diff options
Diffstat (limited to 'src/main/java/goodgenerator/loader')
4 files changed, 29 insertions, 29 deletions
diff --git a/src/main/java/goodgenerator/loader/ComponentAssemblyLineMiscRecipes.java b/src/main/java/goodgenerator/loader/ComponentAssemblyLineMiscRecipes.java index a3a607903d..8ba32f6205 100644 --- a/src/main/java/goodgenerator/loader/ComponentAssemblyLineMiscRecipes.java +++ b/src/main/java/goodgenerator/loader/ComponentAssemblyLineMiscRecipes.java @@ -19,10 +19,7 @@ import com.github.technus.tectech.recipe.TT_recipeAdder; import cpw.mods.fml.common.registry.GameRegistry; import goodgenerator.util.StackUtils; -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.*; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; import gtPlusPlus.core.recipe.common.CI; @@ -262,13 +259,13 @@ public class ComponentAssemblyLineMiscRecipes { 1 << (t - 3), 8000000, 1, - new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TranscendentMetal, 1), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.TranscendentMetal, 6), + new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.TranscendentMetal, 1), + GT_OreDictUnificator.get(OrePrefixes.plateDense, MaterialsUEVplus.TranscendentMetal, 6), ComponentType.Robot_Arm.getComponent(t).get(8), ComponentType.Electric_Piston.getComponent(t).get(10), ComponentType.Electric_Motor.getComponent(t).get(16), - GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.TranscendentMetal, 4), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.TranscendentMetal, 16), + GT_OreDictUnificator.get(OrePrefixes.gearGt, MaterialsUEVplus.TranscendentMetal, 4), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, MaterialsUEVplus.TranscendentMetal, 16), GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NetherStar, 8), getALCircuit(t, 8), getALCircuit(t - 1, 16) }, new FluidStack[] { new FluidStack(sold, 144 * t * 4), CI.getTieredFluid(t, 144 * t * 2), @@ -284,13 +281,13 @@ public class ComponentAssemblyLineMiscRecipes { 1 << (t - 3), 32000000, 1, - new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.SpaceTime, 1), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.SpaceTime, 6), + new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.SpaceTime, 1), + GT_OreDictUnificator.get(OrePrefixes.plateDense, MaterialsUEVplus.SpaceTime, 6), ComponentType.Robot_Arm.getComponent(t).get(8), ComponentType.Electric_Piston.getComponent(t).get(10), ComponentType.Electric_Motor.getComponent(t).get(16), - GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.SpaceTime, 4), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.SpaceTime, 16), + GT_OreDictUnificator.get(OrePrefixes.gearGt, MaterialsUEVplus.SpaceTime, 4), + GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, MaterialsUEVplus.SpaceTime, 16), GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Quantium, 8), getALCircuit(t, 8), getALCircuit(t - 1, 16) }, new FluidStack[] { new FluidStack(sold, 144 * t * 4), CI.getTieredFluid(t - 1, 144 * t * 2), diff --git a/src/main/java/goodgenerator/loader/FuelRecipeLoader.java b/src/main/java/goodgenerator/loader/FuelRecipeLoader.java index bd102bc310..648cb69455 100644 --- a/src/main/java/goodgenerator/loader/FuelRecipeLoader.java +++ b/src/main/java/goodgenerator/loader/FuelRecipeLoader.java @@ -13,6 +13,7 @@ import goodgenerator.items.MyMaterial; import goodgenerator.util.ItemRefer; import goodgenerator.util.MyRecipeAdder; import gregtech.api.enums.Materials; +import gregtech.api.enums.MaterialsUEVplus; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_OreDictUnificator; @@ -112,8 +113,8 @@ public class FuelRecipeLoader { MyRecipeAdder.instance.addNaquadahFuelRefineRecipe( new FluidStack[] { MyMaterial.naquadahBasedFuelMkIV.getFluidOrGas(2000), FluidRegistry.getFluidStack("heavyradox", 1000), }, - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SpaceTime, 8), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TranscendentMetal, 16), + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsUEVplus.SpaceTime, 8), + GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsUEVplus.TranscendentMetal, 16), MyMaterial.atomicSeparationCatalyst.get(OrePrefixes.dust, 48), }, MyMaterial.naquadahBasedFuelMkV.getFluidOrGas(750), 300000000, diff --git a/src/main/java/goodgenerator/loader/RecipeLoader.java b/src/main/java/goodgenerator/loader/RecipeLoader.java index 3998f53e45..cf4904f5c4 100644 --- a/src/main/java/goodgenerator/loader/RecipeLoader.java +++ b/src/main/java/goodgenerator/loader/RecipeLoader.java @@ -638,7 +638,7 @@ public class RecipeLoader { ItemList.Field_Generator_UEV.get(2), ItemList.Electric_Pump_UEV.get(8), GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUHV, 64), GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUHV, 64), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.TranscendentMetal, 8), + GT_OreDictUnificator.get(OrePrefixes.plateDense, MaterialsUEVplus.TranscendentMetal, 8), GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Infinity, 16), ItemList.Circuit_Wafer_PPIC.get(64), new Object[] { OrePrefixes.circuit.get(Materials.Optical), 1L }, }, diff --git a/src/main/java/goodgenerator/loader/RecipeLoader_02.java b/src/main/java/goodgenerator/loader/RecipeLoader_02.java index 52b3faaec5..f0d20aefd8 100644 --- a/src/main/java/goodgenerator/loader/RecipeLoader_02.java +++ b/src/main/java/goodgenerator/loader/RecipeLoader_02.java @@ -374,7 +374,8 @@ public class RecipeLoader_02 { GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, Materials.Infinity, 12), GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.DraconiumAwakened, 8) }, new FluidStack[] { Materials.Draconium.getMolten(36864), new FluidStack(solderIndalloy, 30240), - Materials.TranscendentMetal.getMolten(1440), Materials.InfinityCatalyst.getMolten(5670) }, + MaterialsUEVplus.TranscendentMetal.getMolten(1440), + Materials.InfinityCatalyst.getMolten(5670) }, ItemRefer.Fluid_Storage_Core_T9.get(1), 400, 134217000); @@ -388,12 +389,13 @@ public class RecipeLoader_02 { GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.Infinity, 32), GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, Materials.CosmicNeutronium, 12), GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, Materials.CosmicNeutronium, 12), - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.SpaceTime, 1), - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.SpaceTime, 1), - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.SpaceTime, 1), - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.SpaceTime, 1) }, + GT_OreDictUnificator.get(OrePrefixes.plateDouble, MaterialsUEVplus.SpaceTime, 1), + GT_OreDictUnificator.get(OrePrefixes.plateDouble, MaterialsUEVplus.SpaceTime, 1), + GT_OreDictUnificator.get(OrePrefixes.plateDouble, MaterialsUEVplus.SpaceTime, 1), + GT_OreDictUnificator.get(OrePrefixes.plateDouble, MaterialsUEVplus.SpaceTime, 1) }, new FluidStack[] { Materials.Draconium.getMolten(36864), new FluidStack(solderIndalloy, 46080), - Materials.TranscendentMetal.getMolten(4320), Materials.InfinityCatalyst.getMolten(17010) }, + MaterialsUEVplus.TranscendentMetal.getMolten(4320), + Materials.InfinityCatalyst.getMolten(17010) }, ItemRefer.Fluid_Storage_Core_T10.get(1), 400, 536800000); @@ -551,7 +553,7 @@ public class RecipeLoader_02 { GT_Values.RA.addAssemblylineRecipe( ItemRefer.YOTTank_Cell_T9.get(1), 240000, - new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.SpaceTime, 2), + new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.SpaceTime, 2), ItemRefer.Fluid_Storage_Core_T10.get(2), new Object[] { OrePrefixes.circuit.get(Materials.Quantum), 6L }, new Object[] { OrePrefixes.circuit.get(Materials.Quantum), 6L }, @@ -559,11 +561,11 @@ public class RecipeLoader_02 { GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.NetherStar, 64), GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.CosmicNeutronium, 12), GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.DraconiumAwakened, 12), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.SpaceTime, 5), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.SpaceTime, 5) }, + GT_OreDictUnificator.get(OrePrefixes.plate, MaterialsUEVplus.SpaceTime, 5), + GT_OreDictUnificator.get(OrePrefixes.plate, MaterialsUEVplus.SpaceTime, 5) }, new FluidStack[] { Materials.DraconiumAwakened.getMolten(14400), - Materials.TranscendentMetal.getMolten(1440), FluidRegistry.getFluidStack("supercoolant", 46080), - Materials.Lubricant.getFluid(46080) }, + MaterialsUEVplus.TranscendentMetal.getMolten(1440), + FluidRegistry.getFluidStack("supercoolant", 46080), Materials.Lubricant.getFluid(46080) }, ItemRefer.YOTTank_Cell_T10.get(1), 1000, 536800000); @@ -660,7 +662,7 @@ public class RecipeLoader_02 { GT_Values.RA.addUnboxingRecipe( ItemRefer.YOTTank_Cell_T10.get(1), ItemRefer.Fluid_Storage_Core_T10.get(2), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.SpaceTime, 1), + GT_OreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.SpaceTime, 1), 100, 480); @@ -1590,8 +1592,8 @@ public class RecipeLoader_02 { GT_Values.RA.addPlasmaForgeRecipe( new ItemStack[] { ItemRefer.HiC_T5.get(0) }, new FluidStack[] { MyMaterial.metastableOganesson.getMolten(1152), - MyMaterial.preciousMetalAlloy.getMolten(2304), Materials.SpaceTime.getMolten(288), - Materials.DimensionallyTranscendentResidue.getFluid(5000) }, + MyMaterial.preciousMetalAlloy.getMolten(2304), MaterialsUEVplus.SpaceTime.getMolten(288), + MaterialsUEVplus.DimensionallyTranscendentResidue.getFluid(5000) }, new ItemStack[] {}, new FluidStack[] { MyMaterial.shirabon.getMolten(144) }, 200, |