diff options
Diffstat (limited to 'src/main/java/common')
4 files changed, 25 insertions, 38 deletions
diff --git a/src/main/java/common/recipeLoaders/Assembler.java b/src/main/java/common/recipeLoaders/Assembler.java index 01001038bd..f831ceca1c 100644 --- a/src/main/java/common/recipeLoaders/Assembler.java +++ b/src/main/java/common/recipeLoaders/Assembler.java @@ -14,11 +14,7 @@ import common.TileEntities; import common.items.ErrorItem; import common.items.MetaItem_CraftingComponent; -import gregtech.api.enums.GT_Values; -import gregtech.api.enums.ItemList; -import gregtech.api.enums.Materials; -import gregtech.api.enums.OrePrefixes; -import gregtech.api.enums.TierEU; +import gregtech.api.enums.*; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; @@ -189,8 +185,8 @@ public class Assembler implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.ZPM5.get(1), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TranscendentMetal, 4), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.TranscendentMetal, 24), + GT_OreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.TranscendentMetal, 4), + GT_OreDictUnificator.get(OrePrefixes.screw, MaterialsUEVplus.TranscendentMetal, 24), GT_Utility.getIntegratedCircuit(6)) .itemOutputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 9)).noFluidInputs().noFluidOutputs() .duration(10 * MINUTES + 40 * SECONDS).eut(TierEU.RECIPE_UEV).addTo(sAssemblerRecipes); @@ -199,8 +195,8 @@ public class Assembler implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.ZPM6.get(1), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.SpaceTime, 4), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.SpaceTime, 24), + GT_OreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.SpaceTime, 4), + GT_OreDictUnificator.get(OrePrefixes.screw, MaterialsUEVplus.SpaceTime, 24), GT_Utility.getIntegratedCircuit(6)) .itemOutputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 10)).noFluidInputs().noFluidOutputs() .duration(10 * MINUTES + 40 * SECONDS).eut(TierEU.RECIPE_UIV).addTo(sAssemblerRecipes); diff --git a/src/main/java/common/recipeLoaders/AssemblyLine.java b/src/main/java/common/recipeLoaders/AssemblyLine.java index 6c56d2ccb4..6e84e0c0d3 100644 --- a/src/main/java/common/recipeLoaders/AssemblyLine.java +++ b/src/main/java/common/recipeLoaders/AssemblyLine.java @@ -21,11 +21,7 @@ import net.minecraftforge.fluids.FluidStack; import common.Blocks; -import gregtech.api.enums.GT_Values; -import gregtech.api.enums.ItemList; -import gregtech.api.enums.Materials; -import gregtech.api.enums.OrePrefixes; -import gregtech.api.enums.TierEU; +import gregtech.api.enums.*; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; @@ -100,8 +96,8 @@ public class AssemblyLine implements Runnable { .itemInputs( ItemList.Quantum_Tank_IV.get(4), GT_ModHandler.getModItem(Avaritia.ID, "Neutronium_Compressor", 2), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.TranscendentMetal, 6), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.TranscendentMetal, 6), + GT_OreDictUnificator.get(OrePrefixes.plateDense, MaterialsUEVplus.TranscendentMetal, 6), + 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), @@ -120,11 +116,11 @@ public class AssemblyLine implements Runnable { .itemInputs( ItemList.Quantum_Tank_IV.get(16), GT_ModHandler.getModItem(Avaritia.ID, "Neutronium_Compressor", 4), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.SpaceTime, 6), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.SpaceTime, 6), - GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.SpaceTime, 3), + GT_OreDictUnificator.get(OrePrefixes.plateDense, MaterialsUEVplus.SpaceTime, 6), + GT_OreDictUnificator.get(OrePrefixes.plateDense, MaterialsUEVplus.SpaceTime, 6), + GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, MaterialsUEVplus.SpaceTime, 3), ItemList.EnergisedTesseract.get(6), - GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.SpaceTime, 6), + 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), diff --git a/src/main/java/common/recipeLoaders/ResearchableAssemblyLine.java b/src/main/java/common/recipeLoaders/ResearchableAssemblyLine.java index ce8c68fd15..8f50dec271 100644 --- a/src/main/java/common/recipeLoaders/ResearchableAssemblyLine.java +++ b/src/main/java/common/recipeLoaders/ResearchableAssemblyLine.java @@ -11,10 +11,7 @@ import net.minecraftforge.fluids.FluidStack; import com.github.technus.tectech.recipe.TT_recipeAdder; import common.Blocks; -import gregtech.api.enums.ItemList; -import gregtech.api.enums.Materials; -import gregtech.api.enums.OrePrefixes; -import gregtech.api.enums.TierEU; +import gregtech.api.enums.*; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; @@ -59,8 +56,8 @@ public class ResearchableAssemblyLine implements Runnable { 1_280, 32_000_000, 32, - new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TranscendentMetal, 4), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.TranscendentMetal, 24), + 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), new Object[] { OrePrefixes.circuit.get(Materials.Piko), 1 }, @@ -86,8 +83,8 @@ public class ResearchableAssemblyLine implements Runnable { 12_288, 128_000_000, 64, - new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.SpaceTime, 4), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.SpaceTime, 24), + 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), new Object[] { OrePrefixes.circuit.get(Materials.Quantum), 1 }, diff --git a/src/main/java/common/recipeLoaders/Unpackager.java b/src/main/java/common/recipeLoaders/Unpackager.java index ed39cd1e01..f1f6a71963 100644 --- a/src/main/java/common/recipeLoaders/Unpackager.java +++ b/src/main/java/common/recipeLoaders/Unpackager.java @@ -7,11 +7,7 @@ import net.minecraft.item.ItemStack; import common.Blocks; -import gregtech.api.enums.GT_Values; -import gregtech.api.enums.ItemList; -import gregtech.api.enums.Materials; -import gregtech.api.enums.OrePrefixes; -import gregtech.api.enums.TierEU; +import gregtech.api.enums.*; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; @@ -72,13 +68,14 @@ public class Unpackager implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Blocks.tfftStorageField, 1, 9), ItemList.Quantum_Tank_IV.get(4)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.TranscendentMetal, 12)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.plateDense, MaterialsUEVplus.TranscendentMetal, 12)) .noFluidInputs().noFluidOutputs().duration(5 * SECONDS).eut(TierEU.RECIPE_HV) .addTo(sUnboxinatorRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Blocks.tfftStorageField, 1, 10), ItemList.Quantum_Tank_IV.get(16)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.SpaceTime, 12)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateDense, MaterialsUEVplus.SpaceTime, 12)) .noFluidInputs().noFluidOutputs().duration(5 * SECONDS).eut(TierEU.RECIPE_HV) .addTo(sUnboxinatorRecipes); @@ -132,14 +129,15 @@ public class Unpackager implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 9), ItemList.ZPM5.get(1L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.screw, Materials.TranscendentMetal, 24)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.screw, MaterialsUEVplus.TranscendentMetal, 24)) .noFluidInputs().noFluidOutputs().duration(60 * SECONDS).eut(TierEU.RECIPE_LV) .addTo(sUnboxinatorRecipes); GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 10), ItemList.ZPM6.get(1L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.screw, Materials.SpaceTime, 24)).noFluidInputs() - .noFluidOutputs().duration(60 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sUnboxinatorRecipes); + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.screw, MaterialsUEVplus.SpaceTime, 24)) + .noFluidInputs().noFluidOutputs().duration(60 * SECONDS).eut(TierEU.RECIPE_LV) + .addTo(sUnboxinatorRecipes); } } |