diff options
Diffstat (limited to 'src/main/java/common')
| -rw-r--r-- | src/main/java/common/recipeLoaders/AssemblyLine.java | 14 | ||||
| -rw-r--r-- | src/main/java/common/recipeLoaders/ResearchableAssemblyLine.java | 9 |
2 files changed, 11 insertions, 12 deletions
diff --git a/src/main/java/common/recipeLoaders/AssemblyLine.java b/src/main/java/common/recipeLoaders/AssemblyLine.java index d48de45d58..bc19db42ab 100644 --- a/src/main/java/common/recipeLoaders/AssemblyLine.java +++ b/src/main/java/common/recipeLoaders/AssemblyLine.java @@ -1,10 +1,9 @@ package common.recipeLoaders; +import static goodgenerator.loader.Loaders.huiCircuit; import static gregtech.api.enums.Mods.Avaritia; import static gregtech.api.enums.Mods.EnderIO; import static gregtech.api.enums.Mods.EternalSingularity; -import static gregtech.api.enums.Mods.GTPlusPlus; -import static gregtech.api.enums.Mods.GoodGenerator; import static gregtech.api.enums.Mods.NewHorizonsCoreMod; import static gregtech.api.enums.Mods.UniversalSingularities; import static gregtech.api.util.GT_RecipeBuilder.HOURS; @@ -13,6 +12,7 @@ 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.HYPOGEN; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; @@ -95,7 +95,7 @@ public class AssemblyLine implements Runnable { GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.InfinityCatalyst, 6), ItemList.Field_Generator_ZPM.get(16), ItemList.Field_Generator_UV.get(4), - GT_ModHandler.getModItem(GoodGenerator.ID, "huiCircuit", 4, 2), + new ItemStack(huiCircuit, 4, 2), GT_ModHandler.getModItem(UniversalSingularities.ID, "universal.tinkersConstruct.singularity", 1, 4)) .fluidInputs(Materials.CrystallinePinkSlime.getMolten(4320), new FluidStack(radoxPoly, 2880)) .itemOutputs(new ItemStack(Blocks.tfftStorageField, 1, 8)) @@ -113,10 +113,10 @@ public class AssemblyLine implements Runnable { GT_OreDictUnificator.get(OrePrefixes.plateDense, MaterialsUEVplus.TranscendentMetal, 6), GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.Infinity, 3), ItemList.EnergisedTesseract.get(1), - GT_ModHandler.getModItem(GTPlusPlus.ID, "itemRotorHypogen", 6), + HYPOGEN.getRotor(6), ItemList.Field_Generator_UHV.get(16), ItemList.Field_Generator_UEV.get(4), - GT_ModHandler.getModItem(GoodGenerator.ID, "huiCircuit", 4, 3), + new ItemStack(huiCircuit, 4, 3), GT_ModHandler.getModItem(UniversalSingularities.ID, "universal.tinkersConstruct.singularity", 1, 4)) .fluidInputs(Materials.MelodicAlloy.getMolten(5760), new FluidStack(radoxPoly, 3456)) .itemOutputs(new ItemStack(Blocks.tfftStorageField, 1, 9)) @@ -138,8 +138,8 @@ public class AssemblyLine implements Runnable { GT_OreDictUnificator.get(OrePrefixes.rotor, MaterialsUEVplus.SpaceTime, 6), ItemList.Field_Generator_UEV.get(16), ItemList.Field_Generator_UIV.get(4), - GT_ModHandler.getModItem(GoodGenerator.ID, "huiCircuit", 4, 4), - GT_ModHandler.getModItem(GoodGenerator.ID, "huiCircuit", 4, 4), + new ItemStack(huiCircuit, 4, 4), + new ItemStack(huiCircuit, 4, 4), GT_ModHandler.getModItem(EnderIO.ID, "itemBasicCapacitor", 64, 6), GT_ModHandler.getModItem(EternalSingularity.ID, "eternal_singularity", 1)) .fluidInputs(Materials.StellarAlloy.getMolten(7200), new FluidStack(radoxPoly, 4608)) diff --git a/src/main/java/common/recipeLoaders/ResearchableAssemblyLine.java b/src/main/java/common/recipeLoaders/ResearchableAssemblyLine.java index 7e20cb4ee2..c71e0c07b9 100644 --- a/src/main/java/common/recipeLoaders/ResearchableAssemblyLine.java +++ b/src/main/java/common/recipeLoaders/ResearchableAssemblyLine.java @@ -1,7 +1,8 @@ package common.recipeLoaders; -import static gregtech.api.enums.Mods.GTPlusPlus; import static gregtech.api.enums.Mods.NewHorizonsCoreMod; +import static gtPlusPlus.core.material.ELEMENT.STANDALONE.DRAGON_METAL; +import static gtPlusPlus.core.material.ELEMENT.STANDALONE.HYPOGEN; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; @@ -61,8 +62,7 @@ public class ResearchableAssemblyLine implements Runnable { 32, new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.TranscendentMetal, 4), GT_OreDictUnificator.get(OrePrefixes.screw, MaterialsUEVplus.TranscendentMetal, 24), - GT_ModHandler.getModItem(GTPlusPlus.ID, "itemPlateDoubleHypogen", 32), - GT_ModHandler.getModItem(GTPlusPlus.ID, "itemPlateDoubleHypogen", 32), + HYPOGEN.getPlateDouble(32), HYPOGEN.getPlateDouble(32), new Object[] { OrePrefixes.circuit.get(Materials.UMV), 1 }, new Object[] { OrePrefixes.circuit.get(Materials.UMV), 1 }, new Object[] { OrePrefixes.circuit.get(Materials.UMV), 1 }, @@ -88,8 +88,7 @@ public class ResearchableAssemblyLine implements Runnable { 64, new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.SpaceTime, 4), GT_OreDictUnificator.get(OrePrefixes.screw, MaterialsUEVplus.SpaceTime, 24), - GT_ModHandler.getModItem(GTPlusPlus.ID, "itemPlateDoubleDragonblood", 32), - GT_ModHandler.getModItem(GTPlusPlus.ID, "itemPlateDoubleDragonblood", 32), + DRAGON_METAL.getPlateDouble(32), DRAGON_METAL.getPlateDouble(32), new Object[] { OrePrefixes.circuit.get(Materials.UXV), 1 }, new Object[] { OrePrefixes.circuit.get(Materials.UXV), 1 }, new Object[] { OrePrefixes.circuit.get(Materials.UXV), 1 }, |