From 77c99cd3e1ef3b0758330bf7b1329522f815f9f8 Mon Sep 17 00:00:00 2001 From: Ryan Nasers <42074409+Cardinalstars@users.noreply.github.com> Date: Sun, 4 Feb 2024 13:25:20 -0600 Subject: [PATCH] Removing the need for removal of Applied Energistics-2 recipes in NewHorizonsCoreMod (#453) * Migrating Recipes * Adding the optional loading * More moving of recipes * Cleanup --- src/main/java/appeng/core/RecipeLoader.java | 8 ++ .../easyModeRecipes/aliases.recipe | 2 + .../easyModeRecipes/decorative/certus.recipe | 4 + .../decorative/crystals.recipe | 0 .../decorative/fixtures.recipe | 0 .../easyModeRecipes/decorative/index.recipe | 5 ++ .../decorative/quartzglass.recipe | 0 .../decorative/skystone.recipe | 0 .../easyModeRecipes/groups.recipe | 21 +++++ .../easyModeRecipes/index.recipe | 20 +++++ .../easyModeRecipes/materials/cards.recipe | 39 +++++++++ .../materials/cores.recipe | 0 .../easyModeRecipes/materials/index.recipe | 2 + .../misc/chests.recipe | 0 .../misc/deconstruction.recipe | 3 + .../misc/fluixpearl.recipe | 0 .../easyModeRecipes/misc/index.recipe | 6 ++ .../misc/meteors.recipe | 0 .../misc/seeds.recipe | 0 .../misc/tinytnt.recipe | 0 .../network/blocks/cellworkbench.recipe | 0 .../network/blocks/controller.recipe | 0 .../network/blocks/crystal-processing.recipe | 0 .../network/blocks/energy.recipe | 0 .../network/blocks/index.recipe | 11 +++ .../network/blocks/inscribers.recipe | 0 .../network/blocks/interfaces.recipe | 9 ++ .../network/blocks/io.recipe | 0 .../network/blocks/quantum.recipe | 0 .../network/blocks/security.recipe | 0 .../network/blocks/spatial-io.recipe | 0 .../network/blocks/storage.recipe | 0 .../network/cables/covered.recipe | 4 + .../network/cables/dense-covered.recipe | 3 + .../network/cables/dense.recipe | 4 + .../network/cables/glass.recipe | 3 + .../network/cables/index.recipe | 5 ++ .../network/cables/smart.recipe | 4 + .../network/cells/empty.recipe | 0 .../network/cells/index.recipe | 6 +- .../network/cells/spatial-components.recipe | 0 .../network/cells/spatial.recipe | 0 .../network/cells/storage-components.recipe | 0 .../network/cells/storage.recipe | 66 +++++++-------- .../network/cells/view.recipe | 0 .../network/crafting/cpu.recipe | 83 ++++++++++++++++++ .../network/crafting/index.recipe | 2 + .../network/crafting/patterns.recipe | 0 .../easyModeRecipes/network/index.recipe | 6 ++ .../network/parts/cable-anchor.recipe | 0 .../network/parts/emitters.recipe | 0 .../network/parts/index.recipe | 10 +++ .../network/parts/io-buses.recipe | 0 .../network/parts/monitors.recipe | 0 .../network/parts/panels.recipe | 0 .../network/parts/planes.recipe | 21 +++++ .../network/parts/quartz-fiber.recipe | 0 .../network/parts/terminals.recipe | 0 .../network/parts/toggle-buses.recipe | 0 .../network/parts/tunnels.recipe | 5 ++ .../network/wireless.recipe | 0 .../easyModeRecipes/oredict.recipe | 31 +++++++ .../tools/certus-quartz.recipe | 11 +++ .../easyModeRecipes/tools/index.recipe | 4 + .../tools/matter-cannon.recipe | 0 .../tools/misctools.recipe | 0 .../easyModeRecipes/tools/network.recipe | 19 +++++ .../recipes/decorative/certus.recipe | 4 - .../recipes/decorative/index.recipe | 4 - .../recipes/materials/cards.recipe | 40 --------- .../recipes/materials/index.recipe | 1 - .../recipes/misc/deconstruction.recipe | 4 - .../recipes/misc/index.recipe | 5 -- .../recipes/network/blocks/index.recipe | 10 --- .../recipes/network/blocks/interfaces.recipe | 10 --- .../recipes/network/cables/covered.recipe | 5 -- .../network/cables/dense-covered.recipe | 4 - .../recipes/network/cables/dense.recipe | 5 -- .../recipes/network/cables/glass.recipe | 4 - .../recipes/network/cables/smart.recipe | 5 -- .../recipes/network/crafting/cpu.recipe | 84 ------------------- .../recipes/network/crafting/index.recipe | 1 - .../recipes/network/index.recipe | 2 - .../recipes/network/parts/index.recipe | 8 -- .../recipes/network/parts/planes.recipe | 22 ----- .../recipes/network/parts/tunnels.recipe | 6 -- .../recipes/tools/certus-quartz.recipe | 12 --- .../recipes/tools/network.recipe | 26 +----- 88 files changed, 382 insertions(+), 297 deletions(-) create mode 100644 src/main/resources/assets/appliedenergistics2/easyModeRecipes/aliases.recipe create mode 100644 src/main/resources/assets/appliedenergistics2/easyModeRecipes/decorative/certus.recipe rename src/main/resources/assets/appliedenergistics2/{recipes => easyModeRecipes}/decorative/crystals.recipe (100%) rename src/main/resources/assets/appliedenergistics2/{recipes => easyModeRecipes}/decorative/fixtures.recipe (100%) create mode 100644 src/main/resources/assets/appliedenergistics2/easyModeRecipes/decorative/index.recipe rename src/main/resources/assets/appliedenergistics2/{recipes => easyModeRecipes}/decorative/quartzglass.recipe (100%) rename src/main/resources/assets/appliedenergistics2/{recipes => easyModeRecipes}/decorative/skystone.recipe (100%) create mode 100644 src/main/resources/assets/appliedenergistics2/easyModeRecipes/groups.recipe create mode 100644 src/main/resources/assets/appliedenergistics2/easyModeRecipes/index.recipe create mode 100644 src/main/resources/assets/appliedenergistics2/easyModeRecipes/materials/cards.recipe rename src/main/resources/assets/appliedenergistics2/{recipes => easyModeRecipes}/materials/cores.recipe (100%) create mode 100644 src/main/resources/assets/appliedenergistics2/easyModeRecipes/materials/index.recipe rename src/main/resources/assets/appliedenergistics2/{recipes => easyModeRecipes}/misc/chests.recipe (100%) create mode 100644 src/main/resources/assets/appliedenergistics2/easyModeRecipes/misc/deconstruction.recipe rename src/main/resources/assets/appliedenergistics2/{recipes => easyModeRecipes}/misc/fluixpearl.recipe (100%) create mode 100644 src/main/resources/assets/appliedenergistics2/easyModeRecipes/misc/index.recipe rename src/main/resources/assets/appliedenergistics2/{recipes => easyModeRecipes}/misc/meteors.recipe (100%) rename src/main/resources/assets/appliedenergistics2/{recipes => easyModeRecipes}/misc/seeds.recipe (100%) rename src/main/resources/assets/appliedenergistics2/{recipes => easyModeRecipes}/misc/tinytnt.recipe (100%) rename src/main/resources/assets/appliedenergistics2/{recipes => easyModeRecipes}/network/blocks/cellworkbench.recipe (100%) rename src/main/resources/assets/appliedenergistics2/{recipes => easyModeRecipes}/network/blocks/controller.recipe (100%) rename src/main/resources/assets/appliedenergistics2/{recipes => easyModeRecipes}/network/blocks/crystal-processing.recipe (100%) rename src/main/resources/assets/appliedenergistics2/{recipes => easyModeRecipes}/network/blocks/energy.recipe (100%) create mode 100644 src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/blocks/index.recipe rename src/main/resources/assets/appliedenergistics2/{recipes => easyModeRecipes}/network/blocks/inscribers.recipe (100%) create mode 100644 src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/blocks/interfaces.recipe rename src/main/resources/assets/appliedenergistics2/{recipes => easyModeRecipes}/network/blocks/io.recipe (100%) rename src/main/resources/assets/appliedenergistics2/{recipes => easyModeRecipes}/network/blocks/quantum.recipe (100%) rename src/main/resources/assets/appliedenergistics2/{recipes => easyModeRecipes}/network/blocks/security.recipe (100%) rename src/main/resources/assets/appliedenergistics2/{recipes => easyModeRecipes}/network/blocks/spatial-io.recipe (100%) rename src/main/resources/assets/appliedenergistics2/{recipes => easyModeRecipes}/network/blocks/storage.recipe (100%) create mode 100644 src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/cables/covered.recipe create mode 100644 src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/cables/dense-covered.recipe create mode 100644 src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/cables/dense.recipe create mode 100644 src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/cables/glass.recipe create mode 100644 src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/cables/index.recipe create mode 100644 src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/cables/smart.recipe rename src/main/resources/assets/appliedenergistics2/{recipes => easyModeRecipes}/network/cells/empty.recipe (100%) rename src/main/resources/assets/appliedenergistics2/{recipes => easyModeRecipes}/network/cells/index.recipe (85%) rename src/main/resources/assets/appliedenergistics2/{recipes => easyModeRecipes}/network/cells/spatial-components.recipe (100%) rename src/main/resources/assets/appliedenergistics2/{recipes => easyModeRecipes}/network/cells/spatial.recipe (100%) rename src/main/resources/assets/appliedenergistics2/{recipes => easyModeRecipes}/network/cells/storage-components.recipe (100%) rename src/main/resources/assets/appliedenergistics2/{recipes => easyModeRecipes}/network/cells/storage.recipe (100%) rename src/main/resources/assets/appliedenergistics2/{recipes => easyModeRecipes}/network/cells/view.recipe (100%) create mode 100644 src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/crafting/cpu.recipe create mode 100644 src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/crafting/index.recipe rename src/main/resources/assets/appliedenergistics2/{recipes => easyModeRecipes}/network/crafting/patterns.recipe (100%) create mode 100644 src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/index.recipe rename src/main/resources/assets/appliedenergistics2/{recipes => easyModeRecipes}/network/parts/cable-anchor.recipe (100%) rename src/main/resources/assets/appliedenergistics2/{recipes => easyModeRecipes}/network/parts/emitters.recipe (100%) create mode 100644 src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/parts/index.recipe rename src/main/resources/assets/appliedenergistics2/{recipes => easyModeRecipes}/network/parts/io-buses.recipe (100%) rename src/main/resources/assets/appliedenergistics2/{recipes => easyModeRecipes}/network/parts/monitors.recipe (100%) rename src/main/resources/assets/appliedenergistics2/{recipes => easyModeRecipes}/network/parts/panels.recipe (100%) create mode 100644 src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/parts/planes.recipe rename src/main/resources/assets/appliedenergistics2/{recipes => easyModeRecipes}/network/parts/quartz-fiber.recipe (100%) rename src/main/resources/assets/appliedenergistics2/{recipes => easyModeRecipes}/network/parts/terminals.recipe (100%) rename src/main/resources/assets/appliedenergistics2/{recipes => easyModeRecipes}/network/parts/toggle-buses.recipe (100%) create mode 100644 src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/parts/tunnels.recipe rename src/main/resources/assets/appliedenergistics2/{recipes => easyModeRecipes}/network/wireless.recipe (100%) create mode 100644 src/main/resources/assets/appliedenergistics2/easyModeRecipes/oredict.recipe create mode 100644 src/main/resources/assets/appliedenergistics2/easyModeRecipes/tools/certus-quartz.recipe create mode 100644 src/main/resources/assets/appliedenergistics2/easyModeRecipes/tools/index.recipe rename src/main/resources/assets/appliedenergistics2/{recipes => easyModeRecipes}/tools/matter-cannon.recipe (100%) rename src/main/resources/assets/appliedenergistics2/{recipes => easyModeRecipes}/tools/misctools.recipe (100%) create mode 100644 src/main/resources/assets/appliedenergistics2/easyModeRecipes/tools/network.recipe diff --git a/src/main/java/appeng/core/RecipeLoader.java b/src/main/java/appeng/core/RecipeLoader.java index 09fb2b981..9427484f3 100644 --- a/src/main/java/appeng/core/RecipeLoader.java +++ b/src/main/java/appeng/core/RecipeLoader.java @@ -25,6 +25,7 @@ import appeng.recipes.CustomRecipeConfig; import appeng.recipes.loader.ConfigLoader; import appeng.recipes.loader.JarLoader; import appeng.recipes.loader.RecipeResourceCopier; +import cpw.mods.fml.common.Loader; /** * handles the decision if recipes should be loaded from jar, loaded from file system or force copied from jar @@ -39,6 +40,7 @@ public class RecipeLoader implements Runnable { * recipe path in the jar */ private static final String ASSETS_RECIPE_PATH = "/assets/appliedenergistics2/recipes/"; + private static final String ASSETS_EASY_RECIPE_PATH = "/assets/appliedenergistics2/recipes/"; @Nonnull private final IRecipeHandler handler; @@ -90,9 +92,15 @@ public class RecipeLoader implements Runnable { catch (final IOException | URISyntaxException e) { AELog.debug(e); this.handler.parseRecipes(new JarLoader(ASSETS_RECIPE_PATH), "index.recipe"); + if (!Loader.isModLoaded("dreamcraft")) { + this.handler.parseRecipes(new JarLoader(ASSETS_EASY_RECIPE_PATH), "index.recipe"); + } } } else { this.handler.parseRecipes(new JarLoader(ASSETS_RECIPE_PATH), "index.recipe"); + if (!Loader.isModLoaded("dreamcraft")) { + this.handler.parseRecipes(new JarLoader(ASSETS_EASY_RECIPE_PATH), "index.recipe"); + } } } } diff --git a/src/main/resources/assets/appliedenergistics2/easyModeRecipes/aliases.recipe b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/aliases.recipe new file mode 100644 index 000000000..614a6fe7a --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/aliases.recipe @@ -0,0 +1,2 @@ +alias=mc -> minecraft +alias=ae2 -> appliedenergistics2 \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/easyModeRecipes/decorative/certus.recipe b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/decorative/certus.recipe new file mode 100644 index 000000000..eaafc28af --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/decorative/certus.recipe @@ -0,0 +1,4 @@ +#From decorative/certus +shaped= + ae2:BlockQuartz ae2:BlockQuartz + -> 2 ae2:BlockQuartzChiseled diff --git a/src/main/resources/assets/appliedenergistics2/recipes/decorative/crystals.recipe b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/decorative/crystals.recipe similarity index 100% rename from src/main/resources/assets/appliedenergistics2/recipes/decorative/crystals.recipe rename to src/main/resources/assets/appliedenergistics2/easyModeRecipes/decorative/crystals.recipe diff --git a/src/main/resources/assets/appliedenergistics2/recipes/decorative/fixtures.recipe b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/decorative/fixtures.recipe similarity index 100% rename from src/main/resources/assets/appliedenergistics2/recipes/decorative/fixtures.recipe rename to src/main/resources/assets/appliedenergistics2/easyModeRecipes/decorative/fixtures.recipe diff --git a/src/main/resources/assets/appliedenergistics2/easyModeRecipes/decorative/index.recipe b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/decorative/index.recipe new file mode 100644 index 000000000..c2e396847 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/decorative/index.recipe @@ -0,0 +1,5 @@ +import=decorative/certus.recipe +import=decorative/crystals.recipe +import=decorative/fixtures.recipe +import=decorative/quartzglass.recipe +import=decorative/skystone.recipe \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/recipes/decorative/quartzglass.recipe b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/decorative/quartzglass.recipe similarity index 100% rename from src/main/resources/assets/appliedenergistics2/recipes/decorative/quartzglass.recipe rename to src/main/resources/assets/appliedenergistics2/easyModeRecipes/decorative/quartzglass.recipe diff --git a/src/main/resources/assets/appliedenergistics2/recipes/decorative/skystone.recipe b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/decorative/skystone.recipe similarity index 100% rename from src/main/resources/assets/appliedenergistics2/recipes/decorative/skystone.recipe rename to src/main/resources/assets/appliedenergistics2/easyModeRecipes/decorative/skystone.recipe diff --git a/src/main/resources/assets/appliedenergistics2/easyModeRecipes/groups.recipe b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/groups.recipe new file mode 100644 index 000000000..6d57d203b --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/groups.recipe @@ -0,0 +1,21 @@ +group= oredictionary:itemIlluminatedPanel -> monitor +group= ae2:BlockInterface ae2:ItemPart.Interface -> interface + +group= ae2:ToolCertusQuartzCuttingKnife:* ae2:ToolNetherQuartzCuttingKnife:* -> knife +group= ae2:ToolCertusQuartzWrench ae2:ToolNetherQuartzWrench -> wrench + +group= ae2:CableGlass ae2:CableCovered ae2:CableSmart -> cable +group= ae2:CableDense -> densecable + +group= mc:iron_ingot oredictionary:ingotCopper oredictionary:ingotTin oredictionary:ingotSilver oredictionary:ingotLead oredictionary:ingotBronze oredictionary:ingotBrass oredictionary:ingotNickel oredictionary:ingotInvar oredictionary:ingotAluminium -> metalIngots +group= oredictionary:dustEnder oredictionary:dustEnderPearl -> dustEnder + +group=oredictionary:blockGlass oredictionary:glass mc:glass -> glass +group=oredictionary:wool mc:wool:* -> wool + +group=oredictionary:crystalCertusQuartz oredictionary:crystalNetherQuartz ae2:ItemMaterial.CertusQuartzCrystalCharged -> crystalQuartz +group=oredictionary:dustCertusQuartz oredictionary:dustNetherQuartz -> dustQuartz + +group=oredictionary:crystalCertusQuartz ae2:ItemMaterial.CertusQuartzCrystalCharged ae2:ItemMaterial.PurifiedCertusQuartzCrystal -> certusCrystal +group=oredictionary:crystalNetherQuartz ae2:ItemMaterial.PurifiedNetherQuartzCrystal -> netherCrystal +group=oredictionary:crystalFluix ae2:ItemMaterial.PurifiedFluixCrystal -> fluixCrystal \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/easyModeRecipes/index.recipe b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/index.recipe new file mode 100644 index 000000000..ee8fe0d69 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/index.recipe @@ -0,0 +1,20 @@ +# Crash on Issues +crash=false + +# Hides Exceptions and just display messages. +exceptions=false + +# Error on Missing Items ( default is no because AE2 allows you to enable/disable items without modifying recipes. ) +erroronmissing=true + +# Important, keep in this order +import=aliases.recipe +import=oredict.recipe +import=groups.recipe + +# All actual recipes +import=decorative/index.recipe +import=materials/index.recipe +import=misc/index.recipe +import=network/index.recipe +import=tools/index.recipe \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/easyModeRecipes/materials/cards.recipe b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/materials/cards.recipe new file mode 100644 index 000000000..dc7be53ca --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/materials/cards.recipe @@ -0,0 +1,39 @@ +shaped= + oredictionary:ingotGold oredictionary:ingotIron _, + oredictionary:dustRedstone ae2:ItemMaterial.CalcProcessor oredictionary:ingotIron, + oredictionary:ingotGold oredictionary:ingotIron _ + -> 2 ae2:ItemMaterial.BasicCard + +shaped= + oredictionary:gemDiamond oredictionary:ingotIron _, + oredictionary:dustRedstone ae2:ItemMaterial.CalcProcessor oredictionary:ingotIron, + oredictionary:gemDiamond oredictionary:ingotIron _ + -> 2 ae2:ItemMaterial.AdvCard + +shapeless= + ae2:ItemMaterial.BasicCard certusCrystal + -> ae2:ItemMaterial.CardCapacity + +shapeless= + ae2:ItemMaterial.BasicCard mc:redstone_torch + -> ae2:ItemMaterial.CardRedstone + +shapeless= + ae2:ItemMaterial.AdvCard wool + -> ae2:ItemMaterial.CardFuzzy + +shapeless= + ae2:ItemMaterial.AdvCard mc:redstone_torch + -> ae2:ItemMaterial.CardInverter + +shapeless= + ae2:ItemMaterial.AdvCard fluixCrystal + -> ae2:ItemMaterial.CardSpeed + +shapeless= + ae2:ItemMaterial.BasicCard oredictionary:craftingTableWood + -> ae2:ItemMaterial.CardCrafting + +shapeless= + ae2:ItemMaterial.BasicCard oredictionary:slimeball + -> ae2:ItemMaterial.CardSticky \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/recipes/materials/cores.recipe b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/materials/cores.recipe similarity index 100% rename from src/main/resources/assets/appliedenergistics2/recipes/materials/cores.recipe rename to src/main/resources/assets/appliedenergistics2/easyModeRecipes/materials/cores.recipe diff --git a/src/main/resources/assets/appliedenergistics2/easyModeRecipes/materials/index.recipe b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/materials/index.recipe new file mode 100644 index 000000000..00d1e7d90 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/materials/index.recipe @@ -0,0 +1,2 @@ +import=materials/cards.recipe +import=materials/cores.recipe \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/recipes/misc/chests.recipe b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/misc/chests.recipe similarity index 100% rename from src/main/resources/assets/appliedenergistics2/recipes/misc/chests.recipe rename to src/main/resources/assets/appliedenergistics2/easyModeRecipes/misc/chests.recipe diff --git a/src/main/resources/assets/appliedenergistics2/easyModeRecipes/misc/deconstruction.recipe b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/misc/deconstruction.recipe new file mode 100644 index 000000000..449c8d7b5 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/misc/deconstruction.recipe @@ -0,0 +1,3 @@ +shapeless= + ae2:BlockFluix + -> 4 ae2:ItemMaterial.FluixCrystal diff --git a/src/main/resources/assets/appliedenergistics2/recipes/misc/fluixpearl.recipe b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/misc/fluixpearl.recipe similarity index 100% rename from src/main/resources/assets/appliedenergistics2/recipes/misc/fluixpearl.recipe rename to src/main/resources/assets/appliedenergistics2/easyModeRecipes/misc/fluixpearl.recipe diff --git a/src/main/resources/assets/appliedenergistics2/easyModeRecipes/misc/index.recipe b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/misc/index.recipe new file mode 100644 index 000000000..1660b7867 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/misc/index.recipe @@ -0,0 +1,6 @@ +import=misc/chest.recipe +import=misc/deconstruction.recipe +import=misc/fluixpreal.recipe +import=misc/meteors.recipe +import=misc/seeds.recipe +import=misc/tinytnt.recipe \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/recipes/misc/meteors.recipe b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/misc/meteors.recipe similarity index 100% rename from src/main/resources/assets/appliedenergistics2/recipes/misc/meteors.recipe rename to src/main/resources/assets/appliedenergistics2/easyModeRecipes/misc/meteors.recipe diff --git a/src/main/resources/assets/appliedenergistics2/recipes/misc/seeds.recipe b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/misc/seeds.recipe similarity index 100% rename from src/main/resources/assets/appliedenergistics2/recipes/misc/seeds.recipe rename to src/main/resources/assets/appliedenergistics2/easyModeRecipes/misc/seeds.recipe diff --git a/src/main/resources/assets/appliedenergistics2/recipes/misc/tinytnt.recipe b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/misc/tinytnt.recipe similarity index 100% rename from src/main/resources/assets/appliedenergistics2/recipes/misc/tinytnt.recipe rename to src/main/resources/assets/appliedenergistics2/easyModeRecipes/misc/tinytnt.recipe diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/cellworkbench.recipe b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/blocks/cellworkbench.recipe similarity index 100% rename from src/main/resources/assets/appliedenergistics2/recipes/network/blocks/cellworkbench.recipe rename to src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/blocks/cellworkbench.recipe diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/controller.recipe b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/blocks/controller.recipe similarity index 100% rename from src/main/resources/assets/appliedenergistics2/recipes/network/blocks/controller.recipe rename to src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/blocks/controller.recipe diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/crystal-processing.recipe b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/blocks/crystal-processing.recipe similarity index 100% rename from src/main/resources/assets/appliedenergistics2/recipes/network/blocks/crystal-processing.recipe rename to src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/blocks/crystal-processing.recipe diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/energy.recipe b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/blocks/energy.recipe similarity index 100% rename from src/main/resources/assets/appliedenergistics2/recipes/network/blocks/energy.recipe rename to src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/blocks/energy.recipe diff --git a/src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/blocks/index.recipe b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/blocks/index.recipe new file mode 100644 index 000000000..4ea80c331 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/blocks/index.recipe @@ -0,0 +1,11 @@ +import=network/blocks/cellworkbench.recipe +import=network/blocks/controller.recipe +import=network/blocks/crystal-processing.recipe +import=network/blocks/energy.recipe +import=network/blocks/inscribers.recipe +import=network/blocks/interfaces.recipe +import=network/blocks/io.recipe +import=network/blocks/quantum.recipe +import=network/blocks/security.recipe +import=network/blocks/spatial-io.recipe +import=network/blocks/storage.recipe \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/inscribers.recipe b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/blocks/inscribers.recipe similarity index 100% rename from src/main/resources/assets/appliedenergistics2/recipes/network/blocks/inscribers.recipe rename to src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/blocks/inscribers.recipe diff --git a/src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/blocks/interfaces.recipe b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/blocks/interfaces.recipe new file mode 100644 index 000000000..b9a5f3f98 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/blocks/interfaces.recipe @@ -0,0 +1,9 @@ +shapeless= + ae2:ItemPart.Interface + -> ae2:BlockInterface + +shaped= + oredictionary:ingotIron glass oredictionary:ingotIron, + ae2:ItemMaterial.AnnihilationCore _ ae2:ItemMaterial.FormationCore, + oredictionary:ingotIron glass oredictionary:ingotIron + -> ae2:BlockInterface \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/io.recipe b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/blocks/io.recipe similarity index 100% rename from src/main/resources/assets/appliedenergistics2/recipes/network/blocks/io.recipe rename to src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/blocks/io.recipe diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/quantum.recipe b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/blocks/quantum.recipe similarity index 100% rename from src/main/resources/assets/appliedenergistics2/recipes/network/blocks/quantum.recipe rename to src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/blocks/quantum.recipe diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/security.recipe b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/blocks/security.recipe similarity index 100% rename from src/main/resources/assets/appliedenergistics2/recipes/network/blocks/security.recipe rename to src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/blocks/security.recipe diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/spatial-io.recipe b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/blocks/spatial-io.recipe similarity index 100% rename from src/main/resources/assets/appliedenergistics2/recipes/network/blocks/spatial-io.recipe rename to src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/blocks/spatial-io.recipe diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/storage.recipe b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/blocks/storage.recipe similarity index 100% rename from src/main/resources/assets/appliedenergistics2/recipes/network/blocks/storage.recipe rename to src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/blocks/storage.recipe diff --git a/src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/cables/covered.recipe b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/cables/covered.recipe new file mode 100644 index 000000000..4000459d4 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/cables/covered.recipe @@ -0,0 +1,4 @@ +shapeless= + ae2:CableGlass + wool + -> ae2:CableCovered.Fluix diff --git a/src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/cables/dense-covered.recipe b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/cables/dense-covered.recipe new file mode 100644 index 000000000..5c5011719 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/cables/dense-covered.recipe @@ -0,0 +1,3 @@ +shapeless= + ae2:CableCovered ae2:CableCovered ae2:CableCovered ae2:CableCovered + -> ae2:CableDenseCovered.Fluix diff --git a/src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/cables/dense.recipe b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/cables/dense.recipe new file mode 100644 index 000000000..af1de874f --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/cables/dense.recipe @@ -0,0 +1,4 @@ +shapeless= + ae2:CableCovered ae2:CableCovered ae2:CableCovered ae2:CableCovered + oredictionary:dustRedstone oredictionary:dustGlowstone + -> ae2:CableDense.Fluix diff --git a/src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/cables/glass.recipe b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/cables/glass.recipe new file mode 100644 index 000000000..5f0a31e45 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/cables/glass.recipe @@ -0,0 +1,3 @@ +shapeless= + ae2:ItemPart.QuartzFiber fluixCrystal fluixCrystal + -> 4 ae2:CableGlass.Fluix diff --git a/src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/cables/index.recipe b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/cables/index.recipe new file mode 100644 index 000000000..b191351a0 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/cables/index.recipe @@ -0,0 +1,5 @@ +import=network/cables/covered.recipe +import=network/cables/dense.recipe +import=network/cables/dense-covered.recipe +import=network/cables/glass.recipe +import=network/cables/smart.recipe \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/cables/smart.recipe b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/cables/smart.recipe new file mode 100644 index 000000000..6ca4c2de1 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/cables/smart.recipe @@ -0,0 +1,4 @@ +shapeless= + ae2:CableCovered + oredictionary:dustRedstone oredictionary:dustGlowstone + -> ae2:CableSmart.Fluix diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/empty.recipe b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/cells/empty.recipe similarity index 100% rename from src/main/resources/assets/appliedenergistics2/recipes/network/cells/empty.recipe rename to src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/cells/empty.recipe diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/index.recipe b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/cells/index.recipe similarity index 85% rename from src/main/resources/assets/appliedenergistics2/recipes/network/cells/index.recipe rename to src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/cells/index.recipe index 74c55d8e4..c57ae7e9f 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/index.recipe +++ b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/cells/index.recipe @@ -1,6 +1,6 @@ import=network/cells/empty.recipe -import=network/cells/spatial-components.recipe import=network/cells/spatial.recipe -import=network/cells/storage-components.recipe +import=network/cells/spatial-components.recipe import=network/cells/storage.recipe -import=network/cells/view.recipe +import=network/cells/storage-components.recipe +import=network/cells/view.recipe \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial-components.recipe b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/cells/spatial-components.recipe similarity index 100% rename from src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial-components.recipe rename to src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/cells/spatial-components.recipe diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial.recipe b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/cells/spatial.recipe similarity index 100% rename from src/main/resources/assets/appliedenergistics2/recipes/network/cells/spatial.recipe rename to src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/cells/spatial.recipe diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage-components.recipe b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/cells/storage-components.recipe similarity index 100% rename from src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage-components.recipe rename to src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/cells/storage-components.recipe diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage.recipe b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/cells/storage.recipe similarity index 100% rename from src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage.recipe rename to src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/cells/storage.recipe index a1e981bf5..a46f1f893 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/storage.recipe +++ b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/cells/storage.recipe @@ -1,27 +1,3 @@ -shapeless= - ae2:ItemMaterial.Cell1kPart ae2:ItemMaterial.EmptyStorageCell -> ae2:ItemBasicStorageCell.1k - -shapeless= - ae2:ItemMaterial.Cell4kPart ae2:ItemMaterial.EmptyStorageCell -> ae2:ItemBasicStorageCell.4k - -shapeless= - ae2:ItemMaterial.Cell16kPart ae2:ItemMaterial.EmptyStorageCell -> ae2:ItemBasicStorageCell.16k - -shapeless= - ae2:ItemMaterial.Cell64kPart ae2:ItemMaterial.EmptyStorageCell -> ae2:ItemBasicStorageCell.64k - -shapeless= - ae2:ItemMaterial.Cell256kPart ae2:ItemMaterial.EmptyAdvancedStorageCell -> ae2:ItemAdvancedStorageCell.256k - -shapeless= - ae2:ItemMaterial.Cell1024kPart ae2:ItemMaterial.EmptyAdvancedStorageCell -> ae2:ItemAdvancedStorageCell.1024k - -shapeless= - ae2:ItemMaterial.Cell4096kPart ae2:ItemMaterial.EmptyAdvancedStorageCell -> ae2:ItemAdvancedStorageCell.4096k - -shapeless= - ae2:ItemMaterial.Cell16384kPart ae2:ItemMaterial.EmptyAdvancedStorageCell -> ae2:ItemAdvancedStorageCell.16384k - shaped= ae2:BlockQuartzGlass oredictionary:dustRedstone ae2:BlockQuartzGlass, oredictionary:dustRedstone ae2:ItemMaterial.Cell1kPart oredictionary:dustRedstone, @@ -46,6 +22,9 @@ shaped= oredictionary:ingotIron oredictionary:ingotIron oredictionary:ingotIron -> ae2:ItemBasicStorageCell.64k +shapeless= + ae2:ItemMaterial.Cell4kPart ae2:BlockChest ae2:ItemMaterial.LogicProcessor -> ae2:ItemExtremeStorageCell.Container + shaped= ae2:BlockQuartzGlass oredictionary:dustFluix ae2:BlockQuartzGlass, oredictionary:dustFluix ae2:ItemMaterial.Cell256kPart oredictionary:dustFluix, @@ -70,15 +49,6 @@ shaped= oredictionary:gemDiamond oredictionary:gemDiamond oredictionary:gemDiamond -> ae2:ItemAdvancedStorageCell.16384k -shaped= - ae2:BlockQuartzGlass oredictionary:dustRedstone ae2:BlockQuartzGlass, - oredictionary:dustRedstone mc:ender_pearl oredictionary:dustRedstone, - oredictionary:ingotIron oredictionary:ingotIron oredictionary:ingotIron - -> ae2:ItemVoidStorageCell - -shapeless= - ae2:ItemMaterial.Cell4kPart ae2:BlockChest ae2:ItemMaterial.LogicProcessor -> ae2:ItemExtremeStorageCell.Container - shaped= ae2:BlockQuantumRing ae2:ItemMaterial.Cell16384kPart ae2:BlockQuantumRing, ae2:ItemMaterial.Cell16384kPart ae2:BlockDenseEnergyCell ae2:ItemMaterial.Cell16384kPart, @@ -90,3 +60,33 @@ shaped= ae2:ItemExtremeStorageCell.Quantum ae2:BlockCondenser ae2:ItemExtremeStorageCell.Quantum, ae2:ItemExtremeStorageCell.Quantum ae2:ItemExtremeStorageCell.Quantum ae2:ItemExtremeStorageCell.Quantum -> ae2:ItemExtremeStorageCell.Singularity + +shaped= + ae2:BlockQuartzGlass oredictionary:dustRedstone ae2:BlockQuartzGlass, + oredictionary:dustRedstone mc:ender_pearl oredictionary:dustRedstone, + oredictionary:ingotIron oredictionary:ingotIron oredictionary:ingotIron + -> ae2:ItemVoidStorageCell + +shapeless= + ae2:ItemMaterial.Cell1kPart ae2:ItemMaterial.EmptyStorageCell -> ae2:ItemBasicStorageCell.1k + +shapeless= + ae2:ItemMaterial.Cell4kPart ae2:ItemMaterial.EmptyStorageCell -> ae2:ItemBasicStorageCell.4k + +shapeless= + ae2:ItemMaterial.Cell16kPart ae2:ItemMaterial.EmptyStorageCell -> ae2:ItemBasicStorageCell.16k + +shapeless= + ae2:ItemMaterial.Cell64kPart ae2:ItemMaterial.EmptyStorageCell -> ae2:ItemBasicStorageCell.64k + +shapeless= + ae2:ItemMaterial.Cell256kPart ae2:ItemMaterial.EmptyAdvancedStorageCell -> ae2:ItemAdvancedStorageCell.256k + +shapeless= + ae2:ItemMaterial.Cell1024kPart ae2:ItemMaterial.EmptyAdvancedStorageCell -> ae2:ItemAdvancedStorageCell.1024k + +shapeless= + ae2:ItemMaterial.Cell4096kPart ae2:ItemMaterial.EmptyAdvancedStorageCell -> ae2:ItemAdvancedStorageCell.4096k + +shapeless= + ae2:ItemMaterial.Cell16384kPart ae2:ItemMaterial.EmptyAdvancedStorageCell -> ae2:ItemAdvancedStorageCell.16384k diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cells/view.recipe b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/cells/view.recipe similarity index 100% rename from src/main/resources/assets/appliedenergistics2/recipes/network/cells/view.recipe rename to src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/cells/view.recipe diff --git a/src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/crafting/cpu.recipe b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/crafting/cpu.recipe new file mode 100644 index 000000000..892f898f8 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/crafting/cpu.recipe @@ -0,0 +1,83 @@ +shaped= + oredictionary:ingotIron ae2:ItemMaterial.CalcProcessor oredictionary:ingotIron, + cable ae2:ItemMaterial.LogicProcessor cable, + oredictionary:ingotIron ae2:ItemMaterial.CalcProcessor oredictionary:ingotIron + -> ae2:BlockCraftingUnit:0 + +# co processor +shapeless= + ae2:BlockCraftingUnit:0 + ae2:ItemMaterial.EngProcessor + -> ae2:BlockCraftingUnit:1 + +shapeless= + ae2:BlockCraftingUnit:1 + ae2:BlockCraftingUnit:1 + ae2:BlockCraftingUnit:1 + ae2:BlockCraftingUnit:1 + -> ae2:BlockCraftingUnit:2 + +shapeless= + ae2:BlockCraftingUnit:2 + ae2:BlockCraftingUnit:2 + ae2:BlockCraftingUnit:2 + ae2:BlockCraftingUnit:2 + -> ae2:BlockCraftingUnit:3 + +shapeless= + ae2:BlockCraftingUnit:0 + ae2:ItemPart.StorageMonitor + -> ae2:BlockCraftingMonitor + +# various storage sizes +shapeless= + ae2:BlockCraftingUnit:0 + ae2:ItemMaterial.Cell1kPart + -> ae2:BlockCraftingStorage:0 + +shapeless= + ae2:BlockCraftingUnit:0 + ae2:ItemMaterial.Cell4kPart + -> ae2:BlockCraftingStorage:1 + +shapeless= + ae2:BlockCraftingUnit:0 + ae2:ItemMaterial.Cell16kPart + -> ae2:BlockCraftingStorage:2 + +shapeless= + ae2:BlockCraftingUnit:0 + ae2:ItemMaterial.Cell64kPart + -> ae2:BlockCraftingStorage:3 + +shapeless= + ae2:BlockCraftingUnit:0 + ae2:ItemMaterial.Cell256kPart + -> ae2:BlockAdvancedCraftingStorage:0 + +shapeless= + ae2:BlockCraftingUnit:0 + ae2:ItemMaterial.Cell1024kPart + -> ae2:BlockAdvancedCraftingStorage:1 + +shapeless= + ae2:BlockCraftingUnit:0 + ae2:ItemMaterial.Cell4096kPart + -> ae2:BlockAdvancedCraftingStorage:2 + +shapeless= + ae2:BlockCraftingUnit:0 + ae2:ItemMaterial.Cell16384kPart + -> ae2:BlockAdvancedCraftingStorage:3 + +shapeless= + ae2:ItemExtremeStorageCell.Singularity + ae2:ItemExtremeStorageCell.Singularity + ae2:ItemExtremeStorageCell.Singularity + ae2:ItemExtremeStorageCell.Singularity + ae2:BlockCraftingUnit:0 + ae2:ItemExtremeStorageCell.Singularity + ae2:ItemExtremeStorageCell.Singularity + ae2:ItemExtremeStorageCell.Singularity + ae2:ItemExtremeStorageCell.Singularity + -> ae2:BlockSingularityCraftingStorage:0 diff --git a/src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/crafting/index.recipe b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/crafting/index.recipe new file mode 100644 index 000000000..734af91d6 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/crafting/index.recipe @@ -0,0 +1,2 @@ +import=network/crafting/cpu.recipe +import=network/crafting/patterns.recipe \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/patterns.recipe b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/crafting/patterns.recipe similarity index 100% rename from src/main/resources/assets/appliedenergistics2/recipes/network/crafting/patterns.recipe rename to src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/crafting/patterns.recipe diff --git a/src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/index.recipe b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/index.recipe new file mode 100644 index 000000000..b5a68bc03 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/index.recipe @@ -0,0 +1,6 @@ +import=network/blocks/index.recipe +import=network/cables/index.recipe +import=network/cells/index.recipe +import=network/crafting/index.recipe +import=network/parts/index.recipe +import=network/wireless.recipe \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/cable-anchor.recipe b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/parts/cable-anchor.recipe similarity index 100% rename from src/main/resources/assets/appliedenergistics2/recipes/network/parts/cable-anchor.recipe rename to src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/parts/cable-anchor.recipe diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/emitters.recipe b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/parts/emitters.recipe similarity index 100% rename from src/main/resources/assets/appliedenergistics2/recipes/network/parts/emitters.recipe rename to src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/parts/emitters.recipe diff --git a/src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/parts/index.recipe b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/parts/index.recipe new file mode 100644 index 000000000..dfbd9e8be --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/parts/index.recipe @@ -0,0 +1,10 @@ +import=network/parts/cable-anchor.recipe +import=network/parts/emitters.recipe +import=network/parts/io-buses.recipe +import=network/parts/monitors.recipe +import=network/parts/panels.recipe +import=network/parts/planes.recipe +import=network/parts/quartz-fiber.recipe +import=network/parts/terminals.recipe +import=network/parts/toggle-buses.recipe +import=network/parts/tunnels.recipe \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/io-buses.recipe b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/parts/io-buses.recipe similarity index 100% rename from src/main/resources/assets/appliedenergistics2/recipes/network/parts/io-buses.recipe rename to src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/parts/io-buses.recipe diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/monitors.recipe b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/parts/monitors.recipe similarity index 100% rename from src/main/resources/assets/appliedenergistics2/recipes/network/parts/monitors.recipe rename to src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/parts/monitors.recipe diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/panels.recipe b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/parts/panels.recipe similarity index 100% rename from src/main/resources/assets/appliedenergistics2/recipes/network/parts/panels.recipe rename to src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/parts/panels.recipe diff --git a/src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/parts/planes.recipe b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/parts/planes.recipe new file mode 100644 index 000000000..81a2fa2f0 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/parts/planes.recipe @@ -0,0 +1,21 @@ +shaped= + fluixCrystal fluixCrystal fluixCrystal, + oredictionary:ingotIron ae2:ItemMaterial.FormationCore oredictionary:ingotIron + -> ae2:ItemPart.FormationPlane + +shaped= + fluixCrystal fluixCrystal fluixCrystal, + oredictionary:ingotIron ae2:ItemMaterial.AnnihilationCore oredictionary:ingotIron + -> ae2:ItemPart.AnnihilationPlane + +shaped= + oredictionary:ingotIron fluixCrystal, + ae2:ItemMaterial.AnnihilationCore fluixCrystal, + oredictionary:ingotIron fluixCrystal + -> ae2:ItemPart.AnnihilationPlane + +shaped= + oredictionary:ingotIron fluixCrystal, + ae2:ItemMaterial.FormationCore fluixCrystal, + oredictionary:ingotIron fluixCrystal + -> ae2:ItemPart.FormationPlane diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/quartz-fiber.recipe b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/parts/quartz-fiber.recipe similarity index 100% rename from src/main/resources/assets/appliedenergistics2/recipes/network/parts/quartz-fiber.recipe rename to src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/parts/quartz-fiber.recipe diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/terminals.recipe b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/parts/terminals.recipe similarity index 100% rename from src/main/resources/assets/appliedenergistics2/recipes/network/parts/terminals.recipe rename to src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/parts/terminals.recipe diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/toggle-buses.recipe b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/parts/toggle-buses.recipe similarity index 100% rename from src/main/resources/assets/appliedenergistics2/recipes/network/parts/toggle-buses.recipe rename to src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/parts/toggle-buses.recipe diff --git a/src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/parts/tunnels.recipe b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/parts/tunnels.recipe new file mode 100644 index 000000000..d158898e9 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/parts/tunnels.recipe @@ -0,0 +1,5 @@ +shaped= + _ oredictionary:ingotIron _, + oredictionary:ingotIron ae2:ItemMaterial.EngProcessor oredictionary:ingotIron, + fluixCrystal fluixCrystal fluixCrystal + -> ae2:ItemPart.P2PTunnelME diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/wireless.recipe b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/wireless.recipe similarity index 100% rename from src/main/resources/assets/appliedenergistics2/recipes/network/wireless.recipe rename to src/main/resources/assets/appliedenergistics2/easyModeRecipes/network/wireless.recipe diff --git a/src/main/resources/assets/appliedenergistics2/easyModeRecipes/oredict.recipe b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/oredict.recipe new file mode 100644 index 000000000..4a019c360 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/oredict.recipe @@ -0,0 +1,31 @@ +# Forge Ore Dictionary +# logWood, slabWood, stairWood, treeSapling, treeLeaves, +# oreGold, oreIron, oreLapis, oreDiamond, oreRedstone, oreEmerald, oreQuartz, oreCoal, +# stone, cobblestone, record, stickWood, plankWood, +# dyeBlack, dyeRed, dyeGreen, dyeBrown, dyeBlue, dyePurple, dyeCyan, dyeLightGray, dyeGray, dyePink, dyeLime, dyeYellow, dyeLightBlue, dyeMagenta, dyeOrange, dyeWhite + +# Minecraft Ore Dict Entries +# Renamed for less clashing +ore=mc:quartz -> crystalNetherQuartz +ore=mc:wool:* -> blockWool +ore=mc:stained_hardened_clay:* -> blockStainedHardenedClay +ore=mc:crafting_table -> craftingTableWood +ore=mc:chest -> chestWood + +# AE2 Ore Dictionary +# Materials for processing in other machines +ore=ae2:ItemMaterial.CertusQuartzCrystal -> crystalCertusQuartz +ore=ae2:ItemMaterial.FluixCrystal -> crystalFluix +ore=ae2:ItemMaterial.PurifiedFluixCrystal -> crystalPureFluix +ore=ae2:ItemMaterial.NetherQuartzDust -> dustNetherQuartz +ore=ae2:ItemMaterial.CertusQuartzDust -> dustCertusQuartz +ore=ae2:ItemMaterial.FluixDust -> dustFluix + +# Ores of AE2 +ore=ae2:tile.OreQuartz -> oreCertusQuartz +ore=ae2:tile.OreQuartzCharged -> oreChargedCertusQuartz + +# Parts to be used +ore= ae2:ItemPart.SemiDarkMonitor -> itemIlluminatedPanel +ore= ae2:ItemPart.Monitor -> itemIlluminatedPanel +ore= ae2:ItemPart.DarkMonitor -> itemIlluminatedPanel \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/easyModeRecipes/tools/certus-quartz.recipe b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/tools/certus-quartz.recipe new file mode 100644 index 000000000..7d8712e6e --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/tools/certus-quartz.recipe @@ -0,0 +1,11 @@ +shaped= + oredictionary:crystalCertusQuartz _ oredictionary:crystalCertusQuartz, + _ oredictionary:crystalCertusQuartz _, + oredictionary:crystalCertusQuartz _ oredictionary:crystalCertusQuartz + -> ae2:ToolCertusQuartzWrench + +shaped= + _ _ oredictionary:stickWood, + oredictionary:ingotIron oredictionary:stickWood _, + oredictionary:crystalCertusQuartz oredictionary:crystalCertusQuartz _ + -> ae2:ToolCertusQuartzCuttingKnife diff --git a/src/main/resources/assets/appliedenergistics2/easyModeRecipes/tools/index.recipe b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/tools/index.recipe new file mode 100644 index 000000000..f9c2e5fae --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/tools/index.recipe @@ -0,0 +1,4 @@ +import=tools/certus-quartz.recipe +import=tools/matter-cannon.recipe +import=tools/misctools.recipe +import=tools/network.recipe \ No newline at end of file diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/matter-cannon.recipe b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/tools/matter-cannon.recipe similarity index 100% rename from src/main/resources/assets/appliedenergistics2/recipes/tools/matter-cannon.recipe rename to src/main/resources/assets/appliedenergistics2/easyModeRecipes/tools/matter-cannon.recipe diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/misctools.recipe b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/tools/misctools.recipe similarity index 100% rename from src/main/resources/assets/appliedenergistics2/recipes/tools/misctools.recipe rename to src/main/resources/assets/appliedenergistics2/easyModeRecipes/tools/misctools.recipe diff --git a/src/main/resources/assets/appliedenergistics2/easyModeRecipes/tools/network.recipe b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/tools/network.recipe new file mode 100644 index 000000000..09042aac7 --- /dev/null +++ b/src/main/resources/assets/appliedenergistics2/easyModeRecipes/tools/network.recipe @@ -0,0 +1,19 @@ +shaped= + ae2:BlockChest ae2:ItemMaterial.Cell1kPart ae2:BlockEnergyCell + -> ae2:ToolPortableCell + +shaped= + ae2:ItemMaterial.EngProcessor oredictionary:ingotIron oredictionary:ingotIron, + oredictionary:ingotGold oredictionary:dustRedstone oredictionary:ingotGold + -> ae2:ToolBiometricCard + +shaped= + ae2:ItemMaterial.CalcProcessor oredictionary:ingotIron oredictionary:ingotIron, + oredictionary:ingotGold oredictionary:dustRedstone oredictionary:ingotGold + -> ae2:ToolMemoryCard + +shaped= + ae2:ItemMaterial.FormationCore oredictionary:ingotIron _, + oredictionary:ingotIron ae2:ItemMaterial.Cell4kPart _, + _ _ ae2:BlockEnergyCell + -> ae2:ToolColorApplicator diff --git a/src/main/resources/assets/appliedenergistics2/recipes/decorative/certus.recipe b/src/main/resources/assets/appliedenergistics2/recipes/decorative/certus.recipe index d69310275..793720a13 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/decorative/certus.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/decorative/certus.recipe @@ -2,7 +2,3 @@ shaped= ae2:BlockQuartz, ae2:BlockQuartz -> 2 ae2:BlockQuartzPillar - -shaped= - ae2:BlockQuartz ae2:BlockQuartz - -> 2 ae2:BlockQuartzChiseled diff --git a/src/main/resources/assets/appliedenergistics2/recipes/decorative/index.recipe b/src/main/resources/assets/appliedenergistics2/recipes/decorative/index.recipe index 5b79d2a13..0b9f84cc9 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/decorative/index.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/decorative/index.recipe @@ -1,7 +1,3 @@ import=decorative/certus.recipe -import=decorative/crystals.recipe -import=decorative/fixtures.recipe -import=decorative/quartzglass.recipe -import=decorative/skystone.recipe import=decorative/slabs.recipe import=decorative/stairs.recipe diff --git a/src/main/resources/assets/appliedenergistics2/recipes/materials/cards.recipe b/src/main/resources/assets/appliedenergistics2/recipes/materials/cards.recipe index f4d952891..30c7e2322 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/materials/cards.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/materials/cards.recipe @@ -1,43 +1,3 @@ -shaped= - oredictionary:ingotGold oredictionary:ingotIron _, - oredictionary:dustRedstone ae2:ItemMaterial.CalcProcessor oredictionary:ingotIron, - oredictionary:ingotGold oredictionary:ingotIron _ - -> 2 ae2:ItemMaterial.BasicCard - -shaped= - oredictionary:gemDiamond oredictionary:ingotIron _, - oredictionary:dustRedstone ae2:ItemMaterial.CalcProcessor oredictionary:ingotIron, - oredictionary:gemDiamond oredictionary:ingotIron _ - -> 2 ae2:ItemMaterial.AdvCard - -shapeless= - ae2:ItemMaterial.BasicCard certusCrystal - -> ae2:ItemMaterial.CardCapacity - -shapeless= - ae2:ItemMaterial.BasicCard mc:redstone_torch - -> ae2:ItemMaterial.CardRedstone - -shapeless= - ae2:ItemMaterial.AdvCard wool - -> ae2:ItemMaterial.CardFuzzy - -shapeless= - ae2:ItemMaterial.AdvCard mc:redstone_torch - -> ae2:ItemMaterial.CardInverter - -shapeless= - ae2:ItemMaterial.AdvCard fluixCrystal - -> ae2:ItemMaterial.CardSpeed - -shapeless= - ae2:ItemMaterial.BasicCard oredictionary:craftingTableWood - -> ae2:ItemMaterial.CardCrafting - -shapeless= - ae2:ItemMaterial.BasicCard oredictionary:slimeball - -> ae2:ItemMaterial.CardSticky - shaped= ae2:ItemMaterial.AdvCard ae2:ItemMaterial.Cell16kPart _, ae2:ItemMaterial.Cell16kPart ae2:ItemPart.Interface _, diff --git a/src/main/resources/assets/appliedenergistics2/recipes/materials/index.recipe b/src/main/resources/assets/appliedenergistics2/recipes/materials/index.recipe index 2f989adc2..770bd5d38 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/materials/index.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/materials/index.recipe @@ -1,5 +1,4 @@ import=materials/cards.recipe import=materials/circuits.recipe -import=materials/cores.recipe import=materials/presses.recipe import=materials/processors.recipe diff --git a/src/main/resources/assets/appliedenergistics2/recipes/misc/deconstruction.recipe b/src/main/resources/assets/appliedenergistics2/recipes/misc/deconstruction.recipe index 024ce79b4..bc972197c 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/misc/deconstruction.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/misc/deconstruction.recipe @@ -9,7 +9,3 @@ shapeless= shapeless= ae2:BlockQuartzChiseled -> 4 ae2:ItemMaterial.CertusQuartzCrystal - -shapeless= - ae2:BlockFluix - -> 4 ae2:ItemMaterial.FluixCrystal diff --git a/src/main/resources/assets/appliedenergistics2/recipes/misc/index.recipe b/src/main/resources/assets/appliedenergistics2/recipes/misc/index.recipe index 59927195d..7a3eace58 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/misc/index.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/misc/index.recipe @@ -1,8 +1,3 @@ -import=misc/chests.recipe import=misc/deconstruction.recipe -import=misc/fluixpearl.recipe import=misc/grindstone.recipe -import=misc/meteors.recipe -import=misc/tinytnt.recipe -import=misc/seeds.recipe import=misc/vanilla.recipe diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/index.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/index.recipe index 6174d5014..b3b42c332 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/index.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/index.recipe @@ -1,11 +1 @@ -import=network/blocks/cellworkbench.recipe -import=network/blocks/controller.recipe -import=network/blocks/crystal-processing.recipe -import=network/blocks/energy.recipe -import=network/blocks/inscribers.recipe import=network/blocks/interfaces.recipe -import=network/blocks/io.recipe -import=network/blocks/quantum.recipe -import=network/blocks/security.recipe -import=network/blocks/spatial-io.recipe -import=network/blocks/storage.recipe diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/interfaces.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/interfaces.recipe index e132cda5c..35fc6f345 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/interfaces.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/blocks/interfaces.recipe @@ -1,13 +1,3 @@ -shapeless= - ae2:ItemPart.Interface - -> ae2:BlockInterface - shapeless= ae2:BlockInterface -> ae2:ItemPart.Interface - -shaped= - oredictionary:ingotIron glass oredictionary:ingotIron, - ae2:ItemMaterial.AnnihilationCore _ ae2:ItemMaterial.FormationCore, - oredictionary:ingotIron glass oredictionary:ingotIron - -> ae2:BlockInterface diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered.recipe index 1e1b5bbca..bd65d37ca 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/covered.recipe @@ -1,8 +1,3 @@ -shapeless= - ae2:CableGlass - wool - -> ae2:CableCovered.Fluix - shapeless= ae2:CableCovered mc:water_bucket -> ae2:CableCovered.Fluix diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense-covered.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense-covered.recipe index cfd1f3343..dc886e0af 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense-covered.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense-covered.recipe @@ -1,7 +1,3 @@ -shapeless= - ae2:CableCovered ae2:CableCovered ae2:CableCovered ae2:CableCovered - -> ae2:CableDenseCovered.Fluix - shapeless= ae2:CableDenseCovered mc:water_bucket -> ae2:CableDenseCovered.Fluix diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense.recipe index 147799a23..a6fa1746b 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/dense.recipe @@ -1,8 +1,3 @@ -shapeless= - ae2:CableCovered ae2:CableCovered ae2:CableCovered ae2:CableCovered - oredictionary:dustRedstone oredictionary:dustGlowstone - -> ae2:CableDense.Fluix - shapeless= ae2:CableDense mc:water_bucket -> ae2:CableDense.Fluix diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass.recipe index 8fdecd928..80bc00be2 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/glass.recipe @@ -1,7 +1,3 @@ -shapeless= - ae2:ItemPart.QuartzFiber fluixCrystal fluixCrystal - -> 4 ae2:CableGlass.Fluix - shapeless= ae2:CableGlass mc:water_bucket -> ae2:CableGlass.Fluix diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart.recipe index 3d14679ab..6162f9382 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/cables/smart.recipe @@ -1,8 +1,3 @@ -shapeless= - ae2:CableCovered - oredictionary:dustRedstone oredictionary:dustGlowstone - -> ae2:CableSmart.Fluix - shapeless= ae2:CableSmart mc:water_bucket -> ae2:CableSmart.Fluix diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/cpu.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/cpu.recipe index bdc3f58b7..7c1c6bf9e 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/cpu.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/cpu.recipe @@ -1,29 +1,3 @@ -shaped= - oredictionary:ingotIron ae2:ItemMaterial.CalcProcessor oredictionary:ingotIron, - cable ae2:ItemMaterial.LogicProcessor cable, - oredictionary:ingotIron ae2:ItemMaterial.CalcProcessor oredictionary:ingotIron - -> ae2:BlockCraftingUnit:0 - -# co processor -shapeless= - ae2:BlockCraftingUnit:0 - ae2:ItemMaterial.EngProcessor - -> ae2:BlockCraftingUnit:1 - -shapeless= - ae2:BlockCraftingUnit:1 - ae2:BlockCraftingUnit:1 - ae2:BlockCraftingUnit:1 - ae2:BlockCraftingUnit:1 - -> ae2:BlockCraftingUnit:2 - -shapeless= - ae2:BlockCraftingUnit:2 - ae2:BlockCraftingUnit:2 - ae2:BlockCraftingUnit:2 - ae2:BlockCraftingUnit:2 - -> ae2:BlockCraftingUnit:3 - shapeless= ae2:BlockCraftingUnit:3 ae2:BlockCraftingUnit:3 @@ -51,61 +25,3 @@ shapeless= ae2:BlockAdvancedCraftingUnit:2 ae2:BlockAdvancedCraftingUnit:2 -> ae2:BlockAdvancedCraftingUnit:3 - -shapeless= - ae2:BlockCraftingUnit:0 - ae2:ItemPart.StorageMonitor - -> ae2:BlockCraftingMonitor - -# various storage sizes -shapeless= - ae2:BlockCraftingUnit:0 - ae2:ItemMaterial.Cell1kPart - -> ae2:BlockCraftingStorage:0 - -shapeless= - ae2:BlockCraftingUnit:0 - ae2:ItemMaterial.Cell4kPart - -> ae2:BlockCraftingStorage:1 - -shapeless= - ae2:BlockCraftingUnit:0 - ae2:ItemMaterial.Cell16kPart - -> ae2:BlockCraftingStorage:2 - -shapeless= - ae2:BlockCraftingUnit:0 - ae2:ItemMaterial.Cell64kPart - -> ae2:BlockCraftingStorage:3 - -shapeless= - ae2:BlockCraftingUnit:0 - ae2:ItemMaterial.Cell256kPart - -> ae2:BlockAdvancedCraftingStorage:0 - -shapeless= - ae2:BlockCraftingUnit:0 - ae2:ItemMaterial.Cell1024kPart - -> ae2:BlockAdvancedCraftingStorage:1 - -shapeless= - ae2:BlockCraftingUnit:0 - ae2:ItemMaterial.Cell4096kPart - -> ae2:BlockAdvancedCraftingStorage:2 - -shapeless= - ae2:BlockCraftingUnit:0 - ae2:ItemMaterial.Cell16384kPart - -> ae2:BlockAdvancedCraftingStorage:3 - -shapeless= - ae2:ItemExtremeStorageCell.Singularity - ae2:ItemExtremeStorageCell.Singularity - ae2:ItemExtremeStorageCell.Singularity - ae2:ItemExtremeStorageCell.Singularity - ae2:BlockCraftingUnit:0 - ae2:ItemExtremeStorageCell.Singularity - ae2:ItemExtremeStorageCell.Singularity - ae2:ItemExtremeStorageCell.Singularity - ae2:ItemExtremeStorageCell.Singularity - -> ae2:BlockSingularityCraftingStorage:0 diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/index.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/index.recipe index 2d4f10d0b..9772c6a99 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/index.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/crafting/index.recipe @@ -1,3 +1,2 @@ import=network/crafting/assembler.recipe import=network/crafting/cpu.recipe -import=network/crafting/patterns.recipe diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/index.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/index.recipe index 22cdf1319..b3ea195da 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/index.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/index.recipe @@ -1,6 +1,4 @@ import=network/blocks/index.recipe import=network/cables/index.recipe -import=network/cells/index.recipe import=network/crafting/index.recipe import=network/parts/index.recipe -import=network/wireless.recipe diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/index.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/index.recipe index 1f8093c3c..e324986d8 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/index.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/index.recipe @@ -1,10 +1,2 @@ -import=network/parts/cable-anchor.recipe -import=network/parts/emitters.recipe -import=network/parts/io-buses.recipe -import=network/parts/monitors.recipe -import=network/parts/panels.recipe import=network/parts/planes.recipe -import=network/parts/quartz-fiber.recipe -import=network/parts/terminals.recipe -import=network/parts/toggle-buses.recipe import=network/parts/tunnels.recipe diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes.recipe index 426d98680..ef1dc49ee 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/planes.recipe @@ -1,25 +1,3 @@ -shaped= - fluixCrystal fluixCrystal fluixCrystal, - oredictionary:ingotIron ae2:ItemMaterial.FormationCore oredictionary:ingotIron - -> ae2:ItemPart.FormationPlane - -shaped= - fluixCrystal fluixCrystal fluixCrystal, - oredictionary:ingotIron ae2:ItemMaterial.AnnihilationCore oredictionary:ingotIron - -> ae2:ItemPart.AnnihilationPlane - -shaped= - oredictionary:ingotIron fluixCrystal, - ae2:ItemMaterial.AnnihilationCore fluixCrystal, - oredictionary:ingotIron fluixCrystal - -> ae2:ItemPart.AnnihilationPlane - -shaped= - oredictionary:ingotIron fluixCrystal, - ae2:ItemMaterial.FormationCore fluixCrystal, - oredictionary:ingotIron fluixCrystal - -> ae2:ItemPart.FormationPlane - shapeless= ae2:ItemPart.AnnihilationPlane ae2:ItemMaterial.FluixPearl -> ae2:ItemPart.IdentityAnnihilationPlane diff --git a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/tunnels.recipe b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/tunnels.recipe index 86aa34866..279175620 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/network/parts/tunnels.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/network/parts/tunnels.recipe @@ -1,9 +1,3 @@ -shaped= - _ oredictionary:ingotIron _, - oredictionary:ingotIron ae2:ItemMaterial.EngProcessor oredictionary:ingotIron, - fluixCrystal fluixCrystal fluixCrystal - -> ae2:ItemPart.P2PTunnelME - shapeless= ae2:ItemPart.P2PTunnelME ae2:ItemPart.Interface -> ae2:ItemPart.P2PTunnelInterface diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/certus-quartz.recipe b/src/main/resources/assets/appliedenergistics2/recipes/tools/certus-quartz.recipe index 8ebf02c1d..52fd3da3b 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/certus-quartz.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/certus-quartz.recipe @@ -27,15 +27,3 @@ shaped= _ oredictionary:stickWood, _ oredictionary:stickWood -> ae2:ToolCertusQuartzHoe - -shaped= - oredictionary:crystalCertusQuartz _ oredictionary:crystalCertusQuartz, - _ oredictionary:crystalCertusQuartz _, - oredictionary:crystalCertusQuartz _ oredictionary:crystalCertusQuartz - -> ae2:ToolCertusQuartzWrench - -shaped= - _ _ oredictionary:stickWood, - oredictionary:ingotIron oredictionary:stickWood _, - oredictionary:crystalCertusQuartz oredictionary:crystalCertusQuartz _ - -> ae2:ToolCertusQuartzCuttingKnife diff --git a/src/main/resources/assets/appliedenergistics2/recipes/tools/network.recipe b/src/main/resources/assets/appliedenergistics2/recipes/tools/network.recipe index 50c74afcf..b81f2e63c 100644 --- a/src/main/resources/assets/appliedenergistics2/recipes/tools/network.recipe +++ b/src/main/resources/assets/appliedenergistics2/recipes/tools/network.recipe @@ -1,32 +1,8 @@ -shaped= - ae2:BlockChest ae2:ItemMaterial.Cell1kPart ae2:BlockEnergyCell - -> ae2:ToolPortableCell - shapeless= wrench monitor ae2:ItemMaterial.CalcProcessor oredictionary:chestWood -> ae2:ToolNetworkTool - + shapeless= ae2:ToolNetworkTool ae2:ItemPart.ConversionMonitor ae2:ItemMaterial.Cell64kPart ae2:ItemMaterial.CardCapacity -> ae2:ToolAdvancedNetworkTool - -shaped= - ae2:ItemMaterial.EngProcessor oredictionary:ingotIron oredictionary:ingotIron, - oredictionary:ingotGold oredictionary:dustRedstone oredictionary:ingotGold - -> ae2:ToolBiometricCard -shaped= - ae2:ItemMaterial.CalcProcessor oredictionary:ingotIron oredictionary:ingotIron, - oredictionary:ingotGold oredictionary:dustRedstone oredictionary:ingotGold - -> ae2:ToolMemoryCard - -shaped= - ae2:ItemMaterial.EngProcessor oredictionary:ingotIron oredictionary:ingotIron, - oredictionary:gemDiamond oredictionary:dustRedstone oredictionary:gemDiamond - -> ae2:ToolPriorityCard - -shaped= - ae2:ItemMaterial.FormationCore oredictionary:ingotIron _, - oredictionary:ingotIron ae2:ItemMaterial.Cell4kPart _, - _ _ ae2:BlockEnergyCell - -> ae2:ToolColorApplicator