diff options
| author | chochem <40274384+chochem@users.noreply.github.com> | 2024-08-04 05:49:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-04 11:49:03 +0700 |
| commit | aaf88d87a2111ced5c381a016dbed6c136edb7fc (patch) | |
| tree | 19ef14496af5c03119c711fbeaf1cf2c4c238789 /src/main/java | |
| parent | 50c7afb6c42498c45b422dfd09a0b9433a061034 (diff) | |
| download | GT5-Unofficial-aaf88d87a2111ced5c381a016dbed6c136edb7fc.tar.gz GT5-Unofficial-aaf88d87a2111ced5c381a016dbed6c136edb7fc.tar.bz2 GT5-Unofficial-aaf88d87a2111ced5c381a016dbed6c136edb7fc.zip | |
Circuit material overhaul (#2814)
* first push to use new Materials for circuits
* dont deprecate or redefine ultimate
* sa
* move it
* second round
* dont deprecate or redefine advanced
* part 3
* part 4
* part 5
* part 6
* mini fix
Diffstat (limited to 'src/main/java')
43 files changed, 781 insertions, 805 deletions
diff --git a/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java b/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java index 5b6ebe0a20..3889a8ffad 100644 --- a/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java +++ b/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java @@ -171,7 +171,7 @@ public class RecipeLoader { .itemInputs( ItemList.Hull_LuV.get(1), WerkstoffMaterialPool.MuMetal.get(OrePrefixes.plateDense, 8), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Ultimate, 4), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.ZPM, 4), ItemList.Conveyor_Module_LuV.get(4), GT_Utility.copyAmount(2, LanthItemList.BEAMLINE_PIPE), GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.VanadiumGallium, 2), @@ -190,7 +190,7 @@ public class RecipeLoader { ItemList.Hull_LuV.get(1), WerkstoffMaterialPool.MuMetal.get(OrePrefixes.plateDense, 8), ItemList.Casing_Coil_Superconductor.get(2), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Ultimate, 8), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.ZPM, 8), ItemList.Electric_Pump_LuV.get(2), GT_Utility.copyAmount(2, LanthItemList.BEAMLINE_PIPE), GT_OreDictUnificator.get(OrePrefixes.cableGt08, Materials.VanadiumGallium, 2), @@ -209,8 +209,8 @@ public class RecipeLoader { ItemList.Hull_LuV.get(1), WerkstoffMaterialPool.MuMetal.get(OrePrefixes.plateDense, 8), GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Lead, 4), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Ultimate, 4), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.SuperconductorUHV, 2), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.ZPM, 4), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.UV, 2), GT_Utility.copyAmount(2, LanthItemList.BEAMLINE_PIPE), GT_OreDictUnificator.get(OrePrefixes.cableGt02, Materials.VanadiumGallium, 1), GT_Utility.getIntegratedCircuit(16) @@ -228,8 +228,8 @@ public class RecipeLoader { ItemList.Hull_LuV.get(1), WerkstoffMaterialPool.MuMetal.get(OrePrefixes.plateDense, 8), ItemList.Casing_Coil_Superconductor.get(12), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Ultimate, 8), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.SuperconductorUHV, 8), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.ZPM, 8), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.UV, 8), GT_Utility.copyAmount(8, LanthItemList.BEAMLINE_PIPE), GT_OreDictUnificator.get(OrePrefixes.cableGt08, Materials.NiobiumTitanium, 8), GT_Utility.getIntegratedCircuit(16)) @@ -317,7 +317,7 @@ public class RecipeLoader { Materials.Copper.getPlates(4), WerkstoffMaterialPool.MuMetal.get(OrePrefixes.plate, 5), GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorLuV, 4), - new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 4 }, + new Object[] { OrePrefixes.circuit.get(Materials.ZPM), 4 }, ItemList.Emitter_LuV.get(6), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Gold, 32), GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Electrum, 6)) @@ -341,7 +341,7 @@ public class RecipeLoader { Materials.Copper.getPlates(4), WerkstoffMaterialPool.MuMetal.get(OrePrefixes.plate, 5), GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorZPM, 4), - new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 4 }, + new Object[] { OrePrefixes.circuit.get(Materials.UV), 4 }, ItemList.Emitter_ZPM.get(6), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Gold, 64), GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Electrum, 6)) @@ -361,7 +361,7 @@ public class RecipeLoader { .itemInputs( GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Aluminium, 1), - new Object[] { OrePrefixes.circuit.get(Materials.Elite), 4 }, + new Object[] { OrePrefixes.circuit.get(Materials.IV), 4 }, ItemList.Robot_Arm_LuV.get(2), ItemList.Robot_Arm_LuV.get(2), ItemList.Conveyor_Module_LuV.get(2), @@ -411,7 +411,7 @@ public class RecipeLoader { Materials.Argon.getGas(1000)) .itemInputs( GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Aluminium, 1), - new Object[] { OrePrefixes.circuit.get(Materials.Elite), 4 }, + new Object[] { OrePrefixes.circuit.get(Materials.IV), 4 }, ItemList.Robot_Arm_LuV.get(2), ItemList.Robot_Arm_LuV.get(2), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Gold, 16), @@ -482,7 +482,7 @@ public class RecipeLoader { ) .itemInputs( ItemList.Hull_LuV.get(1), - new Object[] { OrePrefixes.circuit.get(Materials.Master), 2 }, + new Object[] { OrePrefixes.circuit.get(Materials.LuV), 2 }, new ItemStack(LanthItemList.CAPILLARY_EXCHANGE, 2), ItemList.Electric_Pump_LuV.get(1), LanthItemList.BEAMLINE_PIPE, @@ -506,7 +506,7 @@ public class RecipeLoader { ) .itemInputs( ItemList.Hull_LuV.get(1), - new Object[] { OrePrefixes.circuit.get(Materials.Master), 6 }, + new Object[] { OrePrefixes.circuit.get(Materials.LuV), 6 }, new ItemStack(LanthItemList.CAPILLARY_EXCHANGE, 4), ItemList.Electric_Pump_LuV.get(2), ItemList.Electric_Motor_LuV.get(4), @@ -3429,7 +3429,7 @@ public class RecipeLoader { ItemList.Electric_Motor_IV.get(4L), ItemList.Electric_Pump_IV.get(4L), GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Desh, 4L), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 4L), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.LuV, 4L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(LanthItemList.DIGESTER) .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(1440)) @@ -3444,7 +3444,7 @@ public class RecipeLoader { ItemList.Electric_Motor_EV.get(4L), ItemList.Electric_Pump_EV.get(2L), GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.VibrantAlloy, 4L), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Data, 4L), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.EV, 4L), GT_Utility.getIntegratedCircuit(2)) .itemOutputs(LanthItemList.DISSOLUTION_TANK) .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(720)) diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/items/Circuit_Programmer.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/items/Circuit_Programmer.java index f0c746dd64..59332b17a2 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/items/Circuit_Programmer.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/items/Circuit_Programmer.java @@ -233,6 +233,6 @@ public class Circuit_Programmer extends GT_Generic_Item implements IElectricItem private boolean isLVCircuit(ItemStack stack) { return BW_Util.checkStackAndPrefix(stack) && OrePrefixes.circuit.equals(GT_OreDictUnificator.getAssociation(stack).mPrefix) - && GT_OreDictUnificator.getAssociation(stack).mMaterial.mMaterial.equals(Materials.Basic); + && GT_OreDictUnificator.getAssociation(stack).mMaterial.mMaterial.equals(Materials.LV); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Assembler.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Assembler.java index 7c866d53d2..9d244e5eba 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Assembler.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Assembler.java @@ -41,7 +41,7 @@ public class Assembler implements Runnable { .itemInputs( new ItemStack(ItemRegistry.BW_BLOCKS[0], 1, 0), Materials.Lapis.getPlates(9), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 2L), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 2L), GT_Utility.getIntegratedCircuit(17)) .itemOutputs(new ItemStack(ItemRegistry.BW_BLOCKS[0], 1, 1)) .fluidInputs(FluidRegistry.getFluidStack("ic2coolant", 1000)) @@ -111,7 +111,7 @@ public class Assembler implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Good, 1L), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.MV, 1L), Materials.Aluminium.getPlates(1), ItemList.Circuit_Board_Plastic.get(1L), ItemList.Battery_RE_LV_Lithium.get(1L)) @@ -152,24 +152,13 @@ public class Assembler implements Runnable { ItemStack converter = converters[j][i]; ItemStack eInput = input[j][i]; ItemStack eDynamo = dynamo[j][i]; - long recipeConsumption; - switch (i) { - case 0: - recipeConsumption = TierEU.RECIPE_EV; - break; - case 1: - recipeConsumption = TierEU.RECIPE_IV; - break; - case 2: - recipeConsumption = TierEU.RECIPE_LuV; - break; - case 3: - recipeConsumption = TierEU.RECIPE_ZPM; - break; - default: - recipeConsumption = TierEU.RECIPE_EV; - break; - } + long recipeConsumption = switch (i) { + case 0 -> TierEU.RECIPE_EV; + case 1 -> TierEU.RECIPE_IV; + case 2 -> TierEU.RECIPE_LuV; + case 3 -> TierEU.RECIPE_ZPM; + default -> TierEU.RECIPE_EV; + }; int solderingAmount = Math.max(144 * i, 72) * (j + 1); diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/CraftingRecipes.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/CraftingRecipes.java index 17a5d5b025..e156aacbe7 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/CraftingRecipes.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/CraftingRecipes.java @@ -376,7 +376,7 @@ public class CraftingRecipes implements Runnable { BioItemList.mBioLabParts[2], RecipeLoader.BITSD, new Object[] { "SFE", "CPC", "NFN", 'N', - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Nichrome, 1L), 'C', "circuit" + Materials.Data, + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Nichrome, 1L), 'C', "circuit" + Materials.EV, 'F', ItemList.Field_Generator_EV.get(1L), 'E', ItemList.Emitter_EV.get(1L), 'S', ItemList.Sensor_EV.get(1L), 'P', GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 1L), }); @@ -385,20 +385,18 @@ public class CraftingRecipes implements Runnable { BioItemList.mBioLabParts[3], RecipeLoader.BITSD, new Object[] { "SFE", "CPC", "NFN", 'N', - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Naquadah, 1L), 'C', - "circuit" + Materials.Master, 'F', ItemList.Field_Generator_LuV.get(1L), 'E', - ItemList.Emitter_LuV.get(1L), 'S', ItemList.Sensor_LuV.get(1L), 'P', - WerkstoffLoader.LuVTierMaterial.get(OrePrefixes.plate, 1), }); + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Naquadah, 1L), 'C', "circuit" + Materials.LuV, + 'F', ItemList.Field_Generator_LuV.get(1L), 'E', ItemList.Emitter_LuV.get(1L), 'S', + ItemList.Sensor_LuV.get(1L), 'P', WerkstoffLoader.LuVTierMaterial.get(OrePrefixes.plate, 1), }); // ClonalCellularSynthesisModule GT_ModHandler.addCraftingRecipe( BioItemList.mBioLabParts[4], RecipeLoader.BITSD, new Object[] { "FEF", "CPC", "FSF", 'N', - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Naquadah, 1L), 'C', - "circuit" + Materials.Master, 'F', ItemList.Field_Generator_LuV.get(1L), 'E', - ItemList.Emitter_LuV.get(1L), 'S', ItemList.Sensor_LuV.get(1L), 'P', - WerkstoffLoader.LuVTierMaterial.get(OrePrefixes.plate, 1), }); + GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Naquadah, 1L), 'C', "circuit" + Materials.LuV, + 'F', ItemList.Field_Generator_LuV.get(1L), 'E', ItemList.Emitter_LuV.get(1L), 'S', + ItemList.Sensor_LuV.get(1L), 'P', WerkstoffLoader.LuVTierMaterial.get(OrePrefixes.plate, 1), }); GT_ModHandler.addCraftingRecipe( new GT_TileEntity_BioVat( @@ -407,7 +405,7 @@ public class CraftingRecipes implements Runnable { StatCollector.translateToLocal("tile.biovat.name")).getStackForm(1L), RecipeLoader.BITSD, new Object[] { "GCG", "KHK", "GCG", 'G', new ItemStack(ItemRegistry.bw_glasses[0], 1, 1), 'C', - "circuit" + Materials.Data, 'K', GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Silver, 1L), + "circuit" + Materials.EV, 'K', GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Silver, 1L), 'H', ItemList.MACHINE_HULLS[3].get(1L) }); ItemStack[] Pistons2 = { ItemList.Electric_Piston_HV.get(1L), ItemList.Electric_Piston_EV.get(1L), @@ -421,8 +419,8 @@ public class CraftingRecipes implements Runnable { Materials.Iridium, Materials.Osmium, Materials.Naquadah }; Materials[] wireMat2 = { Materials.Kanthal, Materials.Nichrome, Materials.TungstenSteel, Materials.Naquadah, Materials.NaquadahAlloy, Materials.SuperconductorUHV }; - Materials[] circuits2 = { Materials.Advanced, Materials.Data, Materials.Elite, Materials.Master, - Materials.Ultimate, Materials.SuperconductorUHV }; + Materials[] circuits2 = { Materials.HV, Materials.EV, Materials.IV, Materials.LuV, Materials.ZPM, + Materials.UV }; for (int i = 3; i < GT_Values.VN.length - 1; i++) { // 12625 diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/BW_Meta_Items.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/BW_Meta_Items.java index 99eb6e7d7e..7d749d11b7 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/BW_Meta_Items.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/BW_Meta_Items.java @@ -100,50 +100,50 @@ public class BW_Meta_Items { String tooltip = ""; String aOreDictPrefix = OrePrefixes.circuit.toString(); switch (aTier) { - case 0: - additionalOreDictData = Materials.Primitive.toString(); - tooltip = Materials.Primitive.getToolTip(); - break; - case 1: - additionalOreDictData = Materials.Basic.toString(); - tooltip = Materials.Basic.getToolTip(); - break; - case 2: - additionalOreDictData = Materials.Good.toString(); - tooltip = Materials.Good.getToolTip(); - break; - case 3: - additionalOreDictData = Materials.Advanced.toString(); - tooltip = Materials.Advanced.getToolTip(); - break; - case 4: - additionalOreDictData = Materials.Data.toString(); - tooltip = Materials.Data.getToolTip(); - break; - case 5: - additionalOreDictData = Materials.Elite.toString(); - tooltip = Materials.Elite.getToolTip(); - break; - case 6: - additionalOreDictData = Materials.Master.toString(); - tooltip = Materials.Master.getToolTip(); - break; - case 7: - additionalOreDictData = Materials.Ultimate.toString(); - tooltip = Materials.Ultimate.getToolTip(); - break; - case 8: - additionalOreDictData = Materials.SuperconductorUHV.toString(); - tooltip = Materials.SuperconductorUHV.getToolTip(); - break; - case 9: - additionalOreDictData = "Infinite"; - tooltip = "An Infinite Circuit"; - break; - case 10: - additionalOreDictData = "Bio"; - tooltip = "A Bio Circuit"; - break; + case 0 -> { + additionalOreDictData = Materials.ULV.toString(); + tooltip = Materials.ULV.getToolTip(); + } + case 1 -> { + additionalOreDictData = Materials.LV.toString(); + tooltip = Materials.LV.getToolTip(); + } + case 2 -> { + additionalOreDictData = Materials.MV.toString(); + tooltip = Materials.MV.getToolTip(); + } + case 3 -> { + additionalOreDictData = Materials.HV.toString(); + tooltip = Materials.HV.getToolTip(); + } + case 4 -> { + additionalOreDictData = Materials.EV.toString(); + tooltip = Materials.EV.getToolTip(); + } + case 5 -> { + additionalOreDictData = Materials.IV.toString(); + tooltip = Materials.IV.getToolTip(); + } + case 6 -> { + additionalOreDictData = Materials.LuV.toString(); + tooltip = Materials.LuV.getToolTip(); + } + case 7 -> { + additionalOreDictData = Materials.ZPM.toString(); + tooltip = Materials.ZPM.getToolTip(); + } + case 8 -> { + additionalOreDictData = Materials.UV.toString(); + tooltip = Materials.UV.getToolTip(); + } + case 9 -> { + additionalOreDictData = Materials.UHV.toString(); + tooltip = Materials.UHV.getToolTip(); + } + case 10 -> { + additionalOreDictData = Materials.UEV.toString(); + tooltip = Materials.UEV.getToolTip(); + } } ItemStack tStack = BW_Meta_Items.NEWCIRCUITS.addCircuit(aID, aName, tooltip, aTier); diff --git a/src/main/java/com/github/technus/tectech/loader/recipe/Assembler.java b/src/main/java/com/github/technus/tectech/loader/recipe/Assembler.java index c374ae4d4e..35dea3f0ed 100644 --- a/src/main/java/com/github/technus/tectech/loader/recipe/Assembler.java +++ b/src/main/java/com/github/technus/tectech/loader/recipe/Assembler.java @@ -75,7 +75,7 @@ public class Assembler implements Runnable { .itemInputs( GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Iridium, 1), GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Iridium, 6), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.LuV, 1), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Cobalt, 16), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 16), GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.NiobiumTitanium, 2)) @@ -89,7 +89,7 @@ public class Assembler implements Runnable { .itemInputs( CustomItemList.eM_Power.get(1), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 8), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Ultimate, 1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.ZPM, 1), GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.NiobiumTitanium, 2)) .itemOutputs(CustomItemList.eM_Computer_Casing.get(1)) .fluidInputs(Materials.Aluminium.getMolten(1296)) @@ -996,7 +996,7 @@ public class Assembler implements Runnable { .itemInputs( ItemList.Transformer_LuV_IV.get(1), getItemContainer("Display").get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Elite, 2), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.IV, 2), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 2), GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.TungstenSteel, 4), getModItem(BartWorks.ID, "BW_GlasBlocks", 2L, 2)) @@ -1010,7 +1010,7 @@ public class Assembler implements Runnable { .itemInputs( ItemList.Transformer_ZPM_LuV.get(1), getItemContainer("Display").get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 2), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.LuV, 2), GT_OreDictUnificator .get(OrePrefixes.plate, getOrDefault("Rhodium-PlatedPalladium", Materials.Chrome), 2), GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.NiobiumTitanium, 4), @@ -1025,7 +1025,7 @@ public class Assembler implements Runnable { .itemInputs( ItemList.Transformer_UV_ZPM.get(1), getItemContainer("Display").get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Ultimate, 2), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.ZPM, 2), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 2), GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.TungstenSteel, 4), getModItem(BartWorks.ID, "BW_GlasBlocks", 2L, 4)) @@ -1039,7 +1039,7 @@ public class Assembler implements Runnable { .itemInputs( ItemList.Transformer_MAX_UV.get(1), getItemContainer("Display").get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.SuperconductorUHV, 2), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.UV, 2), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmium, 2), GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.Naquadah, 4), getModItem(BartWorks.ID, "BW_GlasBlocks", 2L, 5)) @@ -1053,7 +1053,7 @@ public class Assembler implements Runnable { .itemInputs( getItemContainer("Transformer_UEV_UHV").get(1), getItemContainer("Display").get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Infinite, 2), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.UHV, 2), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 2), GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.ElectrumFlux, 4), getModItem(BartWorks.ID, "BW_GlasBlocks", 4L, 5)) @@ -1067,7 +1067,7 @@ public class Assembler implements Runnable { .itemInputs( getItemContainer("Transformer_UIV_UEV").get(1), getItemContainer("Display").get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Bio, 2), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.UEV, 2), GT_OreDictUnificator.get(OrePrefixes.plate, getOrDefault("Bedrockium", Materials.Neutronium), 2), GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.Bedrockium, 4), getModItem(BartWorks.ID, "BW_GlasBlocks", 8L, 5)) @@ -1081,7 +1081,7 @@ public class Assembler implements Runnable { .itemInputs( getItemContainer("Transformer_UMV_UIV").get(1), getItemContainer("Display").get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Optical, 2), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.UIV, 2), GT_OreDictUnificator.get(OrePrefixes.plate, getOrDefault("BlackPlutonium", Materials.Neutronium), 2), GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.Draconium, 4), getModItem(BartWorks.ID, "BW_GlasBlocks", 16L, 5)) @@ -2772,7 +2772,7 @@ public class Assembler implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( CustomItemList.teslaComponent.getWithDamage(4, 0), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 2), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 2), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Gold, 16), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NickelZincFerrite, 2), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 8)) @@ -2784,7 +2784,7 @@ public class Assembler implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( CustomItemList.teslaComponent.getWithDamage(4, 0), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 2), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 2), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Gold, 16), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NickelZincFerrite, 2), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 8)) @@ -2796,7 +2796,7 @@ public class Assembler implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( CustomItemList.teslaComponent.getWithDamage(4, 0), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 2), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 2), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Gold, 16), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NickelZincFerrite, 2), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 8)) @@ -2809,7 +2809,7 @@ public class Assembler implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( CustomItemList.teslaComponent.getWithDamage(4, 1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 2), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.LuV, 2), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Tungsten, 16), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NickelZincFerrite, 2), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 8)) @@ -2821,7 +2821,7 @@ public class Assembler implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( CustomItemList.teslaComponent.getWithDamage(4, 1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 2), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.LuV, 2), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Tungsten, 16), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NickelZincFerrite, 2), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 8)) @@ -2833,7 +2833,7 @@ public class Assembler implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( CustomItemList.teslaComponent.getWithDamage(4, 1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 2), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.LuV, 2), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Tungsten, 16), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NickelZincFerrite, 2), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Aluminium, 8)) @@ -3327,7 +3327,7 @@ public class Assembler implements Runnable { GT_ModHandler.getIC2Item("teslaCoil", 1), CustomItemList.tM_TeslaSecondary.get(4), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NickelZincFerrite, 4), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 4), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 4), ItemList.Upgrade_Overclocker.get(4)) .itemOutputs(CustomItemList.Machine_Multi_TeslaCoil.get(1)) .fluidInputs(Materials.Silver.getMolten(576)) @@ -3339,7 +3339,7 @@ public class Assembler implements Runnable { .itemInputs( ItemList.Machine_HV_Microwave.get(1), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StainlessSteel, 4), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 4), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 4), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.AnnealedCopper, 16), ItemList.Upgrade_Overclocker.get(4)) .itemOutputs(CustomItemList.Machine_Multi_Microwave.get(1)) @@ -3365,7 +3365,7 @@ public class Assembler implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( CustomItemList.Machine_Multi_Transformer.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 4), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.LuV, 4), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Cobalt, 64), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Copper, 64), CustomItemList.DATApipe.get(4)) @@ -3420,7 +3420,7 @@ public class Assembler implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( CustomItemList.eM_Computer_Casing.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Ultimate, 1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.ZPM, 1), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Cobalt, 64), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Electrum, 64), GT_OreDictUnificator @@ -3436,7 +3436,7 @@ public class Assembler implements Runnable { .itemInputs( CustomItemList.eM_Computer_Casing.get(1), ItemList.Hatch_Input_Bus_LuV.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.LuV, 1), CustomItemList.DATApipe.get(2)) .itemOutputs(CustomItemList.dataIn_Hatch.get(1)) .fluidInputs(Materials.Iridium.getMolten(1296)) @@ -3449,7 +3449,7 @@ public class Assembler implements Runnable { .itemInputs( CustomItemList.eM_Computer_Casing.get(1), ItemList.Hatch_Output_Bus_LuV.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.LuV, 1), CustomItemList.DATApipe.get(2)) .itemOutputs(CustomItemList.dataOut_Hatch.get(1)) .fluidInputs(Materials.Iridium.getMolten(1296)) @@ -3462,7 +3462,7 @@ public class Assembler implements Runnable { .itemInputs( CustomItemList.eM_Computer_Bus.get(1), ItemList.Hatch_Input_Bus_ZPM.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 2), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.LuV, 2), CustomItemList.DATApipe.get(4)) .itemOutputs(CustomItemList.rack_Hatch.get(1)) .fluidInputs(Materials.Iridium.getMolten(1296)) @@ -3474,7 +3474,7 @@ public class Assembler implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( CustomItemList.eM_Computer_Casing.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Ultimate, 1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.ZPM, 1), CustomItemList.DATApipe.get(16), ItemList.Cover_Screen.get(1), new ItemStack(Blocks.stone_button, 16), @@ -3489,7 +3489,7 @@ public class Assembler implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( CustomItemList.eM_Computer_Casing.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Bio, 1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.UEV, 1), CustomItemList.DATApipe.get(32), ItemList.Cover_Screen.get(1), new ItemStack(Blocks.stone_button, 16), diff --git a/src/main/java/com/github/technus/tectech/loader/recipe/AssemblyLine.java b/src/main/java/com/github/technus/tectech/loader/recipe/AssemblyLine.java index 59348ff6b4..c5796cb2fd 100644 --- a/src/main/java/com/github/technus/tectech/loader/recipe/AssemblyLine.java +++ b/src/main/java/com/github/technus/tectech/loader/recipe/AssemblyLine.java @@ -31,7 +31,7 @@ public class AssemblyLine implements Runnable { .metadata(RESEARCH_TIME, 16 * MINUTES + 20 * SECONDS) .itemInputs( CustomItemList.Machine_Multi_Switch.get(1), - new Object[] { OrePrefixes.circuit.get(Materials.Master), 2 }, + new Object[] { OrePrefixes.circuit.get(Materials.LuV), 2 }, ItemList.Tool_DataOrb.get(1), ItemList.Cover_Screen.get(1)) .fluidInputs(new FluidStack(FluidRegistry.getFluid("ic2coolant"), 2000), Materials.Hydrogen.getGas(1000)) @@ -91,7 +91,7 @@ public class AssemblyLine implements Runnable { ItemList.Emitter_ZPM.get(8), ItemList.Robot_Arm_ZPM.get(1), ItemList.Electric_Motor_ZPM.get(2), - new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.UV), 1 }, new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.cableGt02, Materials.Naquadah, 2) }, new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Naquadah, 16) }, CustomItemList.DATApipe.get(2)) @@ -110,7 +110,7 @@ public class AssemblyLine implements Runnable { .metadata(RESEARCH_TIME, 16 * MINUTES + 40 * SECONDS) .itemInputs( CustomItemList.Machine_Multi_Switch.get(1), - new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 2 }, + new Object[] { OrePrefixes.circuit.get(Materials.UV), 2 }, ItemList.Tool_DataOrb.get(1), ItemList.Cover_Screen.get(1), new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUV, 8) }, @@ -132,7 +132,7 @@ public class AssemblyLine implements Runnable { .itemInputs( CustomItemList.Machine_Multi_Switch.get(1), ItemList.Sensor_ZPM.get(8), - new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 4 }, + new Object[] { OrePrefixes.circuit.get(Materials.UV), 4 }, ItemList.Field_Generator_ZPM.get(1), ItemList.Electric_Motor_ZPM.get(2), new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.cableGt02, Materials.Naquadah, 4) }, diff --git a/src/main/java/com/github/technus/tectech/loader/recipe/CircuitAssembler.java b/src/main/java/com/github/technus/tectech/loader/recipe/CircuitAssembler.java index 0c20827ca4..d267652fdd 100644 --- a/src/main/java/com/github/technus/tectech/loader/recipe/CircuitAssembler.java +++ b/src/main/java/com/github/technus/tectech/loader/recipe/CircuitAssembler.java @@ -43,7 +43,7 @@ public class CircuitAssembler implements Runnable { // Parametrizer Memory Card GT_Values.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Basic, 2), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.LV, 2), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Gold, 4)) .itemOutputs(CustomItemList.parametrizerMemory.get(1)) .fluidInputs(Materials.Plastic.getMolten(72)) diff --git a/src/main/java/com/github/technus/tectech/loader/recipe/ResearchStationAssemblyLine.java b/src/main/java/com/github/technus/tectech/loader/recipe/ResearchStationAssemblyLine.java index d4f63a7d23..515d68e409 100644 --- a/src/main/java/com/github/technus/tectech/loader/recipe/ResearchStationAssemblyLine.java +++ b/src/main/java/com/github/technus/tectech/loader/recipe/ResearchStationAssemblyLine.java @@ -92,7 +92,7 @@ public class ResearchStationAssemblyLine implements Runnable { 4, new Object[] { ItemList.OilDrill4.get(1), GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 4), - new Object[] { OrePrefixes.circuit.get(Materials.Infinite), 4L }, ItemList.Electric_Motor_UHV.get(4), + new Object[] { OrePrefixes.circuit.get(Materials.UHV), 4L }, ItemList.Electric_Motor_UHV.get(4), ItemList.Electric_Pump_UHV.get(4), GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Neutronium, 4), ItemList.Sensor_UHV.get(3), ItemList.Field_Generator_UHV.get(3), @@ -109,7 +109,7 @@ public class ResearchStationAssemblyLine implements Runnable { 2048, 8_000_000, 1, - new Object[] { new Object[] { OrePrefixes.circuit.get(Materials.Infinite), 1L }, + new Object[] { new Object[] { OrePrefixes.circuit.get(Materials.UHV), 1L }, GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.Infinity, 8), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Infinity, 8), getModItem(NewHorizonsCoreMod.ID, "item.MicaInsulatorFoil", 64, 0), @@ -126,7 +126,7 @@ public class ResearchStationAssemblyLine implements Runnable { 2048 * 2, 32_000_000, 1, - new Object[] { new Object[] { OrePrefixes.circuit.get(Materials.Bio), 1L }, + new Object[] { new Object[] { OrePrefixes.circuit.get(Materials.UEV), 1L }, GT_OreDictUnificator.get("wireGt02Hypogen", 8L), getModItem(GTPlusPlus.ID, "itemScrewHypogen", 8, 0), getModItem(NewHorizonsCoreMod.ID, "item.MicaInsulatorFoil", 64, 0), getModItem(NewHorizonsCoreMod.ID, "item.MicaInsulatorFoil", 64, 0), @@ -143,7 +143,7 @@ public class ResearchStationAssemblyLine implements Runnable { 8_192, 128_000_000, 1, - new Object[] { new Object[] { OrePrefixes.circuit.get(Materials.Optical), 1L }, + new Object[] { new Object[] { OrePrefixes.circuit.get(Materials.UIV), 1L }, GT_OreDictUnificator.get(OrePrefixes.wireGt02, MaterialsUEVplus.SpaceTime, 8), GT_OreDictUnificator.get(OrePrefixes.screw, MaterialsUEVplus.SpaceTime, 8), getModItem(EternalSingularity.ID, "eternal_singularity", 1L), @@ -171,8 +171,8 @@ public class ResearchStationAssemblyLine implements Runnable { 2, new Object[] { ItemList.Hull_MAX.get(1L), GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUHV, 2L), - ItemList.Circuit_Chip_QPIC.get(2L), - new Object[] { OrePrefixes.circuit.get(Materials.Infinite), 2L }, ItemList.UHV_Coil.get(2L), + ItemList.Circuit_Chip_QPIC.get(2L), new Object[] { OrePrefixes.circuit.get(Materials.UHV), 2L }, + ItemList.UHV_Coil.get(2L), new ItemStack[] { ItemList.Reactor_Coolant_He_6.get(1L), ItemList.Reactor_Coolant_NaK_6.get(1L), ItemList.Reactor_Coolant_Sp_2.get(1L) }, new ItemStack[] { ItemList.Reactor_Coolant_He_6.get(1L), ItemList.Reactor_Coolant_NaK_6.get(1L), @@ -205,7 +205,7 @@ public class ResearchStationAssemblyLine implements Runnable { 4, new Object[] { getItemContainer("Hull_UEV").get(1L), GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUEV, 2L), - ItemList.Circuit_Chip_QPIC.get(4L), new Object[] { OrePrefixes.circuit.get(Materials.Bio), 2L }, + ItemList.Circuit_Chip_QPIC.get(4L), new Object[] { OrePrefixes.circuit.get(Materials.UEV), 2L }, ItemList.UHV_Coil.get(4L), ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Electric_Pump_UEV.get(1L) }, @@ -224,12 +224,11 @@ public class ResearchStationAssemblyLine implements Runnable { 8, new Object[] { getItemContainer("Hull_UIV").get(1L), GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUIV, 2L), - ItemList.Circuit_Chip_QPIC.get(4L), - new Object[] { OrePrefixes.circuit.get(Materials.Optical), 2L }, ItemList.UHV_Coil.get(8L), - ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), + ItemList.Circuit_Chip_QPIC.get(4L), new Object[] { OrePrefixes.circuit.get(Materials.UIV), 2L }, + ItemList.UHV_Coil.get(8L), ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), - ItemList.Electric_Pump_UIV.get(1L) }, + ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Electric_Pump_UIV.get(1L) }, new FluidStack[] { Materials.SuperCoolant.getFluid(16_000L), new FluidStack(solderUEV, 20 * 144), Materials.UUMatter.getFluid(16_000L) }, getItemContainer("Hatch_Energy_UIV").get(1L), @@ -293,8 +292,8 @@ public class ResearchStationAssemblyLine implements Runnable { 4, new Object[] { ItemList.Hull_MAX.get(1L), GT_OreDictUnificator.get(OrePrefixes.spring, Materials.Longasssuperconductornameforuhvwire, 8L), - ItemList.Circuit_Chip_QPIC.get(2L), - new Object[] { OrePrefixes.circuit.get(Materials.Infinite), 2L }, ItemList.UHV_Coil.get(2L), + ItemList.Circuit_Chip_QPIC.get(2L), new Object[] { OrePrefixes.circuit.get(Materials.UHV), 2L }, + ItemList.UHV_Coil.get(2L), new ItemStack[] { ItemList.Reactor_Coolant_He_6.get(1L), ItemList.Reactor_Coolant_NaK_6.get(1L), ItemList.Reactor_Coolant_Sp_2.get(1L) }, new ItemStack[] { ItemList.Reactor_Coolant_He_6.get(1L), ItemList.Reactor_Coolant_NaK_6.get(1L), @@ -327,7 +326,7 @@ public class ResearchStationAssemblyLine implements Runnable { 8, new Object[] { getItemContainer("Hull_UEV").get(1L), GT_OreDictUnificator.get(OrePrefixes.spring, Materials.SuperconductorUEVBase, 8L), - ItemList.Circuit_Chip_QPIC.get(4L), new Object[] { OrePrefixes.circuit.get(Materials.Bio), 2L }, + ItemList.Circuit_Chip_QPIC.get(4L), new Object[] { OrePrefixes.circuit.get(Materials.UEV), 2L }, ItemList.UHV_Coil.get(4L), ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Electric_Pump_UEV.get(1L) }, @@ -346,12 +345,11 @@ public class ResearchStationAssemblyLine implements Runnable { 16, new Object[] { getItemContainer("Hull_UIV").get(1L), GT_OreDictUnificator.get(OrePrefixes.spring, Materials.SuperconductorUIVBase, 8L), - ItemList.Circuit_Chip_QPIC.get(4L), - new Object[] { OrePrefixes.circuit.get(Materials.Optical), 2L }, ItemList.UHV_Coil.get(8L), - ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), + ItemList.Circuit_Chip_QPIC.get(4L), new Object[] { OrePrefixes.circuit.get(Materials.UIV), 2L }, + ItemList.UHV_Coil.get(8L), ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), - ItemList.Electric_Pump_UIV.get(1L) }, + ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Electric_Pump_UIV.get(1L) }, new FluidStack[] { Materials.SuperCoolant.getFluid(16_000L), new FluidStack(solderUEV, 20 * 144), Materials.UUMatter.getFluid(16_000L) }, getItemContainer("Hatch_Dynamo_UIV").get(1L), @@ -570,7 +568,7 @@ public class ResearchStationAssemblyLine implements Runnable { (int) TierEU.RECIPE_UIV, 1, new Object[] { CustomItemList.eM_energyTunnel7_UV.get(32), - new Object[] { OrePrefixes.circuit.get(Materials.Exotic), 32L }, ItemList.Electric_Pump_UIV.get(16), + new Object[] { OrePrefixes.circuit.get(Materials.UMV), 32L }, ItemList.Electric_Pump_UIV.get(16), GT_OreDictUnificator.get(OrePrefixes.plate, MaterialsUEVplus.TranscendentMetal, 64), GT_OreDictUnificator.get(OrePrefixes.gearGt, MaterialsUEVplus.TranscendentMetal, 16), @@ -706,8 +704,8 @@ public class ResearchStationAssemblyLine implements Runnable { GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUEV, 6), ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), - new Object[] { OrePrefixes.circuit.get(Materials.Optical), 20L }, - ItemList.Field_Generator_UEV.get(4), getModItem(EternalSingularity.ID, "eternal_singularity", 4L), + new Object[] { OrePrefixes.circuit.get(Materials.UIV), 20L }, ItemList.Field_Generator_UEV.get(4), + getModItem(EternalSingularity.ID, "eternal_singularity", 4L), getModItem(GTPlusPlus.ID, "MU-metaitem.01", 1L, 32105), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmiridium, 64L), ItemList.Electric_Pump_UEV.get(4), ItemList.ZPM3.get(1), @@ -728,7 +726,7 @@ public class ResearchStationAssemblyLine implements Runnable { 32_000_000, 1, new Object[] { ItemList.Casing_Dim_Trans.get(1), ItemList.MicroTransmitter_UV.get(1), - new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 2L }, + new Object[] { OrePrefixes.circuit.get(Materials.UV), 2L }, getModItem(Avaritia.ID, "Singularity", 2L, 0), GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUHV, 6), getModItem(NewHorizonsCoreMod.ID, "item.PicoWafer", 2, 0), ItemList.Field_Generator_UHV.get(1L) }, @@ -749,7 +747,7 @@ public class ResearchStationAssemblyLine implements Runnable { GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Ledox, 1), GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.CallistoIce, 1), ItemList.Reactor_Coolant_Sp_6.get(1L), getModItem(GTPlusPlus.ID, "itemScrewLaurenium", 12, 0), - new Object[] { OrePrefixes.circuit.get(Materials.Elite), 2L }, + new Object[] { OrePrefixes.circuit.get(Materials.IV), 2L }, GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUHV, 2), ItemList.Super_Chest_IV.get(1), ItemList.Super_Tank_IV.get(1), getModItem(NewHorizonsCoreMod.ID, "item.PicoWafer", 1, 0), }, @@ -806,10 +804,10 @@ public class ResearchStationAssemblyLine implements Runnable { new Object[] { getModItem(ExtraUtilities.ID, "cobblestone_compressed", 1, 7), getModItem(IndustrialCraft2.ID, "blockMachine2", 1, 0), GT_OreDictUnificator.get(OrePrefixes.block, Materials.Infinity, 4L), - new Object[] { OrePrefixes.circuit.get(Materials.Cosmic), 1 }, - new Object[] { OrePrefixes.circuit.get(Materials.Cosmic), 1 }, - new Object[] { OrePrefixes.circuit.get(Materials.Cosmic), 1 }, - new Object[] { OrePrefixes.circuit.get(Materials.Cosmic), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.UXV), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.UXV), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.UXV), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.UXV), 1 }, getModItem(NewHorizonsCoreMod.ID, "item.PicoWafer", 32, 0), ItemList.Robot_Arm_UMV.get(4), ItemList.Emitter_UMV.get(4), ItemList.Sensor_UMV.get(4), }, new FluidStack[] { new FluidStack(FluidRegistry.getFluid("oganesson"), 50000), @@ -829,10 +827,10 @@ public class ResearchStationAssemblyLine implements Runnable { 100000, 3, new Object[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Tritanium, 64L), - new Object[] { OrePrefixes.circuit.get(Materials.Infinite), 1L }, - new Object[] { OrePrefixes.circuit.get(Materials.Infinite), 1L }, - new Object[] { OrePrefixes.circuit.get(Materials.Infinite), 1L }, - new Object[] { OrePrefixes.circuit.get(Materials.Infinite), 1L }, ItemList.Energy_Cluster.get(8L), + new Object[] { OrePrefixes.circuit.get(Materials.UHV), 1L }, + new Object[] { OrePrefixes.circuit.get(Materials.UHV), 1L }, + new Object[] { OrePrefixes.circuit.get(Materials.UHV), 1L }, + new Object[] { OrePrefixes.circuit.get(Materials.UHV), 1L }, ItemList.Energy_Cluster.get(8L), ItemList.Field_Generator_UV.get(2), ItemList.Circuit_Wafer_HPIC.get(64), ItemList.Circuit_Wafer_HPIC.get(64), ItemList.Circuit_Parts_DiodeASMD.get(32), GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUHV, 32), }, @@ -851,10 +849,10 @@ public class ResearchStationAssemblyLine implements Runnable { 6, new Object[] { GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Neutronium, 32L), GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Neutronium, 32L), - new Object[] { OrePrefixes.circuit.get(Materials.Bio), 1L }, - new Object[] { OrePrefixes.circuit.get(Materials.Bio), 1L }, - new Object[] { OrePrefixes.circuit.get(Materials.Bio), 1L }, - new Object[] { OrePrefixes.circuit.get(Materials.Bio), 1L }, ItemList.ZPM2.get(8), + new Object[] { OrePrefixes.circuit.get(Materials.UEV), 1L }, + new Object[] { OrePrefixes.circuit.get(Materials.UEV), 1L }, + new Object[] { OrePrefixes.circuit.get(Materials.UEV), 1L }, + new Object[] { OrePrefixes.circuit.get(Materials.UEV), 1L }, ItemList.ZPM2.get(8), ItemList.Field_Generator_UHV.get(4), ItemList.Circuit_Wafer_UHPIC.get(64), ItemList.Circuit_Wafer_UHPIC.get(64), ItemList.Circuit_Wafer_SoC2.get(32), ItemList.Circuit_Parts_DiodeASMD.get(64), @@ -874,10 +872,10 @@ public class ResearchStationAssemblyLine implements Runnable { 16, new Object[] { GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.InfinityCatalyst, 32L), GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.InfinityCatalyst, 32L), - new Object[] { OrePrefixes.circuit.get(Materials.Optical), 1L }, - new Object[] { OrePrefixes.circuit.get(Materials.Optical), 1L }, - new Object[] { OrePrefixes.circuit.get(Materials.Optical), 1L }, - new Object[] { OrePrefixes.circuit.get(Materials.Optical), 1L }, ItemList.ZPM3.get(8), + new Object[] { OrePrefixes.circuit.get(Materials.UIV), 1L }, + new Object[] { OrePrefixes.circuit.get(Materials.UIV), 1L }, + new Object[] { OrePrefixes.circuit.get(Materials.UIV), 1L }, + new Object[] { OrePrefixes.circuit.get(Materials.UIV), 1L }, ItemList.ZPM3.get(8), ItemList.Field_Generator_UEV.get(4), ItemList.Circuit_Wafer_PPIC.get(64), ItemList.Circuit_Wafer_PPIC.get(64), ItemList.Circuit_Wafer_SoC2.get(64), ItemList.Circuit_Parts_DiodeXSMD.get(64), @@ -898,10 +896,10 @@ public class ResearchStationAssemblyLine implements Runnable { 32, new Object[] { ELEMENT.STANDALONE.HYPOGEN.getPlateDouble(32), ELEMENT.STANDALONE.HYPOGEN.getPlateDouble(32), - new Object[] { OrePrefixes.circuit.get(Materials.Exotic), 1 }, - new Object[] { OrePrefixes.circuit.get(Materials.Exotic), 1 }, - new Object[] { OrePrefixes.circuit.get(Materials.Exotic), 1 }, - new Object[] { OrePrefixes.circuit.get(Materials.Exotic), 1 }, ItemList.ZPM4.get(8L), + new Object[] { OrePrefixes.circuit.get(Materials.UMV), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.UMV), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.UMV), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.UMV), 1 }, ItemList.ZPM4.get(8L), ItemList.Field_Generator_UIV.get(4), ItemList.Circuit_Wafer_QPIC.get(64), ItemList.Circuit_Wafer_QPIC.get(64), GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.RawPicoWafer", 64), @@ -923,10 +921,10 @@ public class ResearchStationAssemblyLine implements Runnable { 64, new Object[] { ELEMENT.STANDALONE.DRAGON_METAL.getPlateDouble(32), ELEMENT.STANDALONE.DRAGON_METAL.getPlateDouble(32), - new Object[] { OrePrefixes.circuit.get(Materials.Cosmic), 1 }, - new Object[] { OrePrefixes.circuit.get(Materials.Cosmic), 1 }, - new Object[] { OrePrefixes.circuit.get(Materials.Cosmic), 1 }, - new Object[] { OrePrefixes.circuit.get(Materials.Cosmic), 1 }, ItemList.ZPM5.get(8L), + new Object[] { OrePrefixes.circuit.get(Materials.UXV), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.UXV), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.UXV), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.UXV), 1 }, ItemList.ZPM5.get(8L), ItemList.Field_Generator_UMV.get(4), ItemList.Circuit_Wafer_QPIC.get(64), ItemList.Circuit_Wafer_QPIC.get(64), GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.PicoWafer", 64), @@ -950,10 +948,10 @@ public class ResearchStationAssemblyLine implements Runnable { 2000000, 1, new Object[] { GregtechItemList.Casing_Fusion_Internal.get(1), - new Object[] { OrePrefixes.circuit.get(Materials.Bio), 1L }, - new Object[] { OrePrefixes.circuit.get(Materials.Bio), 1L }, - new Object[] { OrePrefixes.circuit.get(Materials.Bio), 1L }, - new Object[] { OrePrefixes.circuit.get(Materials.Bio), 1L }, + new Object[] { OrePrefixes.circuit.get(Materials.UEV), 1L }, + new Object[] { OrePrefixes.circuit.get(Materials.UEV), 1L }, + new Object[] { OrePrefixes.circuit.get(Materials.UEV), 1L }, + new Object[] { OrePrefixes.circuit.get(Materials.UEV), 1L }, GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Neutronium, 4), ItemList.Field_Generator_UHV.get(2), ItemList.Circuit_Wafer_QPIC.get(64), GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUHV, 32) }, @@ -971,8 +969,8 @@ public class ResearchStationAssemblyLine implements Runnable { 2000000, 1, new Object[] { ItemList.Energy_LapotronicOrb2.get(16L), - new Object[] { OrePrefixes.circuit.get(Materials.Master), 16L }, - new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 8L }, + new Object[] { OrePrefixes.circuit.get(Materials.LuV), 16L }, + new Object[] { OrePrefixes.circuit.get(Materials.UV), 8L }, GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 8), ItemList.Emitter_UHV.get(1), ItemList.Sensor_UHV.get(1), ItemList.Casing_Fusion_Coil.get(1L), }, new FluidStack[] { Materials.UUMatter.getFluid(8000L), ALLOY.CINOBITE.getFluidStack(2304), @@ -988,8 +986,8 @@ public class ResearchStationAssemblyLine implements Runnable { 512, 2000000, 1, - new Object[] { new Object[] { OrePrefixes.circuit.get(Materials.Data), 16L }, - new Object[] { OrePrefixes.circuit.get(Materials.Elite), 8L }, + new Object[] { new Object[] { OrePrefixes.circuit.get(Materials.EV), 16L }, + new Object[] { OrePrefixes.circuit.get(Materials.IV), 8L }, GT_OreDictUnificator.get(OrePrefixes.block, Materials.TungstenCarbide, 8), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 8), ItemList.Electric_Motor_UHV.get(2), ItemList.Electric_Piston_UHV.get(1), @@ -1008,10 +1006,10 @@ public class ResearchStationAssemblyLine implements Runnable { (int) TierEU.RECIPE_UEV, 8, new Object[] { GregtechItemList.Casing_Fusion_Internal2.get(1), - new Object[] { OrePrefixes.circuit.get(Materials.Optical), 1L }, - new Object[] { OrePrefixes.circuit.get(Materials.Optical), 1L }, - new Object[] { OrePrefixes.circuit.get(Materials.Optical), 1L }, - new Object[] { OrePrefixes.circuit.get(Materials.Optical), 1L }, + new Object[] { OrePrefixes.circuit.get(Materials.UIV), 1L }, + new Object[] { OrePrefixes.circuit.get(Materials.UIV), 1L }, + new Object[] { OrePrefixes.circuit.get(Materials.UIV), 1L }, + new Object[] { OrePrefixes.circuit.get(Materials.UIV), 1L }, GT_OreDictUnificator.get("plateDenseMetastableOganesson", 4), ItemList.Field_Generator_UEV.get(2), getItemContainer("PicoWafer").get(64L), GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUEV, 32) }, @@ -1029,10 +1027,9 @@ public class ResearchStationAssemblyLine implements Runnable { 4096, (int) TierEU.RECIPE_UEV, 8, - new Object[] { ItemList.Energy_Module.get(16), - new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 16L }, - new Object[] { OrePrefixes.circuit.get(Materials.Infinite), 8L }, - ELEMENT.STANDALONE.RHUGNOR.getPlate(8), ItemList.Emitter_UEV.get(1), ItemList.Sensor_UEV.get(1), + new Object[] { ItemList.Energy_Module.get(16), new Object[] { OrePrefixes.circuit.get(Materials.ZPM), 16L }, + new Object[] { OrePrefixes.circuit.get(Materials.UHV), 8L }, ELEMENT.STANDALONE.RHUGNOR.getPlate(8), + ItemList.Emitter_UEV.get(1), ItemList.Sensor_UEV.get(1), getModItem(GoodGenerator.ID, "compactFusionCoil", 1, 2) }, new FluidStack[] { ELEMENT.getInstance().NEPTUNIUM.getFluidStack(2304), ELEMENT.STANDALONE.CHRONOMATIC_GLASS.getFluidStack(2304), ALLOY.ABYSSAL.getFluidStack(2304), @@ -1048,8 +1045,8 @@ public class ResearchStationAssemblyLine implements Runnable { 4096, (int) TierEU.RECIPE_UEV, 8, - new Object[] { new Object[] { OrePrefixes.circuit.get(Materials.Elite), 16L }, - new Object[] { OrePrefixes.circuit.get(Materials.Master), 8L }, + new Object[] { new Object[] { OrePrefixes.circuit.get(Materials.IV), 16L }, + new Object[] { OrePrefixes.circuit.get(Materials.LuV), 8L }, GT_OreDictUnificator.get(OrePrefixes.block, Materials.NaquadahAlloy, 8), ELEMENT.STANDALONE.CHRONOMATIC_GLASS.getPlate(8), ItemList.Electric_Motor_UEV.get(2), ItemList.Electric_Piston_UEV.get(1), GregtechItemList.Casing_Fusion_External.get(1L) }, @@ -1072,7 +1069,7 @@ public class ResearchStationAssemblyLine implements Runnable { getModItem(KubaTech.ID, "defc.casing", 1, 8), GT_OreDictUnificator.get(OrePrefixes.plateDense, MaterialsBotania.GaiaSpirit, 1L), ItemList.Casing_Coil_AwakenedDraconium.get(8L), ItemList.Electric_Motor_UHV.get(8L), - ItemList.Robot_Arm_UHV.get(4L), new Object[] { OrePrefixes.circuit.get(Materials.Infinite), 4 }, + ItemList.Robot_Arm_UHV.get(4L), new Object[] { OrePrefixes.circuit.get(Materials.UHV), 4 }, ItemList.Gravistar.get(4, new Object() {}), getModItem(Thaumcraft.ID, "ItemEldritchObject", 1, 3), getModItem(BloodMagic.ID, "bloodMagicBaseItems", 8, 29), getModItem(BloodMagic.ID, "bloodMagicBaseItems", 8, 28), }, @@ -1091,7 +1088,7 @@ public class ResearchStationAssemblyLine implements Runnable { new Object[] { getModItem(DraconicEvolution.ID, "draconicCore", 1, 0), GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Draconium, 1L), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Ichorium, 1L), - new Object[] { OrePrefixes.circuit.get(Materials.Infinite), 1 }, }, + new Object[] { OrePrefixes.circuit.get(Materials.UHV), 1 }, }, new FluidStack[] { Materials.Sunnarium.getMolten(14400L), Materials.Void.getMolten(28800L), }, getModItem(KubaTech.ID, "kubaitems", 1, 38), 6000, @@ -1107,7 +1104,7 @@ public class ResearchStationAssemblyLine implements Runnable { new Object[] { getModItem(DraconicEvolution.ID, "draconicCore", 4, 0), GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Draconium, 1L), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 1L), - new Object[] { OrePrefixes.circuit.get(Materials.Bio), 1 }, }, + new Object[] { OrePrefixes.circuit.get(Materials.UEV), 1 }, }, new FluidStack[] { Materials.Neutronium.getMolten(14400L), Materials.Void.getMolten(57600L), }, getModItem(KubaTech.ID, "kubaitems", 1, 39), 12000, @@ -1123,7 +1120,7 @@ public class ResearchStationAssemblyLine implements Runnable { new Object[] { getModItem(DraconicEvolution.ID, "wyvernCore", 4, 0), GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.DraconiumAwakened, 1L), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Infinity, 1L), - new Object[] { OrePrefixes.circuit.get(Materials.Optical), 1L } }, + new Object[] { OrePrefixes.circuit.get(Materials.UIV), 1L } }, new FluidStack[] { Materials.Infinity.getMolten(14400L), Materials.Void.getMolten(115200L), }, getModItem(KubaTech.ID, "kubaitems", 1, 40), 24000, @@ -1139,7 +1136,7 @@ public class ResearchStationAssemblyLine implements Runnable { new Object[] { getModItem(DraconicEvolution.ID, "awakenedCore", 8, 0), GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.DraconiumAwakened, 4L), GT_OreDictUnificator.get(OrePrefixes.plate, MaterialsUEVplus.SpaceTime, 1L), - new Object[] { OrePrefixes.circuit.get(Materials.Exotic), 1 }, }, + new Object[] { OrePrefixes.circuit.get(Materials.UMV), 1 }, }, new FluidStack[] { MaterialsUEVplus.SpaceTime.getMolten(14400L), Materials.Void.getMolten(230400L), }, getModItem(KubaTech.ID, "kubaitems", 1, 41), 36000, @@ -1155,8 +1152,8 @@ public class ResearchStationAssemblyLine implements Runnable { 6, new Object[] { ItemList.Hatch_AutoMaintenance.get(1L), ItemList.Robot_Arm_UV.get(1L), ItemList.Electric_Pump_UV.get(1L), ItemList.Conveyor_Module_UV.get(1L), - new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 4L }, - ItemList.Energy_LapotronicOrb2.get(1L), ItemList.Duct_Tape.get(64L), ItemList.Duct_Tape.get(64L), + new Object[] { OrePrefixes.circuit.get(Materials.UV), 4L }, ItemList.Energy_LapotronicOrb2.get(1L), + ItemList.Duct_Tape.get(64L), ItemList.Duct_Tape.get(64L), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 64L), }, new FluidStack[] { Materials.Lubricant.getFluid(256000), new FluidStack(solderIndalloy, 1296), }, CustomItemList.hatch_CreativeMaintenance.get(1), @@ -1172,7 +1169,7 @@ public class ResearchStationAssemblyLine implements Runnable { 6, new Object[] { CustomItemList.eM_Computer_Bus.get(1), CustomItemList.hatch_CreativeMaintenance.get(1), ItemList.Field_Generator_UIV.get(1L), GregtechItemList.Laser_Lens_Special.get(4), - new Object[] { OrePrefixes.circuit.get(Materials.Exotic), 2 }, CustomItemList.DATApipe.get(64), + new Object[] { OrePrefixes.circuit.get(Materials.UMV), 2 }, CustomItemList.DATApipe.get(64), CustomItemList.DATApipe.get(64), ItemList.Cover_Screen.get(1) }, new FluidStack[] { Materials.Iridium.getMolten(INGOTS * 100), new FluidStack(solderUEV, 2592), new FluidStack(ELEMENT.getInstance().NEPTUNIUM.getPlasma(), 20000), @@ -1289,9 +1286,9 @@ public class ResearchStationAssemblyLine implements Runnable { GT_OreDictUnificator.get(OrePrefixes.gear, Materials.CosmicNeutronium, 2L), GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.CosmicNeutronium, 6L), ItemList.Electric_Motor_UHV.get(2L), ItemList.Electric_Piston_UHV.get(1L), - new Object[] { OrePrefixes.circuit.get(Materials.Infinite), 2L }, - new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 4L }, - new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 8L }, + new Object[] { OrePrefixes.circuit.get(Materials.UHV), 2L }, + new Object[] { OrePrefixes.circuit.get(Materials.UV), 4L }, + new Object[] { OrePrefixes.circuit.get(Materials.ZPM), 8L }, GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Bedrockium, 6L) }, new FluidStack[] { fluid_0, fluid_1, fluid_2 }, ItemList.Robot_Arm_UHV.get(1L), @@ -1333,7 +1330,7 @@ public class ResearchStationAssemblyLine implements Runnable { new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.CosmicNeutronium, 1L), ItemList.Electric_Motor_UHV.get(1L), GT_OreDictUnificator.get(OrePrefixes.stick, Materials.CosmicNeutronium, 8L), ItemList.Gravistar.get(8L), - new Object[] { OrePrefixes.circuit.get(Materials.Infinite), 4L }, + new Object[] { OrePrefixes.circuit.get(Materials.UHV), 4L }, GT_OreDictUnificator.get(OrePrefixes.foil, Materials.ElectrumFlux, 64L), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.ElectrumFlux, 64L), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.ElectrumFlux, 64L), @@ -1357,7 +1354,7 @@ public class ResearchStationAssemblyLine implements Runnable { new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.CosmicNeutronium, 1L), ItemList.Electric_Motor_UHV.get(1L), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.CosmicNeutronium, 8L), ItemList.Gravistar.get(8L), - new Object[] { OrePrefixes.circuit.get(Materials.Infinite), 4L }, + new Object[] { OrePrefixes.circuit.get(Materials.UHV), 4L }, GT_OreDictUnificator.get(OrePrefixes.foil, Materials.ElectrumFlux, 64L), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.ElectrumFlux, 64L), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.ElectrumFlux, 64L), @@ -1380,7 +1377,7 @@ public class ResearchStationAssemblyLine implements Runnable { research_amperage, new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.CosmicNeutronium, 1L), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.CosmicNeutronium, 6L), ItemList.Gravistar.get(4L), - ItemList.Emitter_UHV.get(4L), new Object[] { OrePrefixes.circuit.get(Materials.Bio), 4L }, + ItemList.Emitter_UHV.get(4L), new Object[] { OrePrefixes.circuit.get(Materials.UEV), 4L }, GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Neutronium, 64L), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Neutronium, 64L), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Neutronium, 64L), @@ -1504,9 +1501,9 @@ public class ResearchStationAssemblyLine implements Runnable { GT_OreDictUnificator.get(OrePrefixes.gear, Materials.Infinity, 2L), GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Infinity, 6L), ItemList.Electric_Motor_UEV.get(2L), ItemList.Electric_Piston_UEV.get(1L), - new Object[] { OrePrefixes.circuit.get(Materials.Bio), 2L }, - new Object[] { OrePrefixes.circuit.get(Materials.Infinite), 4L }, - new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 8L }, + new Object[] { OrePrefixes.circuit.get(Materials.UEV), 2L }, + new Object[] { OrePrefixes.circuit.get(Materials.UHV), 4L }, + new Object[] { OrePrefixes.circuit.get(Materials.UV), 8L }, GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Draconium, 6L) }, new FluidStack[] { fluid_0, fluid_1, fluid_2 }, ItemList.Robot_Arm_UEV.get(1L), @@ -1548,7 +1545,7 @@ public class ResearchStationAssemblyLine implements Runnable { new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 1L), ItemList.Electric_Motor_UEV.get(1L), GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Infinity, 16L), ItemList.Gravistar.get(16L), - new Object[] { OrePrefixes.circuit.get(Materials.Bio), 4L }, + new Object[] { OrePrefixes.circuit.get(Materials.UEV), 4L }, GT_OreDictUnificator.get(OrePrefixes.foil, Materials.InfinityCatalyst, 64L), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.InfinityCatalyst, 64L), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.InfinityCatalyst, 64L), @@ -1571,7 +1568,7 @@ public class ResearchStationAssemblyLine implements Runnable { research_amperage, new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 1L), ItemList.Electric_Motor_UEV.get(1), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Infinity, 8L), - ItemList.Gravistar.get(16), new Object[] { OrePrefixes.circuit.get(Materials.Bio), 4L }, + ItemList.Gravistar.get(16), new Object[] { OrePrefixes.circuit.get(Materials.UEV), 4L }, GT_OreDictUnificator.get(OrePrefixes.foil, Materials.InfinityCatalyst, 64L), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.InfinityCatalyst, 64L), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.InfinityCatalyst, 64L), @@ -1594,7 +1591,7 @@ public class ResearchStationAssemblyLine implements Runnable { research_amperage, new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 1L), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Infinity, 6L), ItemList.Gravistar.get(8L), - ItemList.Emitter_UEV.get(4L), new Object[] { OrePrefixes.circuit.get(Materials.Optical), 4L }, + ItemList.Emitter_UEV.get(4L), new Object[] { OrePrefixes.circuit.get(Materials.UIV), 4L }, GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Tritanium, 64L), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Tritanium, 64L), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Tritanium, 64L), @@ -1719,9 +1716,9 @@ public class ResearchStationAssemblyLine implements Runnable { GT_OreDictUnificator.get(OrePrefixes.gear, MaterialsUEVplus.TranscendentMetal, 2L), GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, MaterialsUEVplus.TranscendentMetal, 6L), ItemList.Electric_Motor_UIV.get(2L), ItemList.Electric_Piston_UIV.get(1L), - new Object[] { OrePrefixes.circuit.get(Materials.Optical), 2L }, - new Object[] { OrePrefixes.circuit.get(Materials.Bio), 4L }, - new Object[] { OrePrefixes.circuit.get(Materials.Infinite), 8L }, + new Object[] { OrePrefixes.circuit.get(Materials.UIV), 2L }, + new Object[] { OrePrefixes.circuit.get(Materials.UEV), 4L }, + new Object[] { OrePrefixes.circuit.get(Materials.UHV), 8L }, GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NetherStar, 6L) }, new FluidStack[] { fluid_0, fluid_1, fluid_2 }, ItemList.Robot_Arm_UIV.get(1L), @@ -1764,7 +1761,7 @@ public class ResearchStationAssemblyLine implements Runnable { new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.TranscendentMetal, 1L), ItemList.Electric_Motor_UIV.get(1L), GT_OreDictUnificator.get(OrePrefixes.stick, MaterialsUEVplus.TranscendentMetal, 16L), - ItemList.Gravistar.get(32L), new Object[] { OrePrefixes.circuit.get(Materials.Optical), 4L }, + ItemList.Gravistar.get(32L), new Object[] { OrePrefixes.circuit.get(Materials.UIV), 4L }, getModItem(GTPlusPlus.ID, "itemFoilArceusAlloy2B", 64, 0), getModItem(GTPlusPlus.ID, "itemFoilLafiumCompound", 64, 0), getModItem(GTPlusPlus.ID, "itemFoilCinobiteA243", 64, 0), @@ -1788,7 +1785,7 @@ public class ResearchStationAssemblyLine implements Runnable { new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.TranscendentMetal, 1L), ItemList.Electric_Motor_UIV.get(1), GT_OreDictUnificator.get(OrePrefixes.plate, MaterialsUEVplus.TranscendentMetal, 8L), - ItemList.Gravistar.get(32), new Object[] { OrePrefixes.circuit.get(Materials.Optical), 4L }, + ItemList.Gravistar.get(32), new Object[] { OrePrefixes.circuit.get(Materials.UIV), 4L }, getModItem(GTPlusPlus.ID, "itemFoilArceusAlloy2B", 64, 0), getModItem(GTPlusPlus.ID, "itemFoilLafiumCompound", 64, 0), getModItem(GTPlusPlus.ID, "itemFoilCinobiteA243", 64, 0), @@ -1812,7 +1809,7 @@ public class ResearchStationAssemblyLine implements Runnable { new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.TranscendentMetal, 1L), GT_OreDictUnificator.get(OrePrefixes.plate, MaterialsUEVplus.TranscendentMetal, 6L), ItemList.Gravistar.get(16L), ItemList.Emitter_UIV.get(4L), - new Object[] { OrePrefixes.circuit.get(Materials.Exotic), 4 }, + new Object[] { OrePrefixes.circuit.get(Materials.UMV), 4 }, GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Infinity, 64L), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Infinity, 64L), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Infinity, 64L), @@ -1942,9 +1939,9 @@ public class ResearchStationAssemblyLine implements Runnable { GT_OreDictUnificator.get(OrePrefixes.gear, MaterialsUEVplus.SpaceTime, 2L), GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, MaterialsUEVplus.SpaceTime, 6L), ItemList.Electric_Motor_UMV.get(2L), ItemList.Electric_Piston_UMV.get(1L), - new Object[] { OrePrefixes.circuit.get(Materials.Exotic), 2L }, - new Object[] { OrePrefixes.circuit.get(Materials.Optical), 4L }, - new Object[] { OrePrefixes.circuit.get(Materials.Bio), 8L }, + new Object[] { OrePrefixes.circuit.get(Materials.UMV), 2L }, + new Object[] { OrePrefixes.circuit.get(Materials.UIV), 4L }, + new Object[] { OrePrefixes.circuit.get(Materials.UEV), 8L }, GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Quantium, 6L) }, new FluidStack[] { fluid_0, fluid_1, fluid_2, fluid_3 }, ItemList.Robot_Arm_UMV.get(1L), @@ -1987,7 +1984,7 @@ public class ResearchStationAssemblyLine implements Runnable { new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.SpaceTime, 1L), ItemList.Electric_Motor_UMV.get(1L), GT_OreDictUnificator.get(OrePrefixes.stick, MaterialsUEVplus.SpaceTime, 16L), - ItemList.Gravistar.get(64), new Object[] { OrePrefixes.circuit.get(Materials.Exotic), 4L }, + ItemList.Gravistar.get(64), new Object[] { OrePrefixes.circuit.get(Materials.UMV), 4L }, getModItem(GTPlusPlus.ID, "itemFoilCelestialTungsten", 64, 0), getModItem(GTPlusPlus.ID, "itemFoilQuantum", 64, 0), getModItem(GTPlusPlus.ID, "itemFoilAstralTitanium", 64, 0), @@ -2011,7 +2008,7 @@ public class ResearchStationAssemblyLine implements Runnable { new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.SpaceTime, 1L), ItemList.Electric_Motor_UMV.get(1), GT_OreDictUnificator.get(OrePrefixes.plate, MaterialsUEVplus.SpaceTime, 8L), ItemList.Gravistar.get(64), - new Object[] { OrePrefixes.circuit.get(Materials.Exotic), 4L }, + new Object[] { OrePrefixes.circuit.get(Materials.UMV), 4L }, getModItem(GTPlusPlus.ID, "itemFoilCelestialTungsten", 64, 0), getModItem(GTPlusPlus.ID, "itemFoilQuantum", 64, 0), getModItem(GTPlusPlus.ID, "itemFoilAstralTitanium", 64, 0), @@ -2035,7 +2032,7 @@ public class ResearchStationAssemblyLine implements Runnable { new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.SpaceTime, 1L), GT_OreDictUnificator.get(OrePrefixes.plate, MaterialsUEVplus.SpaceTime, 6L), ItemList.Gravistar.get(32L), ItemList.Emitter_UMV.get(4L), - new Object[] { OrePrefixes.circuit.get(Materials.Cosmic), 4 }, + new Object[] { OrePrefixes.circuit.get(Materials.UXV), 4 }, getModItem(GTPlusPlus.ID, "itemFineWireHypogen", 64, 0), getModItem(GTPlusPlus.ID, "itemFineWireHypogen", 64, 0), getModItem(GTPlusPlus.ID, "itemFineWireHypogen", 64, 0), @@ -2192,9 +2189,9 @@ public class ResearchStationAssemblyLine implements Runnable { GT_OreDictUnificator .get(OrePrefixes.gearGtSmall, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 6L), GT_OreDictUnificator.get("gearGtSmallShirabon", 6L), ItemList.Electric_Motor_UXV.get(2L), - ItemList.Electric_Piston_UXV.get(1L), new Object[] { OrePrefixes.circuit.get(Materials.Cosmic), 2L }, - new Object[] { OrePrefixes.circuit.get(Materials.Exotic), 4L }, - new Object[] { OrePrefixes.circuit.get(Materials.Optical), 8L }, + ItemList.Electric_Piston_UXV.get(1L), new Object[] { OrePrefixes.circuit.get(Materials.UXV), 2L }, + new Object[] { OrePrefixes.circuit.get(Materials.UMV), 4L }, + new Object[] { OrePrefixes.circuit.get(Materials.UIV), 8L }, GT_OreDictUnificator.get(OrePrefixes.wireGt04, MaterialsUEVplus.SpaceTime, 6L), GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Infinity, 6L), Materials.Neutronium.getNanite(8) }, @@ -2252,7 +2249,7 @@ public class ResearchStationAssemblyLine implements Runnable { ItemList.Electric_Motor_UXV.get(1L), GT_OreDictUnificator .get(OrePrefixes.stick, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 16L), - ItemList.NuclearStar.get(16), new Object[] { OrePrefixes.circuit.get(Materials.Cosmic), 4L }, + ItemList.NuclearStar.get(16), new Object[] { OrePrefixes.circuit.get(Materials.UXV), 4L }, GT_OreDictUnificator .get(OrePrefixes.foil, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 64), GT_OreDictUnificator.get("foilShirabon", 64), @@ -2284,7 +2281,7 @@ public class ResearchStationAssemblyLine implements Runnable { ItemList.Electric_Motor_UXV.get(1L), GT_OreDictUnificator .get(OrePrefixes.plate, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 8L), - ItemList.NuclearStar.get(16), new Object[] { OrePrefixes.circuit.get(Materials.Cosmic), 4L }, + ItemList.NuclearStar.get(16), new Object[] { OrePrefixes.circuit.get(Materials.UXV), 4L }, GT_OreDictUnificator .get(OrePrefixes.foil, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 64), GT_OreDictUnificator.get("foilShirabon", 64), @@ -2314,7 +2311,7 @@ public class ResearchStationAssemblyLine implements Runnable { GT_OreDictUnificator .get(OrePrefixes.plate, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 6L), ItemList.NuclearStar.get(64L), ItemList.Emitter_UXV.get(4L), - new Object[] { OrePrefixes.circuit.get(Materials.Cosmic), 8 }, + new Object[] { OrePrefixes.circuit.get(Materials.UXV), 8 }, GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.SuperconductorUMVBase, 64L), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.SuperconductorUMVBase, 64L), @@ -3037,22 +3034,22 @@ public class ResearchStationAssemblyLine implements Runnable { getItemContainer("Hatch_Dynamo_UEV").get(1L), getItemContainer("Hatch_Dynamo_UIV").get(1L), getItemContainer("Hatch_Dynamo_UMV").get(1L), getItemContainer("Hatch_Dynamo_UXV").get(1L) }; - Object[] circuitsTierPlusTwo = { new Object[] { OrePrefixes.circuit.get(Materials.Good), 1L }, // MV - new Object[] { OrePrefixes.circuit.get(Materials.Advanced), 1L }, // HV - new Object[] { OrePrefixes.circuit.get(Materials.Data), 1L }, // EV - new Object[] { OrePrefixes.circuit.get(Materials.Elite), 1L }, // IV - new Object[] { OrePrefixes.circuit.get(Materials.Master), 1L }, // LuV - new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 1L }, // ZPM - new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 1L }, // UV - new Object[] { OrePrefixes.circuit.get(Materials.Infinite), 1L }, // UHV - new Object[] { OrePrefixes.circuit.get(Materials.Bio), 1L }, // UEV - new Object[] { OrePrefixes.circuit.get(Materials.Optical), 1L }, // UIV - new Object[] { OrePrefixes.circuit.get(Materials.Exotic), 1L }, // UMV - new Object[] { OrePrefixes.circuit.get(Materials.Cosmic), 1L }, // UXV - new Object[] { OrePrefixes.circuit.get(Materials.Cosmic), 4L }, // MAX (Technically not MAX, can be + Object[] circuitsTierPlusTwo = { new Object[] { OrePrefixes.circuit.get(Materials.MV), 1L }, + new Object[] { OrePrefixes.circuit.get(Materials.HV), 1L }, + new Object[] { OrePrefixes.circuit.get(Materials.EV), 1L }, + new Object[] { OrePrefixes.circuit.get(Materials.IV), 1L }, + new Object[] { OrePrefixes.circuit.get(Materials.LuV), 1L }, + new Object[] { OrePrefixes.circuit.get(Materials.ZPM), 1L }, + new Object[] { OrePrefixes.circuit.get(Materials.UV), 1L }, + new Object[] { OrePrefixes.circuit.get(Materials.UHV), 1L }, + new Object[] { OrePrefixes.circuit.get(Materials.UEV), 1L }, + new Object[] { OrePrefixes.circuit.get(Materials.UIV), 1L }, + new Object[] { OrePrefixes.circuit.get(Materials.UMV), 1L }, + new Object[] { OrePrefixes.circuit.get(Materials.UXV), 1L }, + new Object[] { OrePrefixes.circuit.get(Materials.UXV), 4L }, // MAX (Technically not MAX, can be // changed once MAX circuits become // craftable) - new Object[] { OrePrefixes.circuit.get(Materials.Cosmic), 16L } // MAX (Technically not MAX, can be + new Object[] { OrePrefixes.circuit.get(Materials.UXV), 16L } // MAX (Technically not MAX, can be // changed once MAX circuits become // craftable) }; diff --git a/src/main/java/common/recipeLoaders/AssemblyLine.java b/src/main/java/common/recipeLoaders/AssemblyLine.java index cad3b4ec04..d48de45d58 100644 --- a/src/main/java/common/recipeLoaders/AssemblyLine.java +++ b/src/main/java/common/recipeLoaders/AssemblyLine.java @@ -157,7 +157,7 @@ public class AssemblyLine implements Runnable { GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Osmiridium, 24), ItemList.Circuit_Board_Elite.get(1), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.NaquadahAlloy, 64), - new Object[] { OrePrefixes.circuit.get(Materials.Master), 4 }, + new Object[] { OrePrefixes.circuit.get(Materials.LuV), 4 }, ItemList.Circuit_Parts_Crystal_Chip_Master.get(36), ItemList.Circuit_Parts_Crystal_Chip_Master.get(36), ItemList.Circuit_Chip_HPIC.get(64), @@ -180,10 +180,10 @@ public class AssemblyLine implements Runnable { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.NaquadahAlloy, 4), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.NaquadahAlloy, 24), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Europium, 16L), - new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 1 }, - new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 1 }, - new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 1 }, - new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.ZPM), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.ZPM), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.ZPM), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.ZPM), 1 }, ItemList.Energy_LapotronicOrb2.get(8L), ItemList.Field_Generator_LuV.get(2), ItemList.Circuit_Wafer_SoC2.get(64), @@ -206,10 +206,10 @@ public class AssemblyLine implements Runnable { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 4), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Neutronium, 24), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Americium, 32L), - new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 1 }, - new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 1 }, - new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 1 }, - new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.UV), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.UV), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.UV), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.UV), 1 }, ItemList.Energy_Module.get(8L), ItemList.Field_Generator_ZPM.get(2), ItemList.Circuit_Wafer_HPIC.get(64), diff --git a/src/main/java/common/recipeLoaders/Crafting.java b/src/main/java/common/recipeLoaders/Crafting.java index 72985fd8ad..912a6a17e7 100644 --- a/src/main/java/common/recipeLoaders/Crafting.java +++ b/src/main/java/common/recipeLoaders/Crafting.java @@ -26,7 +26,7 @@ public class Crafting implements Runnable { GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.VibrantAlloy, 1), }); // SOFC Controller mk1 - final Object[] mk1_recipe = { "CCC", "PHP", "FBL", 'C', OrePrefixes.circuit.get(Materials.Advanced), 'P', + final Object[] mk1_recipe = { "CCC", "PHP", "FBL", 'C', OrePrefixes.circuit.get(Materials.HV), 'P', ItemList.Electric_Pump_HV.get(1L), 'H', ItemList.Hull_HV.get(1L), 'F', GT_OreDictUnificator.get(OrePrefixes.pipeSmall, Materials.StainlessSteel, 1), 'B', GT_OreDictUnificator.get(OrePrefixes.cableGt02, Materials.Gold, 1), 'L', @@ -34,7 +34,7 @@ public class Crafting implements Runnable { GT_ModHandler.addCraftingRecipe(TileEntities.sofc1.getStackForm(1), mk1_recipe); // SOFC Controller mk2 - final Object[] mk2_recipe = { "CCC", "PHP", "FBL", 'C', OrePrefixes.circuit.get(Materials.Master), 'P', + final Object[] mk2_recipe = { "CCC", "PHP", "FBL", 'C', OrePrefixes.circuit.get(Materials.LuV), 'P', ItemList.Electric_Pump_IV.get(1L), 'H', ItemList.Hull_IV.get(1L), 'F', GT_OreDictUnificator.get(OrePrefixes.pipeSmall, Materials.Ultimate, 1), 'B', Util.getStackofAmountFromOreDict("wireGt04SuperconductorEV", 1), 'L', @@ -43,7 +43,7 @@ public class Crafting implements Runnable { // LSC Controller final Object[] lsc_recipe = { "LPL", "CBC", "LPL", 'L', ItemList.IC2_LapotronCrystal.getWildcard(1L), 'P', - ItemList.Circuit_Chip_PIC.get(1L), 'C', OrePrefixes.circuit.get(Materials.Master), 'B', + ItemList.Circuit_Chip_PIC.get(1L), 'C', OrePrefixes.circuit.get(Materials.LuV), 'B', new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 0), }; GT_ModHandler.addCraftingRecipe(TileEntities.lsc.getStackForm(1), lsc_recipe); diff --git a/src/main/java/common/recipeLoaders/ResearchableAssemblyLine.java b/src/main/java/common/recipeLoaders/ResearchableAssemblyLine.java index 89f22ea39c..7e20cb4ee2 100644 --- a/src/main/java/common/recipeLoaders/ResearchableAssemblyLine.java +++ b/src/main/java/common/recipeLoaders/ResearchableAssemblyLine.java @@ -38,10 +38,10 @@ public class ResearchableAssemblyLine implements Runnable { GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Infinity, 24), GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.InfinityCatalyst, 32L), GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.InfinityCatalyst, 32L), - new Object[] { OrePrefixes.circuit.get(Materials.Optical), 1 }, - new Object[] { OrePrefixes.circuit.get(Materials.Optical), 1 }, - new Object[] { OrePrefixes.circuit.get(Materials.Optical), 1 }, - new Object[] { OrePrefixes.circuit.get(Materials.Optical), 1 }, ItemList.ZPM3.get(8L), + new Object[] { OrePrefixes.circuit.get(Materials.UIV), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.UIV), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.UIV), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.UIV), 1 }, ItemList.ZPM3.get(8L), ItemList.Field_Generator_UEV.get(4), ItemList.Circuit_Wafer_PPIC.get(64), ItemList.Circuit_Wafer_PPIC.get(64), ItemList.Circuit_Wafer_SoC2.get(64), ItemList.Circuit_Parts_DiodeXSMD.get(64), @@ -63,10 +63,10 @@ public class ResearchableAssemblyLine implements Runnable { GT_OreDictUnificator.get(OrePrefixes.screw, MaterialsUEVplus.TranscendentMetal, 24), GT_ModHandler.getModItem(GTPlusPlus.ID, "itemPlateDoubleHypogen", 32), GT_ModHandler.getModItem(GTPlusPlus.ID, "itemPlateDoubleHypogen", 32), - new Object[] { OrePrefixes.circuit.get(Materials.Exotic), 1 }, - new Object[] { OrePrefixes.circuit.get(Materials.Exotic), 1 }, - new Object[] { OrePrefixes.circuit.get(Materials.Exotic), 1 }, - new Object[] { OrePrefixes.circuit.get(Materials.Exotic), 1 }, ItemList.ZPM4.get(8L), + new Object[] { OrePrefixes.circuit.get(Materials.UMV), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.UMV), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.UMV), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.UMV), 1 }, ItemList.ZPM4.get(8L), ItemList.Field_Generator_UIV.get(4), ItemList.Circuit_Wafer_QPIC.get(64), ItemList.Circuit_Wafer_QPIC.get(64), GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.RawPicoWafer", 64), @@ -90,10 +90,10 @@ public class ResearchableAssemblyLine implements Runnable { GT_OreDictUnificator.get(OrePrefixes.screw, MaterialsUEVplus.SpaceTime, 24), GT_ModHandler.getModItem(GTPlusPlus.ID, "itemPlateDoubleDragonblood", 32), GT_ModHandler.getModItem(GTPlusPlus.ID, "itemPlateDoubleDragonblood", 32), - new Object[] { OrePrefixes.circuit.get(Materials.Cosmic), 1 }, - new Object[] { OrePrefixes.circuit.get(Materials.Cosmic), 1 }, - new Object[] { OrePrefixes.circuit.get(Materials.Cosmic), 1 }, - new Object[] { OrePrefixes.circuit.get(Materials.Cosmic), 1 }, ItemList.ZPM5.get(8L), + new Object[] { OrePrefixes.circuit.get(Materials.UXV), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.UXV), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.UXV), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.UXV), 1 }, ItemList.ZPM5.get(8L), ItemList.Field_Generator_UMV.get(4), ItemList.Circuit_Wafer_QPIC.get(64), ItemList.Circuit_Wafer_QPIC.get(64), GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.PicoWafer", 64), @@ -118,10 +118,10 @@ public class ResearchableAssemblyLine implements Runnable { GT_OreDictUnificator.get(OrePrefixes.screw, Materials.CosmicNeutronium, 24), GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Neutronium, 32L), GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Neutronium, 32L), - new Object[] { OrePrefixes.circuit.get(Materials.Bio), 1 }, - new Object[] { OrePrefixes.circuit.get(Materials.Bio), 1 }, - new Object[] { OrePrefixes.circuit.get(Materials.Bio), 1 }, - new Object[] { OrePrefixes.circuit.get(Materials.Bio), 1 }, ItemList.ZPM2.get(8L), + new Object[] { OrePrefixes.circuit.get(Materials.UEV), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.UEV), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.UEV), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.UEV), 1 }, ItemList.ZPM2.get(8L), ItemList.Field_Generator_UHV.get(4), ItemList.Circuit_Wafer_UHPIC.get(64), ItemList.Circuit_Wafer_UHPIC.get(64), ItemList.Circuit_Wafer_SoC2.get(32), ItemList.Circuit_Parts_DiodeASMD.get(64), diff --git a/src/main/java/goodgenerator/crossmod/thaumcraft/Research.java b/src/main/java/goodgenerator/crossmod/thaumcraft/Research.java index 5f18c20ae1..7a58ac18bf 100644 --- a/src/main/java/goodgenerator/crossmod/thaumcraft/Research.java +++ b/src/main/java/goodgenerator/crossmod/thaumcraft/Research.java @@ -70,7 +70,7 @@ public class Research { GregTech_API.sThaumcraftCompat.addInfusionRecipe( "ESSENTIA_GENERATOR", ItemList.Hull_HV.get(1), - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 1L), + new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 1L), new ItemStack(ConfigBlocks.blockJar, 1), GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Thaumium, 1L), GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Emerald, 1L), @@ -576,10 +576,10 @@ public class Research { new ItemStack(ConfigBlocks.blockCrystal, 1, 1), new ItemStack(ConfigBlocks.blockMetalDevice, 1, 3), ItemList.Electric_Piston_IV.get(1), GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.FierySteel, 1L), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Elite, 1L), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Elite, 1L), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Elite, 1L), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Elite, 1L) }, + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.IV, 1L), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.IV, 1L), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.IV, 1L), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.IV, 1L) }, ItemRefer.Large_Essentia_Smeltery.get(1), 16, Arrays.asList( diff --git a/src/main/java/goodgenerator/loader/ComponentAssemblyLineRecipeLoader.java b/src/main/java/goodgenerator/loader/ComponentAssemblyLineRecipeLoader.java index a37b1ac329..f72a31ed65 100644 --- a/src/main/java/goodgenerator/loader/ComponentAssemblyLineRecipeLoader.java +++ b/src/main/java/goodgenerator/loader/ComponentAssemblyLineRecipeLoader.java @@ -448,7 +448,7 @@ public class ComponentAssemblyLineRecipeLoader { double multiplier = magnetoConversionMultipliers.get(data.mPrefix); stacks.addAll( getWrappedCircuits( - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Infinite, 1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.UHV, 1), (int) (total * multiplier), "circuitInfinite")); } diff --git a/src/main/java/goodgenerator/loader/RecipeLoader.java b/src/main/java/goodgenerator/loader/RecipeLoader.java index 11ecf7b701..d6f1682da9 100644 --- a/src/main/java/goodgenerator/loader/RecipeLoader.java +++ b/src/main/java/goodgenerator/loader/RecipeLoader.java @@ -97,7 +97,7 @@ public class RecipeLoader { ItemRefer.Radiation_Protection_Plate.get(16), ItemList.Field_Generator_ZPM.get(2), ItemList.Electric_Pump_ZPM.get(8), - new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 4 }, + new Object[] { OrePrefixes.circuit.get(Materials.UV), 4 }, GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.SuperconductorLuV, 8), GT_OreDictUnificator.get(OrePrefixes.pipeHuge, Materials.Naquadah, 4), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NaquadahAlloy, 8), @@ -659,7 +659,7 @@ public class RecipeLoader { ItemRefer.Advanced_Radiation_Protection_Plate.get(64), ItemList.Field_Generator_UV.get(8), ItemList.Electric_Pump_UHV.get(2), - new Object[] { OrePrefixes.circuit.get(Materials.Bio), 4 }, + new Object[] { OrePrefixes.circuit.get(Materials.UEV), 4 }, GT_OreDictUnificator.get(OrePrefixes.pipeHuge, Materials.MysteriousCrystal, 8), ItemList.Circuit_Wafer_NPIC.get(16), ItemList.UHV_Coil.get(64), @@ -724,7 +724,7 @@ public class RecipeLoader { GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Americium, 8), GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.BlackPlutonium, 16), ItemList.Circuit_Wafer_PPIC.get(32), - new Object[] { OrePrefixes.circuit.get(Materials.Infinite), 1L }) + new Object[] { OrePrefixes.circuit.get(Materials.UHV), 1L }) .fluidInputs( WerkstoffLoader.Krypton.getFluidOrGas(1000), Materials.ElectrumFlux.getMolten(9216), @@ -746,7 +746,7 @@ public class RecipeLoader { GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Infinity, 8), GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Neutronium, 16), ItemList.Circuit_Wafer_PPIC.get(48), - new Object[] { OrePrefixes.circuit.get(Materials.Bio), 1L }) + new Object[] { OrePrefixes.circuit.get(Materials.UEV), 1L }) .fluidInputs( Materials.Radon.getPlasma(1000), Materials.DraconiumAwakened.getMolten(9216), @@ -768,7 +768,7 @@ public class RecipeLoader { GT_OreDictUnificator.get(OrePrefixes.plateDense, MaterialsUEVplus.TranscendentMetal, 8), GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Infinity, 16), ItemList.Circuit_Wafer_PPIC.get(64), - new Object[] { OrePrefixes.circuit.get(Materials.Optical), 1L }) + new Object[] { OrePrefixes.circuit.get(Materials.UIV), 1L }) .fluidInputs( WerkstoffLoader.Oganesson.getFluidOrGas(1000), Materials.Neutronium.getMolten(9216), @@ -1017,7 +1017,7 @@ public class RecipeLoader { .itemInputs( ItemRefer.Quartz_Crystal_Resonator.get(2), ItemRefer.Plastic_Case.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Good, 1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.MV, 1), ItemList.Cover_Screen.get(1), GT_OreDictUnificator.get(OrePrefixes.componentCircuit, Materials.Diode, 16L), GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Aluminium, 8)) @@ -1031,7 +1031,7 @@ public class RecipeLoader { .itemInputs( ItemRefer.Quartz_Crystal_Resonator.get(2), ItemRefer.Plastic_Case.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Good, 1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.MV, 1), ItemList.Cover_Screen.get(1), ItemList.Circuit_Parts_DiodeASMD.get(4), GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Aluminium, 8)) @@ -1180,7 +1180,7 @@ public class RecipeLoader { ItemList.Cover_ActivityDetector.get(1L), ItemList.Cover_Screen.get(1L), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.VibrantAlloy, 4), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Data, 1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.EV, 1), ItemList.Sensor_HV.get(2), GT_Utility.getIntegratedCircuit(1)) .fluidInputs(Materials.Helium.getGas(1000)) diff --git a/src/main/java/goodgenerator/loader/RecipeLoader_02.java b/src/main/java/goodgenerator/loader/RecipeLoader_02.java index 207868e59d..318e09a1f4 100644 --- a/src/main/java/goodgenerator/loader/RecipeLoader_02.java +++ b/src/main/java/goodgenerator/loader/RecipeLoader_02.java @@ -74,7 +74,7 @@ public class RecipeLoader_02 { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.BlueAlloy, 1), GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorHV, 32), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Beryllium, 32), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Elite, 1)) + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.IV, 1)) .itemOutputs(ItemRefer.Speeding_Pipe.get(1)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_EV) @@ -525,7 +525,7 @@ public class RecipeLoader_02 { .itemInputs( GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Naquadah, 1), ItemRefer.Fluid_Storage_Core_T3.get(10), - new Object[] { OrePrefixes.circuit.get(Materials.Master), 8 }, + new Object[] { OrePrefixes.circuit.get(Materials.LuV), 8 }, ItemList.Electric_Pump_IV.get(8), GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.NiobiumTitanium, 8), MyMaterial.adamantiumAlloy.get(OrePrefixes.plate, 32)) @@ -544,7 +544,7 @@ public class RecipeLoader_02 { .itemInputs( GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 1), ItemRefer.Fluid_Storage_Core_T4.get(10), - new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 8 }, + new Object[] { OrePrefixes.circuit.get(Materials.ZPM), 8 }, ItemList.Electric_Pump_LuV.get(8), GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.MysteriousCrystal, 8), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.ElectrumFlux, 32)) @@ -563,7 +563,7 @@ public class RecipeLoader_02 { .itemInputs( GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.CosmicNeutronium, 1), ItemRefer.Fluid_Storage_Core_T5.get(10), - new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 8 }, + new Object[] { OrePrefixes.circuit.get(Materials.UV), 8 }, ItemList.Electric_Pump_ZPM.get(8), GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.DraconiumAwakened, 8), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 64)) @@ -582,7 +582,7 @@ public class RecipeLoader_02 { .itemInputs( GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 1), ItemRefer.Fluid_Storage_Core_T6.get(2), - new Object[] { OrePrefixes.circuit.get(Materials.Infinite), 8L }, + new Object[] { OrePrefixes.circuit.get(Materials.UHV), 8L }, ItemList.Electric_Pump_UV.get(8), GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.NetherStar, 8), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Infinity, 64)) @@ -601,7 +601,7 @@ public class RecipeLoader_02 { .itemInputs( GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 1), ItemRefer.Fluid_Storage_Core_T7.get(2), - new Object[] { OrePrefixes.circuit.get(Materials.Bio), 8L }, + new Object[] { OrePrefixes.circuit.get(Materials.UEV), 8L }, ItemList.Electric_Pump_UHV.get(8), GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.NetherStar, 16), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.CosmicNeutronium, 32), @@ -621,7 +621,7 @@ public class RecipeLoader_02 { .itemInputs( GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 1), ItemRefer.Fluid_Storage_Core_T8.get(2), - new Object[] { OrePrefixes.circuit.get(Materials.Optical), 8L }, + new Object[] { OrePrefixes.circuit.get(Materials.UIV), 8L }, ItemList.Electric_Pump_UEV.get(8), GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.NetherStar, 12), GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.CosmicNeutronium, 12), @@ -643,7 +643,7 @@ public class RecipeLoader_02 { .itemInputs( GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 2), ItemRefer.Fluid_Storage_Core_T9.get(2), - new Object[] { OrePrefixes.circuit.get(Materials.Exotic), 8L }, + new Object[] { OrePrefixes.circuit.get(Materials.UMV), 8L }, ItemList.Electric_Pump_UIV.get(8), GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.NetherStar, 12), GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.CosmicNeutronium, 12), @@ -664,7 +664,7 @@ public class RecipeLoader_02 { .itemInputs( GT_OreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.SpaceTime, 2), ItemRefer.Fluid_Storage_Core_T10.get(2), - new Object[] { OrePrefixes.circuit.get(Materials.Cosmic), 12L }, + new Object[] { OrePrefixes.circuit.get(Materials.UXV), 12L }, ItemList.Electric_Pump_UMV.get(8), GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.NetherStar, 64), GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.CosmicNeutronium, 12), @@ -1139,7 +1139,7 @@ public class RecipeLoader_02 { MyMaterial.marM200.get(OrePrefixes.plate, 2), MyMaterial.marCeM200.get(OrePrefixes.gearGt, 2), MyMaterial.incoloy903.get(OrePrefixes.pipeLarge, 2), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 2), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.LuV, 2), ItemList.Hull_IV.get(1)) .itemOutputs(ItemRefer.SC_Fluid_Turbine.get(1)) .duration(15 * SECONDS) @@ -1349,7 +1349,7 @@ public class RecipeLoader_02 { ItemList.Robot_Arm_EV.get(2), GT_OreDictUnificator.get(OrePrefixes.cableGt02, Materials.Osmiridium, 2), MyMaterial.marM200.get(OrePrefixes.plateDouble, 2), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Data, 1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.EV, 1), ELEMENT.getInstance().RUTHENIUM.getBolt(32), GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Platinum, 8)) .fluidInputs(MyMaterial.zircaloy4.getMolten(576)) @@ -1465,7 +1465,7 @@ public class RecipeLoader_02 { ItemList.FusionComputer_LuV.get(48), ItemRefer.HiC_T1.get(8), MyMaterial.marCeM200.get(OrePrefixes.plate, 32), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 8), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.LuV, 8), ItemList.Circuit_Wafer_HPIC.get(16), ItemList.Field_Generator_LuV.get(4), MyMaterial.marM200.get(OrePrefixes.stickLong, 8)) @@ -1568,7 +1568,7 @@ public class RecipeLoader_02 { GT_Values.RA.stdBuilder() .itemInputs( GregtechItemList.Casing_Fusion_Internal2.get(3), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Bio, 1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.UEV, 1), ItemRefer.HiC_T5.get(4), CI.getEnergyCore(5, 1)) .itemOutputs(ItemRefer.Compact_Fusion_Coil_T4.get(1)) diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java index 2435e1aad7..6bdf6cb776 100644 --- a/src/main/java/gregtech/api/enums/Materials.java +++ b/src/main/java/gregtech/api/enums/Materials.java @@ -348,6 +348,8 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { public static Materials Vyroxeres = new Materials( 951, TextureSet.SET_METALLIC , 32.0F, 7680, 1, 1|2 |8 |64 , 85, 224, 1, 0, "Vyroxeres" , "Vyroxeres" , 0, 0, 5400, 5400, true, false, 1, 1, 1, Dyes._NULL ).disableAutoGeneratedBlastFurnaceRecipes().setTurbineMultipliers(1, 3, 1); public static Materials Yellorium = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1|2 , 255, 255, 255, 0, "Yellorium" , "Yellorium" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes.dyeYellow ); public static Materials Zectium = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1|2 |8 , 255, 255, 255, 0, "Zectium" , "Zectium" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes.dyeBlack ); + public static Materials Ultimate = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 0, 0 , 255, 255, 255, 0, "Ultimate" , "Ultimate" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray , Collections.singletonList(new TC_AspectStack(TC_Aspects.MACHINA, 8))); + public static Materials Advanced = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 0, 0 , 255, 255, 255, 0, "Advanced" , "Advanced" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray , Collections.singletonList(new TC_AspectStack(TC_Aspects.MACHINA, 4))); /** * Tiered materials, primarily Circuitry, Batteries and other Technical things @@ -360,13 +362,13 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { public static Materials IV = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 0, 0 , 255, 255, 255, 0, "Elite" , "Elite" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray , Collections.singletonList(new TC_AspectStack(TC_Aspects.MACHINA, 6))); public static Materials LuV = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 0, 0 , 255, 255, 255, 0, "Master" , "Master" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray , Collections.singletonList(new TC_AspectStack(TC_Aspects.MACHINA, 7))); public static Materials ZPM = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 0, 0 , 255, 255, 255, 0, "Ultimate" , "Ultimate" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray , Collections.singletonList(new TC_AspectStack(TC_Aspects.MACHINA, 8))); - public static Materials UV = Materials.SuperconductorUHV; //I hate this - public static Materials UHV = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 0, 0 , 255, 255, 255, 0, "Infinite" , "Infinite" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray , Collections.singletonList(new TC_AspectStack(TC_Aspects.ELECTRUM, 9))); - public static Materials UEV = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 0, 0 , 255, 255, 255, 0, "Bio" , "Bio" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray , Collections.singletonList(new TC_AspectStack(TC_Aspects.ELECTRUM, 10))); - public static Materials UIV = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 0, 0 , 255, 255, 255, 0, "Optical" , "Optical" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray , Collections.singletonList(new TC_AspectStack(TC_Aspects.ELECTRUM, 13))); - public static Materials UMV = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 0, 0 , 255, 255, 255, 0, "Exotic" , "Exotic" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray , Collections.singletonList(new TC_AspectStack(TC_Aspects.ELECTRUM, 14))); - public static Materials UXV = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 0, 0 , 255, 255, 255, 0, "Cosmic" , "Cosmic" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray , Collections.singletonList(new TC_AspectStack(TC_Aspects.ELECTRUM, 15))); - public static Materials MAX = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 0, 0 , 255, 255, 255, 0, "Transcendent" , "Transcendent" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray , Collections.singletonList(new TC_AspectStack(TC_Aspects.ELECTRUM, 16))); + public static Materials UV = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 0, 0 , 255, 255, 255, 0, "Superconductor" , "Superconductor" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray , Collections.singletonList(new TC_AspectStack(TC_Aspects.MACHINA, 9))); + public static Materials UHV = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 0, 0 , 255, 255, 255, 0, "Infinite" , "Infinite" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray , Collections.singletonList(new TC_AspectStack(TC_Aspects.ELECTRUM, 10))); + public static Materials UEV = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 0, 0 , 255, 255, 255, 0, "Bio" , "Bio" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray , Collections.singletonList(new TC_AspectStack(TC_Aspects.ELECTRUM, 11))); + public static Materials UIV = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 0, 0 , 255, 255, 255, 0, "Optical" , "Optical" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray , Collections.singletonList(new TC_AspectStack(TC_Aspects.ELECTRUM, 12))); + public static Materials UMV = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 0, 0 , 255, 255, 255, 0, "Exotic" , "Exotic" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray , Collections.singletonList(new TC_AspectStack(TC_Aspects.ELECTRUM, 13))); + public static Materials UXV = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 0, 0 , 255, 255, 255, 0, "Cosmic" , "Cosmic" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray , Collections.singletonList(new TC_AspectStack(TC_Aspects.ELECTRUM, 14))); + public static Materials MAX = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 0, 0 , 255, 255, 255, 0, "Transcendent" , "Transcendent" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray , Collections.singletonList(new TC_AspectStack(TC_Aspects.ELECTRUM, 15))); public static Materials Resistor = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 0, 0 , 255, 255, 255, 0, "Resistor" , "Resistor" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray , Collections.singletonList(new TC_AspectStack(TC_Aspects.ELECTRUM, 1))); public static Materials Diode = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 0, 0 , 255, 255, 255, 0, "Diode" , "Diode" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray , Collections.singletonList(new TC_AspectStack(TC_Aspects.ELECTRUM, 1))); @@ -389,16 +391,12 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { @Deprecated public static Materials Good = Materials.MV; @Deprecated - public static Materials Advanced = Materials.HV; - @Deprecated public static Materials Data = Materials.EV; @Deprecated public static Materials Elite = Materials.IV; @Deprecated public static Materials Master = Materials.LuV; @Deprecated - public static Materials Ultimate = Materials.ZPM; - @Deprecated public static Materials Infinite = Materials.UHV; @Deprecated public static Materials Bio = Materials.UEV; diff --git a/src/main/java/gregtech/api/enums/Tier.java b/src/main/java/gregtech/api/enums/Tier.java index 84e8344334..2d64444283 100644 --- a/src/main/java/gregtech/api/enums/Tier.java +++ b/src/main/java/gregtech/api/enums/Tier.java @@ -19,8 +19,8 @@ public class Tier { ItemList.Hull_ULV, OrePrefixes.cableGt01.get(Materials.Lead), OrePrefixes.cableGt04.get(Materials.Lead), - OrePrefixes.circuit.get(Materials.Primitive), - OrePrefixes.circuit.get(Materials.Basic)), + OrePrefixes.circuit.get(Materials.ULV), + OrePrefixes.circuit.get(Materials.LV)), new Tier( SubTag.ENERGY_ELECTRICITY, 1, @@ -32,8 +32,8 @@ public class Tier { ItemList.Hull_LV, OrePrefixes.cableGt01.get(Materials.Tin), OrePrefixes.cableGt04.get(Materials.Tin), - OrePrefixes.circuit.get(Materials.Basic), - OrePrefixes.circuit.get(Materials.Good)), + OrePrefixes.circuit.get(Materials.LV), + OrePrefixes.circuit.get(Materials.MV)), new Tier( SubTag.ENERGY_ELECTRICITY, 2, @@ -45,8 +45,8 @@ public class Tier { ItemList.Hull_MV, OrePrefixes.cableGt01.get(Materials.AnyCopper), OrePrefixes.cableGt04.get(Materials.AnyCopper), - OrePrefixes.circuit.get(Materials.Good), - OrePrefixes.circuit.get(Materials.Advanced)), + OrePrefixes.circuit.get(Materials.MV), + OrePrefixes.circuit.get(Materials.HV)), new Tier( SubTag.ENERGY_ELECTRICITY, 3, @@ -58,8 +58,8 @@ public class Tier { ItemList.Hull_HV, OrePrefixes.cableGt01.get(Materials.Gold), OrePrefixes.cableGt04.get(Materials.Gold), - OrePrefixes.circuit.get(Materials.Advanced), - OrePrefixes.circuit.get(Materials.Data)), + OrePrefixes.circuit.get(Materials.HV), + OrePrefixes.circuit.get(Materials.EV)), new Tier( SubTag.ENERGY_ELECTRICITY, 4, @@ -71,8 +71,8 @@ public class Tier { ItemList.Hull_EV, OrePrefixes.cableGt01.get(Materials.Aluminium), OrePrefixes.cableGt04.get(Materials.Aluminium), - OrePrefixes.circuit.get(Materials.Data), - OrePrefixes.circuit.get(Materials.Elite)), + OrePrefixes.circuit.get(Materials.EV), + OrePrefixes.circuit.get(Materials.IV)), new Tier( SubTag.ENERGY_ELECTRICITY, 5, @@ -84,8 +84,8 @@ public class Tier { ItemList.Hull_IV, OrePrefixes.cableGt01.get(Materials.Platinum), OrePrefixes.cableGt04.get(Materials.Platinum), - OrePrefixes.circuit.get(Materials.Elite), - OrePrefixes.circuit.get(Materials.Master)), + OrePrefixes.circuit.get(Materials.IV), + OrePrefixes.circuit.get(Materials.LuV)), new Tier( SubTag.ENERGY_ELECTRICITY, 6, @@ -97,8 +97,8 @@ public class Tier { ItemList.Hull_LuV, OrePrefixes.cableGt01.get(Materials.NiobiumTitanium), OrePrefixes.cableGt04.get(Materials.NiobiumTitanium), - OrePrefixes.circuit.get(Materials.Master), - OrePrefixes.circuit.get(Materials.Ultimate)), + OrePrefixes.circuit.get(Materials.LuV), + OrePrefixes.circuit.get(Materials.ZPM)), new Tier( SubTag.ENERGY_ELECTRICITY, 7, @@ -110,8 +110,8 @@ public class Tier { ItemList.Hull_ZPM, OrePrefixes.cableGt01.get(Materials.Naquadah), OrePrefixes.cableGt04.get(Materials.Naquadah), - OrePrefixes.circuit.get(Materials.Ultimate), - OrePrefixes.circuit.get(Materials.SuperconductorUHV)), + OrePrefixes.circuit.get(Materials.ZPM), + OrePrefixes.circuit.get(Materials.UV)), new Tier( SubTag.ENERGY_ELECTRICITY, 8, @@ -123,8 +123,8 @@ public class Tier { ItemList.Hull_UV, OrePrefixes.cableGt04.get(Materials.NaquadahAlloy), OrePrefixes.wireGt01.get(Materials.SuperconductorUHV), - OrePrefixes.circuit.get(Materials.SuperconductorUHV), - OrePrefixes.circuit.get(Materials.Infinite)), + OrePrefixes.circuit.get(Materials.UV), + OrePrefixes.circuit.get(Materials.UHV)), new Tier( SubTag.ENERGY_ELECTRICITY, 9, @@ -136,8 +136,8 @@ public class Tier { ItemList.Hull_MAX, OrePrefixes.wireGt01.get(Materials.SuperconductorUHV), OrePrefixes.wireGt04.get(Materials.SuperconductorUHV), - OrePrefixes.circuit.get(Materials.Infinite), - OrePrefixes.circuit.get(Materials.Infinite)), + OrePrefixes.circuit.get(Materials.UHV), + OrePrefixes.circuit.get(Materials.UHV)), new Tier( SubTag.ENERGY_ELECTRICITY, 10, @@ -149,8 +149,8 @@ public class Tier { ItemList.Hull_MAX, OrePrefixes.wireGt01.get(Materials.SuperconductorUHV), OrePrefixes.wireGt04.get(Materials.SuperconductorUHV), - OrePrefixes.circuit.get(Materials.Infinite), - OrePrefixes.circuit.get(Materials.Infinite)), + OrePrefixes.circuit.get(Materials.UHV), + OrePrefixes.circuit.get(Materials.UHV)), new Tier( SubTag.ENERGY_ELECTRICITY, 11, @@ -162,8 +162,8 @@ public class Tier { ItemList.Hull_MAX, OrePrefixes.wireGt01.get(Materials.SuperconductorUHV), OrePrefixes.wireGt04.get(Materials.SuperconductorUHV), - OrePrefixes.circuit.get(Materials.Infinite), - OrePrefixes.circuit.get(Materials.Infinite)), + OrePrefixes.circuit.get(Materials.UHV), + OrePrefixes.circuit.get(Materials.UHV)), new Tier( SubTag.ENERGY_ELECTRICITY, 12, @@ -175,8 +175,8 @@ public class Tier { ItemList.Hull_MAX, OrePrefixes.wireGt01.get(Materials.SuperconductorUHV), OrePrefixes.wireGt04.get(Materials.SuperconductorUHV), - OrePrefixes.circuit.get(Materials.Infinite), - OrePrefixes.circuit.get(Materials.Infinite)), + OrePrefixes.circuit.get(Materials.UHV), + OrePrefixes.circuit.get(Materials.UHV)), new Tier( SubTag.ENERGY_ELECTRICITY, 13, @@ -188,8 +188,8 @@ public class Tier { ItemList.Hull_MAX, OrePrefixes.wireGt01.get(Materials.SuperconductorUHV), OrePrefixes.wireGt04.get(Materials.SuperconductorUHV), - OrePrefixes.circuit.get(Materials.Infinite), - OrePrefixes.circuit.get(Materials.Infinite)), + OrePrefixes.circuit.get(Materials.UHV), + OrePrefixes.circuit.get(Materials.UHV)), new Tier( SubTag.ENERGY_ELECTRICITY, 14, @@ -201,8 +201,8 @@ public class Tier { ItemList.Hull_MAX, OrePrefixes.wireGt01.get(Materials.SuperconductorUHV), OrePrefixes.wireGt04.get(Materials.SuperconductorUHV), - OrePrefixes.circuit.get(Materials.Infinite), - OrePrefixes.circuit.get(Materials.Infinite)), + OrePrefixes.circuit.get(Materials.UHV), + OrePrefixes.circuit.get(Materials.UHV)), new Tier( SubTag.ENERGY_ELECTRICITY, 15, @@ -214,8 +214,8 @@ public class Tier { ItemList.Hull_MAX, OrePrefixes.wireGt01.get(Materials.SuperconductorUHV), OrePrefixes.wireGt04.get(Materials.SuperconductorUHV), - OrePrefixes.circuit.get(Materials.Infinite), - OrePrefixes.circuit.get(Materials.Infinite)), + OrePrefixes.circuit.get(Materials.UHV), + OrePrefixes.circuit.get(Materials.UHV)), // READ GT_VALUES CLASS BEFORE YOU START ADDING STUFF TO TIERS 8+ - and probably dont do it in // GT but in GTNH core mod - that way we shouldnt need to set the tier class diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Maintenance.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Maintenance.java index e1b5ee8f03..cdd289221a 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Maintenance.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Maintenance.java @@ -83,7 +83,7 @@ public class GT_MetaTileEntity_Hatch_Maintenance extends GT_MetaTileEntity_Hatch if (sAutoMaintenanceInputs == null) sAutoMaintenanceInputs = new ItemStack[] { ItemList.Duct_Tape.get(4), GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Lubricant, 2), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 4), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 2) }; + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 2) }; return sAutoMaintenanceInputs; } diff --git a/src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java b/src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java index 0dc5000e7a..d0ef03a1ae 100644 --- a/src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java +++ b/src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java @@ -69,7 +69,7 @@ public class GT_IntegratedCircuit_Item extends GT_Generic_Item implements INetwo GT_ModHandler.addShapelessCraftingRecipe( ItemList.Circuit_Integrated.getWithDamage(1L, 0L), GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { OrePrefixes.circuit.get(Materials.Basic) }); + new Object[] { OrePrefixes.circuit.get(Materials.LV) }); long bits = GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE; GT_ModHandler.addCraftingRecipe( ItemList.Circuit_Integrated.getWithDamage(1L, 1L), diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java index d603d7b004..549081c4cb 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java @@ -1443,7 +1443,7 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 16L), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 16L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 16L), - OrePrefixes.battery.get(Materials.Ultimate))); + OrePrefixes.battery.get(Materials.ZPM))); // ZPM Module ItemList.ZPM.set( @@ -1466,7 +1466,7 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 16L), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 16L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 16L), - OrePrefixes.battery.get(Materials.Ultimate))); + OrePrefixes.battery.get(Materials.ZPM))); // UV Battery ItemList.ZPM2.set( @@ -1533,7 +1533,7 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 16L), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 16L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 16L), - OrePrefixes.battery.get(Materials.Ultimate))); + OrePrefixes.battery.get(Materials.ZPM))); // UV Cluster ItemList.Energy_Cluster.set( @@ -2643,49 +2643,49 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { Circuit_Primitive.ID, "Vacuum Tube", "A very simple Circuit", - OrePrefixes.circuit.get(Materials.Primitive), + OrePrefixes.circuit.get(Materials.ULV), SubTag.NO_UNIFICATION)); ItemList.Circuit_Basic.set( addItem( Circuit_Basic.ID, "Integrated Logic Circuit", "A Basic Circuit", - OrePrefixes.circuit.get(Materials.Basic), + OrePrefixes.circuit.get(Materials.LV), SubTag.NO_UNIFICATION)); ItemList.Circuit_Good.set( addItem( Circuit_Good.ID, "Good Electronic Circuit", "A Good Circuit", - OrePrefixes.circuit.get(Materials.Good), + OrePrefixes.circuit.get(Materials.MV), SubTag.NO_UNIFICATION)); ItemList.Circuit_Advanced.set( addItem( Circuit_Advanced.ID, "Processor Assembly", "An Advanced Circuit", - OrePrefixes.circuit.get(Materials.Advanced), + OrePrefixes.circuit.get(Materials.HV), SubTag.NO_UNIFICATION)); ItemList.Circuit_Data.set( addItem( Circuit_Data.ID, "Workstation", "An Extreme Circuit", - OrePrefixes.circuit.get(Materials.Data), + OrePrefixes.circuit.get(Materials.EV), SubTag.NO_UNIFICATION)); ItemList.Circuit_Elite.set( addItem( Circuit_Elite.ID, "Mainframe", "An Elite Circuit", - OrePrefixes.circuit.get(Materials.Elite), + OrePrefixes.circuit.get(Materials.IV), SubTag.NO_UNIFICATION)); ItemList.Circuit_Master.set( addItem( Circuit_Master.ID, "Nanoprocessor Mainframe", "A Master Circuit", - OrePrefixes.circuit.get(Materials.Master), + OrePrefixes.circuit.get(Materials.LuV), SubTag.NO_UNIFICATION)); // Backwards compatibility. @@ -4468,70 +4468,70 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[] { "CCC", "MSM", "PES", 'S', OrePrefixes.stick.get(Materials.Steel), 'M', ItemList.Electric_Motor_LV, 'P', ItemList.Electric_Piston_LV, 'E', - OrePrefixes.circuit.get(Materials.Basic), 'C', OrePrefixes.cableGt01.get(Materials.Tin) }); + OrePrefixes.circuit.get(Materials.LV), 'C', OrePrefixes.cableGt01.get(Materials.Tin) }); GT_ModHandler.addCraftingRecipe( ItemList.Robot_Arm_MV.get(1L), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[] { "CCC", "MSM", "PES", 'S', OrePrefixes.stick.get(Materials.Aluminium), 'M', ItemList.Electric_Motor_MV, 'P', ItemList.Electric_Piston_MV, 'E', - OrePrefixes.circuit.get(Materials.Good), 'C', OrePrefixes.cableGt01.get(Materials.AnyCopper) }); + OrePrefixes.circuit.get(Materials.MV), 'C', OrePrefixes.cableGt01.get(Materials.AnyCopper) }); GT_ModHandler.addCraftingRecipe( ItemList.Robot_Arm_HV.get(1L), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[] { "CCC", "MSM", "PES", 'S', OrePrefixes.stick.get(Materials.StainlessSteel), 'M', ItemList.Electric_Motor_HV, 'P', ItemList.Electric_Piston_HV, 'E', - OrePrefixes.circuit.get(Materials.Advanced), 'C', OrePrefixes.cableGt01.get(Materials.Gold) }); + OrePrefixes.circuit.get(Materials.HV), 'C', OrePrefixes.cableGt01.get(Materials.Gold) }); GT_ModHandler.addCraftingRecipe( ItemList.Robot_Arm_EV.get(1L), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[] { "CCC", "MSM", "PES", 'S', OrePrefixes.stick.get(Materials.Titanium), 'M', ItemList.Electric_Motor_EV, 'P', ItemList.Electric_Piston_EV, 'E', - OrePrefixes.circuit.get(Materials.Data), 'C', OrePrefixes.cableGt01.get(Materials.Aluminium) }); + OrePrefixes.circuit.get(Materials.EV), 'C', OrePrefixes.cableGt01.get(Materials.Aluminium) }); GT_ModHandler.addCraftingRecipe( ItemList.Robot_Arm_IV.get(1L), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[] { "CCC", "MSM", "PES", 'S', OrePrefixes.stick.get(Materials.TungstenSteel), 'M', ItemList.Electric_Motor_IV, 'P', ItemList.Electric_Piston_IV, 'E', - OrePrefixes.circuit.get(Materials.Elite), 'C', OrePrefixes.cableGt01.get(Materials.Tungsten) }); + OrePrefixes.circuit.get(Materials.IV), 'C', OrePrefixes.cableGt01.get(Materials.Tungsten) }); GT_ModHandler.addCraftingRecipe( ItemList.Emitter_LV.get(1L), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[] { "SSC", "WQS", "CWS", 'Q', OrePrefixes.gem.get(Materials.CertusQuartz), 'S', - OrePrefixes.stick.get(Materials.Brass), 'C', OrePrefixes.circuit.get(Materials.Basic), 'W', + OrePrefixes.stick.get(Materials.Brass), 'C', OrePrefixes.circuit.get(Materials.LV), 'W', OrePrefixes.cableGt01.get(Materials.Tin) }); GT_ModHandler.addCraftingRecipe( ItemList.Emitter_MV.get(1L), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[] { "SSC", "WQS", "CWS", 'Q', OrePrefixes.gem.get(Materials.EnderPearl), 'S', - OrePrefixes.stick.get(Materials.Electrum), 'C', OrePrefixes.circuit.get(Materials.Good), 'W', + OrePrefixes.stick.get(Materials.Electrum), 'C', OrePrefixes.circuit.get(Materials.MV), 'W', OrePrefixes.cableGt01.get(Materials.AnyCopper) }); GT_ModHandler.addCraftingRecipe( ItemList.Emitter_HV.get(1L), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[] { "SSC", "WQS", "CWS", 'Q', OrePrefixes.gem.get(Materials.EnderEye), 'S', - OrePrefixes.stick.get(Materials.Chrome), 'C', OrePrefixes.circuit.get(Materials.Advanced), 'W', + OrePrefixes.stick.get(Materials.Chrome), 'C', OrePrefixes.circuit.get(Materials.HV), 'W', OrePrefixes.cableGt01.get(Materials.Gold) }); GT_ModHandler.addCraftingRecipe( ItemList.Emitter_EV.get(1L), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[] { "SSC", "WQS", "CWS", 'Q', ItemList.QuantumEye, 'S', - OrePrefixes.stick.get(Materials.Platinum), 'C', OrePrefixes.circuit.get(Materials.Data), 'W', + OrePrefixes.stick.get(Materials.Platinum), 'C', OrePrefixes.circuit.get(Materials.EV), 'W', OrePrefixes.cableGt01.get(Materials.Aluminium) }); GT_ModHandler.addCraftingRecipe( ItemList.Emitter_IV.get(1L), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[] { "SSC", "WQS", "CWS", 'Q', ItemList.QuantumStar, 'S', - OrePrefixes.stick.get(Materials.Iridium), 'C', OrePrefixes.circuit.get(Materials.Elite), 'W', + OrePrefixes.stick.get(Materials.Iridium), 'C', OrePrefixes.circuit.get(Materials.IV), 'W', OrePrefixes.cableGt01.get(Materials.Tungsten) }); GT_ModHandler.addCraftingRecipe( @@ -4540,35 +4540,35 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[] { "P Q", "PS ", "CPP", 'Q', OrePrefixes.gem.get(Materials.CertusQuartz), 'S', OrePrefixes.stick.get(Materials.Brass), 'P', OrePrefixes.plate.get(Materials.Steel), 'C', - OrePrefixes.circuit.get(Materials.Basic) }); + OrePrefixes.circuit.get(Materials.LV) }); GT_ModHandler.addCraftingRecipe( ItemList.Sensor_MV.get(1L), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[] { "P Q", "PS ", "CPP", 'Q', OrePrefixes.gemFlawless.get(Materials.Emerald), 'S', OrePrefixes.stick.get(Materials.Electrum), 'P', OrePrefixes.plate.get(Materials.Aluminium), 'C', - OrePrefixes.circuit.get(Materials.Good) }); + OrePrefixes.circuit.get(Materials.MV) }); GT_ModHandler.addCraftingRecipe( ItemList.Sensor_HV.get(1L), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[] { "P Q", "PS ", "CPP", 'Q', OrePrefixes.gem.get(Materials.EnderEye), 'S', OrePrefixes.stick.get(Materials.Chrome), 'P', OrePrefixes.plate.get(Materials.StainlessSteel), 'C', - OrePrefixes.circuit.get(Materials.Advanced) }); + OrePrefixes.circuit.get(Materials.HV) }); GT_ModHandler.addCraftingRecipe( ItemList.Sensor_EV.get(1L), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[] { "P Q", "PS ", "CPP", 'Q', ItemList.QuantumEye, 'S', OrePrefixes.stick.get(Materials.Platinum), 'P', OrePrefixes.plate.get(Materials.Titanium), 'C', - OrePrefixes.circuit.get(Materials.Data) }); + OrePrefixes.circuit.get(Materials.EV) }); GT_ModHandler.addCraftingRecipe( ItemList.Sensor_IV.get(1L), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[] { "P Q", "PS ", "CPP", 'Q', ItemList.QuantumStar, 'S', OrePrefixes.stick.get(Materials.Iridium), 'P', OrePrefixes.plate.get(Materials.TungstenSteel), 'C', - OrePrefixes.circuit.get(Materials.Elite) }); + OrePrefixes.circuit.get(Materials.IV) }); GT_ModHandler.addCraftingRecipe( ItemList.Component_Sawblade_Diamond.get(1L), @@ -4601,7 +4601,7 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { ItemList.Tool_Scanner.get(1L), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "EPR", "CSC", "PBP", 'C', OrePrefixes.circuit.get(Materials.Advanced), 'P', + new Object[] { "EPR", "CSC", "PBP", 'C', OrePrefixes.circuit.get(Materials.HV), 'P', OrePrefixes.plate.get(Materials.Aluminium), 'E', ItemList.Emitter_MV, 'R', ItemList.Sensor_MV, 'S', ItemList.Cover_Screen, 'B', ItemList.Battery_RE_MV_Lithium }); diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java index d1e657c2c8..d4a4b184a0 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java @@ -2531,7 +2531,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { RA.stdBuilder() .itemInputs( ItemList.Cover_RedstoneTransmitterExternal.get(1L), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Data, 1L), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.EV, 1L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Cover_AdvancedRedstoneTransmitterExternal.get(1L)) .duration(2 * MINUTES + 40 * SECONDS) @@ -2540,7 +2540,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { RA.stdBuilder() .itemInputs( ItemList.Cover_RedstoneReceiverExternal.get(1L), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Data, 1L), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.EV, 1L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Cover_AdvancedRedstoneReceiverExternal.get(1L)) .duration(2 * MINUTES + 40 * SECONDS) diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java index 52a268baf9..29a99fc671 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java @@ -504,7 +504,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { NandChip.ID, "NAND Chip", "A very simple Circuit", - OrePrefixes.circuit.get(Materials.Primitive), + OrePrefixes.circuit.get(Materials.ULV), SubTag.NO_UNIFICATION)); // Vacuum Tube Item01 @@ -517,7 +517,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_Integrated_Good.ID, "Good Integrated Circuit", "Good Circuit", - OrePrefixes.circuit.get(Materials.Good), + OrePrefixes.circuit.get(Materials.MV), SubTag.NO_UNIFICATION)); // Good Integrated Circuit Item01 @@ -528,7 +528,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_Microprocessor.ID, "Microprocessor", "A Basic Circuit", - OrePrefixes.circuit.get(Materials.Basic), + OrePrefixes.circuit.get(Materials.LV), SubTag.NO_UNIFICATION)); ItemList.Circuit_Processor.set( @@ -536,7 +536,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_Processor.ID, "Integrated Processor", "A Good Circuit", - OrePrefixes.circuit.get(Materials.Good), + OrePrefixes.circuit.get(Materials.MV), SubTag.NO_UNIFICATION)); ItemList.Circuit_Nanoprocessor.set( @@ -544,7 +544,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_Nanoprocessor.ID, "Nanoprocessor", "An Advanced Circuit", - OrePrefixes.circuit.get(Materials.Advanced), + OrePrefixes.circuit.get(Materials.HV), SubTag.NO_UNIFICATION)); ItemList.Circuit_Nanocomputer.set( @@ -552,7 +552,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_Nanocomputer.ID, "Nanoprocessor Assembly", "An Extreme Circuit", - OrePrefixes.circuit.get(Materials.Data), + OrePrefixes.circuit.get(Materials.EV), SubTag.NO_UNIFICATION)); ItemList.Circuit_Elitenanocomputer.set( @@ -560,7 +560,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_Elitenanocomputer.ID, "Elite Nanocomputer", "An Elite Circuit", - OrePrefixes.circuit.get(Materials.Elite), + OrePrefixes.circuit.get(Materials.IV), SubTag.NO_UNIFICATION)); // Quantum circuits @@ -569,7 +569,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_Quantumprocessor.ID, "Quantumprocessor", "An Extreme Circuit", - OrePrefixes.circuit.get(Materials.Data), + OrePrefixes.circuit.get(Materials.EV), SubTag.NO_UNIFICATION)); ItemList.Circuit_Quantumcomputer.set( @@ -577,7 +577,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_Quantumcomputer.ID, "Quantumprocessor Assembly", "An Elite Circuit", - OrePrefixes.circuit.get(Materials.Elite), + OrePrefixes.circuit.get(Materials.IV), SubTag.NO_UNIFICATION)); ItemList.Circuit_Masterquantumcomputer.set( @@ -585,7 +585,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_Masterquantumcomputer.ID, "Master Quantumcomputer", "A Master Circuit", - OrePrefixes.circuit.get(Materials.Master), + OrePrefixes.circuit.get(Materials.LuV), SubTag.NO_UNIFICATION)); ItemList.Circuit_Quantummainframe.set( @@ -593,7 +593,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_Quantummainframe.ID, "Quantumprocessor Mainframe", "An Ultimate Circuit", - OrePrefixes.circuit.get(Materials.Ultimate), + OrePrefixes.circuit.get(Materials.ZPM), SubTag.NO_UNIFICATION)); // Crystal circuits @@ -602,7 +602,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_Crystalprocessor.ID, "Crystalprocessor", "An Elite Circuit", - OrePrefixes.circuit.get(Materials.Elite), + OrePrefixes.circuit.get(Materials.IV), SubTag.NO_UNIFICATION)); ItemList.Circuit_Crystalcomputer.set( @@ -610,7 +610,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_Crystalcomputer.ID, "Crystalprocessor Assembly", "A Master Circuit", - OrePrefixes.circuit.get(Materials.Master), + OrePrefixes.circuit.get(Materials.LuV), SubTag.NO_UNIFICATION)); ItemList.Circuit_Ultimatecrystalcomputer.set( @@ -618,7 +618,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_Ultimatecrystalcomputer.ID, "Ultimate Crystalcomputer", "An Ultimate Circuit", - OrePrefixes.circuit.get(Materials.Ultimate), + OrePrefixes.circuit.get(Materials.ZPM), SubTag.NO_UNIFICATION)); ItemList.Circuit_Crystalmainframe.set( @@ -626,7 +626,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_Crystalmainframe.ID, "Crystalprocessor Mainframe", "A Super Circuit", - OrePrefixes.circuit.get(Materials.SuperconductorUHV), + OrePrefixes.circuit.get(Materials.UV), SubTag.NO_UNIFICATION)); // ???? Scared to remove. @@ -638,7 +638,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_Neuroprocessor.ID, "Wetwareprocessor", "A Master Circuit", - OrePrefixes.circuit.get(Materials.Master), + OrePrefixes.circuit.get(Materials.LuV), SubTag.NO_UNIFICATION)); ItemList.Circuit_Wetwarecomputer.set( @@ -646,7 +646,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_Wetwarecomputer.ID, "Wetwareprocessor Assembly", "An Ultimate Circuit", - OrePrefixes.circuit.get(Materials.Ultimate), + OrePrefixes.circuit.get(Materials.ZPM), SubTag.NO_UNIFICATION)); ItemList.Circuit_Wetwaresupercomputer.set( @@ -654,7 +654,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_Wetwaresupercomputer.ID, "Wetware Supercomputer", "A Super Circuit", - OrePrefixes.circuit.get(Materials.SuperconductorUHV), + OrePrefixes.circuit.get(Materials.UV), SubTag.NO_UNIFICATION)); ItemList.Circuit_Wetwaremainframe.set( @@ -662,7 +662,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_Wetwaremainframe.ID, "Wetware Mainframe", "An Infinite Circuit", - OrePrefixes.circuit.get(Materials.Infinite), + OrePrefixes.circuit.get(Materials.UHV), SubTag.NO_UNIFICATION)); // Bioware circuits. @@ -671,7 +671,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_Bioprocessor.ID, "Bioprocessor", "An Ultimate Circuit", - OrePrefixes.circuit.get(Materials.Ultimate), + OrePrefixes.circuit.get(Materials.ZPM), SubTag.NO_UNIFICATION)); ItemList.Circuit_Biowarecomputer.set( @@ -679,7 +679,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_Biowarecomputer.ID, "Biowareprocessor Assembly", "A Super Circuit", - OrePrefixes.circuit.get(Materials.SuperconductorUHV), + OrePrefixes.circuit.get(Materials.UV), SubTag.NO_UNIFICATION)); ItemList.Circuit_Biowaresupercomputer.set( @@ -687,7 +687,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_Biowaresupercomputer.ID, "Bioware Supercomputer", "An Infinite Circuit", - OrePrefixes.circuit.get(Materials.Infinite), + OrePrefixes.circuit.get(Materials.UHV), SubTag.NO_UNIFICATION)); ItemList.Circuit_Biomainframe.set( @@ -695,7 +695,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_Biomainframe.ID, "Bio Mainframe", "A Bio Circuit", - OrePrefixes.circuit.get(Materials.Bio), + OrePrefixes.circuit.get(Materials.UEV), SubTag.NO_UNIFICATION)); ItemList.Circuit_Board_Coated_Basic @@ -731,7 +731,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_OpticalProcessor.ID, "Optical Processor", "An Optical Circuit", - OrePrefixes.circuit.get(Materials.SuperconductorUHV), + OrePrefixes.circuit.get(Materials.UV), SubTag.NO_UNIFICATION)); ItemList.Circuit_OpticalAssembly.set( @@ -739,7 +739,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_OpticalAssembly.ID, "Optical Assembly", "An Optical Circuit", - OrePrefixes.circuit.get(Materials.Infinite), + OrePrefixes.circuit.get(Materials.UHV), SubTag.NO_UNIFICATION)); ItemList.Circuit_OpticalComputer.set( @@ -747,7 +747,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_OpticalComputer.ID, "Optical Computer", "An Optical Circuit", - OrePrefixes.circuit.get(Materials.Bio), + OrePrefixes.circuit.get(Materials.UEV), SubTag.NO_UNIFICATION)); ItemList.Circuit_OpticalMainframe.set( @@ -755,7 +755,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_OpticalMainframe.ID, "Optical Mainframe", "An Optical Circuit", - OrePrefixes.circuit.get(Materials.Optical), + OrePrefixes.circuit.get(Materials.UIV), SubTag.NO_UNIFICATION)); // Exotic circuits @@ -764,7 +764,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_ExoticProcessor.ID, "Exotic Processor", "An Exotic Circuit", - OrePrefixes.circuit.get(Materials.Infinite), + OrePrefixes.circuit.get(Materials.UHV), SubTag.NO_UNIFICATION)); ItemList.Circuit_ExoticAssembly.set( @@ -772,7 +772,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_ExoticAssembly.ID, "Exotic Assembly", "An Exotic Circuit", - OrePrefixes.circuit.get(Materials.Bio), + OrePrefixes.circuit.get(Materials.UEV), SubTag.NO_UNIFICATION)); ItemList.Circuit_ExoticComputer.set( @@ -780,7 +780,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_ExoticComputer.ID, "Exotic Computer", "An Exotic Circuit", - OrePrefixes.circuit.get(Materials.Optical), + OrePrefixes.circuit.get(Materials.UIV), SubTag.NO_UNIFICATION)); ItemList.Circuit_ExoticMainframe.set( @@ -788,7 +788,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_ExoticMainframe.ID, "Exotic Mainframe", "An Exotic Circuit", - OrePrefixes.circuit.get(Materials.Exotic), + OrePrefixes.circuit.get(Materials.UMV), SubTag.NO_UNIFICATION)); // Cosmic circuits @@ -797,7 +797,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_CosmicProcessor.ID, "Cosmic Processor", "A Cosmic Circuit", - OrePrefixes.circuit.get(Materials.Bio), + OrePrefixes.circuit.get(Materials.UEV), SubTag.NO_UNIFICATION)); ItemList.Circuit_CosmicAssembly.set( @@ -805,7 +805,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_CosmicAssembly.ID, "Cosmic Assembly", "A Cosmic Circuit", - OrePrefixes.circuit.get(Materials.Optical), + OrePrefixes.circuit.get(Materials.UIV), SubTag.NO_UNIFICATION)); ItemList.Circuit_CosmicComputer.set( @@ -813,7 +813,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_CosmicComputer.ID, "Cosmic Computer", "A Cosmic Circuit", - OrePrefixes.circuit.get(Materials.Exotic), + OrePrefixes.circuit.get(Materials.UMV), SubTag.NO_UNIFICATION)); ItemList.Circuit_CosmicMainframe.set( @@ -821,7 +821,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_CosmicMainframe.ID, "Cosmic Mainframe", "A Cosmic Circuit", - OrePrefixes.circuit.get(Materials.Cosmic), + OrePrefixes.circuit.get(Materials.UXV), SubTag.NO_UNIFICATION)); // Transcendent circuits @@ -830,7 +830,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_TranscendentProcessor.ID, "Temporally Transcendent Processor", "A circuit operating outside of known spacetime", - OrePrefixes.circuit.get(Materials.Optical), + OrePrefixes.circuit.get(Materials.UIV), SubTag.NO_UNIFICATION)); ItemList.Circuit_TranscendentAssembly.set( @@ -838,7 +838,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_TranscendentAssembly.ID, "Temporally Transcendent Assembly", "A circuit operating outside of known spacetime", - OrePrefixes.circuit.get(Materials.Exotic), + OrePrefixes.circuit.get(Materials.UMV), SubTag.NO_UNIFICATION)); ItemList.Circuit_TranscendentComputer.set( @@ -846,7 +846,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_TranscendentComputer.ID, "Temporally Transcendent Computer", "A circuit operating outside of known spacetime", - OrePrefixes.circuit.get(Materials.Cosmic), + OrePrefixes.circuit.get(Materials.UXV), SubTag.NO_UNIFICATION)); ItemList.Circuit_TranscendentMainframe.set( @@ -854,7 +854,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_TranscendentMainframe.ID, "Temporally Transcendent Mainframe", "A circuit operating outside of known spacetime", - OrePrefixes.circuit.get(Materials.Transcendent), + OrePrefixes.circuit.get(Materials.MAX), SubTag.NO_UNIFICATION)); ItemList.Tube_Wires.set(addItem(Tube_Wires.ID, "Tube Wires", "For the Vacuum Tubes", o)); diff --git a/src/main/java/gregtech/loaders/load/GT_Loader_MetaTileEntities_Recipes.java b/src/main/java/gregtech/loaders/load/GT_Loader_MetaTileEntities_Recipes.java index 2f372ca778..745546401b 100644 --- a/src/main/java/gregtech/loaders/load/GT_Loader_MetaTileEntities_Recipes.java +++ b/src/main/java/gregtech/loaders/load/GT_Loader_MetaTileEntities_Recipes.java @@ -4932,9 +4932,9 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { GT_ModHandler.addCraftingRecipe( ItemList.Casing_Assembler.get(1L), bits, - new Object[] { "PVP", "PFP", aTextPlateMotor, 'P', OrePrefixes.circuit.get(Materials.Ultimate), 'F', + new Object[] { "PVP", "PFP", aTextPlateMotor, 'P', OrePrefixes.circuit.get(Materials.ZPM), 'F', OrePrefixes.frameGt.get(Materials.TungstenSteel), 'M', ItemList.Electric_Motor_IV, 'V', - OrePrefixes.circuit.get(Materials.Master) }); + OrePrefixes.circuit.get(Materials.LuV) }); GT_ModHandler.addCraftingRecipe( ItemList.Casing_Firebox_Bronze.get(1L), bits, @@ -5280,13 +5280,13 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { ItemList.Hatch_Dynamo_ULV.get(1L), bitsd, new Object[] { "XOL", "SMP", "XOL", 'M', ItemList.Hull_ULV, 'S', OrePrefixes.spring.get(Materials.Lead), - 'X', OrePrefixes.circuit.get(Materials.Primitive), 'O', ItemList.ULV_Coil, 'L', + 'X', OrePrefixes.circuit.get(Materials.ULV), 'O', ItemList.ULV_Coil, 'L', OrePrefixes.cell.get(Materials.Lubricant), 'P', OrePrefixes.rotor.get(Materials.Lead) }); GT_ModHandler.addCraftingRecipe( ItemList.Hatch_Dynamo_LV.get(1L), bitsd, new Object[] { "XOL", "SMP", "XOL", 'M', ItemList.Hull_LV, 'S', OrePrefixes.spring.get(Materials.Tin), 'X', - OrePrefixes.circuit.get(Materials.Basic), 'O', ItemList.LV_Coil, 'L', + OrePrefixes.circuit.get(Materials.LV), 'O', ItemList.LV_Coil, 'L', OrePrefixes.cell.get(Materials.Lubricant), 'P', ItemList.Electric_Pump_LV }); GT_ModHandler.addCraftingRecipe( ItemList.Hatch_Dynamo_MV.get(1L), @@ -5298,13 +5298,13 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { ItemList.Hatch_Energy_ULV.get(1L), bitsd, new Object[] { "COL", "XMP", "COL", 'M', ItemList.Hull_ULV, 'C', OrePrefixes.cableGt01.get(Materials.Lead), - 'X', OrePrefixes.circuit.get(Materials.Primitive), 'O', ItemList.ULV_Coil, 'L', + 'X', OrePrefixes.circuit.get(Materials.ULV), 'O', ItemList.ULV_Coil, 'L', OrePrefixes.cell.get(Materials.Lubricant), 'P', OrePrefixes.rotor.get(Materials.Lead) }); GT_ModHandler.addCraftingRecipe( ItemList.Hatch_Energy_LV.get(1L), bitsd, new Object[] { "COL", "XMP", "COL", 'M', ItemList.Hull_LV, 'C', OrePrefixes.cableGt01.get(Materials.Tin), - 'X', OrePrefixes.circuit.get(Materials.Basic), 'O', ItemList.LV_Coil, 'L', + 'X', OrePrefixes.circuit.get(Materials.LV), 'O', ItemList.LV_Coil, 'L', OrePrefixes.cell.get(Materials.Lubricant), 'P', ItemList.Electric_Pump_LV }); GT_ModHandler.addCraftingRecipe( ItemList.Hatch_Energy_MV.get(1L), @@ -5321,23 +5321,23 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { ItemList.Hatch_DataAccess_EV.get(1L), bitsd, new Object[] { "COC", "OMO", "COC", 'M', ItemList.Hull_EV, 'O', ItemList.Tool_DataStick, 'C', - OrePrefixes.circuit.get(Materials.Elite) }); + OrePrefixes.circuit.get(Materials.IV) }); GT_ModHandler.addCraftingRecipe( ItemList.Hatch_DataAccess_LuV.get(1L), bitsd, new Object[] { "COC", "OMO", "COC", 'M', ItemList.Hull_LuV, 'O', ItemList.Tool_DataOrb, 'C', - OrePrefixes.circuit.get(Materials.Ultimate) }); + OrePrefixes.circuit.get(Materials.ZPM) }); GT_ModHandler.addCraftingRecipe( ItemList.Hatch_DataAccess_UV.get(1L), bitsd, new Object[] { "CRC", "OMO", "CRC", 'M', ItemList.Hull_UV, 'O', ItemList.Tool_DataOrb, 'C', - OrePrefixes.circuit.get(Materials.Infinite), 'R', ItemList.Robot_Arm_UV }); + OrePrefixes.circuit.get(Materials.UHV), 'R', ItemList.Robot_Arm_UV }); GT_ModHandler.addCraftingRecipe( ItemList.Hatch_AutoMaintenance.get(1L), bitsd, new Object[] { "CHC", "AMA", "CHC", 'M', ItemList.Hull_LuV, 'H', ItemList.Hatch_Maintenance, 'A', - ItemList.Robot_Arm_LuV, 'C', OrePrefixes.circuit.get(Materials.Ultimate) }); + ItemList.Robot_Arm_LuV, 'C', OrePrefixes.circuit.get(Materials.ZPM) }); GT_ModHandler.addCraftingRecipe( ItemList.Hatch_Muffler_LV.get(1L), @@ -5702,61 +5702,61 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { bitsd, new Object[] { aTextWireChest, aTextWireHull, "BCB", 'M', ItemList.Hull_ULV, 'W', OrePrefixes.wireGt16.get(Materials.Lead), 'T', OreDictNames.craftingChest, 'B', - ItemList.Battery_RE_ULV_Tantalum, 'C', OrePrefixes.circuit.get(Materials.Primitive) }); + ItemList.Battery_RE_ULV_Tantalum, 'C', OrePrefixes.circuit.get(Materials.ULV) }); GT_ModHandler.addCraftingRecipe( ItemList.Battery_Charger_4by4_LV.get(1L), bitsd, new Object[] { aTextWireChest, aTextWireHull, "BCB", 'M', ItemList.Hull_LV, 'W', OrePrefixes.wireGt16.get(Materials.Tin), 'T', OreDictNames.craftingChest, 'B', - ItemList.Battery_RE_LV_Lithium, 'C', OrePrefixes.circuit.get(Materials.Basic) }); + ItemList.Battery_RE_LV_Lithium, 'C', OrePrefixes.circuit.get(Materials.LV) }); GT_ModHandler.addCraftingRecipe( ItemList.Battery_Charger_4by4_MV.get(1L), bitsd, new Object[] { aTextWireChest, aTextWireHull, "BCB", 'M', ItemList.Hull_MV, 'W', OrePrefixes.wireGt16.get(Materials.AnyCopper), 'T', OreDictNames.craftingChest, 'B', - ItemList.Battery_RE_MV_Lithium, 'C', OrePrefixes.circuit.get(Materials.Good) }); + ItemList.Battery_RE_MV_Lithium, 'C', OrePrefixes.circuit.get(Materials.MV) }); GT_ModHandler.addCraftingRecipe( ItemList.Battery_Charger_4by4_HV.get(1L), bitsd, new Object[] { aTextWireChest, aTextWireHull, "BCB", 'M', ItemList.Hull_HV, 'W', OrePrefixes.wireGt16.get(Materials.Gold), 'T', OreDictNames.craftingChest, 'B', - ItemList.Battery_RE_HV_Lithium, 'C', OrePrefixes.circuit.get(Materials.Advanced) }); + ItemList.Battery_RE_HV_Lithium, 'C', OrePrefixes.circuit.get(Materials.HV) }); GT_ModHandler.addCraftingRecipe( ItemList.Battery_Charger_4by4_EV.get(1L), bitsd, new Object[] { aTextWireChest, aTextWireHull, "BCB", 'M', ItemList.Hull_EV, 'W', OrePrefixes.wireGt16.get(Materials.Aluminium), 'T', OreDictNames.craftingChest, 'B', - OrePrefixes.battery.get(Materials.Master), 'C', OrePrefixes.circuit.get(Materials.Data) }); + OrePrefixes.battery.get(Materials.LuV), 'C', OrePrefixes.circuit.get(Materials.EV) }); GT_ModHandler.addCraftingRecipe( ItemList.Battery_Charger_4by4_IV.get(1L), bitsd, new Object[] { aTextWireChest, aTextWireHull, "BCB", 'M', ItemList.Hull_IV, 'W', OrePrefixes.wireGt16.get(Materials.Tungsten), 'T', OreDictNames.craftingChest, 'B', - ItemList.Energy_LapotronicOrb, 'C', OrePrefixes.circuit.get(Materials.Elite) }); + ItemList.Energy_LapotronicOrb, 'C', OrePrefixes.circuit.get(Materials.IV) }); GT_ModHandler.addCraftingRecipe( ItemList.Battery_Charger_4by4_LuV.get(1L), bitsd, new Object[] { aTextWireChest, aTextWireHull, "BCB", 'M', ItemList.Hull_LuV, 'W', OrePrefixes.wireGt16.get(Materials.VanadiumGallium), 'T', OreDictNames.craftingChest, 'B', - ItemList.Energy_LapotronicOrb2, 'C', OrePrefixes.circuit.get(Materials.Master) }); + ItemList.Energy_LapotronicOrb2, 'C', OrePrefixes.circuit.get(Materials.LuV) }); GT_ModHandler.addCraftingRecipe( ItemList.Battery_Charger_4by4_ZPM.get(1L), bitsd, new Object[] { aTextWireChest, aTextWireHull, "BCB", 'M', ItemList.Hull_ZPM, 'W', OrePrefixes.wireGt16.get(Materials.Naquadah), 'T', OreDictNames.craftingChest, 'B', - ItemList.Energy_LapotronicOrb2, 'C', OrePrefixes.circuit.get(Materials.Ultimate) }); + ItemList.Energy_LapotronicOrb2, 'C', OrePrefixes.circuit.get(Materials.ZPM) }); GT_ModHandler.addCraftingRecipe( ItemList.Battery_Charger_4by4_UV.get(1L), bitsd, new Object[] { aTextWireChest, aTextWireHull, "BCB", 'M', ItemList.Hull_UV, 'W', OrePrefixes.wireGt16.get(Materials.NaquadahAlloy), 'T', OreDictNames.craftingChest, 'B', ItemList.ZPM2, - 'C', OrePrefixes.circuit.get(Materials.SuperconductorUHV) }); + 'C', OrePrefixes.circuit.get(Materials.UV) }); GT_ModHandler.addCraftingRecipe( ItemList.Battery_Charger_4by4_MAX.get(1L), bitsd, new Object[] { aTextWireChest, aTextWireHull, "BCB", 'M', ItemList.Hull_MAX, 'W', OrePrefixes.wireGt16.get(Materials.SuperconductorUHV), 'T', OreDictNames.craftingChest, 'B', - ItemList.ZPM2, 'C', OrePrefixes.circuit.get(Materials.Infinite) }); + ItemList.ZPM2, 'C', OrePrefixes.circuit.get(Materials.UHV) }); GT_ModHandler.addCraftingRecipe( ItemList.Locker_ULV.get(1L), @@ -5803,80 +5803,80 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { ItemList.Machine_LV_Scanner.get(1L), bitsd, new Object[] { "CTC", aTextWireHull, "CRC", 'M', ItemList.Hull_LV, 'T', ItemList.Emitter_LV, 'R', - ItemList.Sensor_LV, 'C', OrePrefixes.circuit.get(Materials.Good), 'W', + ItemList.Sensor_LV, 'C', OrePrefixes.circuit.get(Materials.MV), 'W', OrePrefixes.cableGt01.get(Materials.Tin) }); GT_ModHandler.addCraftingRecipe( ItemList.Machine_MV_Scanner.get(1L), bitsd, new Object[] { "CTC", aTextWireHull, "CRC", 'M', ItemList.Hull_MV, 'T', ItemList.Emitter_MV, 'R', - ItemList.Sensor_MV, 'C', OrePrefixes.circuit.get(Materials.Advanced), 'W', + ItemList.Sensor_MV, 'C', OrePrefixes.circuit.get(Materials.HV), 'W', OrePrefixes.cableGt01.get(Materials.AnyCopper) }); GT_ModHandler.addCraftingRecipe( ItemList.Machine_HV_Scanner.get(1L), bitsd, new Object[] { "CTC", aTextWireHull, "CRC", 'M', ItemList.Hull_HV, 'T', ItemList.Emitter_HV, 'R', - ItemList.Sensor_HV, 'C', OrePrefixes.circuit.get(Materials.Data), 'W', + ItemList.Sensor_HV, 'C', OrePrefixes.circuit.get(Materials.EV), 'W', OrePrefixes.cableGt01.get(Materials.Gold) }); GT_ModHandler.addCraftingRecipe( ItemList.Machine_EV_Scanner.get(1L), bitsd, new Object[] { "CTC", aTextWireHull, "CRC", 'M', ItemList.Hull_EV, 'T', ItemList.Emitter_EV, 'R', - ItemList.Sensor_EV, 'C', OrePrefixes.circuit.get(Materials.Elite), 'W', + ItemList.Sensor_EV, 'C', OrePrefixes.circuit.get(Materials.IV), 'W', OrePrefixes.cableGt01.get(Materials.Aluminium) }); GT_ModHandler.addCraftingRecipe( ItemList.Machine_IV_Scanner.get(1L), bitsd, new Object[] { "CTC", aTextWireHull, "CRC", 'M', ItemList.Hull_IV, 'T', ItemList.Emitter_IV, 'R', - ItemList.Sensor_IV, 'C', OrePrefixes.circuit.get(Materials.Master), 'W', + ItemList.Sensor_IV, 'C', OrePrefixes.circuit.get(Materials.LuV), 'W', OrePrefixes.cableGt01.get(Materials.Tungsten) }); GT_ModHandler.addCraftingRecipe( ItemList.Machine_LV_Boxinator.get(1L), bitsd, new Object[] { "BCB", "RMV", aTextWireCoil, 'M', ItemList.Hull_LV, 'R', ItemList.Robot_Arm_LV, 'V', - ItemList.Conveyor_Module_LV, 'C', OrePrefixes.circuit.get(Materials.Basic), 'W', + ItemList.Conveyor_Module_LV, 'C', OrePrefixes.circuit.get(Materials.LV), 'W', OrePrefixes.cableGt01.get(Materials.Tin), 'B', OreDictNames.craftingChest }); GT_ModHandler.addCraftingRecipe( ItemList.Machine_MV_Boxinator.get(1L), bitsd, new Object[] { "BCB", "RMV", aTextWireCoil, 'M', ItemList.Hull_MV, 'R', ItemList.Robot_Arm_MV, 'V', - ItemList.Conveyor_Module_MV, 'C', OrePrefixes.circuit.get(Materials.Good), 'W', + ItemList.Conveyor_Module_MV, 'C', OrePrefixes.circuit.get(Materials.MV), 'W', OrePrefixes.cableGt01.get(Materials.AnyCopper), 'B', OreDictNames.craftingChest }); GT_ModHandler.addCraftingRecipe( ItemList.Machine_HV_Boxinator.get(1L), bitsd, new Object[] { "BCB", "RMV", aTextWireCoil, 'M', ItemList.Hull_HV, 'R', ItemList.Robot_Arm_HV, 'V', - ItemList.Conveyor_Module_HV, 'C', OrePrefixes.circuit.get(Materials.Advanced), 'W', + ItemList.Conveyor_Module_HV, 'C', OrePrefixes.circuit.get(Materials.HV), 'W', OrePrefixes.cableGt01.get(Materials.Gold), 'B', OreDictNames.craftingChest }); GT_ModHandler.addCraftingRecipe( ItemList.Machine_EV_Boxinator.get(1L), bitsd, new Object[] { "BCB", "RMV", aTextWireCoil, 'M', ItemList.Hull_EV, 'R', ItemList.Robot_Arm_EV, 'V', - ItemList.Conveyor_Module_EV, 'C', OrePrefixes.circuit.get(Materials.Data), 'W', + ItemList.Conveyor_Module_EV, 'C', OrePrefixes.circuit.get(Materials.EV), 'W', OrePrefixes.cableGt01.get(Materials.Aluminium), 'B', OreDictNames.craftingChest }); GT_ModHandler.addCraftingRecipe( ItemList.Machine_IV_Boxinator.get(1L), bitsd, new Object[] { "BCB", "RMV", aTextWireCoil, 'M', ItemList.Hull_IV, 'R', ItemList.Robot_Arm_IV, 'V', - ItemList.Conveyor_Module_IV, 'C', OrePrefixes.circuit.get(Materials.Elite), 'W', + ItemList.Conveyor_Module_IV, 'C', OrePrefixes.circuit.get(Materials.IV), 'W', OrePrefixes.cableGt01.get(Materials.Tungsten), 'B', OreDictNames.craftingChest }); GT_ModHandler.addCraftingRecipe( ItemList.Machine_LuV_Boxinator.get(1L), bitsd, new Object[] { "BCB", "RMV", aTextWireCoil, 'M', ItemList.Hull_LuV, 'R', ItemList.Robot_Arm_LuV, 'V', - ItemList.Conveyor_Module_LuV, 'C', OrePrefixes.circuit.get(Materials.Master), 'W', + ItemList.Conveyor_Module_LuV, 'C', OrePrefixes.circuit.get(Materials.LuV), 'W', OrePrefixes.cableGt01.get(Materials.VanadiumGallium), 'B', OreDictNames.craftingChest }); GT_ModHandler.addCraftingRecipe( ItemList.Machine_ZPM_Boxinator.get(1L), bitsd, new Object[] { "BCB", "RMV", aTextWireCoil, 'M', ItemList.Hull_ZPM, 'R', ItemList.Robot_Arm_ZPM, 'V', - ItemList.Conveyor_Module_ZPM, 'C', OrePrefixes.circuit.get(Materials.Ultimate), 'W', + ItemList.Conveyor_Module_ZPM, 'C', OrePrefixes.circuit.get(Materials.ZPM), 'W', OrePrefixes.cableGt01.get(Materials.Naquadah), 'B', OreDictNames.craftingChest }); GT_ModHandler.addCraftingRecipe( ItemList.Machine_UV_Boxinator.get(1L), bitsd, new Object[] { "BCB", "RMV", aTextWireCoil, 'M', ItemList.Hull_UV, 'R', ItemList.Robot_Arm_UV, 'V', - ItemList.Conveyor_Module_UV, 'C', OrePrefixes.circuit.get(Materials.SuperconductorUHV), 'W', + ItemList.Conveyor_Module_UV, 'C', OrePrefixes.circuit.get(Materials.UV), 'W', OrePrefixes.cableGt01.get(Materials.NaquadahAlloy), 'B', OreDictNames.craftingChest }); GT_ModHandler.addCraftingRecipe( @@ -5884,258 +5884,257 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { bitsd, new Object[] { "PED", aTextWireHull, "GGG", 'M', ItemList.Hull_LV, 'D', OreDictNames.craftingGrinder, 'E', ItemList.Electric_Motor_LV, 'P', ItemList.Electric_Piston_LV, 'C', - OrePrefixes.circuit.get(Materials.Basic), 'W', OrePrefixes.cableGt01.get(Materials.Tin), 'G', + OrePrefixes.circuit.get(Materials.LV), 'W', OrePrefixes.cableGt01.get(Materials.Tin), 'G', new ItemStack(Blocks.glass, 1) }); GT_ModHandler.addCraftingRecipe( ItemList.Machine_MV_RockBreaker.get(1L), bitsd, new Object[] { "PED", aTextWireHull, "GGG", 'M', ItemList.Hull_MV, 'D', OreDictNames.craftingGrinder, 'E', ItemList.Electric_Motor_MV, 'P', ItemList.Electric_Piston_MV, 'C', - OrePrefixes.circuit.get(Materials.Good), 'W', OrePrefixes.cableGt01.get(Materials.AnyCopper), 'G', + OrePrefixes.circuit.get(Materials.MV), 'W', OrePrefixes.cableGt01.get(Materials.AnyCopper), 'G', new ItemStack(Blocks.glass, 1) }); GT_ModHandler.addCraftingRecipe( ItemList.Machine_HV_RockBreaker.get(1L), bitsd, new Object[] { "PED", aTextWireHull, "GGG", 'M', ItemList.Hull_HV, 'D', OreDictNames.craftingGrinder, 'E', ItemList.Electric_Motor_HV, 'P', ItemList.Electric_Piston_HV, 'C', - OrePrefixes.circuit.get(Materials.Advanced), 'W', OrePrefixes.cableGt01.get(Materials.Gold), 'G', + OrePrefixes.circuit.get(Materials.HV), 'W', OrePrefixes.cableGt01.get(Materials.Gold), 'G', new ItemStack(Blocks.glass, 1) }); GT_ModHandler.addCraftingRecipe( ItemList.Machine_EV_RockBreaker.get(1L), bitsd, new Object[] { "PED", aTextWireHull, "GGG", 'M', ItemList.Hull_EV, 'D', OreDictNames.craftingGrinder, 'E', ItemList.Electric_Motor_EV, 'P', ItemList.Electric_Piston_EV, 'C', - OrePrefixes.circuit.get(Materials.Data), 'W', OrePrefixes.cableGt01.get(Materials.Aluminium), 'G', + OrePrefixes.circuit.get(Materials.EV), 'W', OrePrefixes.cableGt01.get(Materials.Aluminium), 'G', new ItemStack(Blocks.glass, 1) }); GT_ModHandler.addCraftingRecipe( ItemList.Machine_IV_RockBreaker.get(1L), bitsd, new Object[] { "PED", aTextWireHull, "GGG", 'M', ItemList.Hull_IV, 'D', OreDictNames.craftingGrinder, 'E', ItemList.Electric_Motor_IV, 'P', ItemList.Electric_Piston_IV, 'C', - OrePrefixes.circuit.get(Materials.Elite), 'W', OrePrefixes.cableGt01.get(Materials.Tungsten), 'G', + OrePrefixes.circuit.get(Materials.IV), 'W', OrePrefixes.cableGt01.get(Materials.Tungsten), 'G', new ItemStack(Blocks.glass, 1) }); GT_ModHandler.addCraftingRecipe( ItemList.Machine_LV_Massfab.get(1L), bitsd, new Object[] { "CFC", aTextWireHull, "CFC", 'M', ItemList.Hull_LV, 'F', ItemList.Field_Generator_LV, 'C', - OrePrefixes.circuit.get(Materials.Good), 'W', OrePrefixes.cableGt04.get(Materials.Tin) }); + OrePrefixes.circuit.get(Materials.MV), 'W', OrePrefixes.cableGt04.get(Materials.Tin) }); GT_ModHandler.addCraftingRecipe( ItemList.Machine_MV_Massfab.get(1L), bitsd, new Object[] { "CFC", aTextWireHull, "CFC", 'M', ItemList.Hull_MV, 'F', ItemList.Field_Generator_MV, 'C', - OrePrefixes.circuit.get(Materials.Advanced), 'W', OrePrefixes.cableGt04.get(Materials.AnyCopper) }); + OrePrefixes.circuit.get(Materials.HV), 'W', OrePrefixes.cableGt04.get(Materials.AnyCopper) }); GT_ModHandler.addCraftingRecipe( ItemList.Machine_HV_Massfab.get(1L), bitsd, new Object[] { "CFC", aTextWireHull, "CFC", 'M', ItemList.Hull_HV, 'F', ItemList.Field_Generator_HV, 'C', - OrePrefixes.circuit.get(Materials.Data), 'W', OrePrefixes.cableGt04.get(Materials.Gold) }); + OrePrefixes.circuit.get(Materials.EV), 'W', OrePrefixes.cableGt04.get(Materials.Gold) }); GT_ModHandler.addCraftingRecipe( ItemList.Machine_EV_Massfab.get(1L), bitsd, new Object[] { "CFC", aTextWireHull, "CFC", 'M', ItemList.Hull_EV, 'F', ItemList.Field_Generator_EV, 'C', - OrePrefixes.circuit.get(Materials.Elite), 'W', OrePrefixes.cableGt04.get(Materials.Aluminium) }); + OrePrefixes.circuit.get(Materials.IV), 'W', OrePrefixes.cableGt04.get(Materials.Aluminium) }); GT_ModHandler.addCraftingRecipe( ItemList.Machine_IV_Massfab.get(1L), bitsd, new Object[] { "CFC", aTextWireHull, "CFC", 'M', ItemList.Hull_IV, 'F', ItemList.Field_Generator_IV, 'C', - OrePrefixes.circuit.get(Materials.Master), 'W', OrePrefixes.cableGt04.get(Materials.Tungsten) }); + OrePrefixes.circuit.get(Materials.LuV), 'W', OrePrefixes.cableGt04.get(Materials.Tungsten) }); GT_ModHandler.addCraftingRecipe( ItemList.Machine_LV_Replicator.get(1L), bitsd, new Object[] { "EFE", aTextCableHull, aTextMotorWire, 'M', ItemList.Hull_LV, 'F', - ItemList.Field_Generator_LV, 'E', ItemList.Emitter_LV, 'C', OrePrefixes.circuit.get(Materials.Good), - 'W', OrePrefixes.cableGt04.get(Materials.Tin) }); + ItemList.Field_Generator_LV, 'E', ItemList.Emitter_LV, 'C', OrePrefixes.circuit.get(Materials.MV), 'W', + OrePrefixes.cableGt04.get(Materials.Tin) }); GT_ModHandler.addCraftingRecipe( ItemList.Machine_MV_Replicator.get(1L), bitsd, new Object[] { "EFE", aTextCableHull, aTextMotorWire, 'M', ItemList.Hull_MV, 'F', - ItemList.Field_Generator_MV, 'E', ItemList.Emitter_MV, 'C', OrePrefixes.circuit.get(Materials.Advanced), - 'W', OrePrefixes.cableGt04.get(Materials.AnyCopper) }); + ItemList.Field_Generator_MV, 'E', ItemList.Emitter_MV, 'C', OrePrefixes.circuit.get(Materials.HV), 'W', + OrePrefixes.cableGt04.get(Materials.AnyCopper) }); GT_ModHandler.addCraftingRecipe( ItemList.Machine_HV_Replicator.get(1L), bitsd, new Object[] { "EFE", aTextCableHull, aTextMotorWire, 'M', ItemList.Hull_HV, 'F', - ItemList.Field_Generator_HV, 'E', ItemList.Emitter_HV, 'C', OrePrefixes.circuit.get(Materials.Data), - 'W', OrePrefixes.cableGt04.get(Materials.Gold) }); + ItemList.Field_Generator_HV, 'E', ItemList.Emitter_HV, 'C', OrePrefixes.circuit.get(Materials.EV), 'W', + OrePrefixes.cableGt04.get(Materials.Gold) }); GT_ModHandler.addCraftingRecipe( ItemList.Machine_EV_Replicator.get(1L), bitsd, new Object[] { "EFE", aTextCableHull, aTextMotorWire, 'M', ItemList.Hull_EV, 'F', - ItemList.Field_Generator_EV, 'E', ItemList.Emitter_EV, 'C', OrePrefixes.circuit.get(Materials.Elite), - 'W', OrePrefixes.cableGt04.get(Materials.Aluminium) }); + ItemList.Field_Generator_EV, 'E', ItemList.Emitter_EV, 'C', OrePrefixes.circuit.get(Materials.IV), 'W', + OrePrefixes.cableGt04.get(Materials.Aluminium) }); GT_ModHandler.addCraftingRecipe( ItemList.Machine_IV_Replicator.get(1L), bitsd, new Object[] { "EFE", aTextCableHull, aTextMotorWire, 'M', ItemList.Hull_IV, 'F', - ItemList.Field_Generator_IV, 'E', ItemList.Emitter_IV, 'C', OrePrefixes.circuit.get(Materials.Master), - 'W', OrePrefixes.cableGt04.get(Materials.Tungsten) }); + ItemList.Field_Generator_IV, 'E', ItemList.Emitter_IV, 'C', OrePrefixes.circuit.get(Materials.LuV), 'W', + OrePrefixes.cableGt04.get(Materials.Tungsten) }); GT_ModHandler.addCraftingRecipe( ItemList.Machine_LV_Brewery.get(1L), bitsd, new Object[] { "GPG", aTextWireHull, "CBC", 'M', ItemList.Hull_LV, 'P', ItemList.Electric_Pump_LV, 'B', - new ItemStack(Items.brewing_stand, 0), 'C', OrePrefixes.circuit.get(Materials.Basic), 'W', + new ItemStack(Items.brewing_stand, 0), 'C', OrePrefixes.circuit.get(Materials.LV), 'W', OrePrefixes.cableGt01.get(Materials.Tin), 'G', new ItemStack(Blocks.glass, 1) }); GT_ModHandler.addCraftingRecipe( ItemList.Machine_MV_Brewery.get(1L), bitsd, new Object[] { "GPG", aTextWireHull, "CBC", 'M', ItemList.Hull_MV, 'P', ItemList.Electric_Pump_MV, 'B', - new ItemStack(Items.brewing_stand, 0), 'C', OrePrefixes.circuit.get(Materials.Good), 'W', + new ItemStack(Items.brewing_stand, 0), 'C', OrePrefixes.circuit.get(Materials.MV), 'W', OrePrefixes.cableGt01.get(Materials.AnyCopper), 'G', new ItemStack(Blocks.glass, 1) }); GT_ModHandler.addCraftingRecipe( ItemList.Machine_HV_Brewery.get(1L), bitsd, new Object[] { "GPG", aTextWireHull, "CBC", 'M', ItemList.Hull_HV, 'P', ItemList.Electric_Pump_HV, 'B', - new ItemStack(Items.brewing_stand, 0), 'C', OrePrefixes.circuit.get(Materials.Advanced), 'W', + new ItemStack(Items.brewing_stand, 0), 'C', OrePrefixes.circuit.get(Materials.HV), 'W', OrePrefixes.cableGt01.get(Materials.Gold), 'G', new ItemStack(Blocks.glass, 1) }); GT_ModHandler.addCraftingRecipe( ItemList.Machine_EV_Brewery.get(1L), bitsd, new Object[] { "GPG", aTextWireHull, "CBC", 'M', ItemList.Hull_EV, 'P', ItemList.Electric_Pump_EV, 'B', - new ItemStack(Items.brewing_stand, 0), 'C', OrePrefixes.circuit.get(Materials.Data), 'W', + new ItemStack(Items.brewing_stand, 0), 'C', OrePrefixes.circuit.get(Materials.EV), 'W', OrePrefixes.cableGt01.get(Materials.Aluminium), 'G', new ItemStack(Blocks.glass, 1) }); GT_ModHandler.addCraftingRecipe( ItemList.Machine_IV_Brewery.get(1L), bitsd, new Object[] { "GPG", aTextWireHull, "CBC", 'M', ItemList.Hull_IV, 'P', ItemList.Electric_Pump_IV, 'B', - new ItemStack(Items.brewing_stand, 0), 'C', OrePrefixes.circuit.get(Materials.Elite), 'W', + new ItemStack(Items.brewing_stand, 0), 'C', OrePrefixes.circuit.get(Materials.IV), 'W', OrePrefixes.cableGt01.get(Materials.Tungsten), 'G', new ItemStack(Blocks.glass, 1) }); GT_ModHandler.addCraftingRecipe( ItemList.Machine_LV_Miner.get(1L), bitsd, new Object[] { "EEE", aTextWireHull, "CSC", 'M', ItemList.Hull_LV, 'E', ItemList.Electric_Motor_LV, 'C', - OrePrefixes.circuit.get(Materials.Basic), 'W', OrePrefixes.cableGt01.get(Materials.Tin), 'S', + OrePrefixes.circuit.get(Materials.LV), 'W', OrePrefixes.cableGt01.get(Materials.Tin), 'S', ItemList.Sensor_LV }); GT_ModHandler.addCraftingRecipe( ItemList.Machine_MV_Miner.get(1L), bitsd, new Object[] { "PEP", aTextWireHull, "CSC", 'M', ItemList.Hull_MV, 'E', ItemList.Electric_Motor_MV, 'P', - ItemList.Electric_Piston_MV, 'C', OrePrefixes.circuit.get(Materials.Good), 'W', + ItemList.Electric_Piston_MV, 'C', OrePrefixes.circuit.get(Materials.MV), 'W', OrePrefixes.cableGt02.get(Materials.Copper), 'S', ItemList.Sensor_MV }); GT_ModHandler.addCraftingRecipe( ItemList.Machine_HV_Miner.get(1L), bitsd, new Object[] { "RPR", aTextWireHull, "CSC", 'M', ItemList.Hull_HV, 'E', ItemList.Electric_Motor_HV, 'P', - ItemList.Electric_Piston_HV, 'R', ItemList.Robot_Arm_HV, 'C', - OrePrefixes.circuit.get(Materials.Advanced), 'W', OrePrefixes.cableGt04.get(Materials.Gold), 'S', - ItemList.Sensor_HV }); + ItemList.Electric_Piston_HV, 'R', ItemList.Robot_Arm_HV, 'C', OrePrefixes.circuit.get(Materials.HV), + 'W', OrePrefixes.cableGt04.get(Materials.Gold), 'S', ItemList.Sensor_HV }); GT_ModHandler.addCraftingRecipe( ItemList.Machine_Multi_BlastFurnace.get(1L), bitsd, new Object[] { "FFF", aTextCableHull, aTextWireCoil, 'M', ItemList.Casing_HeatProof, 'F', - OreDictNames.craftingIronFurnace, 'C', OrePrefixes.circuit.get(Materials.Basic), 'W', + OreDictNames.craftingIronFurnace, 'C', OrePrefixes.circuit.get(Materials.LV), 'W', OrePrefixes.cableGt01.get(Materials.Tin) }); GT_ModHandler.addCraftingRecipe( ItemList.Machine_Multi_VacuumFreezer.get(1L), bitsd, new Object[] { aTextPlate, aTextCableHull, aTextWireCoil, 'M', ItemList.Casing_FrostProof, 'P', - ItemList.Electric_Pump_HV, 'C', OrePrefixes.circuit.get(Materials.Data), 'W', + ItemList.Electric_Pump_HV, 'C', OrePrefixes.circuit.get(Materials.EV), 'W', OrePrefixes.cableGt01.get(Materials.Gold) }); GT_ModHandler.addCraftingRecipe( ItemList.Machine_Multi_ImplosionCompressor.get(1L), bitsd, new Object[] { "OOO", aTextCableHull, aTextWireCoil, 'M', ItemList.Casing_SolidSteel, 'O', - Ic2Items.reinforcedStone, 'C', OrePrefixes.circuit.get(Materials.Advanced), 'W', + Ic2Items.reinforcedStone, 'C', OrePrefixes.circuit.get(Materials.HV), 'W', OrePrefixes.cableGt01.get(Materials.Gold) }); GT_ModHandler.addCraftingRecipe( ItemList.Machine_Multi_Furnace.get(1L), bitsd, new Object[] { "FFF", aTextCableHull, aTextWireCoil, 'M', ItemList.Casing_HeatProof, 'F', - OreDictNames.craftingIronFurnace, 'C', OrePrefixes.circuit.get(Materials.Advanced), 'W', + OreDictNames.craftingIronFurnace, 'C', OrePrefixes.circuit.get(Materials.HV), 'W', OrePrefixes.cableGt01.get(Materials.AnnealedCopper) }); GT_ModHandler.addCraftingRecipe( ItemList.Machine_Multi_LargeBoiler_Bronze.get(1L), bitsd, new Object[] { aTextWireCoil, aTextCableHull, aTextWireCoil, 'M', ItemList.Casing_Firebox_Bronze, 'C', - OrePrefixes.circuit.get(Materials.Good), 'W', OrePrefixes.cableGt01.get(Materials.Tin) }); + OrePrefixes.circuit.get(Materials.MV), 'W', OrePrefixes.cableGt01.get(Materials.Tin) }); GT_ModHandler.addCraftingRecipe( ItemList.Machine_Multi_LargeBoiler_Steel.get(1L), bitsd, new Object[] { aTextWireCoil, aTextCableHull, aTextWireCoil, 'M', ItemList.Casing_Firebox_Steel, 'C', - OrePrefixes.circuit.get(Materials.Advanced), 'W', OrePrefixes.cableGt01.get(Materials.AnyCopper) }); + OrePrefixes.circuit.get(Materials.HV), 'W', OrePrefixes.cableGt01.get(Materials.AnyCopper) }); GT_ModHandler.addCraftingRecipe( ItemList.Machine_Multi_LargeBoiler_Titanium.get(1L), bitsd, new Object[] { aTextWireCoil, aTextCableHull, aTextWireCoil, 'M', ItemList.Casing_Firebox_Titanium, 'C', - OrePrefixes.circuit.get(Materials.Data), 'W', OrePrefixes.cableGt01.get(Materials.Gold) }); + OrePrefixes.circuit.get(Materials.EV), 'W', OrePrefixes.cableGt01.get(Materials.Gold) }); GT_ModHandler.addCraftingRecipe( ItemList.Machine_Multi_LargeBoiler_TungstenSteel.get(1L), bitsd, new Object[] { aTextWireCoil, aTextCableHull, aTextWireCoil, 'M', ItemList.Casing_Firebox_TungstenSteel, - 'C', OrePrefixes.circuit.get(Materials.Elite), 'W', OrePrefixes.cableGt01.get(Materials.Aluminium) }); + 'C', OrePrefixes.circuit.get(Materials.IV), 'W', OrePrefixes.cableGt01.get(Materials.Aluminium) }); GT_ModHandler.addCraftingRecipe( ItemList.Generator_Diesel_LV.get(1L), bitsd, new Object[] { "PCP", "EME", "GWG", 'M', ItemList.Hull_LV, 'P', ItemList.Electric_Piston_LV, 'E', - ItemList.Electric_Motor_LV, 'C', OrePrefixes.circuit.get(Materials.Basic), 'W', + ItemList.Electric_Motor_LV, 'C', OrePrefixes.circuit.get(Materials.LV), 'W', OrePrefixes.cableGt01.get(Materials.Tin), 'G', OrePrefixes.gearGt.get(Materials.Steel) }); GT_ModHandler.addCraftingRecipe( ItemList.Generator_Diesel_MV.get(1L), bitsd, new Object[] { "PCP", "EME", "GWG", 'M', ItemList.Hull_MV, 'P', ItemList.Electric_Piston_MV, 'E', - ItemList.Electric_Motor_MV, 'C', OrePrefixes.circuit.get(Materials.Good), 'W', + ItemList.Electric_Motor_MV, 'C', OrePrefixes.circuit.get(Materials.MV), 'W', OrePrefixes.cableGt01.get(Materials.AnyCopper), 'G', OrePrefixes.gearGt.get(Materials.Aluminium) }); GT_ModHandler.addCraftingRecipe( ItemList.Generator_Diesel_HV.get(1L), bitsd, new Object[] { "PCP", "EME", "GWG", 'M', ItemList.Hull_HV, 'P', ItemList.Electric_Piston_HV, 'E', - ItemList.Electric_Motor_HV, 'C', OrePrefixes.circuit.get(Materials.Advanced), 'W', + ItemList.Electric_Motor_HV, 'C', OrePrefixes.circuit.get(Materials.HV), 'W', OrePrefixes.cableGt01.get(Materials.Gold), 'G', OrePrefixes.gearGt.get(Materials.StainlessSteel) }); GT_ModHandler.addCraftingRecipe( ItemList.Generator_Gas_Turbine_LV.get(1L), bitsd, new Object[] { "CRC", "RMR", aTextMotorWire, 'M', ItemList.Hull_LV, 'E', ItemList.Electric_Motor_LV, 'R', - OrePrefixes.rotor.get(Materials.Tin), 'C', OrePrefixes.circuit.get(Materials.Basic), 'W', + OrePrefixes.rotor.get(Materials.Tin), 'C', OrePrefixes.circuit.get(Materials.LV), 'W', OrePrefixes.cableGt01.get(Materials.Tin) }); GT_ModHandler.addCraftingRecipe( ItemList.Generator_Gas_Turbine_MV.get(1L), bitsd, new Object[] { "CRC", "RMR", aTextMotorWire, 'M', ItemList.Hull_MV, 'E', ItemList.Electric_Motor_MV, 'R', - OrePrefixes.rotor.get(Materials.Bronze), 'C', OrePrefixes.circuit.get(Materials.Good), 'W', + OrePrefixes.rotor.get(Materials.Bronze), 'C', OrePrefixes.circuit.get(Materials.MV), 'W', OrePrefixes.cableGt01.get(Materials.AnyCopper) }); GT_ModHandler.addCraftingRecipe( ItemList.Generator_Gas_Turbine_HV.get(1L), bitsd, new Object[] { "CRC", "RMR", aTextMotorWire, 'M', ItemList.Hull_HV, 'E', ItemList.Electric_Motor_HV, 'R', - OrePrefixes.rotor.get(Materials.Steel), 'C', OrePrefixes.circuit.get(Materials.Advanced), 'W', + OrePrefixes.rotor.get(Materials.Steel), 'C', OrePrefixes.circuit.get(Materials.HV), 'W', OrePrefixes.cableGt01.get(Materials.Gold) }); GT_ModHandler.addCraftingRecipe( ItemList.Generator_Gas_Turbine_EV.get(1L), bitsd, new Object[] { "CRC", "RMR", aTextMotorWire, 'M', ItemList.Hull_EV, 'E', ItemList.Electric_Motor_EV, 'R', - OrePrefixes.rotor.get(Materials.Titanium), 'C', OrePrefixes.circuit.get(Materials.Data), 'W', + OrePrefixes.rotor.get(Materials.Titanium), 'C', OrePrefixes.circuit.get(Materials.EV), 'W', OrePrefixes.cableGt01.get(Materials.Aluminium) }); GT_ModHandler.addCraftingRecipe( ItemList.Generator_Gas_Turbine_IV.get(1L), bitsd, new Object[] { "CRC", "RMR", aTextMotorWire, 'M', ItemList.Hull_IV, 'E', ItemList.Electric_Motor_IV, 'R', - OrePrefixes.rotor.get(Materials.TungstenSteel), 'C', OrePrefixes.circuit.get(Materials.Elite), 'W', + OrePrefixes.rotor.get(Materials.TungstenSteel), 'C', OrePrefixes.circuit.get(Materials.IV), 'W', OrePrefixes.cableGt01.get(Materials.Tungsten) }); GT_ModHandler.addCraftingRecipe( ItemList.Generator_Steam_Turbine_LV.get(1L), bitsd, new Object[] { "PCP", "RMR", aTextMotorWire, 'M', ItemList.Hull_LV, 'E', ItemList.Electric_Motor_LV, 'R', - OrePrefixes.rotor.get(Materials.Tin), 'C', OrePrefixes.circuit.get(Materials.Basic), 'W', + OrePrefixes.rotor.get(Materials.Tin), 'C', OrePrefixes.circuit.get(Materials.LV), 'W', OrePrefixes.cableGt01.get(Materials.Tin), 'P', OrePrefixes.pipeMedium.get(Materials.Bronze) }); GT_ModHandler.addCraftingRecipe( ItemList.Generator_Steam_Turbine_MV.get(1L), bitsd, new Object[] { "PCP", "RMR", aTextMotorWire, 'M', ItemList.Hull_MV, 'E', ItemList.Electric_Motor_MV, 'R', - OrePrefixes.rotor.get(Materials.Bronze), 'C', OrePrefixes.circuit.get(Materials.Good), 'W', + OrePrefixes.rotor.get(Materials.Bronze), 'C', OrePrefixes.circuit.get(Materials.MV), 'W', OrePrefixes.cableGt01.get(Materials.AnyCopper), 'P', OrePrefixes.pipeMedium.get(Materials.Steel) }); GT_ModHandler.addCraftingRecipe( ItemList.Generator_Steam_Turbine_HV.get(1L), bitsd, new Object[] { "PCP", "RMR", aTextMotorWire, 'M', ItemList.Hull_HV, 'E', ItemList.Electric_Motor_HV, 'R', - OrePrefixes.rotor.get(Materials.Steel), 'C', OrePrefixes.circuit.get(Materials.Advanced), 'W', + OrePrefixes.rotor.get(Materials.Steel), 'C', OrePrefixes.circuit.get(Materials.HV), 'W', OrePrefixes.cableGt01.get(Materials.Gold), 'P', OrePrefixes.pipeMedium.get(Materials.StainlessSteel) }); if (!Thaumcraft.isModLoaded()) { @@ -6143,77 +6142,77 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { ItemList.MagicEnergyConverter_LV.get(1L), bitsd, new Object[] { "CTC", "FMF", "CBC", 'M', ItemList.Hull_LV, 'B', new ItemStack(Blocks.beacon), 'C', - OrePrefixes.circuit.get(Materials.Advanced), 'T', ItemList.Field_Generator_LV, 'F', + OrePrefixes.circuit.get(Materials.HV), 'T', ItemList.Field_Generator_LV, 'F', OrePrefixes.plate.get(Materials.Platinum) }); GT_ModHandler.addCraftingRecipe( ItemList.MagicEnergyConverter_MV.get(1L), bitsd, new Object[] { "CTC", "FMF", "CBC", 'M', ItemList.Hull_MV, 'B', new ItemStack(Blocks.beacon), 'C', - OrePrefixes.circuit.get(Materials.Data), 'T', ItemList.Field_Generator_MV, 'F', + OrePrefixes.circuit.get(Materials.EV), 'T', ItemList.Field_Generator_MV, 'F', OrePrefixes.plate.get(Materials.Iridium) }); GT_ModHandler.addCraftingRecipe( ItemList.MagicEnergyConverter_HV.get(1L), bitsd, new Object[] { "CTC", "FMF", "CBC", 'M', ItemList.Hull_HV, 'B', new ItemStack(Blocks.beacon), 'C', - OrePrefixes.circuit.get(Materials.Elite), 'T', ItemList.Field_Generator_HV, 'F', + OrePrefixes.circuit.get(Materials.IV), 'T', ItemList.Field_Generator_HV, 'F', OrePrefixes.plate.get(Materials.Neutronium) }); GT_ModHandler.addCraftingRecipe( ItemList.MagicEnergyAbsorber_LV.get(1L), bitsd, new Object[] { "CTC", "FMF", "CBC", 'M', ItemList.Hull_LV, 'B', - ItemList.MagicEnergyConverter_LV.get(1L), 'C', OrePrefixes.circuit.get(Materials.Advanced), 'T', + ItemList.MagicEnergyConverter_LV.get(1L), 'C', OrePrefixes.circuit.get(Materials.HV), 'T', ItemList.Field_Generator_LV, 'F', OrePrefixes.plate.get(Materials.Platinum) }); GT_ModHandler.addCraftingRecipe( ItemList.MagicEnergyAbsorber_MV.get(1L), bitsd, new Object[] { "CTC", "FMF", "CBC", 'M', ItemList.Hull_MV, 'B', - ItemList.MagicEnergyConverter_MV.get(1L), 'C', OrePrefixes.circuit.get(Materials.Data), 'T', + ItemList.MagicEnergyConverter_MV.get(1L), 'C', OrePrefixes.circuit.get(Materials.EV), 'T', ItemList.Field_Generator_MV, 'F', OrePrefixes.plate.get(Materials.Iridium) }); GT_ModHandler.addCraftingRecipe( ItemList.MagicEnergyAbsorber_HV.get(1L), bitsd, new Object[] { "CTC", "FMF", "CBC", 'M', ItemList.Hull_HV, 'B', - ItemList.MagicEnergyConverter_MV.get(1L), 'C', OrePrefixes.circuit.get(Materials.Elite), 'T', + ItemList.MagicEnergyConverter_MV.get(1L), 'C', OrePrefixes.circuit.get(Materials.IV), 'T', ItemList.Field_Generator_HV, 'F', OrePrefixes.plate.get(Materials.Europium) }); GT_ModHandler.addCraftingRecipe( ItemList.MagicEnergyAbsorber_EV.get(1L), bitsd, new Object[] { "CTC", "FMF", "CBC", 'M', ItemList.Hull_HV, 'B', - ItemList.MagicEnergyConverter_HV.get(1L), 'C', OrePrefixes.circuit.get(Materials.Master), 'T', + ItemList.MagicEnergyConverter_HV.get(1L), 'C', OrePrefixes.circuit.get(Materials.LuV), 'T', ItemList.Field_Generator_EV, 'F', OrePrefixes.plate.get(Materials.Neutronium) }); } GT_ModHandler.addCraftingRecipe( ItemList.Casing_Fusion_Coil.get(1L), bitsd, new Object[] { "CTC", "FMF", "CTC", 'M', ItemList.Casing_Coil_Superconductor, 'C', - OrePrefixes.circuit.get(Materials.Master), 'F', ItemList.Field_Generator_MV, 'T', + OrePrefixes.circuit.get(Materials.LuV), 'F', ItemList.Field_Generator_MV, 'T', ItemList.Neutron_Reflector }); GT_ModHandler.addCraftingRecipe( ItemList.Generator_Plasma_IV.get(1L), bitsd, new Object[] { "UCU", "FMF", aTextWireCoil, 'M', ItemList.Hull_LuV, 'F', ItemList.Field_Generator_HV, 'C', - OrePrefixes.circuit.get(Materials.Elite), 'W', OrePrefixes.cableGt04.get(Materials.Tungsten), 'U', + OrePrefixes.circuit.get(Materials.IV), 'W', OrePrefixes.cableGt04.get(Materials.Tungsten), 'U', OrePrefixes.stick.get(Materials.Plutonium241) }); GT_ModHandler.addCraftingRecipe( ItemList.Generator_Plasma_LuV.get(1L), bitsd, new Object[] { "UCU", "FMF", aTextWireCoil, 'M', ItemList.Hull_ZPM, 'F', ItemList.Field_Generator_EV, 'C', - OrePrefixes.circuit.get(Materials.Master), 'W', OrePrefixes.wireGt04.get(Materials.VanadiumGallium), - 'U', OrePrefixes.stick.get(Materials.Europium) }); + OrePrefixes.circuit.get(Materials.LuV), 'W', OrePrefixes.wireGt04.get(Materials.VanadiumGallium), 'U', + OrePrefixes.stick.get(Materials.Europium) }); GT_ModHandler.addCraftingRecipe( ItemList.Generator_Plasma_ZPMV.get(1L), bitsd, new Object[] { "UCU", "FMF", aTextWireCoil, 'M', ItemList.Hull_UV, 'F', ItemList.Field_Generator_IV, 'C', - OrePrefixes.circuit.get(Materials.Ultimate), 'W', OrePrefixes.wireGt04.get(Materials.Naquadah), 'U', + OrePrefixes.circuit.get(Materials.ZPM), 'W', OrePrefixes.wireGt04.get(Materials.Naquadah), 'U', OrePrefixes.stick.get(Materials.Americium) }); GT_ModHandler.addCraftingRecipe( ItemList.Processing_Array.get(1L), bitsd, new Object[] { "CTC", "FMF", "CBC", 'M', ItemList.Hull_EV, 'B', - OrePrefixes.pipeLarge.get(Materials.StainlessSteel), 'C', OrePrefixes.circuit.get(Materials.Elite), 'F', + OrePrefixes.pipeLarge.get(Materials.StainlessSteel), 'C', OrePrefixes.circuit.get(Materials.IV), 'F', ItemList.Robot_Arm_EV, 'T', ItemList.Energy_LapotronicOrb }); GT_ProcessingArrayRecipeLoader.registerDefaultGregtechMaps(); @@ -6221,99 +6220,99 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { ItemList.Distillation_Tower.get(1L), bitsd, new Object[] { "CBC", "FMF", "CBC", 'M', ItemList.Hull_HV, 'B', - OrePrefixes.pipeLarge.get(Materials.StainlessSteel), 'C', OrePrefixes.circuit.get(Materials.Data), 'F', + OrePrefixes.pipeLarge.get(Materials.StainlessSteel), 'C', OrePrefixes.circuit.get(Materials.EV), 'F', ItemList.Electric_Pump_HV }); GT_ModHandler.addCraftingRecipe( ItemList.LargeSteamTurbine.get(1L), bitsd, new Object[] { "CPC", aTextPlateMotor, "BPB", 'M', ItemList.Hull_HV, 'B', - OrePrefixes.pipeLarge.get(Materials.Steel), 'C', OrePrefixes.circuit.get(Materials.Advanced), 'P', + OrePrefixes.pipeLarge.get(Materials.Steel), 'C', OrePrefixes.circuit.get(Materials.HV), 'P', OrePrefixes.gearGt.get(Materials.Steel) }); GT_ModHandler.addCraftingRecipe( ItemList.LargeGasTurbine.get(1L), bitsd, new Object[] { "CPC", aTextPlateMotor, "BPB", 'M', ItemList.Hull_EV, 'B', - OrePrefixes.pipeLarge.get(Materials.StainlessSteel), 'C', OrePrefixes.circuit.get(Materials.Data), 'P', + OrePrefixes.pipeLarge.get(Materials.StainlessSteel), 'C', OrePrefixes.circuit.get(Materials.EV), 'P', OrePrefixes.gearGt.get(Materials.StainlessSteel) }); GT_ModHandler.addCraftingRecipe( ItemList.LargeAdvancedGasTurbine.get(1L), bitsd, new Object[] { "CPC", aTextPlateMotor, "BPB", 'M', ItemList.Hull_IV, 'B', - OrePrefixes.pipeLarge.get(Materials.TungstenSteel), 'C', OrePrefixes.circuit.get(Materials.Master), 'P', + OrePrefixes.pipeLarge.get(Materials.TungstenSteel), 'C', OrePrefixes.circuit.get(Materials.LuV), 'P', OrePrefixes.gearGt.get(Materials.HSSG) }); GT_ModHandler.addCraftingRecipe( ItemList.Pump_LV.get(1L), bitsd, new Object[] { "CPC", aTextPlateMotor, "BPB", 'M', ItemList.Hull_LV, 'B', - OrePrefixes.pipeLarge.get(Materials.Bronze), 'C', OrePrefixes.circuit.get(Materials.Basic), 'P', + OrePrefixes.pipeLarge.get(Materials.Bronze), 'C', OrePrefixes.circuit.get(Materials.LV), 'P', ItemList.Electric_Pump_LV }); GT_ModHandler.addCraftingRecipe( ItemList.Pump_MV.get(1L), bitsd, new Object[] { "CPC", aTextPlateMotor, "BPB", 'M', ItemList.Hull_MV, 'B', - OrePrefixes.pipeLarge.get(Materials.Steel), 'C', OrePrefixes.circuit.get(Materials.Good), 'P', + OrePrefixes.pipeLarge.get(Materials.Steel), 'C', OrePrefixes.circuit.get(Materials.MV), 'P', ItemList.Electric_Pump_MV }); GT_ModHandler.addCraftingRecipe( ItemList.Pump_HV.get(1L), bitsd, new Object[] { "CPC", aTextPlateMotor, "BPB", 'M', ItemList.Hull_HV, 'B', - OrePrefixes.pipeLarge.get(Materials.StainlessSteel), 'C', OrePrefixes.circuit.get(Materials.Advanced), - 'P', ItemList.Electric_Pump_HV }); + OrePrefixes.pipeLarge.get(Materials.StainlessSteel), 'C', OrePrefixes.circuit.get(Materials.HV), 'P', + ItemList.Electric_Pump_HV }); GT_ModHandler.addCraftingRecipe( ItemList.Pump_EV.get(1L), bitsd, new Object[] { "CPC", aTextPlateMotor, "BPB", 'M', ItemList.Hull_EV, 'B', - OrePrefixes.pipeLarge.get(Materials.Titanium), 'C', OrePrefixes.circuit.get(Materials.Data), 'P', + OrePrefixes.pipeLarge.get(Materials.Titanium), 'C', OrePrefixes.circuit.get(Materials.EV), 'P', ItemList.Electric_Pump_EV }); GT_ModHandler.addCraftingRecipe( ItemList.Pump_IV.get(1L), bitsd, new Object[] { "CPC", aTextPlateMotor, "BPB", 'M', ItemList.Hull_IV, 'B', - OrePrefixes.pipeLarge.get(Materials.TungstenSteel), 'C', OrePrefixes.circuit.get(Materials.Elite), 'P', + OrePrefixes.pipeLarge.get(Materials.TungstenSteel), 'C', OrePrefixes.circuit.get(Materials.IV), 'P', ItemList.Electric_Pump_IV }); GT_ModHandler.addCraftingRecipe( ItemList.MobRep_LV.get(1L), bitsd, new Object[] { "EEE", " M ", "CCC", 'M', ItemList.Hull_LV, 'E', ItemList.Emitter_LV.get(1L), 'C', - OrePrefixes.circuit.get(Materials.Basic) }); + OrePrefixes.circuit.get(Materials.LV) }); GT_ModHandler.addCraftingRecipe( ItemList.MobRep_MV.get(1L), bitsd, new Object[] { "EEE", " M ", "CCC", 'M', ItemList.Hull_MV, 'E', ItemList.Emitter_MV.get(1L), 'C', - OrePrefixes.circuit.get(Materials.Good) }); + OrePrefixes.circuit.get(Materials.MV) }); GT_ModHandler.addCraftingRecipe( ItemList.MobRep_HV.get(1L), bitsd, new Object[] { "EEE", " M ", "CCC", 'M', ItemList.Hull_HV, 'E', ItemList.Emitter_HV.get(1L), 'C', - OrePrefixes.circuit.get(Materials.Advanced) }); + OrePrefixes.circuit.get(Materials.HV) }); GT_ModHandler.addCraftingRecipe( ItemList.MobRep_EV.get(1L), bitsd, new Object[] { "EEE", " M ", "CCC", 'M', ItemList.Hull_EV, 'E', ItemList.Emitter_EV.get(1L), 'C', - OrePrefixes.circuit.get(Materials.Data) }); + OrePrefixes.circuit.get(Materials.EV) }); GT_ModHandler.addCraftingRecipe( ItemList.MobRep_IV.get(1L), bitsd, new Object[] { "EEE", " M ", "CCC", 'M', ItemList.Hull_IV, 'E', ItemList.Emitter_IV.get(1L), 'C', - OrePrefixes.circuit.get(Materials.Elite) }); + OrePrefixes.circuit.get(Materials.IV) }); GT_ModHandler.addCraftingRecipe( ItemList.MobRep_LuV.get(1L), bitsd, new Object[] { "EEE", " M ", "CCC", 'M', ItemList.Hull_LuV, 'E', ItemList.Emitter_LuV.get(1L), 'C', - OrePrefixes.circuit.get(Materials.Master) }); + OrePrefixes.circuit.get(Materials.LuV) }); GT_ModHandler.addCraftingRecipe( ItemList.MobRep_ZPM.get(1L), bitsd, new Object[] { "EEE", " M ", "CCC", 'M', ItemList.Hull_ZPM, 'E', ItemList.Emitter_ZPM.get(1L), 'C', - OrePrefixes.circuit.get(Materials.Ultimate) }); + OrePrefixes.circuit.get(Materials.ZPM) }); GT_ModHandler.addCraftingRecipe( ItemList.MobRep_UV.get(1L), bitsd, new Object[] { "EEE", " M ", "CCC", 'M', ItemList.Hull_UV, 'E', ItemList.Emitter_UV.get(1L), 'C', - OrePrefixes.circuit.get(Materials.SuperconductorUHV) }); + OrePrefixes.circuit.get(Materials.UV) }); GT_ModHandler.addCraftingRecipe( ItemList.Machine_Multi_HeatExchanger.get(1L), @@ -6332,38 +6331,38 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { ItemList.Seismic_Prospector_Adv_LV.get(1L), bitsd, new Object[] { "WWW", "EME", "CXC", 'M', ItemList.Hull_LV, 'W', - OrePrefixes.plateDouble.get(Materials.Steel), 'E', OrePrefixes.circuit.get(Materials.Basic), 'C', + OrePrefixes.plateDouble.get(Materials.Steel), 'E', OrePrefixes.circuit.get(Materials.LV), 'C', ItemList.Sensor_LV, 'X', OrePrefixes.cableGt02.get(Materials.Tin) }); GT_ModHandler.addCraftingRecipe( ItemList.Seismic_Prospector_Adv_MV.get(1L), bitsd, new Object[] { "WWW", "EME", "CXC", 'M', ItemList.Hull_MV, 'W', - OrePrefixes.plateDouble.get(Materials.BlackSteel), 'E', OrePrefixes.circuit.get(Materials.Good), 'C', + OrePrefixes.plateDouble.get(Materials.BlackSteel), 'E', OrePrefixes.circuit.get(Materials.MV), 'C', ItemList.Sensor_MV, 'X', OrePrefixes.cableGt02.get(Materials.Copper) }); GT_ModHandler.addCraftingRecipe( ItemList.Seismic_Prospector_Adv_HV.get(1L), bitsd, new Object[] { "WWW", "EME", "CXC", 'M', ItemList.Hull_HV, 'W', - OrePrefixes.plateDouble.get(Materials.StainlessSteel), 'E', OrePrefixes.circuit.get(Materials.Advanced), - 'C', ItemList.Sensor_HV, 'X', OrePrefixes.cableGt04.get(Materials.Gold) }); + OrePrefixes.plateDouble.get(Materials.StainlessSteel), 'E', OrePrefixes.circuit.get(Materials.HV), 'C', + ItemList.Sensor_HV, 'X', OrePrefixes.cableGt04.get(Materials.Gold) }); GT_ModHandler.addCraftingRecipe( ItemList.Seismic_Prospector_Adv_EV.get(1L), bitsd, new Object[] { "WWW", "EME", "CXC", 'M', ItemList.Hull_EV, 'W', - OrePrefixes.plateDouble.get(Materials.VanadiumSteel), 'E', OrePrefixes.circuit.get(Materials.Data), 'C', + OrePrefixes.plateDouble.get(Materials.VanadiumSteel), 'E', OrePrefixes.circuit.get(Materials.EV), 'C', ItemList.Sensor_EV, 'X', OrePrefixes.cableGt04.get(Materials.Aluminium) }); GT_ModHandler.addCraftingRecipe( ItemList.ConcreteBackfiller1.get(1L), bitsd, new Object[] { "WPW", "EME", "CQC", 'M', ItemList.Hull_MV, 'W', OrePrefixes.frameGt.get(Materials.Steel), - 'E', OrePrefixes.circuit.get(Materials.Good), 'C', ItemList.Electric_Motor_MV, 'P', + 'E', OrePrefixes.circuit.get(Materials.MV), 'C', ItemList.Electric_Motor_MV, 'P', OrePrefixes.pipeLarge.get(Materials.Steel), 'Q', ItemList.Electric_Pump_MV }); GT_ModHandler.addCraftingRecipe( ItemList.ConcreteBackfiller2.get(1L), bitsd, new Object[] { "WPW", "EME", "CQC", 'M', ItemList.ConcreteBackfiller1, 'W', - OrePrefixes.frameGt.get(Materials.Titanium), 'E', OrePrefixes.circuit.get(Materials.Data), 'C', + OrePrefixes.frameGt.get(Materials.Titanium), 'E', OrePrefixes.circuit.get(Materials.EV), 'C', ItemList.Electric_Motor_EV, 'P', OrePrefixes.pipeLarge.get(Materials.Steel), 'Q', ItemList.Electric_Pump_EV }); @@ -6371,38 +6370,38 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { ItemList.PyrolyseOven.get(1L), bitsd, new Object[] { "WEP", "EME", "WCP", 'M', ItemList.Hull_MV, 'W', ItemList.Electric_Piston_MV, 'P', - OrePrefixes.wireGt04.get(Materials.Cupronickel), 'E', OrePrefixes.circuit.get(Materials.Good), 'C', + OrePrefixes.wireGt04.get(Materials.Cupronickel), 'E', OrePrefixes.circuit.get(Materials.MV), 'C', ItemList.Electric_Pump_MV }); GT_ModHandler.addCraftingRecipe( ItemList.OilCracker.get(1L), bitsd, new Object[] { aTextWireCoil, "EME", aTextWireCoil, 'M', ItemList.Hull_HV, 'W', - ItemList.Casing_Coil_Cupronickel, 'E', OrePrefixes.circuit.get(Materials.Advanced), 'C', + ItemList.Casing_Coil_Cupronickel, 'E', OrePrefixes.circuit.get(Materials.HV), 'C', ItemList.Electric_Pump_HV }); GT_ModHandler.addCraftingRecipe( ItemList.MicroTransmitter_HV.get(1L), bitsd, new Object[] { "CPC", aTextCableHull, "GBG", 'M', ItemList.Hull_HV, 'B', ItemList.Battery_RE_HV_Lithium, - 'C', ItemList.Emitter_HV, 'G', OrePrefixes.circuit.get(Materials.Advanced), 'P', + 'C', ItemList.Emitter_HV, 'G', OrePrefixes.circuit.get(Materials.HV), 'P', ItemList.Field_Generator_HV }); GT_ModHandler.addCraftingRecipe( ItemList.MicroTransmitter_EV.get(1L), bitsd, new Object[] { "CPC", aTextCableHull, "GBG", 'M', ItemList.Hull_EV, 'B', GT_ModHandler.getIC2Item("lapotronCrystal", 1L, GT_Values.W), 'C', ItemList.Emitter_EV, 'G', - OrePrefixes.circuit.get(Materials.Data), 'P', ItemList.Field_Generator_EV }); + OrePrefixes.circuit.get(Materials.EV), 'P', ItemList.Field_Generator_EV }); GT_ModHandler.addCraftingRecipe( ItemList.MicroTransmitter_IV.get(1L), bitsd, new Object[] { "CPC", aTextCableHull, "GBG", 'M', ItemList.Hull_IV, 'B', ItemList.Energy_LapotronicOrb, 'C', - ItemList.Emitter_IV, 'G', OrePrefixes.circuit.get(Materials.Elite), 'P', ItemList.Field_Generator_IV }); + ItemList.Emitter_IV, 'G', OrePrefixes.circuit.get(Materials.IV), 'P', ItemList.Field_Generator_IV }); GT_ModHandler.addCraftingRecipe( ItemList.MicroTransmitter_LUV.get(1L), bitsd, new Object[] { "CPC", aTextCableHull, "GBG", 'M', ItemList.Hull_LuV, 'B', ItemList.Energy_LapotronicOrb2, - 'C', ItemList.Emitter_LuV, 'G', OrePrefixes.circuit.get(Materials.Master), 'P', + 'C', ItemList.Emitter_LuV, 'G', OrePrefixes.circuit.get(Materials.LuV), 'P', ItemList.Field_Generator_LuV }); GT_ModHandler.addCraftingRecipe( ItemList.MicroTransmitter_ZPM.get(1L), @@ -6411,7 +6410,7 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { GregTech_API.sOPStuff.get(ConfigCategories.Recipes.gregtechrecipes, "EnableZPMandUVBatteries", false) ? ItemList.Energy_Module : ItemList.ZPM2, - 'C', ItemList.Emitter_ZPM, 'G', OrePrefixes.circuit.get(Materials.Ultimate), 'P', + 'C', ItemList.Emitter_ZPM, 'G', OrePrefixes.circuit.get(Materials.ZPM), 'P', ItemList.Field_Generator_ZPM }); GT_ModHandler.addCraftingRecipe( ItemList.MicroTransmitter_UV.get(1L), @@ -6420,20 +6419,20 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { GregTech_API.sOPStuff.get(ConfigCategories.Recipes.gregtechrecipes, "EnableZPMandUVBatteries", false) ? ItemList.Energy_Module : ItemList.ZPM3, - 'C', ItemList.Emitter_UV, 'G', OrePrefixes.circuit.get(Materials.SuperconductorUHV), 'P', + 'C', ItemList.Emitter_UV, 'G', OrePrefixes.circuit.get(Materials.UV), 'P', ItemList.Field_Generator_UV }); GT_ModHandler.addCraftingRecipe( ItemList.Machine_Multi_Assemblyline.get(1L), bitsd, new Object[] { aTextWireCoil, "EME", aTextWireCoil, 'M', ItemList.Hull_IV, 'W', ItemList.Casing_Assembler, - 'E', OrePrefixes.circuit.get(Materials.Elite), 'C', ItemList.Robot_Arm_IV }); + 'E', OrePrefixes.circuit.get(Materials.IV), 'C', ItemList.Robot_Arm_IV }); GT_ModHandler.addCraftingRecipe( ItemList.Machine_Multi_DieselEngine.get(1L), bitsd, new Object[] { "PCP", "EME", "GWG", 'M', ItemList.Hull_EV, 'P', ItemList.Electric_Piston_EV, 'E', - ItemList.Electric_Motor_EV, 'C', OrePrefixes.circuit.get(Materials.Elite), 'W', + ItemList.Electric_Motor_EV, 'C', OrePrefixes.circuit.get(Materials.IV), 'W', OrePrefixes.cableGt01.get(Materials.TungstenSteel), 'G', OrePrefixes.gearGt.get(Materials.Titanium) }); GT_ModHandler.addCraftingRecipe( ItemList.Casing_EngineIntake.get(4L), @@ -6445,7 +6444,7 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { ItemList.Machine_Multi_ExtremeDieselEngine.get(1L), bitsd, new Object[] { "PCP", "EME", "GWG", 'M', ItemList.Hull_IV, 'P', ItemList.Electric_Piston_IV, 'E', - ItemList.Electric_Motor_IV, 'C', OrePrefixes.circuit.get(Materials.Master), 'W', + ItemList.Electric_Motor_IV, 'C', OrePrefixes.circuit.get(Materials.LuV), 'W', OrePrefixes.cableGt01.get(Materials.HSSG), 'G', OrePrefixes.gearGt.get(Materials.TungstenSteel) }); GT_ModHandler.addCraftingRecipe( ItemList.Casing_ExtremeEngineIntake.get(4L), @@ -6460,7 +6459,7 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { bitsd, new Object[] { "FFF", "RHR", "MCM", 'H', ItemList.Hull_HV, 'F', ItemList.Component_Filter, 'R', OrePrefixes.rotor.get(Materials.StainlessSteel), 'M', ItemList.Electric_Motor_HV, 'C', - OrePrefixes.circuit.get(Materials.Advanced) }); + OrePrefixes.circuit.get(Materials.HV) }); } else { if (NotEnoughItems.isModLoaded()) { API.hideItem(ItemList.Machine_Multi_Cleanroom.get(1L)); @@ -6486,7 +6485,7 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { GT_ModHandler.addCraftingRecipe( ItemList.Machine_Multi_LargeChemicalReactor.get(1L), bitsd, - new Object[] { "CRC", "PMP", "CBC", 'C', OrePrefixes.circuit.get(Materials.Advanced), 'R', + new Object[] { "CRC", "PMP", "CBC", 'C', OrePrefixes.circuit.get(Materials.HV), 'R', OrePrefixes.rotor.get(Materials.StainlessSteel), 'P', OrePrefixes.pipeLarge.get(Materials.Polytetrafluoroethylene), 'M', ItemList.Electric_Motor_HV, 'B', ItemList.Hull_HV }); @@ -6695,235 +6694,235 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { ItemList.Automation_ChestBuffer_ULV.get(1L), bits, new Object[] { "CMV", " X ", 'M', ItemList.Hull_ULV, 'V', ItemList.Conveyor_Module_LV, 'C', - OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.Primitive) }); + OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.ULV) }); GT_ModHandler.addCraftingRecipe( ItemList.Automation_ChestBuffer_LV.get(1L), bits, new Object[] { "CMV", " X ", 'M', ItemList.Hull_LV, 'V', ItemList.Conveyor_Module_LV, 'C', - OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.Basic) }); + OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.LV) }); GT_ModHandler.addCraftingRecipe( ItemList.Automation_ChestBuffer_MV.get(1L), bits, new Object[] { "CMV", " X ", 'M', ItemList.Hull_MV, 'V', ItemList.Conveyor_Module_MV, 'C', - OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.Good) }); + OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.MV) }); GT_ModHandler.addCraftingRecipe( ItemList.Automation_ChestBuffer_HV.get(1L), bits, new Object[] { "CMV", " X ", 'M', ItemList.Hull_HV, 'V', ItemList.Conveyor_Module_HV, 'C', - OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.Advanced) }); + OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.HV) }); GT_ModHandler.addCraftingRecipe( ItemList.Automation_ChestBuffer_EV.get(1L), bits, new Object[] { "CMV", " X ", 'M', ItemList.Hull_EV, 'V', ItemList.Conveyor_Module_EV, 'C', - OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.Data) }); + OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.EV) }); GT_ModHandler.addCraftingRecipe( ItemList.Automation_ChestBuffer_IV.get(1L), bits, new Object[] { "CMV", " X ", 'M', ItemList.Hull_IV, 'V', ItemList.Conveyor_Module_IV, 'C', - OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.Elite) }); + OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.IV) }); GT_ModHandler.addCraftingRecipe( ItemList.Automation_ChestBuffer_LuV.get(1L), bits, new Object[] { "CMV", " X ", 'M', ItemList.Hull_LuV, 'V', ItemList.Conveyor_Module_LuV, 'C', - OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.Master) }); + OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.LuV) }); GT_ModHandler.addCraftingRecipe( ItemList.Automation_ChestBuffer_ZPM.get(1L), bits, new Object[] { "CMV", " X ", 'M', ItemList.Hull_ZPM, 'V', ItemList.Conveyor_Module_ZPM, 'C', - OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.Ultimate) }); + OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.ZPM) }); GT_ModHandler.addCraftingRecipe( ItemList.Automation_ChestBuffer_UV.get(1L), bits, new Object[] { "CMV", " X ", 'M', ItemList.Hull_UV, 'V', ItemList.Conveyor_Module_UV, 'C', - OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.SuperconductorUHV) }); + OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.UV) }); GT_ModHandler.addCraftingRecipe( ItemList.Automation_ChestBuffer_MAX.get(1L), bits, new Object[] { "CMV", " X ", 'M', ItemList.Hull_MAX, 'V', ItemList.Conveyor_Module_UHV, 'C', - OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.Infinite) }); + OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.UHV) }); GT_ModHandler.addCraftingRecipe( ItemList.Automation_Filter_ULV.get(1L), bits, new Object[] { " F ", "CMV", " X ", 'M', ItemList.Hull_ULV, 'V', ItemList.Conveyor_Module_LV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', - OrePrefixes.circuit.get(Materials.Basic) }); + OrePrefixes.circuit.get(Materials.LV) }); GT_ModHandler.addCraftingRecipe( ItemList.Automation_Filter_LV.get(1L), bits, new Object[] { " F ", "CMV", " X ", 'M', ItemList.Hull_LV, 'V', ItemList.Conveyor_Module_LV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', - OrePrefixes.circuit.get(Materials.Basic) }); + OrePrefixes.circuit.get(Materials.LV) }); GT_ModHandler.addCraftingRecipe( ItemList.Automation_Filter_MV.get(1L), bits, new Object[] { " F ", "CMV", " X ", 'M', ItemList.Hull_MV, 'V', ItemList.Conveyor_Module_MV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', - OrePrefixes.circuit.get(Materials.Basic) }); + OrePrefixes.circuit.get(Materials.LV) }); GT_ModHandler.addCraftingRecipe( ItemList.Automation_Filter_HV.get(1L), bits, new Object[] { " F ", "CMV", " X ", 'M', ItemList.Hull_HV, 'V', ItemList.Conveyor_Module_HV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', - OrePrefixes.circuit.get(Materials.Basic) }); + OrePrefixes.circuit.get(Materials.LV) }); GT_ModHandler.addCraftingRecipe( ItemList.Automation_Filter_EV.get(1L), bits, new Object[] { " F ", "CMV", " X ", 'M', ItemList.Hull_EV, 'V', ItemList.Conveyor_Module_EV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', - OrePrefixes.circuit.get(Materials.Basic) }); + OrePrefixes.circuit.get(Materials.LV) }); GT_ModHandler.addCraftingRecipe( ItemList.Automation_Filter_IV.get(1L), bits, new Object[] { " F ", "CMV", " X ", 'M', ItemList.Hull_IV, 'V', ItemList.Conveyor_Module_IV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', - OrePrefixes.circuit.get(Materials.Basic) }); + OrePrefixes.circuit.get(Materials.LV) }); GT_ModHandler.addCraftingRecipe( ItemList.Automation_Filter_LuV.get(1L), bits, new Object[] { " F ", "CMV", " X ", 'M', ItemList.Hull_LuV, 'V', ItemList.Conveyor_Module_LuV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', - OrePrefixes.circuit.get(Materials.Basic) }); + OrePrefixes.circuit.get(Materials.LV) }); GT_ModHandler.addCraftingRecipe( ItemList.Automation_Filter_ZPM.get(1L), bits, new Object[] { " F ", "CMV", " X ", 'M', ItemList.Hull_ZPM, 'V', ItemList.Conveyor_Module_ZPM, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', - OrePrefixes.circuit.get(Materials.Basic) }); + OrePrefixes.circuit.get(Materials.LV) }); GT_ModHandler.addCraftingRecipe( ItemList.Automation_Filter_UV.get(1L), bits, new Object[] { " F ", "CMV", " X ", 'M', ItemList.Hull_UV, 'V', ItemList.Conveyor_Module_UV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', - OrePrefixes.circuit.get(Materials.Basic) }); + OrePrefixes.circuit.get(Materials.LV) }); GT_ModHandler.addCraftingRecipe( ItemList.Automation_Filter_MAX.get(1L), bits, new Object[] { " F ", "CMV", " X ", 'M', ItemList.Hull_MAX, 'V', ItemList.Conveyor_Module_UHV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', - OrePrefixes.circuit.get(Materials.Basic) }); + OrePrefixes.circuit.get(Materials.LV) }); GT_ModHandler.addCraftingRecipe( ItemList.Automation_TypeFilter_ULV.get(1L), bits, new Object[] { " F ", "VMC", " X ", 'M', ItemList.Hull_ULV, 'V', ItemList.Conveyor_Module_LV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', - OrePrefixes.circuit.get(Materials.Basic) }); + OrePrefixes.circuit.get(Materials.LV) }); GT_ModHandler.addCraftingRecipe( ItemList.Automation_TypeFilter_LV.get(1L), bits, new Object[] { " F ", "VMC", " X ", 'M', ItemList.Hull_LV, 'V', ItemList.Conveyor_Module_LV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', - OrePrefixes.circuit.get(Materials.Basic) }); + OrePrefixes.circuit.get(Materials.LV) }); GT_ModHandler.addCraftingRecipe( ItemList.Automation_TypeFilter_MV.get(1L), bits, new Object[] { " F ", "VMC", " X ", 'M', ItemList.Hull_MV, 'V', ItemList.Conveyor_Module_MV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', - OrePrefixes.circuit.get(Materials.Basic) }); + OrePrefixes.circuit.get(Materials.LV) }); GT_ModHandler.addCraftingRecipe( ItemList.Automation_TypeFilter_HV.get(1L), bits, new Object[] { " F ", "VMC", " X ", 'M', ItemList.Hull_HV, 'V', ItemList.Conveyor_Module_HV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', - OrePrefixes.circuit.get(Materials.Basic) }); + OrePrefixes.circuit.get(Materials.LV) }); GT_ModHandler.addCraftingRecipe( ItemList.Automation_TypeFilter_EV.get(1L), bits, new Object[] { " F ", "VMC", " X ", 'M', ItemList.Hull_EV, 'V', ItemList.Conveyor_Module_EV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', - OrePrefixes.circuit.get(Materials.Basic) }); + OrePrefixes.circuit.get(Materials.LV) }); GT_ModHandler.addCraftingRecipe( ItemList.Automation_TypeFilter_IV.get(1L), bits, new Object[] { " F ", "VMC", " X ", 'M', ItemList.Hull_IV, 'V', ItemList.Conveyor_Module_IV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', - OrePrefixes.circuit.get(Materials.Basic) }); + OrePrefixes.circuit.get(Materials.LV) }); GT_ModHandler.addCraftingRecipe( ItemList.Automation_TypeFilter_LuV.get(1L), bits, new Object[] { " F ", "VMC", " X ", 'M', ItemList.Hull_LuV, 'V', ItemList.Conveyor_Module_LuV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', - OrePrefixes.circuit.get(Materials.Basic) }); + OrePrefixes.circuit.get(Materials.LV) }); GT_ModHandler.addCraftingRecipe( ItemList.Automation_TypeFilter_ZPM.get(1L), bits, new Object[] { " F ", "VMC", " X ", 'M', ItemList.Hull_ZPM, 'V', ItemList.Conveyor_Module_ZPM, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', - OrePrefixes.circuit.get(Materials.Basic) }); + OrePrefixes.circuit.get(Materials.LV) }); GT_ModHandler.addCraftingRecipe( ItemList.Automation_TypeFilter_UV.get(1L), bits, new Object[] { " F ", "VMC", " X ", 'M', ItemList.Hull_UV, 'V', ItemList.Conveyor_Module_UV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', - OrePrefixes.circuit.get(Materials.Basic) }); + OrePrefixes.circuit.get(Materials.LV) }); GT_ModHandler.addCraftingRecipe( ItemList.Automation_TypeFilter_MAX.get(1L), bits, new Object[] { " F ", "VMC", " X ", 'M', ItemList.Hull_MAX, 'V', ItemList.Conveyor_Module_UHV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', - OrePrefixes.circuit.get(Materials.Basic) }); + OrePrefixes.circuit.get(Materials.LV) }); GT_ModHandler.addCraftingRecipe( ItemList.Automation_Regulator_ULV.get(1L), bits, new Object[] { "XFX", "VMV", "XCX", 'M', ItemList.Hull_ULV, 'V', ItemList.Robot_Arm_LV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', - OrePrefixes.circuit.get(Materials.Basic) }); + OrePrefixes.circuit.get(Materials.LV) }); GT_ModHandler.addCraftingRecipe( ItemList.Automation_Regulator_LV.get(1L), bits, new Object[] { "XFX", "VMV", "XCX", 'M', ItemList.Hull_LV, 'V', ItemList.Robot_Arm_LV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', - OrePrefixes.circuit.get(Materials.Basic) }); + OrePrefixes.circuit.get(Materials.LV) }); GT_ModHandler.addCraftingRecipe( ItemList.Automation_Regulator_MV.get(1L), bits, new Object[] { "XFX", "VMV", "XCX", 'M', ItemList.Hull_MV, 'V', ItemList.Robot_Arm_MV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', - OrePrefixes.circuit.get(Materials.Basic) }); + OrePrefixes.circuit.get(Materials.LV) }); GT_ModHandler.addCraftingRecipe( ItemList.Automation_Regulator_HV.get(1L), bits, new Object[] { "XFX", "VMV", "XCX", 'M', ItemList.Hull_HV, 'V', ItemList.Robot_Arm_HV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', - OrePrefixes.circuit.get(Materials.Basic) }); + OrePrefixes.circuit.get(Materials.LV) }); GT_ModHandler.addCraftingRecipe( ItemList.Automation_Regulator_EV.get(1L), bits, new Object[] { "XFX", "VMV", "XCX", 'M', ItemList.Hull_EV, 'V', ItemList.Robot_Arm_EV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', - OrePrefixes.circuit.get(Materials.Basic) }); + OrePrefixes.circuit.get(Materials.LV) }); GT_ModHandler.addCraftingRecipe( ItemList.Automation_Regulator_IV.get(1L), bits, new Object[] { "XFX", "VMV", "XCX", 'M', ItemList.Hull_IV, 'V', ItemList.Robot_Arm_IV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', - OrePrefixes.circuit.get(Materials.Basic) }); + OrePrefixes.circuit.get(Materials.LV) }); GT_ModHandler.addCraftingRecipe( ItemList.Automation_Regulator_LuV.get(1L), bits, new Object[] { "XFX", "VMV", "XCX", 'M', ItemList.Hull_LuV, 'V', ItemList.Robot_Arm_LuV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', - OrePrefixes.circuit.get(Materials.Basic) }); + OrePrefixes.circuit.get(Materials.LV) }); GT_ModHandler.addCraftingRecipe( ItemList.Automation_Regulator_ZPM.get(1L), bits, new Object[] { "XFX", "VMV", "XCX", 'M', ItemList.Hull_ZPM, 'V', ItemList.Robot_Arm_ZPM, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', - OrePrefixes.circuit.get(Materials.Basic) }); + OrePrefixes.circuit.get(Materials.LV) }); GT_ModHandler.addCraftingRecipe( ItemList.Automation_Regulator_UV.get(1L), bits, new Object[] { "XFX", "VMV", "XCX", 'M', ItemList.Hull_UV, 'V', ItemList.Robot_Arm_UV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', - OrePrefixes.circuit.get(Materials.Basic) }); + OrePrefixes.circuit.get(Materials.LV) }); GT_ModHandler.addCraftingRecipe( ItemList.Automation_Regulator_MAX.get(1L), bits, new Object[] { "XFX", "VMV", "XCX", 'M', ItemList.Hull_MAX, 'V', ItemList.Robot_Arm_UHV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', - OrePrefixes.circuit.get(Materials.Basic) }); + OrePrefixes.circuit.get(Materials.LV) }); GT_ModHandler.addCraftingRecipe( ItemList.Automation_SuperBuffer_ULV.get(1L), @@ -7031,113 +7030,113 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { ItemList.Automation_ItemDistributor_ULV.get(1L), bits, new Object[] { "XCX", "VMV", " V ", 'M', ItemList.Hull_ULV, 'V', ItemList.Conveyor_Module_LV, 'C', - OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.Basic) }); + OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.LV) }); GT_ModHandler.addCraftingRecipe( ItemList.Automation_ItemDistributor_LV.get(1L), bits, new Object[] { "XCX", "VMV", " V ", 'M', ItemList.Hull_LV, 'V', ItemList.Conveyor_Module_LV, 'C', - OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.Basic) }); + OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.LV) }); GT_ModHandler.addCraftingRecipe( ItemList.Automation_ItemDistributor_MV.get(1L), bits, new Object[] { "XCX", "VMV", " V ", 'M', ItemList.Hull_MV, 'V', ItemList.Conveyor_Module_MV, 'C', - OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.Basic) }); + OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.LV) }); GT_ModHandler.addCraftingRecipe( ItemList.Automation_ItemDistributor_HV.get(1L), bits, new Object[] { "XCX", "VMV", " V ", 'M', ItemList.Hull_HV, 'V', ItemList.Conveyor_Module_HV, 'C', - OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.Basic) }); + OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.LV) }); GT_ModHandler.addCraftingRecipe( ItemList.Automation_ItemDistributor_EV.get(1L), bits, new Object[] { "XCX", "VMV", " V ", 'M', ItemList.Hull_EV, 'V', ItemList.Conveyor_Module_EV, 'C', - OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.Basic) }); + OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.LV) }); GT_ModHandler.addCraftingRecipe( ItemList.Automation_ItemDistributor_IV.get(1L), bits, new Object[] { "XCX", "VMV", " V ", 'M', ItemList.Hull_IV, 'V', ItemList.Conveyor_Module_IV, 'C', - OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.Basic) }); + OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.LV) }); GT_ModHandler.addCraftingRecipe( ItemList.Automation_ItemDistributor_LuV.get(1L), bits, new Object[] { "XCX", "VMV", " V ", 'M', ItemList.Hull_LuV, 'V', ItemList.Conveyor_Module_LuV, 'C', - OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.Basic) }); + OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.LV) }); GT_ModHandler.addCraftingRecipe( ItemList.Automation_ItemDistributor_ZPM.get(1L), bits, new Object[] { "XCX", "VMV", " V ", 'M', ItemList.Hull_ZPM, 'V', ItemList.Conveyor_Module_ZPM, 'C', - OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.Basic) }); + OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.LV) }); GT_ModHandler.addCraftingRecipe( ItemList.Automation_ItemDistributor_UV.get(1L), bits, new Object[] { "XCX", "VMV", " V ", 'M', ItemList.Hull_UV, 'V', ItemList.Conveyor_Module_UV, 'C', - OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.Basic) }); + OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.LV) }); GT_ModHandler.addCraftingRecipe( ItemList.Automation_ItemDistributor_MAX.get(1L), bits, new Object[] { "XCX", "VMV", " V ", 'M', ItemList.Hull_MAX, 'V', ItemList.Conveyor_Module_UHV, 'C', - OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.Basic) }); + OreDictNames.craftingChest, 'X', OrePrefixes.circuit.get(Materials.LV) }); GT_ModHandler.addCraftingRecipe( ItemList.Automation_RecipeFilter_ULV.get(1L), bits, new Object[] { " F ", "VMC", " X ", 'M', ItemList.Hull_ULV, 'V', ItemList.Robot_Arm_LV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', - OrePrefixes.circuit.get(Materials.Basic) }); + OrePrefixes.circuit.get(Materials.LV) }); GT_ModHandler.addCraftingRecipe( ItemList.Automation_RecipeFilter_LV.get(1L), bits, new Object[] { " F ", "VMC", " X ", 'M', ItemList.Hull_LV, 'V', ItemList.Robot_Arm_LV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', - OrePrefixes.circuit.get(Materials.Basic) }); + OrePrefixes.circuit.get(Materials.LV) }); GT_ModHandler.addCraftingRecipe( ItemList.Automation_RecipeFilter_MV.get(1L), bits, new Object[] { " F ", "VMC", " X ", 'M', ItemList.Hull_MV, 'V', ItemList.Robot_Arm_MV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', - OrePrefixes.circuit.get(Materials.Basic) }); + OrePrefixes.circuit.get(Materials.LV) }); GT_ModHandler.addCraftingRecipe( ItemList.Automation_RecipeFilter_HV.get(1L), bits, new Object[] { " F ", "VMC", " X ", 'M', ItemList.Hull_HV, 'V', ItemList.Robot_Arm_HV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', - OrePrefixes.circuit.get(Materials.Basic) }); + OrePrefixes.circuit.get(Materials.LV) }); GT_ModHandler.addCraftingRecipe( ItemList.Automation_RecipeFilter_EV.get(1L), bits, new Object[] { " F ", "VMC", " X ", 'M', ItemList.Hull_EV, 'V', ItemList.Robot_Arm_EV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', - OrePrefixes.circuit.get(Materials.Basic) }); + OrePrefixes.circuit.get(Materials.LV) }); GT_ModHandler.addCraftingRecipe( ItemList.Automation_RecipeFilter_IV.get(1L), bits, new Object[] { " F ", "VMC", " X ", 'M', ItemList.Hull_IV, 'V', ItemList.Robot_Arm_IV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', - OrePrefixes.circuit.get(Materials.Basic) }); + OrePrefixes.circuit.get(Materials.LV) }); GT_ModHandler.addCraftingRecipe( ItemList.Automation_RecipeFilter_LuV.get(1L), bits, new Object[] { " F ", "VMC", " X ", 'M', ItemList.Hull_LuV, 'V', ItemList.Robot_Arm_LuV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', - OrePrefixes.circuit.get(Materials.Basic) }); + OrePrefixes.circuit.get(Materials.LV) }); GT_ModHandler.addCraftingRecipe( ItemList.Automation_RecipeFilter_ZPM.get(1L), bits, new Object[] { " F ", "VMC", " X ", 'M', ItemList.Hull_ZPM, 'V', ItemList.Robot_Arm_ZPM, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', - OrePrefixes.circuit.get(Materials.Basic) }); + OrePrefixes.circuit.get(Materials.LV) }); GT_ModHandler.addCraftingRecipe( ItemList.Automation_RecipeFilter_UV.get(1L), bits, new Object[] { " F ", "VMC", " X ", 'M', ItemList.Hull_UV, 'V', ItemList.Robot_Arm_UV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', - OrePrefixes.circuit.get(Materials.Basic) }); + OrePrefixes.circuit.get(Materials.LV) }); GT_ModHandler.addCraftingRecipe( ItemList.Automation_RecipeFilter_MAX.get(1L), bits, new Object[] { " F ", "VMC", " X ", 'M', ItemList.Hull_MAX, 'V', ItemList.Robot_Arm_UHV, 'C', OreDictNames.craftingChest, 'F', OreDictNames.craftingFilter, 'X', - OrePrefixes.circuit.get(Materials.Basic) }); + OrePrefixes.circuit.get(Materials.LV) }); } @Override diff --git a/src/main/java/gregtech/loaders/misc/GT_Achievements.java b/src/main/java/gregtech/loaders/misc/GT_Achievements.java index cee0ad98cc..9ec6d442f3 100644 --- a/src/main/java/gregtech/loaders/misc/GT_Achievements.java +++ b/src/main/java/gregtech/loaders/misc/GT_Achievements.java @@ -752,9 +752,6 @@ public class GT_Achievements { && ThaumcraftApiHelper.isResearchComplete(player.getDisplayName(), "GT_IRON_TO_STEEL")) { issueAchievement(player, "steel"); } - // } else if (data.mPrefix == OrePrefixes.circuit && data.mMaterial.mMaterial == - // Materials.Advanced) { - // issueAchievement(player, "stepforward"); } } // GT_FML_LOGGER.info(stack.getUnlocalizedName()); diff --git a/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java index 4fb30345d1..f32ee74319 100644 --- a/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_CraftingRecipeLoader.java @@ -1567,12 +1567,12 @@ public class GT_CraftingRecipeLoader implements Runnable { GT_ModHandler.getIC2Item("batBox", 1L), bits_no_remove_buffered, new Object[] { "PCP", "BBB", "PPP", 'C', OrePrefixes.cableGt01.get(Materials.Tin), 'P', - OrePrefixes.plank.get(Materials.Wood), 'B', OrePrefixes.battery.get(Materials.Basic) }); + OrePrefixes.plank.get(Materials.Wood), 'B', OrePrefixes.battery.get(Materials.LV) }); GT_ModHandler.addCraftingRecipe( GT_ModHandler.getIC2Item("mfeUnit", 1L), bits_no_remove_buffered, new Object[] { "CEC", "EME", "CEC", 'C', OrePrefixes.cableGt01.get(Materials.Gold), 'E', - OrePrefixes.battery.get(Materials.Elite), 'M', GT_ModHandler.getIC2Item("machine", 1L) }); + OrePrefixes.battery.get(Materials.IV), 'M', GT_ModHandler.getIC2Item("machine", 1L) }); GT_ModHandler.addCraftingRecipe( GT_ModHandler.getIC2Item("lvTransformer", 1L), bits_no_remove_buffered, @@ -1587,31 +1587,31 @@ public class GT_CraftingRecipeLoader implements Runnable { GT_ModHandler.getIC2Item("hvTransformer", 1L), bits_no_remove_buffered, new Object[] { " C ", "IMB", " C ", 'C', OrePrefixes.cableGt01.get(Materials.Gold), 'M', - GT_ModHandler.getIC2Item("mvTransformer", 1L), 'I', OrePrefixes.circuit.get(Materials.Basic), 'B', - OrePrefixes.battery.get(Materials.Advanced) }); + GT_ModHandler.getIC2Item("mvTransformer", 1L), 'I', OrePrefixes.circuit.get(Materials.LV), 'B', + OrePrefixes.battery.get(Materials.HV) }); GT_ModHandler.addCraftingRecipe( GT_ModHandler.getIC2Item("evTransformer", 1L), bits_no_remove_buffered, new Object[] { " C ", "IMB", " C ", 'C', OrePrefixes.cableGt01.get(Materials.Aluminium), 'M', - GT_ModHandler.getIC2Item("hvTransformer", 1L), 'I', OrePrefixes.circuit.get(Materials.Advanced), - 'B', OrePrefixes.battery.get(Materials.Master) }); + GT_ModHandler.getIC2Item("hvTransformer", 1L), 'I', OrePrefixes.circuit.get(Materials.HV), 'B', + OrePrefixes.battery.get(Materials.LuV) }); GT_ModHandler.addCraftingRecipe( GT_ModHandler.getIC2Item("cesuUnit", 1L), bits_no_remove_buffered, new Object[] { "PCP", "BBB", "PPP", 'C', OrePrefixes.cableGt01.get(Materials.Copper), 'P', - OrePrefixes.plate.get(Materials.Bronze), 'B', OrePrefixes.battery.get(Materials.Advanced) }); + OrePrefixes.plate.get(Materials.Bronze), 'B', OrePrefixes.battery.get(Materials.HV) }); GT_ModHandler.addCraftingRecipe( GT_ModHandler.getIC2Item("teleporter", 1L), bits_no_remove_buffered, new Object[] { "GFG", "CMC", "GDG", 'C', OrePrefixes.cableGt01.get(Materials.Platinum), 'G', - OrePrefixes.circuit.get(Materials.Advanced), 'D', OrePrefixes.gem.get(Materials.Diamond), 'M', + OrePrefixes.circuit.get(Materials.HV), 'D', OrePrefixes.gem.get(Materials.Diamond), 'M', GT_ModHandler.getIC2Item("machine", 1L), 'F', GT_ModHandler.getIC2Item("frequencyTransmitter", 1L) }); GT_ModHandler.addCraftingRecipe( GT_ModHandler.getIC2Item("energyOMat", 1L), bits_no_remove_buffered, new Object[] { "RBR", "CMC", 'C', OrePrefixes.cableGt01.get(Materials.Copper), 'R', - OrePrefixes.dust.get(Materials.Redstone), 'B', OrePrefixes.battery.get(Materials.Basic), 'M', + OrePrefixes.dust.get(Materials.Redstone), 'B', OrePrefixes.battery.get(Materials.LV), 'M', GT_ModHandler.getIC2Item("machine", 1L) }); GT_ModHandler.addCraftingRecipe( @@ -1624,7 +1624,7 @@ public class GT_CraftingRecipeLoader implements Runnable { bits_no_remove_buffered, new Object[] { "CC ", "RGR", "RIR", 'C', OrePrefixes.cableGt01.get(Materials.Copper), 'R', OrePrefixes.dust.get(Materials.Redstone), 'G', OrePrefixes.block.get(Materials.Glass), 'I', - OrePrefixes.circuit.get(Materials.Basic) }); + OrePrefixes.circuit.get(Materials.LV) }); GT_ModHandler.addCraftingRecipe( GT_ModHandler.getIC2Item("coil", 1L), bits_no_remove_buffered, @@ -1634,14 +1634,14 @@ public class GT_CraftingRecipeLoader implements Runnable { GT_ModHandler.getIC2Item("powerunit", 1L), bits_no_remove_buffered, new Object[] { "BCA", "BIM", "BCA", 'C', OrePrefixes.cableGt01.get(Materials.Copper), 'B', - OrePrefixes.battery.get(Materials.Basic), 'A', GT_ModHandler.getIC2Item("casingiron", 1L), 'I', - OrePrefixes.circuit.get(Materials.Basic), 'M', GT_ModHandler.getIC2Item("elemotor", 1L) }); + OrePrefixes.battery.get(Materials.LV), 'A', GT_ModHandler.getIC2Item("casingiron", 1L), 'I', + OrePrefixes.circuit.get(Materials.LV), 'M', GT_ModHandler.getIC2Item("elemotor", 1L) }); GT_ModHandler.addCraftingRecipe( GT_ModHandler.getIC2Item("powerunitsmall", 1L), bits_no_remove_buffered, new Object[] { " CA", "BIM", " CA", 'C', OrePrefixes.cableGt01.get(Materials.Copper), 'B', - OrePrefixes.battery.get(Materials.Basic), 'A', GT_ModHandler.getIC2Item("casingiron", 1L), 'I', - OrePrefixes.circuit.get(Materials.Basic), 'M', GT_ModHandler.getIC2Item("elemotor", 1L) }); + OrePrefixes.battery.get(Materials.LV), 'A', GT_ModHandler.getIC2Item("casingiron", 1L), 'I', + OrePrefixes.circuit.get(Materials.LV), 'M', GT_ModHandler.getIC2Item("elemotor", 1L) }); GT_ModHandler.addCraftingRecipe( GT_ModHandler.getIC2Item("remote", 1L), bits_no_remove_buffered, @@ -1652,14 +1652,14 @@ public class GT_CraftingRecipeLoader implements Runnable { GT_ModHandler.getIC2Item("odScanner", 1L), bits_no_remove_buffered, new Object[] { "PGP", "CBC", "WWW", 'W', OrePrefixes.cableGt01.get(Materials.Copper), 'G', - OrePrefixes.dust.get(Materials.Glowstone), 'B', OrePrefixes.battery.get(Materials.Advanced), 'C', - OrePrefixes.circuit.get(Materials.Advanced), 'P', GT_ModHandler.getIC2Item("casinggold", 1L) }); + OrePrefixes.dust.get(Materials.Glowstone), 'B', OrePrefixes.battery.get(Materials.HV), 'C', + OrePrefixes.circuit.get(Materials.HV), 'P', GT_ModHandler.getIC2Item("casinggold", 1L) }); GT_ModHandler.addCraftingRecipe( GT_ModHandler.getIC2Item("ovScanner", 1L), bits_no_remove_buffered, new Object[] { "PDP", "GCG", "WSW", 'W', OrePrefixes.cableGt01.get(Materials.Gold), 'G', - OrePrefixes.dust.get(Materials.Glowstone), 'D', OrePrefixes.battery.get(Materials.Elite), 'C', - OrePrefixes.circuit.get(Materials.Advanced), 'P', GT_ModHandler.getIC2Item("casinggold", 1L), 'S', + OrePrefixes.dust.get(Materials.Glowstone), 'D', OrePrefixes.battery.get(Materials.IV), 'C', + OrePrefixes.circuit.get(Materials.HV), 'P', GT_ModHandler.getIC2Item("casinggold", 1L), 'S', GT_ModHandler.getIC2Item("odScanner", 1L) }); GT_ModHandler.addCraftingRecipe( GT_ModHandler.getIC2Item("staticBoots", 1L), @@ -1670,36 +1670,36 @@ public class GT_CraftingRecipeLoader implements Runnable { GT_ModHandler.getIC2Item("ecMeter", 1L), bits_no_remove_buffered, new Object[] { " G ", "CIC", "C C", 'C', OrePrefixes.cableGt01.get(Materials.Copper), 'G', - OrePrefixes.dust.get(Materials.Glowstone), 'I', OrePrefixes.circuit.get(Materials.Basic) }); + OrePrefixes.dust.get(Materials.Glowstone), 'I', OrePrefixes.circuit.get(Materials.LV) }); GT_ModHandler.addCraftingRecipe( GT_ModHandler.getIC2Item("obscurator", 1L), bits_no_remove_buffered, new Object[] { "RER", "CAC", "RRR", 'C', OrePrefixes.cableGt01.get(Materials.Gold), 'R', - OrePrefixes.dust.get(Materials.Redstone), 'E', OrePrefixes.battery.get(Materials.Advanced), 'A', - OrePrefixes.circuit.get(Materials.Advanced) }); + OrePrefixes.dust.get(Materials.Redstone), 'E', OrePrefixes.battery.get(Materials.HV), 'A', + OrePrefixes.circuit.get(Materials.HV) }); GT_ModHandler.addCraftingRecipe( GT_ModHandler.getIC2Item("overclockerUpgrade", 1L), bits_no_remove_buffered, new Object[] { "CCC", "WEW", 'W', OrePrefixes.cableGt01.get(Materials.Copper), 'C', GT_ModHandler.getIC2Item("reactorCoolantSimple", 1L, 1), 'E', - OrePrefixes.circuit.get(Materials.Basic) }); + OrePrefixes.circuit.get(Materials.LV) }); GT_ModHandler.addCraftingRecipe( GT_ModHandler.getIC2Item("transformerUpgrade", 1L), bits_no_remove_buffered, new Object[] { "GGG", "WTW", "GEG", 'W', OrePrefixes.cableGt01.get(Materials.Gold), 'T', - GT_ModHandler.getIC2Item("mvTransformer", 1L), 'E', OrePrefixes.circuit.get(Materials.Basic), 'G', + GT_ModHandler.getIC2Item("mvTransformer", 1L), 'E', OrePrefixes.circuit.get(Materials.LV), 'G', OrePrefixes.block.get(Materials.Glass) }); GT_ModHandler.addCraftingRecipe( GT_ModHandler.getIC2Item("energyStorageUpgrade", 1L), bits_no_remove_buffered, new Object[] { "PPP", "WBW", "PEP", 'W', OrePrefixes.cableGt01.get(Materials.Copper), 'E', - OrePrefixes.circuit.get(Materials.Basic), 'P', OrePrefixes.plank.get(Materials.Wood), 'B', - OrePrefixes.battery.get(Materials.Basic) }); + OrePrefixes.circuit.get(Materials.LV), 'P', OrePrefixes.plank.get(Materials.Wood), 'B', + OrePrefixes.battery.get(Materials.LV) }); GT_ModHandler.addCraftingRecipe( GT_ModHandler.getIC2Item("ejectorUpgrade", 1L), bits_no_remove_buffered, new Object[] { "PHP", "WEW", 'W', OrePrefixes.cableGt01.get(Materials.Copper), 'E', - OrePrefixes.circuit.get(Materials.Basic), 'P', new ItemStack(Blocks.piston), 'H', + OrePrefixes.circuit.get(Materials.LV), 'P', new ItemStack(Blocks.piston), 'H', new ItemStack(Blocks.hopper) }); GT_ModHandler.addCraftingRecipe( GT_ModHandler.getIC2Item("suBattery", 1L), @@ -1711,7 +1711,7 @@ public class GT_CraftingRecipeLoader implements Runnable { bits_no_remove_buffered, new Object[] { "PHP", "WEW", 'W', OrePrefixes.cableGt01.get(Materials.Copper), 'P', new ItemStack(Blocks.sticky_piston), 'R', new ItemStack(Blocks.hopper), 'E', - OrePrefixes.circuit.get(Materials.Basic) }); + OrePrefixes.circuit.get(Materials.LV) }); } else { GT_ModHandler.addCraftingRecipe( @@ -1746,7 +1746,7 @@ public class GT_CraftingRecipeLoader implements Runnable { GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "PPP", "GEC", "SBd", 'P', OrePrefixes.plate.get(Materials.Titanium), 'G', OrePrefixes.gemExquisite.get(Materials.Diamond), 'E', ItemList.Emitter_HV, 'C', - OrePrefixes.circuit.get(Materials.Elite), 'S', OrePrefixes.screw.get(Materials.Titanium), 'B', + OrePrefixes.circuit.get(Materials.IV), 'S', OrePrefixes.screw.get(Materials.Titanium), 'B', new ItemStack( Ic2Items.chargingEnergyCrystal.copy() .getItem(), @@ -1757,7 +1757,7 @@ public class GT_CraftingRecipeLoader implements Runnable { GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "PPP", "GEC", "SBd", 'P', OrePrefixes.plate.get(Materials.Titanium), 'G', OrePrefixes.gemExquisite.get(Materials.Ruby), 'E', ItemList.Emitter_HV, 'C', - OrePrefixes.circuit.get(Materials.Elite), 'S', OrePrefixes.screw.get(Materials.Titanium), 'B', + OrePrefixes.circuit.get(Materials.IV), 'S', OrePrefixes.screw.get(Materials.Titanium), 'B', new ItemStack( Ic2Items.chargingEnergyCrystal.copy() .getItem(), @@ -1768,7 +1768,7 @@ public class GT_CraftingRecipeLoader implements Runnable { GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "PPP", "GEC", "SBd", 'P', OrePrefixes.plate.get(Materials.Titanium), 'G', OrePrefixes.gemExquisite.get(Materials.Jasper), 'E', ItemList.Emitter_HV, 'C', - OrePrefixes.circuit.get(Materials.Elite), 'S', OrePrefixes.screw.get(Materials.Titanium), 'B', + OrePrefixes.circuit.get(Materials.IV), 'S', OrePrefixes.screw.get(Materials.Titanium), 'B', new ItemStack( Ic2Items.chargingEnergyCrystal.copy() .getItem(), @@ -1779,7 +1779,7 @@ public class GT_CraftingRecipeLoader implements Runnable { GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "PPP", "GEC", "SBd", 'P', OrePrefixes.plate.get(Materials.Titanium), 'G', OrePrefixes.gemExquisite.get(Materials.GarnetRed), 'E', ItemList.Emitter_HV, 'C', - OrePrefixes.circuit.get(Materials.Elite), 'S', OrePrefixes.screw.get(Materials.Titanium), 'B', + OrePrefixes.circuit.get(Materials.IV), 'S', OrePrefixes.screw.get(Materials.Titanium), 'B', new ItemStack( Ic2Items.chargingEnergyCrystal.copy() .getItem(), @@ -1868,8 +1868,8 @@ public class GT_CraftingRecipeLoader implements Runnable { GT_ModHandler.addCraftingRecipe( GT_ModHandler.getIC2Item("crophavester", 1L), bits_no_remove_buffered, - new Object[] { "ACA", "PMS", "WOW", 'M', ItemList.Hull_MV, 'C', OrePrefixes.circuit.get(Materials.Good), - 'A', ItemList.Robot_Arm_LV, 'P', ItemList.Electric_Piston_LV, 'S', ItemList.Sensor_LV, 'W', + new Object[] { "ACA", "PMS", "WOW", 'M', ItemList.Hull_MV, 'C', OrePrefixes.circuit.get(Materials.MV), 'A', + ItemList.Robot_Arm_LV, 'P', ItemList.Electric_Piston_LV, 'S', ItemList.Sensor_LV, 'W', OrePrefixes.toolHeadSense.get(Materials.Aluminium), 'O', ItemList.Conveyor_Module_LV }); GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("RTGenerator", 1L)); @@ -1877,14 +1877,14 @@ public class GT_CraftingRecipeLoader implements Runnable { GT_ModHandler.getIC2Item("RTGenerator", 1L), bits_no_remove_buffered, new Object[] { "III", "IMI", "ICI", 'I', OrePrefixes.itemCasing.get(Materials.Steel), 'C', - OrePrefixes.circuit.get(Materials.Master), 'M', ItemList.Hull_IV }); + OrePrefixes.circuit.get(Materials.LuV), 'M', ItemList.Hull_IV }); GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("RTHeatGenerator", 1L)); GT_ModHandler.addCraftingRecipe( GT_ModHandler.getIC2Item("RTHeatGenerator", 1L), bits_no_remove_buffered, new Object[] { "III", "IMB", "ICI", 'I', OrePrefixes.itemCasing.get(Materials.Steel), 'C', - OrePrefixes.circuit.get(Materials.Master), 'M', ItemList.Hull_IV, 'B', + OrePrefixes.circuit.get(Materials.LuV), 'M', ItemList.Hull_IV, 'B', GT_OreDictUnificator.get(OrePrefixes.block, Materials.Copper, 1) }); GT_ModHandler.removeRecipeByOutputDelayed(GT_ModHandler.getIC2Item("carbonrotor", 1L)); @@ -1927,7 +1927,7 @@ public class GT_CraftingRecipeLoader implements Runnable { GT_ModHandler.addCraftingRecipe( tStack, bits_no_remove_buffered, - new Object[] { "ICI", "GIG", "DPD", 'C', OrePrefixes.circuit.get(Materials.Advanced), 'D', + new Object[] { "ICI", "GIG", "DPD", 'C', OrePrefixes.circuit.get(Materials.HV), 'D', OrePrefixes.gear.get(Materials.Diamond), 'G', OrePrefixes.gear.get(Materials.Gold), 'I', OrePrefixes.gear.get(Materials.Steel), 'P', GT_ModHandler.getIC2Item("diamondDrill", 1L, 32767) }); } @@ -1953,9 +1953,9 @@ public class GT_CraftingRecipeLoader implements Runnable { GT_ModHandler.addCraftingRecipe( GT_ModHandler.getIC2Item("nanoSaber", 1L), bits_no_remove_buffered, - new Object[] { "PI ", "PI ", "CLC", 'L', OrePrefixes.battery.get(Materials.Master), 'I', + new Object[] { "PI ", "PI ", "CLC", 'L', OrePrefixes.battery.get(Materials.LuV), 'I', OrePrefixes.plateAlloy.get("Iridium"), 'P', OrePrefixes.plate.get(Materials.Platinum), 'C', - OrePrefixes.circuit.get(Materials.Elite) }); + OrePrefixes.circuit.get(Materials.IV) }); GT_ModHandler.removeRecipeByOutputDelayed(new ItemStack(Items.flint_and_steel, 1)); GT_ModHandler.addCraftingRecipe( @@ -1983,7 +1983,7 @@ public class GT_CraftingRecipeLoader implements Runnable { OrePrefixes.plate.get(Materials.TungstenSteel), 'J', GT_ModHandler.getModItem(GraviSuite.ID, "advJetpack", 1, GT_Values.W), 'N', GT_ModHandler.getModItem(IndustrialCraft2.ID, "itemArmorNanoChestplate", 1, GT_Values.W), 'W', - OrePrefixes.wireGt12.get(Materials.Platinum), 'P', OrePrefixes.circuit.get(Materials.Elite) }); + OrePrefixes.wireGt12.get(Materials.Platinum), 'P', OrePrefixes.circuit.get(Materials.IV) }); GT_ModHandler .removeRecipeByOutputDelayed(GT_ModHandler.getModItem(GraviSuite.ID, "advLappack", 1, GT_Values.W)); @@ -1993,7 +1993,7 @@ public class GT_CraftingRecipeLoader implements Runnable { new Object[] { "CEC", "EJE", "WPW", 'C', OrePrefixes.plateAlloy.get(Materials.Carbon), 'J', GT_ModHandler.getModItem(IndustrialCraft2.ID, "itemArmorEnergypack", 1L, GT_Values.W), 'E', GT_ModHandler.getModItem(IndustrialCraft2.ID, "itemBatCrystal", 1L, GT_Values.W), 'W', - OrePrefixes.wireGt04.get(Materials.Platinum), 'P', OrePrefixes.circuit.get(Materials.Data) }); + OrePrefixes.wireGt04.get(Materials.Platinum), 'P', OrePrefixes.circuit.get(Materials.EV) }); GT_ModHandler .removeRecipeByOutputDelayed(GT_ModHandler.getModItem(GraviSuite.ID, "advJetpack", 1, GT_Values.W)); @@ -2004,7 +2004,7 @@ public class GT_CraftingRecipeLoader implements Runnable { GT_ModHandler.getModItem(IndustrialCraft2.ID, "itemArmorJetpackElectric", 1, GT_Values.W), 'E', OrePrefixes.plate.get(Materials.Titanium), 'X', GT_ModHandler.getModItem(IndustrialCraft2.ID, "itemArmorAlloyChestplate", 1L), 'Z', - OrePrefixes.circuit.get(Materials.Data), 'Y', OrePrefixes.wireGt02.get(Materials.Platinum) }); + OrePrefixes.circuit.get(Materials.EV), 'Y', OrePrefixes.wireGt02.get(Materials.Platinum) }); } GT_ModHandler.addShapelessCraftingRecipe( diff --git a/src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java b/src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java index 1765d9693a..7143c8e7e1 100644 --- a/src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java +++ b/src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java @@ -51,7 +51,7 @@ public class GT_NaniteChain { ItemList.Field_Generator_ZPM.get(16), ItemList.Conveyor_Module_UV.get(16), ItemList.Electric_Motor_UV.get(32), - new Object[] { OrePrefixes.circuit.get(Materials.Master), 16 }, + new Object[] { OrePrefixes.circuit.get(Materials.LuV), 16 }, GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.Naquadah, 32)) .fluidInputs( new FluidStack(solderIndalloy, 144 * 32), @@ -66,7 +66,7 @@ public class GT_NaniteChain { .metadata(RESEARCH_ITEM, ItemList.Circuit_Crystalmainframe.get(1)) .metadata(RESEARCH_TIME, 2 * HOURS) .itemInputs( - new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 16 }, + new Object[] { OrePrefixes.circuit.get(Materials.UV), 16 }, ItemList.Robot_Arm_UV.get(16), ItemList.Circuit_Chip_Stemcell.get(32), GT_OreDictUnificator.get(OrePrefixes.ring, Materials.NaquadahAlloy, 32), diff --git a/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java b/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java index 7c3beec6aa..c9dafacf52 100644 --- a/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java +++ b/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java @@ -50,7 +50,7 @@ public class GT_PCBFactoryRecipes { .itemInputs( GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 32), ItemList.Machine_ZPM_CircuitAssembler.get(4), - new Object[] { OrePrefixes.circuit.get(Materials.Master), 16 }, + new Object[] { OrePrefixes.circuit.get(Materials.LuV), 16 }, ItemList.Robot_Arm_ZPM.get(8)) .fluidInputs(new FluidStack(solderLuV, 144 * 36), Materials.Naquadah.getMolten(144 * 18)) .itemOutputs(ItemList.PCBFactory.get(1)) diff --git a/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java index efe94403e0..1531a80110 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java @@ -73,7 +73,7 @@ public class AssemblerRecipes implements Runnable { ItemList.Component_Filter.get(2L), GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.StainlessSteel, 1L), ItemList.Electric_Motor_HV.get(1L), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 1L), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 1L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Machine_Multi_Cleanroom.get(1L)) .fluidInputs(Materials.StainlessSteel.getMolten(864L)) @@ -85,7 +85,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Cover_Shutter.get(1L), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Basic, 1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.LV, 1), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.FluidFilter.get(1L)) .duration(40 * SECONDS) @@ -125,7 +125,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.TungstenSteel, 16), - GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Data), 4), + GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.EV), 4), ItemList.Electric_Motor_IV.get(16), ItemList.Emitter_EV.get(4), ItemList.Duct_Tape.get(64), @@ -216,7 +216,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Electric_Pump_LV.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Basic), 2), + GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.LV), 2), GT_Utility.getIntegratedCircuit(3)) .itemOutputs(ItemList.FluidRegulator_LV.get(1)) .duration(20 * SECONDS) @@ -226,7 +226,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Electric_Pump_MV.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Good), 2), + GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.MV), 2), GT_Utility.getIntegratedCircuit(3)) .itemOutputs(ItemList.FluidRegulator_MV.get(1)) .duration(17 * SECONDS + 10 * TICKS) @@ -236,7 +236,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Electric_Pump_HV.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Advanced), 2), + GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.HV), 2), GT_Utility.getIntegratedCircuit(3)) .itemOutputs(ItemList.FluidRegulator_HV.get(1)) .duration(15 * SECONDS) @@ -246,7 +246,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Electric_Pump_EV.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Data), 2), + GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.EV), 2), GT_Utility.getIntegratedCircuit(3)) .itemOutputs(ItemList.FluidRegulator_EV.get(1)) .duration(12 * SECONDS + 10 * TICKS) @@ -256,7 +256,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Electric_Pump_IV.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Elite), 2), + GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.IV), 2), GT_Utility.getIntegratedCircuit(3)) .itemOutputs(ItemList.FluidRegulator_IV.get(1)) .duration(10 * SECONDS) @@ -266,7 +266,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Electric_Pump_LuV.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Master), 2), + GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.LuV), 2), GT_Utility.getIntegratedCircuit(3)) .itemOutputs(ItemList.FluidRegulator_LuV.get(1)) .duration(7 * SECONDS + 10 * TICKS) @@ -276,7 +276,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Electric_Pump_ZPM.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Ultimate), 2), + GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.ZPM), 2), GT_Utility.getIntegratedCircuit(3)) .itemOutputs(ItemList.FluidRegulator_ZPM.get(1)) .duration(5 * SECONDS) @@ -286,7 +286,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Electric_Pump_UV.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.SuperconductorUHV), 2), + GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.UV), 2), GT_Utility.getIntegratedCircuit(3)) .itemOutputs(ItemList.FluidRegulator_UV.get(1)) .duration(2 * SECONDS + 10 * TICKS) @@ -296,7 +296,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Steam_Valve_LV.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Basic), 2), + GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.LV), 2), GT_Utility.getIntegratedCircuit(3)) .itemOutputs(ItemList.Steam_Regulator_LV.get(1)) .duration(20 * SECONDS) @@ -306,7 +306,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Steam_Valve_MV.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Good), 2), + GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.MV), 2), GT_Utility.getIntegratedCircuit(3)) .itemOutputs(ItemList.Steam_Regulator_MV.get(1)) .duration(17 * SECONDS + 10 * TICKS) @@ -316,7 +316,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Steam_Valve_HV.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Advanced), 2), + GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.HV), 2), GT_Utility.getIntegratedCircuit(3)) .itemOutputs(ItemList.Steam_Regulator_HV.get(1)) .duration(15 * SECONDS) @@ -326,7 +326,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Steam_Valve_EV.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Data), 2), + GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.EV), 2), GT_Utility.getIntegratedCircuit(3)) .itemOutputs(ItemList.Steam_Regulator_EV.get(1)) .duration(12 * SECONDS + 10 * TICKS) @@ -336,7 +336,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Steam_Valve_IV.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Elite), 2), + GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.IV), 2), GT_Utility.getIntegratedCircuit(3)) .itemOutputs(ItemList.Steam_Regulator_IV.get(1)) .duration(10 * SECONDS) @@ -401,7 +401,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.plate.get(Materials.Steel), 4), - GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Basic), 4), + GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.LV), 4), GT_Utility.getIntegratedCircuit(3)) .itemOutputs(ItemList.Schematic.get(1L)) .duration(30 * SECONDS) @@ -411,7 +411,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.plate.get(Materials.Aluminium), 3), - GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Good), 2), + GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.MV), 2), GT_Utility.getIntegratedCircuit(3)) .itemOutputs(ItemList.Schematic.get(1L)) .duration(15 * SECONDS) @@ -421,7 +421,7 @@ public class AssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.plate.get(Materials.StainlessSteel), 2), - GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Advanced), 1), + GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.HV), 1), GT_Utility.getIntegratedCircuit(3)) .itemOutputs(ItemList.Schematic.get(1L)) .duration(7 * SECONDS + 10 * TICKS) @@ -6664,7 +6664,7 @@ public class AssemblerRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.ring, Materials.BorosilicateGlass, 16), GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Aluminium, 2), GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Polytetrafluoroethylene, 4), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Data, 4), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.EV, 4), ItemList.Shape_Extruder_Wire.get(16)) .itemOutputs(ItemList.Spinneret.get(1)) .fluidInputs(Materials.SolderingAlloy.getMolten(144)) @@ -6771,7 +6771,7 @@ public class AssemblerRecipes implements Runnable { .itemInputs( getModItem(IC2NuclearControl.ID, "ItemSensorLocationCard", 1L, 0), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Good), 2)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.MV), 2)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(assemblerRecipes); @@ -6782,7 +6782,7 @@ public class AssemblerRecipes implements Runnable { .itemInputs( getModItem(IC2NuclearControl.ID, "Item55ReactorCard", 1L, 0), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.Good), 2)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.circuit.get(Materials.MV), 2)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(assemblerRecipes); diff --git a/src/main/java/gregtech/loaders/postload/recipes/AssemblyLineRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/AssemblyLineRecipes.java index 03c1f2a280..bea7f75a4f 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/AssemblyLineRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/AssemblyLineRecipes.java @@ -303,9 +303,9 @@ public class AssemblyLineRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.HSSS, 3), ItemList.Electric_Motor_LuV.get(2), ItemList.Electric_Piston_LuV.get(1), - new Object[] { OrePrefixes.circuit.get(Materials.Master), 2 }, - new Object[] { OrePrefixes.circuit.get(Materials.Elite), 4 }, - new Object[] { OrePrefixes.circuit.get(Materials.Data), 8 }, + new Object[] { OrePrefixes.circuit.get(Materials.LuV), 2 }, + new Object[] { OrePrefixes.circuit.get(Materials.IV), 4 }, + new Object[] { OrePrefixes.circuit.get(Materials.EV), 8 }, GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.YttriumBariumCuprate, 6)) .itemOutputs(ItemList.Robot_Arm_LuV.get(1)) .fluidInputs(new FluidStack(solderIndalloy, 576), Materials.Lubricant.getFluid(250)) @@ -323,9 +323,9 @@ public class AssemblyLineRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.NaquadahAlloy, 3), ItemList.Electric_Motor_ZPM.get(2), ItemList.Electric_Piston_ZPM.get(1), - new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 2 }, - new Object[] { OrePrefixes.circuit.get(Materials.Master), 4 }, - new Object[] { OrePrefixes.circuit.get(Materials.Elite), 8 }, + new Object[] { OrePrefixes.circuit.get(Materials.ZPM), 2 }, + new Object[] { OrePrefixes.circuit.get(Materials.LuV), 4 }, + new Object[] { OrePrefixes.circuit.get(Materials.IV), 8 }, GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.VanadiumGallium, 6)) .itemOutputs(ItemList.Robot_Arm_ZPM.get(1)) .fluidInputs(new FluidStack(solderIndalloy, 1152), Materials.Lubricant.getFluid(750)) @@ -343,9 +343,9 @@ public class AssemblyLineRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Neutronium, 3), ItemList.Electric_Motor_UV.get(2), ItemList.Electric_Piston_UV.get(1), - new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 2 }, - new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 4 }, - new Object[] { OrePrefixes.circuit.get(Materials.Master), 8 }, + new Object[] { OrePrefixes.circuit.get(Materials.UV), 2 }, + new Object[] { OrePrefixes.circuit.get(Materials.ZPM), 4 }, + new Object[] { OrePrefixes.circuit.get(Materials.LuV), 8 }, GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NaquadahAlloy, 6)) .itemOutputs(ItemList.Robot_Arm_UV.get(1)) .fluidInputs( @@ -368,7 +368,7 @@ public class AssemblyLineRecipes implements Runnable { ItemList.Electric_Motor_LuV.get(1), GT_OreDictUnificator.get(OrePrefixes.stick, LuVMat, 8), ItemList.QuantumStar.get(1), - new Object[] { OrePrefixes.circuit.get(Materials.Master), 4 }, + new Object[] { OrePrefixes.circuit.get(Materials.LuV), 4 }, GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Gallium, 64), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Gallium, 64), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Gallium, 64), @@ -388,7 +388,7 @@ public class AssemblyLineRecipes implements Runnable { ItemList.Electric_Motor_ZPM.get(1), GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Osmiridium, 8), ItemList.QuantumStar.get(2), - new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 4 }, + new Object[] { OrePrefixes.circuit.get(Materials.ZPM), 4 }, GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Trinium, 64), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Trinium, 64), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Trinium, 64), @@ -408,7 +408,7 @@ public class AssemblyLineRecipes implements Runnable { ItemList.Electric_Motor_UV.get(1), GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Neutronium, 8), ItemList.Gravistar.get(4), - new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 4 }, + new Object[] { OrePrefixes.circuit.get(Materials.UV), 4 }, GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Naquadria, 64), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Naquadria, 64), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Naquadria, 64), @@ -431,7 +431,7 @@ public class AssemblyLineRecipes implements Runnable { ItemList.Electric_Motor_LuV.get(1), GT_OreDictUnificator.get(OrePrefixes.plate, LuVMat, 8), ItemList.QuantumStar.get(1), - new Object[] { OrePrefixes.circuit.get(Materials.Master), 4 }, + new Object[] { OrePrefixes.circuit.get(Materials.LuV), 4 }, GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Gallium, 64), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Gallium, 64), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Gallium, 64), @@ -451,7 +451,7 @@ public class AssemblyLineRecipes implements Runnable { ItemList.Electric_Motor_ZPM.get(1), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmiridium, 8), ItemList.QuantumStar.get(2), - new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 4 }, + new Object[] { OrePrefixes.circuit.get(Materials.ZPM), 4 }, GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Trinium, 64), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Trinium, 64), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Trinium, 64), @@ -471,7 +471,7 @@ public class AssemblyLineRecipes implements Runnable { ItemList.Electric_Motor_UV.get(1), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 8), ItemList.Gravistar.get(4), - new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 4 }, + new Object[] { OrePrefixes.circuit.get(Materials.UV), 4 }, GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Naquadria, 64), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Naquadria, 64), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Naquadria, 64), @@ -494,7 +494,7 @@ public class AssemblyLineRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.HSSS, 6), ItemList.QuantumStar.get(2), ItemList.Emitter_LuV.get(4), - new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 4 }, + new Object[] { OrePrefixes.circuit.get(Materials.ZPM), 4 }, GT_OreDictUnificator.get(OrePrefixes.wireFine, LuVMat, 64), GT_OreDictUnificator.get(OrePrefixes.wireFine, LuVMat, 64), GT_OreDictUnificator.get(OrePrefixes.wireFine, LuVMat, 64), @@ -515,7 +515,7 @@ public class AssemblyLineRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NaquadahAlloy, 6), ItemList.QuantumStar.get(2), ItemList.Emitter_ZPM.get(4), - new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 4 }, + new Object[] { OrePrefixes.circuit.get(Materials.UV), 4 }, GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Europium, 64), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Europium, 64), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Europium, 64), @@ -536,7 +536,7 @@ public class AssemblyLineRecipes implements Runnable { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 6), ItemList.Gravistar.get(2), ItemList.Emitter_UV.get(4), - new Object[] { OrePrefixes.circuit.get(Materials.Infinite), 4 }, + new Object[] { OrePrefixes.circuit.get(Materials.UHV), 4 }, GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 64), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 64), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 64), @@ -561,7 +561,7 @@ public class AssemblyLineRecipes implements Runnable { ItemList.Hull_LuV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorLuV, 2), ItemList.Circuit_Chip_UHPIC.get(2), - new Object[] { OrePrefixes.circuit.get(Materials.Master), 2 }, + new Object[] { OrePrefixes.circuit.get(Materials.LuV), 2 }, ItemList.LuV_Coil.get(2), new ItemStack[] { ItemList.Reactor_Coolant_He_3.get(1), ItemList.Reactor_Coolant_NaK_3.get(1), ItemList.Reactor_Coolant_Sp_1.get(1) }, @@ -584,7 +584,7 @@ public class AssemblyLineRecipes implements Runnable { ItemList.Hull_ZPM.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorZPM, 2), ItemList.Circuit_Chip_NPIC.get(2), - new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 2 }, + new Object[] { OrePrefixes.circuit.get(Materials.ZPM), 2 }, ItemList.ZPM_Coil.get(2), new ItemStack[] { ItemList.Reactor_Coolant_He_6.get(1), ItemList.Reactor_Coolant_NaK_6.get(1), ItemList.Reactor_Coolant_Sp_2.get(1) }, @@ -607,7 +607,7 @@ public class AssemblyLineRecipes implements Runnable { ItemList.Hull_UV.get(1), GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorUV, 2), ItemList.Circuit_Chip_PPIC.get(2), - new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 2 }, + new Object[] { OrePrefixes.circuit.get(Materials.UV), 2 }, ItemList.UV_Coil.get(2), new ItemStack[] { ItemList.Reactor_Coolant_He_6.get(1), ItemList.Reactor_Coolant_NaK_6.get(1), ItemList.Reactor_Coolant_Sp_2.get(1) }, @@ -640,7 +640,7 @@ public class AssemblyLineRecipes implements Runnable { Materials.Tetraindiumditindibariumtitaniumheptacoppertetrakaidekaoxid, 2), ItemList.Circuit_Chip_UHPIC.get(2), - new Object[] { OrePrefixes.circuit.get(Materials.Master), 2 }, + new Object[] { OrePrefixes.circuit.get(Materials.LuV), 2 }, ItemList.LuV_Coil.get(2), new ItemStack[] { ItemList.Reactor_Coolant_He_3.get(1), ItemList.Reactor_Coolant_NaK_3.get(1), ItemList.Reactor_Coolant_Sp_1.get(1) }, @@ -663,7 +663,7 @@ public class AssemblyLineRecipes implements Runnable { ItemList.Hull_ZPM.get(1), GT_OreDictUnificator.get(OrePrefixes.spring, Materials.Tetranaquadahdiindiumhexaplatiumosminid, 4), ItemList.Circuit_Chip_NPIC.get(2), - new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 2 }, + new Object[] { OrePrefixes.circuit.get(Materials.ZPM), 2 }, ItemList.ZPM_Coil.get(2), new ItemStack[] { ItemList.Reactor_Coolant_He_6.get(1), ItemList.Reactor_Coolant_NaK_6.get(1), ItemList.Reactor_Coolant_Sp_2.get(1) }, @@ -686,7 +686,7 @@ public class AssemblyLineRecipes implements Runnable { ItemList.Hull_UV.get(1), GT_OreDictUnificator.get(OrePrefixes.spring, Materials.Longasssuperconductornameforuvwire, 4), ItemList.Circuit_Chip_PPIC.get(2), - new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 2 }, + new Object[] { OrePrefixes.circuit.get(Materials.UV), 2 }, ItemList.UV_Coil.get(2), new ItemStack[] { ItemList.Reactor_Coolant_He_6.get(1), ItemList.Reactor_Coolant_NaK_6.get(1), ItemList.Reactor_Coolant_Sp_2.get(1) }, @@ -714,10 +714,10 @@ public class AssemblyLineRecipes implements Runnable { .metadata(RESEARCH_TIME, 2 * HOURS) .itemInputs( ItemList.Casing_Fusion_Coil.get(1), - new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 1 }, - new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 1 }, - new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 1 }, - new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.ZPM), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.ZPM), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.ZPM), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.ZPM), 1 }, GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.NaquadahAlloy, 4), GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Osmiridium, 4), ItemList.Field_Generator_LuV.get(2), @@ -735,10 +735,10 @@ public class AssemblyLineRecipes implements Runnable { .metadata(RESEARCH_TIME, 4 * HOURS) .itemInputs( ItemList.Casing_Fusion_Coil.get(1), - new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 1 }, - new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 1 }, - new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 1 }, - new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.UV), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.UV), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.UV), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.UV), 1 }, GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Europium, 4), ItemList.Field_Generator_ZPM.get(2), ItemList.Circuit_Wafer_PPIC.get(48), @@ -755,10 +755,10 @@ public class AssemblyLineRecipes implements Runnable { .metadata(RESEARCH_TIME, 6 * HOURS) .itemInputs( ItemList.Casing_Fusion_Coil.get(1), - new Object[] { OrePrefixes.circuit.get(Materials.Infinite), 1 }, - new Object[] { OrePrefixes.circuit.get(Materials.Infinite), 1 }, - new Object[] { OrePrefixes.circuit.get(Materials.Infinite), 1 }, - new Object[] { OrePrefixes.circuit.get(Materials.Infinite), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.UHV), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.UHV), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.UHV), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.UHV), 1 }, GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Americium, 4), ItemList.Field_Generator_UV.get(2), ItemList.Circuit_Wafer_QPIC.get(64), @@ -775,10 +775,10 @@ public class AssemblyLineRecipes implements Runnable { .metadata(RESEARCH_TIME, 4 * HOURS) .itemInputs( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Europium, 16), - new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 1 }, - new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 1 }, - new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 1 }, - new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.ZPM), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.ZPM), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.ZPM), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.ZPM), 1 }, ItemList.Energy_LapotronicOrb2.get(8), ItemList.Field_Generator_LuV.get(2), ItemList.Circuit_Wafer_SoC2.get(64), @@ -799,10 +799,10 @@ public class AssemblyLineRecipes implements Runnable { .metadata(RESEARCH_TIME, 4 * HOURS) .itemInputs( GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Americium, 32), - new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 1 }, - new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 1 }, - new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 1 }, - new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.UV), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.UV), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.UV), 1 }, + new Object[] { OrePrefixes.circuit.get(Materials.UV), 1 }, ItemList.Energy_Module.get(8), ItemList.Field_Generator_ZPM.get(2), ItemList.Circuit_Wafer_HPIC.get(64), @@ -828,7 +828,7 @@ public class AssemblyLineRecipes implements Runnable { ItemList.Electric_Pump_UHV.get(16), ItemList.Conveyor_Module_UHV.get(8), ItemList.Robot_Arm_UHV.get(8), - new Object[] { OrePrefixes.circuit.get(Materials.Bio), 4 }, + new Object[] { OrePrefixes.circuit.get(Materials.UEV), 4 }, new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Duranium, 32), GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.NaquadahAlloy, 32) }, GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Polybenzimidazole, 64), @@ -848,7 +848,7 @@ public class AssemblyLineRecipes implements Runnable { .metadata(RESEARCH_TIME, 2 * HOURS) .itemInputs( GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.NaquadahAlloy, 16), - new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 4 }, + new Object[] { OrePrefixes.circuit.get(Materials.UV), 4 }, NewHorizonsCoreMod.isModLoaded() ? GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.HeavyDutyRocketEngineTier3", 4) : ItemList.Casing_Firebox_TungstenSteel.get(16), @@ -869,7 +869,7 @@ public class AssemblyLineRecipes implements Runnable { .metadata(RESEARCH_TIME, 8 * HOURS) .itemInputs( GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Infinity, 16), - new Object[] { OrePrefixes.circuit.get(Materials.Bio), 4 }, + new Object[] { OrePrefixes.circuit.get(Materials.UEV), 4 }, ItemList.Field_Generator_UV.get(16), ItemList.Gravistar.get(8), ItemList.Emitter_UV.get(4), diff --git a/src/main/java/gregtech/loaders/postload/recipes/CircuitAssemblerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/CircuitAssemblerRecipes.java index 10aaff6b4d..072992d07e 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/CircuitAssemblerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/CircuitAssemblerRecipes.java @@ -42,7 +42,7 @@ public class CircuitAssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Circuit_Board_Coated_Basic.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Basic, 1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.LV, 1), ItemList.Cover_Controller.get(1)) .itemOutputs(getModItem(Railcraft.ID, "part.circuit", 4L, 0)) .fluidInputs(tMat.getMolten(144L * tMultiplier / 2)) @@ -53,7 +53,7 @@ public class CircuitAssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Circuit_Board_Coated_Basic.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Basic, 1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.LV, 1), ItemList.Sensor_LV.get(1)) .itemOutputs(getModItem(Railcraft.ID, "part.circuit", 4L, 1)) .fluidInputs(tMat.getMolten(144L * tMultiplier / 2)) @@ -64,7 +64,7 @@ public class CircuitAssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Circuit_Board_Coated_Basic.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Basic, 1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.LV, 1), getModItem(Railcraft.ID, "part.signal.lamp", 1L, 0)) .itemOutputs(getModItem(Railcraft.ID, "part.circuit", 4L, 2)) .fluidInputs(tMat.getMolten(144L * tMultiplier / 2)) @@ -75,7 +75,7 @@ public class CircuitAssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Circuit_Board_Phenolic_Good.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Good, 1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.MV, 1), ItemList.Cover_Controller.get(1)) .itemOutputs(getModItem(Railcraft.ID, "part.circuit", 8L, 0)) .fluidInputs(tMat.getMolten(144L * tMultiplier / 2)) @@ -86,7 +86,7 @@ public class CircuitAssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Circuit_Board_Phenolic_Good.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Good, 1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.MV, 1), ItemList.Sensor_LV.get(1)) .itemOutputs(getModItem(Railcraft.ID, "part.circuit", 8L, 1)) .fluidInputs(tMat.getMolten(144L * tMultiplier / 2)) @@ -97,7 +97,7 @@ public class CircuitAssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Circuit_Board_Phenolic_Good.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Good, 1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.MV, 1), getModItem(Railcraft.ID, "part.signal.lamp", 1L, 0)) .itemOutputs(getModItem(Railcraft.ID, "part.circuit", 8L, 2)) .fluidInputs(tMat.getMolten(144L * tMultiplier / 2)) @@ -108,7 +108,7 @@ public class CircuitAssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Circuit_Board_Epoxy_Advanced.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 1), ItemList.Cover_Controller.get(1)) .itemOutputs(getModItem(Railcraft.ID, "part.circuit", 16L, 0)) .fluidInputs(tMat.getMolten(144L * tMultiplier / 2)) @@ -119,7 +119,7 @@ public class CircuitAssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Circuit_Board_Epoxy_Advanced.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 1), ItemList.Sensor_LV.get(1)) .itemOutputs(getModItem(Railcraft.ID, "part.circuit", 16L, 1)) .fluidInputs(tMat.getMolten(144L * tMultiplier / 2)) @@ -130,7 +130,7 @@ public class CircuitAssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Circuit_Board_Epoxy_Advanced.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 1), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 1), getModItem(Railcraft.ID, "part.signal.lamp", 1L, 0)) .itemOutputs(getModItem(Railcraft.ID, "part.circuit", 16L, 2)) .fluidInputs(tMat.getMolten(144L * tMultiplier / 2)) @@ -141,7 +141,7 @@ public class CircuitAssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Circuit_Board_Coated_Basic.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Primitive, 2), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.ULV, 2), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Iron, 2), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Iron, 4), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Iron, 1), @@ -155,7 +155,7 @@ public class CircuitAssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Circuit_Board_Coated_Basic.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Basic, 2), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.LV, 2), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Bronze, 2), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Bronze, 4), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Bronze, 1), @@ -169,7 +169,7 @@ public class CircuitAssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Circuit_Board_Phenolic_Good.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Good, 2), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.MV, 2), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Steel, 2), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 4), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Steel, 1), @@ -183,7 +183,7 @@ public class CircuitAssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Circuit_Board_Phenolic_Good.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 2), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 2), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, 2), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Electrum, 4), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Electrum, 1), @@ -268,7 +268,7 @@ public class CircuitAssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Circuit_Board_Coated_Basic.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Primitive, 2), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.ULV, 2), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Iron, 2), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Iron, 4), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Iron, 1), @@ -282,7 +282,7 @@ public class CircuitAssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Circuit_Board_Coated_Basic.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Basic, 2), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.LV, 2), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Bronze, 2), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Bronze, 4), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Bronze, 1), @@ -296,7 +296,7 @@ public class CircuitAssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Circuit_Board_Phenolic_Good.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Good, 2), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.MV, 2), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Steel, 2), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 4), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Steel, 1), @@ -310,7 +310,7 @@ public class CircuitAssemblerRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs( ItemList.Circuit_Board_Phenolic_Good.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 2), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 2), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, 2), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Electrum, 4), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Electrum, 1), diff --git a/src/main/java/gregtech/loaders/postload/recipes/ThaumcraftRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ThaumcraftRecipes.java index 17bc8b3002..441da5a116 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/ThaumcraftRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/ThaumcraftRecipes.java @@ -709,9 +709,9 @@ public class ThaumcraftRecipes implements Runnable { tKey, ItemList.Hull_LV.get(1L), new ItemStack[] { new ItemStack(Blocks.beacon), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Good, 1L), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.MV, 1L), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 1L), - ItemList.Sensor_MV.get(2L), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Good, 1L), + ItemList.Sensor_MV.get(2L), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.MV, 1L), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Thaumium, 1L), ItemList.Sensor_MV.get(2L) }, ItemList.MagicEnergyConverter_LV.get(1L), @@ -747,10 +747,9 @@ public class ThaumcraftRecipes implements Runnable { tKey, ItemList.Hull_MV.get(1L), new ItemStack[] { new ItemStack(Blocks.beacon), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 1L), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 1L), GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Thaumium, 1L), - ItemList.Sensor_HV.get(2L), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 1L), + ItemList.Sensor_HV.get(2L), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 1L), GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.StainlessSteel, 1L), ItemList.Sensor_HV.get(2L) }, ItemList.MagicEnergyConverter_MV.get(1L), @@ -786,10 +785,10 @@ public class ThaumcraftRecipes implements Runnable { tKey, ItemList.Hull_HV.get(1L), new ItemStack[] { new ItemStack(Blocks.beacon), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Data, 1L), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.EV, 1L), GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Thaumium, 1L), ItemList.Field_Generator_MV.get(1L), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Data, 1L), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.EV, 1L), GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Titanium, 1L), ItemList.Field_Generator_MV.get(1L) }, ItemList.MagicEnergyConverter_HV.get(1L), @@ -825,7 +824,7 @@ public class ThaumcraftRecipes implements Runnable { tKey, ItemList.Hull_LV.get(1L), new ItemStack[] { ItemList.MagicEnergyConverter_LV.get(1L), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Good, 1L), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.MV, 1L), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Thaumium, 1L), ItemList.Sensor_MV.get(2L) }, ItemList.MagicEnergyAbsorber_LV.get(1L), @@ -863,9 +862,9 @@ public class ThaumcraftRecipes implements Runnable { tKey, ItemList.Hull_MV.get(1L), new ItemStack[] { ItemList.MagicEnergyConverter_MV.get(1L), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 1L), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 1L), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Thaumium, 1L), ItemList.Sensor_HV.get(2L), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 1L), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 1L), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Thaumium, 1L) }, ItemList.MagicEnergyAbsorber_MV.get(1L), 6, @@ -880,10 +879,10 @@ public class ThaumcraftRecipes implements Runnable { tKey, ItemList.Hull_HV.get(1L), new ItemStack[] { ItemList.MagicEnergyConverter_MV.get(1L), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Data, 1L), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.EV, 1L), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Void, 1), ItemList.Field_Generator_MV.get(1L), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Data, 1L), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.EV, 1L), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Void, 1), }, ItemList.MagicEnergyAbsorber_HV.get(1L), 8, @@ -898,11 +897,11 @@ public class ThaumcraftRecipes implements Runnable { tKey, ItemList.Hull_EV.get(1L), new ItemStack[] { ItemList.MagicEnergyConverter_HV.get(1L), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Elite, 1L), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.IV, 1L), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Void, 1), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 1), ItemList.Field_Generator_HV.get(1L), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Elite, 1L), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.IV, 1L), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Void, 1), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenSteel, 1), }, ItemList.MagicEnergyAbsorber_EV.get(1L), diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_OreDictionary.java b/src/main/java/gregtech/loaders/preload/GT_Loader_OreDictionary.java index ba1c228e46..c583da068d 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_OreDictionary.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_OreDictionary.java @@ -168,16 +168,15 @@ public class GT_Loader_OreDictionary implements Runnable { GT_OreDictUnificator.registerOre("cropLemon", ItemList.FR_Lemon.get(1L)); GT_OreDictUnificator.registerOre("cropCoffee", ItemList.IC2_CoffeeBeans.get(1L)); GT_OreDictUnificator.registerOre("cropPotato", ItemList.Food_Raw_Potato.get(1L)); + GT_OreDictUnificator.registerOre(OrePrefixes.battery, Materials.LV, GT_ModHandler.getIC2Item("reBattery", 1L)); GT_OreDictUnificator - .registerOre(OrePrefixes.battery, Materials.Basic, GT_ModHandler.getIC2Item("reBattery", 1L)); + .registerOre(OrePrefixes.battery, Materials.LV, GT_ModHandler.getIC2Item("chargedReBattery", 1L, 32767)); GT_OreDictUnificator - .registerOre(OrePrefixes.battery, Materials.Basic, GT_ModHandler.getIC2Item("chargedReBattery", 1L, 32767)); + .registerOre(OrePrefixes.battery, Materials.HV, GT_ModHandler.getIC2Item("advBattery", 1L, 32767)); GT_OreDictUnificator - .registerOre(OrePrefixes.battery, Materials.Advanced, GT_ModHandler.getIC2Item("advBattery", 1L, 32767)); + .registerOre(OrePrefixes.battery, Materials.EV, GT_ModHandler.getIC2Item("energyCrystal", 1L, 32767)); GT_OreDictUnificator - .registerOre(OrePrefixes.battery, Materials.Elite, GT_ModHandler.getIC2Item("energyCrystal", 1L, 32767)); - GT_OreDictUnificator - .registerOre(OrePrefixes.battery, Materials.Master, GT_ModHandler.getIC2Item("lapotronCrystal", 1L, 32767)); + .registerOre(OrePrefixes.battery, Materials.IV, GT_ModHandler.getIC2Item("lapotronCrystal", 1L, 32767)); GT_OreDictUnificator .registerOre(OreDictNames.craftingWireCopper, GT_ModHandler.getIC2Item("insulatedCopperCableItem", 1L)); @@ -271,9 +270,9 @@ public class GT_Loader_OreDictionary implements Runnable { GT_OreDictUnificator.addToBlacklist(GT_ModHandler.getIC2Item("electronicCircuit", 1L)); GT_OreDictUnificator.addToBlacklist(GT_ModHandler.getIC2Item("advancedCircuit", 1L)); GT_OreDictUnificator - .registerOre(OrePrefixes.circuit, Materials.Basic, GT_ModHandler.getIC2Item("electronicCircuit", 1L)); + .registerOre(OrePrefixes.circuit, Materials.LV, GT_ModHandler.getIC2Item("electronicCircuit", 1L)); GT_OreDictUnificator - .registerOre(OrePrefixes.circuit, Materials.Advanced, GT_ModHandler.getIC2Item("advancedCircuit", 1L)); + .registerOre(OrePrefixes.circuit, Materials.HV, GT_ModHandler.getIC2Item("advancedCircuit", 1L)); GT_OreDictUnificator.registerOre( OrePrefixes.itemCasing, @@ -344,63 +343,63 @@ public class GT_Loader_OreDictionary implements Runnable { // Fake Circuits GT_OreDictUnificator.registerOre( OrePrefixes.circuit, - Materials.Primitive, + Materials.ULV, GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitULV", 1L)); GT_OreDictUnificator.registerOre( OrePrefixes.circuit, - Materials.Basic, + Materials.LV, GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitLV", 1L)); GT_OreDictUnificator.registerOre( OrePrefixes.circuit, - Materials.Good, + Materials.MV, GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitMV", 1L)); GT_OreDictUnificator.registerOre( OrePrefixes.circuit, - Materials.Advanced, + Materials.HV, GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitHV", 1L)); GT_OreDictUnificator.registerOre( OrePrefixes.circuit, - Materials.Data, + Materials.EV, GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitEV", 1L)); GT_OreDictUnificator.registerOre( OrePrefixes.circuit, - Materials.Elite, + Materials.IV, GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitIV", 1L)); GT_OreDictUnificator.registerOre( OrePrefixes.circuit, - Materials.Master, + Materials.LuV, GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitLuV", 1L)); GT_OreDictUnificator.registerOre( OrePrefixes.circuit, - Materials.Ultimate, + Materials.ZPM, GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitZPM", 1L)); GT_OreDictUnificator.registerOre( OrePrefixes.circuit, - Materials.SuperconductorUHV, + Materials.UV, GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitUV", 1L)); GT_OreDictUnificator.registerOre( OrePrefixes.circuit, - Materials.Infinite, + Materials.UHV, GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitUHV", 1L)); GT_OreDictUnificator.registerOre( OrePrefixes.circuit, - Materials.Bio, + Materials.UEV, GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitUEV", 1L)); GT_OreDictUnificator.registerOre( OrePrefixes.circuit, - Materials.Optical, + Materials.UIV, GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitUIV", 1L)); GT_OreDictUnificator.registerOre( OrePrefixes.circuit, - Materials.Exotic, + Materials.UMV, GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitUMV", 1L)); GT_OreDictUnificator.registerOre( OrePrefixes.circuit, - Materials.Cosmic, + Materials.UXV, GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitUXV", 1L)); GT_OreDictUnificator.registerOre( OrePrefixes.circuit, - Materials.Transcendent, + Materials.MAX, GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitMAX", 1L)); GT_OreDictUnificator.registerOre( diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java b/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java index 8f3bff8a8b..1a2da7c060 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java @@ -864,7 +864,7 @@ public class GenericChem extends ItemPackage { GT_ModHandler.addShapelessCraftingRecipe( GregtechItemList.Circuit_T3RecipeSelector.getWithDamage(1L, 0L), 0, - new Object[] { OrePrefixes.circuit.get(Materials.Advanced) }); + new Object[] { OrePrefixes.circuit.get(Materials.HV) }); long bits = 0; BioRecipes.addCraftingRecipe( diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java index 80cd053ff4..fd62f57d59 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java @@ -549,8 +549,8 @@ public class RECIPES_GREGTECH { GregtechItemList.Industrial_AlloyBlastSmelter.get(64L, new Object() {}), ItemList.UV_Coil.get(16L, new Object() {}), ItemList.Conveyor_Module_UV.get(4L, new Object() {}), - new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 8 }, - new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), 16 }, + new Object[] { OrePrefixes.circuit.get(Materials.UV), 8 }, + new Object[] { OrePrefixes.circuit.get(Materials.ZPM), 16 }, ItemList.Circuit_Chip_PPIC.get(16, new Object() {}), ALLOY.PIKYONIUM.getPlate(16), ALLOY.CINOBITE.getScrew(32)) diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java index 075b8978f6..e23678b3ae 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java @@ -950,8 +950,8 @@ public class RECIPES_Machines { ItemUtils.getSimpleStack(CI.robotArm_LV, 4 * (1)), ItemList.Cover_Controller.get(1, CI.electricMotor_MV), CI.machineHull_MV, - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Basic, 2), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Good, 2)) + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.LV, 2), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.MV, 2)) .itemOutputs(ItemUtils.getSimpleStack(ModBlocks.blockCircuitProgrammer)) .fluidInputs(ELEMENT.getInstance().IRON.getFluidStack(144 * 4)) .duration(30 * SECONDS) @@ -985,7 +985,7 @@ public class RECIPES_Machines { GT_Values.RA.stdBuilder() .itemInputs( CI.machineHull_LV, - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Basic, 4), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.LV, 4), ItemUtils.getItemStackOfAmountFromOreDict("plateTumbaga", 8), ItemUtils.getSimpleStack(Blocks.jukebox)) .itemOutputs(ItemUtils.getSimpleStack(ModBlocks.blockCustomJukebox)) @@ -1733,7 +1733,7 @@ public class RECIPES_Machines { 16, new Object[] { GregtechItemList.Controller_MolecularTransformer.get(1), GT_ModHandler.getModItem(EternalSingularity.ID, "eternal_singularity", 1), - new Object[] { OrePrefixes.circuit.get(Materials.Bio), 8 }, ItemList.Electric_Pump_UEV.get(4), + new Object[] { OrePrefixes.circuit.get(Materials.UEV), 8 }, ItemList.Electric_Pump_UEV.get(4), ItemList.Field_Generator_UEV.get(4), GregtechItemList.Laser_Lens_Special.get(1) }, new FluidStack[] { MISC_MATERIALS.MUTATED_LIVING_SOLDER.getFluidStack(144 * 10), ALLOY.PIKYONIUM.getFluidStack(144 * 32) }, @@ -2420,7 +2420,7 @@ public class RECIPES_Machines { GregtechItemList.Controller_LargeSemifluidGenerator.get(1L), CI.bitsd, new Object[] { "PCP", "EME", "GWG", 'M', ItemList.Hull_EV, 'P', ItemList.Electric_Piston_EV, 'E', - ItemList.Electric_Pump_EV, 'C', OrePrefixes.circuit.get(Materials.Data), 'W', + ItemList.Electric_Pump_EV, 'C', OrePrefixes.circuit.get(Materials.EV), 'W', OrePrefixes.cableGt08.get(Materials.Electrum), 'G', ALLOY.INCONEL_792.getGear(1) }); if (CORE.ConfigSwitches.enableMultiblock_PowerSubstation) { @@ -2744,7 +2744,7 @@ public class RECIPES_Machines { GregtechItemList.Casing_Adv_BlastFurnace.get(1), ALLOY.MARAGING250.getPlate(4), ALLOY.MARAGING300.getGear(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Elite, 2), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.EV, 2), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(GregtechItemList.Hatch_Input_Pyrotheum.get(1L)) .duration(2 * SECONDS + 10 * TICKS) diff --git a/src/main/java/gtPlusPlus/core/recipe/common/CI.java b/src/main/java/gtPlusPlus/core/recipe/common/CI.java index e7119430e6..a26887ad1f 100644 --- a/src/main/java/gtPlusPlus/core/recipe/common/CI.java +++ b/src/main/java/gtPlusPlus/core/recipe/common/CI.java @@ -431,8 +431,8 @@ public class CI { Materials.YttriumBariumCuprate, Materials.Naquadah, Materials.Duranium, Materials.SuperconductorUHV, }; private static final Materials[] aMaterial_Circuits = new Materials[] { Materials.ULV, Materials.LV, Materials.MV, - Materials.HV, Materials.EV, Materials.IV, Materials.LuV, Materials.ZPM, Materials.SuperconductorUHV, - Materials.UHV, Materials.UEV, }; + Materials.HV, Materials.EV, Materials.IV, Materials.LuV, Materials.ZPM, Materials.UV, Materials.UHV, + Materials.UEV, }; private static final Material[][] aMaster = new Material[][] { aMaterial_Main, aMaterial_Secondary, aMaterial_Tertiary }; diff --git a/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java b/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java index 744d873a48..30011cddbc 100644 --- a/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java +++ b/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java @@ -1136,7 +1136,7 @@ public class BioRecipes { GT_ModHandler.addShapelessCraftingRecipe( GregtechItemList.Circuit_BioRecipeSelector.getWithDamage(1L, 0L), 0, - new Object[] { OrePrefixes.circuit.get(Materials.Primitive) }); + new Object[] { OrePrefixes.circuit.get(Materials.ULV) }); long bits = 0; addCraftingRecipe( diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedBoilers.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedBoilers.java index 6c532b4e76..acaa6a8edf 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedBoilers.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedBoilers.java @@ -51,7 +51,7 @@ public class GregtechAdvancedBoilers { | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "WCW", "GMG", "WPW", 'M', ItemList.Hull_ULV, 'P', - OrePrefixes.pipeLarge.get(Materials.Bronze), 'C', OrePrefixes.circuit.get(Materials.Primitive), 'W', + OrePrefixes.pipeLarge.get(Materials.Bronze), 'C', OrePrefixes.circuit.get(Materials.ULV), 'W', OrePrefixes.plate.get(Materials.Lead), 'G', OrePrefixes.pipeSmall.get(Materials.Copper) }); GT_ModHandler.addCraftingRecipe( @@ -60,7 +60,7 @@ public class GregtechAdvancedBoilers { | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "WCW", "GMG", "WPW", 'M', ItemList.Hull_LV, 'P', OrePrefixes.pipeLarge.get(Materials.Steel), - 'C', OrePrefixes.circuit.get(Materials.Basic), 'W', OrePrefixes.plate.get(Materials.Steel), 'G', + 'C', OrePrefixes.circuit.get(Materials.LV), 'W', OrePrefixes.plate.get(Materials.Steel), 'G', OrePrefixes.pipeSmall.get(Materials.Bronze) }); GT_ModHandler.addCraftingRecipe( @@ -69,7 +69,7 @@ public class GregtechAdvancedBoilers { | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "WCW", "GMG", "WPW", 'M', ItemList.Hull_MV, 'P', - OrePrefixes.pipeLarge.get(Materials.StainlessSteel), 'C', OrePrefixes.circuit.get(Materials.Good), 'W', + OrePrefixes.pipeLarge.get(Materials.StainlessSteel), 'C', OrePrefixes.circuit.get(Materials.MV), 'W', OrePrefixes.plate.get(Materials.Aluminium), 'G', OrePrefixes.pipeSmall.get(Materials.Steel) }); ItemStack pipeTier1 = ItemUtils.getItemStackOfAmountFromOreDict(RECIPES_MachineComponents.pipeTier7, 1); @@ -83,7 +83,7 @@ public class GregtechAdvancedBoilers { | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "dCw", "WMW", "GPG", 'M', ItemList.Hull_LV, 'P', pipeTier1, 'C', - OrePrefixes.circuit.get(Materials.Basic), 'W', chassisT1, 'G', OrePrefixes.gear.get(Materials.Steel) }); + OrePrefixes.circuit.get(Materials.LV), 'W', chassisT1, 'G', OrePrefixes.gear.get(Materials.Steel) }); GT_ModHandler.addCraftingRecipe( GregtechItemList.Boiler_Advanced_MV.get(1L), @@ -91,7 +91,7 @@ public class GregtechAdvancedBoilers { | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "dCw", "WMW", "GPG", 'M', ItemList.Hull_MV, 'P', pipeTier2, 'C', - OrePrefixes.circuit.get(Materials.Good), 'W', chassisT2, 'G', ALLOY.SILICON_CARBIDE.getGear(1) }); + OrePrefixes.circuit.get(Materials.MV), 'W', chassisT2, 'G', ALLOY.SILICON_CARBIDE.getGear(1) }); GT_ModHandler.addCraftingRecipe( GregtechItemList.Boiler_Advanced_HV.get(1L), @@ -99,6 +99,6 @@ public class GregtechAdvancedBoilers { | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "dCw", "WMW", "GPG", 'M', ItemList.Hull_HV, 'P', pipeTier3, 'C', - OrePrefixes.circuit.get(Materials.Advanced), 'W', chassisT3, 'G', ALLOY.SILICON_CARBIDE.getGear(1) }); + OrePrefixes.circuit.get(Materials.HV), 'W', chassisT3, 'G', ALLOY.SILICON_CARBIDE.getGear(1) }); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java index 7c6b576283..7d422c3e1f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java @@ -52,7 +52,7 @@ public class GregtechGeothermalThermalGenerator { | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "CEC", "GMG", "PWP", 'M', ItemList.Hull_EV, 'P', ItemList.Electric_Piston_EV, 'E', - ItemList.Electric_Motor_EV, 'C', OrePrefixes.circuit.get(Materials.Ultimate), 'W', + ItemList.Electric_Motor_EV, 'C', OrePrefixes.circuit.get(Materials.ZPM), 'W', OrePrefixes.cableGt04.get(Materials.Aluminium), 'G', ALLOY.TANTALLOY_61.getGear(1) }); GT_ModHandler.addCraftingRecipe( @@ -61,7 +61,7 @@ public class GregtechGeothermalThermalGenerator { | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "CEC", "GMG", "PWP", 'M', ItemList.Hull_IV, 'P', ItemList.Electric_Piston_IV, 'E', - ItemList.Electric_Motor_IV, 'C', OrePrefixes.circuit.get(Materials.SuperconductorUHV), 'W', + ItemList.Electric_Motor_IV, 'C', OrePrefixes.circuit.get(Materials.UV), 'W', OrePrefixes.cableGt04.get(Materials.Platinum), 'G', ALLOY.STELLITE.getGear(1) }); final ItemStack INGREDIENT_1 = CI.electricPiston_LuV; @@ -72,7 +72,7 @@ public class GregtechGeothermalThermalGenerator { | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "CEC", "GMG", "PWP", 'M', ItemList.Hull_LuV, 'P', INGREDIENT_1, 'E', INGREDIENT_2, 'C', - OrePrefixes.circuit.get(Materials.Infinite), 'W', OrePrefixes.cableGt04.get(Materials.Tungsten), 'G', + OrePrefixes.circuit.get(Materials.UHV), 'W', OrePrefixes.cableGt04.get(Materials.Tungsten), 'G', ALLOY.ZERON_100.getGear(1) }); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRocketFuelGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRocketFuelGenerator.java index 7115efd0d8..8f188f4fd9 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRocketFuelGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRocketFuelGenerator.java @@ -40,7 +40,7 @@ public class GregtechRocketFuelGenerator { CI.bitsd, new Object[] { "PCP", "EME", "GWG", 'M', ItemList.Machine_Multi_DieselEngine.get(1), 'P', ItemList.Electric_Piston_IV, 'E', ItemList.Field_Generator_EV, 'C', - OrePrefixes.circuit.get(Materials.Master), 'W', OrePrefixes.cableGt08.get(Materials.Platinum), 'G', + OrePrefixes.circuit.get(Materials.LuV), 'W', OrePrefixes.cableGt08.get(Materials.Platinum), 'G', ALLOY.MARAGING350.getGear(1) }); GT_ModHandler.addCraftingRecipe( @@ -74,7 +74,7 @@ public class GregtechRocketFuelGenerator { | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "PCP", "EME", "GWG", 'M', ItemList.Hull_EV, 'P', ItemList.Electric_Piston_EV, 'E', - ItemList.Electric_Motor_EV, 'C', OrePrefixes.circuit.get(Materials.Elite), 'W', + ItemList.Electric_Motor_EV, 'C', OrePrefixes.circuit.get(Materials.IV), 'W', OrePrefixes.cableGt02.get(Materials.Aluminium), 'G', ALLOY.TANTALLOY_61.getGear(1) }); GT_ModHandler.addCraftingRecipe( @@ -83,7 +83,7 @@ public class GregtechRocketFuelGenerator { | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "PCP", "EME", "GWG", 'M', ItemList.Hull_IV, 'P', ItemList.Electric_Piston_IV, 'E', - ItemList.Electric_Motor_IV, 'C', OrePrefixes.circuit.get(Materials.Master), 'W', + ItemList.Electric_Motor_IV, 'C', OrePrefixes.circuit.get(Materials.LuV), 'W', OrePrefixes.cableGt02.get(Materials.Platinum), 'G', ALLOY.STELLITE.getGear(1) }); final ItemStack INGREDIENT_1 = CI.electricPiston_LuV; final ItemStack INGREDIENT_2 = CI.electricMotor_LuV; @@ -93,7 +93,7 @@ public class GregtechRocketFuelGenerator { | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "PCP", "EME", "GWG", 'M', ItemList.Hull_LuV, 'P', INGREDIENT_1, 'E', INGREDIENT_2, 'C', - OrePrefixes.circuit.get(Materials.Ultimate), 'W', OrePrefixes.cableGt02.get(Materials.Tungsten), 'G', + OrePrefixes.circuit.get(Materials.ZPM), 'W', OrePrefixes.cableGt02.get(Materials.Tungsten), 'G', ALLOY.ZERON_100.getGear(1) }); } } diff --git a/src/main/java/kubatech/loaders/RecipeLoader.java b/src/main/java/kubatech/loaders/RecipeLoader.java index 9c3ded4992..5df6f8aa4f 100644 --- a/src/main/java/kubatech/loaders/RecipeLoader.java +++ b/src/main/java/kubatech/loaders/RecipeLoader.java @@ -111,7 +111,7 @@ public class RecipeLoader { ItemList.ExtremeEntityCrusher.get(1), bitsd, new Object[] { "RCR", "CHC", "VVV", 'R', gregtech.api.enums.ItemList.Robot_Arm_EV, 'C', - OrePrefixes.circuit.get(Materials.Data), 'H', gregtech.api.enums.ItemList.Hull_EV, 'V', + OrePrefixes.circuit.get(Materials.EV), 'H', gregtech.api.enums.ItemList.Hull_EV, 'V', GT_ModHandler.getModItem("OpenBlocks", "vacuumhopper", 1, new ItemStack(Blocks.hopper)) }); } if (registerMTE( @@ -128,10 +128,10 @@ public class RecipeLoader { gregtech.api.enums.ItemList.IndustrialApiary_Upgrade_Acceleration_8_Upgraded.get(64L), gregtech.api.enums.ItemList.IndustrialApiary_Upgrade_STABILIZER.get(64L), gregtech.api.enums.ItemList.Robot_Arm_UV.get(16L), - new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 4L }, - new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 4L }, - new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 4L }, - new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 4L }) + new Object[] { OrePrefixes.circuit.get(Materials.UV), 4L }, + new Object[] { OrePrefixes.circuit.get(Materials.UV), 4L }, + new Object[] { OrePrefixes.circuit.get(Materials.UV), 4L }, + new Object[] { OrePrefixes.circuit.get(Materials.UV), 4L }) .fluidInputs( FluidRegistry.getFluidStack("molten.indalloy140", 28800), FluidRegistry.getFluidStack("for.honey", 20000)) @@ -155,7 +155,7 @@ public class RecipeLoader { NewHorizonsCoreMod.isModLoaded() ? GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 1, 11104) // IV World Accelerator : gregtech.api.enums.ItemList.Robot_Arm_IV, - 'Z', OrePrefixes.circuit.get(Materials.Ultimate) }); + 'Z', OrePrefixes.circuit.get(Materials.ZPM) }); // Vanilla should always be loaded GT_MetaTileEntity_ExtremeIndustrialGreenhouse.addFertilizerItem(new ItemStack(Items.dye, 1, 15)); @@ -370,10 +370,10 @@ public class RecipeLoader { GameRegistry.findItemStack("Avaritia", "Neutronium_Compressor", 1), gregtech.api.enums.ItemList.Quantum_Tank_EV.get(1), GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 10, 11193), // UHV Fluid extractor - new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 4L }, - new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 4L }, - new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 4L }, - new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 4L }) + new Object[] { OrePrefixes.circuit.get(Materials.UV), 4L }, + new Object[] { OrePrefixes.circuit.get(Materials.UV), 4L }, + new Object[] { OrePrefixes.circuit.get(Materials.UV), 4L }, + new Object[] { OrePrefixes.circuit.get(Materials.UV), 4L }) .fluidInputs(FluidRegistry.getFluidStack("molten.indalloy140", 28800)) .itemOutputs(TeaAcceptor.get(1)) .eut(2_048_000) diff --git a/src/main/java/net/glease/ggfab/ComponentRecipeLoader.java b/src/main/java/net/glease/ggfab/ComponentRecipeLoader.java index 4f6d790557..5c121b205e 100644 --- a/src/main/java/net/glease/ggfab/ComponentRecipeLoader.java +++ b/src/main/java/net/glease/ggfab/ComponentRecipeLoader.java @@ -30,9 +30,9 @@ class ComponentRecipeLoader implements Runnable { .metadata(RESEARCH_TIME, 1 * HOURS + 6 * MINUTES) .itemInputs( ItemList.Machine_Multi_Assemblyline.get(1L), - new Object[] { OrePrefixes.circuit.get(Materials.Master), 2 }, - new Object[] { OrePrefixes.circuit.get(Materials.Elite), 4 }, - new Object[] { OrePrefixes.circuit.get(Materials.Data), 8 }, + new Object[] { OrePrefixes.circuit.get(Materials.LuV), 2 }, + new Object[] { OrePrefixes.circuit.get(Materials.IV), 4 }, + new Object[] { OrePrefixes.circuit.get(Materials.EV), 8 }, ItemList.Automation_ChestBuffer_LuV.get(1L)) .fluidInputs(new FluidStack(solderIndalloy, 1296), Materials.Lubricant.getFluid(2000)) .itemOutputs(GGItemList.AdvAssLine.get(1L)) |