diff options
Diffstat (limited to 'src/main/java/gregtech/loaders/postload/recipes')
9 files changed, 55 insertions, 45 deletions
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(getModItem(GregTech.ID, "gt.comb", 1L, 153), GT_Utility.getIntegratedCircuit(1)) + .itemInputs(new ItemStack(combs, 1, 153), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(getModItem(ThaumicTinkerer.ID, "kamiResource", 1L, 7)) .duration(6 * SECONDS + 8 * TICKS) .eut(512) @@ -779,7 +779,7 @@ public class CentrifugeRecipes implements Runnable { // Caelestis red GT_Values.RA.stdBuilder() - .itemInputs(getModItem(GregTech.ID, "gt.comb", 1L, 154), GT_Utility.getIntegratedCircuit(1)) + .itemInputs(new ItemStack(combs, 1, 154), GT_Utility.getIntegratedCircuit(1)) .itemOutputs( getModItem(ExtraUtilities.ID, "greenscreen", 1L, 2), getModItem(ExtraUtilities.ID, "greenscreen", 1L, 10), @@ -794,7 +794,7 @@ public class CentrifugeRecipes implements Runnable { // Caelestis green GT_Values.RA.stdBuilder() - .itemInputs(getModItem(GregTech.ID, "gt.comb", 1L, 155), GT_Utility.getIntegratedCircuit(1)) + .itemInputs(new ItemStack(combs, 1, 155), GT_Utility.getIntegratedCircuit(1)) .itemOutputs( getModItem(ExtraUtilities.ID, "greenscreen", 1L, 13), getModItem(ExtraUtilities.ID, "greenscreen", 1L, 5), @@ -808,7 +808,7 @@ public class CentrifugeRecipes implements Runnable { // Caelestis blue GT_Values.RA.stdBuilder() - .itemInputs(getModItem(GregTech.ID, "gt.comb", 1L, 156), GT_Utility.getIntegratedCircuit(1)) + .itemInputs(new ItemStack(combs, 1, 156), GT_Utility.getIntegratedCircuit(1)) .itemOutputs( getModItem(ExtraUtilities.ID, "greenscreen", 1L, 3), getModItem(ExtraUtilities.ID, "greenscreen", 1L, 9), diff --git a/src/main/java/gregtech/loaders/postload/recipes/ChemicalRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ChemicalRecipes.java index 9a8ce44947..e4d316e101 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/ChemicalRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/ChemicalRecipes.java @@ -1,6 +1,5 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.enums.Mods.BartWorks; import static gregtech.api.enums.Mods.GTPlusPlus; import static gregtech.api.enums.Mods.GalaxySpace; import static gregtech.api.enums.Mods.NewHorizonsCoreMod; @@ -12,6 +11,8 @@ 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.api.util.GT_RecipeConstants.UniversalChemical; +import static gtPlusPlus.core.material.MISC_MATERIALS.CALCIUM_CHLORIDE; +import static gtPlusPlus.core.material.MISC_MATERIALS.SODIUM_NITRATE; import static net.minecraftforge.fluids.FluidRegistry.getFluidStack; import net.minecraft.init.Blocks; @@ -21,6 +22,9 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; +import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; + +import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -30,6 +34,7 @@ import gregtech.api.enums.TierEU; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; +import gtPlusPlus.core.item.ModItems; public class ChemicalRecipes implements Runnable { @@ -3706,7 +3711,7 @@ public class ChemicalRecipes implements Runnable { GT_Utility.getIntegratedCircuit(1)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 2), - getModItem(BartWorks.ID, "gt.bwMetaGenerateddust", 3L, 63)) + new ItemStack(WerkstoffLoader.items.get(OrePrefixes.dust), 3, 63)) .fluidInputs(Materials.HydrochloricAcid.getFluid(2000)) .fluidOutputs(Materials.Hydrogen.getGas(2000)) .duration(45 * SECONDS) @@ -3721,7 +3726,7 @@ public class ChemicalRecipes implements Runnable { GT_Utility.getIntegratedCircuit(1)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconSG, 1), - getModItem(BartWorks.ID, "gt.bwMetaGenerateddust", 6L, 10052)) + new ItemStack(WerkstoffLoader.items.get(OrePrefixes.dust), 6, 10052)) .fluidInputs(Materials.SiliconTetrachloride.getFluid(1000)) .duration(20 * SECONDS) .eut(30) @@ -3743,8 +3748,9 @@ public class ChemicalRecipes implements Runnable { // 4CH2O + C2H4O =NaOH= C5H12O4 + CO GT_Values.RA.stdBuilder() - .itemInputs( - getModItem(GTPlusPlus.ID, "Formaldehyde", 4), + .itemInputs( // very poor way of looking for it, but getModItem on GT++ within GT5U jar is prohibited now, + // and i don't feel like reworking GT++ cell registration for now + GameRegistry.findItemStack(GTPlusPlus.ID, "Formaldehyde", 4), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 1)) .itemOutputs( GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.Pentaerythritol, 21), @@ -3776,7 +3782,7 @@ public class ChemicalRecipes implements Runnable { .itemInputs( GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.CalciumCarbide, 3), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(getModItem(GTPlusPlus.ID, "itemDustCalciumHydroxide", 5)) + .itemOutputs(new ItemStack(ModItems.dustCalciumHydroxide, 5)) .fluidInputs(Materials.Water.getFluid(2000)) .fluidOutputs(MaterialsKevlar.Acetylene.getGas(1000)) .duration(15 * SECONDS) @@ -3789,9 +3795,7 @@ public class ChemicalRecipes implements Runnable { .itemInputs( MaterialsKevlar.CobaltIINitrate.getDust(9), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 6)) - .itemOutputs( - MaterialsKevlar.CobaltIIHydroxide.getDust(5), - getModItem(GTPlusPlus.ID, "itemDustSodiumNitrate", 10)) + .itemOutputs(MaterialsKevlar.CobaltIIHydroxide.getDust(5), SODIUM_NITRATE.getDust(10)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_MV) .addTo(UniversalChemical); @@ -5852,7 +5856,7 @@ public class ChemicalRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( GT_Utility.getIntegratedCircuit(1), - getModItem(GTPlusPlus.ID, "itemDustCalciumChloride", 1), + CALCIUM_CHLORIDE.getDust(1), GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.ParaPhenylenediamine, 9), GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.TerephthaloylChloride, 9)) .fluidInputs(MaterialsKevlar.NMethylIIPyrrolidone.getFluid(1000)) @@ -5866,7 +5870,7 @@ public class ChemicalRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( GT_Utility.getIntegratedCircuit(9), - getModItem(GTPlusPlus.ID, "itemDustCalciumChloride", 7), + CALCIUM_CHLORIDE.getDust(7), GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.ParaPhenylenediamine, 63), GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsKevlar.TerephthaloylChloride, 63)) .fluidInputs(MaterialsKevlar.NMethylIIPyrrolidone.getFluid(7000)) diff --git a/src/main/java/gregtech/loaders/postload/recipes/CompressorRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/CompressorRecipes.java index ef7441c13b..675143d43a 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/CompressorRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/CompressorRecipes.java @@ -1,11 +1,11 @@ package gregtech.loaders.postload.recipes; import static gregtech.api.enums.Mods.AppliedEnergistics2; -import static gregtech.api.enums.Mods.GTPlusPlus; import static gregtech.api.enums.Mods.Railcraft; import static gregtech.api.recipe.RecipeMaps.compressorRecipes; import static gregtech.api.util.GT_ModHandler.getModItem; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; +import static gtPlusPlus.xmod.bop.blocks.BOP_Block_Registrator.sapling_Rainforest; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -25,7 +25,7 @@ public class CompressorRecipes implements Runnable { @Override public void run() { GT_Values.RA.stdBuilder() - .itemInputs(getModItem(GTPlusPlus.ID, "blockRainforestOakSapling", 8, 0)) + .itemInputs(new ItemStack(sapling_Rainforest, 8)) .itemOutputs(ItemList.IC2_Plantball.get(1)) .duration(15 * SECONDS) .eut(2) diff --git a/src/main/java/gregtech/loaders/postload/recipes/FluidExtractorRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/FluidExtractorRecipes.java index e0ad96abe3..532c592b78 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/FluidExtractorRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/FluidExtractorRecipes.java @@ -1,7 +1,6 @@ package gregtech.loaders.postload.recipes; import static gregtech.api.enums.Mods.Forestry; -import static gregtech.api.enums.Mods.GregTech; import static gregtech.api.enums.Mods.IndustrialCraft2; import static gregtech.api.enums.Mods.NewHorizonsCoreMod; import static gregtech.api.enums.Mods.Railcraft; @@ -10,6 +9,7 @@ import static gregtech.api.recipe.RecipeMaps.fluidExtractionRecipes; import static gregtech.api.util.GT_ModHandler.getModItem; 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; @@ -541,7 +541,7 @@ public class FluidExtractorRecipes implements Runnable { // Beecombs fluid extractor recipes // xenon GT_Values.RA.stdBuilder() - .itemInputs(getModItem(GregTech.ID, "gt.comb", 1L, 134)) + .itemInputs(new ItemStack(combs, 1, 134)) .fluidOutputs(getFluidStack("xenon", 250)) .duration(2 * SECONDS + 10 * TICKS) .eut(TierEU.RECIPE_IV) @@ -549,7 +549,7 @@ public class FluidExtractorRecipes implements Runnable { // neon GT_Values.RA.stdBuilder() - .itemInputs(getModItem(GregTech.ID, "gt.comb", 1L, 135)) + .itemInputs(new ItemStack(combs, 1, 135)) .fluidOutputs(getFluidStack("neon", 250)) .duration(15 * TICKS) .eut(TierEU.RECIPE_IV) @@ -557,7 +557,7 @@ public class FluidExtractorRecipes implements Runnable { // krpton GT_Values.RA.stdBuilder() - .itemInputs(getModItem(GregTech.ID, "gt.comb", 1L, 136)) + .itemInputs(new ItemStack(combs, 1, 136)) .fluidOutputs(getFluidStack("krypton", 250)) .duration(1 * SECONDS + 5 * TICKS) .eut(TierEU.RECIPE_IV) diff --git a/src/main/java/gregtech/loaders/postload/recipes/ForgeHammerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ForgeHammerRecipes.java index 85b03f64c3..4ebb4b8da6 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/ForgeHammerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/ForgeHammerRecipes.java @@ -1,6 +1,5 @@ package gregtech.loaders.postload.recipes; -import static gregtech.api.enums.Mods.GTPlusPlus; import static gregtech.api.enums.Mods.HardcoreEnderExpansion; import static gregtech.api.recipe.RecipeMaps.hammerRecipes; import static gregtech.api.util.GT_ModHandler.getModItem; @@ -18,6 +17,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 ForgeHammerRecipes implements Runnable { @@ -137,7 +137,7 @@ public class ForgeHammerRecipes implements Runnable { .addTo(hammerRecipes); GT_Values.RA.stdBuilder() - .itemInputs(ItemList.Tesseract.get(1L), getModItem(GTPlusPlus.ID, "MU-metaitem.01", 1, 32105)) + .itemInputs(ItemList.Tesseract.get(1L), GregtechItemList.Laser_Lens_Special.get(1)) .fluidInputs(MaterialsUEVplus.SpaceTime.getMolten(2880L)) .fluidOutputs(MaterialsUEVplus.Space.getMolten(1440L), MaterialsUEVplus.Time.getMolten(1440L)) .duration(10 * SECONDS) diff --git a/src/main/java/gregtech/loaders/postload/recipes/PlasmaForgeRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/PlasmaForgeRecipes.java index fe0f7c7ed5..2763bb8d77 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/PlasmaForgeRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/PlasmaForgeRecipes.java @@ -1,18 +1,21 @@ package gregtech.loaders.postload.recipes; -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.plasmaForgeRecipes; import static gregtech.api.util.GT_ModHandler.getModItem; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import static gregtech.api.util.GT_RecipeConstants.COIL_HEAT; +import net.minecraft.item.ItemStack; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.MaterialsUEVplus; import gregtech.api.enums.TierEU; +import gtPlusPlus.core.item.ModItems; +import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; public class PlasmaForgeRecipes implements Runnable { @@ -36,11 +39,11 @@ public class PlasmaForgeRecipes implements Runnable { // Quantum anomaly recipe bypass for UEV+. Avoids RNG. GT_Values.RA.stdBuilder() .itemInputs( - getModItem(GTPlusPlus.ID, "particleBase", 1, 24), + new ItemStack(ModItems.itemStandarParticleBase, 1, 24), getModItem(NewHorizonsCoreMod.ID, "item.ChromaticLens", 0), - getModItem(GoodGenerator.ID, "huiCircuit", 0, 4)) + new ItemStack(huiCircuit, 0, 4)) .fluidInputs(MaterialsUEVplus.ExcitedDTRC.getFluid(92), Materials.Duranium.getMolten(144)) - .itemOutputs(getModItem(GTPlusPlus.ID, "MU-metaitem.01", 1, 32105)) + .itemOutputs(GregtechItemList.Laser_Lens_Special.get(1)) .fluidOutputs(MaterialsUEVplus.DimensionallyTranscendentResidue.getFluid(46)) .duration(60 * SECONDS) .eut((int) TierEU.RECIPE_UEV) |