diff options
Diffstat (limited to 'src/main/java')
4 files changed, 35 insertions, 4 deletions
diff --git a/src/main/java/gregtech/GT_Mod.java b/src/main/java/gregtech/GT_Mod.java index 08303e9f10..422cf02771 100644 --- a/src/main/java/gregtech/GT_Mod.java +++ b/src/main/java/gregtech/GT_Mod.java @@ -80,6 +80,7 @@ import static gregtech.api.enums.GT_Values.MOD_ID_FR; " after:TwilightForest;" + " after:harvestcraft;" + " after:magicalcrops;" + + " after:Botania;" + " after:BuildCraft|Transport;" + " after:BuildCraft|Silicon;" + " after:BuildCraft|Factory;" + diff --git a/src/main/java/gregtech/api/enums/OrePrefixes.java b/src/main/java/gregtech/api/enums/OrePrefixes.java index 0811fdac40..c7382f0a02 100644 --- a/src/main/java/gregtech/api/enums/OrePrefixes.java +++ b/src/main/java/gregtech/api/enums/OrePrefixes.java @@ -438,6 +438,17 @@ public enum OrePrefixes { block.mNotGeneratedItems.add(Materials.Coal); toolHeadArrow.mNotGeneratedItems.add(Materials.Glass); + // Botania + ingot.mNotGeneratedItems.add(MaterialsBotania.Manasteel); + ingot.mNotGeneratedItems.add(MaterialsBotania.Terrasteel); + ingot.mNotGeneratedItems.add(MaterialsBotania.ElvenElementium); + ingot.mNotGeneratedItems.add(MaterialsBotania.GaiaSpirit); + nugget.mNotGeneratedItems.add(MaterialsBotania.Manasteel); + nugget.mNotGeneratedItems.add(MaterialsBotania.Terrasteel); + nugget.mNotGeneratedItems.add(MaterialsBotania.ElvenElementium); + gem.mNotGeneratedItems.add(MaterialsBotania.ManaDiamond); + gem.mNotGeneratedItems.add(MaterialsBotania.BotaniaDragonstone); + //----- dustImpure.mGeneratedItems.add(Materials.GraniteRed); diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingRotor.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingRotor.java index 459f8716dd..b8e06cd684 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingRotor.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingRotor.java @@ -15,10 +15,14 @@ public class ProcessingRotor implements gregtech.api.interfaces.IOreRecipeRegist @Override public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { if ((aMaterial.mUnificatable) && (aMaterial.mMaterialInto == aMaterial) && !aMaterial.contains(SubTag.NO_WORKING)) { - GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.rotor, aMaterial, 1L), GT_Proxy.tBits, new Object[]{"PhP", "SRf", "PdP", 'P', aMaterial == Materials.Wood ? OrePrefixes.plank.get(aMaterial) : OrePrefixes.plate.get(aMaterial), 'R', OrePrefixes.ring.get(aMaterial), 'S', OrePrefixes.screw.get(aMaterial)}); - GT_Values.RA.addAssemblerRecipe(new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 4L), GT_OreDictUnificator.get(OrePrefixes.ring, aMaterial, 1L), GT_Utility.getIntegratedCircuit(4)}, Materials.Tin.getMolten(32), GT_OreDictUnificator.get(OrePrefixes.rotor, aMaterial, 1L), 240, 24); - GT_Values.RA.addAssemblerRecipe(new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 4L), GT_OreDictUnificator.get(OrePrefixes.ring, aMaterial, 1L), GT_Utility.getIntegratedCircuit(4)}, Materials.Lead.getMolten(48), GT_OreDictUnificator.get(OrePrefixes.rotor, aMaterial, 1L), 240, 24); - GT_Values.RA.addAssemblerRecipe(new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 4L), GT_OreDictUnificator.get(OrePrefixes.ring, aMaterial, 1L), GT_Utility.getIntegratedCircuit(4)}, Materials.SolderingAlloy.getMolten(16), GT_OreDictUnificator.get(OrePrefixes.rotor, aMaterial, 1L), 240, 24); + ItemStack tPlate = GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 4L); + ItemStack tRing = GT_OreDictUnificator.get(OrePrefixes.ring, aMaterial, 1L); + if (GT_Utility.isStackValid(tPlate) && GT_Utility.isStackValid(tRing)) { + GT_ModHandler.addCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.rotor, aMaterial, 1L), GT_Proxy.tBits, new Object[]{"PhP", "SRf", "PdP", 'P', aMaterial == Materials.Wood ? OrePrefixes.plank.get(aMaterial) : OrePrefixes.plate.get(aMaterial), 'R', OrePrefixes.ring.get(aMaterial), 'S', OrePrefixes.screw.get(aMaterial)}); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{tPlate, tRing, GT_Utility.getIntegratedCircuit(4)}, Materials.Tin.getMolten(32), GT_OreDictUnificator.get(OrePrefixes.rotor, aMaterial, 1L), 240, 24); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{tPlate, tRing, GT_Utility.getIntegratedCircuit(4)}, Materials.Lead.getMolten(48), GT_OreDictUnificator.get(OrePrefixes.rotor, aMaterial, 1L), 240, 24); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{tPlate, tRing, GT_Utility.getIntegratedCircuit(4)}, Materials.SolderingAlloy.getMolten(16), GT_OreDictUnificator.get(OrePrefixes.rotor, aMaterial, 1L), 240, 24); + } GT_Values.RA.addExtruderRecipe(GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 5L), ItemList.Shape_Extruder_Rotor.get(0L), GT_OreDictUnificator.get(OrePrefixes.rotor, aMaterial, 1L), 200, 60); if (!(aMaterial == Materials.AnnealedCopper || aMaterial == Materials.WroughtIron)) { GT_Values.RA.addFluidSolidifierRecipe(ItemList.Shape_Mold_Rotor.get(0L), aMaterial.getMolten(612L), GT_OreDictUnificator.get(OrePrefixes.rotor, aMaterial, 1L), 100, 60); diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_OreDictionary.java b/src/main/java/gregtech/loaders/preload/GT_Loader_OreDictionary.java index 70b431c7fb..fb5e7ebeaf 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_OreDictionary.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_OreDictionary.java @@ -3,6 +3,7 @@ package gregtech.loaders.preload; import gregtech.api.GregTech_API; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; +import gregtech.api.enums.MaterialsBotania; import gregtech.api.enums.OreDictNames; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_Log; @@ -243,5 +244,19 @@ public class GT_Loader_OreDictionary implements Runnable { GT_OreDictUnificator.registerOre(OrePrefixes.circuit, Materials.Cosmic, GT_ModHandler.getModItem(MOD_ID_DC, "item.CircuitUXV", 1L)); GT_OreDictUnificator.registerOre(OrePrefixes.circuit, Materials.Transcendent, GT_ModHandler.getModItem(MOD_ID_DC, "item.CircuitMAX", 1L)); + GT_OreDictUnificator.registerOre(OrePrefixes.block, MaterialsBotania.Manasteel, GT_ModHandler.getModItem("Botania", "storage", 1L)); + GT_OreDictUnificator.registerOre(OrePrefixes.block, MaterialsBotania.Terrasteel, GT_ModHandler.getModItem("Botania", "storage", 1L, 1)); + GT_OreDictUnificator.registerOre(OrePrefixes.ingot, MaterialsBotania.ElvenElementium, GT_ModHandler.getModItem("Botania", "manaResource", 1L, 7)); + GT_OreDictUnificator.registerOre(OrePrefixes.nugget, MaterialsBotania.ElvenElementium, GT_ModHandler.getModItem("Botania", "manaResource", 1L, 19)); + GT_OreDictUnificator.registerOre(OrePrefixes.block, MaterialsBotania.ElvenElementium, GT_ModHandler.getModItem("Botania", "storage", 1L, 2)); + GT_OreDictUnificator.registerOre(OrePrefixes.block, MaterialsBotania.Livingrock, GT_ModHandler.getModItem("Botania", "livingrock", 1L)); + GT_OreDictUnificator.registerOre(OrePrefixes.ingot, MaterialsBotania.GaiaSpirit, GT_ModHandler.getModItem("Botania", "manaResource", 1L, 14)); + GT_OreDictUnificator.registerOre(OrePrefixes.block, MaterialsBotania.Livingwood, GT_ModHandler.getModItem("Botania", "livingwood", 1L)); + GT_OreDictUnificator.registerOre(OrePrefixes.block, MaterialsBotania.Dreamwood, GT_ModHandler.getModItem("Botania", "dreamwood", 1L)); + GT_OreDictUnificator.registerOre(OrePrefixes.gem, MaterialsBotania.ManaDiamond, GT_ModHandler.getModItem("Botania", "manaResource", 1L, 2)); + GT_OreDictUnificator.registerOre(OrePrefixes.block, MaterialsBotania.ManaDiamond, GT_ModHandler.getModItem("Botania", "storage", 1L, 3)); + GT_OreDictUnificator.registerOre(OrePrefixes.gem, MaterialsBotania.BotaniaDragonstone, GT_ModHandler.getModItem("Botania", "manaResource", 1L, 9)); + GT_OreDictUnificator.registerOre(OrePrefixes.block, MaterialsBotania.BotaniaDragonstone, GT_ModHandler.getModItem("Botania", "storage", 1L, 4)); + } } |