diff options
Diffstat (limited to 'src/main/java/gregtech/common/items')
4 files changed, 68 insertions, 68 deletions
diff --git a/src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java b/src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java index 0dc5000e7a..d0ef03a1ae 100644 --- a/src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java +++ b/src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java @@ -69,7 +69,7 @@ public class GT_IntegratedCircuit_Item extends GT_Generic_Item implements INetwo GT_ModHandler.addShapelessCraftingRecipe( ItemList.Circuit_Integrated.getWithDamage(1L, 0L), GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { OrePrefixes.circuit.get(Materials.Basic) }); + new Object[] { OrePrefixes.circuit.get(Materials.LV) }); long bits = GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE; GT_ModHandler.addCraftingRecipe( ItemList.Circuit_Integrated.getWithDamage(1L, 1L), diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java index d603d7b004..549081c4cb 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java @@ -1443,7 +1443,7 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 16L), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 16L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 16L), - OrePrefixes.battery.get(Materials.Ultimate))); + OrePrefixes.battery.get(Materials.ZPM))); // ZPM Module ItemList.ZPM.set( @@ -1466,7 +1466,7 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 16L), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 16L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 16L), - OrePrefixes.battery.get(Materials.Ultimate))); + OrePrefixes.battery.get(Materials.ZPM))); // UV Battery ItemList.ZPM2.set( @@ -1533,7 +1533,7 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 16L), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 16L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 16L), - OrePrefixes.battery.get(Materials.Ultimate))); + OrePrefixes.battery.get(Materials.ZPM))); // UV Cluster ItemList.Energy_Cluster.set( @@ -2643,49 +2643,49 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { Circuit_Primitive.ID, "Vacuum Tube", "A very simple Circuit", - OrePrefixes.circuit.get(Materials.Primitive), + OrePrefixes.circuit.get(Materials.ULV), SubTag.NO_UNIFICATION)); ItemList.Circuit_Basic.set( addItem( Circuit_Basic.ID, "Integrated Logic Circuit", "A Basic Circuit", - OrePrefixes.circuit.get(Materials.Basic), + OrePrefixes.circuit.get(Materials.LV), SubTag.NO_UNIFICATION)); ItemList.Circuit_Good.set( addItem( Circuit_Good.ID, "Good Electronic Circuit", "A Good Circuit", - OrePrefixes.circuit.get(Materials.Good), + OrePrefixes.circuit.get(Materials.MV), SubTag.NO_UNIFICATION)); ItemList.Circuit_Advanced.set( addItem( Circuit_Advanced.ID, "Processor Assembly", "An Advanced Circuit", - OrePrefixes.circuit.get(Materials.Advanced), + OrePrefixes.circuit.get(Materials.HV), SubTag.NO_UNIFICATION)); ItemList.Circuit_Data.set( addItem( Circuit_Data.ID, "Workstation", "An Extreme Circuit", - OrePrefixes.circuit.get(Materials.Data), + OrePrefixes.circuit.get(Materials.EV), SubTag.NO_UNIFICATION)); ItemList.Circuit_Elite.set( addItem( Circuit_Elite.ID, "Mainframe", "An Elite Circuit", - OrePrefixes.circuit.get(Materials.Elite), + OrePrefixes.circuit.get(Materials.IV), SubTag.NO_UNIFICATION)); ItemList.Circuit_Master.set( addItem( Circuit_Master.ID, "Nanoprocessor Mainframe", "A Master Circuit", - OrePrefixes.circuit.get(Materials.Master), + OrePrefixes.circuit.get(Materials.LuV), SubTag.NO_UNIFICATION)); // Backwards compatibility. @@ -4468,70 +4468,70 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[] { "CCC", "MSM", "PES", 'S', OrePrefixes.stick.get(Materials.Steel), 'M', ItemList.Electric_Motor_LV, 'P', ItemList.Electric_Piston_LV, 'E', - OrePrefixes.circuit.get(Materials.Basic), 'C', OrePrefixes.cableGt01.get(Materials.Tin) }); + OrePrefixes.circuit.get(Materials.LV), 'C', OrePrefixes.cableGt01.get(Materials.Tin) }); GT_ModHandler.addCraftingRecipe( ItemList.Robot_Arm_MV.get(1L), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[] { "CCC", "MSM", "PES", 'S', OrePrefixes.stick.get(Materials.Aluminium), 'M', ItemList.Electric_Motor_MV, 'P', ItemList.Electric_Piston_MV, 'E', - OrePrefixes.circuit.get(Materials.Good), 'C', OrePrefixes.cableGt01.get(Materials.AnyCopper) }); + OrePrefixes.circuit.get(Materials.MV), 'C', OrePrefixes.cableGt01.get(Materials.AnyCopper) }); GT_ModHandler.addCraftingRecipe( ItemList.Robot_Arm_HV.get(1L), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[] { "CCC", "MSM", "PES", 'S', OrePrefixes.stick.get(Materials.StainlessSteel), 'M', ItemList.Electric_Motor_HV, 'P', ItemList.Electric_Piston_HV, 'E', - OrePrefixes.circuit.get(Materials.Advanced), 'C', OrePrefixes.cableGt01.get(Materials.Gold) }); + OrePrefixes.circuit.get(Materials.HV), 'C', OrePrefixes.cableGt01.get(Materials.Gold) }); GT_ModHandler.addCraftingRecipe( ItemList.Robot_Arm_EV.get(1L), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[] { "CCC", "MSM", "PES", 'S', OrePrefixes.stick.get(Materials.Titanium), 'M', ItemList.Electric_Motor_EV, 'P', ItemList.Electric_Piston_EV, 'E', - OrePrefixes.circuit.get(Materials.Data), 'C', OrePrefixes.cableGt01.get(Materials.Aluminium) }); + OrePrefixes.circuit.get(Materials.EV), 'C', OrePrefixes.cableGt01.get(Materials.Aluminium) }); GT_ModHandler.addCraftingRecipe( ItemList.Robot_Arm_IV.get(1L), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[] { "CCC", "MSM", "PES", 'S', OrePrefixes.stick.get(Materials.TungstenSteel), 'M', ItemList.Electric_Motor_IV, 'P', ItemList.Electric_Piston_IV, 'E', - OrePrefixes.circuit.get(Materials.Elite), 'C', OrePrefixes.cableGt01.get(Materials.Tungsten) }); + OrePrefixes.circuit.get(Materials.IV), 'C', OrePrefixes.cableGt01.get(Materials.Tungsten) }); GT_ModHandler.addCraftingRecipe( ItemList.Emitter_LV.get(1L), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[] { "SSC", "WQS", "CWS", 'Q', OrePrefixes.gem.get(Materials.CertusQuartz), 'S', - OrePrefixes.stick.get(Materials.Brass), 'C', OrePrefixes.circuit.get(Materials.Basic), 'W', + OrePrefixes.stick.get(Materials.Brass), 'C', OrePrefixes.circuit.get(Materials.LV), 'W', OrePrefixes.cableGt01.get(Materials.Tin) }); GT_ModHandler.addCraftingRecipe( ItemList.Emitter_MV.get(1L), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[] { "SSC", "WQS", "CWS", 'Q', OrePrefixes.gem.get(Materials.EnderPearl), 'S', - OrePrefixes.stick.get(Materials.Electrum), 'C', OrePrefixes.circuit.get(Materials.Good), 'W', + OrePrefixes.stick.get(Materials.Electrum), 'C', OrePrefixes.circuit.get(Materials.MV), 'W', OrePrefixes.cableGt01.get(Materials.AnyCopper) }); GT_ModHandler.addCraftingRecipe( ItemList.Emitter_HV.get(1L), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[] { "SSC", "WQS", "CWS", 'Q', OrePrefixes.gem.get(Materials.EnderEye), 'S', - OrePrefixes.stick.get(Materials.Chrome), 'C', OrePrefixes.circuit.get(Materials.Advanced), 'W', + OrePrefixes.stick.get(Materials.Chrome), 'C', OrePrefixes.circuit.get(Materials.HV), 'W', OrePrefixes.cableGt01.get(Materials.Gold) }); GT_ModHandler.addCraftingRecipe( ItemList.Emitter_EV.get(1L), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[] { "SSC", "WQS", "CWS", 'Q', ItemList.QuantumEye, 'S', - OrePrefixes.stick.get(Materials.Platinum), 'C', OrePrefixes.circuit.get(Materials.Data), 'W', + OrePrefixes.stick.get(Materials.Platinum), 'C', OrePrefixes.circuit.get(Materials.EV), 'W', OrePrefixes.cableGt01.get(Materials.Aluminium) }); GT_ModHandler.addCraftingRecipe( ItemList.Emitter_IV.get(1L), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[] { "SSC", "WQS", "CWS", 'Q', ItemList.QuantumStar, 'S', - OrePrefixes.stick.get(Materials.Iridium), 'C', OrePrefixes.circuit.get(Materials.Elite), 'W', + OrePrefixes.stick.get(Materials.Iridium), 'C', OrePrefixes.circuit.get(Materials.IV), 'W', OrePrefixes.cableGt01.get(Materials.Tungsten) }); GT_ModHandler.addCraftingRecipe( @@ -4540,35 +4540,35 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[] { "P Q", "PS ", "CPP", 'Q', OrePrefixes.gem.get(Materials.CertusQuartz), 'S', OrePrefixes.stick.get(Materials.Brass), 'P', OrePrefixes.plate.get(Materials.Steel), 'C', - OrePrefixes.circuit.get(Materials.Basic) }); + OrePrefixes.circuit.get(Materials.LV) }); GT_ModHandler.addCraftingRecipe( ItemList.Sensor_MV.get(1L), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[] { "P Q", "PS ", "CPP", 'Q', OrePrefixes.gemFlawless.get(Materials.Emerald), 'S', OrePrefixes.stick.get(Materials.Electrum), 'P', OrePrefixes.plate.get(Materials.Aluminium), 'C', - OrePrefixes.circuit.get(Materials.Good) }); + OrePrefixes.circuit.get(Materials.MV) }); GT_ModHandler.addCraftingRecipe( ItemList.Sensor_HV.get(1L), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[] { "P Q", "PS ", "CPP", 'Q', OrePrefixes.gem.get(Materials.EnderEye), 'S', OrePrefixes.stick.get(Materials.Chrome), 'P', OrePrefixes.plate.get(Materials.StainlessSteel), 'C', - OrePrefixes.circuit.get(Materials.Advanced) }); + OrePrefixes.circuit.get(Materials.HV) }); GT_ModHandler.addCraftingRecipe( ItemList.Sensor_EV.get(1L), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[] { "P Q", "PS ", "CPP", 'Q', ItemList.QuantumEye, 'S', OrePrefixes.stick.get(Materials.Platinum), 'P', OrePrefixes.plate.get(Materials.Titanium), 'C', - OrePrefixes.circuit.get(Materials.Data) }); + OrePrefixes.circuit.get(Materials.EV) }); GT_ModHandler.addCraftingRecipe( ItemList.Sensor_IV.get(1L), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[] { "P Q", "PS ", "CPP", 'Q', ItemList.QuantumStar, 'S', OrePrefixes.stick.get(Materials.Iridium), 'P', OrePrefixes.plate.get(Materials.TungstenSteel), 'C', - OrePrefixes.circuit.get(Materials.Elite) }); + OrePrefixes.circuit.get(Materials.IV) }); GT_ModHandler.addCraftingRecipe( ItemList.Component_Sawblade_Diamond.get(1L), @@ -4601,7 +4601,7 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { ItemList.Tool_Scanner.get(1L), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "EPR", "CSC", "PBP", 'C', OrePrefixes.circuit.get(Materials.Advanced), 'P', + new Object[] { "EPR", "CSC", "PBP", 'C', OrePrefixes.circuit.get(Materials.HV), 'P', OrePrefixes.plate.get(Materials.Aluminium), 'E', ItemList.Emitter_MV, 'R', ItemList.Sensor_MV, 'S', ItemList.Cover_Screen, 'B', ItemList.Battery_RE_MV_Lithium }); diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java index d1e657c2c8..d4a4b184a0 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java @@ -2531,7 +2531,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { RA.stdBuilder() .itemInputs( ItemList.Cover_RedstoneTransmitterExternal.get(1L), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Data, 1L), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.EV, 1L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Cover_AdvancedRedstoneTransmitterExternal.get(1L)) .duration(2 * MINUTES + 40 * SECONDS) @@ -2540,7 +2540,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { RA.stdBuilder() .itemInputs( ItemList.Cover_RedstoneReceiverExternal.get(1L), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Data, 1L), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.EV, 1L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Cover_AdvancedRedstoneReceiverExternal.get(1L)) .duration(2 * MINUTES + 40 * SECONDS) diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java index 52a268baf9..29a99fc671 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java @@ -504,7 +504,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { NandChip.ID, "NAND Chip", "A very simple Circuit", - OrePrefixes.circuit.get(Materials.Primitive), + OrePrefixes.circuit.get(Materials.ULV), SubTag.NO_UNIFICATION)); // Vacuum Tube Item01 @@ -517,7 +517,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_Integrated_Good.ID, "Good Integrated Circuit", "Good Circuit", - OrePrefixes.circuit.get(Materials.Good), + OrePrefixes.circuit.get(Materials.MV), SubTag.NO_UNIFICATION)); // Good Integrated Circuit Item01 @@ -528,7 +528,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_Microprocessor.ID, "Microprocessor", "A Basic Circuit", - OrePrefixes.circuit.get(Materials.Basic), + OrePrefixes.circuit.get(Materials.LV), SubTag.NO_UNIFICATION)); ItemList.Circuit_Processor.set( @@ -536,7 +536,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_Processor.ID, "Integrated Processor", "A Good Circuit", - OrePrefixes.circuit.get(Materials.Good), + OrePrefixes.circuit.get(Materials.MV), SubTag.NO_UNIFICATION)); ItemList.Circuit_Nanoprocessor.set( @@ -544,7 +544,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_Nanoprocessor.ID, "Nanoprocessor", "An Advanced Circuit", - OrePrefixes.circuit.get(Materials.Advanced), + OrePrefixes.circuit.get(Materials.HV), SubTag.NO_UNIFICATION)); ItemList.Circuit_Nanocomputer.set( @@ -552,7 +552,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_Nanocomputer.ID, "Nanoprocessor Assembly", "An Extreme Circuit", - OrePrefixes.circuit.get(Materials.Data), + OrePrefixes.circuit.get(Materials.EV), SubTag.NO_UNIFICATION)); ItemList.Circuit_Elitenanocomputer.set( @@ -560,7 +560,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_Elitenanocomputer.ID, "Elite Nanocomputer", "An Elite Circuit", - OrePrefixes.circuit.get(Materials.Elite), + OrePrefixes.circuit.get(Materials.IV), SubTag.NO_UNIFICATION)); // Quantum circuits @@ -569,7 +569,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_Quantumprocessor.ID, "Quantumprocessor", "An Extreme Circuit", - OrePrefixes.circuit.get(Materials.Data), + OrePrefixes.circuit.get(Materials.EV), SubTag.NO_UNIFICATION)); ItemList.Circuit_Quantumcomputer.set( @@ -577,7 +577,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_Quantumcomputer.ID, "Quantumprocessor Assembly", "An Elite Circuit", - OrePrefixes.circuit.get(Materials.Elite), + OrePrefixes.circuit.get(Materials.IV), SubTag.NO_UNIFICATION)); ItemList.Circuit_Masterquantumcomputer.set( @@ -585,7 +585,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_Masterquantumcomputer.ID, "Master Quantumcomputer", "A Master Circuit", - OrePrefixes.circuit.get(Materials.Master), + OrePrefixes.circuit.get(Materials.LuV), SubTag.NO_UNIFICATION)); ItemList.Circuit_Quantummainframe.set( @@ -593,7 +593,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_Quantummainframe.ID, "Quantumprocessor Mainframe", "An Ultimate Circuit", - OrePrefixes.circuit.get(Materials.Ultimate), + OrePrefixes.circuit.get(Materials.ZPM), SubTag.NO_UNIFICATION)); // Crystal circuits @@ -602,7 +602,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_Crystalprocessor.ID, "Crystalprocessor", "An Elite Circuit", - OrePrefixes.circuit.get(Materials.Elite), + OrePrefixes.circuit.get(Materials.IV), SubTag.NO_UNIFICATION)); ItemList.Circuit_Crystalcomputer.set( @@ -610,7 +610,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_Crystalcomputer.ID, "Crystalprocessor Assembly", "A Master Circuit", - OrePrefixes.circuit.get(Materials.Master), + OrePrefixes.circuit.get(Materials.LuV), SubTag.NO_UNIFICATION)); ItemList.Circuit_Ultimatecrystalcomputer.set( @@ -618,7 +618,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_Ultimatecrystalcomputer.ID, "Ultimate Crystalcomputer", "An Ultimate Circuit", - OrePrefixes.circuit.get(Materials.Ultimate), + OrePrefixes.circuit.get(Materials.ZPM), SubTag.NO_UNIFICATION)); ItemList.Circuit_Crystalmainframe.set( @@ -626,7 +626,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_Crystalmainframe.ID, "Crystalprocessor Mainframe", "A Super Circuit", - OrePrefixes.circuit.get(Materials.SuperconductorUHV), + OrePrefixes.circuit.get(Materials.UV), SubTag.NO_UNIFICATION)); // ???? Scared to remove. @@ -638,7 +638,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_Neuroprocessor.ID, "Wetwareprocessor", "A Master Circuit", - OrePrefixes.circuit.get(Materials.Master), + OrePrefixes.circuit.get(Materials.LuV), SubTag.NO_UNIFICATION)); ItemList.Circuit_Wetwarecomputer.set( @@ -646,7 +646,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_Wetwarecomputer.ID, "Wetwareprocessor Assembly", "An Ultimate Circuit", - OrePrefixes.circuit.get(Materials.Ultimate), + OrePrefixes.circuit.get(Materials.ZPM), SubTag.NO_UNIFICATION)); ItemList.Circuit_Wetwaresupercomputer.set( @@ -654,7 +654,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_Wetwaresupercomputer.ID, "Wetware Supercomputer", "A Super Circuit", - OrePrefixes.circuit.get(Materials.SuperconductorUHV), + OrePrefixes.circuit.get(Materials.UV), SubTag.NO_UNIFICATION)); ItemList.Circuit_Wetwaremainframe.set( @@ -662,7 +662,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_Wetwaremainframe.ID, "Wetware Mainframe", "An Infinite Circuit", - OrePrefixes.circuit.get(Materials.Infinite), + OrePrefixes.circuit.get(Materials.UHV), SubTag.NO_UNIFICATION)); // Bioware circuits. @@ -671,7 +671,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_Bioprocessor.ID, "Bioprocessor", "An Ultimate Circuit", - OrePrefixes.circuit.get(Materials.Ultimate), + OrePrefixes.circuit.get(Materials.ZPM), SubTag.NO_UNIFICATION)); ItemList.Circuit_Biowarecomputer.set( @@ -679,7 +679,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_Biowarecomputer.ID, "Biowareprocessor Assembly", "A Super Circuit", - OrePrefixes.circuit.get(Materials.SuperconductorUHV), + OrePrefixes.circuit.get(Materials.UV), SubTag.NO_UNIFICATION)); ItemList.Circuit_Biowaresupercomputer.set( @@ -687,7 +687,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_Biowaresupercomputer.ID, "Bioware Supercomputer", "An Infinite Circuit", - OrePrefixes.circuit.get(Materials.Infinite), + OrePrefixes.circuit.get(Materials.UHV), SubTag.NO_UNIFICATION)); ItemList.Circuit_Biomainframe.set( @@ -695,7 +695,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_Biomainframe.ID, "Bio Mainframe", "A Bio Circuit", - OrePrefixes.circuit.get(Materials.Bio), + OrePrefixes.circuit.get(Materials.UEV), SubTag.NO_UNIFICATION)); ItemList.Circuit_Board_Coated_Basic @@ -731,7 +731,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_OpticalProcessor.ID, "Optical Processor", "An Optical Circuit", - OrePrefixes.circuit.get(Materials.SuperconductorUHV), + OrePrefixes.circuit.get(Materials.UV), SubTag.NO_UNIFICATION)); ItemList.Circuit_OpticalAssembly.set( @@ -739,7 +739,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_OpticalAssembly.ID, "Optical Assembly", "An Optical Circuit", - OrePrefixes.circuit.get(Materials.Infinite), + OrePrefixes.circuit.get(Materials.UHV), SubTag.NO_UNIFICATION)); ItemList.Circuit_OpticalComputer.set( @@ -747,7 +747,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_OpticalComputer.ID, "Optical Computer", "An Optical Circuit", - OrePrefixes.circuit.get(Materials.Bio), + OrePrefixes.circuit.get(Materials.UEV), SubTag.NO_UNIFICATION)); ItemList.Circuit_OpticalMainframe.set( @@ -755,7 +755,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_OpticalMainframe.ID, "Optical Mainframe", "An Optical Circuit", - OrePrefixes.circuit.get(Materials.Optical), + OrePrefixes.circuit.get(Materials.UIV), SubTag.NO_UNIFICATION)); // Exotic circuits @@ -764,7 +764,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_ExoticProcessor.ID, "Exotic Processor", "An Exotic Circuit", - OrePrefixes.circuit.get(Materials.Infinite), + OrePrefixes.circuit.get(Materials.UHV), SubTag.NO_UNIFICATION)); ItemList.Circuit_ExoticAssembly.set( @@ -772,7 +772,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_ExoticAssembly.ID, "Exotic Assembly", "An Exotic Circuit", - OrePrefixes.circuit.get(Materials.Bio), + OrePrefixes.circuit.get(Materials.UEV), SubTag.NO_UNIFICATION)); ItemList.Circuit_ExoticComputer.set( @@ -780,7 +780,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_ExoticComputer.ID, "Exotic Computer", "An Exotic Circuit", - OrePrefixes.circuit.get(Materials.Optical), + OrePrefixes.circuit.get(Materials.UIV), SubTag.NO_UNIFICATION)); ItemList.Circuit_ExoticMainframe.set( @@ -788,7 +788,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_ExoticMainframe.ID, "Exotic Mainframe", "An Exotic Circuit", - OrePrefixes.circuit.get(Materials.Exotic), + OrePrefixes.circuit.get(Materials.UMV), SubTag.NO_UNIFICATION)); // Cosmic circuits @@ -797,7 +797,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_CosmicProcessor.ID, "Cosmic Processor", "A Cosmic Circuit", - OrePrefixes.circuit.get(Materials.Bio), + OrePrefixes.circuit.get(Materials.UEV), SubTag.NO_UNIFICATION)); ItemList.Circuit_CosmicAssembly.set( @@ -805,7 +805,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_CosmicAssembly.ID, "Cosmic Assembly", "A Cosmic Circuit", - OrePrefixes.circuit.get(Materials.Optical), + OrePrefixes.circuit.get(Materials.UIV), SubTag.NO_UNIFICATION)); ItemList.Circuit_CosmicComputer.set( @@ -813,7 +813,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_CosmicComputer.ID, "Cosmic Computer", "A Cosmic Circuit", - OrePrefixes.circuit.get(Materials.Exotic), + OrePrefixes.circuit.get(Materials.UMV), SubTag.NO_UNIFICATION)); ItemList.Circuit_CosmicMainframe.set( @@ -821,7 +821,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_CosmicMainframe.ID, "Cosmic Mainframe", "A Cosmic Circuit", - OrePrefixes.circuit.get(Materials.Cosmic), + OrePrefixes.circuit.get(Materials.UXV), SubTag.NO_UNIFICATION)); // Transcendent circuits @@ -830,7 +830,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_TranscendentProcessor.ID, "Temporally Transcendent Processor", "A circuit operating outside of known spacetime", - OrePrefixes.circuit.get(Materials.Optical), + OrePrefixes.circuit.get(Materials.UIV), SubTag.NO_UNIFICATION)); ItemList.Circuit_TranscendentAssembly.set( @@ -838,7 +838,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_TranscendentAssembly.ID, "Temporally Transcendent Assembly", "A circuit operating outside of known spacetime", - OrePrefixes.circuit.get(Materials.Exotic), + OrePrefixes.circuit.get(Materials.UMV), SubTag.NO_UNIFICATION)); ItemList.Circuit_TranscendentComputer.set( @@ -846,7 +846,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_TranscendentComputer.ID, "Temporally Transcendent Computer", "A circuit operating outside of known spacetime", - OrePrefixes.circuit.get(Materials.Cosmic), + OrePrefixes.circuit.get(Materials.UXV), SubTag.NO_UNIFICATION)); ItemList.Circuit_TranscendentMainframe.set( @@ -854,7 +854,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_TranscendentMainframe.ID, "Temporally Transcendent Mainframe", "A circuit operating outside of known spacetime", - OrePrefixes.circuit.get(Materials.Transcendent), + OrePrefixes.circuit.get(Materials.MAX), SubTag.NO_UNIFICATION)); ItemList.Tube_Wires.set(addItem(Tube_Wires.ID, "Tube Wires", "For the Vacuum Tubes", o)); |