diff options
Diffstat (limited to 'src/main/java/gregtech/loaders')
17 files changed, 6007 insertions, 115 deletions
diff --git a/src/main/java/gregtech/loaders/load/GT_Loader_MetaTileEntities_Recipes.java b/src/main/java/gregtech/loaders/load/GT_Loader_MetaTileEntities_Recipes.java index b77685cf18..fa9e015138 100644 --- a/src/main/java/gregtech/loaders/load/GT_Loader_MetaTileEntities_Recipes.java +++ b/src/main/java/gregtech/loaders/load/GT_Loader_MetaTileEntities_Recipes.java @@ -5539,7 +5539,7 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_UV, 'W', OrePrefixes.wireGt01.get(Materials.NaquadahAlloy), 'T', OreDictNames.craftingChest }); GT_ModHandler.addCraftingRecipe( - ItemList.Battery_Buffer_1by1_MAX.get(1L), + ItemList.Battery_Buffer_1by1_UHV.get(1L), bitsd, new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_MAX, 'W', OrePrefixes.wireGt01.get(Materials.SuperconductorUHV), 'T', OreDictNames.craftingChest }); @@ -5590,7 +5590,7 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_UV, 'W', OrePrefixes.wireGt04.get(Materials.NaquadahAlloy), 'T', OreDictNames.craftingChest }); GT_ModHandler.addCraftingRecipe( - ItemList.Battery_Buffer_2by2_MAX.get(1L), + ItemList.Battery_Buffer_2by2_UHV.get(1L), bitsd, new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_MAX, 'W', OrePrefixes.wireGt04.get(Materials.SuperconductorUHV), 'T', OreDictNames.craftingChest }); @@ -5641,7 +5641,7 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_UV, 'W', OrePrefixes.wireGt08.get(Materials.NaquadahAlloy), 'T', OreDictNames.craftingChest }); GT_ModHandler.addCraftingRecipe( - ItemList.Battery_Buffer_3by3_MAX.get(1L), + ItemList.Battery_Buffer_3by3_UHV.get(1L), bitsd, new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_MAX, 'W', OrePrefixes.wireGt08.get(Materials.SuperconductorUHV), 'T', OreDictNames.craftingChest }); @@ -5692,7 +5692,7 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_UV, 'W', OrePrefixes.wireGt16.get(Materials.NaquadahAlloy), 'T', OreDictNames.craftingChest }); GT_ModHandler.addCraftingRecipe( - ItemList.Battery_Buffer_4by4_MAX.get(1L), + ItemList.Battery_Buffer_4by4_UHV.get(1L), bitsd, new Object[] { aTextWireChest, aTextWireHull, 'M', ItemList.Hull_MAX, 'W', OrePrefixes.wireGt16.get(Materials.SuperconductorUHV), 'T', OreDictNames.craftingChest }); @@ -5752,7 +5752,7 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { OrePrefixes.wireGt16.get(Materials.NaquadahAlloy), 'T', OreDictNames.craftingChest, 'B', ItemList.ZPM2, 'C', OrePrefixes.circuit.get(Materials.UV) }); GT_ModHandler.addCraftingRecipe( - ItemList.Battery_Charger_4by4_MAX.get(1L), + ItemList.Battery_Charger_4by4_UHV.get(1L), bitsd, new Object[] { aTextWireChest, aTextWireHull, "BCB", 'M', ItemList.Hull_MAX, 'W', OrePrefixes.wireGt16.get(Materials.SuperconductorUHV), 'T', OreDictNames.craftingChest, 'B', @@ -5797,7 +5797,7 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { GT_ModHandler.addCraftingRecipe( ItemList.Locker_MAX.get(1L), bitsd, - new Object[] { "T", "M", 'M', ItemList.Battery_Buffer_2by2_MAX, 'T', OreDictNames.craftingChest }); + new Object[] { "T", "M", 'M', ItemList.Battery_Buffer_2by2_UHV, 'T', OreDictNames.craftingChest }); GT_ModHandler.addCraftingRecipe( ItemList.Machine_LV_Scanner.get(1L), @@ -6190,19 +6190,19 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { ItemList.Neutron_Reflector }); GT_ModHandler.addCraftingRecipe( - ItemList.Generator_Plasma_IV.get(1L), + ItemList.Generator_Plasma_EV.get(1L), bitsd, new Object[] { "UCU", "FMF", aTextWireCoil, 'M', ItemList.Hull_LuV, 'F', ItemList.Field_Generator_HV, 'C', OrePrefixes.circuit.get(Materials.IV), 'W', OrePrefixes.cableGt04.get(Materials.Tungsten), 'U', OrePrefixes.stick.get(Materials.Plutonium241) }); GT_ModHandler.addCraftingRecipe( - ItemList.Generator_Plasma_LuV.get(1L), + ItemList.Generator_Plasma_IV.get(1L), bitsd, new Object[] { "UCU", "FMF", aTextWireCoil, 'M', ItemList.Hull_ZPM, 'F', ItemList.Field_Generator_EV, 'C', OrePrefixes.circuit.get(Materials.LuV), 'W', OrePrefixes.wireGt04.get(Materials.VanadiumGallium), 'U', OrePrefixes.stick.get(Materials.Europium) }); GT_ModHandler.addCraftingRecipe( - ItemList.Generator_Plasma_ZPMV.get(1L), + ItemList.Generator_Plasma_LuV.get(1L), bitsd, new Object[] { "UCU", "FMF", aTextWireCoil, 'M', ItemList.Hull_UV, 'F', ItemList.Field_Generator_IV, 'C', OrePrefixes.circuit.get(Materials.ZPM), 'W', OrePrefixes.wireGt04.get(Materials.Naquadah), 'U', @@ -6736,7 +6736,7 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { new Object[] { "CMV", " X ", 'M', ItemList.Hull_UV, 'V', ItemList.Conveyor_Module_UV, 'C', OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.UV) }); GT_ModHandler.addCraftingRecipe( - ItemList.Automation_ChestBuffer_MAX.get(1L), + ItemList.Automation_ChestBuffer_UHV.get(1L), bits, new Object[] { "CMV", " X ", 'M', ItemList.Hull_MAX, 'V', ItemList.Conveyor_Module_UHV, 'C', OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.UHV) }); @@ -6972,7 +6972,7 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { GT_ModHandler.addCraftingRecipe( ItemList.Automation_SuperBuffer_MAX.get(1L), bits, - new Object[] { "DMV", 'M', ItemList.Automation_ChestBuffer_MAX, 'V', ItemList.Conveyor_Module_UHV, 'D', + new Object[] { "DMV", 'M', ItemList.Automation_ChestBuffer_UHV, 'V', ItemList.Conveyor_Module_UHV, 'D', ItemList.Tool_DataOrb }); GT_ModHandler.addCraftingRecipe( diff --git a/src/main/java/gregtech/loaders/misc/GT_Achievements.java b/src/main/java/gregtech/loaders/misc/GT_Achievements.java index 9ec6d442f3..7747711cd8 100644 --- a/src/main/java/gregtech/loaders/misc/GT_Achievements.java +++ b/src/main/java/gregtech/loaders/misc/GT_Achievements.java @@ -349,12 +349,12 @@ public class GT_Achievements { false); registerAchievement("conducting", 14, 6, ItemList.Casing_Coil_Superconductor.get(1), "upgrade3", false); registerAchievement("fusion", 15, 7, ItemList.FusionComputer_LuV.get(1), "tungstensteel", false); - registerAchievement("higherefficency", 15, 9, ItemList.Generator_Plasma_IV.get(1), "fusion", false); + registerAchievement("higherefficency", 15, 9, ItemList.Generator_Plasma_EV.get(1), "fusion", false); registerAchievement("advancing", 13, 7, ItemList.FusionComputer_ZPMV.get(1), "fusion", false); - registerAchievement("stargateliquid", 11, 9, ItemList.Generator_Plasma_LuV.get(1), "advancing", false); - registerAchievement("tothelimit", 13, 9, ItemList.Generator_Plasma_LuV.get(1), "advancing", false); - registerAchievement("fullefficiency", 12, 10, ItemList.Generator_Plasma_ZPMV.get(1), "tothelimit", false); + registerAchievement("stargateliquid", 11, 9, ItemList.Generator_Plasma_IV.get(1), "advancing", false); + registerAchievement("tothelimit", 13, 9, ItemList.Generator_Plasma_IV.get(1), "advancing", false); + registerAchievement("fullefficiency", 12, 10, ItemList.Generator_Plasma_LuV.get(1), "tothelimit", false); registerAchievement("upgrade5", 9, 9, ItemList.Casing_Coil_Naquadah.get(1), "stargateliquid", false); registerAchievement( "alienmetallurgy", diff --git a/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java index 216c659be7..04591f11e7 100644 --- a/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java @@ -1,6 +1,5 @@ package gregtech.loaders.postload; -import static gregtech.api.enums.Mods.BartWorks; import static gregtech.api.enums.Mods.Forestry; import static gregtech.api.enums.Mods.GraviSuite; import static gregtech.api.enums.Mods.IndustrialCraft2; @@ -15,6 +14,8 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; +import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; + import gregtech.GT_Mod; import gregtech.api.enums.Dyes; import gregtech.api.enums.GT_Values; @@ -2015,7 +2016,7 @@ public class GT_CraftingRecipeLoader implements Runnable { ItemList.Casing_Advanced_Rhodium_Palladium.get(1L), bits, new Object[] { "PhP", "PFP", aTextPlateWrench, 'P', - GT_ModHandler.getModItem(BartWorks.ID, "gt.bwMetaGeneratedplate", 1L, 88), 'F', + new ItemStack(WerkstoffLoader.items.get(OrePrefixes.plate), 1, 88), 'F', OrePrefixes.frameGt.get(Materials.Chrome) }); if (Forestry.isModLoaded()) { diff --git a/src/main/java/gregtech/loaders/postload/GT_RecyclerBlacklistLoader.java b/src/main/java/gregtech/loaders/postload/GT_RecyclerBlacklistLoader.java index 35b18769f0..70bb18527c 100644 --- a/src/main/java/gregtech/loaders/postload/GT_RecyclerBlacklistLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_RecyclerBlacklistLoader.java @@ -1,5 +1,6 @@ package gregtech.loaders.postload; +import static gregtech.api.enums.Mods.Chisel; import static gregtech.api.util.GT_ModHandler.addToRecyclerBlackList; import net.minecraft.init.Blocks; @@ -90,12 +91,12 @@ public class GT_RecyclerBlacklistLoader implements Runnable { addToRecyclerBlackList(GT_ModHandler.getRecipeOutput(new ItemStack(Blocks.glass, 1, 0))); addToRecyclerBlackList( GT_ModHandler.getRecipeOutput(new ItemStack(Blocks.glass, 1, 0), new ItemStack(Blocks.glass, 1, 0))); - if (Mods.Chisel.isModLoaded()) { + if (Chisel.isModLoaded()) { for (int i = 1; i <= 15; i++) { - addToRecyclerBlackList(GT_ModHandler.getModItem("chisel", "cobblestone", 1, i)); + addToRecyclerBlackList(GT_ModHandler.getModItem(Chisel.ID, "cobblestone", 1, i)); } for (int i = 0; i <= 15; i++) { - addToRecyclerBlackList(GT_ModHandler.getModItem("chisel", "stonebricksmooth", 1, i)); + addToRecyclerBlackList(GT_ModHandler.getModItem(Chisel.ID, "stonebricksmooth", 1, i)); } } if (Mods.AE2FluidCraft.isModLoaded()) { diff --git a/src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java b/src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java index 7143c8e7e1..266f7198e6 100644 --- a/src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java +++ b/src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java @@ -1,8 +1,6 @@ package gregtech.loaders.postload.chains; -import static gregtech.api.enums.Mods.BartWorks; -import static gregtech.api.enums.Mods.GTPlusPlus; -import static gregtech.api.enums.Mods.GoodGenerator; +import static goodgenerator.loader.Loaders.huiCircuit; import static gregtech.api.enums.Mods.NewHorizonsCoreMod; import static gregtech.api.recipe.RecipeMaps.nanoForgeRecipes; import static gregtech.api.util.GT_ModHandler.getModItem; @@ -13,12 +11,15 @@ import static gregtech.api.util.GT_RecipeConstants.AssemblyLine; import static gregtech.api.util.GT_RecipeConstants.NANO_FORGE_TIER; import static gregtech.api.util.GT_RecipeConstants.RESEARCH_ITEM; import static gregtech.api.util.GT_RecipeConstants.RESEARCH_TIME; +import static gtPlusPlus.core.block.ModBlocks.blockCompressedObsidian; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; +import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -26,6 +27,7 @@ import gregtech.api.enums.MaterialsUEVplus; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.TierEU; import gregtech.api.util.GT_OreDictUnificator; +import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; public class GT_NaniteChain { @@ -89,7 +91,7 @@ public class GT_NaniteChain { GT_Values.RA.stdBuilder() .itemInputs( aUVTierLens, - getModItem(BartWorks.ID, "bw.werkstoffblockscasingadvanced.01", 8, 31776), + new ItemStack(WerkstoffLoader.BWBlockCasingsAdvanced, 8, 31776), ItemList.Circuit_Chip_SoC.get(64)) .itemOutputs(Materials.Carbon.getNanite(64)) .fluidInputs(Materials.UUMatter.getFluid(200_000)) @@ -126,8 +128,8 @@ public class GT_NaniteChain { GT_Values.RA.stdBuilder() .itemInputs( aUEVTierLens, - getModItem(GTPlusPlus.ID, "blockCompressedObsidian", 8, 7), // Double compressed glowstone blocks (yes, - // it's not obsidian) + new ItemStack(blockCompressedObsidian, 8, 7), // Double compressed glowstone blocks (yes, + // it's not obsidian) ItemList.Circuit_Chip_SoC2.get(64)) .itemOutputs(Materials.Glowstone.getNanite(64)) .fluidInputs(Materials.UUMatter.getFluid(50_000)) @@ -165,12 +167,12 @@ public class GT_NaniteChain { GT_Values.RA.stdBuilder() .itemInputs( aUMVTierLens, - getModItem(BartWorks.ID, "gt.bwMetaGeneratedlens", 0, 36), // Magneto lens - getModItem(GTPlusPlus.ID, "MU-metaitem.01", 0, 32105), // Quantum Anomaly, couldn't find any better - // naming + new ItemStack(WerkstoffLoader.items.get(OrePrefixes.lens), 0, 36), // Magneto lens + GregtechItemList.Laser_Lens_Special.get(0), // Quantum Anomaly, couldn't find any better + // naming MaterialsUEVplus.WhiteDwarfMatter.getBlocks(8), getModItem(NewHorizonsCoreMod.ID, "item.PicoWafer", 32), - getModItem(GoodGenerator.ID, "huiCircuit", 1, 4) // Paradox circuit + new ItemStack(huiCircuit, 1, 4) // Paradox circuit ) .itemOutputs(MaterialsUEVplus.WhiteDwarfMatter.getNanite(4)) .fluidInputs( @@ -186,12 +188,12 @@ public class GT_NaniteChain { GT_Values.RA.stdBuilder() .itemInputs( aUMVTierLens, - getModItem(BartWorks.ID, "gt.bwMetaGeneratedlens", 0, 36), // Magneto lens - getModItem(GTPlusPlus.ID, "MU-metaitem.01", 0, 32105), // Quantum Anomaly, couldn't find any better - // naming + new ItemStack(WerkstoffLoader.items.get(OrePrefixes.lens), 0, 36), // Magneto lens + GregtechItemList.Laser_Lens_Special.get(0), // Quantum Anomaly, couldn't find any better + // naming MaterialsUEVplus.BlackDwarfMatter.getBlocks(8), getModItem(NewHorizonsCoreMod.ID, "item.PicoWafer", 32), - getModItem(GoodGenerator.ID, "huiCircuit", 1, 4) // Paradox circuit + new ItemStack(huiCircuit, 1, 4) // Paradox circuit ) .itemOutputs(MaterialsUEVplus.BlackDwarfMatter.getNanite(4)) .fluidInputs( @@ -208,11 +210,11 @@ public class GT_NaniteChain { .itemInputs( aUMVTierLens, // Quantum Anomaly, couldn't find any better naming. - getModItem(GTPlusPlus.ID, "MU-metaitem.01", 0, 32105), + GregtechItemList.Laser_Lens_Special.get(0), MaterialsUEVplus.Universium.getBlocks(8), ItemList.Optically_Perfected_CPU.get(16), ItemList.Optically_Compatible_Memory.get(16), - getModItem(GoodGenerator.ID, "huiCircuit", 1, 4) // Paradox circuit + new ItemStack(huiCircuit, 1, 4) // Paradox circuit ) .itemOutputs(MaterialsUEVplus.Universium.getNanite(2)) .fluidInputs( @@ -229,7 +231,7 @@ public class GT_NaniteChain { .itemInputs( GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Forcicium, 0, false), // Quantum Anomaly - getModItem(GTPlusPlus.ID, "MU-metaitem.01", 0, 32105), + GregtechItemList.Laser_Lens_Special.get(0), MaterialsUEVplus.TranscendentMetal.getNanite(1), MaterialsUEVplus.Eternity.getBlocks(8), getModItem(NewHorizonsCoreMod.ID, "item.PicoWafer", 32), diff --git a/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java b/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java index c9dafacf52..6be4ab534e 100644 --- a/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java +++ b/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java @@ -1,7 +1,5 @@ package gregtech.loaders.postload.chains; -import static gregtech.api.enums.Mods.BartWorks; -import static gregtech.api.enums.Mods.GTPlusPlus; import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; import static gregtech.api.recipe.metadata.PCBFactoryUpgrade.BIO; import static gregtech.api.util.GT_RecipeBuilder.MINUTES; @@ -9,6 +7,9 @@ import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import static gregtech.api.util.GT_RecipeConstants.AssemblyLine; import static gregtech.api.util.GT_RecipeConstants.RESEARCH_ITEM; import static gregtech.api.util.GT_RecipeConstants.RESEARCH_TIME; +import static gtPlusPlus.core.material.ELEMENT.STANDALONE.CELESTIAL_TUNGSTEN; +import static gtPlusPlus.core.material.ELEMENT.STANDALONE.CHRONOMATIC_GLASS; +import static gtPlusPlus.core.material.ELEMENT.STANDALONE.HYPOGEN; import java.util.ArrayList; import java.util.List; @@ -18,6 +19,8 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; +import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -27,7 +30,6 @@ import gregtech.api.enums.TierEU; import gregtech.api.recipe.RecipeMaps; import gregtech.api.recipe.metadata.PCBFactoryTierKey; import gregtech.api.recipe.metadata.PCBFactoryUpgradeKey; -import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_PCBFactoryManager; import gregtech.api.util.GT_Utility; @@ -77,7 +79,7 @@ public class GT_PCBFactoryRecipes { .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( - GT_ModHandler.getModItem(GTPlusPlus.ID, "blockFrameGtCelestialTungsten", 1), + CELESTIAL_TUNGSTEN.getFrameBox(1), Materials.get("Quantum") .getPlates(6)) .itemOutputs(ItemList.RadiationProofPhotolithographicFrameworkCasing.get(1)) @@ -86,7 +88,7 @@ public class GT_PCBFactoryRecipes { .addTo(assemblerRecipes); GT_Values.RA.stdBuilder() .itemInputs( - GT_ModHandler.getModItem(GTPlusPlus.ID, "blockFrameGtHypogen", 1), + HYPOGEN.getFrameBox(1), GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Infinity, 2), Materials.Thulium.getPlates(6)) .itemOutputs(ItemList.InfinityCooledCasing.get(1)) @@ -609,12 +611,13 @@ public class GT_PCBFactoryRecipes { GT_Utility.getIntegratedCircuit(1), GT_PCBFactoryManager.getPlasticMaterialFromTier(tier) .getPlates(1), - GT_ModHandler - .getModItem(BartWorks.ID, "gt.bwMetaGeneratedfoil", (long) (16 * (Math.sqrt(tier - 6))), 10106), + new ItemStack( + WerkstoffLoader.items.get(OrePrefixes.foil), + (int) (16 * (Math.sqrt(tier - 6))), + 10106), GT_OreDictUnificator .get(OrePrefixes.foil, Materials.InfinityCatalyst, (long) (16 * (Math.sqrt(tier - 6)))), - GT_ModHandler - .getModItem(GTPlusPlus.ID, "itemFoilChromaticGlass", (long) (16 * (Math.sqrt(tier - 6))))) + CHRONOMATIC_GLASS.getFoil((int) (16 * (Math.sqrt(tier - 6))))) .fluidInputs( Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 6)))), Materials.IronIIIChloride.getFluid((long) (12500 * (Math.sqrt(tier - 6)))), @@ -639,12 +642,13 @@ public class GT_PCBFactoryRecipes { GT_Utility.getNaniteAsCatalyst(Materials.Silver), GT_PCBFactoryManager.getPlasticMaterialFromTier(tier) .getPlates(1), - GT_ModHandler - .getModItem(BartWorks.ID, "gt.bwMetaGeneratedfoil", (long) (16 * (Math.sqrt(tier - 6))), 10106), + new ItemStack( + WerkstoffLoader.items.get(OrePrefixes.foil), + (int) (16 * (Math.sqrt(tier - 6))), + 10106), GT_OreDictUnificator .get(OrePrefixes.foil, Materials.InfinityCatalyst, (long) (16 * (Math.sqrt(tier - 6)))), - GT_ModHandler - .getModItem(GTPlusPlus.ID, "itemFoilChromaticGlass", (long) (16 * (Math.sqrt(tier - 6))))) + CHRONOMATIC_GLASS.getFoil((int) (16 * (Math.sqrt(tier - 6))))) .fluidInputs( Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 6)))), Materials.IronIIIChloride.getFluid((long) (12500 * (Math.sqrt(tier - 6)))), @@ -669,12 +673,13 @@ public class GT_PCBFactoryRecipes { GT_Utility.getNaniteAsCatalyst(Materials.Gold), GT_PCBFactoryManager.getPlasticMaterialFromTier(tier) .getPlates(1), - GT_ModHandler - .getModItem(BartWorks.ID, "gt.bwMetaGeneratedfoil", (long) (16 * (Math.sqrt(tier - 6))), 10106), + new ItemStack( + WerkstoffLoader.items.get(OrePrefixes.foil), + (int) (16 * (Math.sqrt(tier - 6))), + 10106), GT_OreDictUnificator .get(OrePrefixes.foil, Materials.InfinityCatalyst, (long) (16 * (Math.sqrt(tier - 6)))), - GT_ModHandler - .getModItem(GTPlusPlus.ID, "itemFoilChromaticGlass", (long) (16 * (Math.sqrt(tier - 6))))) + CHRONOMATIC_GLASS.getFoil((int) (16 * (Math.sqrt(tier - 6))))) .fluidInputs( Materials.SulfuricAcid.getFluid((long) (500 * (Math.sqrt(tier - 6)))), Materials.IronIIIChloride.getFluid((long) (12500 * (Math.sqrt(tier - 6)))), diff --git a/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java index fd26573eff..1881f19b9e 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java @@ -5,7 +5,6 @@ import static gregtech.api.enums.Mods.AvaritiaAddons; import static gregtech.api.enums.Mods.BuildCraftFactory; import static gregtech.api.enums.Mods.ExtraUtilities; import static gregtech.api.enums.Mods.Forestry; -import static gregtech.api.enums.Mods.GTPlusPlus; import static gregtech.api.enums.Mods.GalacticraftCore; import static gregtech.api.enums.Mods.GalacticraftMars; import static gregtech.api.enums.Mods.GalaxySpace; @@ -27,6 +26,7 @@ import static gregtech.api.util.GT_RecipeBuilder.QUARTER_INGOT; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import static gregtech.api.util.GT_RecipeBuilder.TICKS; import static gregtech.loaders.postload.GT_MachineRecipeLoader.solderingMats; +import static gtPlusPlus.core.material.ALLOY.INCONEL_690; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -3983,7 +3983,7 @@ public class AssemblerRecipes implements Runnable { { GT_Values.RA.stdBuilder() .itemInputs(ItemList.Hull_MAX.get(1), ItemList.Super_Tank_MV.get(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(ItemList.Hatch_Input_MAX.get(1)) + .itemOutputs(ItemList.Hatch_Input_UHV.get(1)) .fluidInputs(Materials.Polybenzimidazole.getMolten(16 * INGOTS)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_UHV) @@ -4278,7 +4278,7 @@ public class AssemblerRecipes implements Runnable { { GT_Values.RA.stdBuilder() .itemInputs(ItemList.Hull_MAX.get(1), ItemList.Super_Tank_MV.get(1), GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(ItemList.Hatch_Output_MAX.get(1)) + .itemOutputs(ItemList.Hatch_Output_UHV.get(1)) .fluidInputs(Materials.Polybenzimidazole.getMolten(16 * INGOTS)) .duration(24 * SECONDS) .eut(TierEU.RECIPE_UHV) @@ -6659,7 +6659,7 @@ public class AssemblerRecipes implements Runnable { .itemInputs( ItemList.Electric_Pump_EV.get(4), ItemList.Field_Generator_EV.get(4), - getModItem(GTPlusPlus.ID, "itemPlateInconel690", 4), + INCONEL_690.getPlate(4), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Titanium, 16), GT_OreDictUnificator.get(OrePrefixes.ring, Materials.BorosilicateGlass, 16), GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Aluminium, 2), diff --git a/src/main/java/gregtech/loaders/postload/recipes/AssemblyLineRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/AssemblyLineRecipes.java index bea7f75a4f..2b4e957d34 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/AssemblyLineRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/AssemblyLineRecipes.java @@ -1,6 +1,5 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.enums.Mods.GregTech; import static gregtech.api.enums.Mods.NewHorizonsCoreMod; import static gregtech.api.util.GT_RecipeBuilder.HOURS; import static gregtech.api.util.GT_RecipeBuilder.MINUTES; @@ -14,6 +13,8 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; +import com.github.technus.tectech.thing.CustomItemList; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -873,7 +874,7 @@ public class AssemblyLineRecipes implements Runnable { ItemList.Field_Generator_UV.get(16), ItemList.Gravistar.get(8), ItemList.Emitter_UV.get(4), - GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 16, 15497), + CustomItemList.hatch_CreativeMaintenance.get(16), ItemList.Energy_Cluster.get(8), ItemList.Cover_WirelessNeedsMaintainance.get(1)) .itemOutputs(ItemList.TierdDrone2.get(1)) diff --git a/src/main/java/gregtech/loaders/postload/recipes/BlastFurnaceRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/BlastFurnaceRecipes.java index 36bfb67de5..1a71f037fd 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/BlastFurnaceRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/BlastFurnaceRecipes.java @@ -1,9 +1,7 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.enums.Mods.BartWorks; import static gregtech.api.recipe.RecipeMaps.blastFurnaceRecipes; import static gregtech.api.recipe.RecipeMaps.primitiveBlastRecipes; -import static gregtech.api.util.GT_ModHandler.getModItem; import static gregtech.api.util.GT_RecipeBuilder.MINUTES; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import static gregtech.api.util.GT_RecipeBuilder.TICKS; @@ -14,6 +12,8 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; +import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; + import gregtech.GT_Mod; import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; @@ -642,7 +642,9 @@ public class BlastFurnaceRecipes implements Runnable { // Rh + 3Cl = RhCl3 GT_Values.RA.stdBuilder() - .itemInputs(getModItem(BartWorks.ID, "gt.bwMetaGenerateddust", 1L, 78), GT_Utility.getIntegratedCircuit(2)) + .itemInputs( + new ItemStack(WerkstoffLoader.items.get(OrePrefixes.dust), 1, 78), + GT_Utility.getIntegratedCircuit(2)) .itemOutputs(MaterialsKevlar.RhodiumChloride.getDust(4)) .fluidInputs(Materials.Chlorine.getGas(3000)) .duration(30 * SECONDS) diff --git a/src/main/java/gregtech/loaders/postload/recipes/CentrifugeRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/CentrifugeRecipes.java index b9375ebb1d..9d7927b074 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/CentrifugeRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/CentrifugeRecipes.java @@ -2,7 +2,6 @@ package gregtech.loaders.postload.recipes; import static gregtech.api.enums.Mods.AppliedEnergistics2; import static gregtech.api.enums.Mods.ExtraUtilities; -import static gregtech.api.enums.Mods.GregTech; import static gregtech.api.enums.Mods.Thaumcraft; import static gregtech.api.enums.Mods.ThaumicTinkerer; import static gregtech.api.enums.Mods.TwilightForest; @@ -11,6 +10,7 @@ import static gregtech.api.util.GT_ModHandler.getModItem; import static gregtech.api.util.GT_RecipeBuilder.MINUTES; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import static gregtech.api.util.GT_RecipeBuilder.TICKS; +import static gregtech.loaders.misc.GT_Bees.combs; import static net.minecraftforge.fluids.FluidRegistry.getFluidStack; import net.minecraft.init.Blocks; @@ -705,7 +705,7 @@ public class CentrifugeRecipes implements Runnable { // air GT_Values.RA.stdBuilder() - .itemInputs(getModItem(GregTech.ID, "gt.comb", 1L, 144), GT_Utility.getIntegratedCircuit(1)) + .itemInputs(new ItemStack(combs, 1, 144), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.InfusedAir, 1)) .duration(51 * SECONDS + 4 * TICKS) .eut(12) @@ -714,7 +714,7 @@ public class CentrifugeRecipes implements Runnable { // fire GT_Values.RA.stdBuilder() - .itemInputs(getModItem(GregTech.ID, "gt.comb", 1L, 146), GT_Utility.getIntegratedCircuit(1)) + .itemInputs(new ItemStack(combs, 1, 146), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.InfusedFire, 1)) .duration(51 * SECONDS + 4 * TICKS) .eut(12) @@ -723,7 +723,7 @@ public class CentrifugeRecipes implements Runnable { // aqua GT_Values.RA.stdBuilder() - .itemInputs(getModItem(GregTech.ID, "gt.comb", 1L, 147), GT_Utility.getIntegratedCircuit(1)) + .itemInputs(new ItemStack(combs, 1, 147), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.InfusedWater, 1)) .duration(51 * SECONDS + 4 * TICKS) .eut(12) @@ -732,7 +732,7 @@ public class CentrifugeRecipes implements Runnable { // terra GT_Values.RA.stdBuilder() - .itemInputs(getModItem(GregTech.ID, "gt.comb", 1L, 145), GT_Utility.getIntegratedCircuit(1)) + .itemInputs(new ItemStack(combs, 1, 145), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.InfusedEarth, 1)) .duration(51 * SECONDS + 4 * TICKS) .eut(12) @@ -741,7 +741,7 @@ public class CentrifugeRecipes implements Runnable { // ordo GT_Values.RA.stdBuilder() - .itemInputs(getModItem(GregTech.ID, "gt.comb", 1L, 148), GT_Utility.getIntegratedCircuit(1)) + .itemInputs(new ItemStack(combs, 1, 148), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.InfusedOrder, 1)) .duration(51 * SECONDS + 4 * TICKS) .eut(12) @@ -750,7 +750,7 @@ public class CentrifugeRecipes implements Runnable { // perditio GT_Values.RA.stdBuilder() - .itemInputs(getModItem(GregTech.ID, "gt.comb", 1L, 149), GT_Utility.getIntegratedCircuit(1)) + .itemInputs(new ItemStack(combs, 1, 149), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.InfusedEntropy, 1)) .duration(51 * SECONDS + 4 * TICKS) .eut(12) @@ -759,7 +759,7 @@ public class CentrifugeRecipes implements Runnable { // Nethershard GT_Values.RA.stdBuilder() - .itemInputs(getModItem(GregTech.ID, "gt.comb", 1L, 152), GT_Utility.getIntegratedCircuit(1)) + .itemInputs(new ItemStack(combs, 1, 152), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(getModItem(ThaumicTinkerer.ID, "kamiResource", 1L, 6)) .duration(6 * SECONDS + 8 * TICKS) .eut(512) @@ -768,7 +768,7 @@ public class CentrifugeRecipes implements Runnable { // Endshard GT_Values.RA.stdBuilder() - .itemInputs |