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/gregtech/loaders/postload | |
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/gregtech/loaders/postload')
7 files changed, 143 insertions, 144 deletions
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), |