From aaf88d87a2111ced5c381a016dbed6c136edb7fc Mon Sep 17 00:00:00 2001 From: chochem <40274384+chochem@users.noreply.github.com> Date: Sun, 4 Aug 2024 05:49:03 +0100 Subject: 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 --- src/main/java/gregtech/api/enums/Materials.java | 20 +- src/main/java/gregtech/api/enums/Tier.java | 64 ++-- .../GT_MetaTileEntity_Hatch_Maintenance.java | 2 +- .../common/items/GT_IntegratedCircuit_Item.java | 2 +- .../common/items/GT_MetaGenerated_Item_01.java | 52 +-- .../common/items/GT_MetaGenerated_Item_02.java | 4 +- .../common/items/GT_MetaGenerated_Item_03.java | 78 ++--- .../load/GT_Loader_MetaTileEntities_Recipes.java | 385 ++++++++++----------- .../gregtech/loaders/misc/GT_Achievements.java | 3 - .../loaders/postload/GT_CraftingRecipeLoader.java | 82 ++--- .../loaders/postload/chains/GT_NaniteChain.java | 4 +- .../postload/chains/GT_PCBFactoryRecipes.java | 2 +- .../loaders/postload/recipes/AssemblerRecipes.java | 44 +-- .../postload/recipes/AssemblyLineRecipes.java | 94 ++--- .../postload/recipes/CircuitAssemblerRecipes.java | 34 +- .../postload/recipes/ThaumcraftRecipes.java | 27 +- .../loaders/preload/GT_Loader_OreDictionary.java | 45 ++- 17 files changed, 467 insertions(+), 475 deletions(-) (limited to 'src/main/java/gregtech') diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java index 2435e1aad7..6bdf6cb776 100644 --- a/src/main/java/gregtech/api/enums/Materials.java +++ b/src/main/java/gregtech/api/enums/Materials.java @@ -348,6 +348,8 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { public static Materials Vyroxeres = new Materials( 951, TextureSet.SET_METALLIC , 32.0F, 7680, 1, 1|2 |8 |64 , 85, 224, 1, 0, "Vyroxeres" , "Vyroxeres" , 0, 0, 5400, 5400, true, false, 1, 1, 1, Dyes._NULL ).disableAutoGeneratedBlastFurnaceRecipes().setTurbineMultipliers(1, 3, 1); public static Materials Yellorium = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1|2 , 255, 255, 255, 0, "Yellorium" , "Yellorium" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes.dyeYellow ); public static Materials Zectium = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1|2 |8 , 255, 255, 255, 0, "Zectium" , "Zectium" , 0, 0, -1, 0, false, false, 3, 1, 1, Dyes.dyeBlack ); + public static Materials Ultimate = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 0, 0 , 255, 255, 255, 0, "Ultimate" , "Ultimate" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray , Collections.singletonList(new TC_AspectStack(TC_Aspects.MACHINA, 8))); + public static Materials Advanced = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 0, 0 , 255, 255, 255, 0, "Advanced" , "Advanced" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray , Collections.singletonList(new TC_AspectStack(TC_Aspects.MACHINA, 4))); /** * Tiered materials, primarily Circuitry, Batteries and other Technical things @@ -360,13 +362,13 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { public static Materials IV = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 0, 0 , 255, 255, 255, 0, "Elite" , "Elite" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray , Collections.singletonList(new TC_AspectStack(TC_Aspects.MACHINA, 6))); public static Materials LuV = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 0, 0 , 255, 255, 255, 0, "Master" , "Master" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray , Collections.singletonList(new TC_AspectStack(TC_Aspects.MACHINA, 7))); public static Materials ZPM = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 0, 0 , 255, 255, 255, 0, "Ultimate" , "Ultimate" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray , Collections.singletonList(new TC_AspectStack(TC_Aspects.MACHINA, 8))); - public static Materials UV = Materials.SuperconductorUHV; //I hate this - public static Materials UHV = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 0, 0 , 255, 255, 255, 0, "Infinite" , "Infinite" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray , Collections.singletonList(new TC_AspectStack(TC_Aspects.ELECTRUM, 9))); - public static Materials UEV = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 0, 0 , 255, 255, 255, 0, "Bio" , "Bio" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray , Collections.singletonList(new TC_AspectStack(TC_Aspects.ELECTRUM, 10))); - public static Materials UIV = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 0, 0 , 255, 255, 255, 0, "Optical" , "Optical" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray , Collections.singletonList(new TC_AspectStack(TC_Aspects.ELECTRUM, 13))); - public static Materials UMV = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 0, 0 , 255, 255, 255, 0, "Exotic" , "Exotic" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray , Collections.singletonList(new TC_AspectStack(TC_Aspects.ELECTRUM, 14))); - public static Materials UXV = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 0, 0 , 255, 255, 255, 0, "Cosmic" , "Cosmic" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray , Collections.singletonList(new TC_AspectStack(TC_Aspects.ELECTRUM, 15))); - public static Materials MAX = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 0, 0 , 255, 255, 255, 0, "Transcendent" , "Transcendent" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray , Collections.singletonList(new TC_AspectStack(TC_Aspects.ELECTRUM, 16))); + public static Materials UV = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 0, 0 , 255, 255, 255, 0, "Superconductor" , "Superconductor" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray , Collections.singletonList(new TC_AspectStack(TC_Aspects.MACHINA, 9))); + public static Materials UHV = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 0, 0 , 255, 255, 255, 0, "Infinite" , "Infinite" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray , Collections.singletonList(new TC_AspectStack(TC_Aspects.ELECTRUM, 10))); + public static Materials UEV = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 0, 0 , 255, 255, 255, 0, "Bio" , "Bio" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray , Collections.singletonList(new TC_AspectStack(TC_Aspects.ELECTRUM, 11))); + public static Materials UIV = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 0, 0 , 255, 255, 255, 0, "Optical" , "Optical" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray , Collections.singletonList(new TC_AspectStack(TC_Aspects.ELECTRUM, 12))); + public static Materials UMV = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 0, 0 , 255, 255, 255, 0, "Exotic" , "Exotic" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray , Collections.singletonList(new TC_AspectStack(TC_Aspects.ELECTRUM, 13))); + public static Materials UXV = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 0, 0 , 255, 255, 255, 0, "Cosmic" , "Cosmic" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray , Collections.singletonList(new TC_AspectStack(TC_Aspects.ELECTRUM, 14))); + public static Materials MAX = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 0, 0 , 255, 255, 255, 0, "Transcendent" , "Transcendent" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray , Collections.singletonList(new TC_AspectStack(TC_Aspects.ELECTRUM, 15))); public static Materials Resistor = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 0, 0 , 255, 255, 255, 0, "Resistor" , "Resistor" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray , Collections.singletonList(new TC_AspectStack(TC_Aspects.ELECTRUM, 1))); public static Materials Diode = new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 0, 0 , 255, 255, 255, 0, "Diode" , "Diode" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray , Collections.singletonList(new TC_AspectStack(TC_Aspects.ELECTRUM, 1))); @@ -389,16 +391,12 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { @Deprecated public static Materials Good = Materials.MV; @Deprecated - public static Materials Advanced = Materials.HV; - @Deprecated public static Materials Data = Materials.EV; @Deprecated public static Materials Elite = Materials.IV; @Deprecated public static Materials Master = Materials.LuV; @Deprecated - public static Materials Ultimate = Materials.ZPM; - @Deprecated public static Materials Infinite = Materials.UHV; @Deprecated public static Materials Bio = Materials.UEV; diff --git a/src/main/java/gregtech/api/enums/Tier.java b/src/main/java/gregtech/api/enums/Tier.java index 84e8344334..2d64444283 100644 --- a/src/main/java/gregtech/api/enums/Tier.java +++ b/src/main/java/gregtech/api/enums/Tier.java @@ -19,8 +19,8 @@ public class Tier { ItemList.Hull_ULV, OrePrefixes.cableGt01.get(Materials.Lead), OrePrefixes.cableGt04.get(Materials.Lead), - OrePrefixes.circuit.get(Materials.Primitive), - OrePrefixes.circuit.get(Materials.Basic)), + OrePrefixes.circuit.get(Materials.ULV), + OrePrefixes.circuit.get(Materials.LV)), new Tier( SubTag.ENERGY_ELECTRICITY, 1, @@ -32,8 +32,8 @@ public class Tier { ItemList.Hull_LV, OrePrefixes.cableGt01.get(Materials.Tin), OrePrefixes.cableGt04.get(Materials.Tin), - OrePrefixes.circuit.get(Materials.Basic), - OrePrefixes.circuit.get(Materials.Good)), + OrePrefixes.circuit.get(Materials.LV), + OrePrefixes.circuit.get(Materials.MV)), new Tier( SubTag.ENERGY_ELECTRICITY, 2, @@ -45,8 +45,8 @@ public class Tier { ItemList.Hull_MV, OrePrefixes.cableGt01.get(Materials.AnyCopper), OrePrefixes.cableGt04.get(Materials.AnyCopper), - OrePrefixes.circuit.get(Materials.Good), - OrePrefixes.circuit.get(Materials.Advanced)), + OrePrefixes.circuit.get(Materials.MV), + OrePrefixes.circuit.get(Materials.HV)), new Tier( SubTag.ENERGY_ELECTRICITY, 3, @@ -58,8 +58,8 @@ public class Tier { ItemList.Hull_HV, OrePrefixes.cableGt01.get(Materials.Gold), OrePrefixes.cableGt04.get(Materials.Gold), - OrePrefixes.circuit.get(Materials.Advanced), - OrePrefixes.circuit.get(Materials.Data)), + OrePrefixes.circuit.get(Materials.HV), + OrePrefixes.circuit.get(Materials.EV)), new Tier( SubTag.ENERGY_ELECTRICITY, 4, @@ -71,8 +71,8 @@ public class Tier { ItemList.Hull_EV, OrePrefixes.cableGt01.get(Materials.Aluminium), OrePrefixes.cableGt04.get(Materials.Aluminium), - OrePrefixes.circuit.get(Materials.Data), - OrePrefixes.circuit.get(Materials.Elite)), + OrePrefixes.circuit.get(Materials.EV), + OrePrefixes.circuit.get(Materials.IV)), new Tier( SubTag.ENERGY_ELECTRICITY, 5, @@ -84,8 +84,8 @@ public class Tier { ItemList.Hull_IV, OrePrefixes.cableGt01.get(Materials.Platinum), OrePrefixes.cableGt04.get(Materials.Platinum), - OrePrefixes.circuit.get(Materials.Elite), - OrePrefixes.circuit.get(Materials.Master)), + OrePrefixes.circuit.get(Materials.IV), + OrePrefixes.circuit.get(Materials.LuV)), new Tier( SubTag.ENERGY_ELECTRICITY, 6, @@ -97,8 +97,8 @@ public class Tier { ItemList.Hull_LuV, OrePrefixes.cableGt01.get(Materials.NiobiumTitanium), OrePrefixes.cableGt04.get(Materials.NiobiumTitanium), - OrePrefixes.circuit.get(Materials.Master), - OrePrefixes.circuit.get(Materials.Ultimate)), + OrePrefixes.circuit.get(Materials.LuV), + OrePrefixes.circuit.get(Materials.ZPM)), new Tier( SubTag.ENERGY_ELECTRICITY, 7, @@ -110,8 +110,8 @@ public class Tier { ItemList.Hull_ZPM, OrePrefixes.cableGt01.get(Materials.Naquadah), OrePrefixes.cableGt04.get(Materials.Naquadah), - OrePrefixes.circuit.get(Materials.Ultimate), - OrePrefixes.circuit.get(Materials.SuperconductorUHV)), + OrePrefixes.circuit.get(Materials.ZPM), + OrePrefixes.circuit.get(Materials.UV)), new Tier( SubTag.ENERGY_ELECTRICITY, 8, @@ -123,8 +123,8 @@ public class Tier { ItemList.Hull_UV, OrePrefixes.cableGt04.get(Materials.NaquadahAlloy), OrePrefixes.wireGt01.get(Materials.SuperconductorUHV), - OrePrefixes.circuit.get(Materials.SuperconductorUHV), - OrePrefixes.circuit.get(Materials.Infinite)), + OrePrefixes.circuit.get(Materials.UV), + OrePrefixes.circuit.get(Materials.UHV)), new Tier( SubTag.ENERGY_ELECTRICITY, 9, @@ -136,8 +136,8 @@ public class Tier { ItemList.Hull_MAX, OrePrefixes.wireGt01.get(Materials.SuperconductorUHV), OrePrefixes.wireGt04.get(Materials.SuperconductorUHV), - OrePrefixes.circuit.get(Materials.Infinite), - OrePrefixes.circuit.get(Materials.Infinite)), + OrePrefixes.circuit.get(Materials.UHV), + OrePrefixes.circuit.get(Materials.UHV)), new Tier( SubTag.ENERGY_ELECTRICITY, 10, @@ -149,8 +149,8 @@ public class Tier { ItemList.Hull_MAX, OrePrefixes.wireGt01.get(Materials.SuperconductorUHV), OrePrefixes.wireGt04.get(Materials.SuperconductorUHV), - OrePrefixes.circuit.get(Materials.Infinite), - OrePrefixes.circuit.get(Materials.Infinite)), + OrePrefixes.circuit.get(Materials.UHV), + OrePrefixes.circuit.get(Materials.UHV)), new Tier( SubTag.ENERGY_ELECTRICITY, 11, @@ -162,8 +162,8 @@ public class Tier { ItemList.Hull_MAX, OrePrefixes.wireGt01.get(Materials.SuperconductorUHV), OrePrefixes.wireGt04.get(Materials.SuperconductorUHV), - OrePrefixes.circuit.get(Materials.Infinite), - OrePrefixes.circuit.get(Materials.Infinite)), + OrePrefixes.circuit.get(Materials.UHV), + OrePrefixes.circuit.get(Materials.UHV)), new Tier( SubTag.ENERGY_ELECTRICITY, 12, @@ -175,8 +175,8 @@ public class Tier { ItemList.Hull_MAX, OrePrefixes.wireGt01.get(Materials.SuperconductorUHV), OrePrefixes.wireGt04.get(Materials.SuperconductorUHV), - OrePrefixes.circuit.get(Materials.Infinite), - OrePrefixes.circuit.get(Materials.Infinite)), + OrePrefixes.circuit.get(Materials.UHV), + OrePrefixes.circuit.get(Materials.UHV)), new Tier( SubTag.ENERGY_ELECTRICITY, 13, @@ -188,8 +188,8 @@ public class Tier { ItemList.Hull_MAX, OrePrefixes.wireGt01.get(Materials.SuperconductorUHV), OrePrefixes.wireGt04.get(Materials.SuperconductorUHV), - OrePrefixes.circuit.get(Materials.Infinite), - OrePrefixes.circuit.get(Materials.Infinite)), + OrePrefixes.circuit.get(Materials.UHV), + OrePrefixes.circuit.get(Materials.UHV)), new Tier( SubTag.ENERGY_ELECTRICITY, 14, @@ -201,8 +201,8 @@ public class Tier { ItemList.Hull_MAX, OrePrefixes.wireGt01.get(Materials.SuperconductorUHV), OrePrefixes.wireGt04.get(Materials.SuperconductorUHV), - OrePrefixes.circuit.get(Materials.Infinite), - OrePrefixes.circuit.get(Materials.Infinite)), + OrePrefixes.circuit.get(Materials.UHV), + OrePrefixes.circuit.get(Materials.UHV)), new Tier( SubTag.ENERGY_ELECTRICITY, 15, @@ -214,8 +214,8 @@ public class Tier { ItemList.Hull_MAX, OrePrefixes.wireGt01.get(Materials.SuperconductorUHV), OrePrefixes.wireGt04.get(Materials.SuperconductorUHV), - OrePrefixes.circuit.get(Materials.Infinite), - OrePrefixes.circuit.get(Materials.Infinite)), + OrePrefixes.circuit.get(Materials.UHV), + OrePrefixes.circuit.get(Materials.UHV)), // READ GT_VALUES CLASS BEFORE YOU START ADDING STUFF TO TIERS 8+ - and probably dont do it in // GT but in GTNH core mod - that way we shouldnt need to set the tier class diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Maintenance.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Maintenance.java index e1b5ee8f03..cdd289221a 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Maintenance.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Maintenance.java @@ -83,7 +83,7 @@ public class GT_MetaTileEntity_Hatch_Maintenance extends GT_MetaTileEntity_Hatch if (sAutoMaintenanceInputs == null) sAutoMaintenanceInputs = new ItemStack[] { ItemList.Duct_Tape.get(4), GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Lubricant, 2), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 4), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 2) }; + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 2) }; return sAutoMaintenanceInputs; } diff --git a/src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java b/src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java index 0dc5000e7a..d0ef03a1ae 100644 --- a/src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java +++ b/src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java @@ -69,7 +69,7 @@ public class GT_IntegratedCircuit_Item extends GT_Generic_Item implements INetwo GT_ModHandler.addShapelessCraftingRecipe( ItemList.Circuit_Integrated.getWithDamage(1L, 0L), GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { OrePrefixes.circuit.get(Materials.Basic) }); + new Object[] { OrePrefixes.circuit.get(Materials.LV) }); long bits = GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE; GT_ModHandler.addCraftingRecipe( ItemList.Circuit_Integrated.getWithDamage(1L, 1L), diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java index d603d7b004..549081c4cb 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java @@ -1443,7 +1443,7 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 16L), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 16L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 16L), - OrePrefixes.battery.get(Materials.Ultimate))); + OrePrefixes.battery.get(Materials.ZPM))); // ZPM Module ItemList.ZPM.set( @@ -1466,7 +1466,7 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 16L), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 16L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 16L), - OrePrefixes.battery.get(Materials.Ultimate))); + OrePrefixes.battery.get(Materials.ZPM))); // UV Battery ItemList.ZPM2.set( @@ -1533,7 +1533,7 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 16L), new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 16L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 16L), - OrePrefixes.battery.get(Materials.Ultimate))); + OrePrefixes.battery.get(Materials.ZPM))); // UV Cluster ItemList.Energy_Cluster.set( @@ -2643,49 +2643,49 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { Circuit_Primitive.ID, "Vacuum Tube", "A very simple Circuit", - OrePrefixes.circuit.get(Materials.Primitive), + OrePrefixes.circuit.get(Materials.ULV), SubTag.NO_UNIFICATION)); ItemList.Circuit_Basic.set( addItem( Circuit_Basic.ID, "Integrated Logic Circuit", "A Basic Circuit", - OrePrefixes.circuit.get(Materials.Basic), + OrePrefixes.circuit.get(Materials.LV), SubTag.NO_UNIFICATION)); ItemList.Circuit_Good.set( addItem( Circuit_Good.ID, "Good Electronic Circuit", "A Good Circuit", - OrePrefixes.circuit.get(Materials.Good), + OrePrefixes.circuit.get(Materials.MV), SubTag.NO_UNIFICATION)); ItemList.Circuit_Advanced.set( addItem( Circuit_Advanced.ID, "Processor Assembly", "An Advanced Circuit", - OrePrefixes.circuit.get(Materials.Advanced), + OrePrefixes.circuit.get(Materials.HV), SubTag.NO_UNIFICATION)); ItemList.Circuit_Data.set( addItem( Circuit_Data.ID, "Workstation", "An Extreme Circuit", - OrePrefixes.circuit.get(Materials.Data), + OrePrefixes.circuit.get(Materials.EV), SubTag.NO_UNIFICATION)); ItemList.Circuit_Elite.set( addItem( Circuit_Elite.ID, "Mainframe", "An Elite Circuit", - OrePrefixes.circuit.get(Materials.Elite), + OrePrefixes.circuit.get(Materials.IV), SubTag.NO_UNIFICATION)); ItemList.Circuit_Master.set( addItem( Circuit_Master.ID, "Nanoprocessor Mainframe", "A Master Circuit", - OrePrefixes.circuit.get(Materials.Master), + OrePrefixes.circuit.get(Materials.LuV), SubTag.NO_UNIFICATION)); // Backwards compatibility. @@ -4468,70 +4468,70 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[] { "CCC", "MSM", "PES", 'S', OrePrefixes.stick.get(Materials.Steel), 'M', ItemList.Electric_Motor_LV, 'P', ItemList.Electric_Piston_LV, 'E', - OrePrefixes.circuit.get(Materials.Basic), 'C', OrePrefixes.cableGt01.get(Materials.Tin) }); + OrePrefixes.circuit.get(Materials.LV), 'C', OrePrefixes.cableGt01.get(Materials.Tin) }); GT_ModHandler.addCraftingRecipe( ItemList.Robot_Arm_MV.get(1L), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[] { "CCC", "MSM", "PES", 'S', OrePrefixes.stick.get(Materials.Aluminium), 'M', ItemList.Electric_Motor_MV, 'P', ItemList.Electric_Piston_MV, 'E', - OrePrefixes.circuit.get(Materials.Good), 'C', OrePrefixes.cableGt01.get(Materials.AnyCopper) }); + OrePrefixes.circuit.get(Materials.MV), 'C', OrePrefixes.cableGt01.get(Materials.AnyCopper) }); GT_ModHandler.addCraftingRecipe( ItemList.Robot_Arm_HV.get(1L), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[] { "CCC", "MSM", "PES", 'S', OrePrefixes.stick.get(Materials.StainlessSteel), 'M', ItemList.Electric_Motor_HV, 'P', ItemList.Electric_Piston_HV, 'E', - OrePrefixes.circuit.get(Materials.Advanced), 'C', OrePrefixes.cableGt01.get(Materials.Gold) }); + OrePrefixes.circuit.get(Materials.HV), 'C', OrePrefixes.cableGt01.get(Materials.Gold) }); GT_ModHandler.addCraftingRecipe( ItemList.Robot_Arm_EV.get(1L), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[] { "CCC", "MSM", "PES", 'S', OrePrefixes.stick.get(Materials.Titanium), 'M', ItemList.Electric_Motor_EV, 'P', ItemList.Electric_Piston_EV, 'E', - OrePrefixes.circuit.get(Materials.Data), 'C', OrePrefixes.cableGt01.get(Materials.Aluminium) }); + OrePrefixes.circuit.get(Materials.EV), 'C', OrePrefixes.cableGt01.get(Materials.Aluminium) }); GT_ModHandler.addCraftingRecipe( ItemList.Robot_Arm_IV.get(1L), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[] { "CCC", "MSM", "PES", 'S', OrePrefixes.stick.get(Materials.TungstenSteel), 'M', ItemList.Electric_Motor_IV, 'P', ItemList.Electric_Piston_IV, 'E', - OrePrefixes.circuit.get(Materials.Elite), 'C', OrePrefixes.cableGt01.get(Materials.Tungsten) }); + OrePrefixes.circuit.get(Materials.IV), 'C', OrePrefixes.cableGt01.get(Materials.Tungsten) }); GT_ModHandler.addCraftingRecipe( ItemList.Emitter_LV.get(1L), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[] { "SSC", "WQS", "CWS", 'Q', OrePrefixes.gem.get(Materials.CertusQuartz), 'S', - OrePrefixes.stick.get(Materials.Brass), 'C', OrePrefixes.circuit.get(Materials.Basic), 'W', + OrePrefixes.stick.get(Materials.Brass), 'C', OrePrefixes.circuit.get(Materials.LV), 'W', OrePrefixes.cableGt01.get(Materials.Tin) }); GT_ModHandler.addCraftingRecipe( ItemList.Emitter_MV.get(1L), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[] { "SSC", "WQS", "CWS", 'Q', OrePrefixes.gem.get(Materials.EnderPearl), 'S', - OrePrefixes.stick.get(Materials.Electrum), 'C', OrePrefixes.circuit.get(Materials.Good), 'W', + OrePrefixes.stick.get(Materials.Electrum), 'C', OrePrefixes.circuit.get(Materials.MV), 'W', OrePrefixes.cableGt01.get(Materials.AnyCopper) }); GT_ModHandler.addCraftingRecipe( ItemList.Emitter_HV.get(1L), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[] { "SSC", "WQS", "CWS", 'Q', OrePrefixes.gem.get(Materials.EnderEye), 'S', - OrePrefixes.stick.get(Materials.Chrome), 'C', OrePrefixes.circuit.get(Materials.Advanced), 'W', + OrePrefixes.stick.get(Materials.Chrome), 'C', OrePrefixes.circuit.get(Materials.HV), 'W', OrePrefixes.cableGt01.get(Materials.Gold) }); GT_ModHandler.addCraftingRecipe( ItemList.Emitter_EV.get(1L), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[] { "SSC", "WQS", "CWS", 'Q', ItemList.QuantumEye, 'S', - OrePrefixes.stick.get(Materials.Platinum), 'C', OrePrefixes.circuit.get(Materials.Data), 'W', + OrePrefixes.stick.get(Materials.Platinum), 'C', OrePrefixes.circuit.get(Materials.EV), 'W', OrePrefixes.cableGt01.get(Materials.Aluminium) }); GT_ModHandler.addCraftingRecipe( ItemList.Emitter_IV.get(1L), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[] { "SSC", "WQS", "CWS", 'Q', ItemList.QuantumStar, 'S', - OrePrefixes.stick.get(Materials.Iridium), 'C', OrePrefixes.circuit.get(Materials.Elite), 'W', + OrePrefixes.stick.get(Materials.Iridium), 'C', OrePrefixes.circuit.get(Materials.IV), 'W', OrePrefixes.cableGt01.get(Materials.Tungsten) }); GT_ModHandler.addCraftingRecipe( @@ -4540,35 +4540,35 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[] { "P Q", "PS ", "CPP", 'Q', OrePrefixes.gem.get(Materials.CertusQuartz), 'S', OrePrefixes.stick.get(Materials.Brass), 'P', OrePrefixes.plate.get(Materials.Steel), 'C', - OrePrefixes.circuit.get(Materials.Basic) }); + OrePrefixes.circuit.get(Materials.LV) }); GT_ModHandler.addCraftingRecipe( ItemList.Sensor_MV.get(1L), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[] { "P Q", "PS ", "CPP", 'Q', OrePrefixes.gemFlawless.get(Materials.Emerald), 'S', OrePrefixes.stick.get(Materials.Electrum), 'P', OrePrefixes.plate.get(Materials.Aluminium), 'C', - OrePrefixes.circuit.get(Materials.Good) }); + OrePrefixes.circuit.get(Materials.MV) }); GT_ModHandler.addCraftingRecipe( ItemList.Sensor_HV.get(1L), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[] { "P Q", "PS ", "CPP", 'Q', OrePrefixes.gem.get(Materials.EnderEye), 'S', OrePrefixes.stick.get(Materials.Chrome), 'P', OrePrefixes.plate.get(Materials.StainlessSteel), 'C', - OrePrefixes.circuit.get(Materials.Advanced) }); + OrePrefixes.circuit.get(Materials.HV) }); GT_ModHandler.addCraftingRecipe( ItemList.Sensor_EV.get(1L), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[] { "P Q", "PS ", "CPP", 'Q', ItemList.QuantumEye, 'S', OrePrefixes.stick.get(Materials.Platinum), 'P', OrePrefixes.plate.get(Materials.Titanium), 'C', - OrePrefixes.circuit.get(Materials.Data) }); + OrePrefixes.circuit.get(Materials.EV) }); GT_ModHandler.addCraftingRecipe( ItemList.Sensor_IV.get(1L), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[] { "P Q", "PS ", "CPP", 'Q', ItemList.QuantumStar, 'S', OrePrefixes.stick.get(Materials.Iridium), 'P', OrePrefixes.plate.get(Materials.TungstenSteel), 'C', - OrePrefixes.circuit.get(Materials.Elite) }); + OrePrefixes.circuit.get(Materials.IV) }); GT_ModHandler.addCraftingRecipe( ItemList.Component_Sawblade_Diamond.get(1L), @@ -4601,7 +4601,7 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { ItemList.Tool_Scanner.get(1L), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "EPR", "CSC", "PBP", 'C', OrePrefixes.circuit.get(Materials.Advanced), 'P', + new Object[] { "EPR", "CSC", "PBP", 'C', OrePrefixes.circuit.get(Materials.HV), 'P', OrePrefixes.plate.get(Materials.Aluminium), 'E', ItemList.Emitter_MV, 'R', ItemList.Sensor_MV, 'S', ItemList.Cover_Screen, 'B', ItemList.Battery_RE_MV_Lithium }); diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java index d1e657c2c8..d4a4b184a0 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java @@ -2531,7 +2531,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { RA.stdBuilder() .itemInputs( ItemList.Cover_RedstoneTransmitterExternal.get(1L), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Data, 1L), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.EV, 1L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Cover_AdvancedRedstoneTransmitterExternal.get(1L)) .duration(2 * MINUTES + 40 * SECONDS) @@ -2540,7 +2540,7 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { RA.stdBuilder() .itemInputs( ItemList.Cover_RedstoneReceiverExternal.get(1L), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Data, 1L), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.EV, 1L), GT_Utility.getIntegratedCircuit(1)) .itemOutputs(ItemList.Cover_AdvancedRedstoneReceiverExternal.get(1L)) .duration(2 * MINUTES + 40 * SECONDS) diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java index 52a268baf9..29a99fc671 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java @@ -504,7 +504,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { NandChip.ID, "NAND Chip", "A very simple Circuit", - OrePrefixes.circuit.get(Materials.Primitive), + OrePrefixes.circuit.get(Materials.ULV), SubTag.NO_UNIFICATION)); // Vacuum Tube Item01 @@ -517,7 +517,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_Integrated_Good.ID, "Good Integrated Circuit", "Good Circuit", - OrePrefixes.circuit.get(Materials.Good), + OrePrefixes.circuit.get(Materials.MV), SubTag.NO_UNIFICATION)); // Good Integrated Circuit Item01 @@ -528,7 +528,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_Microprocessor.ID, "Microprocessor", "A Basic Circuit", - OrePrefixes.circuit.get(Materials.Basic), + OrePrefixes.circuit.get(Materials.LV), SubTag.NO_UNIFICATION)); ItemList.Circuit_Processor.set( @@ -536,7 +536,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_Processor.ID, "Integrated Processor", "A Good Circuit", - OrePrefixes.circuit.get(Materials.Good), + OrePrefixes.circuit.get(Materials.MV), SubTag.NO_UNIFICATION)); ItemList.Circuit_Nanoprocessor.set( @@ -544,7 +544,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_Nanoprocessor.ID, "Nanoprocessor", "An Advanced Circuit", - OrePrefixes.circuit.get(Materials.Advanced), + OrePrefixes.circuit.get(Materials.HV), SubTag.NO_UNIFICATION)); ItemList.Circuit_Nanocomputer.set( @@ -552,7 +552,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_Nanocomputer.ID, "Nanoprocessor Assembly", "An Extreme Circuit", - OrePrefixes.circuit.get(Materials.Data), + OrePrefixes.circuit.get(Materials.EV), SubTag.NO_UNIFICATION)); ItemList.Circuit_Elitenanocomputer.set( @@ -560,7 +560,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_Elitenanocomputer.ID, "Elite Nanocomputer", "An Elite Circuit", - OrePrefixes.circuit.get(Materials.Elite), + OrePrefixes.circuit.get(Materials.IV), SubTag.NO_UNIFICATION)); // Quantum circuits @@ -569,7 +569,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_Quantumprocessor.ID, "Quantumprocessor", "An Extreme Circuit", - OrePrefixes.circuit.get(Materials.Data), + OrePrefixes.circuit.get(Materials.EV), SubTag.NO_UNIFICATION)); ItemList.Circuit_Quantumcomputer.set( @@ -577,7 +577,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_Quantumcomputer.ID, "Quantumprocessor Assembly", "An Elite Circuit", - OrePrefixes.circuit.get(Materials.Elite), + OrePrefixes.circuit.get(Materials.IV), SubTag.NO_UNIFICATION)); ItemList.Circuit_Masterquantumcomputer.set( @@ -585,7 +585,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_Masterquantumcomputer.ID, "Master Quantumcomputer", "A Master Circuit", - OrePrefixes.circuit.get(Materials.Master), + OrePrefixes.circuit.get(Materials.LuV), SubTag.NO_UNIFICATION)); ItemList.Circuit_Quantummainframe.set( @@ -593,7 +593,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_Quantummainframe.ID, "Quantumprocessor Mainframe", "An Ultimate Circuit", - OrePrefixes.circuit.get(Materials.Ultimate), + OrePrefixes.circuit.get(Materials.ZPM), SubTag.NO_UNIFICATION)); // Crystal circuits @@ -602,7 +602,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_Crystalprocessor.ID, "Crystalprocessor", "An Elite Circuit", - OrePrefixes.circuit.get(Materials.Elite), + OrePrefixes.circuit.get(Materials.IV), SubTag.NO_UNIFICATION)); ItemList.Circuit_Crystalcomputer.set( @@ -610,7 +610,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_Crystalcomputer.ID, "Crystalprocessor Assembly", "A Master Circuit", - OrePrefixes.circuit.get(Materials.Master), + OrePrefixes.circuit.get(Materials.LuV), SubTag.NO_UNIFICATION)); ItemList.Circuit_Ultimatecrystalcomputer.set( @@ -618,7 +618,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_Ultimatecrystalcomputer.ID, "Ultimate Crystalcomputer", "An Ultimate Circuit", - OrePrefixes.circuit.get(Materials.Ultimate), + OrePrefixes.circuit.get(Materials.ZPM), SubTag.NO_UNIFICATION)); ItemList.Circuit_Crystalmainframe.set( @@ -626,7 +626,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_Crystalmainframe.ID, "Crystalprocessor Mainframe", "A Super Circuit", - OrePrefixes.circuit.get(Materials.SuperconductorUHV), + OrePrefixes.circuit.get(Materials.UV), SubTag.NO_UNIFICATION)); // ???? Scared to remove. @@ -638,7 +638,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_Neuroprocessor.ID, "Wetwareprocessor", "A Master Circuit", - OrePrefixes.circuit.get(Materials.Master), + OrePrefixes.circuit.get(Materials.LuV), SubTag.NO_UNIFICATION)); ItemList.Circuit_Wetwarecomputer.set( @@ -646,7 +646,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_Wetwarecomputer.ID, "Wetwareprocessor Assembly", "An Ultimate Circuit", - OrePrefixes.circuit.get(Materials.Ultimate), + OrePrefixes.circuit.get(Materials.ZPM), SubTag.NO_UNIFICATION)); ItemList.Circuit_Wetwaresupercomputer.set( @@ -654,7 +654,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_Wetwaresupercomputer.ID, "Wetware Supercomputer", "A Super Circuit", - OrePrefixes.circuit.get(Materials.SuperconductorUHV), + OrePrefixes.circuit.get(Materials.UV), SubTag.NO_UNIFICATION)); ItemList.Circuit_Wetwaremainframe.set( @@ -662,7 +662,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_Wetwaremainframe.ID, "Wetware Mainframe", "An Infinite Circuit", - OrePrefixes.circuit.get(Materials.Infinite), + OrePrefixes.circuit.get(Materials.UHV), SubTag.NO_UNIFICATION)); // Bioware circuits. @@ -671,7 +671,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_Bioprocessor.ID, "Bioprocessor", "An Ultimate Circuit", - OrePrefixes.circuit.get(Materials.Ultimate), + OrePrefixes.circuit.get(Materials.ZPM), SubTag.NO_UNIFICATION)); ItemList.Circuit_Biowarecomputer.set( @@ -679,7 +679,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_Biowarecomputer.ID, "Biowareprocessor Assembly", "A Super Circuit", - OrePrefixes.circuit.get(Materials.SuperconductorUHV), + OrePrefixes.circuit.get(Materials.UV), SubTag.NO_UNIFICATION)); ItemList.Circuit_Biowaresupercomputer.set( @@ -687,7 +687,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_Biowaresupercomputer.ID, "Bioware Supercomputer", "An Infinite Circuit", - OrePrefixes.circuit.get(Materials.Infinite), + OrePrefixes.circuit.get(Materials.UHV), SubTag.NO_UNIFICATION)); ItemList.Circuit_Biomainframe.set( @@ -695,7 +695,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_Biomainframe.ID, "Bio Mainframe", "A Bio Circuit", - OrePrefixes.circuit.get(Materials.Bio), + OrePrefixes.circuit.get(Materials.UEV), SubTag.NO_UNIFICATION)); ItemList.Circuit_Board_Coated_Basic @@ -731,7 +731,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_OpticalProcessor.ID, "Optical Processor", "An Optical Circuit", - OrePrefixes.circuit.get(Materials.SuperconductorUHV), + OrePrefixes.circuit.get(Materials.UV), SubTag.NO_UNIFICATION)); ItemList.Circuit_OpticalAssembly.set( @@ -739,7 +739,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_OpticalAssembly.ID, "Optical Assembly", "An Optical Circuit", - OrePrefixes.circuit.get(Materials.Infinite), + OrePrefixes.circuit.get(Materials.UHV), SubTag.NO_UNIFICATION)); ItemList.Circuit_OpticalComputer.set( @@ -747,7 +747,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_OpticalComputer.ID, "Optical Computer", "An Optical Circuit", - OrePrefixes.circuit.get(Materials.Bio), + OrePrefixes.circuit.get(Materials.UEV), SubTag.NO_UNIFICATION)); ItemList.Circuit_OpticalMainframe.set( @@ -755,7 +755,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_OpticalMainframe.ID, "Optical Mainframe", "An Optical Circuit", - OrePrefixes.circuit.get(Materials.Optical), + OrePrefixes.circuit.get(Materials.UIV), SubTag.NO_UNIFICATION)); // Exotic circuits @@ -764,7 +764,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_ExoticProcessor.ID, "Exotic Processor", "An Exotic Circuit", - OrePrefixes.circuit.get(Materials.Infinite), + OrePrefixes.circuit.get(Materials.UHV), SubTag.NO_UNIFICATION)); ItemList.Circuit_ExoticAssembly.set( @@ -772,7 +772,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_ExoticAssembly.ID, "Exotic Assembly", "An Exotic Circuit", - OrePrefixes.circuit.get(Materials.Bio), + OrePrefixes.circuit.get(Materials.UEV), SubTag.NO_UNIFICATION)); ItemList.Circuit_ExoticComputer.set( @@ -780,7 +780,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_ExoticComputer.ID, "Exotic Computer", "An Exotic Circuit", - OrePrefixes.circuit.get(Materials.Optical), + OrePrefixes.circuit.get(Materials.UIV), SubTag.NO_UNIFICATION)); ItemList.Circuit_ExoticMainframe.set( @@ -788,7 +788,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_ExoticMainframe.ID, "Exotic Mainframe", "An Exotic Circuit", - OrePrefixes.circuit.get(Materials.Exotic), + OrePrefixes.circuit.get(Materials.UMV), SubTag.NO_UNIFICATION)); // Cosmic circuits @@ -797,7 +797,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_CosmicProcessor.ID, "Cosmic Processor", "A Cosmic Circuit", - OrePrefixes.circuit.get(Materials.Bio), + OrePrefixes.circuit.get(Materials.UEV), SubTag.NO_UNIFICATION)); ItemList.Circuit_CosmicAssembly.set( @@ -805,7 +805,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_CosmicAssembly.ID, "Cosmic Assembly", "A Cosmic Circuit", - OrePrefixes.circuit.get(Materials.Optical), + OrePrefixes.circuit.get(Materials.UIV), SubTag.NO_UNIFICATION)); ItemList.Circuit_CosmicComputer.set( @@ -813,7 +813,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_CosmicComputer.ID, "Cosmic Computer", "A Cosmic Circuit", - OrePrefixes.circuit.get(Materials.Exotic), + OrePrefixes.circuit.get(Materials.UMV), SubTag.NO_UNIFICATION)); ItemList.Circuit_CosmicMainframe.set( @@ -821,7 +821,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_CosmicMainframe.ID, "Cosmic Mainframe", "A Cosmic Circuit", - OrePrefixes.circuit.get(Materials.Cosmic), + OrePrefixes.circuit.get(Materials.UXV), SubTag.NO_UNIFICATION)); // Transcendent circuits @@ -830,7 +830,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_TranscendentProcessor.ID, "Temporally Transcendent Processor", "A circuit operating outside of known spacetime", - OrePrefixes.circuit.get(Materials.Optical), + OrePrefixes.circuit.get(Materials.UIV), SubTag.NO_UNIFICATION)); ItemList.Circuit_TranscendentAssembly.set( @@ -838,7 +838,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_TranscendentAssembly.ID, "Temporally Transcendent Assembly", "A circuit operating outside of known spacetime", - OrePrefixes.circuit.get(Materials.Exotic), + OrePrefixes.circuit.get(Materials.UMV), SubTag.NO_UNIFICATION)); ItemList.Circuit_TranscendentComputer.set( @@ -846,7 +846,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_TranscendentComputer.ID, "Temporally Transcendent Computer", "A circuit operating outside of known spacetime", - OrePrefixes.circuit.get(Materials.Cosmic), + OrePrefixes.circuit.get(Materials.UXV), SubTag.NO_UNIFICATION)); ItemList.Circuit_TranscendentMainframe.set( @@ -854,7 +854,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { Circuit_TranscendentMainframe.ID, "Temporally Transcendent Mainframe", "A circuit operating outside of known spacetime", - OrePrefixes.circuit.get(Materials.Transcendent), + OrePrefixes.circuit.get(Materials.MAX), SubTag.NO_UNIFICATION)); ItemList.Tube_Wires.set(addItem(Tube_Wires.ID, "Tube Wires", "For the Vacuum Tubes", o)); diff --git a/src/main/java/gregtech/loaders/load/GT_Loader_MetaTileEntities_Recipes.java b/src/main/java/gregtech/loaders/load/GT_Loader_MetaTileEntities_Recipes.java index 2f372ca778..745546401b 100644 --- a/src/main/java/gregtech/loaders/load/GT_Loader_MetaTileEntities_Recipes.java +++ b/src/main/java/gregtech/loaders/load/GT_Loader_MetaTileEntities_Recipes.java @@ -4932,9 +4932,9 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { GT_ModHandler.addCraftingRecipe( ItemList.Casing_Assembler.get(1L), bits, - new Object[] { "PVP", "PFP", aTextPlateMotor, 'P', OrePrefixes.circuit.get(Materials.Ultimate), 'F', + new Object[] { "PVP", "PFP", aTextPlateMotor, 'P', OrePrefixes.circuit.get(Materials.ZPM), 'F', OrePrefixes.frameGt.get(Materials.TungstenSteel), 'M', ItemList.Electric_Motor_IV, 'V', - OrePrefixes.circuit.get(Materials.Master) }); + OrePrefixes.circuit.get(Materials.LuV) }); GT_ModHandler.addCraftingRecipe( ItemList.Casing_Firebox_Bronze.get(1L), bits, @@ -5280,13 +5280,13 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { ItemList.Hatch_Dynamo_ULV.get(1L), bitsd, new Object[] { "XOL", "SMP", "XOL", 'M', ItemList.Hull_ULV, 'S', OrePrefixes.spring.get(Materials.Lead), - 'X', OrePrefixes.circuit.get(Materials.Primitive), 'O', ItemList.ULV_Coil, 'L', + 'X', OrePrefixes.circuit.get(Materials.ULV), 'O', ItemList.ULV_Coil, 'L', OrePrefixes.cell.get(Materials.Lubricant), 'P', OrePrefixes.rotor.get(Materials.Lead) }); GT_ModHandler.addCraftingRecipe( ItemList.Hatch_Dynamo_LV.get(1L), bitsd, new Object[] { "XOL", "SMP", "XOL", 'M', ItemList.Hull_LV, 'S', OrePrefixes.spring.get(Materials.Tin), 'X', - OrePrefixes.circuit.get(Materials.Basic), 'O', ItemList.LV_Coil, 'L', + OrePrefixes.circuit.get(Materials.LV), 'O', ItemList.LV_Coil, 'L', OrePrefixes.cell.get(Materials.Lubricant), 'P', ItemList.Electric_Pump_LV }); GT_ModHandler.addCraftingRecipe( ItemList.Hatch_Dynamo_MV.get(1L), @@ -5298,13 +5298,13 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { ItemList.Hatch_Energy_ULV.get(1L), bitsd, new Object[] { "COL", "XMP", "COL", 'M', ItemList.Hull_ULV, 'C', OrePrefixes.cableGt01.get(Materials.Lead), - 'X', OrePrefixes.circuit.get(Materials.Primitive), 'O', ItemList.ULV_Coil, 'L', + 'X', OrePrefixes.circuit.get(Materials.ULV), 'O', ItemList.ULV_Coil, 'L', OrePrefixes.cell.get(Materials.Lubricant), 'P', OrePrefixes.rotor.get(Materials.Lead) }); GT_ModHandler.addCraftingRecipe( ItemList.Hatch_Energy_LV.get(1L), bitsd, new Object[] { "COL", "XMP", "COL", 'M', ItemList.Hull_LV, 'C', OrePrefixes.cableGt01.get(Materials.Tin), - 'X', OrePrefixes.circuit.get(Materials.Basic), 'O', ItemList.LV_Coil, 'L', + 'X', OrePrefixes.circuit.get(Materials.LV), 'O', ItemList.LV_Coil, 'L', OrePrefixes.cell.get(Materials.Lubricant), 'P', ItemList.Electric_Pump_LV }); GT_ModHandler.addCraftingRecipe( ItemList.Hatch_Energy_MV.get(1L), @@ -5321,23 +5321,23 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { ItemList.Hatch_DataAccess_EV.get(1L), bitsd, new Object[] { "COC", "OMO", "COC", 'M', ItemList.Hull_EV, 'O', ItemList.Tool_DataStick, 'C', - OrePrefixes.circuit.get(Materials.Elite) }); + OrePrefixes.circuit.get(Materials.IV) }); GT_ModHandler.addCraftingRecipe( ItemList.Hatch_DataAccess_LuV.get(1L), bitsd, new Object[] { "COC", "OMO", "COC", 'M', ItemList.Hull_LuV, 'O', ItemList.Tool_DataOrb, 'C', - OrePrefixes.circuit.get(Materials.Ultimate) }); + OrePrefixes.circuit.get(Materials.ZPM) }); GT_ModHandler.addCraftingRecipe( ItemList.Hatch_DataAccess_UV.get(1L), bitsd, new Object[] { "CRC", "OMO", "CRC", 'M', ItemList.Hull_UV, 'O', ItemList.Tool_DataOrb, 'C', - OrePrefixes.circuit.get(Materials.Infinite), 'R', ItemList.Robot_Arm_UV }); + OrePrefixes.circuit.get(Materials.UHV), 'R', ItemList.Robot_Arm_UV }); GT_ModHandler.addCraftingRecipe( ItemList.Hatch_AutoMaintenance.get(1L), bitsd, new Object[] { "CHC", "AMA", "CHC", 'M', ItemList.Hull_LuV, 'H', ItemList.Hatch_Maintenance, 'A', - ItemList.Robot_Arm_LuV, 'C', OrePrefixes.circuit.get(Materials.Ultimate) }); + ItemList.Robot_Arm_LuV, 'C', OrePrefixes.circuit.get(Materials.ZPM) }); GT_ModHandler.addCraftingRecipe( ItemList.Hatch_Muffler_LV.get(1L), @@ -5702,61 +5702,61 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { bitsd, new Object[] { aTextWireChest, aTextWireHull, "BCB", 'M', ItemList.Hull_ULV, 'W', OrePrefixes.wireGt16.get(Materials.Lead), 'T', OreDictNames.craftingChest, 'B', - ItemList.Battery_RE_ULV_Tantalum, 'C', OrePrefixes.circuit.get(Materials.Primitive) }); + ItemList.Battery_RE_ULV_Tantalum, 'C', OrePrefixes.circuit.get(Materials.ULV) }); GT_ModHandler.addCraftingRecipe( ItemList.Battery_Charger_4by4_LV.get(1L), bitsd, new Object[] { aTextWireChest, aTextWireHull, "BCB", 'M', ItemList.Hull_LV, 'W', OrePrefixes.wireGt16.get(Materials.Tin), 'T', OreDictNames.craftingChest, 'B', - ItemList.Battery_RE_LV_Lithium, 'C', OrePrefixes.circuit.get(Materials.Basic) }); + ItemList.Battery_RE_LV_Lithium, 'C', OrePrefixes.circuit.get(Materials.LV) }); GT_ModHandler.addCraftingRecipe( ItemList.Battery_Charger_4by4_MV.get(1L), bitsd, new Object[] { aTextWireChest, aTextWireHull, "BCB", 'M', ItemList.Hull_MV, 'W', OrePrefixes.wireGt16.get(Materials.AnyCopper), 'T', OreDictNames.craftingChest, 'B', - ItemList.Battery_RE_MV_Lithium, 'C', OrePrefixes.circuit.get(Materials.Good) }); + ItemList.Battery_RE_MV_Lithium, 'C', OrePrefixes.circuit.get(Materials.MV) }); GT_ModHandler.addCraftingRecipe( ItemList.Battery_Charger_4by4_HV.get(1L), bitsd, new Object[] { aTextWireChest, aTextWireHull, "BCB", 'M', ItemList.Hull_HV, 'W', OrePrefixes.wireGt16.get(Materials.Gold), 'T', OreDictNames.craftingChest, 'B', - ItemList.Battery_RE_HV_Lithium, 'C', OrePrefixes.circuit.get(Materials.Advanced) }); + ItemList.Battery_RE_HV_Lithium, 'C', OrePrefixes.circuit.get(Materials.HV) }); GT_ModHandler.addCraftingRecipe( ItemList.Battery_Charger_4by4_EV.get(1L), bitsd, new Object[] { aTextWireChest, aTextWireHull, "BCB", 'M', ItemList.Hull_EV, 'W', OrePrefixes.wireGt16.get(Materials.Aluminium), 'T', OreDictNames.craftingChest, 'B', - OrePrefixes.battery.get(Materials.Master), 'C', OrePrefixes.circuit.get(Materials.Data) }); + OrePrefixes.battery.get(Materials.LuV), 'C', OrePrefixes.circuit.get(Materials.EV) }); GT_ModHandler.addCraftingRecipe( ItemList.Battery_Charger_4by4_IV.get(1L), bitsd, new Object[] { aTextWireChest, aTextWireHull, "BCB", 'M', ItemList.Hull_IV, 'W', OrePrefixes.wireGt16.get(Materials.Tungsten), 'T', OreDictNames.craftingChest, 'B', - ItemList.Energy_LapotronicOrb, 'C', OrePrefixes.circuit.get(Materials.Elite) }); + ItemList.Energy_LapotronicOrb, 'C', OrePrefixes.circuit.get(Materials.IV) }); GT_ModHandler.addCraftingRecipe( ItemList.Battery_Charger_4by4_LuV.get(1L), bitsd, new Object[] { aTextWireChest, aTextWireHull, "BCB", 'M', ItemList.Hull_LuV, 'W', OrePrefixes.wireGt16.get(Materials.VanadiumGallium), 'T', OreDictNames.craftingChest, 'B', - ItemList.Energy_LapotronicOrb2, 'C', OrePrefixes.circuit.get(Materials.Master) }); + ItemList.Energy_LapotronicOrb2, 'C', OrePrefixes.circuit.get(Materials.LuV) }); GT_ModHandler.addCraftingRecipe( ItemList.Battery_Charger_4by4_ZPM.get(1L), bitsd, new Object[] { aTextWireChest, aTextWireHull, "BCB", 'M', ItemList.Hull_ZPM, 'W', OrePrefixes.wireGt16.get(Materials.Naquadah), 'T', OreDictNames.craftingChest, 'B', - ItemList.Energy_LapotronicOrb2, 'C', OrePrefixes.circuit.get(Materials.Ultimate) }); + ItemList.Energy_LapotronicOrb2, 'C', OrePrefixes.circuit.get(Materials.ZPM) }); GT_ModHandler.addCraftingRecipe( ItemList.Battery_Charger_4by4_UV.get(1L), bitsd, new Object[] { aTextWireChest, aTextWireHull, "BCB", 'M', ItemList.Hull_UV, 'W', OrePrefixes.wireGt16.get(Materials.NaquadahAlloy), 'T', OreDictNames.craftingChest, 'B', ItemList.ZPM2, - 'C', OrePrefixes.circuit.get(Materials.SuperconductorUHV) }); + 'C', OrePrefixes.circuit.get(Materials.UV) }); GT_ModHandler.addCraftingRecipe( ItemList.Battery_Charger_4by4_MAX.get(1L), bitsd, new Object[] { aTextWireChest, aTextWireHull, "BCB", 'M', ItemList.Hull_MAX, 'W', OrePrefixes.wireGt16.get(Materials.SuperconductorUHV), 'T', OreDictNames.craftingChest, 'B', - ItemList.ZPM2, 'C', OrePrefixes.circuit.get(Materials.Infinite) }); + ItemList.ZPM2, 'C', OrePrefixes.circuit.get(Materials.UHV) }); GT_ModHandler.addCraftingRecipe( ItemList.Locker_ULV.get(1L), @@ -5803,80 +5803,80 @@ public class GT_Loader_MetaTileEntities_Recipes implements Runnable { ItemList.Machine_LV_Scanner.get(1L), bitsd, new Object[] { "CTC", aTextWireHull, "CRC", 'M', ItemList.Hull_LV,