diff options
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod/gregtech')
122 files changed, 743 insertions, 4399 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java b/src/main/java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java index 977eb8a2c9..1a188153d5 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java @@ -37,8 +37,6 @@ import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechTools; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GregtechMTE_ElementalDuplicator; import gtPlusPlus.xmod.gregtech.loaders.Gregtech_Blocks; import gtPlusPlus.xmod.gregtech.loaders.ProcessingAngleGrinder; -import gtPlusPlus.xmod.gregtech.loaders.ProcessingElectricButcherKnife; -import gtPlusPlus.xmod.gregtech.loaders.ProcessingElectricLighter; import gtPlusPlus.xmod.gregtech.loaders.ProcessingElectricSnips; import gtPlusPlus.xmod.gregtech.loaders.misc.AddCustomMachineToPA; import gtPlusPlus.xmod.gregtech.loaders.recipe.RecipeLoader_AlgaeFarm; @@ -80,8 +78,6 @@ public class HANDLER_GT { // Only loads if the config option is true (default: true) new ProcessingAngleGrinder().run(); new ProcessingElectricSnips().run(); - new ProcessingElectricButcherKnife().run(); - new ProcessingElectricLighter().run(); // Register custom singles to the PA AddCustomMachineToPA.register(); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java index 90fd1e2358..ed2bc20c32 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java @@ -53,18 +53,7 @@ public enum GregtechItemList implements GregtechItemContainer { Sensor_ZPM, Sensor_UV, - // ULV Components - Electric_Motor_ULV, - Electric_Pump_ULV, - Conveyor_Module_ULV, - Electric_Piston_ULV, - Robot_Arm_ULV, - Field_Generator_ULV, - Emitter_ULV, - Sensor_ULV, - // Mixed Components - TransmissionComponent_ULV, TransmissionComponent_LV, TransmissionComponent_MV, TransmissionComponent_HV, @@ -73,7 +62,7 @@ public enum GregtechItemList implements GregtechItemContainer { TransmissionComponent_LuV, TransmissionComponent_ZPM, TransmissionComponent_UV, - TransmissionComponent_MAX, + TransmissionComponent_UHV, // Recipe Circuit Circuit_BioRecipeSelector, @@ -176,13 +165,6 @@ public enum GregtechItemList implements GregtechItemContainer { Laser_Lens_WoodsGlass, Laser_Lens_Special, - // Bombs - Bomb_Cast, - Bomb_Cast_Molten, - Bomb_Cast_Set, - Bomb_Cast_Broken, - Bomb_Cast_Mold, - // Pellet Mold Pellet_Mold, @@ -210,7 +192,7 @@ public enum GregtechItemList implements GregtechItemContainer { GTPP_Casing_LuV, GTPP_Casing_ZPM, GTPP_Casing_UV, - GTPP_Casing_MAX, + GTPP_Casing_UHV, // IronBlastFurnace Machine_Bronze_BlastFurnace Casing_IronPlatedBricks, @@ -552,7 +534,6 @@ public enum GregtechItemList implements GregtechItemContainer { Hatch_Muffler_Adv_MAX, // Super Input Busses - Hatch_SuperBus_Input_ULV, Hatch_SuperBus_Input_LV, Hatch_SuperBus_Input_MV, Hatch_SuperBus_Input_HV, @@ -564,7 +545,6 @@ public enum GregtechItemList implements GregtechItemContainer { Hatch_SuperBus_Input_MAX, // Super Output Busses - Hatch_SuperBus_Output_ULV, Hatch_SuperBus_Output_LV, Hatch_SuperBus_Output_MV, Hatch_SuperBus_Output_HV, @@ -576,10 +556,9 @@ public enum GregtechItemList implements GregtechItemContainer { Hatch_SuperBus_Output_MAX, // Chisel Buses for Industrial Chisel - GT_MetaTileEntity_ChiselBus_I, - GT_MetaTileEntity_ChiselBus_II, - GT_MetaTileEntity_ChiselBus_III, - GT_MetaTileEntity_ChiselBus_IV, + GT_MetaTileEntity_ChiselBus_LV, + GT_MetaTileEntity_ChiselBus_MV, + GT_MetaTileEntity_ChiselBus_HV, // ---------------------------------------------------------------------------- @@ -602,11 +581,6 @@ public enum GregtechItemList implements GregtechItemContainer { * Single Block Tile Entities */ - // ULV Generators - Generator_Diesel_ULV, - Generator_Gas_Turbine_ULV, - Generator_Steam_Turbine_ULV, - // Crate Box CrateStorage, @@ -616,17 +590,6 @@ public enum GregtechItemList implements GregtechItemContainer { // infinite Items Infinite_Item_Chest, - // GT4 Redstone - GT4_Redstone_Lamp, - GT4_Redstone_Button_Panel, - GT4_Redstone_Scale, - GT4_Redstone_Display, - GT4_Redstone_Circuit, - - // Gt4 Workbenches - GT4_Workbench_Bronze, - GT4_Workbench_Advanced, - // GT4 automation GT4_Electric_Auto_Workbench_LV, GT4_Electric_Auto_Workbench_MV, @@ -671,7 +634,6 @@ public enum GregtechItemList implements GregtechItemContainer { // Fancy Pollution Devices Pollution_Detector, - Pollution_Cleaner_ULV, Pollution_Cleaner_LV, Pollution_Cleaner_MV, Pollution_Cleaner_HV, @@ -702,11 +664,6 @@ public enum GregtechItemList implements GregtechItemContainer { Super_Chest_EV, Super_Chest_IV, - // Chunkloader - GT_Chunkloader_HV, - GT_Chunkloader_ZPM, - GT_Chunkloader_IV, - // Wireless Chargers Charger_LV, Charger_MV, @@ -716,7 +673,7 @@ public enum GregtechItemList implements GregtechItemContainer { Charger_LuV, Charger_ZPM, Charger_UV, - Charger_MAX, + Charger_UHV, // Reactor Processing Unit ReactorProcessingUnit_IV, @@ -752,21 +709,6 @@ public enum GregtechItemList implements GregtechItemContainer { Energy_Buffer_1by1_UV, Energy_Buffer_1by1_MAX, - // Cobble Generators - Cobble_Generator_ULV, - Cobble_Generator_LV, - Cobble_Generator_MV, - Cobble_Generator_HV, - Cobble_Generator_EV, - Cobble_Generator_IV, - Cobble_Generator_LuV, - Cobble_Generator_ZPM, - Cobble_Generator_UV, - Cobble_Generator_MAX, - - // The max Steam condenser - Condensor_MAX, - // Rocket Engines Rocket_Engine_EV, Rocket_Engine_IV, @@ -856,7 +798,6 @@ public enum GregtechItemList implements GregtechItemContainer { */ // Fluid Void Covers - Cover_Overflow_ULV, Cover_Overflow_LV, Cover_Overflow_MV, Cover_Overflow_HV, diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java index 61abc48a18..03ec5f3fc5 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java @@ -109,7 +109,7 @@ public enum GregtechOrePrefixes { chipset("Chipsets", "", "", true, true, false, false, false, false, false, false, false, false, 0, -1, 64, -1), // Introduced ; - public static volatile int VERSION = 508; + public static final int VERSION = 508; static { ingotHot.mHeatDamage = 3.0F; @@ -132,11 +132,11 @@ public enum GregtechOrePrefixes { mGeneratedItems = new HashSet<>(); private final ArrayList<Interface_OreRecipeRegistrator> mOreProcessing = new ArrayList<>(); private final ArrayList<Interface_OreRecipeRegistrator> mOreProcessingFake = new ArrayList<>(); - public ItemStack mContainerItem = null; - public ICondition<ISubTagContainer> mCondition = null; + public final ItemStack mContainerItem = null; + public final ICondition<ISubTagContainer> mCondition = null; public byte mDefaultStackSize = 64; - public GregtechMaterialStack mSecondaryMaterial = null; - public GregtechOrePrefixes mPrefixInto = this; + public final GregtechMaterialStack mSecondaryMaterial = null; + public final GregtechOrePrefixes mPrefixInto = this; public float mHeatDamage = 0.0F; // Negative for Frost Damage /** * Yes this Value can be changed to add Bits for the MetaGenerated-Item-Check. @@ -657,15 +657,22 @@ public enum GregtechOrePrefixes { mOreMultiplier = 1, mByProductMultiplier = 1, mSmeltingMultiplier = 1; public long mDensity = M; public Element mElement = null; - public GT_Materials mDirectSmelting = this, mOreReplacement = this, mMacerateInto = this, mSmeltInto = this, - mArcSmeltInto = this, mHandleMaterial = this; + public GT_Materials mDirectSmelting = this; + public GT_Materials mOreReplacement = this; + public GT_Materials mMacerateInto = this; + public GT_Materials mSmeltInto = this; + public GT_Materials mArcSmeltInto = this; + public final GT_Materials mHandleMaterial = this; public byte mToolQuality = 0; - public Fluid mSolid = null, mFluid = null, mGas = null, mPlasma = null; + public final Fluid mSolid = null; + public Fluid mFluid = null; + public Fluid mGas = null; + public Fluid mPlasma = null; /** * This Fluid is used as standard Unit for Molten Materials. 1296 is a Molten Block, what means 144 is one * Material Unit worth */ - public Fluid mStandardMoltenFluid = null; + public final Fluid mStandardMoltenFluid = null; private GT_Materials(final int aMetaItemSubID, final TextureSet aIconSet, final float aToolSpeed, final int aToolDurability, final int aToolQuality, final boolean aUnificatable) { @@ -1283,6 +1290,6 @@ public enum GregtechOrePrefixes { return this.mRGBa; } - public static volatile int VERSION = 508; + public static final int VERSION = 508; } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem_Base.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem_Base.java index 5437f65aff..e6f7933fd7 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem_Base.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem_Base.java @@ -294,7 +294,9 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item + " / " + GT_Utility.formatNumbers(Math.abs(tStats[0])) + " EU - Voltage: " - + V[(int) (tStats[2] >= 0 ? tStats[2] < V.length ? tStats[2] : V.length - 1 : 1)] + + GT_Utility.formatNumbers( + V[(int) (tStats[2] >= 0 ? tStats[2] < V.length ? tStats[2] : V.length - 1 + : 1)]) + EnumChatFormatting.GRAY); } } @@ -308,7 +310,10 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item + ((tFluid == null ? "No Fluids Contained" : GT_Utility.getFluidName(tFluid, true))) + EnumChatFormatting.GRAY); aList.add( - EnumChatFormatting.BLUE + ((tFluid == null ? 0 : tFluid.amount) + "L / " + tStats[0] + "L") + EnumChatFormatting.BLUE + + (GT_Utility.formatNumbers(tFluid == null ? 0 : tFluid.amount) + "L / " + + GT_Utility.formatNumbers(tStats[0]) + + "L") + EnumChatFormatting.GRAY); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaTool.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaTool.java index a66cce394d..259aa2760c 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaTool.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaTool.java @@ -480,10 +480,7 @@ public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool } this.doDamage(aStack, tStats.getToolDamagePerContainerCraft()); aStack = aStack.stackSize > 0 ? aStack : null; - if (playSound) { - // String sound = (aStack == null) ? tStats.getBreakingSound() : tStats.getCraftingSound(); - // GT_Utility.doSoundAtClient(sound, 1, 1.0F); - } + if (playSound) {} return aStack; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ElementalDataOrbHolder.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ElementalDataOrbHolder.java index 6a8b3a9af6..68aaa75aa1 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ElementalDataOrbHolder.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ElementalDataOrbHolder.java @@ -150,7 +150,7 @@ public class GT_MetaTileEntity_Hatch_ElementalDataOrbHolder extends GT_MetaTileE } public ArrayList<ItemStack> getInventory() { - ArrayList<ItemStack> aContents = new ArrayList<ItemStack>(); + ArrayList<ItemStack> aContents = new ArrayList<>(); for (int i = getBaseMetaTileEntity().getSizeInventory() - 2; i >= 0; i--) { if (getBaseMetaTileEntity().getStackInSlot(i) != null) aContents.add(getBaseMetaTileEntity().getStackInSlot(i)); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_InputBattery.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_InputBattery.java index 1fca67d295..254c81a515 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_InputBattery.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_InputBattery.java @@ -128,8 +128,7 @@ public class GT_MetaTileEntity_Hatch_InputBattery extends GT_MetaTileEntity_Hatc fillStacksIntoFirstSlots(); } if (aBaseMetaTileEntity.isServerSide()) { - if (aBaseMetaTileEntity.getMetaTileEntity() instanceof MetaTileEntity) { - MetaTileEntity mMetaTileEntity = (MetaTileEntity) aBaseMetaTileEntity.getMetaTileEntity(); + if (aBaseMetaTileEntity.getMetaTileEntity() instanceof MetaTileEntity mMetaTileEntity) { if (mMetaTileEntity.rechargerSlotCount() > 0 && aBaseMetaTileEntity.getStoredEU() > 0) { for (int i = mMetaTileEntity.rechargerSlotStartIndex(), k = mMetaTileEntity.rechargerSlotCount() + i; i < k; i++) { @@ -149,11 +148,7 @@ public class GT_MetaTileEntity_Hatch_InputBattery extends GT_MetaTileEntity_Hatc } } } - } else { - // Utils.LOG_INFO("reCharger Slot Count = "+mMetaTileEntity.rechargerSlotCount()); - // Utils.LOG_INFO("getStoredEU = "+aBaseMetaTileEntity.getStoredEU()); - // Utils.LOG_INFO("getEUVar = "+mMetaTileEntity.getEUVar()); - } + } else {} } } super.onPostTick(aBaseMetaTileEntity, aTimer); @@ -202,14 +197,11 @@ public class GT_MetaTileEntity_Hatch_InputBattery extends GT_MetaTileEntity_Hatc @Override public int rechargerSlotCount() { - switch (mTier) { - case 2: - return 4; - case 4: - return 16; - default: - return 16; - } + return switch (mTier) { + case 2 -> 4; + case 4 -> 16; + default -> 16; + }; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler_Adv.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler_Adv.java index d8ec187fff..8c0ebe60e9 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler_Adv.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler_Adv.java @@ -195,10 +195,7 @@ public class GT_MetaTileEntity_Hatch_Muffler_Adv extends GT_MetaTileEntity_Hatch // return; } else { // Logger.INFO("B2"); - if (this.getInventoryStack() == null) { - // Logger.INFO("D1"); - // Logger.INFO("Empty - "+this.mInventory.length); - } else { + if (this.getInventoryStack() == null) {} else { // Logger.INFO("D2"); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_OutputBattery.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_OutputBattery.java index 502dd0ee0b..f70be9aa89 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_OutputBattery.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_OutputBattery.java @@ -174,8 +174,7 @@ public class GT_MetaTileEntity_Hatch_OutputBattery extends GT_MetaTileEntity_Hat } if (aBaseMetaTileEntity.isServerSide()) { - if (aBaseMetaTileEntity.getMetaTileEntity() instanceof MetaTileEntity) { - MetaTileEntity mMetaTileEntity = (MetaTileEntity) aBaseMetaTileEntity.getMetaTileEntity(); + if (aBaseMetaTileEntity.getMetaTileEntity() instanceof MetaTileEntity mMetaTileEntity) { if (mMetaTileEntity.dechargerSlotCount() > 0 && mMetaTileEntity.getEUVar() < aBaseMetaTileEntity.getEUCapacity()) { for (int i = mMetaTileEntity.dechargerSlotStartIndex(), diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Turbine.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Turbine.java index e8ef0a454b..0d307f6e0f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Turbine.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Turbine.java @@ -30,7 +30,6 @@ import gregtech.api.util.GT_Utility; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.minecraft.BlockPos; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.PlayerUtils; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.turbines.GregtechMetaTileEntity_LargerTurbineBase; @@ -172,7 +171,7 @@ public class GT_MetaTileEntity_Hatch_Turbine extends GT_MetaTileEntity_Hatch { } } - private final int getDamageToComponent(ItemStack aStack) { + private int getDamageToComponent(ItemStack aStack) { return 1; } @@ -334,7 +333,7 @@ public class GT_MetaTileEntity_Hatch_Turbine extends GT_MetaTileEntity_Hatch { PlayerUtils.messagePlayer(aPlayer, "Using: " + aMat.mLocalizedName + " " + aSize); } } else { - this.mUsingAnimation = Utils.invertBoolean(mUsingAnimation); + this.mUsingAnimation = !mUsingAnimation; if (this.mUsingAnimation) { PlayerUtils.messagePlayer(aPlayer, "Using Animated Turbine Texture."); } else { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_TurbineProvider.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_TurbineProvider.java index 226086a1ff..e6cb5f8132 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_TurbineProvider.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_TurbineProvider.java @@ -20,7 +20,6 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_LargeTurbine; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.PlayerUtils; import gtPlusPlus.core.util.sys.KeyboardUtils; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.turbines.GregtechMetaTileEntity_LargerTurbineBase; @@ -64,20 +63,18 @@ public class GT_MetaTileEntity_Hatch_TurbineProvider extends GT_MetaTileEntity_H } } - private final void tryFindParentTurbine() { + private void tryFindParentTurbine() { Logger.INFO("This turbine housing has no parent, searching world."); IGregTechTileEntity T = this.getBaseMetaTileEntity(); World W = T.getWorld(); Chunk C = W.getChunkFromBlockCoords(T.getXCoord(), T.getZCoord()); for (Object o : C.chunkTileEntityMap.values()) { - if (o instanceof IGregTechTileEntity) { - IGregTechTileEntity G = (IGregTechTileEntity) o; + if (o instanceof IGregTechTileEntity G) { final IMetaTileEntity aMetaTileEntity = G.getMetaTileEntity(); if (aMetaTileEntity == null) { continue; } - if (aMetaTileEntity instanceof GT_MetaTileEntity_LargeTurbine) { - GT_MetaTileEntity_LargeTurbine aTurb = (GT_MetaTileEntity_LargeTurbine) aMetaTileEntity; + if (aMetaTileEntity instanceof GT_MetaTileEntity_LargeTurbine aTurb) { for (GT_MetaTileEntity_Hatch_InputBus ee : aTurb.mInputBusses) { if (ee.equals(this)) { mParent = aTurb; @@ -90,7 +87,7 @@ public class GT_MetaTileEntity_Hatch_TurbineProvider extends GT_MetaTileEntity_H } } - private final void tryRefillTurbine() { + private void tryRefillTurbine() { if (mParent == null) { tryFindParentTurbine(); } @@ -166,7 +163,7 @@ public class GT_MetaTileEntity_Hatch_TurbineProvider extends GT_MetaTileEntity_H public void onScrewdriverRightClick(ForgeDirection side, EntityPlayer aPlayer, float aX, float aY, float aZ) { if (aPlayer != null) { if (KeyboardUtils.isCtrlKeyDown()) { - mDescending = Utils.invertBoolean(mDescending); + mDescending = !mDescending; PlayerUtils.messagePlayer(aPlayer, "Direction: " + (mDescending ? "DOWN" : "UP")); } else { int aAmount = 0; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaTransformerHiAmp.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaTransformerHiAmp.java index a9dd8d3a97..3701f5dd0f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaTransformerHiAmp.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaTransformerHiAmp.java @@ -12,7 +12,6 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Transformer; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.PlayerUtils; public class GregtechMetaTransformerHiAmp extends GT_MetaTileEntity_Transformer { @@ -108,11 +107,10 @@ public class GregtechMetaTransformerHiAmp extends GT_MetaTileEntity_Transformer @Override public void onScrewdriverRightClick(ForgeDirection side, EntityPlayer aPlayer, float aX, float aY, float aZ) { - this.mHalfMode = Utils.invertBoolean(mHalfMode); + this.mHalfMode = !mHalfMode; if (this.mHalfMode) { PlayerUtils.messagePlayer(aPlayer, "Transformer is now running at 2A:8A in/out Ratio."); } else { - PlayerUtils.messagePlayer(aPlayer, "Transformer is now running at 4A:16A in/out Ratio."); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java index fe394238a6..01e0f731f6 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java @@ -561,35 +561,29 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex public boolean causeMaintenanceIssue() { boolean b = false; switch (this.getBaseMetaTileEntity().getRandomNumber(6)) { - case 0: { + case 0 -> { this.mWrench = false; b = true; - break; } - case 1: { + case 1 -> { this.mScrewdriver = false; b = true; - break; } - case 2: { + case 2 -> { this.mSoftHammer = false; b = true; - break; } - case 3: { + case 3 -> { this.mHardHammer = false; b = true; - break; } - case 4: { + case 4 -> { this.mSolderingTool = false; b = true; - break; } - case 5: { + case 5 -> { this.mCrowbar = false; b = true; - break; } } return b; @@ -1018,8 +1012,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex if (aMetaTileEntity == null) { return false; } - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch) { - GT_MetaTileEntity_Hatch aHatch = (GT_MetaTileEntity_Hatch) aMetaTileEntity; + if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch aHatch) { return mAllDynamoHatches.add(aHatch); } return false; @@ -1072,8 +1065,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex if (aMetaTileEntity == null) { return false; } - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch) { - GT_MetaTileEntity_Hatch aHatch = (GT_MetaTileEntity_Hatch) aMetaTileEntity; + if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch aHatch) { return mAllEnergyHatches.add(aHatch); } return false; @@ -1209,7 +1201,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex tryTickWaitTimerDown(); } - private final void tryTickWaitTimerDown() { + private void tryTickWaitTimerDown() { /* * if (mStartUpCheck > 10) { mStartUpCheck = 10; } */ @@ -1251,7 +1243,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex public static <T> IStructureElement<T> addTieredBlock(Block aBlock, BiPredicate<T, Integer> aSetTheMeta, Function<T, Integer> aGetTheMeta, int minMeta, int maxMeta) { - return new IStructureElement<T>() { + return new IStructureElement<>() { @Override public boolean check(T t, World world, int x, int y, int z) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_SteamMultiBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_SteamMultiBase.java index cd23f036da..d4db6b1350 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_SteamMultiBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_SteamMultiBase.java @@ -32,9 +32,9 @@ import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEn public abstract class GregtechMeta_SteamMultiBase<T extends GregtechMeta_SteamMultiBase<T>> extends GregtechMeta_MultiBlockBase<T> { - public ArrayList<GT_MetaTileEntity_Hatch_Steam_BusInput> mSteamInputs = new ArrayList<GT_MetaTileEntity_Hatch_Steam_BusInput>(); - public ArrayList<GT_MetaTileEntity_Hatch_Steam_BusOutput> mSteamOutputs = new ArrayList<GT_MetaTileEntity_Hatch_Steam_BusOutput>(); - public ArrayList<GT_MetaTileEntity_Hatch_CustomFluidBase> mSteamInputFluids = new ArrayList<GT_MetaTileEntity_Hatch_CustomFluidBase>(); + public ArrayList<GT_MetaTileEntity_Hatch_Steam_BusInput> mSteamInputs = new ArrayList<>(); + public ArrayList<GT_MetaTileEntity_Hatch_Steam_BusOutput> mSteamOutputs = new ArrayList<>(); + public ArrayList<GT_MetaTileEntity_Hatch_CustomFluidBase> mSteamInputFluids = new ArrayList<>(); protected static final String TT_steaminputbus = StatCollector.translateToLocal("GTPP.MBTT.SteamInputBus"); protected static final String TT_steamoutputbus = StatCollector.translateToLocal("GTPP.MBTT.SteamOutputBus"); @@ -80,7 +80,7 @@ public abstract class GregtechMeta_SteamMultiBase<T extends GregtechMeta_SteamMu } public ArrayList<FluidStack> getAllSteamStacks() { - ArrayList<FluidStack> aFluids = new ArrayList<FluidStack>(); + ArrayList<FluidStack> aFluids = new ArrayList<>(); FluidStack aSteam = FluidUtils.getSteam(1); for (FluidStack aFluid : this.getStoredFluids()) { if (aFluid.isFluidEqual(aSteam)) { @@ -231,7 +231,7 @@ public abstract class GregtechMeta_SteamMultiBase<T extends GregtechMeta_SteamMu @Override public ArrayList<FluidStack> getStoredFluids() { - ArrayList<FluidStack> rList = new ArrayList<FluidStack>(); + ArrayList<FluidStack> rList = new ArrayList<>(); for (GT_MetaTileEntity_Hatch_CustomFluidBase tHatch : mSteamInputFluids) { if (isValidMetaTileEntity(tHatch) && tHatch.getFillableStack() != null) { rList.add(tHatch.getFillableStack()); @@ -242,7 +242,7 @@ public abstract class GregtechMeta_SteamMultiBase<T extends GregtechMeta_SteamMu @Override public ArrayList<ItemStack> getStoredInputs() { - ArrayList<ItemStack> rList = new ArrayList<ItemStack>(); + ArrayList<ItemStack> rList = new ArrayList<>(); for (GT_MetaTileEntity_Hatch_Steam_BusInput tHatch : mSteamInputs) { tHatch.mRecipeMap = getRecipeMap(); if (isValidMetaTileEntity(tHatch)) { @@ -282,7 +282,7 @@ public abstract class GregtechMeta_SteamMultiBase<T extends GregtechMeta_SteamMu @Override public ArrayList<ItemStack> getStoredOutputs() { - ArrayList<ItemStack> rList = new ArrayList<ItemStack>(); + ArrayList<ItemStack> rList = new ArrayList<>(); for (GT_MetaTileEntity_Hatch_Steam_BusOutput tHatch : mSteamOutputs) { if (isValidMetaTileEntity(tHatch)) { for (int i = tHatch.getBaseMetaTileEntity().getSizeInventory() - 1; i >= 0; i--) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechRocketFuelGeneratorBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechRocketFuelGeneratorBase.java index 0200113e95..cab45a9a7b 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechRocketFuelGeneratorBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechRocketFuelGeneratorBase.java @@ -319,10 +319,6 @@ public abstract class GregtechRocketFuelGeneratorBase extends GT_MetaTileEntity_ // Logger.INFO("Found some fuel?"); int aperOp = this.consumedFluidPerOperation(tLiquid); int aConsume = (int) (((long) tFuel.mSpecialValue * this.getEfficiency() * aperOp) / 100); - // Logger.INFO("Fuel Value: "+tFuel.mSpecialValue); - // Logger.INFO("Efficiency: "+getEfficiency()); - // Logger.INFO("Consumed per op: "+aperOp); - // Logger.INFO("Consuming "+aConsume); return aConsume; } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_Catalysts.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_Catalysts.java index 9bf0ad3f53..b53e540044 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_Catalysts.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_Catalysts.java @@ -56,7 +56,7 @@ public class GT_MetaTileEntity_Hatch_Catalysts extends GT_MetaTileEntity_Hatch_N @Override public AutoMap<ItemStack> getItemsValidForUsageSlots() { - return new AutoMap<ItemStack>(); + return new AutoMap<>(); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_MillingBalls.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_MillingBalls.java index 240ed3624f..e3134f5812 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_MillingBalls.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_MillingBalls.java @@ -56,7 +56,7 @@ public class GT_MetaTileEntity_Hatch_MillingBalls extends GT_MetaTileEntity_Hatc @Override public AutoMap<ItemStack> getItemsValidForUsageSlots() { - return new AutoMap<ItemStack>(); + return new AutoMap<>(); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_NbtConsumable.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_NbtConsumable.java index 5555d1ff09..53c988676f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_NbtConsumable.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_NbtConsumable.java @@ -169,7 +169,7 @@ public abstract class GT_MetaTileEntity_Hatch_NbtConsumable extends GT_MetaTileE } public final AutoMap<ItemStack> getContentUsageSlots() { - AutoMap<ItemStack> aItems = new AutoMap<ItemStack>(); + AutoMap<ItemStack> aItems = new AutoMap<>(); for (int i = mInputslotCount; i < mTotalSlotCount; i++) { if (mInventory[i] != null) { aItems.add(mInventory[i]); @@ -279,24 +279,19 @@ public abstract class GT_MetaTileEntity_Hatch_NbtConsumable extends GT_MetaTileE @Override public void addGregTechLogo(ModularWindow.Builder builder) { switch (mTotalSlotCount) { - case 8: - case 18: - builder.widget( - new DrawableWidget().setDrawable(getGUITextureSet().getGregTechLogo()).setSize(17, 17) - .setPos(152, 63)); - break; - case 32: - builder.widget( - new DrawableWidget().setDrawable(getGUITextureSet().getGregTechLogo()).setSize(17, 17) - .setPos(79, 35)); - break; + case 8, 18 -> builder.widget( + new DrawableWidget().setDrawable(getGUITextureSet().getGregTechLogo()).setSize(17, 17) + .setPos(152, 63)); + case 32 -> builder.widget( + new DrawableWidget().setDrawable(getGUITextureSet().getGregTechLogo()).setSize(17, 17) + .setPos(79, 35)); } } @Override public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) { switch (mTotalSlotCount) { - case 8: + case 8 -> { builder.widget( SlotGroup.ofItemHandler(inventoryHandler, 2).startFromSlot(0).endAtSlot(3).build() .setPos(25, 25)); @@ -305,8 +300,8 @@ public abstract class GT_MetaTileEntity_Hatch_NbtConsumable extends GT_MetaTileE .build().setPos(115, 25)); builder.widget(new TextWidget("Stock").setDefaultColor(COLOR_TEXT_GRAY.get()).setPos(25, 16)) .widget(new TextWidget("Active").setDefaultColor(COLOR_TEXT_GRAY.get()).setPos(115, 16)); - break; - case 18: + } + case 18 -> { builder.widget( SlotGroup.ofItemHandler(inventoryHandler, 3).startFromSlot(0).endAtSlot(8).build() .setPos(25, 19)); @@ -315,15 +310,15 @@ public abstract class GT_MetaTileEntity_Hatch_NbtConsumable extends GT_MetaTileE .build().setPos(97, 19)); builder.widget(new TextWidget("Stock").setDefaultColor(COLOR_TEXT_GRAY.get()).setPos(25, 14)) .widget(new TextWidget("Active").setDefaultColor(COLOR_TEXT_GRAY.get()).setPos(15, 14)); - break; - case 32: + } + case 32 -> { builder.widget( SlotGroup.ofItemHandler(inventoryHandler, 4).startFromSlot(0).endAtSlot(15).build() .setPos(7, 7)); builder.widget( SlotGroup.ofItemHandler(inventoryHandler, 4).startFromSlot(16).endAtSlot(31).canInsert(false) .build().setPos(96, 7)); - break; + } } } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechItemData.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechItemData.java index b9dc5d4b70..77ad6cd4ac 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechItemData.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechItemData.java @@ -2,8 +2,6 @@ package gtPlusPlus.xmod.gregtech.api.objects; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; -import java.util.Comparator; import java.util.List; import net.minecraft.item.ItemStack; @@ -47,9 +45,9 @@ public class GregtechItemData { final GregtechMaterialStack[] tByProducts = aByProducts.length < 1 ? EMPTY_GT_MaterialStack_ARRAY : new GregtechMaterialStack[aByProducts.length]; int j = 0; - for (int i = 0; i < aByProducts.length; i++) { - if ((aByProducts[i] != null) && (aByProducts[i].mMaterial != null)) { - tByProducts[j++] = aByProducts[i].clone(); + for (GregtechMaterialStack aByProduct : aByProducts) { + if ((aByProduct != null) && (aByProduct.mMaterial != null)) { + tByProducts[j++] = aByProduct.clone(); } } this.mByProducts = j > 0 ? new GregtechMaterialStack[j] : EMPTY_GT_MaterialStack_ARRAY; @@ -102,13 +100,7 @@ public class GregtechItemData { } } - Collections.sort(rList, new Comparator<GregtechMaterialStack>() { - - @Override - public int compare(final GregtechMaterialStack a, final GregtechMaterialStack b) { - return a.mAmount == b.mAmount ? 0 : a.mAmount > b.mAmount ? -1 : +1; - } - }); + rList.sort((a, b) -> Long.compare(b.mAmount, a.mAmount)); if (rList.isEmpty()) { this.mMaterial = null; @@ -117,7 +109,7 @@ public class GregtechItemData { rList.remove(0); } - this.mByProducts = rList.toArray(new GregtechMaterialStack[rList.size()]); + this.mByProducts = rList.toArray(new GregtechMaterialStack[0]); } public boolean hasValidPrefixMaterialData() { @@ -133,7 +125,7 @@ public class GregtechItemData { } public ArrayList<GregtechMaterialStack> getAllGT_MaterialStacks() { - final ArrayList<GregtechMaterialStack> rList = new ArrayList<GregtechMaterialStack>(); + final ArrayList<GregtechMaterialStack> rList = new ArrayList<>(); if (this.hasValidMaterialData()) { rList.add(this.mMaterial); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/util/SpecialBehaviourTooltipHandler.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/util/SpecialBehaviourTooltipHandler.java index 51987d84fd..df95b7de2b 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/util/SpecialBehaviourTooltipHandler.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/util/SpecialBehaviourTooltipHandler.java @@ -11,7 +11,7 @@ import gregtech.api.util.GT_Utility; public class SpecialBehaviourTooltipHandler { - private static final HashMap<ItemStack, String> mTooltipCache = new HashMap<ItemStack, String>(); + private static final HashMap<ItemStack, String> mTooltipCache = new HashMap<>(); public static void addTooltipForItem(ItemStack aStack, String aTooltip) { mTooltipCache.put(aStack, aTooltip); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java index c38b7d4282..5a16d0a20d 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java @@ -65,7 +65,7 @@ public class GregtechMetaCasingBlocks3 extends GregtechMetaCasingBlocksAbstract GT_LanguageManager .addStringLocalization(this.getUnlocalizedName() + ".7.name", "Vanadium Redox Power Cell (UV)"); GT_LanguageManager - .addStringLocalization(this.getUnlocalizedName() + ".8.name", "Vanadium Redox Power Cell (MAX)"); + .addStringLocalization(this.getUnlocalizedName() + ".8.name", "Vanadium Redox Power Cell (UHV)"); GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".9.name", "Supply Depot Casing"); GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".10.name", "Advanced Cryogenic Casing"); GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".11.name", "Volcanus Casing"); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks5.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks5.java index 99228b6ed3..26c747e50e 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks5.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks5.java @@ -81,53 +81,69 @@ public class GregtechMetaCasingBlocks5 extends GregtechMetaCasingBlocksAbstract public static IIcon getStaticIcon(final int ordinalSide, final int aMeta) { if ((aMeta >= 0) && (aMeta < 16)) { switch (aMeta) { - case 0: + case 0 -> { return TexturesGtBlock.TEXTURE_PIPE_GRINDING_MILL.getIcon(); - case 1: + } + case 1 -> { return TexturesGtBlock.TEXTURE_CASING_GRINDING_MILL.getIcon(); - case 2: + } + case 2 -> { return TexturesGtBlock.TEXTURE_GEARBOX_GRINDING_MILL.getIcon(); - case 3: + } + case 3 -> { return TexturesGtBlock.TEXTURE_TECH_PANEL_D.getIcon(); - case 4: + } + case 4 -> { return TexturesGtBlock.Casing_Machine_Metal_Sheet_H.getIcon(); - case 5: + } + case 5 -> { return TexturesGtBlock.Casing_Machine_Metal_Sheet_I.getIcon(); - case 6: + } + case 6 -> { return TexturesGtBlock.TEXTURE_TECH_PANEL_H.getIcon(); - case 7: + } + case 7 -> { if (ordinalSide == 0 || ordinalSide == 1) { return TexturesGtBlock.Manipulator_Top.getIcon(); } return TexturesGtBlock.NeutronPulseManipulator.getIcon(); - case 8: + } + case 8 -> { if (ordinalSide == 0 || ordinalSide == 1) { return TexturesGtBlock.Manipulator_Top.getIcon(); } return TexturesGtBlock.CosmicFabricManipulator.getIcon(); - case 9: + } + case 9 -> { if (ordinalSide == 0 || ordinalSide == 1) { return TexturesGtBlock.Manipulator_Top.getIcon(); } return TexturesGtBlock.InfinityInfusedManipulator.getIcon(); - case 10: + } + case 10 -> { if (ordinalSide == 0 || ordinalSide == 1) { return TexturesGtBlock.Manipulator_Top.getIcon(); } return TexturesGtBlock.SpaceTimeContinuumRipper.getIcon(); - case 11: + } + case 11 -> { return TexturesGtBlock.NeutronShieldingCore.getIcon(); - case 12: + } + case 12 -> { return TexturesGtBlock.CosmicFabricShieldingCore.getIcon(); - case 13: + } + case 13 -> { return TexturesGtBlock.InfinityInfusedShieldingCore.getIcon(); - case 14: + } + case 14 -> { return TexturesGtBlock.SpaceTimeBendingCore.getIcon(); - case 15: + } + case 15 -> { if (ordinalSide == 0 || ordinalSide == 1) { return TexturesGtBlock.Blank.getIcon(); } return TexturesGtBlock.ForceFieldGlass.getIcon(); + } } } return Textures.BlockIcons.RENDERING_ERROR.getIcon(); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocksPipeGearbox.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocksPipeGearbox.java index f6c53e875e..17b5507416 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocksPipeGearbox.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocksPipeGearbox.java @@ -15,7 +15,7 @@ import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; public class GregtechMetaCasingBlocksPipeGearbox extends GregtechMetaCasingBlocksAbstract { - private static HashMap<Integer, Integer> sMaterialMapping = new HashMap<Integer, Integer>(); + private static HashMap<Integer, Integer> sMaterialMapping = new HashMap<>(); public GregtechMetaCasingBlocksPipeGearbox() { super(GregtechMetaCasingItems.class, "gtplusplus.blockcasings.pipesgears", GT_Material_Casings.INSTANCE); @@ -60,24 +60,12 @@ public class GregtechMetaCasingBlocksPipeGearbox extends GregtechMetaCasingBlock public IIcon getIcon(final int ordinalSide, final int meta) { if ((meta >= 0) && (meta < 16)) { switch (meta) { - case 0: - case 1: - case 2: - case 3: - case 4: - case 5: - case 6: - case 7: + case 0, 1, 2, 3, 4, 5, 6, 7 -> { return TexturesGtBlock.TEXTURE_GEARBOX_GENERIC.getIcon(); - case 8: - case 9: - case 10: - case 11: - case 12: - case 13: - case 14: - case 15: + } + case 8, 9, 10, 11, 12, 13, 14, 15 -> { return TexturesGtBlock.TEXTURE_PIPE_GENERIC.getIcon(); + } } } return Textures.BlockIcons.RENDERING_ERROR.getIcon(); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMachineCasings.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMachineCasings.java index b16868aeb2..a8ea05ddbc 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMachineCasings.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMachineCasings.java @@ -65,16 +65,12 @@ public class GregtechMetaSpecialMachineCasings extends GregtechMetaCasingBlocksA @Override public IIcon getIcon(int ordinalSide, int aMeta) { - switch (aMeta) { - case 0: - return Textures.BlockIcons.MACHINE_BRONZEPLATEDBRICKS.getIcon(); - case 1: - return Textures.BlockIcons.MACHINE_CASING_FROST_PROOF.getIcon(); - case 2: - return TexturesGtBlock.Casing_Material_Laurenium.getIcon(); - case 3: - return Textures.BlockIcons.MACHINE_HEATPROOFCASING.getIcon(); - } - return Textures.BlockIcons.RENDERING_ERROR.getIcon(); + return switch (aMeta) { + case 0 -> Textures.BlockIcons.MACHINE_BRONZEPLATEDBRICKS.getIcon(); + case 1 -> Textures.BlockIcons.MACHINE_CASING_FROST_PROOF.getIcon(); + case 2 -> TexturesGtBlock.Casing_Material_Laurenium.getIcon(); + case 3 -> Textures.BlockIcons.MACHINE_HEATPROOFCASING.getIcon(); + default -> Textures.BlockIcons.RENDERING_ERROR.getIcon(); + }; } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings.java index 61e74fc56a..411fef65d3 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings.java @@ -97,40 +97,24 @@ public class GregtechMetaSpecialMultiCasings extends GregtechMetaCasingBlocksAbs } public static IIcon getStaticIcon(final int ordinalSide, final byte aMeta) { - switch (aMeta) { - case 0: - return TexturesGtBlock.Casing_Redox_1.getIcon(); - case 1: - return Textures.BlockIcons.MACHINE_CASING_TURBINE.getIcon(); - case 2: - return Textures.BlockIcons.MACHINE_CASING_STABLE_TITANIUM.getIcon(); - case 3: - return Textures.BlockIcons.MACHINE_CASING_CLEAN_STAINLESSSTEEL.getIcon(); - case 4: - return Textures.BlockIcons.MACHINE_CASING_ROBUST_TUNGSTENSTEEL.getIcon(); - case 5: - return TexturesGtBlock.Casing_Material_RedSteel.getIcon(); - case 6: - return TexturesGtBlock.Casing_Material_MaragingSteel.getIcon(); - case 7: - return TexturesGtBlock.Casing_Material_Stellite.getIcon(); - case 8: - return TexturesGtBlock.Casing_Machine_Simple_Top.getIcon(); - case 9: - return TexturesGtBlock.TEXTURE_CASING_FLOTATION.getIcon(); - case 10: - return TexturesGtBlock.Casing_Material_Talonite.getIcon(); - case 11: - return Textures.BlockIcons.MACHINE_CASING_RADIATIONPROOF.getIcon(); - case 12: - return TexturesGtBlock.Casing_Redox_5.getIcon(); - case 13: - return TexturesGtBlock.TEXTURE_MAGIC_PANEL_B.getIcon(); - case 14: - return TexturesGtBlock.Casing_Material_Talonite.getIcon(); - case 15: - return TexturesGtBlock.Turbine_SC_Material_Casing.getIcon(); - } - return Textures.BlockIcons.RENDERING_ERROR.getIcon(); + return switch (aMeta) { + case 0 -> TexturesGtBlock.Casing_Redox_1.getIcon(); + case 1 -> Textures.BlockIcons.MACHINE_CASING_TURBINE.getIcon(); + case 2 -> Textures.BlockIcons.MACHINE_CASING_STABLE_TITANIUM.getIcon(); + case 3 -> Textures.BlockIcons.MACHINE_CASING_CLEAN_STAINLESSSTEEL.getIcon(); + case 4 -> Textures.BlockIcons.MACHINE_CASING_ROBUST_TUNGSTENSTEEL.getIcon(); + case 5 -> TexturesGtBlock.Casing_Material_RedSteel.getIcon(); + case 6 -> TexturesGtBlock.Casing_Material_MaragingSteel.getIcon(); + case 7 -> TexturesGtBlock.Casing_Material_Stellite.getIcon(); + case 8 -> TexturesGtBlock.Casing_Machine_Simple_Top.getIcon(); + case 9 -> TexturesGtBlock.TEXTURE_CASING_FLOTATION.getIcon(); + case 10 -> TexturesGtBlock.Casing_Material_Talonite.getIcon(); + case 11 -> Textures.BlockIcons.MACHINE_CASING_RADIATIONPROOF.getIcon(); + case 12 -> TexturesGtBlock.Casing_Redox_5.getIcon(); + case 13 -> TexturesGtBlock.TEXTURE_MAGIC_PANEL_B.getIcon(); + case 14 -> TexturesGtBlock.Casing_Material_Talonite.getIcon(); + case 15 -> TexturesGtBlock.Turbine_SC_Material_Casing.getIcon(); + default -> Textures.BlockIcons.RENDERING_ERROR.getIcon(); + }; } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings2.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings2.java index 1cc2403973..d9ae7fc1c6 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings2.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings2.java @@ -84,24 +84,16 @@ public class GregtechMetaSpecialMultiCasings2 extends GregtechMetaCasingBlocksAb } public static IIcon getStaticIcon(final byte aSide, final byte aMeta) { - switch (aMeta) { - case 0: - return TexturesGtBlock.Casing_Resonance_1.getIcon(); - case 1: - return TexturesGtBlock.Casing_Resonance_2.getIcon(); - case 2: - return TexturesGtBlock.Casing_Resonance_3.getIcon(); - case 3: - return TexturesGtBlock.Casing_Resonance_4.getIcon(); - case 4: - return TexturesGtBlock.Casing_Modulator_1.getIcon(); - case 5: - return TexturesGtBlock.Casing_Modulator_2.getIcon(); - case 6: - return TexturesGtBlock.Casing_Modulator_3.getIcon(); - case 7: - return TexturesGtBlock.Casing_Modulator_4.getIcon(); - } - return Textures.BlockIcons.RENDERING_ERROR.getIcon(); + return switch (aMeta) { + case 0 -> TexturesGtBlock.Casing_Resonance_1.getIcon(); + case 1 -> TexturesGtBlock.Casing_Resonance_2.getIcon(); + case 2 -> TexturesGtBlock.Casing_Resonance_3.getIcon(); + case 3 -> TexturesGtBlock.Casing_Resonance_4.getIcon(); + case 4 -> TexturesGtBlock.Casing_Modulator_1.getIcon(); + case 5 -> TexturesGtBlock.Casing_Modulator_2.getIcon(); + case 6 -> TexturesGtBlock.Casing_Modulator_3.getIcon(); + case 7 -> TexturesGtBlock.Casing_Modulator_4.getIcon(); + default -> Textures.BlockIcons.RENDERING_ERROR.getIcon(); + }; } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaTieredCasingBlocks1.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaTieredCasingBlocks1.java index c9f748e171..7ddab1c471 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaTieredCasingBlocks1.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaTieredCasingBlocks1.java @@ -63,7 +63,7 @@ public class GregtechMetaTieredCasingBlocks1 extends GregtechMetaCasingBlocksAbs GregtechItemList.GTPP_Casing_LuV.set(new ItemStack(this, 1, 6)); GregtechItemList.GTPP_Casing_ZPM.set(new ItemStack(this, 1, 7)); GregtechItemList.GTPP_Casing_UV.set(new ItemStack(this, 1, 8)); - GregtechItemList.GTPP_Casing_MAX.set(new ItemStack(this, 1, 9)); + GregtechItemList.GTPP_Casing_UHV.set(new ItemStack(this, 1, 9)); } @Override @@ -71,20 +71,14 @@ public class GregtechMetaTieredCasingBlocks1 extends GregtechMetaCasingBlocksAbs if (aMeta < 10) { return TexturesGtBlock.TIERED_MACHINE_HULLS[aMeta].getIcon(); } - switch (aMeta) { - case 10: - return Textures.BlockIcons.RENDERING_ERROR.getIcon(); - case 11: - return Textures.BlockIcons.RENDERING_ERROR.getIcon(); - case 12: - return Textures.BlockIcons.RENDERING_ERROR.getIcon(); - case 13: - return Textures.BlockIcons.RENDERING_ERROR.getIcon(); - case 14: - return Textures.BlockIcons.RENDERING_ERROR.getIcon(); - case 15: - return Textures.BlockIcons.RENDERING_ERROR.getIcon(); - } - return Textures.BlockIcons.RENDERING_ERROR.getIcon(); + return switch (aMeta) { + case 10 -> Textures.BlockIcons.RENDERING_ERROR.getIcon(); + case 11 -> Textures.BlockIcons.RENDERING_ERROR.getIcon(); + case 12 -> Textures.BlockIcons.RENDERING_ERROR.getIcon(); + case 13 -> Textures.BlockIcons.RENDERING_ERROR.getIcon(); + case 14 -> Textures.BlockIcons.RENDERING_ERROR.getIcon(); + case 15 -> Textures.BlockIcons.RENDERING_ERROR.getIcon(); + default -> Textures.BlockIcons.RENDERING_ERROR.getIcon(); + }; } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler.java index ec1ee2a226..3409277f91 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler.java @@ -13,57 +13,39 @@ public class CasingTextureHandler { public static IIcon getIcon(final int ordinalSide, final int aMeta) { // Texture ID's. case 0 == ID[57] if ((aMeta >= 0) && (aMeta < 16)) { - switch (aMeta) { + return switch (aMeta) { // Centrifuge - case 0: - return TexturesGtBlock.Casing_Material_Centrifuge.getIcon(); + case 0 -> TexturesGtBlock.Casing_Material_Centrifuge.getIcon(); // Coke Oven Frame - case 1: - return TexturesGtBlock.Casing_Material_Tantalloy61.getIcon(); + case 1 -> TexturesGtBlock.Casing_Material_Tantalloy61.getIcon(); // Coke Oven Casing Tier 1 - case 2: - return Textures.BlockIcons.MACHINE_CASING_FIREBOX_BRONZE.getIcon(); + case 2 -> Textures.BlockIcons.MACHINE_CASING_FIREBOX_BRONZE.getIcon(); // Coke Oven Casing Tier 2 - case 3: - return Textures.BlockIcons.MACHINE_CASING_FIREBOX_STEEL.getIcon(); + case 3 -> Textures.BlockIcons.MACHINE_CASING_FIREBOX_STEEL.getIcon(); // Material Press Casings - case 4: - return Textures.BlockIcons.MACHINE_CASING_STABLE_TITANIUM.getIcon(); + case 4 -> Textures.BlockIcons.MACHINE_CASING_STABLE_TITANIUM.getIcon(); // Electrolyzer Casings - case 5: - return TexturesGtBlock.Casing_Material_Potin.getIcon(); + case 5 -> TexturesGtBlock.Casing_Material_Potin.getIcon(); // Broken Blue Fusion Casings - case 6: - return TexturesGtBlock.Casing_Material_MaragingSteel.getIcon(); + case 6 -> TexturesGtBlock.Casing_Material_MaragingSteel.getIcon(); // Maceration Stack Casings - case 7: - return TexturesGtBlock.Casing_Material_Tumbaga.getIcon(); + case 7 -> TexturesGtBlock.Casing_Material_Tumbaga.getIcon(); // Broken Pink Fusion Casings - case 8: - return TexturesGtBlock.TEXTURE_ORGANIC_PANEL_A_GLOWING.getIcon(); + case 8 -> TexturesGtBlock.TEXTURE_ORGANIC_PANEL_A_GLOWING.getIcon(); // Matter Fabricator Casings - case 9: - return TexturesGtBlock.TEXTURE_METAL_PANEL_F.getIcon(); + case 9 -> TexturesGtBlock.TEXTURE_METAL_PANEL_F.getIcon(); // Iron Blast Fuance Textures - case 10: - return TexturesGtBlock.Casing_Machine_Simple_Top.getIcon(); + case 10 -> TexturesGtBlock.Casing_Machine_Simple_Top.getIcon(); // Multitank Exterior Casing - case 11: - return TexturesGtBlock.Casing_Material_Grisium.getIcon(); + case 11 -> TexturesGtBlock.Casing_Material_Grisium.getIcon(); // Reactor Casing I - case 12: - return TexturesGtBlock.Casing_Material_Stellite.getIcon(); + case 12 -> TexturesGtBlock.Casing_Material_Stellite.getIcon(); // Reactor Casing II - case 13: - return TexturesGtBlock.Casing_Material_Zeron100.getIcon(); - case 14: - return TexturesGtBlock.Casing_Staballoy_Firebox.getIcon(); - case 15: - return TexturesGtBlock.Casing_Material_ZirconiumCarbide.getIcon(); - - default: - return Textures.BlockIcons.MACHINE_CASING_RADIOACTIVEHAZARD.getIcon(); - } + case 13 -> TexturesGtBlock.Casing_Material_Zeron100.getIcon(); + case 14 -> TexturesGtBlock.Casing_Staballoy_Firebox.getIcon(); + case 15 -> TexturesGtBlock.Casing_Material_ZirconiumCarbide.getIcon(); + default -> Textures.BlockIcons.MACHINE_CASING_RADIOACTIVEHAZARD.getIcon(); + }; } return Textures.BlockIcons.MACHINE_CASING_GEARBOX_TUNGSTENSTEEL.getIcon(); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler2.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler2.java index e02a9ffbd3..1da572fb35 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler2.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler2.java @@ -9,44 +9,61 @@ public class CasingTextureHandler2 { public static IIcon getIcon(final int ordinalSide, final int aMeta) { // Texture ID's. case 0 == ID[57] if ((aMeta >= 0) && (aMeta < 16)) { switch (aMeta) { - case 0: + case 0 -> { return TexturesGtBlock.Casing_Material_RedSteel.getIcon(); - case 1: + } + case 1 -> { return TexturesGtBlock.Casing_Material_HastelloyX.getIcon(); - case 2: + } + case 2 -> { return TexturesGtBlock.Casing_Material_HastelloyN.getIcon(); - case 3: + } + case 3 -> { return TexturesGtBlock.Casing_Material_Fluid_IncoloyDS.getIcon(); - case 4: + } + case 4 -> { return TexturesGtBlock.Casing_Material_Grisium.getIcon(); - case 5: + } + case 5 -> { return TexturesGtBlock.Casing_Machine_Metal_Panel_A.getIcon(); - case 6: + } + case 6 -> { return TexturesGtBlock.Casing_Machine_Metal_Grate_A.getIcon(); - case 7: + } + case 7 -> { return TexturesGtBlock.Casing_Redox_1.getIcon(); - case 8: + } + case 8 -> { return TexturesGtBlock.Casing_Machine_Metal_Sheet_A.getIcon(); - case 9: + } + case 9 -> { return TexturesGtBlock.Overlay_Machine_Cyber_A.getIcon(); - case 10: + } + case 10 -> { return Textures.BlockIcons.MACHINE_CASING_RADIATIONPROOF.getIcon(); - case 11: + } + case 11 -> { return TexturesGtBlock.Casing_Material_Tantalloy61.getIcon(); - case 12: + } + case 12 -> { return TexturesGtBlock.Casing_Machine_Simple_Top.getIcon(); - case 13: + } + case 13 -> { if (ordinalSide < 2) { return TexturesGtBlock.TEXTURE_TECH_A.getIcon(); } else { return TexturesGtBlock.TEXTURE_TECH_B.getIcon(); } - case 14: + } + case 14 -> { return Textures.BlockIcons.RENDERING_ERROR.getIcon(); - case 15: + } + case 15 -> { return TexturesGtBlock.Casing_Machine_Acacia_Log.getIcon(); - default: + } + default -> { return TexturesGtBlock.Overlay_UU_Matter.getIcon(); + } } } return TexturesGtBlock._PlaceHolder.getIcon(); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java index 9ffbbd6a85..6b2627ec39 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java @@ -8,55 +8,49 @@ public class CasingTextureHandler3 { public static IIcon getIcon(final int ordinalSide, final int aMeta) { // Texture ID's. case 0 == ID[57] if ((aMeta >= 0) && (aMeta < 16)) { - switch (aMeta) { - case 0: + return switch (aMeta) { + case 0 -> // Aquatic Casing - return TexturesGtBlock.TEXTURE_METAL_PANEL_B.getIcon(); - case 1: + TexturesGtBlock.TEXTURE_METAL_PANEL_B.getIcon(); + case 1 -> // Inconel Reinforced Casing - return TexturesGtBlock.TEXTURE_METAL_PANEL_D.getIcon(); - case 2: + TexturesGtBlock.TEXTURE_METAL_PANEL_D.getIcon(); + case 2 -> // Multi-Use Casing - return TexturesGtBlock.TEXTURE_METAL_PANEL_C.getIcon(); - case 3: + TexturesGtBlock.TEXTURE_METAL_PANEL_C.getIcon(); + case 3 -> // Trinium Plated Mining Platform Casing - return TexturesGtBlock.Casing_Trinium_Naquadah_Vent.getIcon(); - case 4: + TexturesGtBlock.Casing_Trinium_Naquadah_Vent.getIcon(); + case 4 -> // Vanadium Redox IV - return TexturesGtBlock.Casing_Redox_2.getIcon(); - case 5: + TexturesGtBlock.Casing_Redox_2.getIcon(); + case 5 -> // Vanadium Redox LuV - return TexturesGtBlock.Casing_Redox_3.getIcon(); - case 6: + TexturesGtBlock.Casing_Redox_3.getIcon(); + case 6 -> // Vanadium Redox ZPM - return TexturesGtBlock.Casing_Redox_4.getIcon(); - case 7: + TexturesGtBlock.Casing_Redox_4.getIcon(); + case 7 -> // Vanadium Redox UV - return TexturesGtBlock.Casing_Redox_5.getIcon(); - case 8: + TexturesGtBlock.Casing_Redox_5.getIcon(); + case 8 -> // Vanadium Redox MAX - return TexturesGtBlock.Casing_Redox_6.getIcon(); - case 9: + TexturesGtBlock.Casing_Redox_6.getIcon(); + case 9 -> // Amazon Warehouse Casing - return TexturesGtBlock.TEXTURE_CASING_AMAZON.getIcon(); - case 10: + TexturesGtBlock.TEXTURE_CASING_AMAZON.getIcon(); + case 10 -> // Adv. Vac. Freezer - return TexturesGtBlock.TEXTURE_CASING_ADVANCED_CRYOGENIC.getIcon(); - case 11: + TexturesGtBlock.TEXTURE_CASING_ADVANCED_CRYOGENIC.getIcon(); + case 11 -> // Adv. EBF - return TexturesGtBlock.TEXTURE_CASING_ADVANCED_VOLCNUS.getIcon(); - case 12: - return TexturesGtBlock.TEXTURE_CASING_FUSION_COIL_II.getIcon(); - case 13: - return TexturesGtBlock.TEXTURE_CASING_FUSION_COIL_II_INNER.getIcon(); - case 14: - return TexturesGtBlock.TEXTURE_CASING_FUSION_CASING_ULTRA.getIcon(); - case 15: - return TexturesGtBlock.TEXTURE_MAGIC_PANEL_A.getIcon(); - - default: - return TexturesGtBlock._PlaceHolder.getIcon(); - } + TexturesGtBlock.TEXTURE_CASING_ADVANCED_VOLCNUS.getIcon(); + case 12 -> TexturesGtBlock.TEXTURE_CASING_FUSION_COIL_II.getIcon(); + case 13 -> TexturesGtBlock.TEXTURE_CASING_FUSION_COIL_II_INNER.getIcon(); + case 14 -> TexturesGtBlock.TEXTURE_CASING_FUSION_CASING_ULTRA.getIcon(); + case 15 -> TexturesGtBlock.TEXTURE_MAGIC_PANEL_A.getIcon(); + default -> TexturesGtBlock._PlaceHolder.getIcon(); + }; } return TexturesGtBlock._PlaceHolder.getIcon(); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler6.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler6.java index e33099b09a..b8d5a024df 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler6.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler6.java @@ -8,17 +8,12 @@ public class CasingTextureHandler6 { public static IIcon getIcon(final int ordinalSide, final int aMeta) { // Texture ID's. case 0 == ID[57] if ((aMeta >= 0) && (aMeta < 16)) { - switch (aMeta) { - case 0: - return TexturesGtBlock.TEXTURE_CASING_FUSION_COIL_III.getIcon(); - case 1: - return TexturesGtBlock.TEXTURE_CASING_FUSION_COIL_III_INNER.getIcon(); - case 2: - return TexturesGtBlock.TEXTURE_CASING_FUSION_CASING_HYPER.getIcon(); - default: - return TexturesGtBlock._PlaceHolder.getIcon(); - - } + return switch (aMeta) { + case 0 -> TexturesGtBlock.TEXTURE_CASING_FUSION_COIL_III.getIcon(); + case 1 -> TexturesGtBlock.TEXTURE_CASING_FUSION_COIL_III_INNER.getIcon(); + case 2 -> TexturesGtBlock.TEXTURE_CASING_FUSION_CASING_HYPER.getIcon(); + default -> TexturesGtBlock._PlaceHolder.getIcon(); + }; } return TexturesGtBlock._PlaceHolder.getIcon(); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesCentrifugeMultiblock.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesCentrifugeMultiblock.java index 8ad5bd914d..f4d0ec0608 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesCentrifugeMultiblock.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesCentrifugeMultiblock.java @@ -66,8 +66,7 @@ public class TexturesCentrifugeMultiblock { private static int isCentrifugeControllerWithSide(IBlockAccess aWorld, int aX, int aY, int aZ, ForgeDirection side) { TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ); - if (!(tTileEntity instanceof IGregTechTileEntity)) return 0; - IGregTechTileEntity tTile = (IGregTechTileEntity) tTileEntity; + if (!(tTileEntity instanceof IGregTechTileEntity tTile)) return 0; if (tTile.getMetaTileEntity() instanceof GregtechMetaTileEntity_IndustrialCentrifuge && tTile.getFrontFacing() == side) return tTile.isActive() ? 1 : 2; @@ -84,7 +83,7 @@ public class TexturesCentrifugeMultiblock { int tInvertLeftRightMod = ordinalSide % 2 * 2 - 1; switch (ordinalSide / 2) { - case 0: + case 0 -> { for (int i = -1; i < 2; i++) { for (int j = -1; j < 2; j++) { if (i == 0 && j == 0) continue; @@ -95,8 +94,8 @@ public class TexturesCentrifugeMultiblock { } } } - break; - case 1: + } + case 1 -> { for (int i = -1; i < 2; i++) { for (int j = -1; j < 2; j++) { if (i == 0 && j == 0) continue; @@ -107,8 +106,8 @@ public class TexturesCentrifugeMultiblock { } } } - break; - case 2: + } + case 2 -> { for (int i = -1; i < 2; i++) { for (int j = -1; j < 2; j++) { if (i == 0 && j == 0) continue; @@ -119,7 +118,7 @@ public class TexturesCentrifugeMultiblock { } } } - break; + } } return TexturesGtBlock.Casing_Material_Centrifuge.getIcon(); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGrinderMultiblock.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGrinderMultiblock.java index f042b88370..fab36fbcea 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGrinderMultiblock.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGrinderMultiblock.java @@ -60,8 +60,7 @@ public class TexturesGrinderMultiblock { private static int isIsaControllerWithSide(IBlockAccess aWorld, int aX, int aY, int aZ, ForgeDirection side) { TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ); - if (!(tTileEntity instanceof IGregTechTileEntity)) return 0; - IGregTechTileEntity tTile = (IGregTechTileEntity) tTileEntity; + if (!(tTileEntity instanceof IGregTechTileEntity tTile)) return 0; if (tTile.getMetaTileEntity() instanceof GregtechMetaTileEntity_IsaMill && tTile.getFrontFacing() == side) return tTile.isActive() ? 1 : 2; return 0; @@ -76,7 +75,7 @@ public class TexturesGrinderMultiblock { } int tInvertLeftRightMod = ordinalSide % 2 * 2 - 1; switch (ordinalSide / 2) { - case 0: + case 0 -> { for (int i = -1; i < 2; i++) { for (int j = -1; j < 2; j++) { if (i == 0 && j == 0) continue; @@ -87,8 +86,8 @@ public class TexturesGrinderMultiblock { } } } - break; - case 1: + } + case 1 -> { for (int i = -1; i < 2; i++) { for (int j = -1; j < 2; j++) { if (i == 0 && j == 0) continue; @@ -99,8 +98,8 @@ public class TexturesGrinderMultiblock { } } } - break; - case 2: + } + case 2 -> { for (int i = -1; i < 2; i++) { for (int j = -1; j < 2; j++) { if (i == 0 && j == 0) continue; @@ -111,7 +110,7 @@ public class TexturesGrinderMultiblock { } } } - break; + } } return TexturesGtBlock.TEXTURE_CASING_GRINDING_MILL.getIcon(); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java index cac8aa742f..3d71f00514 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java @@ -19,7 +19,7 @@ public class TexturesGtBlock { private static boolean mAnimated = CORE.ConfigSwitches.enableAnimatedTextures; - private static AutoMap<Runnable> mCustomiconMap = new AutoMap<Runnable>(); + private static AutoMap<Runnable> mCustomiconMap = new AutoMap<>(); static {} @@ -276,8 +276,6 @@ public class TexturesGtBlock { public static final CustomIcon Casing_Redox_4 = new CustomIcon("redox/redox4"); public static final CustomIcon Casing_Redox_5 = new CustomIcon("redox/redox5"); public static final CustomIcon Casing_Redox_6 = new CustomIcon("redox/redox6"); - // public static final CustomIcon Casing_Redox_7 = new CustomIcon("redox/redox7"); - // public static final CustomIcon Casing_Redox_8 = new CustomIcon("redox/redox8"); // Special Block 2 public static final CustomIcon Casing_Resonance_1 = new CustomIcon("special/block_1"); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtTools.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtTools.java index dfb519a445..7400bb987c 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtTools.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtTools.java @@ -19,8 +19,8 @@ public final class TexturesGtTools { public static final class CustomIcon implements IIconContainer, Runnable { - protected IIcon mIcon, mOverlay; - protected final String mIconName; + private IIcon mIcon, mOverlay; + private final String mIconName; public CustomIcon(final String aIconName) { this.mIconName = aIconName; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_Overflow.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_Overflow.java index af80b7c684..d3b8dc3498 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_Overflow.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_Overflow.java @@ -46,8 +46,6 @@ public class GTPP_Cover_Overflow extends GT_CoverBehavior { directionFrom = ForgeDirection.UNKNOWN; tTank1 = (IFluidHandler) aTileEntity; if (tTank1 != null) { - // Logger.INFO("Found Self. "+aSide); - // FluidStack aTankStack = tTank1.drain(ForgeDirection.UNKNOWN, 1, false); FluidStack aTankStack = tTank1.getTankInfo(directionFrom)[0].fluid; if (aTankStack != null) { // Logger.INFO("Found Fluid inside self - "+aTankStack.getLocalizedName()+", overflow point set at @@ -217,8 +215,8 @@ public class GTPP_Cover_Overflow extends GT_CoverBehavior { (warn.get() ? GT_Utility.trans("325", "Max") : GT_Utility.trans("324", "Now")) + ": " + convert(getCoverData()) - + "/" - + mMaxTransferRate + + " / " + + GT_Utility.formatNumbers(mMaxTransferRate) + " " + GT_Utility.trans("323", "L")).color( warn.get() ? COLOR_TEXT_WARN.get() diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_ToggleVisual.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_ToggleVisual.java index 44ddf9f6cf..cea96cefea 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_ToggleVisual.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_ToggleVisual.java @@ -21,8 +21,8 @@ import gtPlusPlus.core.util.minecraft.PlayerUtils; public class GTPP_Cover_ToggleVisual extends GT_CoverBehavior { - private static final Map<String, Integer> sConnectionStateForEntityMap = new ConcurrentHashMap<String, Integer>(); - private static final Map<String, String> sPrefixMap = new ConcurrentHashMap<String, String>(); + private static final Map<String, Integer> sConnectionStateForEntityMap = new ConcurrentHashMap<>(); + private static final Map<String, String> sPrefixMap = new ConcurrentHashMap<>(); private static final int VALUE_OFF = 0; private static final int VALUE_ON = 1; @@ -153,7 +153,7 @@ public class GTPP_Cover_ToggleVisual extends GT_CoverBehavior { return aCoverVar == VALUE_ON; } - private static final void trySetState(ForgeDirection side, int aState, ICoverable aTile) { + private static void trySetState(ForgeDirection side, int aState, ICoverable aTile) { // Try set cover state directly if (aTile instanceof IGregTechTileEntity gTileEntity) { gTileEntity.setCoverDataAtSide(side, new ISerializableObject.LegacyCoverData(aState)); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/ChargingHelper.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/ChargingHelper.java index ce9ea45841..a2114ab375 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/ChargingHelper.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/ChargingHelper.java @@ -1,7 +1,8 @@ package gtPlusPlus.xmod.gregtech.common.helpers; import static gregtech.api.GregTech_API.mEUtoRF; -import static gregtech.api.enums.Mods.*; +import static gregtech.api.enums.Mods.Baubles; +import static gregtech.api.enums.Mods.COFHCore; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/FlotationRecipeHandler.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/FlotationRecipeHandler.java index b866be1d87..8cbb473a42 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/FlotationRecipeHandler.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/FlotationRecipeHandler.java @@ -13,8 +13,8 @@ import gtPlusPlus.core.material.Material; public class FlotationRecipeHandler { - private static final HashMap<String, Material> sMaterialMap = new HashMap<String, Material>(); - private static final HashMap<String, ItemStack> sMilledMap = new HashMap<String, ItemStack>(); + private static final HashMap<String, Material> sMaterialMap = new HashMap<>(); + private static final HashMap<String, ItemStack> sMilledMap = new HashMap<>(); public static boolean registerOreType(Material aMaterial) { String aMaterialKey = aMaterial.getUnlocalizedName(); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java index a8b3ea15ea..7774a34dc1 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java @@ -13,16 +13,15 @@ public class TreeFarmHelper { public static SAWTOOL isCorrectMachinePart(final ItemStack aStack) { if (aStack != null && aStack.getItem() instanceof GT_MetaGenerated_Tool_01) { switch (aStack.getItemDamage()) { - case GT_MetaGenerated_Tool_01.SAW: + case GT_MetaGenerated_Tool_01.SAW -> { return SAWTOOL.SAW; - case GT_MetaGenerated_Tool_01.BUZZSAW_LV: - case GT_MetaGenerated_Tool_01.BUZZSAW_MV: - case GT_MetaGenerated_Tool_01.BUZZSAW_HV: + } + case GT_MetaGenerated_Tool_01.BUZZSAW_LV, GT_MetaGenerated_Tool_01.BUZZSAW_MV, GT_MetaGenerated_Tool_01.BUZZSAW_HV -> { return SAWTOOL.BUZZSAW; - case GT_MetaGenerated_Tool_01.CHAINSAW_LV: - case GT_MetaGenerated_Tool_01.CHAINSAW_MV: - case GT_MetaGenerated_Tool_01.CHAINSAW_HV: + } + case GT_MetaGenerated_Tool_01.CHAINSAW_LV, GT_MetaGenerated_Tool_01.CHAINSAW_MV, GT_MetaGenerated_Tool_01.CHAINSAW_HV -> { return SAWTOOL.CHAINSAW; + } } } return SAWTOOL.NONE; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/tesseract/TesseractHelper.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/tesseract/TesseractHelper.java index 93442675ca..a526e61107 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/tesseract/TesseractHelper.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/tesseract/TesseractHelper.java @@ -4,7 +4,6 @@ import static gtPlusPlus.core.lib.CORE.sTesseractGeneratorOwnershipMap; import static gtPlusPlus.core.lib.CORE.sTesseractTerminalOwnershipMap; import java.util.HashMap; -import java.util.Iterator; import java.util.Map; import java.util.Map.Entry; import java.util.Set; @@ -38,10 +37,8 @@ public class TesseractHelper { // Utils.LOG_WARNING("Success. [isGeneratorOwnedByPlayer] 2"); Map<Integer, GT_MetaTileEntity_TesseractGenerator> generators = getGeneratorOwnershipByPlayer(player); Set<Entry<Integer, GT_MetaTileEntity_TesseractGenerator>> players = generators.entrySet(); - Iterator<Entry<Integer, GT_MetaTileEntity_TesseractGenerator>> i = players.iterator(); - while (i.hasNext()) { + for (Entry<Integer, GT_MetaTileEntity_TesseractGenerator> current : players) { // Utils.LOG_WARNING("Success. [isGeneratorOwnedByPlayer] 3"); - Entry<Integer, GT_MetaTileEntity_TesseractGenerator> current = i.next(); if (current.getValue().equals(generator)) { // Utils.LOG_WARNING("Success. [isGeneratorOwnedByPlayer] 4"); return true; @@ -64,7 +61,7 @@ public class TesseractHelper { Map<Integer, GT_MetaTileEntity_TesseractGenerator> playerOwned = sTesseractGeneratorOwnershipMap .get(playerIdentifier); if (playerOwned == null || playerOwned.isEmpty()) { - Map<Integer, GT_MetaTileEntity_TesseractGenerator> newOwnershipMap = new HashMap<Integer, GT_MetaTileEntity_TesseractGenerator>(); + Map<Integer, GT_MetaTileEntity_TesseractGenerator> newOwnershipMap = new HashMap<>(); newOwnershipMap.put(freq, generator); sTesseractGeneratorOwnershipMap.put(playerIdentifier, newOwnershipMap); Logger.WARNING("Success! [Empty Map]"); @@ -96,10 +93,8 @@ public class TesseractHelper { // Utils.LOG_WARNING("Success. [getGeneratorByFrequency] 1"); Map<Integer, GT_MetaTileEntity_TesseractGenerator> generators = getGeneratorOwnershipByPlayer(player); Set<Entry<Integer, GT_MetaTileEntity_TesseractGenerator>> players = generators.entrySet(); - Iterator<Entry<Integer, GT_MetaTileEntity_TesseractGenerator>> i = players.iterator(); - while (i.hasNext()) { + for (Entry<Integer, GT_MetaTileEntity_TesseractGenerator> current : players) { // Utils.LOG_WARNING("Success. [getGeneratorByFrequency] 2"); - Entry<Integer, GT_MetaTileEntity_TesseractGenerator> current = i.next(); if (current.getKey().equals(freq)) { // Utils.LOG_WARNING("Success. [getGeneratorByFrequency] 3"); Logger.WARNING("Success!"); @@ -142,9 +137,7 @@ public class TesseractHelper { if (!sTesseractTerminalOwnershipMap.isEmpty() && playerIdentifier != null) { Map<Integer, GT_MetaTileEntity_TesseractTerminal> generators = getTerminalOwnershipByPlayer(player); Set<Entry<Integer, GT_MetaTileEntity_TesseractTerminal>> players = generators.entrySet(); - Iterator<Entry<Integer, GT_MetaTileEntity_TesseractTerminal>> i = players.iterator(); - while (i.hasNext()) { - Entry<Integer, GT_MetaTileEntity_TesseractTerminal> current = i.next(); + for (Entry<Integer, GT_MetaTileEntity_TesseractTerminal> current : players) { if (current.getValue().equals(generator)) { return true; } @@ -165,7 +158,7 @@ public class TesseractHelper { Map<Integer, GT_MetaTileEntity_TesseractTerminal> playerOwned = sTesseractTerminalOwnershipMap .get(playerIdentifier); if (playerOwned == null || playerOwned.isEmpty()) { - Map<Integer, GT_MetaTileEntity_TesseractTerminal> newOwnershipMap = new HashMap<Integer, GT_MetaTileEntity_TesseractTerminal>(); + Map<Integer, GT_MetaTileEntity_TesseractTerminal> newOwnershipMap = new HashMap<>(); newOwnershipMap.put(freq, generator); sTesseractTerminalOwnershipMap.put(playerIdentifier, newOwnershipMap); Logger.WARNING("Success! [Empty Map]"); @@ -195,9 +188,7 @@ public class TesseractHelper { if (!sTesseractTerminalOwnershipMap.isEmpty() && playerIdentifier != null) { Map<Integer, GT_MetaTileEntity_TesseractTerminal> generators = getTerminalOwnershipByPlayer(player); Set<Entry<Integer, GT_MetaTileEntity_TesseractTerminal>> players = generators.entrySet(); - Iterator<Entry<Integer, GT_MetaTileEntity_TesseractTerminal>> i = players.iterator(); - while (i.hasNext()) { - Entry<Integer, GT_MetaTileEntity_TesseractTerminal> current = i.next(); + for (Entry<Integer, GT_MetaTileEntity_TesseractTerminal> current : players) { if (current.getKey().equals(freq)) { Logger.WARNING("Success!"); return current.getValue(); @@ -226,15 +217,13 @@ public class TesseractHelper { * Internal Methods * */ - private static final Map<Integer, GT_MetaTileEntity_TesseractGenerator> getGeneratorOwnershipByPlayer( + private static Map<Integer, GT_MetaTileEntity_TesseractGenerator> getGeneratorOwnershipByPlayer( EntityPlayer player) { UUID playerIdentifier = player.getUniqueID(); if (!sTesseractGeneratorOwnershipMap.isEmpty() && playerIdentifier != null) { Set<Entry<UUID, Map<Integer, GT_MetaTileEntity_TesseractGenerator>>> players = sTesseractGeneratorOwnershipMap .entrySet(); - Iterator<Entry<UUID, Map<Integer, GT_MetaTileEntity_TesseractGenerator>>> i = players.iterator(); - while (i.hasNext()) { - Entry<UUID, Map<Integer, GT_MetaTileEntity_TesseractGenerator>> current = i.next(); + for (Entry<UUID, Map<Integer, GT_MetaTileEntity_TesseractGenerator>> current : players) { if (current.getKey().compareTo(playerIdentifier) == 0) { return current.getValue(); } @@ -243,15 +232,12 @@ public class TesseractHelper { return null; } - private static final Map<Integer, GT_MetaTileEntity_TesseractTerminal> getTerminalOwnershipByPlayer( - EntityPlayer player) { + private static Map<Integer, GT_MetaTileEntity_TesseractTerminal> getTerminalOwnershipByPlayer(EntityPlayer player) { UUID playerIdentifier = player.getUniqueID(); if (!sTesseractTerminalOwnershipMap.isEmpty() && playerIdentifier != null) { Set<Entry<UUID, Map<Integer, GT_MetaTileEntity_TesseractTerminal>>> players = sTesseractTerminalOwnershipMap .entrySet(); - Iterator<Entry<UUID, Map<Integer, GT_MetaTileEntity_TesseractTerminal>>> i = players.iterator(); - while (i.hasNext()) { - Entry<UUID, Map<Integer, GT_MetaTileEntity_TesseractTerminal>> current = i.next(); + for (Entry<UUID, Map<Integer, GT_MetaTileEntity_TesseractTerminal>> current : players) { if (current.getKey().compareTo(playerIdentifier) == 0) { return current.getValue(); } 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); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java index ae3a40cff9..6344632a6b 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java @@ -45,7 +45,7 @@ public class GTPP_CapeRenderer extends RenderPlayer { mInit = init(); } - private final boolean init() { + private boolean init() { if (mInit) { return false; } @@ -165,7 +165,7 @@ public class GTPP_CapeRenderer extends RenderPlayer { } } - private final boolean renderCapeOnPlayer(RenderPlayerEvent.Specials.Pre aEvent, AbstractClientPlayer aPlayer) { + private boolean renderCapeOnPlayer(RenderPlayerEvent.Specials.Pre aEvent, AbstractClientPlayer aPlayer) { float aPartialTicks = aEvent.partialRenderTick; try { if (tResource == null && CORE.DEVENV) { @@ -174,7 +174,7 @@ public class GTPP_CapeRenderer extends RenderPlayer { // If player is invisible, don't render. if (GT_Utility.getFullInvisibility(aPlayer) || aPlayer.isInvisible() - || GT_Utility.getPotion(aPlayer, Integer.valueOf(Potion.invisibility.id).intValue())) { + || GT_Utility.getPotion(aPlayer, Integer.valueOf(Potion.invisibility.id))) { aEvent.setCanceled(true); return false; } @@ -235,13 +235,13 @@ public class GTPP_CapeRenderer extends RenderPlayer { private static AES sAES; // UUID - Username - private static final AutoMap<Pair<String, String>> mOrangeCapes = new AutoMap<Pair<String, String>>(); - private static final AutoMap<Pair<String, String>> mMiscCapes = new AutoMap<Pair<String, String>>(); - private static final AutoMap<Pair<String, String>> mBetaTestCapes = new AutoMap<Pair<String, String>>(); - private static final AutoMap<Pair<String, String>> mPatreonCapes = new AutoMap<Pair<String, String>>(); - private static final AutoMap<Pair<String, String>> mDevCapes = new AutoMap<Pair<String, String>>(); + private static final AutoMap<Pair<String, String>> mOrangeCapes = new AutoMap<>(); + private static final AutoMap<Pair<String, String>> mMiscCapes = new AutoMap<>(); + private static final AutoMap<Pair<String, String>> mBetaTestCapes = new AutoMap<>(); + private static final AutoMap<Pair<String, String>> mPatreonCapes = new AutoMap<>(); + private static final AutoMap<Pair<String, String>> mDevCapes = new AutoMap<>(); - private static final boolean init() { + private static boolean init() { CapeUtils.handleOldCapeCache(); if (CORE.DEVENV) { return true; @@ -267,7 +267,7 @@ public class GTPP_CapeRenderer extends RenderPlayer { return false; } - private static final boolean isCapeCacheWeekOld() { + private static boolean isCapeCacheWeekOld() { if (!doesCapeCacheExistLocally()) { return true; } else { @@ -281,7 +281,7 @@ public class GTPP_CapeRenderer extends RenderPlayer { return false; } - private static final void downloadCapeList() { + private static void downloadCapeList() { try { File dat = getCapeCache(); File temp = allocateTempFile(); @@ -297,7 +297,7 @@ public class GTPP_CapeRenderer extends RenderPlayer { } } - private static final boolean isDownloadedCapeListBigger(File aFile) { + private static boolean isDownloadedCapeListBigger(File aFile) { double aExistingFileSize = (doesCapeCacheExistLocally() ? getCapeCache().length() : 0); double aNewFileSize = aFile.length(); if (aNewFileSize > aExistingFileSize) { @@ -313,7 +313,7 @@ public class GTPP_CapeRenderer extends RenderPlayer { } } - private static final boolean doesCapeCacheExistLocally() { + private static boolean doesCapeCacheExistLocally() { File aCacheFile = FileUtils.getFile("CapeCache", "dat"); if (FileUtils.doesFileExist(aCacheFile)) { return true; @@ -321,7 +321,7 @@ public class GTPP_CapeRenderer extends RenderPlayer { return false; } - private static final File getCapeCache() { + private static File getCapeCache() { File aCacheFile = FileUtils.getFile("CapeCache", "dat"); if (FileUtils.doesFileExist(aCacheFile)) { FileUtils.createFile(aCacheFile); @@ -335,10 +335,10 @@ public class GTPP_CapeRenderer extends RenderPlayer { if (aCache != null && !aCache.isEmpty()) { return aCache; } - return new AutoMap<String>(); + return new AutoMap<>(); } - private static final File allocateTempFile() { + private static File allocateTempFile() { File tempFile = null; try { tempFile = File.createTempFile("gtpp-", null); @@ -359,16 +359,16 @@ public class GTPP_CapeRenderer extends RenderPlayer { if (sAES == null) { sAES = new AES(); } - AutoMap<String> aDecodedData = new AutoMap<String>(); + AutoMap<String> aDecodedData = new AutoMap<>(); for (String aToDecode : aCacheData) { aDecodedData.put(sAES.decode(aToDecode)); } if (!aDecodedData.isEmpty()) { - AutoMap<Pair<String, String>> aCapeType1 = new AutoMap<Pair<String, String>>(); - AutoMap<Pair<String, String>> aCapeType2 = new AutoMap<Pair<String, String>>(); - AutoMap<Pair<String, String>> aCapeType3 = new AutoMap<Pair<String, String>>(); - AutoMap<Pair<String, String>> aCapeType4 = new AutoMap<Pair<String, String>>(); - AutoMap<Pair<String, String>> aCapeType5 = new AutoMap<Pair<String, String>>(); + AutoMap<Pair<String, String>> aCapeType1 = new AutoMap<>(); + AutoMap<Pair<String, String>> aCapeType2 = new AutoMap<>(); + AutoMap<Pair<String, String>> aCapeType3 = new AutoMap<>(); + AutoMap<Pair<String, String>> aCapeType4 = new AutoMap<>(); + AutoMap<Pair<String, String>> aCapeType5 = new AutoMap<>(); boolean didProcessStringData = false; Logger.INFO("Decoded String Count: " + aDecodedData.size()); for (String aToSplit : aDecodedData) { @@ -378,55 +378,54 @@ public class GTPP_CapeRenderer extends RenderPlayer { Integer aCapeTypeID2 = Integer.parseInt(aSplitData[0]); if (aCapeTypeID2 != null) { int aCapeTypeID = aCapeTypeID2; - Pair<String, String> aFinalString = new Pair<String, String>( + Pair<String, String> aFinalString = new Pair<>( "UUID: " + aSplitData[1], "Username: " + (aSplitData[2] != null && aSplitData[0].length() > 0 ? aSplitData[2] : "Not Specified")); Logger.INFO("Cape Type: " + aCapeTypeID); switch (aCapeTypeID) { - case 0: + case 0 -> { aCapeType1.add(aFinalString); Logger.INFO( "Added user to map " + aCapeTypeID + ", map now holds " + aCapeType1.size() + " users."); - break; - case 1: + } + case 1 -> { aCapeType2.add(aFinalString); Logger.INFO( "Added user to map " + aCapeTypeID + ", map now holds " + aCapeType2.size() + " users."); - break; - case 2: + } + case 2 -> { aCapeType3.add(aFinalString); Logger.INFO( "Added user to map " + aCapeTypeID + ", map now holds " + aCapeType3.size() + " users."); - break; - case 3: + } + case 3 -> { aCapeType4.add(aFinalString); Logger.INFO( "Added user to map " + aCapeTypeID + ", map now holds " + aCapeType4.size() + " users."); - break; - case 4: + } + case 4 -> { aCapeType5.add(aFinalString); Logger.INFO( "Added user to map " + aCapeTypeID + ", map now holds " + aCapeType5.size() + " users."); - break; - default: - break; + } + default -> {} } } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_Render_MachineBlock.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_Render_MachineBlock.java index b3fe3dd935..9b4962fea7 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_Render_MachineBlock.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_Render_MachineBlock.java @@ -1079,9 +1079,9 @@ public class GTPP_Render_MachineBlock extends GT_Renderer_Block { } if (aIcon != null) { - for (int i = 0; i < aIcon.length; ++i) { - if (aIcon[i] != null) { - aIcon[i].renderYNeg(aRenderer, aBlock, aX, aY, aZ); + for (ITexture iTexture : aIcon) { + if (iTexture != null) { + iTexture.renderYNeg(aRenderer, aBlock, aX, aY, aZ); } } } @@ -1101,9 +1101,9 @@ public class GTPP_Render_MachineBlock extends GT_Renderer_Block { } if (aIcon != null) { - for (int i = 0; i < aIcon.length; ++i) { - if (aIcon[i] != null) { - aIcon[i].renderYPos(aRenderer, aBlock, aX, aY, aZ); + for (ITexture iTexture : aIcon) { + if (iTexture != null) { + iTexture.renderYPos(aRenderer, aBlock, aX, aY, aZ); } } } @@ -1124,9 +1124,9 @@ public class GTPP_Render_MachineBlock extends GT_Renderer_Block { aRenderer.flipTexture = !aFullBlock; if (aIcon != null) { - for (int i = 0; i < aIcon.length; ++i) { - if (aIcon[i] != null) { - aIcon[i].renderZNeg(aRenderer, aBlock, aX, aY, aZ); + for (ITexture iTexture : aIcon) { + if (iTexture != null) { + iTexture.renderZNeg(aRenderer, aBlock, aX, aY, aZ); } } } @@ -1146,9 +1146,9 @@ public class GTPP_Render_MachineBlock extends GT_Renderer_Block { } if (aIcon != null) { - for (int i = 0; i < aIcon.length; ++i) { - if (aIcon[i] != null) { - aIcon[i].renderZPos(aRenderer, aBlock, aX, aY, aZ); + for (ITexture iTexture : aIcon) { + if (iTexture != null) { + iTexture.renderZPos(aRenderer, aBlock, aX, aY, aZ); } } } @@ -1168,9 +1168,9 @@ public class GTPP_Render_MachineBlock extends GT_Renderer_Block { } if (aIcon != null) { - for (int i = 0; i < aIcon.length; ++i) { - if (aIcon[i] != null) { - aIcon[i].renderXNeg(aRenderer, aBlock, aX, aY, aZ); + for (ITexture iTexture : aIcon) { + if (iTexture != null) { + iTexture.renderXNeg(aRenderer, aBlock, aX, aY, aZ); } } } @@ -1191,9 +1191,9 @@ public class GTPP_Render_MachineBlock extends GT_Renderer_Block { aRenderer.flipTexture = !aFullBlock; if (aIcon != null) { - for (int i = 0; i < aIcon.length; ++i) { - if (aIcon[i] != null) { - aIcon[i].renderXPos(aRenderer, aBlock, aX, aY, aZ); + for (ITexture iTexture : aIcon) { + if (iTexture != null) { + iTexture.renderXPos(aRenderer, aBlock, aX, aY, aZ); } } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_ElectricAutoWorkbench.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_ElectricAutoWorkbench.java index 8c7ca4c9e1..886500457b 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_ElectricAutoWorkbench.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_ElectricAutoWorkbench.java @@ -260,7 +260,7 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B mCurrentSlot = (mCurrentSlot + 1) % 18; } switch (mMode) { - case 0: + case 0 -> { if (mInventory[mCurrentSlot] != null && !isItemTypeOrItsEmptyLiquidContainerInCraftingGrid(mInventory[mCurrentSlot])) { if (mInventory[18] == null && mThroughPut < 2 && mCurrentSlot < 8) { @@ -277,8 +277,8 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B tRecipe[i].stackSize = 1; } } - break; - case 1: + } + case 1 -> { if (isItemTypeOrItsEmptyLiquidContainerInCraftingGrid(mInventory[mCurrentSlot])) { if (mInventory[18] == null && mThroughPut < 2) { mInventory[18] = mInventory[mCurrentSlot]; @@ -308,10 +308,9 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B mInventory[mCurrentSlot] = null; mTicksUntilNextUpdate = 1; } - break; } - break; - case 2: + } + case 2 -> { if (isItemTypeOrItsEmptyLiquidContainerInCraftingGrid(mInventory[mCurrentSlot])) { if (mInventory[18] == null && mThroughPut < 2) { mInventory[18] = mInventory[mCurrentSlot]; @@ -329,10 +328,9 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B mInventory[mCurrentSlot] = null; mTicksUntilNextUpdate = 1; } - break; } - break; - case 3: + } + case 3 -> { if (isItemTypeOrItsEmptyLiquidContainerInCraftingGrid(mInventory[mCurrentSlot])) { if (mInventory[18] == null && mThroughPut < 2) { mInventory[18] = mInventory[mCurrentSlot]; @@ -353,10 +351,9 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B mInventory[mCurrentSlot] = null; mTicksUntilNextUpdate = 1; } - break; } - break; - case 4: + } + case 4 -> { if (isItemTypeOrItsEmptyLiquidContainerInCraftingGrid(mInventory[mCurrentSlot])) { if (mInventory[18] == null && mThroughPut < 2) { mInventory[18] = mInventory[mCurrentSlot]; @@ -382,10 +379,9 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B mInventory[mCurrentSlot] = null; mTicksUntilNextUpdate = 1; } - break; } - break; - case 5: + } + case 5 -> { if (isItemTypeOrItsEmptyLiquidContainerInCraftingGrid(mInventory[mCurrentSlot])) { if (mInventory[18] == null && mThroughPut < 2) { mInventory[18] = mInventory[mCurrentSlot]; @@ -397,11 +393,8 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B tTempStack = GT_Utility.copy(mInventory[mCurrentSlot]); tTempStack.stackSize = 1; tRecipe[0] = tTempStack; - tOutput = GT_OreDictUnificator.get(true, tTempStack); - if (tOutput != null && GT_Utility.areStacksEqual(tOutput, tTempStack)) tOutput = null; - if (tOutput == null) { tRecipe[0] = null; if (mInventory[18] == null) { @@ -410,15 +403,14 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B mTicksUntilNextUpdate = 1; } } - break; - case 6: + } + case 6 -> { if (isItemTypeOrItsEmptyLiquidContainerInCraftingGrid(mInventory[mCurrentSlot])) { if (mInventory[18] == null && mThroughPut < 2) { mInventory[18] = mInventory[mCurrentSlot]; mInventory[mCurrentSlot] = null; mTicksUntilNextUpdate = 1; } - break; } else if (OrePrefixes.dustSmall.contains(mInventory[mCurrentSlot])) { tTempStack = GT_Utility.copy(mInventory[mCurrentSlot]); tTempStack.stackSize = 1; @@ -433,7 +425,6 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B mInventory[mCurrentSlot] = null; mTicksUntilNextUpdate = 1; } - break; } } else if (OrePrefixes.dustTiny.contains(mInventory[mCurrentSlot])) { tTempStack = GT_Utility.copy(mInventory[mCurrentSlot]); @@ -454,7 +445,6 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B mInventory[mCurrentSlot] = null; mTicksUntilNextUpdate = 1; } - break; } } else { if (mInventory[18] == null && mThroughPut < 2) { @@ -462,10 +452,9 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B mInventory[mCurrentSlot] = null; mTicksUntilNextUpdate = 1; } - break; } - break; - case 7: + } + case 7 -> { if (isItemTypeOrItsEmptyLiquidContainerInCraftingGrid(mInventory[mCurrentSlot]) || !OrePrefixes.nugget.contains(mInventory[mCurrentSlot])) { if (mInventory[18] == null && mThroughPut < 2) { @@ -492,10 +481,9 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B mInventory[mCurrentSlot] = null; mTicksUntilNextUpdate = 1; } - break; } - break; - case 8: + } + case 8 -> { if (isItemTypeOrItsEmptyLiquidContainerInCraftingGrid(mInventory[mCurrentSlot]) || mInventory[mCurrentSlot].getItemDamage() <= 0 || !mInventory[mCurrentSlot].getItem().isRepairable()) { @@ -525,8 +513,8 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B break; } } - break; - case 9: + } + case 9 -> { if (isItemTypeOrItsEmptyLiquidContainerInCraftingGrid(mInventory[mCurrentSlot])) { if (mInventory[18] == null && mThroughPut < 2) { mInventory[18] = mInventory[mCurrentSlot]; @@ -547,7 +535,7 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B } } if (tRecipe[1] == null) tRecipe[0] = null; - break; + } } } @@ -677,13 +665,13 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B } private ArrayList<ItemStack> recipeContent(ItemStack[] tRecipe) { - ArrayList<ItemStack> tList = new ArrayList<ItemStack>(); + ArrayList<ItemStack> tList = new ArrayList<>(); for (byte i = 0; i < 9; i++) { if (tRecipe[i] != null) { boolean temp = false; - for (byte j = 0; j < tList.size(); j++) { - if (GT_Utility.areStacksEqual(tRecipe[i], tList.get(j))) { - tList.get(j).stackSize++; + for (ItemStack itemStack : tList) { + if (GT_Utility.areStacksEqual(tRecipe[i], itemStack)) { + itemStack.stackSize++; temp = true; break; } @@ -695,7 +683,7 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B } private ArrayList<ItemStack> benchContent() { - ArrayList<ItemStack> tList = new ArrayList<ItemStack>(); + ArrayList<ItemStack> tList = new ArrayList<>(); for (byte i = 0; i < 18; i++) { if (mInventory[i] != null) { boolean temp = false; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_ElectricInventoryManager.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_ElectricInventoryManager.java deleted file mode 100644 index 2c9a50dfa5..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_ElectricInventoryManager.java +++ /dev/null @@ -1,686 +0,0 @@ -package gtPlusPlus.xmod.gregtech.common.tileentities.automation; - -import static net.minecraftforge.common.util.ForgeDirection.DOWN; -import static net.minecraftforge.common.util.ForgeDirection.EAST; -import static net.minecraftforge.common.util.ForgeDirection.NORTH; -import static net.minecraftforge.common.util.ForgeDirection.SOUTH; -import static net.minecraftforge.common.util.ForgeDirection.UP; -import static net.minecraftforge.common.util.ForgeDirection.WEST; - -import java.util.ArrayList; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.oredict.OreDictionary; - -import org.apache.commons.lang3.ArrayUtils; - -import com.gtnewhorizons.modularui.api.ModularUITextures; -import com.gtnewhorizons.modularui.api.drawable.IDrawable; -import com.gtnewhorizons.modularui.api.screen.ModularWindow; -import com.gtnewhorizons.modularui.api.screen.UIBuildContext; -import com.gtnewhorizons.modularui.common.internal.wrapper.BaseSlot; -import com.gtnewhorizons.modularui.common.widget.ButtonWidget; -import com.gtnewhorizons.modularui.common.widget.DrawableWidget; -import com.gtnewhorizons.modularui.common.widget.FakeSyncWidget; -import com.gtnewhorizons.modularui.common.widget.SlotWidget; - -import gregtech.api.enums.GT_Values; -import gregtech.api.enums.Textures; -import gregtech.api.gui.modularui.GT_UIInfos; -import gregtech.api.gui.modularui.GT_UITextures; -import gregtech.api.interfaces.ITexture; -import gregtech.api.interfaces.modularui.IAddGregtechLogo; -import gregtech.api.interfaces.modularui.IAddUIWidgets; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachineBlock; -import gregtech.api.objects.GT_ItemStack; -import gregtech.api.objects.GT_RenderedTexture; -import gregtech.api.util.GT_Utility; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.xmod.gregtech.api.gui.GTPP_UITextures; -import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; - -public class GT_MetaTileEntity_ElectricInventoryManager extends GT_MetaTileEntity_TieredMachineBlock - implements IAddGregtechLogo, IAddUIWidgets { - - public int[] mSlotRange = new int[4]; - public boolean mWorkedLastTick = false; - protected String mLocalName; - - public GT_MetaTileEntity_ElectricInventoryManager(final int aID, final int aTier, final String aDescription) { - super( - aID, - "basicmachine.automation.inventorymanager.0" + aTier, - "Electric Inventory Manager (" + GT_Values.VN[aTier] + ")", - aTier, - 16, - aDescription); - mLocalName = "Auto Workbench (" + GT_Values.VN[aTier] + ")"; - } - - public GT_MetaTileEntity_ElectricInventoryManager(final String aName, final int aTier, final String[] aDescription, - final ITexture[][][] aTextures) { - super(aName, aTier, 16, aDescription, aTextures); - } - - @Override - public boolean isTransformerUpgradable() { - return true; - } - - @Override - public boolean isOverclockerUpgradable() { - return false; - } - - @Override - public boolean isSimpleMachine() { - return false; - } - - @Override - public boolean isFacingValid(ForgeDirection facing) { - return true; - } - - @Override - public boolean isEnetInput() { - return true; - } - - @Override - public boolean isEnetOutput() { - return true; - } - - @Override - public long maxEUInput() { - return GT_Values.V[mTier]; - } - - @Override - public long maxEUOutput() { - return GT_Values.V[mTier]; - } - - @Override - public long getMinimumStoredEU() { - return GT_Values.V[this.mTier]; - } - - @Override - public long maxEUStore() { - return GT_Values.V[this.mTier] * (this.mTier * GT_Values.V[this.mTier]); - } - - @Override - public long maxAmperesIn() { - return 4; - } - - @Override - public long maxAmperesOut() { - return 4; - } - - @Override - public boolean isValidSlot(int aIndex) { - return aIndex < 3; - } - - @Override - public boolean isInputFacing(ForgeDirection side) { - return !isOutputFacing(side); - } - - @Override - public boolean isOutputFacing(ForgeDirection side) { - for (int i = 0; i < mSlotRange.length; i++) { - if (side == getRangeDirection(i) && getRangeEnergy(i)) { - return true; - } - } - return false; - } - - @Override - public int getSizeInventory() { - return 16; - } - - @Override - public boolean isAccessAllowed(EntityPlayer aPlayer) { - return true; - } - - @Override - public boolean onRightclick(final IGregTechTileEntity aBaseMetaTileEntity, final EntityPlayer aPlayer) { - GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer); - return true; - } - - @Override - public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_ElectricInventoryManager( - this.mName, - this.mTier, - this.mDescriptionArray, - this.mTextures); - } - - @Override - public void saveNBTData(NBTTagCompound aNBT) { - aNBT.setInteger("mSlotRange0", mSlotRange[0]); - aNBT.setInteger("mSlotRange1", mSlotRange[1]); - aNBT.setInteger("mSlotRange2", mSlotRange[2]); - aNBT.setInteger("mSlotRange3", mSlotRange[3]); - } - - @Override - public void loadNBTData(NBTTagCompound aNBT) { - mSlotRange[0] = aNBT.getInteger("mSlotRange0"); - mSlotRange[1] = aNBT.getInteger("mSlotRange1"); - mSlotRange[2] = aNBT.getInteger("mSlotRange2"); - mSlotRange[3] = aNBT.getInteger("mSlotRange3"); - } - - public void iterateRangeDirection(int aIndex) { - mSlotRange[aIndex] = (mSlotRange[aIndex] & ~7) | (((mSlotRange[aIndex] & 7) + 1) % 6); - } - - public void switchRangeEnergy(int aIndex) { - mSlotRange[aIndex] = (mSlotRange[aIndex] & ~8) | ((mSlotRange[aIndex] & 8) > 0 ? 0 : 8); - } - - public void iterateSlot1Direction(int aIndex) { - mSlotRange[aIndex] = (mSlotRange[aIndex] & ~112) | (((((mSlotRange[aIndex] & 112) >> 4) + 1) % 6) << 4); - } - - public void iterateSlot2Direction(int aIndex) { - mSlotRange[aIndex] = (mSlotRange[aIndex] & ~896) | (((((mSlotRange[aIndex] & 896) >> 7) + 1) % 6) << 7); - } - - public void iterateSlot3Direction(int aIndex) { - mSlotRange[aIndex] = (mSlotRange[aIndex] & ~7168) | (((((mSlotRange[aIndex] & 7168) >> 10) + 1) % 6) << 10); - } - - public void switchSlot1InOut(int aIndex) { - mSlotRange[aIndex] = (mSlotRange[aIndex] & ~8192) | ((mSlotRange[aIndex] & 8192) > 0 ? 0 : 8192); - } - - public void switchSlot2InOut(int aIndex) { - mSlotRange[aIndex] = (mSlotRange[aIndex] & ~16384) | ((mSlotRange[aIndex] & 16384) > 0 ? 0 : 16384); - } - - public void switchSlot3InOut(int aIndex) { - mSlotRange[aIndex] = (mSlotRange[aIndex] & ~32768) | ((mSlotRange[aIndex] & 32768) > 0 ? 0 : 32768); - } - - public ForgeDirection getRangeDirection(int aIndex) { - return ForgeDirection.getOrientation(mSlotRange[aIndex] & 7); - } - - public ForgeDirection getSlot1Direction(int aIndex) { - return ForgeDirection.getOrientation((mSlotRange[aIndex] & 112) >> 4); - } - - public ForgeDirection getSlot2Direction(int aIndex) { - return ForgeDirection.getOrientation((mSlotRange[aIndex] & 896) >> 7); - } - - public ForgeDirection getSlot3Direction(int aIndex) { - return ForgeDirection.getOrientation((mSlotRange[aIndex] & 7168) >> 10); - } - - public boolean getRangeEnergy(int aIndex) { - return (mSlotRange[aIndex] & 8) > 0; - } - - public boolean getSlot1InOut(int aIndex) { - return (mSlotRange[aIndex] & 8192) > 0; - } - - public boolean getSlot2InOut(int aIndex) { - return (mSlotRange[aIndex] & 16384) > 0; - } - - public boolean getSlot3InOut(int aIndex) { - return (mSlotRange[aIndex] & 32768) > 0; - } - - @Override - public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { - super.onPostTick(aBaseMetaTileEntity, aTick); - if (getBaseMetaTileEntity().isAllowedToWork() && getBaseMetaTileEntity().isServerSide() - && getBaseMetaTileEntity().getUniversalEnergyStored() >= 5000 - && (getBaseMetaTileEntity().hasWorkJustBeenEnabled() || getBaseMetaTileEntity().getTimer() % 100 == 0 - || mWorkedLastTick - || getBaseMetaTileEntity().hasInventoryBeenModified())) { - mWorkedLastTick = false; - - IInventory[] tTileEntities = new IInventory[] { getBaseMetaTileEntity().getIInventoryAtSide(DOWN), - getBaseMetaTileEntity().getIInventoryAtSide(UP), getBaseMetaTileEntity().getIInventoryAtSide(NORTH), - getBaseMetaTileEntity().getIInventoryAtSide(SOUTH), - getBaseMetaTileEntity().getIInventoryAtSide(WEST), - getBaseMetaTileEntity().getIInventoryAtSide(EAST), null, null }; - - int tCost = 0; - - for (int i = 0; i < 4; i++) { - final int ordinalRangeDirection = getRangeDirection(i).ordinal(); - if (tTileEntities[ordinalRangeDirection] != null) { - ArrayList<ItemStack> tList = new ArrayList<ItemStack>(); - ItemStack tStack; - tList.add(null); - - tStack = mInventory[3 + i * 3 + 0]; - if (tStack == null) { - if (getSlot1InOut(i)) tCost += 5 * GT_Utility.moveOneItemStack( - getBaseMetaTileEntity(), - tTileEntities[ordinalRangeDirection], - getSlot1Direction(i), - getSlot1Direction(i), - null, - false, - (byte) 64, - (byte) 1, - (byte) 64, - (byte) 1); - else tCost += 5 * GT_Utility.moveOneItemStack( - tTileEntities[ordinalRangeDirection], - getBaseMetaTileEntity(), - getSlot1Direction(i), - getSlot1Direction(i), - null, - false, - (byte) 64, - (byte) 1, - (byte) 64, - (byte) 1); - } else { - tList.set(0, tStack); - if (getSlot1InOut(i)) tCost += 5 * GT_Utility.moveOneItemStack( - getBaseMetaTileEntity(), - tTileEntities[ordinalRangeDirection], - getSlot1Direction(i), - getSlot1Direction(i), - tList, - false, - (byte) tStack.stackSize, - (byte) 1, - (byte) 64, - (byte) 1); - else tCost += 5 * GT_Utility.moveOneItemStack( - tTileEntities[ordinalRangeDirection], - getBaseMetaTileEntity(), - getSlot1Direction(i), - getSlot1Direction(i), - tList, - false, - (byte) tStack.stackSize, - (byte) 1, - (byte) 64, - (byte) 1); - } - - tStack = mInventory[3 + i * 3 + 1]; - if (tStack == null) { - if (getSlot2InOut(i)) tCost += 5 * GT_Utility.moveOneItemStack( - getBaseMetaTileEntity(), - tTileEntities[ordinalRangeDirection], - getSlot2Direction(i), - getSlot2Direction(i), - null, - false, - (byte) 64, - (byte) 1, - (byte) 64, - (byte) 1); - else tCost += 5 * GT_Utility.moveOneItemStack( - tTileEntities[ordinalRangeDirection], - getBaseMetaTileEntity(), - getSlot2Direction(i), - getSlot2Direction(i), - null, - false, - (byte) 64, - (byte) 1, - (byte) 64, - (byte) 1); - } else { - tList.set(0, tStack); - if (getSlot2InOut(i)) tCost += 5 * GT_Utility.moveOneItemStack( - getBaseMetaTileEntity(), - tTileEntities[ordinalRangeDirection], - getSlot2Direction(i), - getSlot2Direction(i), - tList, - false, - (byte) tStack.stackSize, - (byte) 1, - (byte) 64, - (byte) 1); - else tCost += 5 * GT_Utility.moveOneItemStack( - tTileEntities[ordinalRangeDirection], - getBaseMetaTileEntity(), - getSlot2Direction(i), - getSlot2Direction(i), - tList, - false, - (byte) tStack.stackSize, - (byte) 1, - (byte) 64, - (byte) 1); - } - - tStack = mInventory[3 + i * 3 + 2]; - if (tStack == null) { - if (getSlot3InOut(i)) tCost += 5 * GT_Utility.moveOneItemStack( - getBaseMetaTileEntity(), - tTileEntities[ordinalRangeDirection], - getSlot3Direction(i), - getSlot3Direction(i), - null, - false, - (byte) 64, - (byte) 1, - (byte) 64, - (byte) 1); - else tCost += 5 * GT_Utility.moveOneItemStack( - tTileEntities[ordinalRangeDirection], - getBaseMetaTileEntity(), - getSlot3Direction(i), - getSlot3Direction(i), - null, - false, - (byte) 64, - (byte) 1, - (byte) 64, - (byte) 1); - } else { - tList.set(0, tStack); - if (getSlot3InOut(i)) tCost += 5 * GT_Utility.moveOneItemStack( - getBaseMetaTileEntity(), - tTileEntities[ordinalRangeDirection], - getSlot3Direction(i), - getSlot3Direction(i), - tList, - false, - (byte) tStack.stackSize, - (byte) 1, - (byte) 64, - (byte) 1); - else tCost += 5 * GT_Utility.moveOneItemStack( - tTileEntities[ordinalRangeDirection], - getBaseMetaTileEntity(), - getSlot3Direction(i), - getSlot3Direction(i), - tList, - false, - (byte) tStack.stackSize, - (byte) 1, - (byte) 64, - (byte) 1); - } - } - } - - if (tCost > 0) { - mWorkedLastTick = true; - getBaseMetaTileEntity().decreaseStoredEnergyUnits(tCost, true); - } - } - } - - @Override - public String[] getDescription() { - return ArrayUtils - .addAll(this.mDescriptionArray, "It's simpler than you think. I promise.", CORE.GT_Tooltip.get()); - } - - @Override - public boolean allowCoverOnSide(ForgeDirection side, GT_ItemStack aStack) { - return false; - } - - @Override - public boolean allowPullStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, ForgeDirection side, - ItemStack aStack) { - return true; - } - - @Override - public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, ForgeDirection side, - ItemStack aStack) { - return true; - } - - @Override - public ITexture[][][] getTextureSet(final ITexture[] aTextures) { - final ITexture[][][] rTextures = new ITexture[16][17][]; - for (byte i = -1; i < 16; i++) { - rTextures[0][i + 1] = this.getBottom(i); - rTextures[1][i + 1] = this.getTop(i); - rTextures[2][i + 1] = this.getNegativeZ(i); - rTextures[3][i + 1] = this.getPositiveZ(i); - rTextures[4][i + 1] = this.getNegativeX(i); - rTextures[5][i + 1] = this.getPositiveX(i); - rTextures[6][i + 1] = this.getBottomRedstone(i); - rTextures[7][i + 1] = this.getTopRedstone(i); - rTextures[8][i + 1] = this.getNegativeZRedstone(i); - rTextures[9][i + 1] = this.getPositiveZRedstone(i); - rTextures[10][i + 1] = this.getNegativeXRedstone(i); - rTextures[11][i + 1] = this.getPositiveXRedstone(i); - } - return rTextures; - } - - @Override - public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final ForgeDirection side, - final ForgeDirection facing, final int aColorIndex, final boolean aActive, final boolean aRedstone) { - return this.mTextures[!aRedstone ? side.ordinal() : side.ordinal() + 6][aColorIndex < 0 ? 0 : aColorIndex]; - } - - public ITexture[] getBottom(final byte aColor) { - return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Red) }; - } - - public ITexture[] getTop(final byte aColor) { - return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Green) }; - } - - public ITexture[] getNegativeZ(final byte aColor) { - return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Blue) }; - } - - public ITexture[] getPositiveZ(final byte aColor) { - return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Cyan) }; - } - - public ITexture[] getNegativeX(final byte aColor) { - return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Purple) }; - } - - public ITexture[] getPositiveX(final byte aColor) { - return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Yellow) }; - } - - public ITexture[] getBottomRedstone(final byte aColor) { - return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Red_Redstone) }; - } - - public ITexture[] getTopRedstone(final byte aColor) { - return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Green_Redstone) }; - } - - public ITexture[] getNegativeZRedstone(final byte aColor) { - return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Blue_Redstone) }; - } - - public ITexture[] getPositiveZRedstone(final byte aColor) { - return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Cyan_Redstone) }; - } - - public ITexture[] getNegativeXRedstone(final byte aColor) { - return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Purple_Redstone) }; - } - - public ITexture[] getPositiveXRedstone(final byte aColor) { - return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Yellow_Redstone) }; - } - - @Override - public boolean useModularUI() { - return true; - } - - @Override - public void addGregTechLogo(ModularWindow.Builder builder) { - builder.widget( - new DrawableWidget().setDrawable(getGUITextureSet().getGregTechLogo()).setSize(17, 17).setPos(154, 59)); - } - - // Internal copy of values stored in this tile. Client will use these to render stuff. - private final int[] mTargetDirections = new int[12]; - private final int[] mRangeDirections = new int[4]; - private final boolean[] mTargetInOut = new boolean[12]; - private final boolean[] mTargetEnergy = new boolean[4]; - - @Override - public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) { - for (int i = 0; i < 3; i++) { - builder.widget( - new SlotWidget(inventoryHandler, i) - .setBackground(getGUITextureSet().getItemSlot(), GTPP_UITextures.OVERLAY_SLOT_CHEST) - .setPos(154, 4 + i * 18)); - } - - int[] slotXPositions = new int[] { 4, 60, 79, 135 }; - for (int i = 0; i < 12; i++) { - final int index = i; - builder.widget(new SlotWidget(new BaseSlot(inventoryHandler, i + 3, true)) { - - @Override - protected void phantomClick(ClickData clickData, ItemStack cursorStack) { - super.phantomClick(clickData, cursorStack); - if (clickData.mouseButton != 0 && cursorStack != null && getMcSlot().getHasStack()) { - getMcSlot().getStack().setItemDamage(OreDictionary.WILDCARD_VALUE); - } - } - }.setControlsAmount(true).disableShiftInsert().setBackground(() -> { - if (index % 3 == 0) { - return new IDrawable[] { GTPP_UITextures.SLOT_INVENTORY_MANAGER[mRangeDirections[index / 3]], - GTPP_UITextures.OVERLAY_SLOT_INVENTORY_MANAGER_COLOR[mRangeDirections[index / 3]] }; - } else if (index % 3 == 1) { - return new IDrawable[] { GTPP_UITextures.SLOT_INVENTORY_MANAGER[mRangeDirections[index / 3]], - GTPP_UITextures.OVERLAY_SLOT_INVENTORY_MANAGER_ARROW[mRangeDirections[index / 3]] }; - } else { - return new IDrawable[] { GTPP_UITextures.SLOT_INVENTORY_MANAGER[mRangeDirections[index / 3]] }; - } - }).setPos(slotXPositions[i / 3], 4 + (i % 3) * 18)); - } - for (int i = 0; i < 4; i++) { - final int index = i; - builder.widget( - new ButtonWidget().setOnClick((clickData, widget) -> switchRangeEnergy(index)).setBackground( - () -> new IDrawable[] { - mTargetEnergy[index] ? ModularUITextures.ITEM_SLOT : GT_UITextures.BUTTON_STANDARD, - GT_UITextures.OVERLAY_BUTTON_EMIT_ENERGY }) - .setPos(slotXPositions[i], 59).setSize(18, 18)); - } - - int[] buttonXPositions = new int[] { 23, 41, 98, 116 }; - for (int i = 0; i < 12; i++) { - final int index = i; - builder.widget(new ButtonWidget().setOnClick((clickData, widget) -> { - if (index % 3 == 0) { - if (clickData.mouseButton != 0) { - switchSlot1InOut(index / 3); - } else { - iterateSlot1Direction(index / 3); - } - } else if (index % 3 == 1) { - if (clickData.mouseButton != 0) { - switchSlot2InOut(index / 3); - } else { - iterateSlot2Direction(index / 3); - } - } else { - if (clickData.mouseButton != 0) { - switchSlot3InOut(index / 3); - } else { - iterateSlot3Direction(index / 3); - } - } - }).setBackground( - () -> new IDrawable[] { GT_UITextures.BUTTON_STANDARD, - GTPP_UITextures.OVERLAY_BUTTON_DIRECTION[mTargetDirections[index]], - mTargetInOut[index] ? GTPP_UITextures.OVERLAY_BUTTON_TIP_RED - : GTPP_UITextures.OVERLAY_BUTTON_TIP_GREEN }) - .setPos(buttonXPositions[i / 3], 4 + (i % 3) * 18).setSize(18, 18)); - } - for (int i = 0; i < 4; i++) { - final int index = i; - builder.widget( - new ButtonWidget().setOnClick((clickData, widget) -> iterateRangeDirection(index)) - .setBackground( - () -> new IDrawable[] { GT_UITextures.BUTTON_STANDARD, - GTPP_UITextures.OVERLAY_BUTTON_DIRECTION_GRAY[mRangeDirections[index]] }) - .setPos(buttonXPositions[i], 59).setSize(18, 18)); - } - - for (int i = 0; i < mTargetDirections.length; i++) { - final int index = i; - builder.widget(new FakeSyncWidget.IntegerSyncer(() -> { - if (index % 3 == 0) { - return getSlot1Direction(index / 3).ordinal(); - } else if (index % 3 == 1) { - return getSlot2Direction(index / 3).ordinal(); - } else { - return getSlot3Direction(index / 3).ordinal(); - } - }, val -> mTargetDirections[index] = val)); - } - for (int i = 0; i < mRangeDirections.length; i++) { - final int index = i; - builder.widget( - new FakeSyncWidget.IntegerSyncer( - () -> getRangeDirection(index).ordinal(), - val -> mRangeDirections[index] = val)); - } - for (int i = 0; i < mTargetInOut.length; i++) { - final int index = i; - builder.widget(new FakeSyncWidget.BooleanSyncer(() -> { - if (index % 3 == 0) { - return getSlot1InOut(index / 3); - } else if (index % 3 == 1) { - return getSlot2InOut(index / 3); - } else { - return getSlot3InOut(index / 3); - } - }, val -> mTargetInOut[index] = val)); - } - for (int i = 0; i < mTargetEnergy.length; i++) { - final int index = i; - builder.widget( - new FakeSyncWidget.BooleanSyncer(() -> getRangeEnergy(index), val -> mTargetEnergy[index] = val)); - } - } -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java index 2427cb12ae..25609343d3 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java @@ -245,29 +245,30 @@ public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_Basi if (side == this.getBaseMetaTileEntity().getFrontFacing()) { final float[] tCoords = GT_Utility.getClickedFacingCoords(side, aX, aY, aZ); switch ((byte) ((byte) (int) (tCoords[0] * 2.0F) + (2 * (byte) (int) (tCoords[1] * 2.0F)))) { - case 0: + case 0 -> { try { CORE.sTesseractGeneratorOwnershipMap.get(mOwner).remove(this.mFrequency); } catch (Throwable t) {} this.mFrequency -= 64; - break; - case 1: + } + case 1 -> { try { CORE.sTesseractGeneratorOwnershipMap.get(mOwner).remove(this.mFrequency); } catch (Throwable t) {} this.mFrequency += 64; - break; - case 2: + } + case 2 -> { try { CORE.sTesseractGeneratorOwnershipMap.get(mOwner).remove(this.mFrequency); } catch (Throwable t) {} this.mFrequency -= 512; - break; - case 3: + } + case 3 -> { try { CORE.sTesseractGeneratorOwnershipMap.get(mOwner).remove(this.mFrequency); } catch (Throwable t) {} this.mFrequency += 512; + } } if (getGeneratorEntity(this.mFrequency) != null && getGeneratorEntity(this.mFrequency) != this) { GT_Utility.sendChatToPlayer( diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractTerminal.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractTerminal.java index 18314c059f..5b305950ff 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractTerminal.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractTerminal.java @@ -198,29 +198,30 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic if (side == this.getBaseMetaTileEntity().getFrontFacing()) { final float[] tCoords = GT_Utility.getClickedFacingCoords(side, aX, aY, aZ); switch ((byte) ((byte) (int) (tCoords[0] * 2.0F) + (2 * (byte) (int) (tCoords[1] * 2.0F)))) { - case 0: + case 0 -> { try { CORE.sTesseractTerminalOwnershipMap.get(mOwner).remove(this.mFrequency); } catch (Throwable t) {} this.mFrequency -= 64; - break; - case 1: + } + case 1 -> { try { CORE.sTesseractTerminalOwnershipMap.get(mOwner).remove(this.mFrequency); } catch (Throwable t) {} this.mFrequency += 64; - break; - case 2: + } + case 2 -> { try { CORE.sTesseractTerminalOwnershipMap.get(mOwner).remove(this.mFrequency); } catch (Throwable t) {} this.mFrequency -= 512; - break; - case 3: + } + case 3 -> { try { CORE.sTesseractTerminalOwnershipMap.get(mOwner).remove(this.mFrequency); } catch (Throwable t) {} this.mFrequency += 512; + } } GT_Utility.sendChatToPlayer( aPlayer, diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java index ee85b16f5f..95c5a7eeaf 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java @@ -88,8 +88,6 @@ public class GT_MetaTileEntity_Boiler_Base extends GT_MetaTileEntity_Boiler { } else { return new GT_RenderedTexture(Textures.BlockIcons.MACHINE_HV_SIDE); } - // return new - // GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntity_RTG.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntity_RTG.java index 3b54fb46a7..cca69bc5d5 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntity_RTG.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntity_RTG.java @@ -128,7 +128,9 @@ public class GregtechMetaTileEntity_RTG extends GT_MetaTileEntity_BasicGenerator if (this.mInventory[getStackDisplaySlot()] == null) this.mInventory[getStackDisplaySlot()] = new ItemStack(Blocks.fire, 1); this.mInventory[getStackDisplaySlot()].setStackDisplayName( - "Generating: " + (aBaseMetaTileEntity.getUniversalEnergyStored() - getMinimumStoredEU()) + "Generating: " + + GT_Utility.formatNumbers( + aBaseMetaTileEntity.getUniversalEnergyStored() - getMinimumStoredEU()) + " EU"); } } else { @@ -177,8 +179,8 @@ public class GregtechMetaTileEntity_RTG extends GT_MetaTileEntity_BasicGenerator this.mDescriptionArray, "Fuel is measured in minecraft days (Check with Scanner)", "RTG changes output voltage depending on fuel", - "Generates power at " + this.getEfficiency() + "% Efficiency per tick", - "Output Voltage: " + this.getOutputTier() + " EU/t", + "Generates power at " + GT_Utility.formatNumbers(this.getEfficiency()) + "% Efficiency per tick", + "Output Voltage: " + GT_Utility.formatNumbers(this.getOutputTier()) + " EU/t", CORE.GT_Tooltip.get()); } @@ -310,7 +312,6 @@ public class GregtechMetaTileEntity_RTG extends GT_MetaTileEntity_BasicGenerator this.mCurrentRecipe = tFuel; int voltage = tFuel.mEUt; this.mVoltage = voltage; - int sfsf = this.mTier; // this.mDaysRemaining = tFuel.mSpecialValue*365; // Do some voodoo. @@ -326,8 +327,6 @@ public class GregtechMetaTileEntity_RTG extends GT_MetaTileEntity_BasicGenerator } else if (ItemStack.areItemStacksEqual(tFuel.mInputs[0], GregtechItemList.Pellet_RTG_SR90.get(1))) { mTier2 = 1; } else { - // Utils.LOG_INFO("test:"+tFuel.mInputs[0].getDisplayName() + " | " + - // (ItemStack.areItemStacksEqual(tFuel.mInputs[0], GregtechItemList.Pellet_RTG_PU238.get(1)))); mTier2 = 0; } ReflectionUtils.setByte(this, "mTier", mTier2); @@ -345,8 +344,6 @@ public class GregtechMetaTileEntity_RTG extends GT_MetaTileEntity_BasicGenerator this.mDaysRemaining = MathUtils.roundToClosestInt(mTicksToBurnFor / 20 / 60 / 3); Logger.WARNING("step | " + (int) (mTicksToBurnFor * getEfficiency() / 100L)); return (int) (mTicksToBurnFor * getEfficiency() / 100L); - // return (int) (tFuel.mSpecialValue * 365L * getEfficiency() / 100L); - // return tFuel.mEUt; } Logger.WARNING("Not sure"); return 0; @@ -373,12 +370,11 @@ public class GregtechMetaTileEntity_RTG extends GT_MetaTileEntity_BasicGenerator @Override public String[] getInfoData() { return new String[] { "RTG - Running at tier " + this.mTier, - "Active: " + this.getBaseMetaTileEntity().isActive(), "Current Output: " + this.mVoltage + " EU/t", - "Days of Fuel remaining: " + (mTicksToBurnFor / 20 / 60 / 20), - "Hours of Fuel remaining: " + (mTicksToBurnFor / 20 / 60 / 60), - "Ticks of " + this.mVoltage + "v remaining: " + (mTicksToBurnFor), - "Current Recipe input: " + this.mCurrentRecipe != null - ? this.mCurrentRecipe.mInputs[0].getDisplayName() + " x1" - : "NUll" }; + "Active: " + this.getBaseMetaTileEntity().isActive(), + "Current Output: " + GT_Utility.formatNumbers(mVoltage) + " EU/t", + "Days of Fuel remaining: " + GT_Utility.formatNumbers(mTicksToBurnFor / 20 / 60 / 20), + "Hours of Fuel remaining: " + GT_Utility.formatNumbers(mTicksToBurnFor / 20 / 60 / 60), + "Ticks of " + this.mVoltage + "v remaining: " + mTicksToBurnFor, + this.mCurrentRecipe.mInputs[0].getDisplayName() + " x1" }; } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_GasTurbine.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_GasTurbine.java deleted file mode 100644 index e0d13325e9..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_GasTurbine.java +++ /dev/null @@ -1,65 +0,0 @@ -package gtPlusPlus.xmod.gregtech.common.tileentities.generators.ULV; - -import static gregtech.api.enums.GT_Values.V; - -import org.apache.commons.lang3.ArrayUtils; - -import gregtech.api.GregTech_API; -import gregtech.api.enums.ConfigCategories; -import gregtech.api.interfaces.IIconContainer; -import gregtech.api.interfaces.ITexture; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.objects.GT_RenderedTexture; -import gregtech.common.tileentities.generators.GT_MetaTileEntity_GasTurbine; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; - -public class GT_MetaTileEntity_ULV_GasTurbine extends GT_MetaTileEntity_GasTurbine { - - private static final int EFFICIENCY_DEFAULT = 95; - - public GT_MetaTileEntity_ULV_GasTurbine(int aID, String aName, String aNameRegional, int aTier) { - super(aID, aName, aNameRegional, aTier, EFFICIENCY_DEFAULT); - } - - public GT_MetaTileEntity_ULV_GasTurbine(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { - super(aName, aTier, aDescription, aTextures, EFFICIENCY_DEFAULT); - } - - @Override - public String[] getDescription() { - return ArrayUtils.addAll( - this.mDescriptionArray, - "Produces " + (this.getPollution() * 20) + " pollution/sec", - "Fuel Efficiency: " + this.getEfficiency() + "%", - CORE.GT_Tooltip.get()); - } - - @Override - public long maxEUStore() { - return Math.max(getEUVar(), V[1] * 80L + getMinimumStoredEU()); - } - - @Override - public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_ULV_GasTurbine(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); - } - - @Override - public int getCapacity() { - return 16000; - } - - @Override - public void onConfigLoad() { - this.mEfficiency = GregTech_API.sMachineFile - .get(ConfigCategories.machineconfig, "GasTurbine.efficiency.tier." + this.mTier, EFFICIENCY_DEFAULT); - } - - @Override - public ITexture[] getSidesActive(final byte aColor) { - return new ITexture[] { super.getSidesActive(aColor)[0], - new GT_RenderedTexture((IIconContainer) TexturesGtBlock.Overlay_Machine_Turbine_Active) }; - } -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_CropHarvestor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_CropHarvestor.java index 1d8d3a42d3..972fc086f9 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_CropHarvestor.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_CropHarvestor.java @@ -151,32 +151,22 @@ public class GT_MetaTileEntity_CropHarvestor extends GT_MetaTileEntity_BasicTank return 21; } - private static final int getRange(int aTier) { - switch (aTier) { - case 1: - return 1; - case 2: - return 5; - case 3: - return 9; - case 4: - return 13; - case 5: - return 17; - case 6: - return 21; - case 7: - return 25; - case 8: - return 29; - case 9: - return 33; - default: - return 0; - } - } - - private HashSet<ICropTile> mCropCache = new HashSet<ICropTile>(); + private static int getRange(int aTier) { + return switch (aTier) { + case 1 -> 1; + case 2 -> 5; + case 3 -> 9; + case 4 -> 13; + case 5 -> 17; + case 6 -> 21; + case 7 -> 25; + case 8 -> 29; + case 9 -> 33; + default -> 0; + }; + } + + private HashSet<ICropTile> mCropCache = new HashSet<>(); private boolean mInvalidCache = false; public boolean doesInventoryHaveSpace() { @@ -222,8 +212,7 @@ public class GT_MetaTileEntity_CropHarvestor extends GT_MetaTileEntity_BasicTank for (int x = (-aSide); x <= aSide; x++) { for (int z = (-aSide); z <= aSide; z++) { TileEntity tTileEntity = getBaseMetaTileEntity().getTileEntityOffset(x, y, z); - if (tTileEntity != null && tTileEntity instanceof ICropTile) { - ICropTile tCrop = (ICropTile) tTileEntity; + if (tTileEntity != null && tTileEntity instanceof ICropTile tCrop) { this.mCropCache.add(tCrop); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaAtmosphericReconditioner.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaAtmosphericReconditioner.java index 469f5f4d6b..03b0fe9b13 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaAtmosphericReconditioner.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaAtmosphericReconditioner.java @@ -3,7 +3,6 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic; import static gregtech.api.enums.GT_Values.V; import java.util.Collections; -import java.util.HashMap; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -39,9 +38,7 @@ import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.core.item.general.ItemAirFilter; import gtPlusPlus.core.item.general.ItemBasicScrubberTurbine; import gtPlusPlus.core.recipe.common.CI; -import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.math.MathUtils; -import gtPlusPlus.core.util.minecraft.PlayerUtils; import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils; import gtPlusPlus.xmod.gregtech.api.gui.GTPP_UITextures; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; @@ -58,14 +55,6 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi protected boolean mSaveRotor = false; - private static final HashMap<Byte, ItemStack> mConveyorMap = new HashMap<>(); - - static { - for (byte i = 0; i < 9; i++) { - mConveyorMap.put(i, CI.getConveyor(i, 1)); - } - } - public GregtechMetaAtmosphericReconditioner(int aID, String aName, String aNameRegional, int aTier) { super( aID, @@ -93,12 +82,6 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi mPollutionEnabled = PollutionUtils.isPollutionEnabled(); } - /* - * public GregtechMetaAtmosphericReconditioner(String aName, int aTier, String[] aDescription, ITexture[][][] - * aTextures, String aGUIName, String aNEIName) { super(aName, aTier, 2, aDescription, aTextures, 2, 0, aGUIName, - * aNEIName); } - */ - @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { return new GregtechMetaAtmosphericReconditioner(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); @@ -374,7 +357,7 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi if (this.mTier < 7) { mCurrentChunkPollution = PollutionUtils.getPollution(getBaseMetaTileEntity()); } else { - AutoMap<Chunk> aSurrounding = new AutoMap<Chunk>(); + AutoMap<Chunk> aSurrounding = new AutoMap<>(); World aWorld = this.getBaseMetaTileEntity().getWorld(); int xPos = this.getBaseMetaTileEntity().getXCoord(); int zPos = this.getBaseMetaTileEntity().getZCoord(); @@ -599,7 +582,7 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi } else { int chunksWithRemoval = 0; int totalRemoved = 0; - AutoMap<Chunk> aSurrounding = new AutoMap<Chunk>(); + AutoMap<Chunk> aSurrounding = new AutoMap<>(); Chunk aThisChunk = this.getBaseMetaTileEntity().getWorld().getChunkFromBlockCoords( this.getBaseMetaTileEntity().getXCoord(), this.getBaseMetaTileEntity().getZCoord()); @@ -683,10 +666,7 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi if (filter == null) { return false; } - if (filter.getItem() instanceof ItemAirFilter) { - return true; - } - return false; + return filter.getItem() instanceof ItemAirFilter; } public boolean damageAirFilter() { @@ -760,17 +740,6 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi super.onScrewdriverRightClick(side, aPlayer, aX, aY, aZ); } - public boolean onSolderingToolRightclick(ForgeDirection side, byte aWrenchingSide, EntityPlayer aPlayer, float aX, - float aY, float aZ) { - this.mSaveRotor = Utils.invertBoolean(mSaveRotor); - if (mSaveRotor) { - PlayerUtils.messagePlayer(aPlayer, "Running in low efficiency mode, rotors will not break."); - } else { - PlayerUtils.messagePlayer(aPlayer, "Running in high efficiency mode, rotors will break."); - } - return true; - } - @Override public void doSound(byte aIndex, double aX, double aY, double aZ) { if (aIndex == -120) { @@ -782,14 +751,8 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi } @Override - public boolean canHaveInsufficientEnergy() { - // TODO Auto-generated method stub - return super.canHaveInsufficientEnergy(); - } - - @Override public String[] getInfoData() { - AutoMap<String> aTooltipSuper = new AutoMap<String>(); + AutoMap<String> aTooltipSuper = new AutoMap<>(); for (String s : super.getInfoData()) { aTooltipSuper.put(s); } @@ -910,7 +873,7 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi .setPos(106, 24)) .widget( new SlotWidget(inventoryHandler, 7) - .setFilter(stack -> GT_Utility.areStacksEqual(stack, mConveyorMap.get(mTier), true)) + .setFilter(stack -> GT_Utility.areStacksEqual(stack, CI.getConveyor(mTier, 1), true)) .setPos(124, 62)); builder.widget( new DrawableWidget().setDrawable(GT_UITextures.PICTURE_INFORMATION) diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaCondensor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaCondensor.java deleted file mode 100644 index 910c3120b3..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaCondensor.java +++ /dev/null @@ -1,230 +0,0 @@ -package gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic; - -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.IFluidHandler; - -import org.apache.commons.lang3.ArrayUtils; - -import com.gtnewhorizons.modularui.api.screen.ModularWindow; -import com.gtnewhorizons.modularui.api.screen.UIBuildContext; -import com.gtnewhorizons.modularui.common.widget.DrawableWidget; -import com.gtnewhorizons.modularui.common.widget.ProgressBar; -import com.gtnewhorizons.modularui.common.widget.SlotWidget; - -import gregtech.api.enums.Dyes; -import gregtech.api.enums.Textures; -import gregtech.api.gui.modularui.GT_UITextures; -import gregtech.api.interfaces.ITexture; -import gregtech.api.interfaces.modularui.IAddGregtechLogo; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.objects.GT_RenderedTexture; -import gregtech.api.util.GT_ModHandler; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.Utils; -import gtPlusPlus.core.util.math.MathUtils; -import gtPlusPlus.xmod.gregtech.api.gui.GTPP_UITextures; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.generators.GregtechMetaBoilerBase; - -public class GregtechMetaCondensor extends GregtechMetaBoilerBase implements IAddGregtechLogo { - - public GregtechMetaCondensor(final int aID, final String aName, final String aNameRegional) { - super(aID, aName, aNameRegional, "A Steam condenser - [IC2->Steam]", new ITexture[0]); - } - - public GregtechMetaCondensor(final String aName, final int aTier, final String[] aDescription, - final ITexture[][][] aTextures) { - super(aName, aTier, aDescription, aTextures); - } - - @Override - public String[] getDescription() { - return ArrayUtils.addAll( - this.mDescriptionArray, - "IC2 Steam + Water = Normal Steam.", - "Requires no power to run, although it's not very fast.", - CORE.GT_Tooltip.get()); - } - - @Override - public ITexture[][][] getTextureSet(final ITexture[] aTextures) { - final ITexture[][][] rTextures = new ITexture[5][17][]; - for (byte i = -1; i < 16; i++) { - rTextures[0][(i + 1)] = new ITexture[] { new GT_RenderedTexture( - Textures.BlockIcons.MACHINE_CASING_VENT, - Dyes.getModulation(i, Dyes.MACHINE_METAL.mRGBa)) }; - rTextures[1][(i + 1)] = new ITexture[] { - new GT_RenderedTexture( - Textures.BlockIcons.MACHINE_CASING_VENT, - Dyes.getModulation(i, Dyes.MACHINE_METAL.mRGBa)), - new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE) }; - rTextures[2][(i + 1)] = new ITexture[] { - new GT_RenderedTexture( - Textures.BlockIcons.MACHINE_CASING_VENT, - Dyes.getModulation(i, Dyes.MACHINE_METAL.mRGBa)), - new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE) }; - rTextures[3][(i + 1)] = new ITexture[] { - new GT_RenderedTexture( - Textures.BlockIcons.MACHINE_CASING_VENT, - Dyes.getModulation(i, Dyes.MACHINE_METAL.mRGBa)), - new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_POTIONBREWER) }; - rTextures[4][(i + 1)] = new ITexture[] { - new GT_RenderedTexture( - Textures.BlockIcons.MACHINE_CASING_VENT, - Dyes.getModulation(i, Dyes.MACHINE_METAL.mRGBa)), - new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_POTIONBREWER_ACTIVE) }; - } - return rTextures; - } - - @Override - public int maxProgresstime() { - return 1000; - } - - @Override - public MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return new GregtechMetaCondensor(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); - } - - @Override - public void onPostTick(final IGregTechTileEntity aBaseMetaTileEntity, final long aTick) { - this.RI = MathUtils.randLong(5L, 30L); - if ((aBaseMetaTileEntity.isServerSide()) && (aTick > 20L)) { - if (this.mTemperature <= 5) { - this.mTemperature = 5; - this.mLossTimer = 0; - } - if (++this.mLossTimer > 10) { - this.mTemperature -= 1; - this.mLossTimer = 0; - } - for (final ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) { - if (this.mSteam == null) break; - if (side != aBaseMetaTileEntity.getFrontFacing()) { - final IFluidHandler tTileEntity = aBaseMetaTileEntity.getITankContainerAtSide(side); - if (tTileEntity != null) { - final FluidStack tDrained = aBaseMetaTileEntity - .drain(side, Math.max(1, this.mSteam.amount / 2), false); - if (tDrained != null) { - final int tFilledAmount = tTileEntity.fill(side.getOpposite(), tDrained, false); - if (tFilledAmount > 0) { - tTileEntity.fill( - side.getOpposite(), - aBaseMetaTileEntity.drain(side, tFilledAmount, true), - true); - } - } - } - } - } - if ((aTick % 10L) == 0L) { - if (this.mTemperature > 5) { - if ((this.mFluid == null) || (!GT_ModHandler.isWater(this.mFluid)) || (this.mFluid.amount <= 0)) { - this.mHadNoWater = true; - } else { - if (this.mHadNoWater) { - aBaseMetaTileEntity.doExplosion(2048L); - return; - } - this.mFluid.amount -= 1; - if (this.mSteam == null) { - this.mSteam = GT_ModHandler.getSteam(30L); - } else if (GT_ModHandler.isSteam(this.mSteam)) { - this.mSteam.amount += 30; - } else { - this.mSteam = GT_ModHandler.getSteam(30L); - } - } - } else { - this.mHadNoWater = false; - } - } - if ((this.mSteam != null) && (this.mSteam.amount > getSteamCapacity())) { - this.sendSound((byte) 1); - this.mSteam.amount = getSteamCapacity() * 3 / 4; - } - /* - * if ((this.mProcessingEnergy <= 0) && (aBaseMetaTileEntity.isAllowedToWork()) && - * (GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], - * OrePrefixes.bucket.get(IC2.getItemFromBlock(p_150898_0_))))) { this.mProcessingEnergy += 1000; - * aBaseMetaTileEntity.decrStackSize(2, 1); aBaseMetaTileEntity.addStackToSlot(3, - * GT_OreDictUnificator.get(OrePrefixes.bucket, Materials.Empty, 1L)); } - */ - if ((this.mTemperature < 1000) && (this.mProcessingEnergy > 0) && ((aTick % this.RI) == 0L)) { - this.mProcessingEnergy -= 40; - this.mTemperature += 2; - } - aBaseMetaTileEntity.setActive(this.mProcessingEnergy > 0); - } - } - - @Override - public final int fill(final FluidStack aFluid, final boolean doFill) { - if ((Utils.isIC2Steam(aFluid)) && (this.mProcessingEnergy < 50)) { - final int tFilledAmount = Math.min(50, aFluid.amount); - if (doFill) { - this.mProcessingEnergy += tFilledAmount; - } - return tFilledAmount; - } - return super.fill(aFluid, doFill); - } - - @Override - public boolean useModularUI() { - return true; - } - - @Override - public void addGregTechLogo(ModularWindow.Builder builder) {} - - @Override - public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) { - builder.widget( - new SlotWidget(inventoryHandler, 0).setPos(43, 25) - .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_IN)) - .widget( - new SlotWidget(inventoryHandler, 1).setPos(43, 61) - .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_OUT)) - .widget( - new SlotWidget(inventoryHandler, 2).setPos(115, 61) - .setBackground(getGUITextureSet().getItemSlot(), GTPP_UITextures.OVERLAY_SLOT_COAL)) - .widget( - new SlotWidget(inventoryHandler, 3).setPos(115, 25) - .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_DUST)) - .widget( - new ProgressBar().setProgress(() -> mSteam == null ? 0 : (float) mSteam.amount / getCapacity()) - .setTexture( - GTPP_UITextures.PROGRESSBAR_BOILER_EMPTY, - GT_UITextures.PROGRESSBAR_BOILER_STEAM, - 10) - .setDirection(ProgressBar.Direction.UP).setPos(70, 25).setSize(10, 54)) - .widget( - new ProgressBar().setProgress(() -> mFluid == null ? 0 : (float) mFluid.amount / getCapacity()) - .setTexture( - GTPP_UITextures.PROGRESSBAR_BOILER_EMPTY, - GT_UITextures.PROGRESSBAR_BOILER_WATER, - 10) - .setDirection(ProgressBar.Direction.UP).setPos(83, 25).setSize(10, 54)) - .widget( - new ProgressBar().setProgress(() -> (float) mTemperature / maxProgresstime()) - .setTexture( - GTPP_UITextures.PROGRESSBAR_BOILER_EMPTY, - GT_UITextures.PROGRESSBAR_BOILER_HEAT, - 10) - .setDirection(ProgressBar.Direction.UP).setPos(96, 25).setSize(10, 54)) - .widget( - new ProgressBar() - // cap minimum so that one can easily see there's fuel remaining - .setProgress( - () -> mProcessingEnergy > 0 ? Math.max((float) mProcessingEnergy / 1000, 1f / 5) - : 0) - .setTexture(GTPP_UITextures.PROGRESSBAR_FUEL, 14).setDirection(ProgressBar.Direction.UP) - .setPos(116, 45).setSize(14, 14)) - .widget( - new DrawableWidget().setDrawable(GTPP_UITextures.OVERLAY_SLOT_CANISTER_DARK).setPos(43, 43) - .setSize(18, 18)); - } -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionCreator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionCreator.java index 0c0e9664b5..2e59750e08 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionCreator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionCreator.java @@ -393,10 +393,6 @@ public class GregtechMetaPollutionCreator extends GregtechMetaTileEntity { return false; } - // int mCurrentPollution; - // int mAveragePollution; - // int mAveragePollutionArray[] = new int[10]; - @Override public void saveNBTData(final NBTTagCompound aNBT) { aNBT.setInteger("mCurrentPollution", this.mCurrentPollution); @@ -438,9 +434,9 @@ public class GregtechMetaPollutionCreator extends GregtechMetaTileEntity { int counter = 0; int total = 0; - for (int i = 0; i < this.mAveragePollutionArray.length; i++) { - if (this.mAveragePollutionArray[i] != 0) { - total += this.mAveragePollutionArray[i]; + for (int j : this.mAveragePollutionArray) { + if (j != 0) { + total += j; counter++; } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionDetector.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionDetector.java index 0c75d91a1b..c4b93a83b7 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionDetector.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionDetector.java @@ -385,10 +385,6 @@ public class GregtechMetaPollutionDetector extends GregtechMetaTileEntity { return false; } - // int mCurrentPollution; - // int mAveragePollution; - // int mAveragePollutionArray[] = new int[10]; - @Override public void saveNBTData(final NBTTagCompound aNBT) { aNBT.setInteger("mCurrentPollution", this.mCurrentPollution); @@ -456,17 +452,10 @@ public class GregtechMetaPollutionDetector extends GregtechMetaTileEntity { if (side == this.getBaseMetaTileEntity().getFrontFacing()) { final float[] tCoords = GT_Utility.getClickedFacingCoords(side, aX, aY, aZ); switch ((byte) ((byte) (int) (tCoords[0] * 2.0F) + (2 * (byte) (int) (tCoords[1] * 2.0F)))) { - case 0: - this.mRedstoneLevel -= 5000; - break; - case 1: - this.mRedstoneLevel += 5000; - break; - case 2: - this.mRedstoneLevel -= 50000; - break; - case 3: - this.mRedstoneLevel += 50000; + case 0 -> this.mRedstoneLevel -= 5000; + case 1 -> this.mRedstoneLevel += 5000; + case 2 -> this.mRedstoneLevel -= 50000; + case 3 -> this.mRedstoneLevel += 50000; } this.markDirty(); GT_Utility.sendChatToPlayer(aPlayer, "Emit Redstone at Pollution Level: " + this.mRedstoneLevel); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityChunkLoader.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityChunkLoader.java deleted file mode 100644 index 5cbc92a148..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityChunkLoader.java +++ /dev/null @@ -1,440 +0,0 @@ -package gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic; - -import static gregtech.api.enums.GT_Values.V; -import static gregtech.api.enums.Mods.GTPlusPlus; -import static net.minecraftforge.common.ForgeChunkManager.getMaxChunkDepthFor; - -import java.util.HashSet; -import java.util.Map; -import java.util.Set; -import java.util.UUID; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.ChunkCoordIntPair; -import net.minecraftforge.common.ForgeChunkManager; -import net.minecraftforge.common.ForgeChunkManager.Ticket; -import net.minecraftforge.common.util.ForgeDirection; - -import com.google.common.collect.MapMaker; - -import gregtech.api.enums.GT_Values; -import gregtech.api.enums.Textures; -import gregtech.api.interfaces.ITexture; -import gregtech.api.interfaces.metatileentity.IMetaTileEntity; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine; -import gregtech.api.objects.GT_RenderedTexture; -import gtPlusPlus.GTplusplus; -import gtPlusPlus.core.chunkloading.GTPP_ChunkManager; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; - -public class GregtechMetaTileEntityChunkLoader extends GT_MetaTileEntity_BasicMachine { - - public GregtechMetaTileEntityChunkLoader(int aID, String aName, String aNameRegional, int aTier) { - super( - aID, - aName, - aNameRegional, - aTier, - 4, - "Loads " + getMaxChunksToLoadForTier(aTier) + " chunks when powered", - 0, - 0); - } - - public GregtechMetaTileEntityChunkLoader(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { - super(aName, aTier, 4, aDescription, aTextures, 0, 0); - } - - public static int getMaxChunksToLoadForTier(int aTier) { - if (aTier < 4) { - return Math.min(3 * 3, getMaxChunkDepthFor(GTPlusPlus.ID)); - } - if (aTier < 6) { - return Math.min(7 * 7, getMaxChunkDepthFor(GTPlusPlus.ID)); - } - if (aTier < 8) { - return Math.min(15 * 15, getMaxChunkDepthFor(GTPlusPlus.ID)); - } else { - return 0; - } - } - - public static int getChunkRadiusForTier(int aTier) { - if (aTier < 4) { - return Math.min(1, (int) Math.floor(Math.sqrt(getMaxChunkDepthFor(GTPlusPlus.ID)))); - } - if (aTier < 6) { - return Math.min(3, (int) Math.floor(Math.sqrt(getMaxChunkDepthFor(GTPlusPlus.ID)))); - } - if (aTier < 8) { - return Math.min(7, (int) Math.floor(Math.sqrt(getMaxChunkDepthFor(GTPlusPlus.ID)))); - } else { - return 0; - } - } - - @Override - public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) { - return false; - } - - @Override - public String[] getDescription() { - return new String[] { "Loads " + getMaxChunksToLoadForTier(this.mTier) + " chunks when powered", "Consumes 2A", - "Behaves Identically to a Railcraft World Anchor", CORE.GT_Tooltip.get() }; - } - - @Override - public ITexture[][][] getTextureSet(final ITexture[] aTextures) { - final ITexture[][][] rTextures = new ITexture[10][17][]; - for (byte i = -1; i < 16; i++) { - rTextures[0][i + 1] = this.getFront(i); - rTextures[1][i + 1] = this.getBack(i); - rTextures[2][i + 1] = this.getBottom(i); - rTextures[3][i + 1] = this.getTop(i); - rTextures[4][i + 1] = this.getSides(i); - rTextures[5][i + 1] = this.getFrontActive(i); - rTextures[6][i + 1] = this.getBackActive(i); - rTextures[7][i + 1] = this.getBottomActive(i); - rTextures[8][i + 1] = this.getTopActive(i); - rTextures[9][i + 1] = this.getSidesActive(i); - } - return rTextures; - } - - @Override - public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final ForgeDirection side, - final ForgeDirection facing, final int aColorIndex, final boolean aActive, final boolean aRedstone) { - return this.mTextures[(aActive ? 5 : 0) - + (side == facing ? 0 - : side == facing.getOpposite() ? 1 - : side == ForgeDirection.DOWN ? 2 : side == ForgeDirection.UP ? 3 : 4)][aColorIndex - + 1]; - } - - public ITexture[] getFront(final byte aColor) { - return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_Material_MaragingSteel), - new GT_RenderedTexture(TexturesGtBlock.TIERED_MACHINE_HULLS[mTier]) }; - } - - public ITexture[] getBack(final byte aColor) { - return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_Material_MaragingSteel), - new GT_RenderedTexture(TexturesGtBlock.TIERED_MACHINE_HULLS[mTier]) }; - } - - public ITexture[] getBottom(final byte aColor) { - return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_Material_MaragingSteel), - new GT_RenderedTexture(TexturesGtBlock.TIERED_MACHINE_HULLS[mTier]) }; - } - - public ITexture[] getTop(final byte aColor) { - return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_Material_MaragingSteel), - new GT_RenderedTexture(TexturesGtBlock.TIERED_MACHINE_HULLS[mTier]) }; - } - - public ITexture[] getSides(final byte aColor) { - return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_Material_MaragingSteel), - new GT_RenderedTexture(TexturesGtBlock.TIERED_MACHINE_HULLS[mTier]) }; - } - - public ITexture[] getFrontActive(final byte aColor) { - return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_Material_MaragingSteel), - new GT_RenderedTexture(TexturesGtBlock.TIERED_MACHINE_HULLS[mTier + 1]) }; - } - - public ITexture[] getBackActive(final byte aColor) { - return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_Material_MaragingSteel), - new GT_RenderedTexture(TexturesGtBlock.TIERED_MACHINE_HULLS[mTier + 1]) }; - } - - public ITexture[] getBottomActive(final byte aColor) { - return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_Material_MaragingSteel), - new GT_RenderedTexture(TexturesGtBlock.TIERED_MACHINE_HULLS[mTier + 1]) }; - } - - public ITexture[] getTopActive(final byte aColor) { - return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_Material_MaragingSteel), - new GT_RenderedTexture(TexturesGtBlock.TIERED_MACHINE_HULLS[mTier + 1]) }; - } - - public ITexture[] getSidesActive(final byte aColor) { - return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_Material_MaragingSteel), - new GT_RenderedTexture(TexturesGtBlock.TIERED_MACHINE_HULLS[mTier + 1]) }; - } - - @Override - public void onScrewdriverRightClick(ForgeDirection side, EntityPlayer aPlayer, float aX, float aY, float aZ) { - super.onScrewdriverRightClick(side, aPlayer, aX, aY, aZ); - } - - @Override - public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return new GregtechMetaTileEntityChunkLoader(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); - } - - @Override - public boolean allowPullStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, - final ForgeDirection side, final ItemStack aStack) { - return false; - } - - @Override - public boolean allowPutStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, - final ForgeDirection side, final ItemStack aStack) { - return false; - } - - @Override - public String[] getInfoData() { - return super.getInfoData(); - } - - @Override - public boolean isGivingInformation() { - return true; - } - - @Override - public boolean canInsertItem(final int p_102007_1_, final ItemStack p_102007_2_, final int p_102007_3_) { - return false; - } - - @Override - public boolean canExtractItem(final int p_102008_1_, final ItemStack p_102008_2_, final int p_102008_3_) { - return false; - } - - @Override - public int getSizeInventory() { - return 0; - } - - @Override - public boolean isUseableByPlayer(final EntityPlayer p_70300_1_) { - return true; - } - - @Override - public void onPostTick(final IGregTechTileEntity aBaseMetaTileEntity, final long aTick) { - super.onPostTick(aBaseMetaTileEntity, aTick); - - if (aBaseMetaTileEntity.isServerSide()) { - if (aBaseMetaTileEntity.getXCoord() != prevX || aBaseMetaTileEntity.getYCoord() != prevY - || aBaseMetaTileEntity.getZCoord() != prevZ) { - releaseTicket(); - prevX = aBaseMetaTileEntity.getXCoord(); - prevY = aBaseMetaTileEntity.getYCoord(); - prevZ = aBaseMetaTileEntity.getZCoord(); - } - - if (hasActiveTicket() && (getTicket().world != aBaseMetaTileEntity.getWorld() || refreshTicket - || !aBaseMetaTileEntity.isAllowedToWork())) { - releaseTicket(); - } - - if (++updateCycle % updateCycleLength == 0) { - updateCycle = 0; - if (canChunkload()) { - setEUVar(getEUVar() - getEnergyConsumption()); - } - } - - if (!hasActiveTicket()) { - requestTicket(); - } - } - } - - @Override - public long maxAmperesIn() { - return 4; - } - - @Override - public long getMinimumStoredEU() { - return V[mTier] * 2; - } - - @Override - public long maxEUStore() { - return V[mTier] * 256; - } - - @Override - public long maxEUInput() { - return V[mTier]; - } - - @Override - public void onRemoval() { - super.onRemoval(); - releaseTicket(); - } - - public long getEnergyConsumption() { - return GT_Values.VP[mTier] * 2 * updateCycleLength; - } - - @Override - public void loadNBTData(NBTTagCompound aNBT) { - super.loadNBTData(aNBT); - - prevX = aNBT.getInteger("prevX"); - prevY = aNBT.getInteger("prevY"); - prevZ = aNBT.getInteger("prevZ"); - - NBTTagCompound uuidNBT = aNBT.getCompoundTag("uuid"); - uuid = new UUID(uuidNBT.getLong("most"), uuidNBT.getLong("least")); - } - - @Override - public void saveNBTData(NBTTagCompound aNBT) { - super.saveNBTData(aNBT); - - aNBT.setInteger("prevX", prevX); - aNBT.setInteger("prevY", prevY); - aNBT.setInteger("prevZ", prevZ); - - if (uuid != null) { - NBTTagCompound uuidNBT = new NBTTagCompound(); - uuidNBT.setLong("most", uuid.getMostSignificantBits()); - uuidNBT.setLong("least", uuid.getLeastSignificantBits()); - aNBT.setTag("uuid", uuidNBT); - } - } - - public boolean canChunkload() { - return getBaseMetaTileEntity().isAllowedToWork() && getEUVar() >= getEnergyConsumption(); - } - - /* - * Chunkloading Vars - */ - - private Set<ChunkCoordIntPair> mLoadedChunks = new HashSet<>(); - private static final Map<UUID, Ticket> tickets = new MapMaker().makeMap(); - private boolean refreshTicket; - private int updateCycle = 0; - private static final int updateCycleLength = 20; - private UUID uuid; - private int prevX, prevY, prevZ; - private boolean hasTicket; - - public boolean addChunkToLoadedList(ChunkCoordIntPair aActiveChunk) { - return mLoadedChunks.add(aActiveChunk); - } - - public boolean removeChunkFromLoadedList(ChunkCoordIntPair aActiveChunk) { - return mLoadedChunks.remove(aActiveChunk); - } - - public Set<ChunkCoordIntPair> getManagedChunks() { - return mLoadedChunks; - } - - public int getChunkloaderTier() { - return mTier; - } - - public void forceChunkLoading(Ticket ticket) { - setTicket(ticket); - setupChunks(); - - if (mLoadedChunks != null) { - for (ChunkCoordIntPair chunk : mLoadedChunks) { - ForgeChunkManager.forceChunk(ticket, chunk); - } - } - } - - public void setupChunks() { - if (!hasTicket) { - mLoadedChunks = null; - } else { - mLoadedChunks = GTPP_ChunkManager.getChunksAround( - getBaseMetaTileEntity().getXCoord() >> 4, - getBaseMetaTileEntity().getZCoord() >> 4, - getChunkRadiusForTier(mTier)); - } - } - - protected Ticket getTicketFromForge() { - return ForgeChunkManager - .requestTicket(GTplusplus.instance, getBaseMetaTileEntity().getWorld(), ForgeChunkManager.Type.NORMAL); - } - - public boolean hasActiveTicket() { - return getTicket() != null; - } - - protected void releaseTicket() { - refreshTicket = false; - setTicket(null); - } - - protected void requestTicket() { - if (canChunkload()) { - Ticket chunkTicket = getTicketFromForge(); - if (chunkTicket != null) { - setTicketData(chunkTicket); - forceChunkLoading(chunkTicket); - } - } - } - - protected void setTicketData(Ticket chunkTicket) { - if (chunkTicket != null) { - chunkTicket.getModData().setInteger("xCoord", getBaseMetaTileEntity().getXCoord()); - chunkTicket.getModData().setInteger("yCoord", getBaseMetaTileEntity().getYCoord()); - chunkTicket.getModData().setInteger("zCoord", getBaseMetaTileEntity().getZCoord()); - chunkTicket.setChunkListDepth(getMaxChunksToLoadForTier(mTier)); - } - } - - public void setTicket(Ticket t) { - Ticket ticket = getTicket(); - if (ticket != t) { - if (ticket != null) { - if (ticket.world == getBaseMetaTileEntity().getWorld()) { - for (ChunkCoordIntPair chunk : ticket.getChunkList()) { - if (ForgeChunkManager.getPersistentChunksFor(getBaseMetaTileEntity().getWorld()).keys() - .contains(chunk)) { - ForgeChunkManager.unforceChunk(ticket, chunk); - } - } - ForgeChunkManager.releaseTicket(ticket); - } - tickets.remove(getUUID()); - } - } - hasTicket = t != null; - if (hasTicket) { - tickets.put(getUUID(), t); - } - } - - public Ticket getTicket() { - return tickets.get(getUUID()); - } - - public UUID getUUID() { - if (uuid == null) { - uuid = UUID.randomUUID(); - } - return uuid; - } -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java index 968f44630e..d1d937fc82 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java @@ -447,8 +447,8 @@ public class GregtechMetaWirelessCharger extends GregtechMetaTileEntity { super.onFirstTick(aBaseMetaTileEntity); } - private Map<String, UUID> mWirelessChargingMap = new HashMap<String, UUID>(); - private Map<String, UUID> mLocalChargingMap = new HashMap<String, UUID>(); + private Map<String, UUID> mWirelessChargingMap = new HashMap<>(); + private Map<String, UUID> mLocalChargingMap = new HashMap<>(); private boolean isValidPlayer(EntityPlayer aPlayer) { BaseMetaTileEntity aTile = (BaseMetaTileEntity) this.getBaseMetaTileEntity(); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialArcFurnace.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialArcFurnace.java index 1b3822ca3f..ed4da64a85 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialArcFurnace.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialArcFurnace.java @@ -34,7 +34,6 @@ import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.PlayerUtils; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; @@ -229,7 +228,7 @@ public class GregtechMetaTileEntity_IndustrialArcFurnace extends @Override public void onModeChangeByScrewdriver(ForgeDirection side, EntityPlayer aPlayer, float aX, float aY, float aZ) { if (this.mSize > 5) { - this.mPlasmaMode = Utils.invertBoolean(mPlasmaMode); + this.mPlasmaMode = !mPlasmaMode; if (mPlasmaMode) { PlayerUtils.messagePlayer( aPlayer, diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCuttingMachine.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCuttingMachine.java index dfa6eb0130..fb954055b3 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCuttingMachine.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCuttingMachine.java @@ -32,7 +32,6 @@ import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.PlayerUtils; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; @@ -175,7 +174,7 @@ public class GregtechMetaTileEntity_IndustrialCuttingMachine extends @Override public void onModeChangeByScrewdriver(ForgeDirection side, EntityPlayer aPlayer, float aX, float aY, float aZ) { - mCuttingMode = Utils.invertBoolean(mCuttingMode); + mCuttingMode = !mCuttingMode; String aMode = mCuttingMode ? "Cutting" : "Slicing"; PlayerUtils.messagePlayer(aPlayer, "Mode: " + aMode); mLastRecipe = null; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialDehydrator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialDehydrator.java index 805468d4d4..e60a5cd8c4 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialDehydrator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialDehydrator.java @@ -39,7 +39,6 @@ import gregtech.api.util.GT_OverclockCalculator; import gregtech.api.util.GT_Recipe; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.PlayerUtils; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; @@ -197,7 +196,7 @@ public class GregtechMetaTileEntity_IndustrialDehydrator extends @Override public void onModeChangeByScrewdriver(ForgeDirection side, EntityPlayer aPlayer, float aX, float aY, float aZ) { - mDehydratorMode = Utils.invertBoolean(mDehydratorMode); + mDehydratorMode = !mDehydratorMode; String aMode = mDehydratorMode ? "Dehydrator" : "Vacuum Furnace"; PlayerUtils.messagePlayer(aPlayer, "Mode: " + aMode); mLastRecipe = null; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMacerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMacerator.java index fd388ba69c..3d9eab79fa 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMacerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMacerator.java @@ -264,12 +264,10 @@ public class GregtechMetaTileEntity_IndustrialMacerator extends @Override protected int getCasingTextureId() { - switch (controllerTier) { - case 2: - return TAE.GTPP_INDEX(7); - default: - return GT_Utility.getCasingTextureIndex(GregTech_API.sBlockCasings4, 2); - } + return switch (controllerTier) { + case 2 -> TAE.GTPP_INDEX(7); + default -> GT_Utility.getCasingTextureIndex(GregTech_API.sBlockCasings4, 2); + }; } @Override @@ -431,7 +429,10 @@ public class GregtechMetaTileEntity_IndustrialMacerator extends super.getWailaBody(itemStack, currentTip, accessor, config); final NBTTagCompound tag = accessor.getNBTData(); if (tag.hasKey("tier")) { - currentTip.add("Tier: " + EnumChatFormatting.YELLOW + tag.getInteger("tier") + EnumChatFormatting.RESET); + currentTip.add( + "Tier: " + EnumChatFormatting.YELLOW + + GT_Utility.formatNumbers(tag.getInteger("tier")) + + EnumChatFormatting.RESET); } } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java index 075adc065f..0e6757b29a 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java @@ -224,7 +224,7 @@ public class GregtechMetaTileEntity_IndustrialMultiMachine extends return null; } - private final int getCircuitID(ItemStack circuit) { + private int getCircuitID(ItemStack circuit) { int H = circuit.getItemDamage(); int T = (H == 20 ? 0 : (H == 21 ? 1 : (H == 22 ? 2 : -1))); return MODE_MAP[this.mInternalMode][T]; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialPlatePress.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialPlatePress.java index 89bd7fb1a8..7fc9ff0d59 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialPlatePress.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialPlatePress.java @@ -30,7 +30,6 @@ import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.PlayerUtils; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; @@ -177,7 +176,7 @@ public class GregtechMetaTileEntity_IndustrialPlatePress extends @Override public void onModeChangeByScrewdriver(ForgeDirection side, EntityPlayer aPlayer, float aX, float aY, float aZ) { - mFormingMode = Utils.invertBoolean(mFormingMode); + mFormingMode = !mFormingMode; if (mFormingMode) { PlayerUtils.messagePlayer(aPlayer, "Now running in Forming Press Mode."); } else { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IsaMill.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IsaMill.java index aef24e2f69..23889df16e 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IsaMill.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IsaMill.java @@ -70,7 +70,7 @@ public class GregtechMetaTileEntity_IsaMill extends GregtechMeta_MultiBlockBase< private static final IIconContainer frontFaceActive = new CustomIcon("iconsets/Grinder/GRINDER_ACTIVE5"); private static final IIconContainer frontFace = new CustomIcon("iconsets/Grinder/GRINDER5"); - private final ArrayList<GT_MetaTileEntity_Hatch_MillingBalls> mMillingBallBuses = new ArrayList<GT_MetaTileEntity_Hatch_MillingBalls>(); + private final ArrayList<GT_MetaTileEntity_Hatch_MillingBalls> mMillingBallBuses = new ArrayList<>(); private static final DamageSource mIsaMillDamageSource = new DamageSource("gtpp.grinder").setDamageBypassesArmor(); public GregtechMetaTileEntity_IsaMill(int aID, String aName, String aNameRegional) { @@ -216,7 +216,7 @@ public class GregtechMetaTileEntity_IsaMill extends GregtechMeta_MultiBlockBase< super.onPostTick(aBaseMetaTileEntity, aTick); } - private final AutoMap<BlockPos> mFrontBlockPosCache = new AutoMap<BlockPos>(); + private final AutoMap<BlockPos> mFrontBlockPosCache = new AutoMap<>(); public void checkForEntities(IGregTechTileEntity aBaseMetaTileEntity, long aTime) { @@ -246,8 +246,7 @@ public class GregtechMetaTileEntity_IsaMill extends GregtechMeta_MultiBlockBase< AutoMap<EntityLivingBase> aEntities = getEntities(mFrontBlockPosCache, aBaseMetaTileEntity.getWorld()); if (!aEntities.isEmpty()) { for (EntityLivingBase aFoundEntity : aEntities) { - if (aFoundEntity instanceof EntityPlayer) { - EntityPlayer aPlayer = (EntityPlayer) aFoundEntity; + if (aFoundEntity instanceof EntityPlayer aPlayer) { if (PlayerUtils.isCreative(aPlayer) || !PlayerUtils.canTakeDamage(aPlayer)) { continue; } else { @@ -278,9 +277,9 @@ public class GregtechMetaTileEntity_IsaMill extends GregtechMeta_MultiBlockBase< return Math.max(reducedDamage, 0); } - private static final AutoMap<EntityLivingBase> getEntities(AutoMap<BlockPos> aPositionsToCheck, World aWorld) { - AutoMap<EntityLivingBase> aEntities = new AutoMap<EntityLivingBase>(); - HashSet<Chunk> aChunksToCheck = new HashSet<Chunk>(); + private static AutoMap<EntityLivingBase> getEntities(AutoMap<BlockPos> aPositionsToCheck, World aWorld) { + AutoMap<EntityLivingBase> aEntities = new AutoMap<>(); + HashSet<Chunk> aChunksToCheck = new HashSet<>(); if (!aPositionsToCheck.isEmpty()) { Chunk aLocalChunk; for (BlockPos aPos : aPositionsToCheck) { @@ -289,14 +288,13 @@ public class GregtechMetaTileEntity_IsaMill extends GregtechMeta_MultiBlockBase< } } if (!aChunksToCheck.isEmpty()) { - AutoMap<EntityLivingBase> aEntitiesFound = new AutoMap<EntityLivingBase>(); + AutoMap<EntityLivingBase> aEntitiesFound = new AutoMap<>(); for (Chunk aChunk : aChunksToCheck) { if (aChunk.isChunkLoaded) { List[] aEntityLists = aChunk.entityLists; for (List aEntitySubList : aEntityLists) { for (Object aEntity : aEntitySubList) { - if (aEntity instanceof EntityLivingBase) { - EntityLivingBase aPlayer = (EntityLivingBase) aEntity; + if (aEntity instanceof EntityLivingBase aPlayer) { aEntitiesFound.add(aPlayer); } } @@ -320,7 +318,7 @@ public class GregtechMetaTileEntity_IsaMill extends GregtechMeta_MultiBlockBase< private static void generateParticles(EntityLivingBase aEntity) { BlockPos aPlayerPosBottom = EntityUtils.findBlockPosOfEntity(aEntity); BlockPos aPlayerPosTop = aPlayerPosBottom.getUp(); - AutoMap<BlockPos> aEntityPositions = new AutoMap<BlockPos>(); + AutoMap<BlockPos> aEntityPositions = new AutoMap<>(); aEntityPositions.add(aPlayerPosBottom); aEntityPositions.add(aPlayerPosTop); for (int i = 0; i < 64; i++) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_NuclearSaltProcessingPlant.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_NuclearSaltProcessingPlant.java index 8a67e0190a..6db432a24a 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_NuclearSaltProcessingPlant.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_NuclearSaltProcessingPlant.java @@ -1,6 +1,8 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing; -import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; import static gregtech.api.enums.GT_HatchElement.Energy; import static gregtech.api.enums.GT_HatchElement.InputBus; import static gregtech.api.enums.GT_HatchElement.InputHatch; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_SpargeTower.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_SpargeTower.java index 438cb650a8..85f24af541 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_SpargeTower.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_SpargeTower.java @@ -266,7 +266,7 @@ public class GregtechMetaTileEntity_SpargeTower extends GregtechMeta_MultiBlockB private static ArrayList<FluidStack> getByproductsOfSparge(final FluidStack aSpargeGas, final FluidStack aSpentFuel) { GasSpargingRecipe aSpargeRecipe = GasSpargingRecipeMap.findRecipe(aSpargeGas, aSpentFuel); - ArrayList<FluidStack> aOutputGases = new ArrayList<FluidStack>(); + ArrayList<FluidStack> aOutputGases = new ArrayList<>(); if (aSpargeRecipe == null) { Logger.INFO("Did not find sparge recipe!"); return aOutputGases; @@ -274,7 +274,7 @@ public class GregtechMetaTileEntity_SpargeTower extends GregtechMeta_MultiBlockB int aSpargeGasAmount = aSpargeRecipe.mInputGas.amount; aOutputGases.add(aSpargeRecipe.mOutputSpargedFuel.copy()); - ArrayList<FluidStack> aTempMap = new ArrayList<FluidStack>(); + ArrayList<FluidStack> aTempMap = new ArrayList<>(); for (int i = 2; i < aSpargeRecipe.mFluidOutputs.length; i++) { int aGasAmount = MathUtils.randInt(0, (aSpargeRecipe.mMaxOutputQuantity[i - 2] / 100)); FluidStack aOutput = aSpargeRecipe.mFluidOutputs[i].copy(); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_DistillationTower.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_DistillationTower.java index 53ce867b6c..3ca083ebf6 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_DistillationTower.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_DistillationTower.java @@ -155,10 +155,9 @@ public class GregtechMetaTileEntity_Adv_DistillationTower extends protected boolean addLayerOutputHatch(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) { if (aTileEntity == null || aTileEntity.isDead() - || !(aTileEntity.getMetaTileEntity() instanceof GT_MetaTileEntity_Hatch_Output)) + || !(aTileEntity.getMetaTileEntity() instanceof GT_MetaTileEntity_Hatch_Output tHatch)) return false; while (mOutputHatchesByLayer.size() < mHeight) mOutputHatchesByLayer.add(new ArrayList<>()); - GT_MetaTileEntity_Hatch_Output tHatch = (GT_MetaTileEntity_Hatch_Output) aTileEntity.getMetaTileEntity(); tHatch.updateTexture(aBaseCasingIndex); return mOutputHatchesByLayer.get(mHeight - 1).add(tHatch) && mOutputHatches.add(tHatch); } @@ -377,14 +376,11 @@ public class GregtechMetaTileEntity_Adv_DistillationTower extends @Override public int getMaxParallelRecipes() { - switch (mMode) { - case DistillationTower: - return getTierOfTower() == 1 ? 4 : getTierOfTower() == 2 ? 12 : 0; - case Distillery: - return getTierOfTower() * (4 * GT_Utility.getTier(this.getMaxInputVoltage())); - default: - return 0; - } + return switch (mMode) { + case DistillationTower -> getTierOfTower() == 1 ? 4 : getTierOfTower() == 2 ? 12 : 0; + case Distillery -> getTierOfTower() * (4 * GT_Utility.getTier(this.getMaxInputVoltage())); + default -> 0; + }; } private int getTierOfTower() { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_ElementalDuplicator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_ElementalDuplicator.java index d22f74c942..2f0bcc2c4f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_ElementalDuplicator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_ElementalDuplicator.java @@ -57,7 +57,7 @@ import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; public class GregtechMTE_ElementalDuplicator extends GregtechMeta_MultiBlockBase<GregtechMTE_ElementalDuplicator> implements ISurvivalConstructable { - private final ArrayList<GT_MetaTileEntity_Hatch_ElementalDataOrbHolder> mReplicatorDataOrbHatches = new ArrayList<GT_MetaTileEntity_Hatch_ElementalDataOrbHolder>(); + private final ArrayList<GT_MetaTileEntity_Hatch_ElementalDataOrbHolder> mReplicatorDataOrbHatches = new ArrayList<>(); private static final int CASING_TEXTURE_ID = TAE.getIndexFromPage(0, 3); private int mCasing = 0; @@ -501,8 +501,7 @@ public class GregtechMTE_ElementalDuplicator extends GregtechMeta_MultiBlockBase public static ItemStack getSpecialSlotStack(GT_Recipe aRecipe) { ItemStack aStack = null; if (aRecipe.mSpecialItems != null) { - if (aRecipe.mSpecialItems instanceof ItemStack[]) { - ItemStack[] aTempStackArray = (ItemStack[]) aRecipe.mSpecialItems; + if (aRecipe.mSpecialItems instanceof ItemStack[]aTempStackArray) { aStack = aTempStackArray[0]; } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java index fbc6b638d3..20f72a0e62 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java @@ -164,16 +164,12 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase< * @return an int corresponding to the boost */ public int getSawBoost(SAWTOOL sawType) { - switch (sawType) { - case SAW: - return 1; - case BUZZSAW: - return 2; - case CHAINSAW: - return 4; - default: - return 1; - } + return switch (sawType) { + case SAW -> 1; + case BUZZSAW -> 2; + case CHAINSAW -> 4; + default -> 1; + }; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialFishingPond.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialFishingPond.java index c992e90947..7997497d42 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialFishingPond.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialFishingPond.java @@ -342,10 +342,10 @@ public class GregtechMetaTileEntity_IndustrialFishingPond extends || (cofhWater != null && cofhWater.isAssignableFrom(block.getClass()) && meta != 0); } - private static AutoMap<AutoMap<WeightedRandomFishable>> categories = new AutoMap<AutoMap<WeightedRandomFishable>>(); - private static AutoMap<WeightedRandomFishable> categoryFish = new AutoMap<WeightedRandomFishable>(); - private static AutoMap<WeightedRandomFishable> categoryJunk = new AutoMap<WeightedRandomFishable>(); - private static AutoMap<WeightedRandomFishable> categoryLoot = new AutoMap<WeightedRandomFishable>(); + private static AutoMap<AutoMap<WeightedRandomFishable>> categories = new AutoMap<>(); + private static AutoMap<WeightedRandomFishable> categoryFish = new AutoMap<>(); + private static AutoMap<WeightedRandomFishable> categoryJunk = new AutoMap<>(); + private static AutoMap<WeightedRandomFishable> categoryLoot = new AutoMap<>(); private static boolean hasGenerateRecipes = false; private int mMode = 14; private int mMax = 8; @@ -408,7 +408,7 @@ public class GregtechMetaTileEntity_IndustrialFishingPond extends } // reflection map - private static Map<WeightedRandomFishable, ItemStack> reflectiveFishMap = new HashMap<WeightedRandomFishable, ItemStack>(); + private static Map<WeightedRandomFishable, ItemStack> reflectiveFishMap = new HashMap<>(); private ItemStack reflectiveFish(WeightedRandomFishable y) { if (reflectiveFishMap.containsKey(y)) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_LargeRocketEngine.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_LargeRocketEngine.java index cdc5ccf4fb..74a51a0260 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_LargeRocketEngine.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_LargeRocketEngine.java @@ -449,9 +449,7 @@ public class GregtechMetaTileEntity_LargeRocketEngine extends public boolean onRunningTick(ItemStack aStack) { if (this.mRuntime % 20 == 0) { if (this.mMufflerHatches.size() == 1 - && this.mMufflerHatches.get(0) instanceof GT_MetaTileEntity_Hatch_Muffler_Adv) { - GT_MetaTileEntity_Hatch_Muffler_Adv tMuffler = (GT_MetaTileEntity_Hatch_Muffler_Adv) this.mMufflerHatches - .get(0); + && this.mMufflerHatches.get(0) instanceof GT_MetaTileEntity_Hatch_Muffler_Adv tMuffler) { if (!tMuffler.hasValidFilter()) { ArrayList<ItemStack> tInputs = getStoredInputs(); for (ItemStack tItem : tInputs) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_SolarTower.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_SolarTower.java index c33dbbf0b9..4bde2de336 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_SolarTower.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_SolarTower.java @@ -58,7 +58,7 @@ public class GregtechMetaTileEntity_SolarTower extends GregtechMeta_MultiBlockBa private int mCasing3; private int mCasing4; - public ArrayList<TileEntitySolarHeater> mSolarHeaters = new ArrayList<TileEntitySolarHeater>(); + public ArrayList<TileEntitySolarHeater> mSolarHeaters = new ArrayList<>(); public GregtechMetaTileEntity_SolarTower(final int aID, final String aName, final String aNameRegional) { super(aID, aName, aNameRegional); @@ -119,7 +119,7 @@ public class GregtechMetaTileEntity_SolarTower extends GregtechMeta_MultiBlockBa private static final String SOLAR_HEATER_RING_4 = STRUCTURE_PIECE_SOLAR_HEATER_RING[3]; private static final String SOLAR_HEATER_RING_5 = STRUCTURE_PIECE_SOLAR_HEATER_RING[4]; - private static final ClassValue<IStructureDefinition<GregtechMetaTileEntity_SolarTower>> STRUCTURE_DEFINITION = new ClassValue<IStructureDefinition<GregtechMetaTileEntity_SolarTower>>() { + private static final ClassValue<IStructureDefinition<GregtechMetaTileEntity_SolarTower>> STRUCTURE_DEFINITION = new ClassValue<>() { @Override protected IStructureDefinition<GregtechMetaTileEntity_SolarTower> computeValue(Class<?> type) { @@ -445,20 +445,14 @@ public class GregtechMetaTileEntity_SolarTower extends GregtechMeta_MultiBlockBa } private int getHeaterCountForTier(int aTier) { - switch (aTier) { - case 1: - return 36; - case 2: - return 88; - case 4: - return 156; - case 8: - return 240; - case 16: - return 340; - default: - return 0; - } + return switch (aTier) { + case 1 -> 36; + case 2 -> 88; + case 4 -> 156; + case 8 -> 240; + case 16 -> 340; + default -> 0; + }; } public boolean getConnectedSolarReflectors() { @@ -509,8 +503,7 @@ public class GregtechMetaTileEntity_SolarTower extends GregtechMeta_MultiBlockBa return false; } else { IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); - if (aMetaTileEntity instanceof TileEntitySolarHeater) { - TileEntitySolarHeater mTile = (TileEntitySolarHeater) aMetaTileEntity; + if (aMetaTileEntity instanceof TileEntitySolarHeater mTile) { if (!mTile.hasSolarTower() && mTile.canSeeSky()) { // Logger.INFO("Found Solar Reflector, Injecting Data."); mTile.setSolarTower(this); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java index c454a1769e..d06566213a 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java @@ -86,7 +86,7 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase<Gregt private int mCasing; private static IStructureDefinition<GregtechMTE_ChemicalPlant> STRUCTURE_DEFINITION = null; - private final ArrayList<GT_MetaTileEntity_Hatch_Catalysts> mCatalystBuses = new ArrayList<GT_MetaTileEntity_Hatch_Catalysts>(); + private final ArrayList<GT_MetaTileEntity_Hatch_Catalysts> mCatalystBuses = new ArrayList<>(); private static final HashMap<Integer, Triplet<Block, Integer, Integer>> mTieredBlockRegistry = new HashMap<>(); @@ -99,10 +99,7 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase<Gregt } public static boolean registerMachineCasingForTier(int aTier, Block aBlock, int aMeta, int aCasingTextureID) { - Triplet<Block, Integer, Integer> aCasingData = new Triplet<Block, Integer, Integer>( - aBlock, - aMeta, - aCasingTextureID); + Triplet<Block, Integer, Integer> aCasingData = new Triplet<>(aBlock, aMeta, aCasingTextureID); if (mTieredBlockRegistry.containsKey(aTier)) { CORE.crash( "Tried to register a Machine casing for tier " + aTier @@ -447,8 +444,7 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase<Gregt public boolean addToMachineList(IGregTechTileEntity aTileEntity) { int aMaxTier = getMachineCasingTier(); final IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); - if (aMetaTileEntity instanceof GT_MetaTileEntity_TieredMachineBlock) { - GT_MetaTileEntity_TieredMachineBlock aMachineBlock = (GT_MetaTileEntity_TieredMachineBlock) aMetaTileEntity; + if (aMetaTileEntity instanceof GT_MetaTileEntity_TieredMachineBlock aMachineBlock) { int aTileTier = aMachineBlock.mTier; if (aTileTier > aMaxTier) { log("Hatch tier too high."); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Gas.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Gas.java index ac79c96605..6b411443c4 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Gas.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Gas.java @@ -132,11 +132,6 @@ public class GT_MTE_LargeTurbine_Gas extends GregtechMetaTileEntity_LargerTurbin if (totalFlow <= 0) return 0; tEU = GT_Utility.safeInt((long) totalFlow * fuelValue); - // log("Total Flow: "+totalFlow); - // log("Real Optimal Flow: "+actualOptimalFlow); - // log("Flow: "+flow); - // log("Remaining Flow: "+remainingFlow); - if (totalFlow == actualOptimalFlow) { tEU = GT_Utility.safeInt((long) tEU * (long) aBaseEff / 10000L); } else { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Plasma.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Plasma.java index d92d8f870b..f022e16057 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Plasma.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Plasma.java @@ -87,7 +87,7 @@ public class GT_MTE_LargeTurbine_Plasma extends GregtechMetaTileEntity_LargerTur continue; } if (aHatch.insertTurbine(aTurbineItem.copy())) { - boolean aDidDeplete = depleteTurbineFromStock(aTurbineItem); + depleteTurbineFromStock(aTurbineItem); continue hatch; } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GregtechMetaTileEntity_LargerTurbineBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GregtechMetaTileEntity_LargerTurbineBase.java index 046d95735b..fce6ec4408 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GregtechMetaTileEntity_LargerTurbineBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GregtechMetaTileEntity_LargerTurbineBase.java @@ -49,7 +49,6 @@ import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.api.objects.minecraft.BlockPos; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.PlayerUtils; import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils; @@ -72,7 +71,7 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase extends public ITexture frontFace; public ITexture frontFaceActive; - public ArrayList<GT_MetaTileEntity_Hatch_Turbine> mTurbineRotorHatches = new ArrayList<GT_MetaTileEntity_Hatch_Turbine>(); + public ArrayList<GT_MetaTileEntity_Hatch_Turbine> mTurbineRotorHatches = new ArrayList<>(); public GregtechMetaTileEntity_LargerTurbineBase(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); @@ -110,7 +109,7 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase extends } if (getTurbineType().equals("Plasma")) { tt.addInfo("Plasma fuel efficiency is lower for high tier turbines when using low-grade plasmas") - .addInfo("Efficiency = ((FuelValue / 200000)^2) / (EU per Turbine)"); + .addInfo("Efficiency = ((FuelValue / 200,000)^2) / (EU per Turbine)"); } tt.addPollutionAmount(getPollutionPerSecond(null)).addInfo("Pollution is 3x higher in Fast Mode").addSeparator() .beginStructureBlock(7, 9, 7, false).addController("Top Middle") @@ -129,9 +128,10 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase extends } private static final String STRUCTURE_PIECE_MAIN = "main"; - private static final ClassValue<IStructureDefinition<GregtechMetaTileEntity_LargerTurbineBase>> STRUCTURE_DEFINITION = new ClassValue<IStructureDefinition<GregtechMetaTileEntity_LargerTurbineBase>>() { + private static final ClassValue<IStructureDefinition<GregtechMetaTileEntity_LargerTurbineBase>> STRUCTURE_DEFINITION = new ClassValue<>() { @Override + @SuppressWarnings("SpellCheckingInspection") protected IStructureDefinition<GregtechMetaTileEntity_LargerTurbineBase> computeValue(Class<?> type) { return StructureDefinition.<GregtechMetaTileEntity_LargerTurbineBase>builder() // c = turbine casing @@ -267,10 +267,9 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase extends if (aMetaTileEntity == null) { return false; } - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Turbine) { + if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Turbine aTurbineHatch) { log("Found GT_MetaTileEntity_Hatch_Turbine"); updateTexture(aTileEntity, aBaseCasingIndex); - GT_MetaTileEntity_Hatch_Turbine aTurbineHatch = (GT_MetaTileEntity_Hatch_Turbine) aMetaTileEntity; IGregTechTileEntity g = this.getBaseMetaTileEntity(); if (aTurbineHatch.setController(new BlockPos(g.getXCoord(), g.getYCoord(), g.getZCoord(), g.getWorld()))) { boolean aDidAdd = this.mTurbineRotorHatches.add(aTurbineHatch); @@ -375,26 +374,20 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase extends } public static String getTurbineSizeString(int aSize) { - switch (aSize) { - case 1: - return "Small Turbine"; - case 2: - return "Turbine"; - case 3: - return "Large Turbine"; - case 4: - return "Huge Turbine"; - default: - return ""; - } + return switch (aSize) { + case 1 -> "Small Turbine"; + case 2 -> "Turbine"; + case 3 -> "Large Turbine"; + case 4 -> "Huge Turbine"; + default -> ""; + }; } protected ArrayList<GT_MetaTileEntity_Hatch_Turbine> getEmptyTurbineAssemblies() { - ArrayList<GT_MetaTileEntity_Hatch_Turbine> aEmptyTurbineRotorHatches = new ArrayList<GT_MetaTileEntity_Hatch_Turbine>(); + ArrayList<GT_MetaTileEntity_Hatch_Turbine> aEmptyTurbineRotorHatches = new ArrayList<>(); // log("Checking "+mTurbineRotorHatches.size()+" Assemblies for empties."); for (GT_MetaTileEntity_Hatch_Turbine aTurbineHatch : this.mTurbineRotorHatches) { if (!aTurbineHatch.hasTurbine()) { - // log("Found Assembly without Turbine."); aEmptyTurbineRotorHatches.add(aTurbineHatch); } } @@ -402,7 +395,7 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase extends } protected ArrayList<GT_MetaTileEntity_Hatch_Turbine> getFullTurbineAssemblies() { - ArrayList<GT_MetaTileEntity_Hatch_Turbine> aTurbineRotorHatches = new ArrayList<GT_MetaTileEntity_Hatch_Turbine>(); + ArrayList<GT_MetaTileEntity_Hatch_Turbine> aTurbineRotorHatches = new ArrayList<>(); // log("Checking "+mTurbineRotorHatches.size()+" Assemblies for Turbines."); for (GT_MetaTileEntity_Hatch_Turbine aTurbineHatch : this.mTurbineRotorHatches) { if (aTurbineHatch.hasTurbine()) { @@ -413,9 +406,9 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase extends return aTurbineRotorHatches; } - protected boolean depleteTurbineFromStock(ItemStack aTurbine) { + protected void depleteTurbineFromStock(ItemStack aTurbine) { if (aTurbine == null) { - return false; + return; } startRecipeProcessing(); for (GT_MetaTileEntity_Hatch_InputBus aInputBus : this.mInputBusses) { @@ -425,12 +418,11 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase extends aStack.stackSize -= aTurbine.stackSize; updateSlots(); endRecipeProcessing(); - return true; + return; } } } endRecipeProcessing(); - return false; } @Override @@ -445,7 +437,7 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase extends continue; } if (aHatch.insertTurbine(aTurbineItem.copy())) { - boolean aDidDeplete = depleteTurbineFromStock(aTurbineItem); + depleteTurbineFromStock(aTurbineItem); continue hatch; } } @@ -504,7 +496,7 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase extends // Magic numbers: can always change by at least 10 eu/t, but otherwise by at most 1 percent of the // difference in power level (per tick) // This is how much the turbine can actually change during this tick - int maxChangeAllowed = Math.max(10, GT_Utility.safeInt((long) Math.abs(difference) / 100)); + int maxChangeAllowed = Math.max(10, GT_Utility.safeInt(Math.abs(difference) / 100)); if (Math.abs(difference) > maxChangeAllowed) { // If this difference is too big, use the maximum allowed // change @@ -542,24 +534,12 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase extends if (getBaseMetaTileEntity().getRandomNumber(6000) < getMaintenanceThreshold()) { switch (getBaseMetaTileEntity().getRandomNumber(6)) { - case 0: - mWrench = false; - break; - case 1: - mScrewdriver = false; - break; - case 2: - mSoftHammer = false; - break; - case 3: - mHardHammer = false; - break; - case 4: - mSolderingTool = false; - break; - case 5: - mCrowbar = false; - break; + case 0 -> mWrench = false; + case 1 -> mScrewdriver = false; + case 2 -> mSoftHammer = false; + case 3 -> mHardHammer = false; + case 4 -> mSolderingTool = false; + case 5 -> mCrowbar = false; } } for (GT_MetaTileEntity_Hatch_Turbine aHatch : getFullTurbineAssemblies()) { @@ -611,12 +591,12 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase extends : EnumChatFormatting.RED + StatCollector.translateToLocal("GT5U.turbine.running.false") + EnumChatFormatting.RESET; - String tMaintainance = getIdealStatus() == getRepairStatus() + String tMaintenance = getIdealStatus() == getRepairStatus() ? EnumChatFormatting.GREEN + StatCollector.translateToLocal("GT5U.turbine.maintenance.false") + EnumChatFormatting.RESET : EnumChatFormatting.RED + StatCollector.translateToLocal("GT5U.turbine.maintenance.true") + EnumChatFormatting.RESET; - int tDura = 0; + int tDura; StringBuilder aTurbineDamage = new StringBuilder(); for (GT_MetaTileEntity_Hatch_Turbine aHatch : this.getFullTurbineAssemblies()) { @@ -624,7 +604,8 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase extends tDura = MathUtils.safeInt( (long) (100.0f / GT_MetaGenerated_Tool.getToolMaxDamage(aTurbine) * (GT_MetaGenerated_Tool.getToolDamage(aTurbine)) + 1)); - aTurbineDamage.append(EnumChatFormatting.RED).append(tDura).append(EnumChatFormatting.RESET).append("% | "); + aTurbineDamage.append(EnumChatFormatting.RED).append(GT_Utility.formatNumbers(tDura)) + .append(EnumChatFormatting.RESET).append("% | "); } long storedEnergy = 0; @@ -642,27 +623,27 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase extends // 8 Lines available for information panels tRunning + ": " + EnumChatFormatting.RED - + ((lEUt * mEfficiency) / 10000) + + GT_Utility.formatNumbers(((lEUt * mEfficiency) / 10000)) + EnumChatFormatting.RESET + " EU/t", - tMaintainance, + tMaintenance, StatCollector.translateToLocal("GT5U.turbine.efficiency") + ": " + EnumChatFormatting.YELLOW - + (mEfficiency / 100F) + + GT_Utility.formatNumbers((mEfficiency / 100F)) + EnumChatFormatting.RESET + "%", StatCollector.translateToLocal("GT5U.multiblock.energy") + ": " + EnumChatFormatting.GREEN - + storedEnergy + + GT_Utility.formatNumbers(storedEnergy) + EnumChatFormatting.RESET + " EU / " + EnumChatFormatting.YELLOW - + maxEnergy + + GT_Utility.formatNumbers(maxEnergy) + EnumChatFormatting.RESET + " EU", StatCollector.translateToLocal("GT5U.turbine.flow") + ": " + EnumChatFormatting.YELLOW - + MathUtils.safeInt((long) realOptFlow) + + GT_Utility.formatNumbers(MathUtils.safeInt((long) realOptFlow)) + EnumChatFormatting.RESET + " L/s" + EnumChatFormatting.YELLOW @@ -672,18 +653,18 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase extends + ")", StatCollector.translateToLocal("GT5U.turbine.fuel") + ": " + EnumChatFormatting.GOLD - + storedFluid + + GT_Utility.formatNumbers(storedFluid) + EnumChatFormatting.RESET + "L", StatCollector.translateToLocal("GT5U.turbine.dmg") + ": " + aTurbineDamage, StatCollector.translateToLocal("GT5U.multiblock.pollution") + ": " + EnumChatFormatting.GREEN - + mPollutionReduction + + GT_Utility.formatNumbers(mPollutionReduction) + EnumChatFormatting.RESET + " %" }; if (!aIsSteam) ret[4] = StatCollector.translateToLocal("GT5U.turbine.flow") + ": " + EnumChatFormatting.YELLOW - + MathUtils.safeInt((long) realOptFlow) + + GT_Utility.formatNumbers(MathUtils.safeInt((long) realOptFlow)) + EnumChatFormatting.RESET + " L/t"; return ret; @@ -738,7 +719,7 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase extends @Override public void onModeChangeByScrewdriver(ForgeDirection side, EntityPlayer aPlayer, float aX, float aY, float aZ) { - mFastMode = Utils.invertBoolean(mFastMode); + mFastMode = !mFastMode; if (mFastMode) { PlayerUtils.messagePlayer(aPlayer, "Running in Fast (48x) Mode."); } else { @@ -805,22 +786,19 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase extends private Long mLastHatchUpdate; - public int updateTurbineHatches(boolean aState) { - int aUpdated = 0; + public void updateTurbineHatches(boolean aState) { if (mLastHatchUpdate == null) { mLastHatchUpdate = System.currentTimeMillis() / 1000; } if (this.mTurbineRotorHatches.isEmpty() || ((System.currentTimeMillis() / 1000) - mLastHatchUpdate) <= 2) { - return 0; + return; } for (GT_MetaTileEntity_Hatch_Turbine h : this.mTurbineRotorHatches) { if (!isValidMetaTileEntity(h)) continue; h.setActive(aState); - aUpdated++; } mLastHatchUpdate = System.currentTimeMillis() / 1000; - return aUpdated; } @Override @@ -854,25 +832,17 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase extends @Override public boolean addEnergyOutputMultipleDynamos(long aEU, boolean aAllowMixedVoltageDynamos) { int injected = 0; - long totalOutput = 0; long aFirstVoltageFound = -1; - boolean aFoundMixedDynamos = false; for (GT_MetaTileEntity_Hatch aDynamo : mAllDynamoHatches) { if (aDynamo == null) { return false; } if (isValidMetaTileEntity(aDynamo)) { long aVoltage = aDynamo.maxEUOutput(); - long aTotal = aDynamo.maxAmperesOut() * aVoltage; // Check against voltage to check when hatch mixing if (aFirstVoltageFound == -1) { aFirstVoltageFound = aVoltage; - } else { - if (aFirstVoltageFound != aVoltage) { - aFoundMixedDynamos = true; - } } - totalOutput += aTotal; } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java index c25bddabfd..8e7f2b97ed 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java @@ -202,30 +202,25 @@ public class GregtechMetaTileEntity_PowerSubStationController } public static Block getBlockFromTier(int tier) { - switch (tier) { - case 4: - return ModBlocks.blockCasings2Misc; - case 5: - case 6: - case 7: - case 8: - case 9: - return ModBlocks.blockCasings3Misc; - default: - return null; - } + return switch (tier) { + case 4 -> ModBlocks.blockCasings2Misc; + case 5, 6, 7, 8, 9 -> ModBlocks.blockCasings3Misc; + default -> null; + }; } public static int getMaxHatchTier(int aCellTier) { switch (aCellTier) { - case 9: + case 9 -> { return GT_Values.VOLTAGE_NAMES[9].equals("Ultimate High Voltage") ? 15 : 9; - default: + } + default -> { if (aCellTier < 4) { return 0; } else { return aCellTier; } + } } } @@ -537,20 +532,12 @@ public class GregtechMetaTileEntity_PowerSubStationController this.mAverageEuUsage = aNBT.getLong("mAverageEuUsage"); } switch (aNBT.func_150299_b("mAverageEuAdded")) { - case NBT.TAG_BYTE_ARRAY: - this.mAverageEuAdded.read(aNBT, "mAverageEuAdded"); - break; - case NBT.TAG_LONG: - this.mAverageEuAdded.set(aNBT.getLong("mAverageEuAdded")); - break; + case NBT.TAG_BYTE_ARRAY -> this.mAverageEuAdded.read(aNBT, "mAverageEuAdded"); + case NBT.TAG_LONG -> this.mAverageEuAdded.set(aNBT.getLong("mAverageEuAdded")); } switch (aNBT.func_150299_b("mAverageEuConsumed")) { - case NBT.TAG_BYTE_ARRAY: - this.mAverageEuConsumed.read(aNBT, "mAverageEuConsumed"); - break; - case NBT.TAG_LONG: - this.mAverageEuConsumed.set(aNBT.getLong("mAverageEuConsumed")); - break; + case NBT.TAG_BYTE_ARRAY -> this.mAverageEuConsumed.read(aNBT, "mAverageEuConsumed"); + case NBT.TAG_LONG -> this.mAverageEuConsumed.set(aNBT.getLong("mAverageEuConsumed")); } // Usage Stats @@ -829,7 +816,7 @@ public class GregtechMetaTileEntity_PowerSubStationController @Override public void onModeChangeByScrewdriver(ForgeDirection side, EntityPlayer aPlayer, float aX, float aY, float aZ) { - mIsOutputtingPower = Utils.invertBoolean(mIsOutputtingPower); + mIsOutputtingPower = !mIsOutputtingPower; if (mIsOutputtingPower) { PlayerUtils.messagePlayer(aPlayer, "Sub-Station is now outputting power from the controller."); } else { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneButtonPanel.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneButtonPanel.java index 2b3ec158d8..963b80ae99 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneButtonPanel.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneButtonPanel.java @@ -77,67 +77,34 @@ public class GT_MetaTileEntity_RedstoneButtonPanel extends GT_MetaTileEntity_Red case 0: default: switch (side) { - case DOWN: - case UP: - mRedstoneStrength = (byte) ((byte) (aX * 4) + 4 * (byte) (aZ * 4)); - break; - case NORTH: - mRedstoneStrength = (byte) ((byte) (4 - aX * 4) + 4 * (byte) (4 - aY * 4)); - break; - case SOUTH: - mRedstoneStrength = (byte) ((byte) (aX * 4) + 4 * (byte) (4 - aY * 4)); - break; - case WEST: - mRedstoneStrength = (byte) ((byte) (aZ * 4) + 4 * (byte) (4 - aY * 4)); - break; - case EAST: - mRedstoneStrength = (byte) ((byte) (4 - aZ * 4) + 4 * (byte) (4 - aY * 4)); - break; + case DOWN, UP -> mRedstoneStrength = (byte) ((byte) (aX * 4) + 4 * (byte) (aZ * 4)); + case NORTH -> mRedstoneStrength = (byte) ((byte) (4 - aX * 4) + 4 * (byte) (4 - aY * 4)); + case SOUTH -> mRedstoneStrength = (byte) ((byte) (aX * 4) + 4 * (byte) (4 - aY * 4)); + case WEST -> mRedstoneStrength = (byte) ((byte) (aZ * 4) + 4 * (byte) (4 - aY * 4)); + case EAST -> mRedstoneStrength = (byte) ((byte) (4 - aZ * 4) + 4 * (byte) (4 - aY * 4)); } break; case 1: switch (side) { - case DOWN: - case UP: - mRedstoneStrength = (byte) (mRedstoneStrength - ^ (1 << (((byte) (aX * 2) + 2 * (byte) (aZ * 2))))); - break; - case NORTH: - mRedstoneStrength = (byte) (mRedstoneStrength - ^ (1 << (((byte) (2 - aX * 2) + 2 * (byte) (2 - aY * 2))))); - break; - case SOUTH: - mRedstoneStrength = (byte) (mRedstoneStrength - ^ (1 << (((byte) (aX * 2) + 2 * (byte) (2 - aY * 2))))); - break; - case WEST: - mRedstoneStrength = (byte) (mRedstoneStrength - ^ (1 << (((byte) (aZ * 2) + 2 * (byte) (2 - aY * 2))))); - break; - case EAST: - mRedstoneStrength = (byte) (mRedstoneStrength - ^ (1 << (((byte) (2 - aZ * 2) + 2 * (byte) (2 - aY * 2))))); - break; + case DOWN, UP -> mRedstoneStrength = (byte) (mRedstoneStrength + ^ (1 << (((byte) (aX * 2) + 2 * (byte) (aZ * 2))))); + case NORTH -> mRedstoneStrength = (byte) (mRedstoneStrength + ^ (1 << (((byte) (2 - aX * 2) + 2 * (byte) (2 - aY * 2))))); + case SOUTH -> mRedstoneStrength = (byte) (mRedstoneStrength + ^ (1 << (((byte) (aX * 2) + 2 * (byte) (2 - aY * 2))))); + case WEST -> mRedstoneStrength = (byte) (mRedstoneStrength + ^ (1 << (((byte) (aZ * 2) + 2 * (byte) (2 - aY * 2))))); + case EAST -> mRedstoneStrength = (byte) (mRedstoneStrength + ^ (1 << (((byte) (2 - aZ * 2) + 2 * (byte) (2 - aY * 2))))); } break; case 2: switch (side) { - case DOWN: - case UP: - mRedstoneStrength = (byte) (mRedstoneStrength ^ (1 << ((byte) (aZ * 4)))); - break; - case NORTH: - mRedstoneStrength = (byte) (mRedstoneStrength ^ (1 << ((byte) (4 - aY * 4)))); - break; - case SOUTH: - mRedstoneStrength = (byte) (mRedstoneStrength ^ (1 << ((byte) (4 - aY * 4)))); - break; - case WEST: - mRedstoneStrength = (byte) (mRedstoneStrength ^ (1 << ((byte) (4 - aY * 4)))); - break; - case EAST: - mRedstoneStrength = (byte) (mRedstoneStrength ^ (1 << ((byte) (4 - aY * 4)))); - break; + case DOWN, UP -> mRedstoneStrength = (byte) (mRedstoneStrength ^ (1 << ((byte) (aZ * 4)))); + case NORTH -> mRedstoneStrength = (byte) (mRedstoneStrength ^ (1 << ((byte) (4 - aY * 4)))); + case SOUTH -> mRedstoneStrength = (byte) (mRedstoneStrength ^ (1 << ((byte) (4 - aY * 4)))); + case WEST -> mRedstoneStrength = (byte) (mRedstoneStrength ^ (1 << ((byte) (4 - aY * 4)))); + case EAST -> mRedstoneStrength = (byte) (mRedstoneStrength ^ (1 << ((byte) (4 - aY * 4)))); } break; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneCircuitBlock.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneCircuitBlock.java index 8fa38ac694..30002ac512 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneCircuitBlock.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneCircuitBlock.java @@ -161,7 +161,7 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re public void switchGateForward(boolean aShift) { try { Set<Integer> tKeys = GregTech_API.sCircuitryBehaviors.keySet(); - ArrayList<Integer> tList = new ArrayList<Integer>(); + ArrayList<Integer> tList = new ArrayList<>(); tList.addAll(tKeys); if (tList.size() <= 0) return; Collections.sort(tList); @@ -179,7 +179,7 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re public void switchGateBackward(boolean aShift) { try { Set<Integer> tKeys = GregTech_API.sCircuitryBehaviors.keySet(); - ArrayList<Integer> tList = new ArrayList<Integer>(); + ArrayList<Integer> tList = new ArrayList<>(); tList.addAll(tKeys); if (tList.size() <= 0) return; Collections.sort(tList); @@ -308,7 +308,7 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re } /** The Item List for Covers */ - public static final Map<Integer, ItemStack> sCoversItems = new HashMap<Integer, ItemStack>(); + public static final Map<Integer, ItemStack> sCoversItems = new HashMap<>(); private static void initCovers() { for (GT_ItemStack aKey : GregTech_API.sCovers.keySet()) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_AdvancedCraftingTable.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_AdvancedCraftingTable.java deleted file mode 100644 index 5927f08ca9..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_AdvancedCraftingTable.java +++ /dev/null @@ -1,693 +0,0 @@ -package gtPlusPlus.xmod.gregtech.common.tileentities.storage; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.network.PacketBuffer; -import net.minecraftforge.common.util.ForgeDirection; - -import org.apache.commons.lang3.ArrayUtils; - -import com.gtnewhorizons.modularui.api.drawable.IDrawable; -import com.gtnewhorizons.modularui.api.screen.ModularWindow; -import com.gtnewhorizons.modularui.api.screen.UIBuildContext; -import com.gtnewhorizons.modularui.api.widget.Interactable; -import com.gtnewhorizons.modularui.common.internal.network.NetworkUtils; -import com.gtnewhorizons.modularui.common.internal.wrapper.BaseSlot; -import com.gtnewhorizons.modularui.common.widget.ButtonWidget; -import com.gtnewhorizons.modularui.common.widget.SlotGroup; -import com.gtnewhorizons.modularui.common.widget.SlotWidget; - -import gregtech.api.enums.GT_Values; -import gregtech.api.gui.modularui.GT_UIInfos; -import gregtech.api.gui.modularui.GT_UITextures; -import gregtech.api.interfaces.ITexture; -import gregtech.api.interfaces.modularui.IAddGregtechLogo; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicTank; -import gregtech.api.objects.GT_RenderedTexture; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_Utility; -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.interfaces.IItemBlueprint; -import gtPlusPlus.core.item.general.ItemBlueprint; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.math.MathUtils; -import gtPlusPlus.xmod.gregtech.api.gui.GTPP_UITextures; -import gtPlusPlus.xmod.gregtech.api.gui.widget.ElectricSlotWidget; -import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; - -public class GT_MetaTileEntity_AdvancedCraftingTable extends GT_MetaTileEntity_BasicTank implements IAddGregtechLogo { - - public boolean mFlushMode = false; - - protected String mLocalName; - - public GT_MetaTileEntity_AdvancedCraftingTable(final int aID, final String aName, final String aNameRegional, - final int aTier, final String aDescription) { - super(aID, aName, aNameRegional, aTier, 35, aDescription); - mLocalName = aNameRegional; - } - - public GT_MetaTileEntity_AdvancedCraftingTable(final String aName, final int aTier, final String[] aDescription, - final ITexture[][][] aTextures) { - super(aName, aTier, 35, aDescription, aTextures); - } - - @Override - public boolean isTransformerUpgradable() { - return true; - } - - @Override - public boolean isSimpleMachine() { - return true; - } - - @Override - public boolean isValidSlot(int aIndex) { - return aIndex < 31 || aIndex > 32; - } - - @Override - public boolean isFacingValid(ForgeDirection facing) { - return true; - } - - @Override - public boolean isAccessAllowed(EntityPlayer aPlayer) { - return true; - } - - @Override - public boolean isEnetInput() { - return isElectric(); - } - - @Override - public boolean isInputFacing(ForgeDirection side) { - return true; - } - - @Override - public long maxEUInput() { - return isElectric() ? GT_Values.V[3] : 0; - } - - @Override - public long maxEUStore() { - return isElectric() ? GT_Values.V[3] * 1024 : 0; - } - - @Override - public boolean isElectric() { - return isAdvanced(); - } - - @Override - public boolean isPneumatic() { - return false; - } - - @Override - public boolean isSteampowered() { - return false; - } - - @Override - public long maxAmperesIn() { - return isElectric() ? 2 : 0; - } - - @Override - public long getMinimumStoredEU() { - return isElectric() ? GT_Values.V[3] * 2 : 0; - } - - @Override - public int getSizeInventory() { - return 35; - } - - @Override - public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_AdvancedCraftingTable( - this.mName, - this.mTier, - this.mDescriptionArray, - this.mTextures); - } - - @Override - public boolean onRightclick(final IGregTechTileEntity aBaseMetaTileEntity, final EntityPlayer aPlayer) { - GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer); - return true; - } - - @Override - public boolean doesFillContainers() { - return false; - } - - @Override - public boolean doesEmptyContainers() { - return false; - } - - @Override - public boolean canTankBeFilled() { - return true; - } - - @Override - public boolean canTankBeEmptied() { - return true; - } - - @Override - public boolean displaysItemStack() { - return false; - } - - @Override - public boolean displaysStackSize() { - return false; - } - - public void sortIntoTheInputSlots() { - for (byte i = 21; i < 30; i++) if (mInventory[i] != null) { - if (mInventory[i].stackSize == 0) { - mInventory[i] = null; - } - if (mInventory[i] != null) for (byte j = 0; j < 16; j++) { - if (GT_Utility.areStacksEqual(mInventory[i], mInventory[j])) { - GT_Utility.moveStackFromSlotAToSlotB( - getBaseMetaTileEntity(), - getBaseMetaTileEntity(), - i, - j, - (byte) 64, - (byte) 1, - (byte) 64, - (byte) 1); - } - } - if (mInventory[i] != null) for (byte j = 0; j < 16; j++) { - if (mInventory[j] == null) { - GT_Utility.moveStackFromSlotAToSlotB( - getBaseMetaTileEntity(), - getBaseMetaTileEntity(), - i, - j, - (byte) 64, - (byte) 1, - (byte) 64, - (byte) 1); - } - } - } - } - - private void fillLiquidContainers() { - for (byte i = 16; i < 21 && mFluid != null; i++) { - ItemStack tOutput = GT_Utility.fillFluidContainer(mFluid, mInventory[i], false, true); - if (tOutput != null) { - if (mInventory[i].stackSize == 1) { - mFluid.amount -= GT_Utility.getFluidForFilledItem(tOutput, true).amount * tOutput.stackSize; - mInventory[i] = tOutput; - } else for (byte j = 16; j < 21; j++) { - if (mInventory[j] == null || (GT_Utility.areStacksEqual(tOutput, mInventory[j]) - && mInventory[j].stackSize + tOutput.stackSize <= tOutput.getMaxStackSize())) { - mFluid.amount -= GT_Utility.getFluidForFilledItem(tOutput, true).amount * tOutput.stackSize; - getBaseMetaTileEntity().decrStackSize(i, 1); - if (mInventory[j] == null) { - mInventory[j] = tOutput; - } else { - mInventory[j].stackSize++; - } - break; - } - } - if (mFluid != null && mFluid.amount <= 0) mFluid = null; - } - } - if (mFluid != null && mFluid.amount <= 0) mFluid = null; - } - - public void setBluePrint(ItemStack aStack) { - if (aStack == null) { - aStack = mInventory[30]; - Logger.INFO("Using Slot 30 supply."); - } - if (mInventory[31] == null || aStack == null - || aStack.getItem() == null - || aStack.getItemDamage() != 0 - || aStack.stackSize != 1 - || !(aStack.getItem() instanceof ItemBlueprint)) { - try { - Logger.INFO( - "Could not set Blueprint. Slot 31: " - + (mInventory[31] != null ? mInventory[31].getDisplayName() : "Null") - + ", aStack: " - + (aStack != null ? aStack.getDisplayName() : "Null") - + ", Damage: " - + (aStack != null ? aStack.getItemDamage() : "Null")); - } catch (Throwable t) { - t.printStackTrace(); - } - return; - } - if (!aStack.getTagCompound().hasKey("Inventory")) { - NBTTagCompound tNBT = new NBTTagCompound(); - NBTTagList tNBT_ItemList = new NBTTagList(); - for (int i = 0; i < 9; i++) { - ItemStack tStack = mInventory[i + 21]; - if (tStack != null) { - NBTTagCompound tag = new NBTTagCompound(); - tag.setByte("Slot", (byte) i); - tStack.writeToNBT(tag); - tNBT_ItemList.appendTag(tag); - } - } - tNBT.setTag("Inventory", tNBT_ItemList); - tNBT.setBoolean("mBlueprint", true); - tNBT.setInteger("mID", MathUtils.randInt(1, Short.MAX_VALUE)); - tNBT.setString("mName", mInventory[31].getDisplayName()); - aStack.setTagCompound(tNBT); - Logger.INFO("Set NBT of crafting table to Stack in slot 30."); - } else { - Logger.INFO("Blueprint already has recipe tags."); - } - } - - public ItemStack getCraftingOutput() { - if (mInventory[30] != null && mInventory[30].getItem() != null - && mInventory[30].getItemDamage() == 0 - && mInventory[30].hasTagCompound() - && mInventory[30].getItem() instanceof ItemBlueprint) { - // Logger.INFO("Getting Blueprint Data in slot 30. "+mInventory[30].getDisplayName()); - NBTTagCompound tNBT = mInventory[30].getTagCompound(); - NBTTagList tNBT_ItemList = tNBT.getTagList("Blueprint", 10); - for (int i = 0; i < tNBT_ItemList.tagCount() && i < 9; i++) { - NBTTagCompound tag = (NBTTagCompound) tNBT_ItemList.getCompoundTagAt(i); - byte slot = tag.getByte("Slot"); - if (slot >= 0 && slot < 9 && mInventory[slot + 21] == null) { - mInventory[slot + 21] = GT_Utility.loadItem(tag); - if (mInventory[slot + 21] != null) mInventory[slot + 21].stackSize = 0; - } - } - } - mInventory[31] = GT_ModHandler.getAllRecipeOutput( - getBaseMetaTileEntity().getWorld(), - new ItemStack[] { mInventory[21], mInventory[22], mInventory[23], mInventory[24], mInventory[25], - mInventory[26], mInventory[27], mInventory[28], mInventory[29] }); - return mInventory[31]; - } - - public boolean canDoCraftingOutput() { - if (mInventory[31] == null) return false; - for (ItemStack tStack : recipeContent()) { - if (tStack.stackSize > getAmountOf(tStack)) { - return false; - } - } - return true; - } - - private int getAmountOf(ItemStack aStack) { - int tAmount = 0; - for (byte i = 0; i < 30 && tAmount < 9; i++) { - if (GT_Utility.areStacksOrToolsEqual(aStack, mInventory[i])) { - tAmount += mInventory[i].stackSize; - } - } - return tAmount; - } - - private ArrayList<ItemStack> recipeContent() { - ArrayList<ItemStack> tList = new ArrayList<ItemStack>(); - for (byte i = 21; i < 30; i++) { - if (mInventory[i] != null) { - boolean temp = false; - for (byte j = 0; j < tList.size(); j++) { - if (GT_Utility.areStacksOrToolsEqual(mInventory[i], tList.get(j))) { - tList.get(j).stackSize++; - temp = true; - break; - } - } - if (!temp) tList.add(GT_Utility.copy(1, mInventory[i])); - } - } - return tList; - } - - public ItemStack consumeMaterials(EntityPlayer aPlayer, ItemStack aHoldStack) { - if (mInventory[31] == null) return aHoldStack; - if (aHoldStack != null) { - if (!GT_Utility.areStacksEqual(aHoldStack, mInventory[31])) return aHoldStack; - if (aHoldStack.stackSize + mInventory[31].stackSize > aHoldStack.getMaxStackSize()) return aHoldStack; - } - for (byte i = 21; i < 30; i++) if (mInventory[i] != null) { - for (byte j = 0; j <= i; j++) { - if (j < 21 || j == i) { - if (GT_Utility.areStacksOrToolsEqual(mInventory[i], mInventory[j]) && mInventory[j].stackSize > 0) { - ItemStack tStack = GT_Utility.getContainerItem(mInventory[j], true); - if (tStack == null || (tStack.isItemStackDamageable() - && tStack.getItemDamage() >= tStack.getMaxDamage())) { - getBaseMetaTileEntity().decrStackSize(j, 1); - } else if (mInventory[j].stackSize == 1) { - mInventory[j] = tStack; - } else { - getBaseMetaTileEntity().decrStackSize(j, 1); - for (byte k = 0; k < 21; k++) { - if (mInventory[k] == null) { - mInventory[k] = tStack; - break; - } else { - if (GT_Utility.areStacksEqual(tStack, mInventory[k])) { - if (tStack.stackSize + mInventory[k].stackSize - <= mInventory[k].getMaxStackSize()) { - mInventory[k].stackSize += tStack.stackSize; - break; - } - } - } - } - } - break; - } - } - } - } - if (aHoldStack == null) { - aHoldStack = GT_Utility.copy(mInventory[31]); - aHoldStack.onCrafting(getBaseMetaTileEntity().getWorld(), aPlayer, mInventory[31].stackSize); - } else { - aHoldStack.stackSize += mInventory[31].stackSize; - aHoldStack.onCrafting(getBaseMetaTileEntity().getWorld(), aPlayer, mInventory[31].stackSize); - } - - fillLiquidContainers(); - - return aHoldStack; - } - - @Override - public int rechargerSlotStartIndex() { - return 16; - } - - @Override - public int rechargerSlotCount() { - return 5; - } - - @Override - public long getOutputTier() { - return GT_Utility.getTier(getBaseMetaTileEntity().getInputVoltage()); - } - - @Override - public int getCapacity() { - return 64000; - } - - @Override - public int getTankPressure() { - return -100; - } - - @Override - public boolean allowPullStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, ForgeDirection side, - ItemStack aStack) { - return aIndex == 33 || (mFlushMode && aIndex >= 21 && aIndex < 30); - } - - @Override - public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, ForgeDirection side, - ItemStack aStack) { - if (aIndex < 16) { - for (byte i = 0; i < 16; i++) - if (GT_Utility.areStacksOrToolsEqual(aStack, mInventory[i])) return aIndex == i; - return true; - } - return false; - } - - @Override - public void onPreTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { - super.onPreTick(aBaseMetaTileEntity, aTick); - getCraftingOutput(); - } - - @Override - public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { - super.onPostTick(aBaseMetaTileEntity, aTick); - if (getBaseMetaTileEntity().isServerSide()) { - if (getBaseMetaTileEntity().hasInventoryBeenModified()) getCraftingOutput(); - fillLiquidContainers(); - if (mFlushMode) { - mFlushMode = false; - for (byte i = 21; i < 30; i++) { - if (mInventory[i] != null) { - if (mInventory[i].stackSize == 0) { - mInventory[i] = null; - } else { - mFlushMode = true; - break; - } - } - } - } - } - /* - * if (aTick % 100 == 0) { for (int i = 0; i < this.mInventory.length; i++) { ItemStack aSlot = mInventory[i]; - * Logger.INFO("Slot "+i+" "+(aSlot != null ? "contains "+aSlot.getDisplayName() : "is empty")); } } - */ - } - - @Override - public String[] getDescription() { - return ArrayUtils.addAll( - this.mDescriptionArray, - isAdvanced() ? "For the very large Projects" : "For the smaller Projects", - "Hold Shift in GUI to see slot usage", - CORE.GT_Tooltip.get()); - } - - @Override - public ITexture[][][] getTextureSet(final ITexture[] aTextures) { - final ITexture[][][] rTextures = new ITexture[10][17][]; - for (byte i = -1; i < 16; i++) { - rTextures[0][i + 1] = this.getFront(i); - rTextures[1][i + 1] = this.getBack(i); - rTextures[2][i + 1] = this.getBottom(i); - rTextures[3][i + 1] = this.getTop(i); - rTextures[4][i + 1] = this.getSides(i); - rTextures[5][i + 1] = this.getFront(i); - rTextures[6][i + 1] = this.getBack(i); - rTextures[7][i + 1] = this.getBottom(i); - rTextures[8][i + 1] = this.getTop(i); - rTextures[9][i + 1] = this.getSides(i); - } - return rTextures; - } - - protected boolean isAdvanced() { - return true; - } - - @Override - public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final ForgeDirection side, - final ForgeDirection facing, final int aColorIndex, final boolean aActive, final boolean aRedstone) { - return this.mTextures[(aActive ? 5 : 0) - + (side == facing ? 0 - : side == facing.getOpposite() ? 1 - : side == ForgeDirection.DOWN ? 2 : side == ForgeDirection.UP ? 3 : 4)][aColorIndex - + 1]; - } - - public ITexture[] getFront(final byte aColor) { - return new ITexture[] { isAdvanced() ? new GT_RenderedTexture(TexturesGtBlock.Casing_Adv_Workbench_Side) - : new GT_RenderedTexture(TexturesGtBlock.Casing_Workbench_Side) }; - } - - public ITexture[] getBack(final byte aColor) { - return new ITexture[] { isAdvanced() ? new GT_RenderedTexture(TexturesGtBlock.Casing_Adv_Workbench_Side) - : new GT_RenderedTexture(TexturesGtBlock.Casing_Workbench_Side) }; - } - - public ITexture[] getBottom(final byte aColor) { - return new ITexture[] { isAdvanced() ? new GT_RenderedTexture(TexturesGtBlock.Casing_Adv_Workbench_Bottom) - : new GT_RenderedTexture(TexturesGtBlock.Casing_Workbench_Bottom) }; - } - - public ITexture[] getTop(final byte aColor) { - if (isAdvanced()) { - return new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Adv_Workbench_Top), - new GT_RenderedTexture(TexturesGtBlock.Casing_Adv_Workbench_Crafting_Overlay) }; - } else { - return new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Workbench_Top), - new GT_RenderedTexture(TexturesGtBlock.Casing_Workbench_Crafting_Overlay) }; - } - } - - public ITexture[] getSides(final byte aColor) { - return new ITexture[] { isAdvanced() ? new GT_RenderedTexture(TexturesGtBlock.Casing_Adv_Workbench_Side) - : new GT_RenderedTexture(TexturesGtBlock.Casing_Workbench_Side) }; - } - - @Override - public boolean useModularUI() { - return true; - } - - @Override - public void addGregTechLogo(ModularWindow.Builder builder) {} - - @Override - public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) { - builder.widget( - SlotGroup.ofItemHandler(inventoryHandler, 4).endAtSlot(15).background(getGUITextureSet().getItemSlot()) - .build().setPos(7, 7)); - for (int i = 0; i < 5; i++) { - builder.widget(createElectricSlot(i + 16).setPos(81 + i * 18, 7)); - } - builder.widget( - SlotGroup.ofItemHandler(inventoryHandler, 3).startFromSlot(21).endAtSlot(29) - .background(getGUITextureSet().getItemSlot()).applyForWidget(SlotWidget::disableShiftInsert) - .build().setPos(81, 27)); - builder.widget( - new SlotWidget(inventoryHandler, 33).disableShiftInsert().addTooltipShift("Extraction Slot") - .addTooltipShift("Things can always be pulled from here") - .setBackground(getGUITextureSet().getItemSlot(), getArrowOverlay()).setPos(153, 27)) - .widget( - new SlotWidget(inventoryHandler, 34).disableShiftInsert().addTooltipShift("Free Parking") - .setBackground(getGUITextureSet().getItemSlot(), getParkOverlay()).setPos(153, 63)); - - builder.widget(new SlotWidget(inventoryHandler, 30) { - - @Override - public ClickResult onClick(int buttonId, boolean doubleClick) { - if (buttonId == 0 && Interactable.hasShiftDown()) { - syncToServer(99, NetworkUtils.EMPTY_PACKET); - return ClickResult.SUCCESS; - } - return super.onClick(buttonId, doubleClick); - } - - @Override - public void readOnServer(int id, PacketBuffer buf) throws IOException { - if (id == 99) { - setBluePrint(null); - } else { - super.readOnServer(id, buf); - } - } - }.setFilter(stack -> stack.getItem() instanceof IItemBlueprint).disableShiftInsert() - .addTooltipShift("Blueprint Slot").addTooltipShift("Shift+Lmb Sets to crafting output") - .setBackground(getGUITextureSet().getItemSlot(), getBlueprintOverlay()).setPos(135, 27)); - - builder.widget(new SlotWidget(BaseSlot.phantom(inventoryHandler, 31)) { - - @Override - protected void phantomClick(ClickData clickData, ItemStack cursorStack) { - EntityPlayer aPlayer = getContext().getPlayer(); - ItemStack tStack = getMcSlot().getStack(); - if (tStack == null) return; - if (tStack.stackSize <= 0 && !GT_Utility.areStacksEqual(tStack, aPlayer.inventory.getItemStack())) { - return; - } - ItemStack tStack2, tCraftedStack = getCraftingOutput(); - if (tCraftedStack != null) { - if (clickData.shift) { - for (byte i = 0; i < aPlayer.inventory.mainInventory.length; i++) { - for (byte j = 0; j < tCraftedStack.getMaxStackSize() / tCraftedStack.stackSize - && canDoCraftingOutput(); j++) { - if (!GT_Utility.areStacksEqual(tStack2 = getCraftingOutput(), tCraftedStack) - || tStack.stackSize != tStack2.stackSize) - return; - aPlayer.inventory.mainInventory[i] = consumeMaterials( - aPlayer, - aPlayer.inventory.mainInventory[i]); - } - } - } else { - if (clickData.mouseButton == 0) { - if (canDoCraftingOutput()) aPlayer.inventory - .setItemStack(consumeMaterials(aPlayer, aPlayer.inventory.getItemStack())); - } else { - for (int i = 0; i < tCraftedStack.getMaxStackSize() / tCraftedStack.stackSize - && canDoCraftingOutput(); i++) { - if (!GT_Utility.areStacksEqual(tStack2 = getCraftingOutput(), tCraftedStack) - || tStack.stackSize != tStack2.stackSize) - return; - aPlayer.inventory - .setItemStack(consumeMaterials(aPlayer, aPlayer.inventory.getItemStack())); - } - } - } - } - } - - @Override - public boolean handleDragAndDrop(ItemStack draggedStack, int button) { - return false; - } - - @Override - public List<String> getExtraTooltip() { - return Collections.emptyList(); - } - }.setAccess(false, false).setHandlePhantomActionClient(true).addTooltipShift("Output Slot") - .setBackground(getGUITextureSet().getItemSlot(), getCraftOutputOverlay()).setPos(135, 63)); - - builder.widget( - new ButtonWidget().setOnClick((clickData, widget) -> sortIntoTheInputSlots()).addTooltipShift("Flush") - .addTooltipShift("Empty crafting grid back to storage") - .setBackground(getButtonIcon(), getFlushOverlay()).setPos(135, 45).setSize(18, 18)) - .widget( - new ButtonWidget().setOnClick((clickData, widget) -> mFlushMode = true) - .addTooltipShift("Automation").addTooltipShift("Allows output while") - .addTooltipShift("crafting grid is full") - .setBackground(getButtonIcon(), GTPP_UITextures.OVERLAY_BUTTON_AUTOMATION) - .setPos(153, 45).setSize(18, 18)); - } - - protected SlotWidget createElectricSlot(int index) { - return (SlotWidget) new ElectricSlotWidget(inventoryHandler, index).setShiftClickPriority(-1) - .setBackground(getGUITextureSet().getItemSlot(), GTPP_UITextures.OVERLAY_SLOT_ELECTRIC_TOOL); - } - - protected IDrawable getArrowOverlay() { - return GTPP_UITextures.OVERLAY_SLOT_ARROW; - } - - protected IDrawable getParkOverlay() { - return GTPP_UITextures.OVERLAY_SLOT_PARK; - } - - protected IDrawable getBlueprintOverlay() { - return GT_UITextures.OVERLAY_SLOT_PAGE_PRINTED; - } - - protected IDrawable getCraftOutputOverlay() { - return GTPP_UITextures.OVERLAY_SLOT_CRAFT_OUTPUT; - } - - protected IDrawable getButtonIcon() { - return GT_UITextures.BUTTON_STANDARD; - } - - protected IDrawable getFlushOverlay() { - return GTPP_UITextures.OVERLAY_BUTTON_FLUSH; - } -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_BronzeCraftingTable.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_BronzeCraftingTable.java deleted file mode 100644 index e4fdb869ab..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_BronzeCraftingTable.java +++ /dev/null @@ -1,117 +0,0 @@ -package gtPlusPlus.xmod.gregtech.common.tileentities.storage; - -import net.minecraftforge.common.util.ForgeDirection; - -import com.gtnewhorizons.modularui.api.drawable.IDrawable; -import com.gtnewhorizons.modularui.common.widget.SlotWidget; - -import gregtech.api.GregTech_API; -import gregtech.api.enums.SteamVariant; -import gregtech.api.gui.modularui.GUITextureSet; -import gregtech.api.interfaces.ITexture; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.objects.GT_ItemStack; -import gtPlusPlus.xmod.gregtech.api.gui.GTPP_UITextures; - -public class GT_MetaTileEntity_BronzeCraftingTable extends GT_MetaTileEntity_AdvancedCraftingTable { - - public GT_MetaTileEntity_BronzeCraftingTable(final int aID, final String aName, final String aNameRegional, - final int aTier, final String aDescription) { - super(aID, aName, aNameRegional, aTier, aDescription); - } - - public GT_MetaTileEntity_BronzeCraftingTable(final String aName, final int aTier, final String[] aDescription, - final ITexture[][][] aTextures) { - super(aName, aTier, aDescription, aTextures); - } - - @Override - public boolean isTransformerUpgradable() { - return false; - } - - @Override - public boolean isInputFacing(ForgeDirection side) { - return false; - } - - @Override - public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_BronzeCraftingTable( - this.mName, - this.mTier, - this.mDescriptionArray, - this.mTextures); - } - - @Override - public boolean allowCoverOnSide(ForgeDirection side, GT_ItemStack aStack) { - return GregTech_API.getCoverBehaviorNew(aStack.toStack()).isSimpleCover(); - } - - @Override - public int rechargerSlotStartIndex() { - return 0; - } - - @Override - public int rechargerSlotCount() { - return 0; - } - - @Override - public int getCapacity() { - return 16000; - } - - @Override - protected boolean isAdvanced() { - return false; - } - - @Override - public SteamVariant getSteamVariant() { - return SteamVariant.BRONZE; - } - - @Override - public GUITextureSet getGUITextureSet() { - return GUITextureSet.STEAM.apply(getSteamVariant()); - } - - @Override - protected SlotWidget createElectricSlot(int index) { - return (SlotWidget) new SlotWidget(inventoryHandler, index).setBackground(getGUITextureSet().getItemSlot()); - } - - @Override - protected IDrawable getArrowOverlay() { - return GTPP_UITextures.OVERLAY_SLOT_ARROW_BRONZE; - } - - @Override - protected IDrawable getParkOverlay() { - return GTPP_UITextures.OVERLAY_SLOT_PARK_BRONZE; - } - - @Override - protected IDrawable getBlueprintOverlay() { - return GTPP_UITextures.OVERLAY_SLOT_PAGE_PRINTED_BRONZE; - } - - @Override - protected IDrawable getCraftOutputOverlay() { - return GTPP_UITextures.OVERLAY_SLOT_CRAFT_OUTPUT_BRONZE; - } - - @Override - protected IDrawable getButtonIcon() { - return GTPP_UITextures.BUTTON_STANDARD_BRONZE; - } - - @Override - protected IDrawable getFlushOverlay() { - return GTPP_UITextures.OVERLAY_BUTTON_FLUSH_BRONZE; - } -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredTank.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredTank.java index 6c263b6836..e360f1d4b7 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredTank.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredTank.java @@ -29,7 +29,13 @@ public class GT_MetaTileEntity_TieredTank extends GT_MetaTileEntity_BasicTank { public GT_MetaTileEntity_TieredTank(final int aID, final String aName, final String aNameRegional, final int aTier) { - super(aID, aName, aNameRegional, aTier, 3, "Stores " + ((int) (Math.pow(2, aTier) * 32000)) + "L of fluid"); + super( + aID, + aName, + aNameRegional, + aTier, + 3, + "Stores " + GT_Utility.formatNumbers(((int) (Math.pow(2, aTier) * 32000))) + "L of fluid"); } public GT_MetaTileEntity_TieredTank(final String aName, final int aTier, final String[] aDescription, @@ -133,11 +139,10 @@ public class GT_MetaTileEntity_TieredTank extends GT_MetaTileEntity_BasicTank { if (this.mFluid == null) { return new String[] { GT_Values.VOLTAGE_NAMES[this.mTier] + " Fluid Tank", "Stored Fluid:", "No Fluid", - Integer.toString(0) + "L", Integer.toString(this.getCapacity()) + "L" }; + 0 + "L", this.getCapacity() + "L" }; } return new String[] { GT_Values.VOLTAGE_NAMES[this.mTier] + " Fluid Tank", "Stored Fluid:", - this.mFluid.getLocalizedName(), Integer.toString(this.mFluid.amount) + "L", - Integer.toString(this.getCapacity()) + "L" }; + this.mFluid.getLocalizedName(), this.mFluid.amount + "L", this.getCapacity() + "L" }; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricButcherKnife.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricButcherKnife.java deleted file mode 100644 index dbae822abd..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricButcherKnife.java +++ /dev/null @@ -1,187 +0,0 @@ -package gtPlusPlus.xmod.gregtech.common.tools; - -import java.util.Arrays; -import java.util.List; - -import net.minecraft.block.Block; -import net.minecraft.enchantment.Enchantment; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.monster.EntityIronGolem; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.stats.AchievementList; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.IChatComponent; - -import gregtech.GT_Mod; -import gregtech.api.enums.Materials; -import gregtech.api.enums.SoundResource; -import gregtech.api.enums.Textures.ItemIcons; -import gregtech.api.interfaces.IIconContainer; -import gregtech.api.items.GT_MetaGenerated_Tool; -import gregtech.common.items.behaviors.Behaviour_None; -import gregtech.common.tools.GT_Tool; -import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtTools; - -public class TOOL_Gregtech_ElectricButcherKnife extends GT_Tool { - - public static final List<String> mEffectiveList = Arrays - .asList(new String[] { EntityIronGolem.class.getName(), "EntityTowerGuardian" }); - - @Override - public float getNormalDamageAgainstEntity(final float aOriginalDamage, final Entity aEntity, final ItemStack aStack, - final EntityPlayer aPlayer) { - String tName = aEntity.getClass().getName(); - tName = tName.substring(tName.lastIndexOf(".") + 1); - return (mEffectiveList.contains(tName)) || (tName.contains("Golem")) ? aOriginalDamage * 2.0F : aOriginalDamage; - } - - @Override - public int getToolDamagePerBlockBreak() { - return 100; - } - - @Override - public int getToolDamagePerDropConversion() { - return 100; - } - - @Override - public int getToolDamagePerContainerCraft() { - return 100; - } - - @Override - public int getToolDamagePerEntityAttack() { - return 200; - } - - @Override - public int getBaseQuality() { - return 0; - } - - @Override - public float getBaseDamage() { - return 8.0F; - } - - @Override - public float getSpeedMultiplier() { - return 2F; - } - - @Override - public float getMaxDurabilityMultiplier() { - return 1.8F; - } - - @Override - public String getCraftingSound() { - return SoundResource.RANDOM_ANVIL_USE.toString(); - } - - @Override - public String getEntityHitSound() { - return SoundResource.RANDOM_ANVIL_BREAK.toString(); - } - - @Override - public String getMiningSound() { - return null; - } - - @Override - public boolean canBlock() { - return false; - } - - @Override - public boolean isWrench() { - return false; - } - - @Override - public boolean isCrowbar() { - return false; - } - - @Override - public boolean isMinableBlock(final Block aBlock, final byte aMetaData) { - final String tTool = aBlock.getHarvestTool(aMetaData); - return (tTool != null) && (tTool.equals("sword") || tTool.equals("knife")); - } - - @Override - public ItemStack getBrokenItem(final ItemStack aStack) { - return null; - } - - @Override - public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) { - return (IIconContainer) (aIsToolHead ? TexturesGtTools.ELECTRIC_BUTCHER_KNIFE : ItemIcons.POWER_UNIT_HV); - } - - @Override - public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) { - return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa : Materials.RedSteel.mRGBa; - } - - @Override - public void onToolCrafted(final ItemStack aStack, final EntityPlayer aPlayer) { - super.onToolCrafted(aStack, aPlayer); - aPlayer.triggerAchievement(AchievementList.buildSword); - try { - GT_Mod.achievements.issueAchievement(aPlayer, "tools"); - GT_Mod.achievements.issueAchievement(aPlayer, "unitool"); - } catch (final Exception e) {} - } - - @Override - public IChatComponent getDeathMessage(final EntityLivingBase aPlayer, final EntityLivingBase aEntity) { - return new ChatComponentText( - EnumChatFormatting.RED + aEntity.getCommandSenderName() - + EnumChatFormatting.WHITE - + " has been Sliced out of existence by " - + EnumChatFormatting.GREEN - + aPlayer.getCommandSenderName() - + EnumChatFormatting.WHITE); - } - - @Override - public void onStatsAddedToTool(final GT_MetaGenerated_Tool aItem, final int aID) { - aItem.addItemBehavior(aID, new Behaviour_None()); - } - - @Override - public boolean isGrafter() { - return false; - } - - @Override - public int getHurtResistanceTime(int aOriginalHurtResistance, Entity aEntity) { - return aOriginalHurtResistance * 2; - } - - @Override - public boolean isWeapon() { - return true; - } - - @Override - public boolean isMiningTool() { - return false; - } - - @Override - public Enchantment[] getEnchantments(ItemStack aStack) { - return LOOTING_ENCHANTMENT; - } - - @Override - public int[] getEnchantmentLevels(ItemStack aStack) { - return new int[] { (4 + GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mToolQuality) / 2 }; - } -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricLighter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricLighter.java deleted file mode 100644 index 46720bb4f2..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricLighter.java +++ /dev/null @@ -1,165 +0,0 @@ -package gtPlusPlus.xmod.gregtech.common.tools; - -import java.util.Arrays; -import java.util.List; - -import net.minecraft.block.Block; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.monster.EntityIronGolem; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.stats.AchievementList; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.IChatComponent; - -import gregtech.GT_Mod; -import gregtech.api.enums.Materials; -import gregtech.api.enums.SoundResource; -import gregtech.api.enums.Textures.ItemIcons; -import gregtech.api.interfaces.IIconContainer; -import gregtech.api.items.GT_MetaGenerated_Tool; -import gregtech.common.tools.GT_Tool; -import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtTools; -import gtPlusPlus.xmod.gregtech.common.items.behaviours.Behaviour_Electric_Lighter; - -public class TOOL_Gregtech_ElectricLighter extends GT_Tool { - - public static final List<String> mEffectiveList = Arrays - .asList(new String[] { EntityIronGolem.class.getName(), "EntityTowerGuardian" }); - - @Override - public float getNormalDamageAgainstEntity(final float aOriginalDamage, final Entity aEntity, final ItemStack aStack, - final EntityPlayer aPlayer) { - String tName = aEntity.getClass().getName(); - tName = tName.substring(tName.lastIndexOf(".") + 1); - return (mEffectiveList.contains(tName)) || (tName.contains("Golem")) ? aOriginalDamage * 2.0F : aOriginalDamage; - } - - @Override - public int getToolDamagePerBlockBreak() { - return 50; - } - - @Override - public int getToolDamagePerDropConversion() { - return 100; - } - - @Override - public int getToolDamagePerContainerCraft() { - return 400; - } - - @Override - public int getToolDamagePerEntityAttack() { - return 100; - } - - @Override - public int getBaseQuality() { - return 0; - } - - @Override - public float getBaseDamage() { - return 8.0F; - } - - @Override - public float getSpeedMultiplier() { - return 2F; - } - - @Override - public float getMaxDurabilityMultiplier() { - return 1.8F; - } - - @Override - public String getCraftingSound() { - return SoundResource.RANDOM_ANVIL_USE.toString(); - } - - @Override - public String getEntityHitSound() { - return SoundResource.RANDOM_ANVIL_BREAK.toString(); - } - - @Override - public String getMiningSound() { - return null; - } - - @Override - public boolean canBlock() { - return false; - } - - @Override - public boolean isWrench() { - return false; - } - - @Override - public boolean isCrowbar() { - return false; - } - - @Override - public boolean isWeapon() { - return true; - } - - @Override - public boolean isMinableBlock(final Block aBlock, final byte aMetaData) { - return false; - } - - @Override - public ItemStack getBrokenItem(final ItemStack aStack) { - return null; - } - - @Override - public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) { - return (IIconContainer) (aIsToolHead ? TexturesGtTools.ELECTRIC_LIGHTER : ItemIcons.POWER_UNIT_HV); - } - - @Override - public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) { - return !aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa : Materials.Silver.mRGBa; - } - - @Override - public void onToolCrafted(final ItemStack aStack, final EntityPlayer aPlayer) { - super.onToolCrafted(aStack, aPlayer); - aPlayer.triggerAchievement(AchievementList.buildSword); - try { - GT_Mod.achievements.issueAchievement(aPlayer, "tools"); - GT_Mod.achievements.issueAchievement(aPlayer, "unitool"); - } catch (final Exception e) {} - } - - @Override - public IChatComponent getDeathMessage(final EntityLivingBase aPlayer, final EntityLivingBase aEntity) { - return new ChatComponentText( - EnumChatFormatting.RED + aEntity.getCommandSenderName() - + EnumChatFormatting.WHITE - + " has been burnt out of existence by " - + EnumChatFormatting.GREEN - + aPlayer.getCommandSenderName() - + EnumChatFormatting.WHITE); - } - - @Override - public void onStatsAddedToTool(final GT_MetaGenerated_Tool aItem, final int aID) { - aItem.addItemBehavior(aID, new Behaviour_Electric_Lighter()); - } - - @Override - public boolean isGrafter() { - return false; - } -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingAngleGrinder.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingAngleGrinder.java index 247cdb890b..be4accba19 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingAngleGrinder.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingAngleGrinder.java @@ -49,8 +49,8 @@ public class ProcessingAngleGrinder implements Interface_OreRecipeRegistrator, R Logger.MATERIALS("Materials to attempt tool gen. with: " + size); int used = 0; Materials aMaterial = null; - for (int r = 0; r < size; r++) { - aMaterial = i[r]; + for (Materials materials : i) { + aMaterial = materials; if ((aMaterial != Materials.Stone) && (aMaterial != Materials.Flint) && (aMaterial != Materials.Rubber) && (aMaterial != Materials._NULL)) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricButcherKnife.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricButcherKnife.java deleted file mode 100644 index f1493f2e63..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricButcherKnife.java +++ /dev/null @@ -1,142 +0,0 @@ -package gtPlusPlus.xmod.gregtech.loaders; - -import net.minecraft.item.ItemStack; - -import gregtech.api.enums.GT_Values; -import gregtech.api.enums.ItemList; -import gregtech.api.enums.Materials; -import gregtech.api.enums.OrePrefixes; -import gregtech.api.enums.SubTag; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.common.items.GT_MetaGenerated_Tool_01; -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.recipe.common.CI; -import gtPlusPlus.core.util.minecraft.MaterialUtils; -import gtPlusPlus.core.util.minecraft.RecipeUtils; -import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes; -import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials; -import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_OreRecipeRegistrator; -import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechTools; - -public class ProcessingElectricButcherKnife implements Interface_OreRecipeRegistrator, Runnable { - - public ProcessingElectricButcherKnife() { - GregtechOrePrefixes.toolElectricButcherKnife.add(this); - } - - @Override - public void registerOre(final GregtechOrePrefixes aPrefix, final Materials aMaterial, final String aOreDictName, - final String aModName, final ItemStack aStack) { - if ((aMaterial != Materials.Stone) && (aMaterial != Materials.Flint)) { - if (aMaterial != Materials.Rubber) { - if ((!aMaterial.contains(SubTag.WOOD)) && (!aMaterial.contains(SubTag.BOUNCY)) - && (!aMaterial.contains(SubTag.NO_SMASHING))) {} - } - } - } - - @Override - public void registerOre(final GregtechOrePrefixes aPrefix, final GT_Materials aMaterial, final String aOreDictName, - final String aModName, final ItemStack aStack) { - // TODO Auto-generated method stub - - } - - public void materialsLoops() { - final Materials[] i = Materials.values(); - final int size = i.length; - Logger.MATERIALS("Materials to attempt tool gen. with: " + size); - int used = 0; - Materials aMaterial = null; - for (int r = 0; r < size; r++) { - aMaterial = i[r]; - if ((aMaterial != Materials.Stone) && (aMaterial != Materials.Flint) - && (aMaterial != Materials.Rubber) - && (aMaterial != Materials._NULL)) { - if ((!aMaterial.contains(SubTag.WOOD)) && (!aMaterial.contains(SubTag.BOUNCY)) - && (!aMaterial.contains(SubTag.NO_SMASHING)) - && (!aMaterial.contains(SubTag.TRANSPARENT)) - && (!aMaterial.contains(SubTag.FLAMMABLE)) - && (!aMaterial.contains(SubTag.MAGICAL)) - && (!aMaterial.contains(SubTag.NO_SMELTING))) { - Logger.MATERIALS( - "Generating Electric Butcher Knife from " + MaterialUtils.getMaterialName(aMaterial)); - // Input 1 - - final ItemStack plate = GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L); - final ItemStack screw = GT_OreDictUnificator.get(OrePrefixes.screw, aMaterial, 1L); - - if ((null != plate) && screw != null) { - addRecipe(aMaterial, 1600000L, 3, ItemList.Battery_RE_HV_Lithium.get(1)); - addRecipe(aMaterial, 1200000L, 3, ItemList.Battery_RE_HV_Cadmium.get(1)); - addRecipe(aMaterial, 800000L, 3, ItemList.Battery_RE_HV_Sodium.get(1)); - used++; - } else { - Logger.MATERIALS( - "Unable to generate Electric Butcher Knife from " - + MaterialUtils.getMaterialName(aMaterial) - + ", Plate or Long Rod may be invalid. Invalid | Plate? " - + (plate == null) - + " | Rod? " - + " |"); - } - // GT_ModHandler.addCraftingRecipe(, - // GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | - // GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"P H", "PIP", " I ", - // Character.valueOf('I'), OrePrefixes.ingot.get(aMaterial), - // Character.valueOf('P'), OrePrefixes.plate.get(aMaterial), - // Character.valueOf('H'), OrePrefixes.toolHeadHammer.get(aMaterial)}); - } else { - Logger.MATERIALS( - "Unable to generate Electric Butcher Knife from " - + MaterialUtils.getMaterialName(aMaterial)); - } - } else { - Logger.MATERIALS( - "Unable to generate Electric Butcher Knife from " + MaterialUtils.getMaterialName(aMaterial)); - } - } - - Logger.INFO("Materials used for tool gen: " + used); - } - - @Override - public void run() { - Logger.INFO("Generating Electric Butcher Knives for all valid GT Materials."); - this.materialsLoops(); - } - - public boolean addRecipe(Materials aMaterial, long aBatteryStorage, int aVoltageTier, ItemStack aBattery) { - - ItemStack aOutputStack = MetaGeneratedGregtechTools.INSTANCE.getToolWithStats( - MetaGeneratedGregtechTools.ELECTRIC_BUTCHER_KNIFE, - 1, - aMaterial, - Materials.Titanium, - new long[] { aBatteryStorage, GT_Values.V[aVoltageTier], 3L, -1L }); - - ItemStack aInputCutter = GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(GT_MetaGenerated_Tool_01.BUTCHERYKNIFE, 1, aMaterial, aMaterial, null); - - long aDura = MetaGeneratedGregtechTools.getToolMaxDamage(aOutputStack); - if (aDura <= 32000) { - Logger.MATERIALS( - "Unable to generate Electric Butcher Knife from " + MaterialUtils.getMaterialName(aMaterial) - + ", Durability: " - + aDura); - return false; - } - - return RecipeUtils.addShapedRecipe( - OrePrefixes.wireFine.get(Materials.Electrum), - aInputCutter, - OrePrefixes.wireFine.get(Materials.Electrum), - OrePrefixes.plate.get(aMaterial), - CI.getElectricMotor(aVoltageTier, 1), - OrePrefixes.plate.get(aMaterial), - OrePrefixes.screw.get(aMaterial), - aBattery, - OrePrefixes.screw.get(aMaterial), - aOutputStack); - } -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricLighter.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricLighter.java deleted file mode 100644 index ee1cbc2744..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricLighter.java +++ /dev/null @@ -1,139 +0,0 @@ -package gtPlusPlus.xmod.gregtech.loaders; - -import net.minecraft.item.ItemStack; - -import gregtech.api.enums.GT_Values; -import gregtech.api.enums.ItemList; -import gregtech.api.enums.Materials; -import gregtech.api.enums.OrePrefixes; -import gregtech.api.enums.SubTag; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.common.items.GT_MetaGenerated_Tool_01; -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.material.ELEMENT; -import gtPlusPlus.core.recipe.common.CI; -import gtPlusPlus.core.util.minecraft.MaterialUtils; -import gtPlusPlus.core.util.minecraft.RecipeUtils; -import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes; -import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials; -import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_OreRecipeRegistrator; -import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechTools; - -public class ProcessingElectricLighter implements Interface_OreRecipeRegistrator, Runnable { - - public ProcessingElectricLighter() { - GregtechOrePrefixes.toolElectricLighter.add(this); - } - - @Override - public void registerOre(final GregtechOrePrefixes aPrefix, final Materials aMaterial, final String aOreDictName, - final String aModName, final ItemStack aStack) { - if ((aMaterial != Materials.Stone) && (aMaterial != Materials.Flint)) { - if (aMaterial != Materials.Rubber) { - if ((!aMaterial.contains(SubTag.WOOD)) && (!aMaterial.contains(SubTag.BOUNCY)) - && (!aMaterial.contains(SubTag.NO_SMASHING))) {} - } - } - } - - @Override - public void registerOre(final GregtechOrePrefixes aPrefix, final GT_Materials aMaterial, final String aOreDictName, - final String aModName, final ItemStack aStack) { - // TODO Auto-generated method stub - - } - - public void materialsLoops() { - final Materials[] i = Materials.values(); - final int size = i.length; - Logger.MATERIALS("Materials to attempt tool gen. with: " + size); - int used = 0; - Materials aMaterial = null; - for (int r = 0; r < size; r++) { - aMaterial = i[r]; - if ((aMaterial != Materials.Stone) && (aMaterial != Materials.Flint) - && (aMaterial != Materials.Rubber) - && (aMaterial != Materials._NULL)) { - if ((!aMaterial.contains(SubTag.WOOD)) && (!aMaterial.contains(SubTag.BOUNCY)) - && (!aMaterial.contains(SubTag.NO_SMASHING)) - && (!aMaterial.contains(SubTag.TRANSPARENT)) - && (!aMaterial.contains(SubTag.FLAMMABLE)) - && (!aMaterial.contains(SubTag.MAGICAL)) - && (!aMaterial.contains(SubTag.NO_SMELTING))) { - Logger.MATERIALS("Generating Electric Lighter from " + MaterialUtils.getMaterialName(aMaterial)); - // Input 1 - - final ItemStack plate = GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L); - - if ((null != plate)) { - addRecipe(aMaterial, 1600000L, 3, ItemList.Battery_RE_HV_Lithium.get(1)); - addRecipe(aMaterial, 1200000L, 3, ItemList.Battery_RE_HV_Cadmium.get(1)); - addRecipe(aMaterial, 800000L, 3, ItemList.Battery_RE_HV_Sodium.get(1)); - used++; - } else { - Logger.MATERIALS( - "Unable to generate Electric Lighter from " + MaterialUtils.getMaterialName(aMaterial) - + ", Plate or Long Rod may be invalid. Invalid | Plate? " - + (plate == null) - + " | Rod? " - + " |"); - } - // GT_ModHandler.addCraftingRecipe(, - // GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | - // GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"P H", "PIP", " I ", - // Character.valueOf('I'), OrePrefixes.ingot.get(aMaterial), - // Character.valueOf('P'), OrePrefixes.plate.get(aMaterial), - // Character.valueOf('H'), OrePrefixes.toolHeadHammer.get(aMaterial)}); - } else { - Logger.MATERIALS( - "Unable to generate Electric Lighter from " + MaterialUtils.getMaterialName(aMaterial)); - } - } else { - Logger.MATERIALS( - "Unable to generate Electric Lighter from " + MaterialUtils.getMaterialName(aMaterial)); - } - } - - Logger.INFO("Materials used for tool gen: " + used); - } - - @Override - public void run() { - Logger.INFO("Generating Electric Lighters for all valid GT Materials."); - this.materialsLoops(); - } - - public boolean addRecipe(Materials aMaterial, long aBatteryStorage, int aVoltageTier, ItemStack aBattery) { - - ItemStack aOutputStack = MetaGeneratedGregtechTools.INSTANCE.getToolWithStats( - MetaGeneratedGregtechTools.ELECTRIC_LIGHTER, - 1, - aMaterial, - Materials.Titanium, - new long[] { aBatteryStorage, GT_Values.V[aVoltageTier], 3L, -1L }); - - ItemStack aInputCutter = GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(GT_MetaGenerated_Tool_01.SOLDERING_IRON_LV, 1, aMaterial, aMaterial, null); - - long aDura = MetaGeneratedGregtechTools.getToolMaxDamage(aOutputStack); - if (aDura <= 32000) { - Logger.MATERIALS( - "Unable to generate Electric Lighter from " + MaterialUtils.getMaterialName(aMaterial) - + ", Durability: " - + aDura); - return false; - } - - return RecipeUtils.addShapedRecipe( - OrePrefixes.wireGt04.get(Materials.Gold), - aInputCutter, - OrePrefixes.wireGt04.get(Materials.Gold), - ELEMENT.STANDALONE.RUNITE.getPlate(1), - CI.getSensor(aVoltageTier, 1), - ELEMENT.STANDALONE.RUNITE.getPlate(1), - OrePrefixes.plate.get(aMaterial), - aBattery, - OrePrefixes.plate.get(aMaterial), - aOutputStack); - } -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricSnips.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricSnips.java index a431d4a500..3b9d5b8e0c 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricSnips.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricSnips.java @@ -49,8 +49,8 @@ public class ProcessingElectricSnips implements Interface_OreRecipeRegistrator, Logger.MATERIALS("Materials to attempt tool gen. with: " + size); int used = 0; Materials aMaterial = null; - for (int r = 0; r < size; r++) { - aMaterial = i[r]; + for (Materials materials : i) { + aMaterial = materials; if ((aMaterial != Materials.Stone) && (aMaterial != Materials.Flint) && (aMaterial != Materials.Rubber) && (aMaterial != Materials._NULL)) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_AlloySmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_AlloySmelter.java index 28d0609e93..acef57b368 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_AlloySmelter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_AlloySmelter.java @@ -12,7 +12,7 @@ import gtPlusPlus.core.util.minecraft.ItemUtils; public class RecipeGen_AlloySmelter extends RecipeGen_Base { - public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<RunnableWithInfo<Material>>(); + public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<>(); static { MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Assembler.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Assembler.java index 79a5947d66..0e67ab7ebc 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Assembler.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Assembler.java @@ -14,7 +14,7 @@ import gtPlusPlus.core.util.minecraft.ItemUtils; public class RecipeGen_Assembler extends RecipeGen_Base { - public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<RunnableWithInfo<Material>>(); + public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<>(); static { MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java index b072f7ee21..e85f8e4f5e 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java @@ -25,7 +25,7 @@ import gtPlusPlus.core.util.minecraft.MaterialUtils; public class RecipeGen_BlastSmelter extends RecipeGen_Base { - public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<RunnableWithInfo<Material>>(); + public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<>(); static { MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT_GTNH.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT_GTNH.java index a6f19d05fe..a48fa23765 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT_GTNH.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT_GTNH.java @@ -21,8 +21,8 @@ import gtPlusPlus.core.util.minecraft.ItemUtils; public class RecipeGen_BlastSmelterGT_GTNH { - private static Map<String, FluidStack> mCachedIngotToFluidRegistry = new HashMap<String, FluidStack>(); - private static Map<String, String> mCachedHotToColdRegistry = new HashMap<String, String>(); + private static Map<String, FluidStack> mCachedIngotToFluidRegistry = new HashMap<>(); + private static Map<String, String> mCachedHotToColdRegistry = new HashMap<>(); private static synchronized void setIngotToFluid(final ItemStackData stack, final FluidStack fluid) { if (stack != null && fluid != null) { @@ -186,7 +186,7 @@ public class RecipeGen_BlastSmelterGT_GTNH { boolean circuitFound = false; // Build correct input stack - ArrayList<ItemStack> aTempList = new ArrayList<ItemStack>(); + ArrayList<ItemStack> aTempList = new ArrayList<>(); for (ItemStack recipeItem : inputs) { if (ItemUtils.isControlCircuit(recipeItem)) { circuitFound = true; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java index ed8c18ba4b..b30a16f44f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java @@ -25,7 +25,7 @@ import gtPlusPlus.core.util.minecraft.RecipeUtils; public class RecipeGen_DustGeneration extends RecipeGen_Base { - public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<RunnableWithInfo<Material>>(); + public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<>(); static { MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap); @@ -338,7 +338,7 @@ public class RecipeGen_DustGeneration extends RecipeGen_Base { } public static boolean generatePackagerRecipes(Material aMatInfo) { - AutoMap<Boolean> aResults = new AutoMap<Boolean>(); + AutoMap<Boolean> aResults = new AutoMap<>(); // Small Dust aResults.put( GT_Values.RA.addBoxingRecipe( diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Extruder.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Extruder.java index d2d54a920c..7ef35b26a0 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Extruder.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Extruder.java @@ -15,7 +15,7 @@ import gtPlusPlus.core.util.minecraft.ItemUtils; public class RecipeGen_Extruder extends RecipeGen_Base { - public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<RunnableWithInfo<Material>>(); + public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<>(); static { MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_FluidCanning.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_FluidCanning.java index 561c0884cd..0510037f5d 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_FluidCanning.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_FluidCanning.java @@ -40,7 +40,7 @@ public class RecipeGen_FluidCanning implements Runnable { private static boolean mHasRun = false; - private static HashSet<RecipeGen_FluidCanning> mCache = new HashSet<RecipeGen_FluidCanning>(); + private static HashSet<RecipeGen_FluidCanning> mCache = new HashSet<>(); private static void addRunnableToRecipeCache(RecipeGen_FluidCanning r) { if (mHasRun) { @@ -144,8 +144,6 @@ public class RecipeGen_FluidCanning implements Runnable { recipe = aRecipe; disableOptional = aExtracting; isValid = true; - // Logger.INFO("Passed Validity Check. Hash: "+recipe.hashCode()); - // Logger.INFO("Mapped as: "+(disableOptional ? "Extracting" : "Canning")); addRunnableToRecipeCache(this); } else { // Logger.INFO("Failed Validity Check."); @@ -174,7 +172,7 @@ public class RecipeGen_FluidCanning implements Runnable { } } - private final boolean addFluidExtractionRecipe(GT_Recipe aRecipe) { + private boolean addFluidExtractionRecipe(GT_Recipe aRecipe) { boolean result = false; CORE.crash(); Logger.INFO( @@ -211,7 +209,7 @@ public class RecipeGen_FluidCanning implements Runnable { return result; } - private final boolean addFluidCannerRecipe(GT_Recipe aRecipe) { + private boolean addFluidCannerRecipe(GT_Recipe aRecipe) { boolean result = false; int aCount1 = GT_Recipe_Map.sFluidCannerRecipes.mRecipeList.size(); int aCount2 = aCount1; @@ -257,7 +255,7 @@ public class RecipeGen_FluidCanning implements Runnable { + " | "; } - private final int getMapSize(GT_Recipe_Map aMap) { + private int getMapSize(GT_Recipe_Map aMap) { return aMap.mRecipeList.size(); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java index fa08380596..0d5c218ab9 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java @@ -13,7 +13,7 @@ import gtPlusPlus.core.util.minecraft.ItemUtils; public class RecipeGen_Fluids extends RecipeGen_Base { - public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<RunnableWithInfo<Material>>(); + public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<>(); static { MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluorite.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluorite.java index d1bcab904c..c8f87d7cb3 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluorite.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluorite.java @@ -22,7 +22,7 @@ import gtPlusPlus.core.util.minecraft.RecipeUtils; public class RecipeGen_Fluorite extends RecipeGen_Base { - public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<RunnableWithInfo<Material>>(); + public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<>(); static { MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MaterialProcessing.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MaterialProcessing.java index 734832807e..11475c1024 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MaterialProcessing.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MaterialProcessing.java @@ -21,7 +21,7 @@ import gtPlusPlus.core.util.minecraft.ItemUtils; public class RecipeGen_MaterialProcessing extends RecipeGen_Base { - public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<RunnableWithInfo<Material>>(); + public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<>(); static { MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap); @@ -57,11 +57,11 @@ public class RecipeGen_MaterialProcessing extends RecipeGen_Base { partSizes[hu] = (int) material.vSmallestRatio[hu]; } } - AutoMap<Pair<Integer, Material>> componentMap = new AutoMap<Pair<Integer, Material>>(); + AutoMap<Pair<Integer, Material>> componentMap = new AutoMap<>(); int alnsnfds = 0; for (MaterialStack r : material.getComposites()) { if (r != null) { - componentMap.put(new Pair<Integer, Material>(partSizes[alnsnfds], r.getStackMaterial())); + componentMap.put(new Pair<>(partSizes[alnsnfds], r.getStackMaterial())); } alnsnfds++; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MetalRecipe.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MetalRecipe.java index 0464ae80d7..f90c497edb 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MetalRecipe.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MetalRecipe.java @@ -14,7 +14,7 @@ import gtPlusPlus.core.util.minecraft.ItemUtils; public class RecipeGen_MetalRecipe extends RecipeGen_Base { - public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<RunnableWithInfo<Material>>(); + public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<>(); static { MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java index fdbeea89cf..68799b15d1 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java @@ -27,7 +27,7 @@ import gtPlusPlus.core.util.minecraft.RecipeUtils; public class RecipeGen_Ore extends RecipeGen_Base { - public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<RunnableWithInfo<Material>>(); + public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<>(); static { MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap); @@ -73,7 +73,7 @@ public class RecipeGen_Ore extends RecipeGen_Base { boolean allFailed = false; // Setup Bonuses - ArrayList<Material> aMatComp = new ArrayList<Material>(); + ArrayList<Material> aMatComp = new ArrayList<>(); for (Material j : MaterialUtils.getCompoundMaterialsRecursively(material)) { aMatComp.add(j); } @@ -84,7 +84,7 @@ public class RecipeGen_Ore extends RecipeGen_Base { } } - AutoMap<Material> amJ = new AutoMap<Material>(); + AutoMap<Material> amJ = new AutoMap<>(); int aIndexCounter = 0; for (Material g : aMatComp) { if (g.hasSolidForm()) { @@ -134,10 +134,10 @@ public class RecipeGen_Ore extends RecipeGen_Base { bonusB = tVoltageMultiplier > 100 ? material : mStone; } - AutoMap<Pair<Integer, Material>> componentMap = new AutoMap<Pair<Integer, Material>>(); + AutoMap<Pair<Integer, Material>> componentMap = new AutoMap<>(); for (MaterialStack r : material.getComposites()) { if (r != null) { - componentMap.put(new Pair<Integer, Material>(r.getPartsPerOneHundred(), r.getStackMaterial())); + componentMap.put(new Pair<>(r.getPartsPerOneHundred(), r.getStackMaterial())); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plasma.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plasma.java index 22d3e689da..bc27630bcf 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plasma.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plasma.java @@ -15,7 +15,7 @@ import gtPlusPlus.core.util.minecraft.ItemUtils; public class RecipeGen_Plasma extends RecipeGen_Base { - public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<RunnableWithInfo<Material>>(); + public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<>(); static { MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plates.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plates.java index 9cd6fedbc0..75d7abbba0 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plates.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plates.java @@ -19,7 +19,7 @@ import gtPlusPlus.core.util.minecraft.ItemUtils; public class RecipeGen_Plates extends RecipeGen_Base { - public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<RunnableWithInfo<Material>>(); + public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<>(); static { MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Recycling.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Recycling.java index d821751c7b..0087ee07d4 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Recycling.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Recycling.java @@ -29,7 +29,7 @@ import gtPlusPlus.core.util.reflect.ReflectionUtils; public class RecipeGen_Recycling implements Runnable { - public static AutoMap<Runnable> mQueuedRecyclingGenerators = new AutoMap<Runnable>(); + public static AutoMap<Runnable> mQueuedRecyclingGenerators = new AutoMap<>(); public static void executeGenerators() { if (mQueuedRecyclingGenerators.size() > 0) { @@ -80,7 +80,7 @@ public class RecipeGen_Recycling implements Runnable { mValidPrefixesAsString[r].name() + Utils.sanitizeString(material.getLocalizedName()), 1); if (temp != null) { - mValidPairs[mSlotIndex++] = new Pair<OrePrefixes, ItemStack>(mValidPrefixesAsString[r], temp.copy()); + mValidPairs[mSlotIndex++] = new Pair<>(mValidPrefixesAsString[r], temp.copy()); } } @@ -218,7 +218,7 @@ public class RecipeGen_Recycling implements Runnable { if (mPrefix != null && mDust != null) { Logger.WARNING("Built valid dust pair."); - return new Pair<OrePrefixes, ItemStack>(mPrefix, mDust); + return new Pair<>(mPrefix, mDust); } else { Logger.WARNING("mPrefix: " + (mPrefix != null)); Logger.WARNING("mDust: " + (mDust != null)); @@ -310,7 +310,7 @@ public class RecipeGen_Recycling implements Runnable { public static ArrayList<ItemStack> getOres(final Object aOreName) { final String aName = (aOreName == null) ? "" : aOreName.toString(); - final ArrayList<ItemStack> rList = new ArrayList<ItemStack>(); + final ArrayList<ItemStack> rList = new ArrayList<>(); if (GT_Utility.isStringValid(aName)) { Logger.WARNING("Making a list of all OreDict entries for " + aOreName + "."); if (rList.addAll(OreDictionary.getOres(aName))) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java index e414d8c511..fed32b5f7d 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java @@ -12,7 +12,7 @@ import gtPlusPlus.core.util.minecraft.ItemUtils; public class RecipeGen_ShapedCrafting extends RecipeGen_Base { - public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<RunnableWithInfo<Material>>(); + public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<>(); static { MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_AlgaeFarm.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_AlgaeFarm.java index 7ca8d4d78e..980bf983ca 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_AlgaeFarm.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_AlgaeFarm.java @@ -17,8 +17,8 @@ import gtPlusPlus.core.util.minecraft.ItemUtils; public class RecipeLoader_AlgaeFarm { - private static final HashMap<Integer, AutoMap<GT_Recipe>> mRecipeCache = new HashMap<Integer, AutoMap<GT_Recipe>>(); - private static final HashMap<Integer, AutoMap<GT_Recipe>> mRecipeCompostCache = new HashMap<Integer, AutoMap<GT_Recipe>>(); + private static final HashMap<Integer, AutoMap<GT_Recipe>> mRecipeCache = new HashMap<>(); + private static final HashMap<Integer, AutoMap<GT_Recipe>> mRecipeCompostCache = new HashMap<>(); public static void generateRecipes() { for (int i = 0; i < 10; i++) { @@ -35,7 +35,7 @@ public class RecipeLoader_AlgaeFarm { AutoMap<GT_Recipe> aTemp = aMap.get(aTier); if (aTemp == null || aTemp.isEmpty()) { - aTemp = new AutoMap<GT_Recipe>(); + aTemp = new AutoMap<>(); aMap.put(aTier, aTemp); Logger.INFO("Tier " + aTier + aComp + " had no recipes, initialising new map."); } @@ -62,7 +62,7 @@ public class RecipeLoader_AlgaeFarm { return null; } - WeightedCollection<Float> aOutputTimeMulti = new WeightedCollection<Float>(); + WeightedCollection<Float> aOutputTimeMulti = new WeightedCollection<>(); for (int i = 100; i > 0; i--) { float aValue = 0; if (i < 10) { @@ -112,7 +112,7 @@ public class RecipeLoader_AlgaeFarm { private static ItemStack[] getOutputsForTier(int aTier) { // Create an Automap to dump contents into - AutoMap<ItemStack> aOutputMap = new AutoMap<ItemStack>(); + AutoMap<ItemStack> aOutputMap = new AutoMap<>(); // Add loot relevant to tier and also add any from lower tiers. diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_LFTR.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_LFTR.java index 9c92f40608..27f289a7c5 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_LFTR.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_LFTR.java @@ -20,12 +20,12 @@ public class RecipeLoader_LFTR { private static void configureSparging() { if (mSpargeGases == null) { - mSpargeGases = new AutoMap<Fluid>(); + mSpargeGases = new AutoMap<>(); mSpargeGases.add(Materials.Helium.getGas(1).getFluid()); mSpargeGases.add(Materials.Fluorine.getGas(1).getFluid()); } if (mNobleGases == null) { - mNobleGases = new AutoMap<Fluid>(); + mNobleGases = new AutoMap<>(); mNobleGases.add(mSpargeGases.get(0)); mNobleGases.add(ELEMENT.getInstance().XENON.getFluid()); mNobleGases.add(ELEMENT.getInstance().NEON.getFluid()); @@ -34,7 +34,7 @@ public class RecipeLoader_LFTR { mNobleGases.add(ELEMENT.getInstance().RADON.getFluid()); } if (mFluorideGases == null) { - mFluorideGases = new AutoMap<Fluid>(); + mFluorideGases = new AutoMap<>(); mFluorideGases.add(mSpargeGases.get(1)); mFluorideGases.add(FLUORIDES.LITHIUM_FLUORIDE.getFluid()); mFluorideGases.add(FLUORIDES.NEPTUNIUM_HEXAFLUORIDE.getFluid()); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_MolecularTransformer.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_MolecularTransformer.java index c31500d084..8b59e2d232 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_MolecularTransformer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_MolecularTransformer.java @@ -18,8 +18,7 @@ public class RecipeLoader_MolecularTransformer { public static void run() { - for (int i = 0; i < transformerRecipes.size(); i++) { - MTRecipeRecord aRecipe = transformerRecipes.get(i); + for (MTRecipeRecord aRecipe : transformerRecipes) { int aEU = MaterialUtils.getVoltageForTier(5); Logger.INFO("======================="); Logger.INFO("Generating GT recipe for Molecular Transformer."); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java index 19f6f42f64..fcdd93d0fd 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java @@ -5,19 +5,11 @@ import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.automation.GT_MetaTileEntity_ElectricAutoWorkbench; -import gtPlusPlus.xmod.gregtech.common.tileentities.automation.GT_MetaTileEntity_ElectricInventoryManager; import gtPlusPlus.xmod.gregtech.common.tileentities.automation.GT_MetaTileEntity_TesseractGenerator; import gtPlusPlus.xmod.gregtech.common.tileentities.automation.GT_MetaTileEntity_TesseractTerminal; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_CropHarvestor; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GT4Entity_AutoCrafter; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GT4Entity_ThermalBoiler; -import gtPlusPlus.xmod.gregtech.common.tileentities.redstone.GT_MetaTileEntity_RedstoneButtonPanel; -import gtPlusPlus.xmod.gregtech.common.tileentities.redstone.GT_MetaTileEntity_RedstoneCircuitBlock; -import gtPlusPlus.xmod.gregtech.common.tileentities.redstone.GT_MetaTileEntity_RedstoneLamp; -import gtPlusPlus.xmod.gregtech.common.tileentities.redstone.GT_MetaTileEntity_RedstoneStrengthDisplay; -import gtPlusPlus.xmod.gregtech.common.tileentities.redstone.GT_MetaTileEntity_RedstoneStrengthScale; -import gtPlusPlus.xmod.gregtech.common.tileentities.storage.GT_MetaTileEntity_AdvancedCraftingTable; -import gtPlusPlus.xmod.gregtech.common.tileentities.storage.GT_MetaTileEntity_BronzeCraftingTable; public class Gregtech4Content { @@ -25,47 +17,11 @@ public class Gregtech4Content { public static void run() { Logger.INFO("Max MTE: " + GregTech_API.METATILEENTITIES.length + " | " + GregTech_API.MAXIMUM_METATILE_IDS); - workbenches(); thermalBoiler(); multiCrafter(); tesseracts(); basic(); automation(); - redstone(); - } - - private static void workbenches() { - // Gregtech 4 Workbenches - Logger.INFO("Gregtech 4 Content | Registering Workbenches."); - GregtechItemList.GT4_Workbench_Bronze.set( - new GT_MetaTileEntity_BronzeCraftingTable( - 31081, - "workbench.basic", - "Bronze Workbench", - 0, - "Stores 16000L of fluid").getStackForm(1L)); - GregtechItemList.GT4_Workbench_Advanced.set( - new GT_MetaTileEntity_AdvancedCraftingTable( - 31082, - "workbench.advanced", - "Advanced Workbench", - 3, - "Stores 64000L of fluid").getStackForm(1L)); - } - - private static void redstone() { - Logger.INFO("Gregtech 4 Content | Registering Redstone Blocks."); - GregtechItemList.GT4_Redstone_Lamp.set(new GT_MetaTileEntity_RedstoneLamp(31120).getStackForm(1L)); - GregtechItemList.GT4_Redstone_Button_Panel - .set(new GT_MetaTileEntity_RedstoneButtonPanel(31121).getStackForm(1L)); - GregtechItemList.GT4_Redstone_Scale.set(new GT_MetaTileEntity_RedstoneStrengthScale(31122).getStackForm(1L)); - GregtechItemList.GT4_Redstone_Display.set( - new GT_MetaTileEntity_RedstoneStrengthDisplay( - 31123, - "redstone.display.strength", - "Redstone Display", - "Displays Redstone Strength").getStackForm(1L)); - GregtechItemList.GT4_Redstone_Circuit.set(new GT_MetaTileEntity_RedstoneCircuitBlock(31124).getStackForm(1L)); } private static void automation() { @@ -87,31 +43,6 @@ public class Gregtech4Content { GregtechItemList.GT4_Electric_Auto_Workbench_UV.set( new GT_MetaTileEntity_ElectricAutoWorkbench(31098, 8, "Automatic crafting machine").getStackForm(1L)); - Logger.INFO("Gregtech 4 Content | Registering Inventory Managers."); - GregtechItemList.GT4_Electric_Inventory_Manager_LV.set( - new GT_MetaTileEntity_ElectricInventoryManager(31101, 1, "Manages your inventory and stuff") - .getStackForm(1L)); - GregtechItemList.GT4_Electric_Inventory_Manager_MV.set( - new GT_MetaTileEntity_ElectricInventoryManager(31102, 2, "Manages your inventory and stuff") - .getStackForm(1L)); - GregtechItemList.GT4_Electric_Inventory_Manager_HV.set( - new GT_MetaTileEntity_ElectricInventoryManager(31103, 3, "Manages your inventory and stuff") - .getStackForm(1L)); - GregtechItemList.GT4_Electric_Inventory_Manager_EV.set( - new GT_MetaTileEntity_ElectricInventoryManager(31104, 4, "Manages your inventory and stuff") - .getStackForm(1L)); - GregtechItemList.GT4_Electric_Inventory_Manager_IV.set( - new GT_MetaTileEntity_ElectricInventoryManager(31105, 5, "Manages your inventory and stuff") - .getStackForm(1L)); - GregtechItemList.GT4_Electric_Inventory_Manager_LuV.set( - new GT_MetaTileEntity_ElectricInventoryManager(31106, 6, "Manages your inventory and stuff") - .getStackForm(1L)); - GregtechItemList.GT4_Electric_Inventory_Manager_ZPM.set( - new GT_MetaTileEntity_ElectricInventoryManager(31107, 7, "Manages your inventory and stuff") - .getStackForm(1L)); - GregtechItemList.GT4_Electric_Inventory_Manager_UV.set( - new GT_MetaTileEntity_ElectricInventoryManager(31108, 8, "Manages your inventory and stuff") - .getStackForm(1L)); } private static void basic() { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechBufferDynamos.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechBufferDynamos.java index 7fd68be584..67d70e45e4 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechBufferDynamos.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechBufferDynamos.java @@ -18,7 +18,7 @@ public class GregtechBufferDynamos { run2(); } - private static final void run2() { + private static void run2() { GregtechItemList.Hatch_Buffer_Dynamo_ULV.set( new GT_MetaTileEntity_Hatch_DynamoBuffer( mID++, diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java index 6c05c6e79f..0b615b9c3d 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java @@ -648,9 +648,6 @@ public class GregtechConduits { Logger.ERROR(Material.name() + " has defaulted to 8v."); V = 0; } - // makeWires(T, ID, 2L, 4L, 2L, GT_Values.V[V], true, false); - // makeSuperConductors(T, ID, insulatedLoss, uninsulatedLoss, Amps, GT_Values.V[V], true, false); - // makeWires(T, ID, bEC ? 2L : 2L, bEC ? 4L : 4L, 2L, gregtech.api.enums.GT_Values.V[V], true, false); } private static void generateGTFluidPipes(final Materials material, final int startID, final int transferRatePerSec, @@ -949,8 +946,8 @@ public class GregtechConduits { String tName = aName.toString(); if (GT_Utility.isStringInvalid(tName)) return false; ArrayList<ItemStack> tList = GT_OreDictUnificator.getOres(tName); - for (int i = 0; i < tList.size(); ++i) - if (GT_Utility.areStacksEqual((ItemStack) tList.get(i), aStack, true)) return false; + for (ItemStack itemStack : tList) + if (GT_Utility.areStacksEqual((ItemStack) itemStack, aStack, true)) return false; OreDictionary.registerOre(tName, GT_Utility.copyAmount(1L, new Object[] { aStack })); return true; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java index 7878709095..f8c36eb37b 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java @@ -163,11 +163,8 @@ public class GregtechCustomHatches { * Super Input Busses */ - int aStartID = 30021; + int aStartID = 30022; - GregtechItemList.Hatch_SuperBus_Input_ULV.set( - ((IMetaTileEntity) makeInputBus(aStartID++, "hatch.superbus.input.tier.00", "Super Bus (I) (ULV)", 0)) - .getStackForm(1L)); GregtechItemList.Hatch_SuperBus_Input_LV.set( ((IMetaTileEntity) makeInputBus(aStartID++, "hatch.superbus.input.tier.01", "Super Bus (I) (LV)", 1)) .getStackForm(1L)); @@ -193,16 +190,13 @@ public class GregtechCustomHatches { ((IMetaTileEntity) makeInputBus(aStartID++, "hatch.superbus.input.tier.08", "Super Bus (I) (UV)", 8)) .getStackForm(1L)); GregtechItemList.Hatch_SuperBus_Input_MAX.set( - ((IMetaTileEntity) makeInputBus(aStartID++, "hatch.superbus.input.tier.09", "Super Bus (I) (MAX)", 9)) + ((IMetaTileEntity) makeInputBus(aStartID, "hatch.superbus.input.tier.09", "Super Bus (I) (MAX)", 9)) .getStackForm(1L)); /* * Super Output Busses */ - - GregtechItemList.Hatch_SuperBus_Output_ULV.set( - ((IMetaTileEntity) makeOutputBus(aStartID++, "hatch.superbus.output.tier.00", "Super Bus (O) (ULV)", 0)) - .getStackForm(1L)); + aStartID = 30031; GregtechItemList.Hatch_SuperBus_Output_LV.set( ((IMetaTileEntity) makeOutputBus(aStartID++, "hatch.superbus.output.tier.01", "Super Bus (O) (LV)", 1)) .getStackForm(1L)); @@ -228,7 +222,7 @@ public class GregtechCustomHatches { ((IMetaTileEntity) makeOutputBus(aStartID++, "hatch.superbus.output.tier.08", "Super Bus (O) (UV)", 8)) .getStackForm(1L)); GregtechItemList.Hatch_SuperBus_Output_MAX.set( - ((IMetaTileEntity) makeOutputBus(aStartID++, "hatch.superbus.output.tier.09", "Super Bus (O) (MAX)", 9)) + ((IMetaTileEntity) makeOutputBus(aStartID, "hatch.superbus.output.tier.09", "Super Bus (O) (MAX)", 9)) .getStackForm(1L)); } @@ -248,15 +242,13 @@ public class GregtechCustomHatches { } private static void run5() { - int aID = 31777; + int aID = 31778; - GregtechItemList.GT_MetaTileEntity_ChiselBus_I - .set((makeChiselBus(aID++, "hatch.chisel.tier.00", "Chisel Bus I", 0)).getStackForm(1L)); - GregtechItemList.GT_MetaTileEntity_ChiselBus_II + GregtechItemList.GT_MetaTileEntity_ChiselBus_LV .set((makeChiselBus(aID++, "hatch.chisel.tier.01", "Chisel Bus II", 1)).getStackForm(1L)); - GregtechItemList.GT_MetaTileEntity_ChiselBus_III + GregtechItemList.GT_MetaTileEntity_ChiselBus_MV .set((makeChiselBus(aID++, "hatch.chisel.tier.02", "Chisel Bus III", 2)).getStackForm(1L)); - GregtechItemList.GT_MetaTileEntity_ChiselBus_IV + GregtechItemList.GT_MetaTileEntity_ChiselBus_HV .set((makeChiselBus(aID++, "hatch.chisel.tier.03", "Chisel Bus IV", 3)).getStackForm(1L)); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeneratorsULV.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeneratorsULV.java deleted file mode 100644 index bc05640e70..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeneratorsULV.java +++ /dev/null @@ -1,52 +0,0 @@ -package gtPlusPlus.xmod.gregtech.registration.gregtech; - -import static gtPlusPlus.core.recipe.common.CI.bitsd; - -import gregtech.api.enums.ItemList; -import gregtech.api.enums.Materials; -import gregtech.api.enums.OrePrefixes; -import gregtech.api.util.GT_ModHandler; -import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.generators.ULV.GT_MetaTileEntity_ULV_CombustionGenerator; -import gtPlusPlus.xmod.gregtech.common.tileentities.generators.ULV.GT_MetaTileEntity_ULV_GasTurbine; -import gtPlusPlus.xmod.gregtech.common.tileentities.generators.ULV.GT_MetaTileEntity_ULV_SteamTurbine; - -public class GregtechGeneratorsULV { - - public static void run() { - - GregtechItemList.Generator_Diesel_ULV.set( - new GT_MetaTileEntity_ULV_CombustionGenerator( - 960, - "basicgenerator.diesel.tier.00", - "Simple Combustion Generator", - 0).getStackForm(1L)); - GregtechItemList.Generator_Gas_Turbine_ULV.set( - new GT_MetaTileEntity_ULV_GasTurbine(961, "basicgenerator.gas.tier.00", "Simple Gas Turbine", 0) - .getStackForm(1L)); - GregtechItemList.Generator_Steam_Turbine_ULV.set( - new GT_MetaTileEntity_ULV_SteamTurbine(962, "basicgenerator.steam.tier.00", "Simple Steam Turbine") - .getStackForm(1L)); - - GT_ModHandler.addCraftingRecipe( - GregtechItemList.Generator_Diesel_ULV.get(1L, new Object[0]), - bitsd, - new Object[] { "PCP", "EME", "GWG", 'M', ItemList.Hull_ULV, 'P', GregtechItemList.Electric_Piston_ULV, - 'E', GregtechItemList.Electric_Motor_ULV, 'C', OrePrefixes.circuit.get(Materials.Primitive), - 'W', OrePrefixes.cableGt01.get(Materials.RedAlloy), 'G', - OrePrefixes.gearGt.get(Materials.Bronze) }); - GT_ModHandler.addCraftingRecipe( - GregtechItemList.Generator_Gas_Turbine_ULV.get(1L, new Object[0]), - bitsd, - new Object[] { "CRC", "RMR", "EWE", 'M', ItemList.Hull_ULV, 'E', GregtechItemList.Electric_Motor_ULV, - 'R', OrePrefixes.rotor.get(Materials.Tin), 'C', OrePrefixes.circuit.get(Materials.Primitive), - 'W', OrePrefixes.cableGt01.get(Materials.RedAlloy) }); - GT_ModHandler.addCraftingRecipe( - GregtechItemList.Generator_Steam_Turbine_ULV.get(1L, new Object[0]), - bitsd, - new Object[] { "PCP", "RMR", "EWE", 'M', ItemList.Hull_ULV, 'E', GregtechItemList.Electric_Motor_ULV, - 'R', OrePrefixes.rotor.get(Materials.Tin), 'C', OrePrefixes.circuit.get(Materials.Primitive), - 'W', OrePrefixes.cableGt01.get(Materials.RedAlloy), 'P', - OrePrefixes.pipeMedium.get(Materials.Copper) }); - } -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPollutionDevices.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPollutionDevices.java index 02e397ca35..e6c1febd66 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPollutionDevices.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPollutionDevices.java @@ -37,12 +37,6 @@ public class GregtechPollutionDevices { "Polluting the skies.", 0).getStackForm(1L)); - GregtechItemList.Pollution_Cleaner_ULV.set( - new GregtechMetaAtmosphericReconditioner( - 757, - "pollutioncleaner.01.tier.single", - "Pollution Scrubber", - 0).getStackForm(1L)); GregtechItemList.Pollution_Cleaner_LV.set( new GregtechMetaAtmosphericReconditioner( 758, diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSteamCondenser.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSteamCondenser.java deleted file mode 100644 index 0d52cc0fcb..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSteamCondenser.java +++ /dev/null @@ -1,22 +0,0 @@ -package gtPlusPlus.xmod.gregtech.registration.gregtech; - -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaCondensor; - -public class GregtechSteamCondenser { - - public static void run() { - Logger.INFO("Gregtech5u Content | Registering Steam Condensor."); - if (CORE.ConfigSwitches.enableMachine_SteamConverter) { - run1(); - } - } - - private static void run1() { - // Steam Condensors - GregtechItemList.Condensor_MAX.set( - new GregtechMetaCondensor(769, "steamcondensor.01.tier.single", "Steam Condensor").getStackForm(1L)); - } -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSuperChests.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSuperChests.java index ccd7d6cbf7..08ce02b5fa 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSuperChests.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSuperChests.java @@ -1,6 +1,5 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; -import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.storage.GT_MetaTileEntity_TieredChest; @@ -27,12 +26,5 @@ public class GregtechSuperChests { (new GT_MetaTileEntity_TieredChest(mId++, "super.chest.gtpp.tier.05", "Super Chest V" + aSuffix, 5)) .getStackForm(1L)); - // Do not add Recipes for GTNH, hide them from NEI instead. - ItemUtils.hideItemFromNEI(GregtechItemList.Super_Chest_LV.get(1L)); - ItemUtils.hideItemFromNEI(GregtechItemList.Super_Chest_MV.get(1L)); - ItemUtils.hideItemFromNEI(GregtechItemList.Super_Chest_HV.get(1L)); - ItemUtils.hideItemFromNEI(GregtechItemList.Super_Chest_EV.get(1L)); - ItemUtils.hideItemFromNEI(GregtechItemList.Super_Chest_IV.get(1L)); - } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredChunkloaders.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredChunkloaders.java deleted file mode 100644 index 0d560610ff..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredChunkloaders.java +++ /dev/null @@ -1,26 +0,0 @@ -package gtPlusPlus.xmod.gregtech.registration.gregtech; - -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaTileEntityChunkLoader; - -public class GregtechTieredChunkloaders { - - public static void run() { - Logger.INFO("Gregtech5u Content | Registering Chunk Loaders."); - run1(); - } - - private static void run1() { - int ID = 943; - GregtechItemList.GT_Chunkloader_HV.set( - new GregtechMetaTileEntityChunkLoader(ID++, "chunkloader.tier.01", "Chunkloader MK I", 3) - .getStackForm(1L)); - GregtechItemList.GT_Chunkloader_IV.set( - new GregtechMetaTileEntityChunkLoader(ID++, "chunkloader.tier.02", "Chunkloader MK II", 5) - .getStackForm(1L)); - GregtechItemList.GT_Chunkloader_ZPM.set( - new GregtechMetaTileEntityChunkLoader(ID++, "chunkloader.tier.03", "Chunkloader MK III", 7) - .getStackForm(1L)); - } -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechWirelessChargers.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechWirelessChargers.java index fe7628933e..43645b16fb 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechWirelessChargers.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechWirelessChargers.java @@ -84,7 +84,7 @@ public class GregtechWirelessChargers { 8, "Hopefully won't give you cancer.", 0).getStackForm(1L)); - GregtechItemList.Charger_MAX.set( + GregtechItemList.Charger_UHV.set( new GregtechMetaWirelessCharger( mID++, "wificharger.09.tier.single", |