diff options
Diffstat (limited to 'src/main/java/gregtech/common')
| -rw-r--r-- | src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java | 79 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java | 82 |
2 files changed, 80 insertions, 81 deletions
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 baafc4c876..7434321b86 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 @@ -1,6 +1,8 @@ package gregtech.common.items; import static gregtech.api.enums.Textures.BlockIcons.*; +import static gregtech.client.GT_TooltipHandler.Tier.*; +import static gregtech.client.GT_TooltipHandler.registerTieredTooltip; import java.util.Collection; import java.util.HashMap; @@ -1513,7 +1515,7 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 1L))); setElectricStats(32000 + tLastID, 1000L, GT_Values.V[0], 0L, -3L, false); - OreDictionary.registerOre("ULV", ItemList.Battery_RE_ULV_Tantalum.get(1)); + registerTieredTooltip(ItemList.Battery_RE_ULV_Tantalum.get(1), ULV); // LV Batteries ItemList.Battery_SU_LV_SulfuricAcid.set( @@ -1526,7 +1528,7 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 2L))); setElectricStats(32000 + tLastID, 18000L, GT_Values.V[1], 1L, -2L, true); - OreDictionary.registerOre("LV", ItemList.Battery_SU_LV_SulfuricAcid.get(1)); + registerTieredTooltip(ItemList.Battery_SU_LV_SulfuricAcid.get(1), LV); ItemList.Battery_SU_LV_Mercury.set( addItem( @@ -1537,7 +1539,7 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 1L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 2L))); setElectricStats(32000 + tLastID, 32000L, GT_Values.V[1], 1L, -2L, true); - OreDictionary.registerOre("LV", ItemList.Battery_SU_LV_Mercury.get(1)); + registerTieredTooltip(ItemList.Battery_SU_LV_Mercury.get(1), LV); ItemList.Battery_RE_LV_Cadmium.set( addItem( @@ -1549,10 +1551,9 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 1L), "batteryLV")); setElectricStats(32000 + tLastID, 75000L, GT_Values.V[1], 1L, -3L, true); - OreDictionary.registerOre("LV", ItemList.Battery_RE_LV_Cadmium.get(1)); - OreDictionary.registerOre("calclavia:ADVANCED_BATTERY", ItemList.Battery_RE_LV_Cadmium.get(1)); // Annoying - // backwards - // compat + registerTieredTooltip(ItemList.Battery_RE_LV_Cadmium.get(1), LV); + // Annoying backwards compat + OreDictionary.registerOre("calclavia:ADVANCED_BATTERY", ItemList.Battery_RE_LV_Cadmium.get(1)); ItemList.Battery_RE_LV_Lithium.set( addItem( @@ -1564,10 +1565,9 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 1L), "batteryLV")); setElectricStats(32000 + tLastID, 100000L, GT_Values.V[1], 1L, -3L, true); - OreDictionary.registerOre("LV", ItemList.Battery_RE_LV_Lithium.get(1)); - OreDictionary.registerOre("calclavia:ADVANCED_BATTERY", ItemList.Battery_RE_LV_Lithium.get(1)); // Annoying - // backwards - // compat + registerTieredTooltip(ItemList.Battery_RE_LV_Lithium.get(1), LV); + // Annoying backwards compat + OreDictionary.registerOre("calclavia:ADVANCED_BATTERY", ItemList.Battery_RE_LV_Lithium.get(1)); ItemList.Battery_RE_LV_Sodium.set( addItem( @@ -1579,10 +1579,9 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 1L), "calclavia:ADVANCED_BATTERY")); setElectricStats(32000 + tLastID, 50000L, GT_Values.V[1], 1L, -3L, true); - OreDictionary.registerOre("LV", ItemList.Battery_RE_LV_Sodium.get(1)); - OreDictionary.registerOre("calclavia:ADVANCED_BATTERY", ItemList.Battery_RE_LV_Sodium.get(1)); // Annoying - // backwards - // compat + registerTieredTooltip(ItemList.Battery_RE_LV_Sodium.get(1), LV); + // Annoying backwards compat + OreDictionary.registerOre("calclavia:ADVANCED_BATTERY", ItemList.Battery_RE_LV_Sodium.get(1)); // MV Batteries ItemList.Battery_SU_MV_SulfuricAcid.set( @@ -1595,7 +1594,7 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 4L))); setElectricStats(32000 + tLastID, 72000L, GT_Values.V[2], 2L, -2L, true); - OreDictionary.registerOre("MV", ItemList.Battery_SU_MV_SulfuricAcid.get(1)); + registerTieredTooltip(ItemList.Battery_SU_MV_SulfuricAcid.get(1), MV); ItemList.Battery_SU_MV_Mercury.set( addItem( @@ -1607,7 +1606,7 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 4L))); setElectricStats(32000 + tLastID, 128000L, GT_Values.V[2], 2L, -2L, true); - OreDictionary.registerOre("MV", ItemList.Battery_SU_MV_Mercury.get(1)); + registerTieredTooltip(ItemList.Battery_SU_MV_Mercury.get(1), MV); ItemList.Battery_RE_MV_Cadmium.set( addItem( @@ -1619,7 +1618,7 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 2L))); setElectricStats(32000 + tLastID, 300000L, GT_Values.V[2], 2L, -3L, true); - OreDictionary.registerOre("MV", ItemList.Battery_RE_MV_Cadmium.get(1)); + registerTieredTooltip(ItemList.Battery_RE_MV_Cadmium.get(1), MV); ItemList.Battery_RE_MV_Lithium.set( addItem( @@ -1631,7 +1630,7 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 2L))); setElectricStats(32000 + tLastID, 400000L, GT_Values.V[2], 2L, -3L, true); - OreDictionary.registerOre("MV", ItemList.Battery_RE_MV_Lithium.get(1)); + registerTieredTooltip(ItemList.Battery_RE_MV_Lithium.get(1), MV); ItemList.Battery_RE_MV_Sodium.set( addItem( @@ -1643,7 +1642,7 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 2L))); setElectricStats(32000 + tLastID, 200000L, GT_Values.V[2], 2L, -3L, true); - OreDictionary.registerOre("MV", ItemList.Battery_RE_MV_Sodium.get(1)); + registerTieredTooltip(ItemList.Battery_RE_MV_Sodium.get(1), MV); // HV Batteries ItemList.Battery_SU_HV_SulfuricAcid.set( @@ -1656,7 +1655,7 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 4L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 8L))); setElectricStats(32000 + tLastID, 288000L, GT_Values.V[3], 3L, -2L, true); - OreDictionary.registerOre("HV", ItemList.Battery_SU_HV_SulfuricAcid.get(1)); + registerTieredTooltip(ItemList.Battery_SU_HV_SulfuricAcid.get(1), HV); ItemList.Battery_SU_HV_Mercury.set( addItem( @@ -1668,7 +1667,7 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 4L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 8L))); setElectricStats(32000 + tLastID, 512000L, GT_Values.V[3], 3L, -2L, true); - OreDictionary.registerOre("HV", ItemList.Battery_SU_HV_Mercury.get(1)); + registerTieredTooltip(ItemList.Battery_SU_HV_Mercury.get(1), HV); ItemList.Battery_RE_HV_Cadmium.set( addItem( @@ -1680,7 +1679,7 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 4L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 4L))); setElectricStats(32000 + tLastID, 1200000L, GT_Values.V[3], 3L, -3L, true); - OreDictionary.registerOre("HV", ItemList.Battery_RE_HV_Cadmium.get(1)); + registerTieredTooltip(ItemList.Battery_RE_HV_Cadmium.get(1), HV); ItemList.Battery_RE_HV_Lithium.set( addItem( @@ -1692,7 +1691,7 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 4L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 4L))); setElectricStats(32000 + tLastID, 1600000L, GT_Values.V[3], 3L, -3L, true); - OreDictionary.registerOre("HV", ItemList.Battery_RE_HV_Lithium.get(1)); + registerTieredTooltip(ItemList.Battery_RE_HV_Lithium.get(1), HV); ItemList.Battery_RE_HV_Sodium.set( addItem( @@ -1704,7 +1703,7 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 4L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 4L))); setElectricStats(32000 + tLastID, 800000L, GT_Values.V[3], 3L, -3L, true); - OreDictionary.registerOre("HV", ItemList.Battery_RE_HV_Sodium.get(1)); + registerTieredTooltip(ItemList.Battery_RE_HV_Sodium.get(1), HV); GT_ModHandler .addExtractionRecipe(ItemList.Battery_SU_LV_SulfuricAcid.get(1L), ItemList.Battery_Hull_LV.get(1L)); @@ -1801,7 +1800,7 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 16L), OrePrefixes.battery.get(Materials.Ultimate))); setElectricStats(32000 + tLastID, 100000000L, GT_Values.V[5], 5L, -3L, true); - OreDictionary.registerOre("IV", ItemList.Energy_LapotronicOrb.get(1)); + registerTieredTooltip(ItemList.Energy_LapotronicOrb.get(1), IV); // ZPM Module ItemList.ZPM.set( @@ -1814,7 +1813,7 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 16L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 64L))); setElectricStats(32000 + tLastID, 2000000000000L, GT_Values.V[7], 7L, -2L, true); - OreDictionary.registerOre("ZPM", ItemList.ZPM.get(1)); + registerTieredTooltip(ItemList.ZPM.get(1), ZPM); // LuV Lapotron orb cluster battery ItemList.Energy_LapotronicOrb2.set( @@ -1828,7 +1827,7 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 16L), OrePrefixes.battery.get(Materials.Ultimate))); setElectricStats(32000 + tLastID, 1000000000L, GT_Values.V[6], 6L, -3L, true); - OreDictionary.registerOre("LuV", ItemList.Energy_LapotronicOrb2.get(1)); + registerTieredTooltip(ItemList.Energy_LapotronicOrb2.get(1), LuV); // UV Battery ItemList.ZPM2.set( @@ -1841,7 +1840,7 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 16L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 64L))); setElectricStats(32000 + tLastID, Long.MAX_VALUE, GT_Values.V[8], 8L, -3L, true); - OreDictionary.registerOre("UV", ItemList.ZPM2.get(1)); + registerTieredTooltip(ItemList.ZPM2.get(1), UV); // UMV Battery ItemList.ZPM3.set( @@ -1854,7 +1853,7 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 16L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 64L))); setElectricStats(32000 + tLastID, Long.MAX_VALUE, GT_Values.V[12], 12L, -3L, true); - OreDictionary.registerOre("UMV", ItemList.ZPM3.get(1)); + registerTieredTooltip(ItemList.ZPM3.get(1), UMV); // UXV Battery ItemList.ZPM4.set( @@ -1867,7 +1866,7 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 16L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 64L))); setElectricStats(32000 + tLastID, Long.MAX_VALUE, GT_Values.V[13], 13L, -3L, true); - OreDictionary.registerOre("UXV", ItemList.ZPM4.get(1)); + registerTieredTooltip(ItemList.ZPM4.get(1), UXV); // ZPM Cluster ItemList.Energy_Module.set( @@ -1881,7 +1880,7 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 16L), OrePrefixes.battery.get(Materials.Ultimate))); setElectricStats(32000 + tLastID, 10000000000L, GT_Values.V[7], 7L, -3L, true); - OreDictionary.registerOre("ZPM", ItemList.Energy_Module.get(1)); + registerTieredTooltip(ItemList.Energy_Module.get(1), ZPM); // UV Cluster ItemList.Energy_Cluster.set( @@ -1894,7 +1893,7 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 16L), new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 64L))); setElectricStats(32000 + tLastID, 100000000000L, GT_Values.V[8], 8L, -3L, true); - OreDictionary.registerOre("UV", ItemList.Energy_Cluster.get(1)); + registerTieredTooltip(ItemList.Energy_Cluster.get(1), UV); // UIV, UMV, UXV and MAX component textures backported from gregicality. ItemList.Electric_Motor_LV.set( @@ -3445,7 +3444,7 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { "A very simple Circuit", OrePrefixes.circuit.get(Materials.Primitive), SubTag.NO_UNIFICATION)); - OreDictionary.registerOre("ULV", ItemList.Circuit_Primitive.get(1)); + registerTieredTooltip(ItemList.Circuit_Primitive.get(1), ULV); ItemList.Circuit_Basic.set( addItem( tLastID = 701, @@ -3453,7 +3452,7 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { "A Basic Circuit", OrePrefixes.circuit.get(Materials.Basic), SubTag.NO_UNIFICATION)); - OreDictionary.registerOre("LV", ItemList.Circuit_Basic.get(1)); + registerTieredTooltip(ItemList.Circuit_Basic.get(1), LV); ItemList.Circuit_Good.set( addItem( tLastID = 702, @@ -3461,7 +3460,7 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { "A Good Circuit", OrePrefixes.circuit.get(Materials.Good), SubTag.NO_UNIFICATION)); - OreDictionary.registerOre("MV", ItemList.Circuit_Good.get(1)); + registerTieredTooltip(ItemList.Circuit_Good.get(1), MV); ItemList.Circuit_Advanced.set( addItem( tLastID = 703, @@ -3469,7 +3468,7 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { "An Advanced Circuit", OrePrefixes.circuit.get(Materials.Advanced), SubTag.NO_UNIFICATION)); - OreDictionary.registerOre("HV", ItemList.Circuit_Advanced.get(1)); + registerTieredTooltip(ItemList.Circuit_Advanced.get(1), HV); ItemList.Circuit_Data.set( addItem( tLastID = 704, @@ -3477,7 +3476,7 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { "An Extreme Circuit", OrePrefixes.circuit.get(Materials.Data), SubTag.NO_UNIFICATION)); - OreDictionary.registerOre("EV", ItemList.Circuit_Data.get(1)); + registerTieredTooltip(ItemList.Circuit_Data.get(1), EV); ItemList.Circuit_Elite.set( addItem( tLastID = 705, @@ -3485,7 +3484,7 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { "An Elite Circuit", OrePrefixes.circuit.get(Materials.Elite), SubTag.NO_UNIFICATION)); - OreDictionary.registerOre("IV", ItemList.Circuit_Elite.get(1)); + registerTieredTooltip(ItemList.Circuit_Elite.get(1), IV); ItemList.Circuit_Master.set( addItem( tLastID = 706, @@ -3493,7 +3492,7 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { "A Master Circuit", OrePrefixes.circuit.get(Materials.Master), SubTag.NO_UNIFICATION)); - OreDictionary.registerOre("LuV", ItemList.Circuit_Master.get(1)); + registerTieredTooltip(ItemList.Circuit_Master.get(1), LuV); // Backwards compatibility. ItemList.Circuit_Parts_Vacuum_Tube.set(ItemList.Circuit_Primitive.get(1)); 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 353e660727..8e1d53f348 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 @@ -3,8 +3,8 @@ package gregtech.common.items; import static gregtech.api.enums.Textures.BlockIcons.SOLARPANEL_UEV; import static gregtech.api.enums.Textures.BlockIcons.SOLARPANEL_UHV; import static gregtech.api.enums.Textures.BlockIcons.SOLARPANEL_UIV; - -import net.minecraftforge.oredict.OreDictionary; +import static gregtech.client.GT_TooltipHandler.Tier.*; +import static gregtech.client.GT_TooltipHandler.registerTieredTooltip; import gregtech.api.GregTech_API; import gregtech.api.enums.*; @@ -258,7 +258,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { "A very simple Circuit", OrePrefixes.circuit.get(Materials.Primitive), SubTag.NO_UNIFICATION)); - OreDictionary.registerOre("ULV", ItemList.NandChip.get(1)); + registerTieredTooltip(ItemList.NandChip.get(1), ULV); // Vacuum Tube Item01 // Basic Circuit IC2 // Good Circuit Item01 @@ -271,7 +271,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { "Good Circuit", OrePrefixes.circuit.get(Materials.Good), SubTag.NO_UNIFICATION)); - OreDictionary.registerOre("MV", ItemList.Circuit_Integrated_Good.get(1)); + registerTieredTooltip(ItemList.Circuit_Integrated_Good.get(1), MV); // Good Integrated Circuit Item01 // Advanced Circuit IC2 @@ -282,7 +282,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { "A Basic Circuit", OrePrefixes.circuit.get(Materials.Basic), SubTag.NO_UNIFICATION)); - OreDictionary.registerOre("LV", ItemList.Circuit_Microprocessor.get(1)); + registerTieredTooltip(ItemList.Circuit_Microprocessor.get(1), LV); ItemList.Circuit_Processor.set( addItem( tLastID = 80, @@ -290,7 +290,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { "A Good Circuit", OrePrefixes.circuit.get(Materials.Good), SubTag.NO_UNIFICATION)); - OreDictionary.registerOre("MV", ItemList.Circuit_Processor.get(1)); + registerTieredTooltip(ItemList.Circuit_Processor.get(1), MV); // ItemList.Circuit_Computer.set(addItem(tLastID = 81, "Processor Assembly", "Advanced Circuit", new // Object[]{OrePrefixes.circuit.get(Materials.Advanced), SubTag.NO_UNIFICATION})); // Workstation/ Item01 Datacircuit @@ -303,7 +303,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { "An Advanced Circuit", OrePrefixes.circuit.get(Materials.Advanced), SubTag.NO_UNIFICATION)); - OreDictionary.registerOre("HV", ItemList.Circuit_Nanoprocessor.get(1)); + registerTieredTooltip(ItemList.Circuit_Nanoprocessor.get(1), HV); ItemList.Circuit_Nanocomputer.set( addItem( tLastID = 83, @@ -311,7 +311,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { "An Extreme Circuit", OrePrefixes.circuit.get(Materials.Data), SubTag.NO_UNIFICATION)); - OreDictionary.registerOre("EV", ItemList.Circuit_Nanocomputer.get(1)); + registerTieredTooltip(ItemList.Circuit_Nanocomputer.get(1), EV); ItemList.Circuit_Elitenanocomputer.set( addItem( tLastID = 84, @@ -319,7 +319,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { "An Elite Circuit", OrePrefixes.circuit.get(Materials.Elite), SubTag.NO_UNIFICATION)); - OreDictionary.registerOre("IV", ItemList.Circuit_Elitenanocomputer.get(1)); + registerTieredTooltip(ItemList.Circuit_Elitenanocomputer.get(1), IV); // Nanoprocessor Mainframe Item01 Energy Flow Circuit // Quantum circuits @@ -330,7 +330,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { "An Extreme Circuit", OrePrefixes.circuit.get(Materials.Data), SubTag.NO_UNIFICATION)); - OreDictionary.registerOre("EV", ItemList.Circuit_Quantumprocessor.get(1)); + registerTieredTooltip(ItemList.Circuit_Quantumprocessor.get(1), EV); ItemList.Circuit_Quantumcomputer.set( addItem( tLastID = 86, @@ -338,7 +338,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { "An Elite Circuit", OrePrefixes.circuit.get(Materials.Elite), SubTag.NO_UNIFICATION)); - OreDictionary.registerOre("IV", ItemList.Circuit_Quantumcomputer.get(1)); + registerTieredTooltip(ItemList.Circuit_Quantumcomputer.get(1), IV); ItemList.Circuit_Masterquantumcomputer.set( addItem( tLastID = 87, @@ -346,7 +346,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { "A Master Circuit", OrePrefixes.circuit.get(Materials.Master), SubTag.NO_UNIFICATION)); - OreDictionary.registerOre("LuV", ItemList.Circuit_Masterquantumcomputer.get(1)); + registerTieredTooltip(ItemList.Circuit_Masterquantumcomputer.get(1), LuV); ItemList.Circuit_Quantummainframe.set( addItem( tLastID = 88, @@ -354,7 +354,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { "An Ultimate Circuit", OrePrefixes.circuit.get(Materials.Ultimate), SubTag.NO_UNIFICATION)); - OreDictionary.registerOre("ZPM", ItemList.Circuit_Quantummainframe.get(1)); + registerTieredTooltip(ItemList.Circuit_Quantummainframe.get(1), ZPM); // Crystal circuits ItemList.Circuit_Crystalprocessor.set( @@ -364,7 +364,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { "An Elite Circuit", OrePrefixes.circuit.get(Materials.Elite), SubTag.NO_UNIFICATION)); - OreDictionary.registerOre("IV", ItemList.Circuit_Crystalprocessor.get(1)); + registerTieredTooltip(ItemList.Circuit_Crystalprocessor.get(1), IV); ItemList.Circuit_Crystalcomputer.set( addItem( tLastID = 96, @@ -372,7 +372,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { "A Master Circuit", OrePrefixes.circuit.get(Materials.Master), SubTag.NO_UNIFICATION)); - OreDictionary.registerOre("LuV", ItemList.Circuit_Crystalcomputer.get(1)); + registerTieredTooltip(ItemList.Circuit_Crystalcomputer.get(1), LuV); ItemList.Circuit_Ultimatecrystalcomputer.set( addItem( tLastID = 90, @@ -380,7 +380,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { "An Ultimate Circuit", OrePrefixes.circuit.get(Materials.Ultimate), SubTag.NO_UNIFICATION)); - OreDictionary.registerOre("ZPM", ItemList.Circuit_Ultimatecrystalcomputer.get(1)); + registerTieredTooltip(ItemList.Circuit_Ultimatecrystalcomputer.get(1), ZPM); ItemList.Circuit_Crystalmainframe.set( addItem( tLastID = 91, @@ -388,7 +388,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { "A Super Circuit", OrePrefixes.circuit.get(Materials.Superconductor), SubTag.NO_UNIFICATION)); - OreDictionary.registerOre("UV", ItemList.Circuit_Crystalmainframe.get(1)); + registerTieredTooltip(ItemList.Circuit_Crystalmainframe.get(1), UV); // ???? Scared to remove. ItemList.Circuit_Ultimate.set(ItemList.Circuit_Ultimatecrystalcomputer.get(1L)); // maybe should be removed @@ -401,7 +401,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { "A Master Circuit", OrePrefixes.circuit.get(Materials.Master), SubTag.NO_UNIFICATION)); - OreDictionary.registerOre("LuV", ItemList.Circuit_Neuroprocessor.get(1)); + registerTieredTooltip(ItemList.Circuit_Neuroprocessor.get(1), LuV); ItemList.Circuit_Wetwarecomputer.set( addItem( tLastID = 93, @@ -409,7 +409,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { "An Ultimate Circuit", OrePrefixes.circuit.get(Materials.Ultimate), SubTag.NO_UNIFICATION)); - OreDictionary.registerOre("ZPM", ItemList.Circuit_Wetwarecomputer.get(1)); + registerTieredTooltip(ItemList.Circuit_Wetwarecomputer.get(1), ZPM); ItemList.Circuit_Wetwaresupercomputer.set( addItem( tLastID = 94, @@ -417,7 +417,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { "A Super Circuit", OrePrefixes.circuit.get(Materials.Superconductor), SubTag.NO_UNIFICATION)); - OreDictionary.registerOre("UV", ItemList.Circuit_Wetwaresupercomputer.get(1)); + registerTieredTooltip(ItemList.Circuit_Wetwaresupercomputer.get(1), UV); ItemList.Circuit_Wetwaremainframe.set( addItem( tLastID = 95, @@ -425,7 +425,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { "An Infinite Circuit", OrePrefixes.circuit.get(Materials.Infinite), SubTag.NO_UNIFICATION)); - OreDictionary.registerOre("UHV", ItemList.Circuit_Wetwaremainframe.get(1)); + registerTieredTooltip(ItemList.Circuit_Wetwaremainframe.get(1), UHV); // Bioware circuits. ItemList.Circuit_Bioprocessor.set( @@ -435,7 +435,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { "An Ultimate Circuit", OrePrefixes.circuit.get(Materials.Ultimate), SubTag.NO_UNIFICATION)); - OreDictionary.registerOre("ZPM", ItemList.Circuit_Bioprocessor.get(1)); + registerTieredTooltip(ItemList.Circuit_Bioprocessor.get(1), ZPM); ItemList.Circuit_Biowarecomputer.set( addItem( tLastID = 98, @@ -443,7 +443,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { "A Super Circuit", OrePrefixes.circuit.get(Materials.Superconductor), SubTag.NO_UNIFICATION)); - OreDictionary.registerOre("UV", ItemList.Circuit_Biowarecomputer.get(1)); + registerTieredTooltip(ItemList.Circuit_Biowarecomputer.get(1), UV); ItemList.Circuit_Biowaresupercomputer.set( addItem( tLastID = 99, @@ -451,7 +451,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { "An Infinite Circuit", OrePrefixes.circuit.get(Materials.Infinite), SubTag.NO_UNIFICATION)); - OreDictionary.registerOre("UHV", ItemList.Circuit_Biowaresupercomputer.get(1)); + registerTieredTooltip(ItemList.Circuit_Biowaresupercomputer.get(1), UHV); ItemList.Circuit_Biomainframe.set( addItem( tLastID = 120, @@ -459,7 +459,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { "A Bio Circuit", OrePrefixes.circuit.get(Materials.Bio), SubTag.NO_UNIFICATION)); - OreDictionary.registerOre("UEV", ItemList.Circuit_Biomainframe.get(1)); + registerTieredTooltip(ItemList.Circuit_Biomainframe.get(1), UEV); ItemList.Circuit_Board_Coated_Basic.set(addItem(tLastID = 100, "Circuit Board", "A basic Circuit Board", o)); ItemList.Circuit_Board_Phenolic_Good @@ -486,7 +486,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { "An Optical Circuit", OrePrefixes.circuit.get(Materials.Superconductor), SubTag.NO_UNIFICATION)); - OreDictionary.registerOre("UV", ItemList.Circuit_OpticalProcessor.get(1)); + registerTieredTooltip(ItemList.Circuit_OpticalProcessor.get(1), UV); ItemList.Circuit_OpticalAssembly.set( addItem( tLastID = 155, @@ -494,7 +494,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { "An Optical Circuit", OrePrefixes.circuit.get(Materials.Infinite), SubTag.NO_UNIFICATION)); - OreDictionary.registerOre("UHV", ItemList.Circuit_OpticalAssembly.get(1)); + registerTieredTooltip(ItemList.Circuit_OpticalAssembly.get(1), UHV); ItemList.Circuit_OpticalComputer.set( addItem( tLastID = 156, @@ -502,7 +502,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { "An Optical Circuit", OrePrefixes.circuit.get(Materials.Bio), SubTag.NO_UNIFICATION)); - OreDictionary.registerOre("UEV", ItemList.Circuit_OpticalComputer.get(1)); + registerTieredTooltip(ItemList.Circuit_OpticalComputer.get(1), UEV); ItemList.Circuit_OpticalMainframe.set( addItem( tLastID = 157, @@ -510,7 +510,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { "An Optical Circuit", OrePrefixes.circuit.get(Materials.Optical), SubTag.NO_UNIFICATION)); - OreDictionary.registerOre("UIV", ItemList.Circuit_OpticalMainframe.get(1)); + registerTieredTooltip(ItemList.Circuit_OpticalMainframe.get(1), UIV); // Exotic circuits ItemList.Circuit_ExoticProcessor.set( @@ -520,7 +520,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { "An Exotic Circuit", OrePrefixes.circuit.get(Materials.Infinite), SubTag.NO_UNIFICATION)); - OreDictionary.registerOre("UHV", ItemList.Circuit_ExoticProcessor.get(1)); + registerTieredTooltip(ItemList.Circuit_ExoticProcessor.get(1), UHV); ItemList.Circuit_ExoticAssembly.set( addItem( tLastID = 167, @@ -528,7 +528,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { "An Exotic Circuit", OrePrefixes.circuit.get(Materials.Bio), SubTag.NO_UNIFICATION)); - OreDictionary.registerOre("UEV", ItemList.Circuit_ExoticAssembly.get(1)); + registerTieredTooltip(ItemList.Circuit_ExoticAssembly.get(1), UEV); ItemList.Circuit_ExoticComputer.set( addItem( tLastID = 168, @@ -536,7 +536,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { "An Exotic Circuit", OrePrefixes.circuit.get(Materials.Optical), SubTag.NO_UNIFICATION)); - OreDictionary.registerOre("UIV", ItemList.Circuit_ExoticComputer.get(1)); + registerTieredTooltip(ItemList.Circuit_ExoticComputer.get(1), UIV); ItemList.Circuit_ExoticMainframe.set( addItem( tLastID = 169, @@ -544,7 +544,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { "An Exotic Circuit", OrePrefixes.circuit.get(Materials.Exotic), SubTag.NO_UNIFICATION)); - OreDictionary.registerOre("UMV", ItemList.Circuit_ExoticMainframe.get(1)); + registerTieredTooltip(ItemList.Circuit_ExoticMainframe.get(1), UMV); // Cosmic circuits ItemList.Circuit_CosmicProcessor.set( @@ -554,7 +554,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { "A Cosmic Circuit", OrePrefixes.circuit.get(Materials.Bio), SubTag.NO_UNIFICATION)); - OreDictionary.registerOre("UEV", ItemList.Circuit_CosmicProcessor.get(1)); + registerTieredTooltip(ItemList.Circuit_CosmicProcessor.get(1), UEV); ItemList.Circuit_CosmicAssembly.set( addItem( tLastID = 171, @@ -562,7 +562,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { "A Cosmic Circuit", OrePrefixes.circuit.get(Materials.Optical), SubTag.NO_UNIFICATION)); - OreDictionary.registerOre("UIV", ItemList.Circuit_CosmicAssembly.get(1)); + registerTieredTooltip(ItemList.Circuit_CosmicAssembly.get(1), UIV); ItemList.Circuit_CosmicComputer.set( addItem( tLastID = 172, @@ -570,7 +570,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { "A Cosmic Circuit", OrePrefixes.circuit.get(Materials.Exotic), SubTag.NO_UNIFICATION)); - OreDictionary.registerOre("UMV", ItemList.Circuit_CosmicComputer.get(1)); + registerTieredTooltip(ItemList.Circuit_CosmicComputer.get(1), UMV); ItemList.Circuit_CosmicMainframe.set( addItem( tLastID = 173, @@ -578,7 +578,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { "A Cosmic Circuit", OrePrefixes.circuit.get(Materials.Cosmic), SubTag.NO_UNIFICATION)); - OreDictionary.registerOre("UXV", ItemList.Circuit_CosmicMainframe.get(1)); + registerTieredTooltip(ItemList.Circuit_CosmicMainframe.get(1), UXV); // Transcendent circuits ItemList.Circuit_TranscendentProcessor.set( @@ -588,7 +588,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { "A circuit operating outside of known spacetime", OrePrefixes.circuit.get(Materials.Optical), SubTag.NO_UNIFICATION)); - OreDictionary.registerOre("UIV", ItemList.Circuit_TranscendentProcessor.get(1)); + registerTieredTooltip(ItemList.Circuit_TranscendentProcessor.get(1), UIV); ItemList.Circuit_TranscendentAssembly.set( addItem( tLastID = 175, @@ -596,7 +596,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { "A circuit operating outside of known spacetime", OrePrefixes.circuit.get(Materials.Exotic), SubTag.NO_UNIFICATION)); - OreDictionary.registerOre("UMV", ItemList.Circuit_TranscendentAssembly.get(1)); + registerTieredTooltip(ItemList.Circuit_TranscendentAssembly.get(1), UMV); ItemList.Circuit_TranscendentComputer.set( addItem( tLastID = 176, @@ -604,7 +604,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { "A circuit operating outside of known spacetime", OrePrefixes.circuit.get(Materials.Cosmic), SubTag.NO_UNIFICATION)); - OreDictionary.registerOre("UXV", ItemList.Circuit_TranscendentComputer.get(1)); + registerTieredTooltip(ItemList.Circuit_TranscendentComputer.get(1), UXV); ItemList.Circuit_TranscendentMainframe.set( addItem( tLastID = 177, @@ -612,7 +612,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { "A circuit operating outside of known spacetime", OrePrefixes.circuit.get(Materials.Transcendent), SubTag.NO_UNIFICATION)); - OreDictionary.registerOre("MAX", ItemList.Circuit_TranscendentMainframe.get(1)); + registerTieredTooltip(ItemList.Circuit_TranscendentMainframe.get(1), MAX); ItemList.Tube_Wires.set(addItem(tLastID = 110, "Tube Wires", "For the Vacuum Tubes", o)); |