diff options
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod/gregtech/common/items')
5 files changed, 98 insertions, 353 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaCustomCoverItem.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaCustomCoverItem.java index 1a0a92b2ef..7126cb2480 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaCustomCoverItem.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaCustomCoverItem.java @@ -65,7 +65,7 @@ public class MetaCustomCoverItem extends Item { return true; } - private final void registerCover() { + private void registerCover() { // CommonProxy.registerItemRendererGlobal(this, new CustomItemBlockRenderer()); for (int i = 0; i < icons.length; i++) { ItemStack thisStack = ItemUtils.simpleMetaStack(this, i, 1); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java index d7eccc0d6b..e8690b155b 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java @@ -1,30 +1,18 @@ package gtPlusPlus.xmod.gregtech.common.items; -import static gregtech.api.enums.Textures.BlockIcons.*; -import static gregtech.client.GT_TooltipHandler.Tier.*; +import static gregtech.client.GT_TooltipHandler.Tier.EV; import static gregtech.client.GT_TooltipHandler.registerTieredTooltip; import static gtPlusPlus.core.util.Utils.getTcAspectStack; import gregtech.api.GregTech_API; import gregtech.api.enums.GT_Values; -import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; -import gregtech.api.enums.SubTag; import gregtech.api.enums.TC_Aspects; import gregtech.api.enums.Textures; -import gregtech.api.interfaces.ITexture; import gregtech.api.objects.GT_MultiTexture; import gregtech.api.objects.GT_RenderedTexture; -import gregtech.api.render.TextureFactory; import gregtech.api.util.GT_ModHandler; -import gregtech.common.covers.GT_Cover_Arm; -import gregtech.common.covers.GT_Cover_Conveyor; -import gregtech.common.covers.GT_Cover_Pump; -import gregtech.common.items.behaviors.Behaviour_DataOrb; -import gregtech.common.items.behaviors.Behaviour_DataStick; -import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.data.StringUtils; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -52,12 +40,9 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { registerCustomCircuits(); - // Simplify life. - registerComponents_ULV(); - // Extruder Shape GregtechItemList.Shape_Extruder_WindmillShaft - .set(this.addItem(tLastID = 40, "Extruder Shape (Shaft)", "Extruder Shape for making Windmill Shafts")); + .set(this.addItem(40, "Extruder Shape (Shaft)", "Extruder Shape for making Windmill Shafts")); // Batteries GregtechItemList.Battery_RE_EV_Sodium.set( @@ -65,9 +50,9 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { tLastID = 50, "Quad Cell Sodium Battery", "Reusable", - new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 2L), - getTcAspectStack(TC_Aspects.METALLUM, 2L), - getTcAspectStack(TC_Aspects.POTENTIA, 2L) })); + getTcAspectStack(TC_Aspects.ELECTRUM, 2L), + getTcAspectStack(TC_Aspects.METALLUM, 2L), + getTcAspectStack(TC_Aspects.POTENTIA, 2L))); this.setElectricStats(32000 + tLastID, 3200000L, GT_Values.V[4], 4L, -3L, true); registerTieredTooltip(GregtechItemList.Battery_RE_EV_Sodium.get(1), EV); @@ -76,9 +61,9 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { tLastID = 52, "Quad Cell Cadmium Battery", "Reusable", - new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L), - getTcAspectStack(TC_Aspects.METALLUM, 1L), - getTcAspectStack(TC_Aspects.POTENTIA, 1L) })); + getTcAspectStack(TC_Aspects.ELECTRUM, 1L), + getTcAspectStack(TC_Aspects.METALLUM, 1L), + getTcAspectStack(TC_Aspects.POTENTIA, 1L))); this.setElectricStats(32000 + tLastID, 4800000L, GT_Values.V[4], 4L, -3L, true); registerTieredTooltip(GregtechItemList.Battery_RE_EV_Cadmium.get(1), EV); @@ -87,9 +72,9 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { tLastID = 54, "Quad Cell Lithium Battery", "Reusable", - new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 3L), - getTcAspectStack(TC_Aspects.METALLUM, 3L), - getTcAspectStack(TC_Aspects.POTENTIA, 3L) })); + getTcAspectStack(TC_Aspects.ELECTRUM, 3L), + getTcAspectStack(TC_Aspects.METALLUM, 3L), + getTcAspectStack(TC_Aspects.POTENTIA, 3L))); this.setElectricStats(32000 + tLastID, 6400000L, GT_Values.V[4], 4L, -3L, true); registerTieredTooltip(GregtechItemList.Battery_RE_EV_Lithium.get(1), EV); @@ -101,41 +86,28 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { tLastID = 66, "Proton Cell", "Reusable", - new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 8L), - getTcAspectStack(TC_Aspects.METALLUM, 24L), - getTcAspectStack(TC_Aspects.POTENTIA, 16L) })); + getTcAspectStack(TC_Aspects.ELECTRUM, 8L), + getTcAspectStack(TC_Aspects.METALLUM, 24L), + getTcAspectStack(TC_Aspects.POTENTIA, 16L))); this.setElectricStats(32000 + tLastID, GT_Values.V[6] * 20 * 300 / 4, GT_Values.V[6], 6L, -3L, false); GregtechItemList.Battery_Gem_2.set( this.addItem( tLastID = 68, "Electron Cell", "Reusable", - new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 16L), - getTcAspectStack(TC_Aspects.METALLUM, 32L), - getTcAspectStack(TC_Aspects.POTENTIA, 32L) })); + getTcAspectStack(TC_Aspects.ELECTRUM, 16L), + getTcAspectStack(TC_Aspects.METALLUM, 32L), + getTcAspectStack(TC_Aspects.POTENTIA, 32L))); this.setElectricStats(32000 + tLastID, GT_Values.V[7] * 20 * 300 / 4, GT_Values.V[7], 7L, -3L, false); GregtechItemList.Battery_Gem_3.set( this.addItem( tLastID = 70, "Quark Entanglement", "Reusable", - new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 32L), - getTcAspectStack(TC_Aspects.METALLUM, 48L), - getTcAspectStack(TC_Aspects.POTENTIA, 64L) })); + getTcAspectStack(TC_Aspects.ELECTRUM, 32L), + getTcAspectStack(TC_Aspects.METALLUM, 48L), + getTcAspectStack(TC_Aspects.POTENTIA, 64L))); this.setElectricStats(32000 + tLastID, GT_Values.V[8] * 20 * 300 / 4, GT_Values.V[8], 8L, -3L, false); - // ItemUtils.addItemToOreDictionary(GregtechItemList.Battery_Gem_1.get(1), "batteryFutureBasic"); - // ItemUtils.addItemToOreDictionary(GregtechItemList.Battery_Gem_2.get(1), "batteryFutureGood"); - // ItemUtils.addItemToOreDictionary(GregtechItemList.Battery_Gem_3.get(1), "batteryFutureAdvanced"); - - /* - * GregtechItemList.Battery_RE_EV_Sodium.set(addItem(tLastID = 50, "Quad Cell Acid Battery", "Reusable", new - * Object[]{getTcAspectStack(TC_Aspects.ELECTRUM, 1L), getTcAspectStack(TC_Aspects.METALLUM, 1L), - * getTcAspectStack(TC_Aspects.POTENTIA, 1L)})); setElectricStats(32000 + tLastID, 5000000L, GT_Values.V[2], 4L, - * -3L, true); GregtechItemList.Battery_RE_EV_Sodium.set(addItem(tLastID = 50, "Quad Cell Mercury Battery", - * "Reusable", new Object[]{getTcAspectStack(TC_Aspects.ELECTRUM, 1L), getTcAspectStack(TC_Aspects.METALLUM, - * 1L), getTcAspectStack(TC_Aspects.POTENTIA, 1L)})); setElectricStats(32000 + tLastID, 5000000L, - * GT_Values.V[2], 4L, -3L, true); - */ // RTG Pellet GregtechItemList.Pellet_RTG_PU238.set( @@ -143,38 +115,38 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { 41, StringUtils.superscript("238") + "Pu Pellet", "", - new Object[] { getTcAspectStack(TC_Aspects.RADIO, 4L), - getTcAspectStack(TC_Aspects.POTENTIA, 2L), - getTcAspectStack(TC_Aspects.METALLUM, 2L) })); + getTcAspectStack(TC_Aspects.RADIO, 4L), + getTcAspectStack(TC_Aspects.POTENTIA, 2L), + getTcAspectStack(TC_Aspects.METALLUM, 2L))); GregtechItemList.Pellet_RTG_SR90.set( this.addItem( 42, StringUtils.superscript("90") + "Sr Pellet", "", - new Object[] { getTcAspectStack(TC_Aspects.RADIO, 4L), - getTcAspectStack(TC_Aspects.POTENTIA, 2L), - getTcAspectStack(TC_Aspects.METALLUM, 2L) })); + getTcAspectStack(TC_Aspects.RADIO, 4L), + getTcAspectStack(TC_Aspects.POTENTIA, 2L), + getTcAspectStack(TC_Aspects.METALLUM, 2L))); GregtechItemList.Pellet_RTG_PO210.set( this.addItem( 43, StringUtils.superscript("210") + "Po Pellet", "", - new Object[] { getTcAspectStack(TC_Aspects.RADIO, 4L), - getTcAspectStack(TC_Aspects.POTENTIA, 2L), - getTcAspectStack(TC_Aspects.METALLUM, 2L) })); + getTcAspectStack(TC_Aspects.RADIO, 4L), + getTcAspectStack(TC_Aspects.POTENTIA, 2L), + getTcAspectStack(TC_Aspects.METALLUM, 2L))); GregtechItemList.Pellet_RTG_AM241.set( this.addItem( 44, StringUtils.superscript("241") + "Am Pellet", "", - new Object[] { getTcAspectStack(TC_Aspects.RADIO, 4L), - getTcAspectStack(TC_Aspects.POTENTIA, 2L), - getTcAspectStack(TC_Aspects.METALLUM, 2L) })); + getTcAspectStack(TC_Aspects.RADIO, 4L), + getTcAspectStack(TC_Aspects.POTENTIA, 2L), + getTcAspectStack(TC_Aspects.METALLUM, 2L))); CORE.RA.addFuelForRTG(GregtechItemList.Pellet_RTG_PU238.get(1), MathUtils.roundToClosestInt(87.7f), 64); CORE.RA.addFuelForRTG(GregtechItemList.Pellet_RTG_SR90.get(1), MathUtils.roundToClosestInt(28.8f), 32); CORE.RA.addFuelForRTG(GregtechItemList.Pellet_RTG_PO210.get(1), 1, 512); - CORE.RA.addFuelForRTG(GregtechItemList.Pellet_RTG_AM241.get(1), MathUtils.roundToClosestInt(432 / 2), 16); + CORE.RA.addFuelForRTG(GregtechItemList.Pellet_RTG_AM241.get(1), 216, 16); CORE.RA.addFuelForRTG(GT_ModHandler.getIC2Item("RTGPellets", 1), MathUtils.roundToClosestInt(2.6f), 8); // Computer Cube @@ -183,95 +155,86 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { tLastID = 55, "Gregtech Computer Cube", "Reusable", - new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 8L), - getTcAspectStack(TC_Aspects.METALLUM, 8L), - getTcAspectStack(TC_Aspects.POTENTIA, 8L) })); + getTcAspectStack(TC_Aspects.ELECTRUM, 8L), + getTcAspectStack(TC_Aspects.METALLUM, 8L), + getTcAspectStack(TC_Aspects.POTENTIA, 8L))); this.setElectricStats(32000 + tLastID, GT_Values.V[6] * 10 * 60 * 20, GT_Values.V[5], 5L, -3L, true); - GregtechItemList.Cover_Overflow_ULV.set( - this.addItem( - 71, - "Overflow Valve (ULV)", - "Maximum void amount: 8,000", - new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L), - getTcAspectStack(TC_Aspects.MACHINA, 1L), getTcAspectStack(TC_Aspects.ITER, 1L), - getTcAspectStack(TC_Aspects.AQUA, 1L) })); GregtechItemList.Cover_Overflow_LV.set( this.addItem( 72, "Overflow Valve (LV)", "Maximum void amount: 64,000", - new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L), - getTcAspectStack(TC_Aspects.MACHINA, 1L), getTcAspectStack(TC_Aspects.ITER, 1L), - getTcAspectStack(TC_Aspects.AQUA, 1L) })); + getTcAspectStack(TC_Aspects.ELECTRUM, 1L), + getTcAspectStack(TC_Aspects.MACHINA, 1L), + getTcAspectStack(TC_Aspects.ITER, 1L), + getTcAspectStack(TC_Aspects.AQUA, 1L))); GregtechItemList.Cover_Overflow_MV.set( this.addItem( 73, "Overflow Valve (MV)", "Maximum void amount: 512,000", - new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L), - getTcAspectStack(TC_Aspects.MACHINA, 1L), getTcAspectStack(TC_Aspects.ITER, 1L), - getTcAspectStack(TC_Aspects.AQUA, 1L) })); + getTcAspectStack(TC_Aspects.ELECTRUM, 1L), + getTcAspectStack(TC_Aspects.MACHINA, 1L), + getTcAspectStack(TC_Aspects.ITER, 1L), + getTcAspectStack(TC_Aspects.AQUA, 1L))); GregtechItemList.Cover_Overflow_HV.set( this.addItem( 74, "Overflow Valve (HV)", "Maximum void amount: 4,096,000", - new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L), - getTcAspectStack(TC_Aspects.MACHINA, 1L), getTcAspectStack(TC_Aspects.ITER, 1L), - getTcAspectStack(TC_Aspects.AQUA, 1L) })); + getTcAspectStack(TC_Aspects.ELECTRUM, 1L), + getTcAspectStack(TC_Aspects.MACHINA, 1L), + getTcAspectStack(TC_Aspects.ITER, 1L), + getTcAspectStack(TC_Aspects.AQUA, 1L))); GregtechItemList.Cover_Overflow_EV.set( this.addItem( 75, "Overflow Valve (EV)", "Maximum void amount: 32,768,000", - new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L), - getTcAspectStack(TC_Aspects.MACHINA, 1L), getTcAspectStack(TC_Aspects.ITER, 1L), - getTcAspectStack(TC_Aspects.AQUA, 1L) })); + getTcAspectStack(TC_Aspects.ELECTRUM, 1L), + getTcAspectStack(TC_Aspects.MACHINA, 1L), + getTcAspectStack(TC_Aspects.ITER, 1L), + getTcAspectStack(TC_Aspects.AQUA, 1L))); GregtechItemList.Cover_Overflow_IV.set( this.addItem( 76, "Overflow Valve (IV)", "Maximum void amount: 262,144,000", - new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L), - getTcAspectStack(TC_Aspects.MACHINA, 1L), getTcAspectStack(TC_Aspects.ITER, 1L), - getTcAspectStack(TC_Aspects.AQUA, 1L) })); + getTcAspectStack(TC_Aspects.ELECTRUM, 1L), + getTcAspectStack(TC_Aspects.MACHINA, 1L), + getTcAspectStack(TC_Aspects.ITER, 1L), + getTcAspectStack(TC_Aspects.AQUA, 1L))); GregTech_API.registerCover( - GregtechItemList.Cover_Overflow_ULV.get(1L), - new GT_MultiTexture( - new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[4][0], - new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve) }), - new GTPP_Cover_Overflow(8)); - GregTech_API.registerCover( GregtechItemList.Cover_Overflow_LV.get(1L), new GT_MultiTexture( - new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[4][0], - new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve) }), + Textures.BlockIcons.MACHINE_CASINGS[4][0], + new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)), new GTPP_Cover_Overflow(64)); GregTech_API.registerCover( GregtechItemList.Cover_Overflow_MV.get(1L), new GT_MultiTexture( - new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[5][0], - new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve) }), + Textures.BlockIcons.MACHINE_CASINGS[5][0], + new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)), new GTPP_Cover_Overflow(512)); GregTech_API.registerCover( GregtechItemList.Cover_Overflow_HV.get(1L), new GT_MultiTexture( - new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[5][0], - new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve) }), + Textures.BlockIcons.MACHINE_CASINGS[5][0], + new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)), new GTPP_Cover_Overflow(4096)); GregTech_API.registerCover( GregtechItemList.Cover_Overflow_EV.get(1L), new GT_MultiTexture( - new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[8][0], - new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve) }), + Textures.BlockIcons.MACHINE_CASINGS[8][0], + new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)), new GTPP_Cover_Overflow(32768)); GregTech_API.registerCover( GregtechItemList.Cover_Overflow_IV.get(1L), new GT_MultiTexture( - new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[8][0], - new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve) }), + Textures.BlockIcons.MACHINE_CASINGS[8][0], + new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)), new GTPP_Cover_Overflow(262144)); // Fusion Reactor MK4 Singularity @@ -294,22 +257,12 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { tLastID = 110, "Graviton Anomaly", "Reusable", - new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 64L), - getTcAspectStack(TC_Aspects.METALLUM, 64L), - getTcAspectStack(TC_Aspects.POTENTIA, 64L) })); + getTcAspectStack(TC_Aspects.ELECTRUM, 64L), + getTcAspectStack(TC_Aspects.METALLUM, 64L), + getTcAspectStack(TC_Aspects.POTENTIA, 64L))); this.setElectricStats(32000 + tLastID, (64000000000L * 16), GT_Values.V[9], 9L, -3L, false); /* - * Bombs - */ - GregtechItemList.Bomb_Cast.set(this.addItem(111, "Bomb Cast", "Used in the production of Bombs")); - GregtechItemList.Bomb_Cast_Molten.set(this.addItem(112, "Bomb Cast (Hot)", "Consider cooling this off")); - GregtechItemList.Bomb_Cast_Set - .set(this.addItem(113, "Bomb Cast (Set)", "Break it open for the goodies inside!")); - GregtechItemList.Bomb_Cast_Broken.set(this.addItem(114, "Bomb Cast (Broken)", "This is probably just junk")); - GregtechItemList.Bomb_Cast_Mold.set(this.addItem(115, "Mold (Bomb Cast)", "Used in the production of Bombs")); - - /* * High Tier 'Saws' for the tree Farm */ @@ -320,21 +273,20 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { "Allows UV & IF to pass through, blocks visible light spectrums")); int aStartID = 141; - GregtechItemList[] aTransParts = new GregtechItemList[] { GregtechItemList.TransmissionComponent_ULV, - GregtechItemList.TransmissionComponent_LV, GregtechItemList.TransmissionComponent_MV, - GregtechItemList.TransmissionComponent_HV, GregtechItemList.TransmissionComponent_EV, - GregtechItemList.TransmissionComponent_IV, GregtechItemList.TransmissionComponent_LuV, - GregtechItemList.TransmissionComponent_ZPM, GregtechItemList.TransmissionComponent_UV, - GregtechItemList.TransmissionComponent_MAX, }; - for (int aIndex = 0; aIndex < 10; aIndex++) { + GregtechItemList[] aTransParts = new GregtechItemList[] { GregtechItemList.TransmissionComponent_LV, + GregtechItemList.TransmissionComponent_MV, GregtechItemList.TransmissionComponent_HV, + GregtechItemList.TransmissionComponent_EV, GregtechItemList.TransmissionComponent_IV, + GregtechItemList.TransmissionComponent_LuV, GregtechItemList.TransmissionComponent_ZPM, + GregtechItemList.TransmissionComponent_UV, GregtechItemList.TransmissionComponent_UHV, }; + for (int aIndex = 0; aIndex < aTransParts.length; aIndex++) { aTransParts[aIndex].set( this.addItem( aStartID++, "Transmission Component (" + GT_Values.VN[aIndex] + ")", "", - new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, aIndex), - getTcAspectStack(TC_Aspects.MACHINA, aIndex), - getTcAspectStack(TC_Aspects.MAGNETO, aIndex) })); + getTcAspectStack(TC_Aspects.ELECTRUM, aIndex), + getTcAspectStack(TC_Aspects.MACHINA, aIndex), + getTcAspectStack(TC_Aspects.MAGNETO, aIndex))); } // Distillus Chip @@ -344,203 +296,26 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { .set(this.addItem(152, "Maceration Upgrade Chip", "Used to upgrade Maceration Stack to Tier 2")); } - private boolean registerComponents_ULV() { - GregtechItemList.Electric_Pump_ULV.set( - this.addItem( - 32, - "Electric Pump (ULV)", - "160 L/sec (as Cover)", - new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L), - getTcAspectStack(TC_Aspects.MACHINA, 1L), getTcAspectStack(TC_Aspects.ITER, 1L), - getTcAspectStack(TC_Aspects.AQUA, 1L) })); - GregtechItemList.Electric_Motor_ULV.set( - this.addItem( - 33, - "Electric Motor (ULV)", - "", - new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L), - getTcAspectStack(TC_Aspects.MACHINA, 1L), getTcAspectStack(TC_Aspects.MOTUS, 1L) })); - GregtechItemList.Conveyor_Module_ULV.set( - this.addItem( - 34, - "Conveyor Module (ULV)", - "1 Stack every 80 secs (as Cover)", - new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L), - getTcAspectStack(TC_Aspects.MACHINA, 1L), getTcAspectStack(TC_Aspects.ITER, 1L) })); - GregtechItemList.Electric_Piston_ULV.set( - this.addItem( - 35, - "Electric Piston (ULV)", - "", - new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L), - getTcAspectStack(TC_Aspects.MACHINA, 2L), getTcAspectStack(TC_Aspects.MOTUS, 1L) })); - GregtechItemList.Robot_Arm_ULV.set( - this.addItem( - 36, - "Robot Arm (ULV)", - "Inserts into specific Slots (as Cover)", - new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L), - getTcAspectStack(TC_Aspects.MACHINA, 2L), getTcAspectStack(TC_Aspects.MOTUS, 1L), - Utils.getTcAspectStack("COGNITIO", 1L) })); - GregtechItemList.Field_Generator_ULV.set( - this.addItem( - 37, - "Field Generator (ULV)", - "", - new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 2L), - getTcAspectStack(TC_Aspects.MACHINA, 1L), getTcAspectStack(TC_Aspects.TUTAMEN, 1L) })); - GregtechItemList.Emitter_ULV.set( - this.addItem( - 38, - "Emitter (ULV)", - "", - new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L), - getTcAspectStack(TC_Aspects.MACHINA, 1L), getTcAspectStack(TC_Aspects.LUX, 1L) })); - GregtechItemList.Sensor_ULV.set( - this.addItem( - 39, - "Sensor (ULV)", - "", - new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L), - getTcAspectStack(TC_Aspects.MACHINA, 1L), getTcAspectStack(TC_Aspects.SENSUS, 1L) })); - - GregTech_API.registerCover( - GregtechItemList.Electric_Pump_ULV.get(1L), - new GT_MultiTexture( - new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[5][0], - new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PUMP) }), - new GT_Cover_Pump(8, TextureFactory.of(OVERLAY_PUMP))); - GregTech_API.registerCover( - GregtechItemList.Conveyor_Module_ULV.get(1L), - new GT_MultiTexture( - new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[1][0], - new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_CONVEYOR) }), - new GT_Cover_Conveyor(1600, 1, TextureFactory.of(OVERLAY_CONVEYOR))); - GregTech_API.registerCover( - GregtechItemList.Robot_Arm_ULV.get(1L), - new GT_MultiTexture( - new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[1][0], - new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_ARM) }), - new GT_Cover_Arm(1600, TextureFactory.of(OVERLAY_ARM))); - - return true; - } - - public boolean registerOldCircuits() { - // Enable Old Circuits - Logger.INFO("[Old Feature - Circuits] Enabling Pre-5.09.28 Circuits and Data Storage."); - - GregtechItemList.Old_Circuit_Primitive.set( - this.addItem( - 200, - "NAND Chip", - "A very simple Circuit", - new Object[] { OrePrefixes.circuit.get(Materials.Primitive) })); - GregtechItemList.Old_Circuit_Basic.set( - this.addItem( - 201, - "Basic Electronic Circuit", - "A basic Circuit", - new Object[] { OrePrefixes.circuit.get(Materials.Basic) })); - GregtechItemList.Old_Circuit_Good.set( - this.addItem( - 202, - "Good Electronic Circuit", - "A good Circuit", - new Object[] { OrePrefixes.circuit.get(Materials.Good) })); - GregtechItemList.Old_Circuit_Advanced.set( - this.addItem( - 203, - "Advanced Circuit", - "An advanced Circuit", - new Object[] { OrePrefixes.circuit.get(Materials.Advanced) })); - GregtechItemList.Old_Circuit_Data.set( - this.addItem( - 204, - "Data Storage Circuit", - "A Data Storage Chip", - new Object[] { OrePrefixes.circuit.get(Materials.Data) })); - GregtechItemList.Old_Circuit_Elite.set( - this.addItem( - 205, - "Data Control Circuit", - "A Processor", - new Object[] { OrePrefixes.circuit.get(Materials.Elite) })); - GregtechItemList.Old_Circuit_Master.set( - this.addItem( - 206, - "Energy Flow Circuit", - "A High Voltage Processor", - new Object[] { OrePrefixes.circuit.get(Materials.Master) })); - - GregtechItemList.Old_Tool_DataOrb.set( - this.addItem( - 207, - "Data Orb [GT++]", - "A High Capacity Data Storage", - new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), SubTag.NO_UNIFICATION, - new Behaviour_DataOrb() })); - GregtechItemList.Old_Circuit_Ultimate.set(GregtechItemList.Old_Tool_DataOrb.get(1L)); - GT_ModHandler.addShapelessCraftingRecipe( - GregtechItemList.Old_Tool_DataOrb.get(1L), - GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { GregtechItemList.Old_Tool_DataOrb.get(1L) }); - - GregtechItemList.Old_Tool_DataStick.set( - this.addItem( - 208, - "Data Stick [GT++]", - "A Low Capacity Data Storage", - new Object[] { OrePrefixes.circuit.get(Materials.Data), SubTag.NO_UNIFICATION, - new Behaviour_DataStick() })); - GT_ModHandler.addShapelessCraftingRecipe( - GregtechItemList.Old_Tool_DataStick.get(1L), - GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { GregtechItemList.Old_Tool_DataStick.get(1L) }); - - GregtechItemList.Old_Circuit_Board_Basic.set(this.addItem(210, "Basic Circuit Board", "A basic Board")); - GregtechItemList.Old_Circuit_Board_Advanced - .set(this.addItem(211, "Advanced Circuit Board", "An advanced Board")); - GregtechItemList.Old_Circuit_Board_Elite.set(this.addItem(212, "Processor Board", "A Processor Board")); - GregtechItemList.Old_Circuit_Parts_Crystal_Chip_Elite - .set(this.addItem(213, "Engraved Crystal Chip", "Needed for Circuits")); - GregtechItemList.Old_Circuit_Parts_Crystal_Chip_Master - .set(this.addItem(214, "Engraved Lapotron Chip", "Needed for Circuits")); - GregtechItemList.Old_Circuit_Parts_Advanced - .set(this.addItem(215, "Advanced Circuit Parts", "Advanced Circuit Parts")); - GregtechItemList.Old_Circuit_Parts_Wiring_Basic - .set(this.addItem(216, "Etched Medium Voltage Wiring", "Part of Circuit Boards")); - GregtechItemList.Old_Circuit_Parts_Wiring_Advanced - .set(this.addItem(217, "Etched High Voltage Wiring", "Part of Circuit Boards")); - GregtechItemList.Old_Circuit_Parts_Wiring_Elite - .set(this.addItem(218, "Etched Extreme Voltage Wiring", "Part of Circuit Boards")); - GregtechItemList.Old_Empty_Board_Basic.set(this.addItem(219, "Empty Circuit Board", "A Board Part")); - GregtechItemList.Old_Empty_Board_Elite - .set(this.addItem(220, "Empty Processor Board", "A Processor Board Part")); - - return true; - } - - public boolean registerCustomCircuits() { + public void registerCustomCircuits() { if (CORE.ConfigSwitches.enableCustomCircuits) { GregtechItemList.Circuit_IV.set( this.addItem( 704, "Symbiotic Circuit (IV)", "A Symbiotic Data Processor", - new Object[] { GregtechOrePrefixes.circuit.get(GT_Materials.Symbiotic) })); + GregtechOrePrefixes.circuit.get(GT_Materials.Symbiotic))); GregtechItemList.Circuit_LuV.set( this.addItem( 705, "Neutronic Circuit (LuV)", "A Neutron Particle Processor", - new Object[] { GregtechOrePrefixes.circuit.get(GT_Materials.Neutronic) })); + GregtechOrePrefixes.circuit.get(GT_Materials.Neutronic))); GregtechItemList.Circuit_ZPM.set( this.addItem( 706, "Quantum Circuit (ZPM)", "A Singlularity Processor", - new Object[] { GregtechOrePrefixes.circuit.get(GT_Materials.Quantum) })); + GregtechOrePrefixes.circuit.get(GT_Materials.Quantum))); GregtechItemList.Circuit_Board_IV .set(this.addItem(710, "IV Circuit Board", "An IV Voltage Rated Circuit Board")); GregtechItemList.Circuit_Board_LuV @@ -565,8 +340,6 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { .set(this.addItem(721, "Etched ZPM Voltage Wiring", "Part of Circuit Boards")); ItemUtils.addItemToOreDictionary(GregtechItemList.Circuit_IV.get(1), "circuitSuperconductor"); ItemUtils.addItemToOreDictionary(GregtechItemList.Circuit_LuV.get(1), "circuitInfinite"); - return true; } - return false; } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechTools.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechTools.java index a07ed2131a..5f39209178 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechTools.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechTools.java @@ -6,14 +6,10 @@ import gregtech.api.enums.ToolDictNames; import gregtech.api.items.GT_MetaGenerated_Tool; import gtPlusPlus.xmod.gregtech.api.enums.GregtechToolDictNames; import gtPlusPlus.xmod.gregtech.common.tools.TOOL_Gregtech_AngleGrinder; -import gtPlusPlus.xmod.gregtech.common.tools.TOOL_Gregtech_ElectricButcherKnife; -import gtPlusPlus.xmod.gregtech.common.tools.TOOL_Gregtech_ElectricLighter; import gtPlusPlus.xmod.gregtech.common.tools.TOOL_Gregtech_ElectricSnips; public class MetaGeneratedGregtechTools extends GT_MetaGenerated_Tool { - public static final short ELECTRIC_LIGHTER = 7534; - public static final short ELECTRIC_BUTCHER_KNIFE = 7634; public static final short ANGLE_GRINDER = 7834; public static final short ELECTRIC_SNIPS = 7934; public static GT_MetaGenerated_Tool INSTANCE; @@ -35,10 +31,11 @@ public class MetaGeneratedGregtechTools extends GT_MetaGenerated_Tool { "Angle Grinder", "Hand-held electric filing device", new TOOL_Gregtech_AngleGrinder(), - new Object[] { GregtechToolDictNames.craftingToolAngleGrinder, ToolDictNames.craftingToolFile, - new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L), - new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 2L), - new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L) }); + GregtechToolDictNames.craftingToolAngleGrinder, + ToolDictNames.craftingToolFile, + new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L), + new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 2L), + new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L)); // Electric Wire Cutter GregTech_API.registerWireCutter( @@ -47,32 +44,11 @@ public class MetaGeneratedGregtechTools extends GT_MetaGenerated_Tool { "Automatic Snips", "Hand-held electric wire cutter", new TOOL_Gregtech_ElectricSnips(), - new Object[] { GregtechToolDictNames.craftingToolElectricSnips, - ToolDictNames.craftingToolWireCutter, - new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 4L), - new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 4L), - new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 4L) })); + GregtechToolDictNames.craftingToolElectricSnips, + ToolDictNames.craftingToolWireCutter, + new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 4L), + new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 4L), + new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 4L))); - // Electric Lighter - this.addTool( - ELECTRIC_LIGHTER, - "Pyromatic 9k", - "Electric Fire!", - new TOOL_Gregtech_ElectricLighter(), - new Object[] { GregtechToolDictNames.craftingToolElectricLighter, - new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L), - new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 2L), - new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L) }); - - // Electric Butcher Knife - this.addTool( - ELECTRIC_BUTCHER_KNIFE, - "Meat-o-matic", - "Electric butcher knife", - new TOOL_Gregtech_ElectricButcherKnife(), - new Object[] { GregtechToolDictNames.craftingToolElectricButcherKnife, ToolDictNames.craftingToolKnife, - new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 1L), - new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 2L), - new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L) }); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Choocher.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Choocher.java index a7c23c69fc..6a5bfb7838 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Choocher.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Choocher.java @@ -11,7 +11,6 @@ import gregtech.api.items.GT_MetaBase_Item; import gregtech.api.util.GT_LanguageManager; import gregtech.common.items.behaviors.Behaviour_None; import gregtech.common.items.behaviors.Behaviour_Wrench; -import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.NBTUtils; import gtPlusPlus.core.util.minecraft.PlayerUtils; @@ -48,7 +47,7 @@ public class Behaviour_Choocher extends Behaviour_None { } if (aPlayer.isSneaking()) { - boolean aModeNew = Utils.invertBoolean(inWrenchMode); + boolean aModeNew = !inWrenchMode; aStack.getTagCompound().setBoolean("aMode", aModeNew); PlayerUtils.messagePlayer(aPlayer, "Mode: " + (aModeNew ? "Wrench" : "Hammer")); return true; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Electric_Lighter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Electric_Lighter.java index db3638a4e0..6a4bd010fb 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Electric_Lighter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Electric_Lighter.java @@ -20,7 +20,6 @@ import gregtech.common.items.behaviors.Behaviour_None; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.entity.projectile.EntityLightningAttack; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.NBTUtils; import gtPlusPlus.core.util.minecraft.PlayerUtils; import gtPlusPlus.xmod.gregtech.common.helpers.ChargingHelper; @@ -70,7 +69,7 @@ public class Behaviour_Electric_Lighter extends Behaviour_None { Logger.INFO("Changing Mode"); boolean aCurrentMode = NBTUtils.getBoolean(aStack, "aFireballMode"); Logger.INFO("Is currently in Fireball mode? " + aCurrentMode); - boolean aNewMode = Utils.invertBoolean(aCurrentMode); + boolean aNewMode = !aCurrentMode; Logger.INFO("Is now set to Fireball mode? " + aNewMode); aStack.getTagCompound().setBoolean("aFireballMod", aNewMode); // NBTUtils.setBoolean(aStack, "aFireballMode", aNewMode); @@ -123,7 +122,7 @@ public class Behaviour_Electric_Lighter extends Behaviour_None { Logger.INFO("Changing Mode"); boolean aCurrentMode = NBTUtils.getBoolean(aStack, "aFireballMode"); Logger.INFO("Is currently in Fireball mode? " + aCurrentMode); - boolean aNewMode = Utils.invertBoolean(aCurrentMode); + boolean aNewMode = !aCurrentMode; Logger.INFO("Is now set to Fireball mode? " + aNewMode); aStack.getTagCompound().setBoolean("aFireballMode", aNewMode); // NBTUtils.setBoolean(aStack, "aFireballMode", aNewMode); @@ -176,9 +175,8 @@ public class Behaviour_Electric_Lighter extends Behaviour_None { Logger.WARNING("Preparing Lighter 2"); if (ChargingHelper.isItemValid(aStack)) { Logger.WARNING("Preparing Lighter 3"); - if (aStack.getItem() instanceof IElectricItemManager) { + if (aStack.getItem() instanceof IElectricItemManager aItemElec) { Logger.WARNING("Preparing Lighter 4"); - IElectricItemManager aItemElec = (IElectricItemManager) aStack.getItem(); double aCharge = aItemElec.getCharge(aStack); long aEuCost = 4096 * 2; if (aCharge >= aEuCost) { @@ -203,8 +201,7 @@ public class Behaviour_Electric_Lighter extends Behaviour_None { if (aStack != null) { if (aStack.getItem() instanceof MetaGeneratedGregtechTools) { if (ChargingHelper.isItemValid(aStack)) { - if (aStack.getItem() instanceof IElectricItemManager) { - IElectricItemManager aItemElec = (IElectricItemManager) aStack.getItem(); + if (aStack.getItem() instanceof IElectricItemManager aItemElec) { double aCharge = aItemElec.getCharge(aStack); long aEuCost = 4096 * 2; aUses = (int) (aCharge / aEuCost); |