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/com | |
| 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/com')
9 files changed, 221 insertions, 237 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) }; |