diff options
| author | Connor-Colenso <52056774+Connor-Colenso@users.noreply.github.com> | 2023-01-30 18:19:51 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-30 19:19:51 +0100 |
| commit | df5f9d448647d5ccf9eb774a244319e54021ede0 (patch) | |
| tree | 925b8bff5a47abd4387c33463f966b0116501d59 /src/main/java/gregtech/loaders/postload/recipes | |
| parent | e633f7af1f0a3996f6c69aaa8c5d9c4a15232fbe (diff) | |
| download | GT5-Unofficial-df5f9d448647d5ccf9eb774a244319e54021ede0.tar.gz GT5-Unofficial-df5f9d448647d5ccf9eb774a244319e54021ede0.tar.bz2 GT5-Unofficial-df5f9d448647d5ccf9eb774a244319e54021ede0.zip | |
General Fixes (#1702)
* Fix missing machine recipes due to load order.
* Fix missing compressor recipe
* Add new compressor recipe adder method
* Line
* Narrow crafting restrictions on pipes
* Crafting working, assembler not
* Nonuple working
* Spotless
* Both assembler recipes exist
* Pipe recipes finally working as they should.
* Spotless
* Working still
* T-2 materials
* Tier -> TierEU and a few corrections on recipes using full amps.
* Fix comment
* spotlessApply (#1703)
Co-authored-by: GitHub GTNH Actions <>
* Spotless
* Remove comment
* T-2
---------
Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Diffstat (limited to 'src/main/java/gregtech/loaders/postload/recipes')
13 files changed, 340 insertions, 345 deletions
diff --git a/src/main/java/gregtech/loaders/postload/recipes/ArcFurnaceRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ArcFurnaceRecipes.java index beb371fa37..a6a61c9470 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/ArcFurnaceRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/ArcFurnaceRecipes.java @@ -25,7 +25,7 @@ public class ArcFurnaceRecipes implements Runnable { new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 19L)}, null, 180, - (int) Tier.RECIPE_MV); + (int) TierEU.RECIPE_MV); GT_Values.RA.addArcFurnaceRecipe( ItemList.Long_Distance_Pipeline_Item.get(1L), @@ -35,14 +35,14 @@ public class ArcFurnaceRecipes implements Runnable { }, null, 180, - (int) Tier.RECIPE_MV); + (int) TierEU.RECIPE_MV); GT_Values.RA.addArcFurnaceRecipe( ItemList.Long_Distance_Pipeline_Fluid_Pipe.get(1L), new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.nugget, Materials.Steel, 2L)}, null, 10, - (int) Tier.RECIPE_MV); + (int) TierEU.RECIPE_MV); GT_Values.RA.addArcFurnaceRecipe( ItemList.Long_Distance_Pipeline_Item_Pipe.get(1L), @@ -52,7 +52,7 @@ public class ArcFurnaceRecipes implements Runnable { }, null, 10, - (int) Tier.RECIPE_MV); + (int) TierEU.RECIPE_MV); GT_Values.RA.addArcFurnaceRecipe( ItemList.Casing_Coil_Cupronickel.get(1L), @@ -195,7 +195,7 @@ public class ArcFurnaceRecipes implements Runnable { new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 2L)}, null, 180, - (int) Tier.RECIPE_MV); + (int) TierEU.RECIPE_MV); GT_Values.RA.addArcFurnaceRecipe( getModItem(MOD_ID_RC, "machine.beta", 1L, 14), new ItemStack[] { @@ -204,7 +204,7 @@ public class ArcFurnaceRecipes implements Runnable { }, null, 180, - (int) Tier.RECIPE_MV); + (int) TierEU.RECIPE_MV); GT_Values.RA.addArcFurnaceRecipe( getModItem(MOD_ID_RC, "machine.beta", 1L, 15), new ItemStack[] { @@ -213,7 +213,7 @@ public class ArcFurnaceRecipes implements Runnable { }, null, 180, - (int) Tier.RECIPE_MV); + (int) TierEU.RECIPE_MV); GT_Values.RA.addArcFurnaceRecipe( getModItem(MOD_ID_RC, "machine.zeta", 1L, 0), @@ -418,6 +418,6 @@ public class ArcFurnaceRecipes implements Runnable { new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 3)}, null, 1200, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java index 0a76faf817..33d0544713 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java @@ -80,7 +80,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, ItemList.Component_Filter.get(1L), 1600, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Steel, 64), @@ -101,7 +101,7 @@ public class AssemblerRecipes implements Runnable { Materials.AdvancedGlue.getFluid(500L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Graphene, 64), 3200, - (int) Tier.RECIPE_EV); + (int) TierEU.RECIPE_EV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Graphite, 64), @@ -122,7 +122,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, ItemList.FluidRegulator_LV.get(1L), 400, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { ItemList.Electric_Pump_MV.get(1L), @@ -132,7 +132,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, ItemList.FluidRegulator_MV.get(1L), 350, - (int) Tier.MV); + (int) TierEU.RECIPE_MV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { ItemList.Electric_Pump_HV.get(1L), @@ -142,7 +142,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, ItemList.FluidRegulator_HV.get(1L), 300, - (int) Tier.RECIPE_HV); + (int) TierEU.RECIPE_HV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { ItemList.Electric_Pump_EV.get(1L), @@ -152,7 +152,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, ItemList.FluidRegulator_EV.get(1L), 250, - (int) Tier.RECIPE_EV); + (int) TierEU.RECIPE_EV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { ItemList.Electric_Pump_IV.get(1L), @@ -162,7 +162,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, ItemList.FluidRegulator_IV.get(1L), 200, - (int) Tier.IV); + (int) TierEU.RECIPE_IV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { ItemList.Electric_Pump_LuV.get(1L), @@ -172,7 +172,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, ItemList.FluidRegulator_LuV.get(1L), 150, - (int) Tier.RECIPE_LuV); + (int) TierEU.RECIPE_LuV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { ItemList.Electric_Pump_ZPM.get(1L), @@ -182,7 +182,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, ItemList.FluidRegulator_ZPM.get(1L), 100, - (int) Tier.RECIPE_ZPM); + (int) TierEU.RECIPE_ZPM); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { ItemList.Electric_Pump_UV.get(1L), @@ -204,7 +204,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, ItemList.Steam_Valve_LV.get(1L), 400, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { ItemList.Electric_Pump_MV.get(1L), @@ -215,7 +215,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, ItemList.Steam_Valve_MV.get(1L), 350, - (int) Tier.MV); + (int) TierEU.RECIPE_MV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { ItemList.Electric_Pump_HV.get(1L), @@ -226,7 +226,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, ItemList.Steam_Valve_HV.get(1L), 300, - (int) Tier.RECIPE_HV); + (int) TierEU.RECIPE_HV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { ItemList.Electric_Pump_EV.get(1L), @@ -237,7 +237,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, ItemList.Steam_Valve_EV.get(1L), 250, - (int) Tier.RECIPE_EV); + (int) TierEU.RECIPE_EV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { ItemList.Electric_Pump_IV.get(1L), @@ -248,7 +248,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, ItemList.Steam_Valve_IV.get(1L), 200, - (int) Tier.IV); + (int) TierEU.RECIPE_IV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { @@ -269,7 +269,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, ItemList.Schematic.get(1L), 300, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 2L), @@ -293,7 +293,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, ItemList.Hatch_Energy_HV.get(1L), 200, - (int) Tier.RECIPE_HV); + (int) TierEU.RECIPE_HV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { ItemList.Hull_EV.get(1L), @@ -306,7 +306,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, ItemList.Hatch_Energy_EV.get(1L), 200, - (int) Tier.RECIPE_EV); + (int) TierEU.RECIPE_EV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { ItemList.Hull_IV.get(1L), @@ -319,7 +319,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, ItemList.Hatch_Energy_IV.get(1L), 200, - (int) Tier.IV); + (int) TierEU.RECIPE_IV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { ItemList.Hull_HV.get(1L), @@ -332,7 +332,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, ItemList.Hatch_Energy_HV.get(1L), 200, - (int) Tier.RECIPE_HV); + (int) TierEU.RECIPE_HV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { ItemList.Hull_EV.get(1L), @@ -345,7 +345,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, ItemList.Hatch_Energy_EV.get(1L), 200, - (int) Tier.RECIPE_EV); + (int) TierEU.RECIPE_EV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { ItemList.Hull_IV.get(1L), @@ -358,7 +358,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, ItemList.Hatch_Energy_IV.get(1L), 200, - (int) Tier.IV); + (int) TierEU.RECIPE_IV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { @@ -372,7 +372,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, ItemList.Hatch_Dynamo_HV.get(1L), 200, - (int) Tier.RECIPE_HV); + (int) TierEU.RECIPE_HV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { ItemList.Hull_EV.get(1L), @@ -385,7 +385,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, ItemList.Hatch_Dynamo_EV.get(1L), 200, - (int) Tier.RECIPE_EV); + (int) TierEU.RECIPE_EV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { ItemList.Hull_IV.get(1L), @@ -398,7 +398,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, ItemList.Hatch_Dynamo_IV.get(1L), 200, - (int) Tier.IV); + (int) TierEU.RECIPE_IV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { ItemList.Hull_HV.get(1L), @@ -411,7 +411,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, ItemList.Hatch_Dynamo_HV.get(1L), 200, - (int) Tier.RECIPE_HV); + (int) TierEU.RECIPE_HV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { ItemList.Hull_EV.get(1L), @@ -424,7 +424,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, ItemList.Hatch_Dynamo_EV.get(1L), 200, - (int) Tier.RECIPE_EV); + (int) TierEU.RECIPE_EV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { ItemList.Hull_IV.get(1L), @@ -437,7 +437,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, ItemList.Hatch_Dynamo_IV.get(1L), 200, - (int) Tier.IV); + (int) TierEU.RECIPE_IV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { @@ -553,67 +553,67 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, ItemList.Casing_Gearbox_TungstenSteel.get(1L), 200, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); - { // limiting life time of the variables + { // limiting lifetime of the variables ItemStack flask = ItemList.VOLUMETRIC_FLASK.get(1); NBTTagCompound nbtFlask = new NBTTagCompound(); nbtFlask.setInteger("Capacity", 144); flask.setTagCompound(nbtFlask); GT_Values.RA.addAssemblerRecipe( ItemList.VOLUMETRIC_FLASK.get(1), GT_Utility.getIntegratedCircuit(1), flask, 10, (int) - Tier.RECIPE_LV); + TierEU.RECIPE_LV); nbtFlask.setInteger("Capacity", 288); flask.setTagCompound(nbtFlask); GT_Values.RA.addAssemblerRecipe( ItemList.VOLUMETRIC_FLASK.get(1), GT_Utility.getIntegratedCircuit(2), flask, 10, (int) - Tier.RECIPE_LV); + TierEU.RECIPE_LV); nbtFlask.setInteger("Capacity", 576); flask.setTagCompound(nbtFlask); GT_Values.RA.addAssemblerRecipe( ItemList.VOLUMETRIC_FLASK.get(1), GT_Utility.getIntegratedCircuit(3), flask, 10, (int) - Tier.RECIPE_LV); + TierEU.RECIPE_LV); nbtFlask.setInteger("Capacity", 720); flask.setTagCompound(nbtFlask); GT_Values.RA.addAssemblerRecipe( ItemList.VOLUMETRIC_FLASK.get(1), GT_Utility.getIntegratedCircuit(4), flask, 10, (int) - Tier.RECIPE_LV); + TierEU.RECIPE_LV); nbtFlask.setInteger("Capacity", 864); flask.setTagCompound(nbtFlask); GT_Values.RA.addAssemblerRecipe( ItemList.VOLUMETRIC_FLASK.get(1), GT_Utility.getIntegratedCircuit(5), flask, 10, (int) - Tier.RECIPE_LV); + TierEU.RECIPE_LV); nbtFlask.setInteger("Capacity", 72); flask.setTagCompound(nbtFlask); GT_Values.RA.addAssemblerRecipe( ItemList.VOLUMETRIC_FLASK.get(1), GT_Utility.getIntegratedCircuit(6), flask, 10, (int) - Tier.RECIPE_LV); + TierEU.RECIPE_LV); nbtFlask.setInteger("Capacity", 648); flask.setTagCompound(nbtFlask); GT_Values.RA.addAssemblerRecipe( ItemList.VOLUMETRIC_FLASK.get(1), GT_Utility.getIntegratedCircuit(7), flask, 10, (int) - Tier.RECIPE_LV); + TierEU.RECIPE_LV); nbtFlask.setInteger("Capacity", 936); flask.setTagCompound(nbtFlask); GT_Values.RA.addAssemblerRecipe( ItemList.VOLUMETRIC_FLASK.get(1), GT_Utility.getIntegratedCircuit(8), flask, 10, (int) - Tier.RECIPE_LV); + TierEU.RECIPE_LV); nbtFlask.setInteger("Capacity", 250); flask.setTagCompound(nbtFlask); GT_Values.RA.addAssemblerRecipe( ItemList.VOLUMETRIC_FLASK.get(1), GT_Utility.getIntegratedCircuit(10), flask, 10, (int) - Tier.RECIPE_LV); + TierEU.RECIPE_LV); nbtFlask.setInteger("Capacity", 500); flask.setTagCompound(nbtFlask); GT_Values.RA.addAssemblerRecipe( ItemList.VOLUMETRIC_FLASK.get(1), GT_Utility.getIntegratedCircuit(11), flask, 10, (int) - Tier.RECIPE_LV); - // make the 1000L recipe actualy in + TierEU.RECIPE_LV); + // make the 1000L recipe actually in ItemStack flask500 = flask.copy(); nbtFlask.setInteger("Capacity", 1000); flask.setTagCompound(nbtFlask); GT_Values.RA.addAssemblerRecipe( - flask500, GT_Utility.getIntegratedCircuit(24), flask, 10, (int) Tier.RECIPE_LV); + flask500, GT_Utility.getIntegratedCircuit(24), flask, 10, (int) TierEU.RECIPE_LV); } GT_Values.RA.addAssemblerRecipe( @@ -627,7 +627,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, ItemList.Hatch_Muffler_LV.get(1L), 200, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { ItemList.Hull_MV.get(1L), @@ -639,7 +639,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, ItemList.Hatch_Muffler_MV.get(1L), 200, - (int) Tier.MV); + (int) TierEU.RECIPE_MV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { ItemList.Hull_HV.get(1L), @@ -651,7 +651,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, ItemList.Hatch_Muffler_HV.get(1L), 200, - (int) Tier.RECIPE_HV); + (int) TierEU.RECIPE_HV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { ItemList.Hull_EV.get(1L), @@ -663,7 +663,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, ItemList.Hatch_Muffler_EV.get(1L), 200, - (int) Tier.RECIPE_EV); + (int) TierEU.RECIPE_EV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { ItemList.Hull_IV.get(1L), @@ -675,7 +675,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, ItemList.Hatch_Muffler_IV.get(1L), 200, - (int) Tier.IV); + (int) TierEU.RECIPE_IV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { ItemList.Hull_LuV.get(1L), @@ -687,7 +687,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, ItemList.Hatch_Muffler_LuV.get(1L), 200, - (int) Tier.RECIPE_LuV); + (int) TierEU.RECIPE_LuV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { ItemList.Hull_ZPM.get(1L), @@ -699,7 +699,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, ItemList.Hatch_Muffler_ZPM.get(1L), 200, - (int) Tier.RECIPE_ZPM); + (int) TierEU.RECIPE_ZPM); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { ItemList.Hull_UV.get(1L), @@ -808,21 +808,21 @@ public class AssemblerRecipes implements Runnable { Materials.Redstone.getMolten(144L), getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 23), 64, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 17), getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 20), Materials.Redstone.getMolten(144L), getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 24), 64, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 18), getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 20), Materials.Redstone.getMolten(144L), getModItem(GT_MachineRecipeLoader.aTextAE, GT_MachineRecipeLoader.aTextAEMM, 1L, 22), 64, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.CertusQuartz, 1L), new ItemStack(Blocks.sand, 1, 32767), @@ -930,7 +930,7 @@ public class AssemblerRecipes implements Runnable { Materials.Glue.getFluid(300L), ItemList.Duct_Tape.get(1L), 100, - (int) Tier.MV); + (int) TierEU.RECIPE_MV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StyreneButadieneRubber, 2L), @@ -940,7 +940,7 @@ public class AssemblerRecipes implements Runnable { Materials.Glue.getFluid(200L), ItemList.Duct_Tape.get(1L), 100, - (int) Tier.RECIPE_HV); + (int) TierEU.RECIPE_HV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Silicone, 1L), @@ -950,7 +950,7 @@ public class AssemblerRecipes implements Runnable { Materials.Glue.getFluid(100L), ItemList.Duct_Tape.get(1L), 100, - (int) Tier.RECIPE_EV); + (int) TierEU.RECIPE_EV); // Maintenance Hatch Recipes Using BrainTech + Refined Glue. Info: One BrainTech Recipe Is In GT+ΓΌ Originally. // The Maintenance Hatch Recipe using SuperGlue is there. GT_Values.RA.addAssemblerRecipe( @@ -959,7 +959,7 @@ public class AssemblerRecipes implements Runnable { Materials.Glue.getFluid(1000L), ItemList.Hatch_Maintenance.get(1L), 100, - (int) Tier.MV); + (int) TierEU.RECIPE_MV); GT_Values.RA.addAssemblerRecipe( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Paper, 3L), new ItemStack(Items.leather, 1, 32767), @@ -1118,7 +1118,7 @@ public class AssemblerRecipes implements Runnable { Materials.Helium.getGas(2000L), GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorMV, 3L), 400, - (int) Tier.MV); + (int) TierEU.RECIPE_MV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Titaniumonabariumdecacoppereikosaoxid, 6L), @@ -1129,7 +1129,7 @@ public class AssemblerRecipes implements Runnable { Materials.Helium.getGas(4000L), GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorHV, 6L), 400, - (int) Tier.RECIPE_HV); + (int) TierEU.RECIPE_HV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Uraniumtriplatinid, 9L), @@ -1140,7 +1140,7 @@ public class AssemblerRecipes implements Runnable { Materials.Helium.getGas(6000L), GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorEV, 9L), 400, - (int) Tier.RECIPE_EV); + (int) TierEU.RECIPE_EV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Vanadiumtriindinid, 12L), @@ -1151,7 +1151,7 @@ public class AssemblerRecipes implements Runnable { Materials.Helium.getGas(8000L), GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorIV, 12L), 800, - (int) Tier.IV); + (int) TierEU.RECIPE_IV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get( @@ -1165,7 +1165,7 @@ public class AssemblerRecipes implements Runnable { Materials.Helium.getGas(12000L), GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorLuV, 15L), 800, - (int) Tier.RECIPE_LuV); + (int) TierEU.RECIPE_LuV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get( @@ -1177,7 +1177,7 @@ public class AssemblerRecipes implements Runnable { Materials.Helium.getGas(16000L), GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorZPM, 18L), 1600, - (int) Tier.RECIPE_ZPM); + (int) TierEU.RECIPE_ZPM); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Longasssuperconductornameforuvwire, 21L), @@ -1188,7 +1188,7 @@ public class AssemblerRecipes implements Runnable { Materials.Helium.getGas(20000L), GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUV, 21L), 1600, - (int) Tier.RECIPE_UV); + (int) TierEU.RECIPE_UV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Longasssuperconductornameforuhvwire, 24L), @@ -1199,7 +1199,7 @@ public class AssemblerRecipes implements Runnable { Materials.Helium.getGas(24000L), GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUHV, 24L), 3200, - (int) Tier.RECIPE_UHV); + (int) TierEU.RECIPE_UHV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { @@ -1220,7 +1220,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, ItemList.LV_Coil.get(1L), 200, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, Materials.SteelMagnetic, 1L), @@ -1230,7 +1230,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, ItemList.MV_Coil.get(1L), 200, - (int) Tier.MV); + (int) TierEU.RECIPE_MV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, Materials.SteelMagnetic, 1L), @@ -1240,7 +1240,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, ItemList.HV_Coil.get(1L), 200, - (int) Tier.RECIPE_HV); + (int) TierEU.RECIPE_HV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, Materials.NeodymiumMagnetic, 1L), @@ -1250,7 +1250,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, ItemList.EV_Coil.get(1L), 200, - (int) Tier.RECIPE_EV); + (int) TierEU.RECIPE_EV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, Materials.NeodymiumMagnetic, 1L), @@ -1260,7 +1260,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, ItemList.IV_Coil.get(1L), 200, - (int) Tier.IV); + (int) TierEU.RECIPE_IV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, Materials.SamariumMagnetic, 1L), @@ -1270,7 +1270,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, ItemList.LuV_Coil.get(1L), 200, - (int) Tier.RECIPE_LuV); + (int) TierEU.RECIPE_LuV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, Materials.SamariumMagnetic, 1L), @@ -1280,7 +1280,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, ItemList.ZPM_Coil.get(1L), 200, - (int) Tier.RECIPE_ZPM); + (int) TierEU.RECIPE_ZPM); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, Materials.SamariumMagnetic, 1L), @@ -1309,7 +1309,7 @@ public class AssemblerRecipes implements Runnable { Materials.Glue.getFluid(10), GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Wood, 2L), 200, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Wood, 3L), GT_Utility.getIntegratedCircuit(4) @@ -1317,7 +1317,7 @@ public class AssemblerRecipes implements Runnable { Materials.Glue.getFluid(20), GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Wood, 4L), 200, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Wood, 1L), GT_Utility.getIntegratedCircuit(12) @@ -1325,7 +1325,7 @@ public class AssemblerRecipes implements Runnable { Materials.Glue.getFluid(60), GT_OreDictUnificator.get(OrePrefixes.pipeSmall, Materials.Wood, 6L), 200, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { @@ -1337,7 +1337,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, ItemList.Ingot_IridiumAlloy.get(1L), 1200, - (int) Tier.IV); + (int) TierEU.RECIPE_IV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { @@ -1350,7 +1350,7 @@ public class AssemblerRecipes implements Runnable { null, ItemList.Casing_Vent_T2.get(1L), 30 * 20, - (int) Tier.RECIPE_LuV); + (int) TierEU.RECIPE_LuV); if (!GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.disabledrecipes, "torchesFromCoal", false)) { GT_Values.RA.addAssemblerRecipe( @@ -1396,8 +1396,6 @@ public class AssemblerRecipes implements Runnable { new ItemStack(Blocks.iron_bars, 4), 300, 4); - // GT_Values.RA.addAssemblerRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 2L), - // GT_Utility.getIntegratedCircuit(2), new ItemStack(Blocks.heavy_weighted_pressure_plate, 1), 200, 4); GT_Values.RA.addAssemblerRecipe( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 6L), GT_Utility.getIntegratedCircuit(6), @@ -1668,14 +1666,14 @@ public class AssemblerRecipes implements Runnable { Materials.HSSG.getMolten(288), ItemList.Casing_Fusion.get(1L), 100, - (int) Tier.IV); + (int) TierEU.RECIPE_IV); GT_Values.RA.addAssemblerRecipe( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Americium, 4L), ItemList.Casing_Fusion.get(1L), Materials.NaquadahAlloy.getMolten(288), ItemList.Casing_Fusion2.get(1L), 200, - (int) Tier.RECIPE_LuV); + (int) TierEU.RECIPE_LuV); GT_Values.RA.addAssemblerRecipe( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Magnalium, 6L), GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.BlueSteel, 1L), @@ -2047,79 +2045,79 @@ public class AssemblerRecipes implements Runnable { GT_Utility.getIntegratedCircuit(1), GT_ModHandler.getIC2Item("electronicCircuit", 2L), 200, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( getModItem("IC2NuclearControl", "ItemInventoryScannerCard", 1L, 0), GT_Utility.getIntegratedCircuit(1), GT_ModHandler.getIC2Item("electronicCircuit", 2L), 200, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( getModItem("IC2NuclearControl", "ItemEnergySensorLocationCard", 1L, 0), GT_Utility.getIntegratedCircuit(1), GT_ModHandler.getIC2Item("electronicCircuit", 2L), 200, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( getModItem("IC2NuclearControl", "RFSensorCard", 1L, 0), GT_Utility.getIntegratedCircuit(1), GT_ModHandler.getIC2Item("electronicCircuit", 2L), 200, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( getModItem("IC2NuclearControl", "ItemMultipleSensorLocationCard", 1L, 0), GT_Utility.getIntegratedCircuit(1), GT_ModHandler.getIC2Item("electronicCircuit", 1L), 200, - (int) Tier.RECIPE_LV); // counter + (int) TierEU.RECIPE_LV); // counter GT_Values.RA.addAssemblerRecipe( getModItem("IC2NuclearControl", "ItemMultipleSensorLocationCard", 1L, 1), GT_Utility.getIntegratedCircuit(1), GT_ModHandler.getIC2Item("electronicCircuit", 1L), 200, - (int) Tier.RECIPE_LV); // liquid + (int) TierEU.RECIPE_LV); // liquid GT_Values.RA.addAssemblerRecipe( getModItem("IC2NuclearControl", "ItemMultipleSensorLocationCard", 1L, 2), GT_Utility.getIntegratedCircuit(1), GT_ModHandler.getIC2Item("electronicCircuit", 2L), 200, - (int) Tier.RECIPE_LV); // generator + (int) TierEU.RECIPE_LV); // generator GT_Values.RA.addAssemblerRecipe( getModItem("IC2NuclearControl", "ItemLiquidArrayLocationCard", 1L, 0), GT_Utility.getIntegratedCircuit(1), GT_ModHandler.getIC2Item("electronicCircuit", 2L), 200, - (int) Tier.RECIPE_LV); // 2-6 liquid + (int) TierEU.RECIPE_LV); // 2-6 liquid GT_Values.RA.addAssemblerRecipe( getModItem("IC2NuclearControl", "ItemEnergyArrayLocationCard", 1L, 0), GT_Utility.getIntegratedCircuit(1), GT_ModHandler.getIC2Item("electronicCircuit", 2L), 200, - (int) Tier.RECIPE_LV); // 2-6 energy + (int) TierEU.RECIPE_LV); // 2-6 energy GT_Values.RA.addAssemblerRecipe( getModItem("IC2NuclearControl", "ItemSensorLocationCard", 1L, 0), GT_Utility.getIntegratedCircuit(1), GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Good), 2L), 200, - (int) Tier.RECIPE_LV); // non-fluid nuke + (int) TierEU.RECIPE_LV); // non-fluid nuke GT_Values.RA.addAssemblerRecipe( getModItem("IC2NuclearControl", "Item55ReactorCard", 1L, 0), GT_Utility.getIntegratedCircuit(1), GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Good), 2L), 200, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( getModItem("IC2NuclearControl", "CardAppeng", 1L, 0), GT_Utility.getIntegratedCircuit(1), GT_ModHandler.getIC2Item("electronicCircuit", 2L), 200, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( ItemList.NC_SensorCard.get(1L), GT_Utility.getIntegratedCircuit(1), GT_ModHandler.getIC2Item("electronicCircuit", 3L), 200, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); } if (!GT_Mod.gregtechproxy.mDisableIC2Cables) { @@ -2373,7 +2371,7 @@ public class AssemblerRecipes implements Runnable { null, ItemList.ThoriumCell_2.get(1L), 200, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { ItemList.ThoriumCell_1.get(4L), @@ -2383,7 +2381,7 @@ public class AssemblerRecipes implements Runnable { null, ItemList.ThoriumCell_4.get(1L), 300, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { ItemList.ThoriumCell_2.get(2L), @@ -2393,7 +2391,7 @@ public class AssemblerRecipes implements Runnable { null, ItemList.ThoriumCell_4.get(1L), 200, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { ItemList.Uraniumcell_1.get(2L), @@ -2403,7 +2401,7 @@ public class AssemblerRecipes implements Runnable { null, ItemList.Uraniumcell_2.get(1L), 200, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { ItemList.Uraniumcell_1.get(4L), @@ -2413,7 +2411,7 @@ public class AssemblerRecipes implements Runnable { null, ItemList.Uraniumcell_4.get(1L), 300, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { ItemList.Uraniumcell_2.get(2L), @@ -2423,7 +2421,7 @@ public class AssemblerRecipes implements Runnable { null, ItemList.Uraniumcell_4.get(1L), 200, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { ItemList.Moxcell_1.get(2L), @@ -2433,7 +2431,7 @@ public class AssemblerRecipes implements Runnable { null, ItemList.Moxcell_2.get(1L), 200, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { ItemList.Moxcell_1.get(4L), @@ -2443,7 +2441,7 @@ public class AssemblerRecipes implements Runnable { null, ItemList.Moxcell_4.get(1L), 300, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { ItemList.Moxcell_2.get(2L), @@ -2453,7 +2451,7 @@ public class AssemblerRecipes implements Runnable { null, ItemList.Moxcell_4.get(1L), 200, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { ItemList.NaquadahCell_1.get(2L), @@ -2536,7 +2534,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, ItemList.WovenKevlar.get(1L), 300, - (int) Tier.RECIPE_EV); + (int) TierEU.RECIPE_EV); for (Materials tMat : Materials.values()) { if (tMat.isProperSolderingFluid()) { @@ -2614,7 +2612,7 @@ public class AssemblerRecipes implements Runnable { Materials.SolderingAlloy.getGas(144L), ItemList.Spinneret.get(1L), 2400, - (int) Tier.RECIPE_EV); + (int) TierEU.RECIPE_EV); } } @@ -2862,7 +2860,7 @@ public class AssemblerRecipes implements Runnable { Materials.VibrantAlloy.getMolten(216L), ItemList.RC_Rail_HS.get(32L), 100, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 3L), @@ -2902,7 +2900,7 @@ public class AssemblerRecipes implements Runnable { Materials.ConductiveIron.getMolten(216L), ItemList.RC_Rail_Adv.get(32L), 100, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { ItemList.RC_Rail_Standard.get(3L), @@ -2962,7 +2960,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, ItemList.RC_Rail_Electric.get(8L), 50, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { ItemList.RC_Rail_Standard.get(1L), @@ -3032,7 +3030,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, ItemList.RC_Rail_Wooden.get(32L), 133, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { ItemList.RC_Tie_Wood.get(1L), @@ -3048,7 +3046,7 @@ public class AssemblerRecipes implements Runnable { GT_Utility.getIntegratedCircuit(20), ItemList.RC_Bed_Wood.get(24L), 200, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( ItemList.RC_Tie_Wood.get(64L), GT_Utility.getIntegratedCircuit(24), @@ -3060,7 +3058,7 @@ public class AssemblerRecipes implements Runnable { GT_Utility.getIntegratedCircuit(20), ItemList.RC_Bed_Stone.get(24L), 200, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( ItemList.RC_Tie_Stone.get(64L), GT_Utility.getIntegratedCircuit(24), @@ -3087,7 +3085,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, tRailWood, 100, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_Utility.copyAmount(2, tRailWood), @@ -3097,7 +3095,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, tRailWoodB, 200, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); } GT_Values.RA.addAssemblerRecipe( new ItemStack[] { @@ -3109,7 +3107,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, new ItemStack(Blocks.golden_rail, 16, 0), 300, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { @@ -3118,7 +3116,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, new ItemStack(Blocks.rail, 64, 0), 200, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); ItemStack tRailRe = getModItem(MOD_ID_RC, "track", 64); NBTTagCompound tTagRe = new NBTTagCompound(); @@ -3134,7 +3132,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, tRailRe, 200, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); ItemStack tRailReB = getModItem(MOD_ID_RC, "track.reinforced", 16); NBTTagCompound tTagReB = new NBTTagCompound(); @@ -3150,7 +3148,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, tRailReB, 300, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); ItemStack tRailEl = getModItem(MOD_ID_RC, "track", 64); NBTTagCompound tTagEl = new NBTTagCompound(); @@ -3166,7 +3164,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, tRailEl, 200, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); ItemStack tRailHs = getModItem(MOD_ID_RC, "track", 64, 816); if (tRailHs != null) { @@ -3181,7 +3179,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, tRailHs, 200, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); } ItemStack tRailHsB = getModItem(MOD_ID_RC, "track.speed", 16); NBTTagCompound tTagHsB = new NBTTagCompound(); @@ -3197,7 +3195,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, tRailHsB, 300, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); // --- Wooden Switch Track --- ItemStack tRailSS = getModItem(MOD_ID_RC, "track.slow", 1, 19986); @@ -3235,7 +3233,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, GT_Utility.copyAmount(4, tRailSS), 100, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_Utility.copyAmount(2, tRailWood), @@ -3265,7 +3263,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, GT_Utility.copyAmount(32, tRailSS), 100, - (int) Tier.MV); + (int) TierEU.RECIPE_MV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_Utility.copyAmount(2, tRailWood), @@ -3313,7 +3311,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, GT_Utility.copyAmount(4, tRailSW), 100, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_Utility.copyAmount(2, tRailWood), @@ -3343,7 +3341,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, GT_Utility.copyAmount(32, tRailSW), 100, - (int) Tier.MV); + (int) TierEU.RECIPE_MV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_Utility.copyAmount(2, tRailWood), @@ -3391,7 +3389,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, GT_Utility.copyAmount(4, tRailSJ), 100, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_Utility.copyAmount(2, tRailWood), @@ -3421,7 +3419,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, GT_Utility.copyAmount(32, tRailSJ), 100, - (int) Tier.MV); + (int) TierEU.RECIPE_MV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_Utility.copyAmount(2, tRailWood), @@ -3459,7 +3457,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, GT_Utility.copyAmount(2, tRailNS), 200, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { new ItemStack(Blocks.rail, 2, 0), @@ -3489,7 +3487,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, GT_Utility.copyAmount(16, tRailNS), 200, - (int) Tier.MV); + (int) TierEU.RECIPE_MV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { new ItemStack(Blocks.rail, 2, 0), @@ -3509,7 +3507,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, GT_Utility.copyAmount(64, tRailNS), 200, - (int) Tier.RECIPE_HV); + (int) TierEU.RECIPE_HV); } // --- Wye Tack --- ItemStack tRailNW = getModItem(MOD_ID_RC, "track", 1, 2144); @@ -3537,7 +3535,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, GT_Utility.copyAmount(2, tRailNW), 200, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { new ItemStack(Blocks.rail, 2, 0), @@ -3567,7 +3565,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, GT_Utility.copyAmount(16, tRailNW), 200, - (int) Tier.MV); + (int) TierEU.RECIPE_MV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { new ItemStack(Blocks.rail, 2, 0), @@ -3587,7 +3585,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, GT_Utility.copyAmount(64, tRailNW), 200, - (int) Tier.RECIPE_HV); + (int) TierEU.RECIPE_HV); } // --- Junction Tack --- ItemStack tRailNJ = getModItem(MOD_ID_RC, "track", 1); @@ -3615,7 +3613,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, GT_Utility.copyAmount(2, tRailNJ), 200, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { new ItemStack(Blocks.rail, 2, 0), @@ -3645,7 +3643,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, GT_Utility.copyAmount(16, tRailNJ), 200, - (int) Tier.MV); + (int) TierEU.RECIPE_MV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { new ItemStack(Blocks.rail, 2, 0), @@ -3665,7 +3663,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, GT_Utility.copyAmount(64, tRailNJ), 200, - (int) Tier.RECIPE_HV); + (int) TierEU.RECIPE_HV); } // --- Reinforced Switch Track --- ItemStack tRailRS = getModItem(MOD_ID_RC, "track.reinforced", 1); @@ -3693,7 +3691,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, GT_Utility.copyAmount(2, tRailRS), 300, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_Utility.copyAmount(2, tRailRe), @@ -3723,7 +3721,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, GT_Utility.copyAmount(16, tRailRS), 300, - (int) Tier.MV); + (int) TierEU.RECIPE_MV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_Utility.copyAmount(2, tRailRe), @@ -3743,7 +3741,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, GT_Utility.copyAmount(64, tRailRS), 300, - (int) Tier.RECIPE_HV); + (int) TierEU.RECIPE_HV); } // --- Reinforced Wye Track --- ItemStack tRailRW = getModItem(MOD_ID_RC, "track.reinforced", 1); @@ -3771,7 +3769,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, GT_Utility.copyAmount(2, tRailRW), 300, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_Utility.copyAmount(2, tRailRe), @@ -3801,7 +3799,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, GT_Utility.copyAmount(16, tRailRW), 300, - (int) Tier.MV); + (int) TierEU.RECIPE_MV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_Utility.copyAmount(2, tRailRe), @@ -3821,7 +3819,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, GT_Utility.copyAmount(64, tRailRW), 300, - (int) Tier.RECIPE_HV); + (int) TierEU.RECIPE_HV); } // --- Reinforced Junction Track --- ItemStack tRailRJ = getModItem(MOD_ID_RC, "track.reinforced", 1, 764); @@ -3849,7 +3847,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, GT_Utility.copyAmount(2, tRailRJ), 300, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_Utility.copyAmount(2, tRailRe), @@ -3879,7 +3877,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, GT_Utility.copyAmount(16, tRailRJ), 300, - (int) Tier.MV); + (int) TierEU.RECIPE_MV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_Utility.copyAmount(2, tRailRe), @@ -3899,7 +3897,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, GT_Utility.copyAmount(64, tRailRJ), 300, - (int) Tier.RECIPE_HV); + (int) TierEU.RECIPE_HV); } // --- H.S. Switch Track --- ItemStack tRailSSw = getModItem(MOD_ID_RC, "track.speed", 1, 7916); @@ -3927,7 +3925,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, GT_Utility.copyAmount(2, tRailSSw), 400, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_Utility.copyAmount(2, tRailHs), @@ -3957,7 +3955,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, GT_Utility.copyAmount(16, tRailSSw), 400, - (int) Tier.MV); + (int) TierEU.RECIPE_MV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_Utility.copyAmount(2, tRailHs), @@ -3977,7 +3975,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, GT_Utility.copyAmount(64, tRailSSw), 400, - (int) Tier.RECIPE_HV); + (int) TierEU.RECIPE_HV); } // --- H.S. Wye Track --- ItemStack tRailSWy = getModItem(MOD_ID_RC, "track.speed", 1); @@ -4005,7 +4003,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, GT_Utility.copyAmount(2, tRailSWy), 400, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_Utility.copyAmount(2, tRailHs), @@ -4035,7 +4033,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, GT_Utility.copyAmount(16, tRailSWy), 400, - (int) Tier.MV); + (int) TierEU.RECIPE_MV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_Utility.copyAmount(2, tRailHs), @@ -4055,7 +4053,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, GT_Utility.copyAmount(64, tRailSWy), 400, - (int) Tier.RECIPE_HV); + (int) TierEU.RECIPE_HV); } // --- H.S. Transition Track --- ItemStack tRailSTt = getModItem(MOD_ID_RC, "track.speed", 1, 26865); @@ -4074,7 +4072,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, GT_Utility.copyAmount(4, tRailSTt), 400, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_Utility.copyAmount(2, tRailHs), @@ -4096,7 +4094,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, GT_Utility.copyAmount(16, tRailSTt), 400, - (int) Tier.MV); + (int) TierEU.RECIPE_MV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_Utility.copyAmount(2, tRailHs), @@ -4118,7 +4116,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, GT_Utility.copyAmount(64, tRailSTt), 400, - (int) Tier.RECIPE_HV); + (int) TierEU.RECIPE_HV); } // --- Electric Switch Track --- ItemStack tRailES = getModItem(MOD_ID_RC, "track.electric", 1, 10488); @@ -4146,7 +4144,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, GT_Utility.copyAmount(2, tRailES), 400, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_Utility.copyAmount(2, tRailEl), @@ -4176,7 +4174,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, GT_Utility.copyAmount(16, tRailES), 400, - (int) Tier.MV); + (int) TierEU.RECIPE_MV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_Utility.copyAmount(2, tRailEl), @@ -4196,7 +4194,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, GT_Utility.copyAmount(64, tRailES), 400, - (int) Tier.RECIPE_HV); + (int) TierEU.RECIPE_HV); } // --- Electric Wye Track --- ItemStack tRailEw = getModItem(MOD_ID_RC, "track.electric", 1); @@ -4224,7 +4222,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, GT_Utility.copyAmount(2, tRailEw), 400, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_Utility.copyAmount(2, tRailEl), @@ -4254,7 +4252,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, GT_Utility.copyAmount(16, tRailEw), 400, - (int) Tier.MV); + (int) TierEU.RECIPE_MV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_Utility.copyAmount(2, tRailEl), @@ -4274,7 +4272,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, GT_Utility.copyAmount(64, tRailEw), 400, - (int) Tier.RECIPE_HV); + (int) TierEU.RECIPE_HV); } // --- Electric Junction Track --- ItemStack tRailEJ = getModItem(MOD_ID_RC, "track.electric", 1); @@ -4302,7 +4300,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, GT_Utility.copyAmount(2, tRailEJ), 400, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_Utility.copyAmount(2, tRailEl), @@ -4332,7 +4330,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, GT_Utility.copyAmount(16, tRailEJ), 400, - (int) Tier.MV); + (int) TierEU.RECIPE_MV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_Utility.copyAmount(2, tRailEl), @@ -4352,7 +4350,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, GT_Utility.copyAmount(64, tRailEJ), 400, - (int) Tier.RECIPE_HV); + (int) TierEU.RECIPE_HV); } // Shunting Wire for (Materials tMat : Materials.values()) { @@ -4399,7 +4397,7 @@ public class AssemblerRecipes implements Runnable { tMat.getMolten(16L * tMultiplier / 2L), ItemList.RC_ShuntingWire.get(8L), 200, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Titanium, 1L), @@ -4429,7 +4427,7 @@ public class AssemblerRecipes implements Runnable { tMat.getMolten(16L * tMultiplier / 2L), ItemList.RC_ShuntingWire.get(64L), 200, - (int) Tier.MV); + (int) TierEU.RECIPE_MV); // chunkloader upgrade OC GT_Values.RA.addAssemblerRecipe( new ItemStack[] { @@ -4520,14 +4518,14 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, getModItem(MOD_ID_RC, "machine.alpha", 1, 0), 600, - (int) Tier.RECIPE_HV); + (int) TierEU.RECIPE_HV); GT_Values.RA.addAssemblerRecipe( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.AnyIron, 2L), GT_Utility.getIntegratedCircuit(20), getModItem(MOD_ID_RC, "machine.beta", 1L, 0), 600, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.AnyIron, 2L), @@ -4537,7 +4535,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, getModItem(MOD_ID_RC, "machine.beta", 2L, 1), 800, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.AnyIron, 2L), @@ -4547,7 +4545,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, getModItem(MOD_ID_RC, "machine.beta", 2L, 1), 800, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Bronze, 2L), @@ -4557,7 +4555,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, getModItem(MOD_ID_RC, "machine.beta", 1L, 2), 800, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 2L), @@ -4602,7 +4600,7 @@ public class AssemblerRecipes implements Runnable { GT_Utility.getIntegratedCircuit(20), getModItem(MOD_ID_RC, "machine.zeta", 1L, 0), 600, - (int) Tier.MV); + (int) TierEU.RECIPE_MV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 2L), @@ -4612,7 +4610,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, getModItem(MOD_ID_RC, "machine.zeta", 2L, 1), 800, - (int) Tier.MV); + (int) TierEU.RECIPE_MV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 2L), @@ -4622,7 +4620,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, getModItem(MOD_ID_RC, "machine.zeta", 2L, 1), 800, - (int) Tier.MV); + (int) TierEU.RECIPE_MV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Plastic, 2L), @@ -4632,7 +4630,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, getModItem(MOD_ID_RC, "machine.zeta", 1L, 2), 800, - (int) Tier.MV); + (int) TierEU.RECIPE_MV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 2L), @@ -4677,7 +4675,7 @@ public class AssemblerRecipes implements Runnable { GT_Utility.getIntegratedCircuit(20), getModItem(MOD_ID_RC, "machine.zeta", 1L, 6), 600, - (int) Tier.RECIPE_HV); + (int) TierEU.RECIPE_HV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 2L), @@ -4687,7 +4685,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, getModItem(MOD_ID_RC, "machine.zeta", 2L, 7), 800, - (int) Tier.RECIPE_HV); + (int) TierEU.RECIPE_HV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 2L), @@ -4697,7 +4695,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, getModItem(MOD_ID_RC, "machine.zeta", 2L, 7), 800, - (int) Tier.RECIPE_HV); + (int) TierEU.RECIPE_HV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Titanium, 2L), @@ -4707,7 +4705,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, getModItem(MOD_ID_RC, "machine.zeta", 1L, 8), 800, - (int) Tier.RECIPE_HV); + (int) TierEU.RECIPE_HV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 2L), @@ -4752,7 +4750,7 @@ public class AssemblerRecipes implements Runnable { GT_Utility.getIntegratedCircuit(20), getModItem(MOD_ID_RC, "machine.zeta", 1L, 12), 600, - (int) Tier.RECIPE_EV); + (int) TierEU.RECIPE_EV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Palladium, 2L), @@ -4762,7 +4760,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, getModItem(MOD_ID_RC, "machine.zeta", 2L, 13), 800, - (int) Tier.RECIPE_EV); + (int) TierEU.RECIPE_EV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Palladium, 2L), @@ -4772,7 +4770,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, getModItem(MOD_ID_RC, "machine.zeta", 2L, 13), 800, - (int) Tier.RECIPE_EV); + (int) TierEU.RECIPE_EV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.NiobiumTitanium, 2L), @@ -4782,7 +4780,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, getModItem(MOD_ID_RC, "machine.zeta", 1L, 14), 800, - (int) Tier.RECIPE_EV); + (int) TierEU.RECIPE_EV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 2L), @@ -4827,7 +4825,7 @@ public class AssemblerRecipes implements Runnable { GT_Utility.getIntegratedCircuit(20), getModItem(MOD_ID_RC, "machine.eta", 1L, 3), 600, - (int) Tier.IV); + (int) TierEU.RECIPE_IV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 2L), @@ -4837,7 +4835,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, getModItem(MOD_ID_RC, "machine.eta", 2L, 4), 800, - (int) Tier.IV); + (int) TierEU.RECIPE_IV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 2L), @@ -4847,7 +4845,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, getModItem(MOD_ID_RC, "machine.eta", 2L, 4), 800, - (int) Tier.IV); + (int) TierEU.RECIPE_IV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Naquadah, 2L), @@ -4857,7 +4855,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, getModItem(MOD_ID_RC, "machine.eta", 1L, 5), 800, - (int) Tier.IV); + (int) TierEU.RECIPE_IV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 2L), @@ -4866,7 +4864,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, getModItem(MOD_ID_RC, "machine.eta", 1L, 6), 200, - (int) Tier.RECIPE_LuV); + (int) TierEU.RECIPE_LuV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 2L), @@ -4876,7 +4874,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, getModItem(MOD_ID_RC, "machine.eta", 2L, 7), 400, - (int) Tier.RECIPE_LuV); + (int) TierEU.RECIPE_LuV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 2L), @@ -4886,7 +4884,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, getModItem(MOD_ID_RC, "machine.eta", 2L, 7), 400, - (int) Tier.RECIPE_LuV); + (int) TierEU.RECIPE_LuV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Neutronium, 2L), @@ -4896,7 +4894,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.NF, getModItem(MOD_ID_RC, "machine.eta", 1L, 8), 400, - (int) Tier.RECIPE_LuV); + (int) TierEU.RECIPE_LuV); // Water Tank GT_Values.RA.addAssemblerRecipe( new ItemStack[] { @@ -4964,7 +4962,7 @@ public class AssemblerRecipes implements Runnable { GT_Utility.getIntegratedCircuit(6), getModItem(MOD_ID_RC, "machine.beta", 1L, 3), 400, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addAssemblerRecipe( ItemList.IC2_Item_Casing_Steel.get(6L), GT_Utility.getIntegratedCircuit(6), @@ -4996,7 +4994,7 @@ public class AssemblerRecipes implements Runnable { Materials.StainlessSteel.getMolten(72L), ItemList.Ingot_Heavy1.get(1L), 300, - (int) Tier.RECIPE_HV); + (int) TierEU.RECIPE_HV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { getModItem("GalacticraftCore", "item.heavyPlating", 1L), @@ -5006,7 +5004,7 @@ public class AssemblerRecipes implements Runnable { Materials.TungstenSteel.getMolten(72L), ItemList.Ingot_Heavy2.get(1L), 300, - (int) Tier.RECIPE_EV); + (int) TierEU.RECIPE_EV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { getModItem("GalacticraftMars", "item.null", 1L, 3), @@ -5016,7 +5014,7 @@ public class AssemblerRecipes implements Runnable { Materials.Platinum.getMolten(72L), ItemList.Ingot_Heavy3.get(1L), 300, - (int) Tier.IV); + (int) TierEU.RECIPE_IV); } } @@ -5032,7 +5030,7 @@ public class AssemblerRecipes implements Runnable { new FluidStack(FluidRegistry.getFluid("liquid helium"), 2000), GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorMV, 3L), 320, - (int) Tier.MV); + (int) TierEU.RECIPE_MV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get( @@ -5044,7 +5042,7 @@ public class AssemblerRecipes implements Runnable { new FluidStack(FluidRegistry.getFluid("liquid helium"), 4000), GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorHV, 6L), 320, - (int) Tier.RECIPE_HV); + (int) TierEU.RECIPE_HV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Uraniumtriplatinid, 9L), @@ -5055,7 +5053,7 @@ public class AssemblerRecipes implements Runnable { new FluidStack(FluidRegistry.getFluid("liquid helium"), 6000), GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorEV, 9L), 320, - (int) Tier.RECIPE_EV); + (int) TierEU.RECIPE_EV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Vanadiumtriindinid, 12L), @@ -5066,7 +5064,7 @@ public class AssemblerRecipes implements Runnable { new FluidStack(FluidRegistry.getFluid("liquid helium"), 8000), GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorIV, 12L), 640, - (int) Tier.IV); + (int) TierEU.RECIPE_IV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get( @@ -5080,7 +5078,7 @@ public class AssemblerRecipes implements Runnable { new FluidStack(FluidRegistry.getFluid("liquid helium"), 12000), GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorLuV, 15L), 640, - (int) Tier.RECIPE_LuV); + (int) TierEU.RECIPE_LuV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get( @@ -5092,7 +5090,7 @@ public class AssemblerRecipes implements Runnable { new FluidStack(FluidRegistry.getFluid("liquid helium"), 16000), GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorZPM, 18L), 1280, - (int) Tier.RECIPE_ZPM); + (int) TierEU.RECIPE_ZPM); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get( @@ -5104,7 +5102,7 @@ public class AssemblerRecipes implements Runnable { new FluidStack(FluidRegistry.getFluid("liquid helium"), 20000), GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUV, 21L), 1280, - (int) Tier.RECIPE_UV); + (int) TierEU.RECIPE_UV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get( @@ -5116,7 +5114,7 @@ public class AssemblerRecipes implements Runnable { new FluidStack(FluidRegistry.getFluid("liquid helium"), 24000), GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUHV, 24L), 2560, - (int) Tier.RECIPE_UHV); + (int) TierEU.RECIPE_UHV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUEVBase, 27L), @@ -5127,7 +5125,7 @@ public class AssemblerRecipes implements Runnable { new FluidStack(FluidRegistry.getFluid("liquid helium"), 28000), GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUEV, 27L), 3200, - (int) Tier.RECIPE_UEV); + (int) TierEU.RECIPE_UEV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUMVBase, 33L), @@ -5138,7 +5136,7 @@ public class AssemblerRecipes implements Runnable { new FluidStack(FluidRegistry.getFluid("liquid helium"), 36000), GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUMV, 33L), 3200, - (int) Tier.RECIPE_UMV); + (int) TierEU.RECIPE_UMV); } } @@ -5153,7 +5151,7 @@ public class AssemblerRecipes implements Runnable { Materials.AdvancedGlue.getFluid(500L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Graphene, 64), 400, - (int) Tier.RECIPE_LuV); + (int) TierEU.RECIPE_LuV); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Graphite, 64), @@ -5163,7 +5161,7 @@ public class AssemblerRecipes implements Runnable { Materials.AdvancedGlue.getFluid(250L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Graphene, 64), 80, - (int) Tier.RECIPE_ZPM); + (int) TierEU.RECIPE_ZPM); } } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/AssemblyLineRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/AssemblyLineRecipes.java index 3ed0cf4a77..35569431a4 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/AssemblyLineRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/AssemblyLineRecipes.java @@ -519,7 +519,7 @@ public class AssemblyLineRecipes implements Runnable { }, ItemList.Hatch_Energy_LuV.get(1), 400, - (int) Tier.RECIPE_LuV); + (int) TierEU.RECIPE_LuV); GT_Values.RA.addAssemblylineRecipe( ItemList.Hatch_Energy_LuV.get(1, new Object() {}), @@ -547,7 +547,7 @@ public class AssemblyLineRecipes implements Runnable { }, ItemList.Hatch_Energy_ZPM.get(1), 600, - (int) Tier.ZPM); + (int) TierEU.ZPM); GT_Values.RA.addAssemblylineRecipe( ItemList.Hatch_Energy_ZPM.get(1, new Object() {}), @@ -617,7 +617,7 @@ public class AssemblyLineRecipes implements Runnable { }, ItemList.Hatch_Dynamo_LuV.get(1), 400, - (int) Tier.RECIPE_LuV); + (int) TierEU.RECIPE_LuV); GT_Values.RA.addAssemblylineRecipe( ItemList.Hatch_Dynamo_LuV.get(1, new Object() {}), @@ -645,7 +645,7 @@ public class AssemblyLineRecipes implements Runnable { }, ItemList.Hatch_Dynamo_ZPM.get(1), 600, - (int) Tier.RECIPE_ZPM); + (int) TierEU.RECIPE_ZPM); GT_Values.RA.addAssemblylineRecipe( ItemList.Hatch_Dynamo_ZPM.get(1, new Object() {}), diff --git a/src/main/java/gregtech/loaders/postload/recipes/AutoclaveRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/AutoclaveRecipes.java index 03964fc13d..6c44e6d51a 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/AutoclaveRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/AutoclaveRecipes.java @@ -95,35 +95,35 @@ public class AutoclaveRecipes implements Runnable { GT_ModHandler.getIC2Item("carbonFiber", 64L), 10000, 150, - (int) Tier.RECIPE_EV); + (int) TierEU.RECIPE_EV); GT_Values.RA.addAutoclaveRecipe( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 64), Materials.Epoxid.getMolten(144L), GT_ModHandler.getIC2Item("carbonFiber", 64L), 10000, 300, - (int) Tier.RECIPE_HV); + (int) TierEU.RECIPE_HV); GT_Values.RA.addAutoclaveRecipe( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 64), Materials.Polytetrafluoroethylene.getMolten(288L), GT_ModHandler.getIC2Item("carbonFiber", 32L), 10000, 400, - (int) Tier.RECIPE_MV); + (int) TierEU.RECIPE_MV); GT_Values.RA.addAutoclaveRecipe( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 64), Materials.Plastic.getMolten(576L), GT_ModHandler.getIC2Item("carbonFiber", 16L), 10000, 600, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addAutoclaveRecipe( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.NetherStar, 1), Materials.UUMatter.getFluid(576L), GT_OreDictUnificator.get(OrePrefixes.gem, Materials.NetherStar, 1), 3333, 72000, - (int) Tier.RECIPE_HV); + (int) TierEU.RECIPE_HV); GT_Values.RA.addAutoclaveRecipe( GT_OreDictUnificator.get(ItemList.QuantumStar.get(1L)), @@ -131,7 +131,7 @@ public class AutoclaveRecipes implements Runnable { ItemList.Gravistar.get(1L), 10000, 480, - (int) Tier.RECIPE_IV); + (int) TierEU.RECIPE_IV); GT_Values.RA.addAutoclaveRecipe( GT_OreDictUnificator.get(ItemList.Gravistar.get(16L)), Materials.Infinity.getMolten(288), @@ -171,7 +171,7 @@ public class AutoclaveRecipes implements Runnable { new ItemStack[] {GT_Values.NI, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 3)}, new int[] {0, 7500}, 1200, - (int) Tier.RECIPE_LV, + (int) TierEU.RECIPE_LV, false); GT_Values.RA.addAutoclave4Recipe( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Silicon, 1), @@ -181,7 +181,7 @@ public class AutoclaveRecipes implements Runnable { new ItemStack[] {GT_Values.NI, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 3)}, new int[] {0, 9000}, 1200, - (int) Tier.RECIPE_LV, + (int) TierEU.RECIPE_LV, false); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/BenderRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/BenderRecipes.java index 6bf67f76ec..2ccdd50362 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/BenderRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/BenderRecipes.java @@ -15,97 +15,97 @@ public class BenderRecipes implements Runnable { (GT_Utility.getIntegratedCircuit(10)), ItemList.RC_Rail_Standard.get(64L), 300, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addBenderRecipe( GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Iron, 48L), (GT_Utility.getIntegratedCircuit(10)), ItemList.RC_Rail_Standard.get(64L), 300, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addBenderRecipe( GT_OreDictUnificator.get(OrePrefixes.stick, Materials.WroughtIron, 32L), (GT_Utility.getIntegratedCircuit(10)), ItemList.RC_Rail_Standard.get(64L), 300, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addBenderRecipe( GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Bronze, 32L), (GT_Utility.getIntegratedCircuit(10)), ItemList.RC_Rail_Standard.get(64L), 300, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addBenderRecipe( GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 24L), (GT_Utility.getIntegratedCircuit(10)), ItemList.RC_Rail_Standard.get(64L), 300, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addBenderRecipe( GT_OreDictUnificator.get(OrePrefixes.stick, Materials.StainlessSteel, 16L), (GT_Utility.getIntegratedCircuit(10)), ItemList.RC_Rail_Standard.get(64L), 300, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addBenderRecipe( GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Titanium, 12L), (GT_Utility.getIntegratedCircuit(10)), ItemList.RC_Rail_Standard.get(64L), 300, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addBenderRecipe( GT_OreDictUnificator.get(OrePrefixes.stick, Materials.TungstenSteel, 9L), (GT_Utility.getIntegratedCircuit(10)), ItemList.RC_Rail_Standard.get(64L), 300, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addBenderRecipe( GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Iridium, 6L), (GT_Utility.getIntegratedCircuit(10)), ItemList.RC_Rail_Standard.get(64L), 300, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addBenderRecipe( GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Osmium, 3L), (GT_Utility.getIntegratedCircuit(10)), ItemList.RC_Rail_Standard.get(64L), 300, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addBenderRecipe( GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Osmiridium, 2L), (GT_Utility.getIntegratedCircuit(10)), ItemList.RC_Rail_Standard.get(64L), 300, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addBenderRecipe( GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Obsidian, 24L), (GT_Utility.getIntegratedCircuit(11)), ItemList.RC_Rail_Reinforced.get(64L), 600, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addBenderRecipe( GT_OreDictUnificator.get(OrePrefixes.stick, Materials.StainlessSteel, 12L), (GT_Utility.getIntegratedCircuit(11)), ItemList.RC_Rail_Reinforced.get(64L), 600, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addBenderRecipe( GT_OreDictUnificator.get(OrePrefixes.stick, Materials.TungstenSteel, 6L), (GT_Utility.getIntegratedCircuit(11)), ItemList.RC_Rail_Reinforced.get(64L), 600, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addBenderRecipe( GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Iridium, 3L), (GT_Utility.getIntegratedCircuit(11)), ItemList.RC_Rail_Reinforced.get(64L), 600, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addBenderRecipe( GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Osmium, 1L), (GT_Utility.getIntegratedCircuit(11)), ItemList.RC_Rail_Reinforced.get(64L), 600, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addBenderRecipe( GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Aluminium, 20L), (GT_Utility.getIntegratedCircuit(12)), @@ -205,6 +205,6 @@ public class BenderRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.itemCasing, Materials.Tin, 1L), ItemList.IC2_Food_Can_Empty.get(1L), 20, - (int) Tier.RECIPE_HV); + (int) TierEU.RECIPE_HV); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/BlastFurnaceRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/BlastFurnaceRecipes.java index d8f83d0764..3ca6d6408d 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/BlastFurnaceRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/BlastFurnaceRecipes.java @@ -26,7 +26,7 @@ public class BlastFurnaceRecipes implements Runnable { Materials.Quicklime.getDust(1), GT_Values.NI, 200, - (int) Tier.RECIPE_HV, + (int) TierEU.RECIPE_HV, 3200); // Carbothermic Reduction @@ -41,7 +41,7 @@ public class BlastFurnaceRecipes implements Runnable { Materials.Copper.getIngots(outputIngotAmount), Materials.Ash.getDustTiny(2), 240, - (int) Tier.RECIPE_MV, + (int) TierEU.RECIPE_MV, 1200); GT_Values.RA.addBlastRecipe( Materials.RoastedAntimony.getDust(2), @@ -51,7 +51,7 @@ public class BlastFurnaceRecipes implements Runnable { Materials.Antimony.getIngots(outputIngotAmount), Materials.Ash.getDustTiny(2), 240, - (int) Tier.RECIPE_MV, + (int) TierEU.RECIPE_MV, 1200); GT_Values.RA.addBlastRecipe( Materials.RoastedIron.getDust(2), @@ -61,7 +61,7 @@ public class BlastFurnaceRecipes implements Runnable { Materials.Iron.getIngots(outputIngotAmount), Materials.Ash.getDustTiny(2), 240, - (int) Tier.RECIPE_MV, + (int) TierEU.RECIPE_MV, 1200); GT_Values.RA.addBlastRecipe( Materials.RoastedNickel.getDust(2), @@ -71,7 +71,7 @@ public class BlastFurnaceRecipes implements Runnable { Materials.Nickel.getIngots(outputIngotAmount), Materials.Ash.getDustTiny(2), 240, - (int) Tier.RECIPE_MV, + (int) TierEU.RECIPE_MV, 1200); GT_Values.RA.addBlastRecipe( Materials.RoastedZinc.getDust(2), @@ -81,7 +81,7 @@ public class BlastFurnaceRecipes implements Runnable { Materials.Zinc.getIngots(outputIngotAmount), Materials.Ash.getDustTiny(2), 240, - (int) Tier.RECIPE_MV, + (int) TierEU.RECIPE_MV, 1200); GT_Values.RA.addBlastRecipe( Materials.RoastedCobalt.getDust(2), @@ -91,7 +91,7 @@ public class BlastFurnaceRecipes implements Runnable { Materials.Cobalt.getIngots(outputIngotAmount), Materials.Ash.getDustTiny(2), 240, - (int) Tier.RECIPE_MV, + (int) TierEU.RECIPE_MV, 1200); GT_Values.RA.addBlastRecipe( Materials.RoastedArsenic.getDust(2), @@ -101,7 +101,7 @@ public class BlastFurnaceRecipes implements Runnable { Materials.Arsenic.getIngots(outputIngotAmount), Materials.Ash.getDustTiny(2), 240, - (int) Tier.RECIPE_MV, + (int) TierEU.RECIPE_MV, 1200); GT_Values.RA.addBlastRecipe( Materials.RoastedLead.getDust(2), @@ -111,7 +111,7 @@ public class BlastFurnaceRecipes implements Runnable { Materials.Lead.getIngots(outputIngotAmount), Materials.Ash.getDustTiny(2), 240, - (int) Tier.RECIPE_MV, + (int) TierEU.RECIPE_MV, 1200); GT_Values.RA.addBlastRecipe( @@ -122,7 +122,7 @@ public class BlastFurnaceRecipes implements Runnable { Materials.Copper.getIngots(outputIngotAmount), Materials.Ash.getDustTiny(2), 240, - (int) Tier.RECIPE_MV, + (int) TierEU.RECIPE_MV, 1200); GT_Values.RA.addBlastRecipe( Materials.Magnetite.getDust(2), @@ -132,7 +132,7 @@ public class BlastFurnaceRecipes implements Runnable { Materials.Iron.getIngots(outputIngotAmount), Materials.Ash.getDustTiny(2), 240, - (int) Tier.RECIPE_MV, + (int) TierEU.RECIPE_MV, 1200); GT_Values.RA.addBlastRecipe( Materials.YellowLimonite.getDust(2), @@ -142,7 +142,7 @@ public class BlastFurnaceRecipes implements Runnable { Materials.Iron.getIngots(outputIngotAmount), Materials.Ash.getDustTiny(2), 240, - (int) Tier.RECIPE_MV, + (int) TierEU.RECIPE_MV, 1200); GT_Values.RA.addBlastRecipe( Materials.BrownLimonite.getDust(2), @@ -152,7 +152,7 @@ public class BlastFurnaceRecipes implements Runnable { Materials.Iron.getIngots(outputIngotAmount), Materials.Ash.getDustTiny(2), 240, - (int) Tier.RECIPE_MV, + (int) TierEU.RECIPE_MV, 1200); GT_Values.RA.addBlastRecipe( Materials.BasalticMineralSand.getDust(2), @@ -162,7 +162,7 @@ public class BlastFurnaceRecipes implements Runnable { Materials.Iron.getIngots(outputIngotAmount), Materials.Ash.getDustTiny(2), 240, - (int) Tier.RECIPE_MV, + (int) TierEU.RECIPE_MV, 1200); GT_Values.RA.addBlastRecipe( Materials.GraniticMineralSand.getDust(2), @@ -172,7 +172,7 @@ public class BlastFurnaceRecipes implements Runnable { Materials.Iron.getIngots(outputIngotAmount), Materials.Ash.getDustTiny(2), 240, - (int) Tier.RECIPE_MV, + (int) TierEU.RECIPE_MV, 1200); GT_Values.RA.addBlastRecipe( @@ -183,7 +183,7 @@ public class BlastFurnaceRecipes implements Runnable { Materials.Tin.getIngots(outputIngotAmount), Materials.Ash.getDustTiny(2), 240, - (int) Tier.RECIPE_MV, + (int) TierEU.RECIPE_MV, 1200); GT_Values.RA.addBlastRecipe( Materials.CassiteriteSand.getDust(2), @@ -193,7 +193,7 @@ public class BlastFurnaceRecipes implements Runnable { Materials.Tin.getIngots(outputIngotAmount), Materials.Ash.getDustTiny(2), 240, - (int) Tier.RECIPE_MV, + (int) TierEU.RECIPE_MV, 1200); GT_Values.RA.addBlastRecipe( @@ -204,7 +204,7 @@ public class BlastFurnaceRecipes implements Runnable { Materials.Silicon.getIngots(1), Materials.Ash.getDustTiny(1), 80, - (int) Tier.RECIPE_MV, + (int) TierEU.RECIPE_MV, 1200); if (GT_Mod.gregtechproxy.mMixedOreOnlyYieldsTwoThirdsOfPureOre) { @@ -216,7 +216,7 @@ public class BlastFurnaceRecipes implements Runnable { Materials.Copper.getIngots(1), Materials.Ash.getDustTiny(2), 240, - (int) Tier.RECIPE_MV, + (int) TierEU.RECIPE_MV, 1200); GT_Values.RA.addBlastRecipe( Materials.Malachite.getDust(2), @@ -226,7 +226,7 @@ public class BlastFurnaceRecipes implements Runnable { Materials.Copper.getIngots(outputIngotAmount), Materials.Ash.getDustTiny(2), 240, - (int) Tier.RECIPE_MV, + (int) TierEU.RECIPE_MV, 1200); GT_Values.RA.addBlastRecipe( Materials.AntimonyTrioxide.getDust(5), @@ -236,7 +236,7 @@ public class BlastFurnaceRecipes implements Runnable { Materials.Antimony.getIngots(2), Materials.Ash.getDustTiny(2), 240, - (int) Tier.RECIPE_MV, + (int) TierEU.RECIPE_MV, 1200); GT_Values.RA.addBlastRecipe( Materials.BandedIron.getDust(5), @@ -246,7 +246,7 @@ public class BlastFurnaceRecipes implements Runnable { Materials.Iron.getIngots(2), Materials.Ash.getDustTiny(2), 240, - (int) Tier.RECIPE_MV, + (int) TierEU.RECIPE_MV, 1200); GT_Values.RA.addBlastRecipe( Materials.Magnetite.getDust(2), @@ -256,7 +256,7 @@ public class BlastFurnaceRecipes implements Runnable { Materials.Iron.getIngots(outputIngotAmount), Materials.Ash.getDustTiny(2), 240, - (int) Tier.RECIPE_MV, + (int) TierEU.RECIPE_MV, 1200); GT_Values.RA.addBlastRecipe( Materials.YellowLimonite.getDust(2), @@ -266,7 +266,7 @@ public class BlastFurnaceRecipes implements Runnable { Materials.Iron.getIngots(outputIngotAmount), Materials.Ash.getDustTiny(2), 240, - (int) Tier.RECIPE_MV, + (int) TierEU.RECIPE_MV, 1200); GT_Values.RA.addBlastRecipe( Materials.BrownLimonite.getDust(2), @@ -276,7 +276,7 @@ public class BlastFurnaceRecipes implements Runnable { Materials.Iron.getIngots(outputIngotAmount), Materials.Ash.getDustTiny(2), 240, - (int) Tier.RECIPE_MV, + (int) TierEU.RECIPE_MV, 1200); GT_Values.RA.addBlastRecipe( Materials.BasalticMineralSand.getDust(2), @@ -286,7 +286,7 @@ public class BlastFurnaceRecipes implements Runnable { Materials.Iron.getIngots(outputIngotAmount), Materials.Ash.getDustTiny(2), 240, - (int) Tier.RECIPE_MV, + (int) TierEU.RECIPE_MV, 1200); GT_Values.RA.addBlastRecipe( Materials.GraniticMineralSand.getDust(2), @@ -296,7 +296,7 @@ public class BlastFurnaceRecipes implements Runnable { Materials.Iron.getIngots(outputIngotAmount), Materials.Ash.getDustTiny(2), 240, - (int) Tier.RECIPE_MV, + (int) TierEU.RECIPE_MV, 1200); GT_Values.RA.addBlastRecipe( Materials.Cassiterite.getDust(2), @@ -306,7 +306,7 @@ public class BlastFurnaceRecipes implements Runnable { Materials.Tin.getIngots(outputIngotAmount), Materials.Ash.getDustTiny(2), 240, - (int) Tier.RECIPE_MV, + (int) TierEU.RECIPE_MV, 1200); GT_Values.RA.addBlastRecipe( Materials.CassiteriteSand.getDust(2), @@ -316,7 +316,7 @@ public class BlastFurnaceRecipes implements Runnable { Materials.Tin.getIngots(outputIngotAmount), Materials.Ash.getDustTiny(2), 240, - (int) Tier.RECIPE_MV, + (int) TierEU.RECIPE_MV, 1200); GT_Values.RA.addBlastRecipe( Materials.Garnierite.getDust(2), @@ -326,7 +326,7 @@ public class BlastFurnaceRecipes implements Runnable { Materials.Nickel.getIngots(1), Materials.Ash.getDustTiny(2), 240, - (int) Tier.RECIPE_MV, + (int) TierEU.RECIPE_MV, 1200); GT_Values.RA.addBlastRecipe( Materials.CobaltOxide.getDust(2), @@ -336,7 +336,7 @@ public class BlastFurnaceRecipes implements Runnable { Materials.Cobalt.getIngots(1), Materials.Ash.getDustTiny(2), 240, - (int) Tier.RECIPE_MV, + (int) TierEU.RECIPE_MV, 1200); GT_Values.RA.addBlastRecipe( Materials.ArsenicTrioxide.getDust(5), @@ -346,7 +346,7 @@ public class BlastFurnaceRecipes implements Runnable { Materials.Arsenic.getIngots(2), Materials.Ash.getDustTiny(2), 240, - (int) Tier.RECIPE_MV, + (int) TierEU.RECIPE_MV, 1200); GT_Values.RA.addBlastRecipe( Materials.Massicot.getDust(2), @@ -356,7 +356,7 @@ public class BlastFurnaceRecipes implements Runnable { Materials.Lead.getIngots(1), Materials.Ash.getDustTiny(2), 240, - (int) Tier.RECIPE_MV, + (int) TierEU.RECIPE_MV, 1200); } @@ -372,7 +372,7 @@ public class BlastFurnaceRecipes implements Runnable { GT_Values.NI, GT_Values.NI, 9000, - (int) Tier.RECIPE_MV, + (int) TierEU.RECIPE_MV, 1784); GT_Values.RA.addBlastRecipe( @@ -387,7 +387,7 @@ public class BlastFurnaceRecipes implements Runnable { GT_Values.NI, GT_Values.NI, 12000, - (int) Tier.RECIPE_HV, + (int) TierEU.RECIPE_HV, 2484); GT_Values.RA.addBlastRecipe( @@ -402,7 +402,7 @@ public class BlastFurnaceRecipes implements Runnable { GT_Values.NI, GT_Values.NI, 15000, - (int) Tier.RECIPE_EV, + (int) TierEU.RECIPE_EV, 4484); GT_Values.RA.addBlastRecipe( @@ -417,7 +417,7 @@ public class BlastFurnaceRecipes implements Runnable { GT_Values.NI, GT_Values.NI, 18000, - (int) Tier.RECIPE_IV, + (int) TierEU.RECIPE_IV, 6484); GT_Values.RA.addBlastRecipe( @@ -432,7 +432,7 @@ public class BlastFurnaceRecipes implements Runnable { GT_Values.NI, GT_Values.NI, 21000, - (int) Tier.RECIPE_LuV, + (int) TierEU.RECIPE_LuV, 9000); // CaH2 + 2Si = CaSi2 + 2H @@ -444,7 +444,7 @@ public class BlastFurnaceRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.CalciumDisilicide, 3), GT_Values.NI, 300, - (int) Tier.RECIPE_MV, + (int) TierEU.RECIPE_MV, 1273); GT_Values.RA.addBlastRecipe( @@ -455,7 +455,7 @@ public class BlastFurnaceRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.SuperconductorUEVBase, 1L), GT_Values.NI, 19660, - (int) Tier.RECIPE_UV, + (int) TierEU.RECIPE_UV, 11800); GT_Values.RA.addBlastRecipe( @@ -466,7 +466,7 @@ public class BlastFurnaceRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.SuperconductorUEVBase, 1L), GT_Values.NI, 8847, - (int) Tier.RECIPE_UV, + (int) TierEU.RECIPE_UV, 11800); // 0.45 * 19660 = 8847 GT_Values.RA.addBlastRecipe( @@ -477,7 +477,7 @@ public class BlastFurnaceRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.SuperconductorUIVBase, 1L), GT_Values.NI, 19660, - (int) Tier.RECIPE_UHV, + (int) TierEU.RECIPE_UHV, 12700); GT_Values.RA.addBlastRecipe( @@ -488,7 +488,7 @@ public class BlastFurnaceRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.SuperconductorUIVBase, 1L), GT_Values.NI, 8847, - (int) Tier.RECIPE_UHV, + (int) TierEU.RECIPE_UHV, 12700); // 0.45 * 19660 = 8847 GT_Values.RA.addBlastRecipe( @@ -499,7 +499,7 @@ public class BlastFurnaceRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.SuperconductorUMVBase, 1L), GT_Values.NI, 19660, - (int) Tier.RECIPE_UEV, + (int) TierEU.RECIPE_UEV, 13600); GT_Values.RA.addBlastRecipe( @@ -510,7 +510,7 @@ public class BlastFurnaceRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.SuperconductorUMVBase, 1L), GT_Values.NI, 8847, - (int) Tier.RECIPE_UEV, + (int) TierEU.RECIPE_UEV, 13600); // 0.45 * 19660 = 8847 // CaO + 3C = CaC2 + CO @@ -522,7 +522,7 @@ public class BlastFurnaceRecipes implements Runnable { MaterialsKevlar.CalciumCarbide.getDust(3), GT_Values.NI, 600, - (int) Tier.RECIPE_HV, + (int) TierEU.RECIPE_HV, 2573); // Ni + 3Al = NiAl3 GT_Values.RA.addBlastRecipe( @@ -533,7 +533,7 @@ public class BlastFurnaceRecipes implements Runnable { MaterialsKevlar.NickelAluminide.getIngots(4), GT_Values.NI, 900, - (int) Tier.RECIPE_HV, + (int) TierEU.RECIPE_HV, 1688); ItemStack[] tSiliconDioxide = new ItemStack[] { @@ -554,7 +554,7 @@ public class BlastFurnaceRecipes implements Runnable { Materials.RoastedCopper.getDust(1), Materials.Ferrosilite.getDust(5), 120, - (int) Tier.RECIPE_MV, + (int) TierEU.RECIPE_MV, 1200); } @@ -566,7 +566,7 @@ public class BlastFurnaceRecipes implements Runnable { Materials.RoastedCopper.getDust(1), Materials.RoastedAntimony.getDustTiny(3), 120, - (int) Tier.RECIPE_MV, + (int) TierEU.RECIPE_MV, 1200); GT_Values.RA.addBlastRecipe( @@ -577,7 +577,7 @@ public class BlastFurnaceRecipes implements Runnable { Materials.RoastedIron.getDust(1), Materials.Ash.getDustTiny(1), 120, - (int) Tier.RECIPE_MV, + (int) TierEU.RECIPE_MV, 1200); GT_Values.RA.addBlastRecipe( @@ -588,7 +588,7 @@ public class BlastFurnaceRecipes implements Runnable { Materials.RoastedNickel.getDust(1), Materials.Ash.getDustTiny(1), 120, - (int) Tier.RECIPE_MV, + (int) TierEU.RECIPE_MV, 1200); GT_Values.RA.addBlastRecipe( @@ -599,7 +599,7 @@ public class BlastFurnaceRecipes implements Runnable { Materials.RoastedZinc.getDust(1), Materials.Ash.getDustTiny(1), 120, - (int) Tier.RECIPE_MV, + (int) TierEU.RECIPE_MV, 1200); GT_Values.RA.addBlastRecipe( @@ -610,7 +610,7 @@ public class BlastFurnaceRecipes implements Runnable { Materials.RoastedCobalt.getDust(1), Materials.RoastedArsenic.getDust(1), 120, - (int) Tier.RECIPE_MV, + (int) TierEU.RECIPE_MV, 1200); GT_Values.RA.addBlastRecipe( @@ -621,7 +621,7 @@ public class BlastFurnaceRecipes implements Runnable { Materials.RoastedAntimony.getDust(1), Materials.Ash.getDustTiny(1), 120, - (int) Tier.RECIPE_MV, + (int) TierEU.RECIPE_MV, 1200); GT_Values.RA.addBlastRecipe( @@ -632,7 +632,7 @@ public class BlastFurnaceRecipes implements Runnable { Materials.RoastedLead.getDust(1), Materials.Ash.getDustTiny(1), 120, - (int) Tier.RECIPE_MV, + (int) TierEU.RECIPE_MV, 1200); if (isGTNHLanthanidLoaded && isGTPPLoaded) { @@ -657,7 +657,7 @@ public class BlastFurnaceRecipes implements Runnable { MaterialsKevlar.RhodiumChloride.getDust(4), GT_Values.NI, 600, - (int) Tier.RECIPE_HV, + (int) TierEU.RECIPE_HV, 573); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/BreweryRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/BreweryRecipes.java index 81334d879d..ed9f8de513 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/BreweryRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/BreweryRecipes.java @@ -268,7 +268,7 @@ public class BreweryRecipes implements Runnable { GT_ModHandler.getDistilledWater(500L), getFluidStack("ic2biomass", 1000), 10, - (int) Tier.RECIPE_LV, + (int) TierEU.RECIPE_LV, false); GT_Values.RA.addBrewingRecipe( diff --git a/src/main/java/gregtech/loaders/postload/recipes/CentrifugeRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/CentrifugeRecipes.java index 36052566bc..ca2f9f4b36 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/CentrifugeRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/CentrifugeRecipes.java @@ -31,7 +31,7 @@ public class CentrifugeRecipes implements Runnable { GT_Values.NI, new int[] {10000, 10000, 9000}, 400, - (int) Tier.RECIPE_MV); + (int) TierEU.RECIPE_MV); GT_Values.RA.addCentrifugeRecipe( ItemList.Cell_Empty.get(1), @@ -76,7 +76,7 @@ public class CentrifugeRecipes implements Runnable { Materials.Antimony.getDust(1), new int[] {10000, 4000, 2000, 2000, 2000, 2000}, 40, - (int) Tier.RECIPE_MV); + (int) TierEU.RECIPE_MV); // food ->CH4 GT_Values.RA.addCentrifugeRecipe( @@ -598,7 +598,7 @@ public class CentrifugeRecipes implements Runnable { GT_Values.NI, new int[] {5000, 100, 5000}, 600, - (int) Tier.RECIPE_MV); + (int) TierEU.RECIPE_MV); GT_Values.RA.addCentrifugeRecipe( new ItemStack(Blocks.dirt, 1, 32767), GT_Values.NI, @@ -963,7 +963,7 @@ public class CentrifugeRecipes implements Runnable { Materials.Ilmenite.getDust(2), new int[] {10000, 10000, 10000, 10000, 10000, 10000}, 13125, - (int) Tier.EV); + (int) TierEU.RECIPE_EV); GT_Values.RA.addCentrifugeRecipe( null, diff --git a/src/main/java/gregtech/loaders/postload/recipes/ChemicalBathRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ChemicalBathRecipes.java index 6e49ee9d8e..7d11e4c315 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/ChemicalBathRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/ChemicalBathRecipes.java @@ -582,7 +582,7 @@ public class ChemicalBathRecipes implements Runnable { GT_Values.NI, null, 300, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addChemicalBathRecipe( GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TungstenSteel, 1L), Materials.TungstenSteel.getMolten(144L), @@ -600,7 +600,7 @@ public class ChemicalBathRecipes implements Runnable { GT_Values.NI, null, 400, - (int) Tier.RECIPE_MV); + (int) TierEU.RECIPE_MV); GT_Values.RA.addChemicalBathRecipe( GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Naquadah, 1L), Materials.Osmium.getMolten(144L), @@ -618,7 +618,7 @@ public class ChemicalBathRecipes implements Runnable { GT_Values.NI, null, 500, - (int) Tier.RECIPE_HV); + (int) TierEU.RECIPE_HV); GT_Values.RA.addChemicalBathRecipe( GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TungstenSteel, 1L), @@ -740,7 +740,7 @@ public class ChemicalBathRecipes implements Runnable { GT_Values.NI, null, 1200, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); // Na + H2O = NaOH + H GT_Values.RA.addChemicalBathRecipe( diff --git a/src/main/java/gregtech/loaders/postload/recipes/CircuitAssemblerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/CircuitAssemblerRecipes.java index 6ba29cc7db..1c951dbff0 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/CircuitAssemblerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/CircuitAssemblerRecipes.java @@ -24,7 +24,7 @@ public class CircuitAssemblerRecipes implements Runnable { Materials.Glass.getMolten(576L), getModItem(GT_MachineRecipeLoader.aTextForestry, "thermionicTubes", 4L, 0), 200, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addCircuitAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1L), @@ -35,7 +35,7 @@ public class CircuitAssemblerRecipes implements Runnable { Materials.Glass.getMolten(576L), getModItem(GT_MachineRecipeLoader.aTextForestry, "thermionicTubes", 4L, 0), 200, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addCircuitAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1L), @@ -46,7 +46,7 @@ public class CircuitAssemblerRecipes implements Runnable { Materials.Glass.getMolten(576L), getModItem(GT_MachineRecipeLoader.aTextForestry, "thermionicTubes", 4L, 1), 200, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addCircuitAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1L), @@ -57,7 +57,7 @@ public class CircuitAssemblerRecipes implements Runnable { Materials.Glass.getMolten(576L), getModItem(GT_MachineRecipeLoader.aTextForestry, "thermionicTubes", 4L, 2), 200, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addCircuitAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1L), @@ -68,7 +68,7 @@ public class CircuitAssemblerRecipes implements Runnable { Materials.Glass.getMolten(576L), getModItem(GT_MachineRecipeLoader.aTextForestry, "thermionicTubes", 4L, 3), 200, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addCircuitAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1L), @@ -79,7 +79,7 @@ public class CircuitAssemblerRecipes implements Runnable { Materials.Glass.getMolten(576L), getModItem(GT_MachineRecipeLoader.aTextForestry, "thermionicTubes", 4L, 3), 200, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addCircuitAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1L), @@ -90,7 +90,7 @@ public class CircuitAssemblerRecipes implements Runnable { Materials.Glass.getMolten(576L), getModItem(GT_MachineRecipeLoader.aTextForestry, "thermionicTubes", 4L, 4), 200, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addCircuitAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1L), @@ -101,7 +101,7 @@ public class CircuitAssemblerRecipes implements Runnable { Materials.Glass.getMolten(576L), getModItem(GT_MachineRecipeLoader.aTextForestry, "thermionicTubes", 4L, 5), 200, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addCircuitAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1L), @@ -112,7 +112,7 @@ public class CircuitAssemblerRecipes implements Runnable { Materials.Glass.getMolten(576L), getModItem(GT_MachineRecipeLoader.aTextForestry, "thermionicTubes", 4L, 6), 200, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addCircuitAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1L), @@ -123,7 +123,7 @@ public class CircuitAssemblerRecipes implements Runnable { Materials.Glass.getMolten(576L), getModItem(GT_MachineRecipeLoader.aTextForestry, "thermionicTubes", 4L, 7), 200, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addCircuitAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1L), @@ -134,7 +134,7 @@ public class CircuitAssemblerRecipes implements Runnable { Materials.Glass.getMolten(576L), getModItem(GT_MachineRecipeLoader.aTextForestry, "thermionicTubes", 4L, 8), 200, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addCircuitAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1L), @@ -145,7 +145,7 @@ public class CircuitAssemblerRecipes implements Runnable { Materials.Glass.getMolten(576L), getModItem(GT_MachineRecipeLoader.aTextForestry, "thermionicTubes", 4L, 9), 200, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addCircuitAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1L), @@ -156,7 +156,7 @@ public class CircuitAssemblerRecipes implements Runnable { Materials.Glass.getMolten(576L), getModItem(GT_MachineRecipeLoader.aTextForestry, "thermionicTubes", 4L, 10), 200, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addCircuitAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1L), @@ -167,7 +167,7 @@ public class CircuitAssemblerRecipes implements Runnable { Materials.Glass.getMolten(576L), getModItem(GT_MachineRecipeLoader.aTextForestry, "thermionicTubes", 4L, 11), 200, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addCircuitAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedAlloy, 1L), @@ -178,7 +178,7 @@ public class CircuitAssemblerRecipes implements Runnable { Materials.Glass.getMolten(576L), getModItem(GT_MachineRecipeLoader.aTextForestry, "thermionicTubes", 4L, 12), 200, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addCircuitAssemblerRecipe( new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.EnderEye, 1L), @@ -189,7 +189,7 @@ public class CircuitAssemblerRecipes implements Runnable { Materials.Glass.getMolten(576L), getModItem(GT_MachineRecipeLoader.aTextForestry, "thermionicTubes", 4L, 13), 200, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); if (!isRailcraftLoaded) return; for (Materials tMat : Materials.values()) { @@ -208,7 +208,7 @@ public class CircuitAssemblerRecipes implements Runnable { tMat.getMolten(144L * tMultiplier / 2L), getModItem(MOD_ID_RC, "part.circuit", 4L, 0), 300, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addCircuitAssemblerRecipe( new ItemStack[] { ItemList.Circuit_Board_Coated_Basic.get(1L), @@ -218,7 +218,7 @@ public class CircuitAssemblerRecipes implements Runnable { tMat.getMolten(144L * tMultiplier / 2L), getModItem(MOD_ID_RC, "part.circuit", 4L, 1), 300, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addCircuitAssemblerRecipe( new ItemStack[] { ItemList.Circuit_Board_Coated_Basic.get(1L), @@ -228,7 +228,7 @@ public class CircuitAssemblerRecipes implements Runnable { tMat.getMolten(144L * tMultiplier / 2L), getModItem(MOD_ID_RC, "part.circuit", 4L, 2), 300, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addCircuitAssemblerRecipe( new ItemStack[] { ItemList.Circuit_Board_Phenolic_Good.get(1L), @@ -238,7 +238,7 @@ public class CircuitAssemblerRecipes implements Runnable { tMat.getMolten(144L * tMultiplier / 2L), getModItem(MOD_ID_RC, "part.circuit", 8L, 0), 400, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addCircuitAssemblerRecipe( new ItemStack[] { ItemList.Circuit_Board_Phenolic_Good.get(1L), @@ -248,7 +248,7 @@ public class CircuitAssemblerRecipes implements Runnable { tMat.getMolten(144L * tMultiplier / 2L), getModItem(MOD_ID_RC, "part.circuit", 8L, 1), 400, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addCircuitAssemblerRecipe( new ItemStack[] { ItemList.Circuit_Board_Phenolic_Good.get(1L), @@ -258,7 +258,7 @@ public class CircuitAssemblerRecipes implements Runnable { tMat.getMolten(144L * tMultiplier / 2L), getModItem(MOD_ID_RC, "part.circuit", 8L, 2), 400, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addCircuitAssemblerRecipe( new ItemStack[] { ItemList.Circuit_Board_Epoxy_Advanced.get(1L), @@ -268,7 +268,7 @@ public class CircuitAssemblerRecipes implements Runnable { tMat.getMolten(144L * tMultiplier / 2L), getModItem(MOD_ID_RC, "part.circuit", 16L, 0), 500, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addCircuitAssemblerRecipe( new ItemStack[] { ItemList.Circuit_Board_Epoxy_Advanced.get(1L), @@ -278,7 +278,7 @@ public class CircuitAssemblerRecipes implements Runnable { tMat.getMolten(144L * tMultiplier / 2L), getModItem(MOD_ID_RC, "part.circuit", 16L, 1), 500, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addCircuitAssemblerRecipe( new ItemStack[] { ItemList.Circuit_Board_Epoxy_Advanced.get(1L), @@ -288,7 +288,7 @@ public class CircuitAssemblerRecipes implements Runnable { tMat.getMolten(144L * tMultiplier / 2L), getModItem(MOD_ID_RC, "part.circuit", 16L, 2), 500, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); } } @@ -309,7 +309,7 @@ public class CircuitAssemblerRecipes implements Runnable { tMat.getMolten(1152L * tMultiplier / 2L), getModItem("Forestry", "chipsets", 1L, 0), 200, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addCircuitAssemblerRecipe( new ItemStack[] { ItemList.Circuit_Board_Coated_Basic.get(1L), @@ -322,7 +322,7 @@ public class CircuitAssemblerRecipes implements Runnable { tMat.getMolten(1152L * tMultiplier / 2L), getModItem("Forestry", "chipsets", 1L, 1), 200, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addCircuitAssemblerRecipe( new ItemStack[] { ItemList.Circuit_Board_Phenolic_Good.get(1L), @@ -335,7 +335,7 @@ public class CircuitAssemblerRecipes implements Runnable { tMat.getMolten(1152L * tMultiplier / 2L), getModItem("Forestry", "chipsets", 1L, 2), 200, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); GT_Values.RA.addCircuitAssemblerRecipe( new ItemStack[] { ItemList.Circuit_Board_Phenolic_Good.get(1L), @@ -348,7 +348,7 @@ public class CircuitAssemblerRecipes implements Runnable { tMat.getMolten(1152L * tMultiplier / 2L), getModItem("Forestry", "chipsets", 1L, 3), 200, - (int) Tier.RECIPE_LV); + (int) TierEU.RECIPE_LV); } } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/CuttingRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/CuttingRecipes.java index dc79fc6848..1bdd2d7fe2 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/CuttingRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/CuttingRecipes.java @@ -21,7 +21,7 @@ public class CuttingRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconSG, 4L) }, 400, - (int) Tier.RECIPE_LV, + (int) TierEU.RECIPE_LV, false); GT_Values.RA.addCutterRecipe( @@ -31,7 +31,7 @@ public class CuttingRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconSG, 8L) }, 800, - (int) Tier.RECIPE_MV, + (int) TierEU.RECIPE_MV, true); GT_Values.RA.addCutterRecipe( @@ -41,7 +41,7 @@ public class CuttingRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconSG, 16L) }, 1600, - (int) Tier.RECIPE_HV, + (int) TierEU.RECIPE_HV, true); GT_Values.RA.addCutterRecipe( @@ -52,7 +52,7 @@ public class CuttingRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconSG, 32L) }, 2400, - (int) Tier.RECIPE_EV, + (int) TierEU.RECIPE_EV, true); GT_Values.RA.addCutterRecipe( @@ -63,7 +63,7 @@ public class CuttingRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconSG, 64L) }, 3200, - (int) Tier.RECIPE_IV, + (int) TierEU.RECIPE_IV, true); GT_Values.RA.addCutterRecipe( diff --git a/src/main/java/gregtech/loaders/postload/recipes/ForgeHammerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ForgeHammerRecipes.java index e008493b23..7bcca9ea5a 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/ForgeHammerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/ForgeHammerRecipes.java @@ -64,7 +64,7 @@ public class ForgeHammerRecipes implements Runnable { null, new FluidStack[] {Materials.Space.getMolten(1440L), Materials.Time.getMolten(1440L)}, 10 * 20, - (int) Tier.RECIPE_UXV); + (int) TierEU.RECIPE_UXV); if (isHardcoreEnderExpansionLoaded) { GT_Values.RA.addForgeHammerRecipe( diff --git a/src/main/java/gregtech/loaders/postload/recipes/PlasmaForgeRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/PlasmaForgeRecipes.java index f778ae23d9..7b2bb878f0 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/PlasmaForgeRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/PlasmaForgeRecipes.java @@ -4,10 +4,7 @@ import static gregtech.api.enums.GT_Values.*; import static gregtech.api.util.GT_ModHandler.getModItem; import static net.minecraftforge.fluids.FluidRegistry.getFluidStack; -import gregtech.api.enums.GT_Values; -import gregtech.api.enums.ItemList; -import gregtech.api.enums.Materials; -import gregtech.api.enums.Tier; +import gregtech.api.enums.*; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; @@ -43,7 +40,7 @@ public class PlasmaForgeRecipes implements Runnable { new ItemStack[] {getModItem(MOD_ID_GTPP, "MU-metaitem.01", 1, 32105)}, new FluidStack[] {NF}, 50 * 20, - (int) Tier.UXV, + (int) TierEU.RECIPE_UXV, 13_500); } } |