From 67b48690b1078b489bcb017e8db9200f26b77a0c Mon Sep 17 00:00:00 2001 From: miozune Date: Fri, 26 May 2023 14:41:09 +0900 Subject: Deprecation cleanup (#637) --- .../xmod/bop/blocks/base/LeavesBase.java | 1 - .../gtPlusPlus/xmod/bop/blocks/base/LogBase.java | 1 - .../xmod/forestry/bees/custom/GTPP_Bees.java | 4 +- .../xmod/forestry/bees/items/MB_ItemFrame.java | 2 +- .../galacticraft/handler/HandlerTooltip_GC.java | 1 + .../xmod/gregtech/api/enums/GregtechItemList.java | 37 - .../gregtech/api/enums/GregtechOrePrefixes.java | 2 +- .../interfaces/internal/IGregtech_RecipeAdder.java | 13 - .../xmod/gregtech/api/items/Gregtech_MetaTool.java | 2 +- .../custom/power/GTPP_MTE_TieredMachineBlock.java | 7 - .../custom/power/MetaTileEntityCustomPower.java | 10 +- .../GT_MetaTileEntity_Hatch_AirIntake.java | 4 +- .../GT_MetaTileEntity_Hatch_AirIntake_Extreme.java | 8 +- .../GT_MetaTileEntity_Hatch_ControlCore.java | 4 +- .../GT_MetaTileEntity_Hatch_DynamoBuffer.java | 13 +- ...etaTileEntity_Hatch_ElementalDataOrbHolder.java | 6 - .../GT_MetaTileEntity_Hatch_FluidGenerator.java | 2 +- .../GT_MetaTileEntity_Hatch_InputBattery.java | 8 +- .../GT_MetaTileEntity_Hatch_Naquadah.java | 9 +- .../GT_MetaTileEntity_Hatch_OutputBattery.java | 8 +- .../GT_MetaTileEntity_Hatch_Reservoir.java | 4 +- .../GT_MetaTileEntity_Hatch_Steam_BusInput.java | 10 +- .../GT_MetaTileEntity_Hatch_Turbine.java | 12 +- .../GT_MetaTileEntity_Hatch_TurbineProvider.java | 13 +- .../GT_MetaTileEntity_SuperBus_Input.java | 7 +- .../GT_MetaTileEntity_SuperBus_Output.java | 7 +- .../GregtechMetaPipeEntityFluid.java | 18 +- .../GregtechMetaTreeFarmerStructural.java | 14 +- .../GT_MetaTileEntity_Hatch_CustomFluidBase.java | 9 +- .../base/GregtechMetaTransformerHiAmp.java | 13 +- .../base/GregtechMeta_MultiBlockBase.java | 10 +- .../base/generators/GregtechMetaBoilerBase.java | 7 +- .../generators/GregtechMetaSolarGenerator.java | 6 +- .../GregtechRocketFuelGeneratorBase.java | 11 +- .../base/machines/GregtechMetaSafeBlockBase.java | 3 +- .../base/machines/GregtechMetaTreeFarmerBase.java | 5 +- .../GT_MetaTileEntity_Hatch_Catalysts.java | 10 +- .../GT_MetaTileEntity_Hatch_MillingBalls.java | 10 +- .../GT_MetaTileEntity_Hatch_NbtConsumable.java | 8 - .../xmod/gregtech/common/Meta_GT_Proxy.java | 25 - .../common/covers/GTPP_Cover_Overflow.java | 7 +- .../common/covers/GTPP_Cover_ToggleVisual.java | 16 +- .../gregtech/common/helpers/TreeFarmHelper.java | 1015 -------------------- .../common/items/MetaGeneratedGregtechItems.java | 40 +- .../behaviours/Behaviour_Electric_Lighter.java | 22 +- .../items/behaviours/Behaviour_Prospecting_Ex.java | 19 +- .../gregtech/common/render/GTPP_CapeRenderer.java | 54 -- .../GT_MetaTileEntity_ElectricAutoWorkbench.java | 10 +- ...GT_MetaTileEntity_ElectricInventoryManager.java | 9 +- .../GT_MetaTileEntity_TesseractGenerator.java | 12 +- .../GT_MetaTileEntity_TesseractTerminal.java | 15 +- .../generators/GT_MetaTileEntity_Boiler_Base.java | 15 +- .../generators/GT_MetaTileEntity_Boiler_HV.java | 4 +- .../generators/GT_MetaTileEntity_Boiler_LV.java | 4 +- .../generators/GT_MetaTileEntity_Boiler_MV.java | 4 +- .../GT_MetaTileEntity_SemiFluidGenerator.java | 20 +- .../GregtechMetaTileEntityGeothermalGenerator.java | 19 +- .../GregtechMetaTileEntityRocketFuelGenerator.java | 11 +- .../GregtechMetaTileEntitySolarGenerator.java | 13 +- .../generators/GregtechMetaTileEntity_RTG.java | 14 +- .../GT_MetaTileEntity_ULV_CombustionGenerator.java | 17 +- .../ULV/GT_MetaTileEntity_ULV_GasTurbine.java | 21 +- .../basic/GT_MetaTileEntity_CropHarvestor.java | 15 +- .../basic/GT_MetaTileEntity_WorldAccelerator.java | 311 ------ .../GregtechMetaAtmosphericReconditioner.java | 30 +- .../machines/basic/GregtechMetaCondensor.java | 13 +- .../basic/GregtechMetaTileEntityChunkLoader.java | 4 +- .../basic/GregtechMetaTileEntity_AutoChisel.java | 13 +- .../basic/GregtechMetaTileEntity_BasicWasher.java | 15 +- .../GregtechMetaTileEntity_ReactorColdTrap.java | 8 +- ...egtechMetaTileEntity_ReactorProcessingUnit.java | 8 +- .../machines/multi/misc/GMTE_AmazonPackager.java | 6 +- .../multi/misc/GregtechMTE_TeslaTower.java | 2 +- ...gtechMetaTileEntity_IndustrialAlloySmelter.java | 4 +- ...regtechMetaTileEntity_IndustrialArcFurnace.java | 12 +- ...regtechMetaTileEntity_IndustrialCentrifuge.java | 2 +- .../GregtechMetaTileEntity_IndustrialChisel.java | 7 +- .../GregtechMetaTileEntity_IndustrialCokeOven.java | 8 +- ...echMetaTileEntity_IndustrialCuttingMachine.java | 6 +- ...regtechMetaTileEntity_IndustrialDehydrator.java | 2 +- ...gtechMetaTileEntity_IndustrialElectrolyzer.java | 8 +- .../GregtechMetaTileEntity_IndustrialExtruder.java | 6 +- ...egtechMetaTileEntity_IndustrialFluidHeater.java | 4 +- ...egtechMetaTileEntity_IndustrialForgeHammer.java | 6 +- ...GregtechMetaTileEntity_IndustrialMacerator.java | 7 +- .../GregtechMetaTileEntity_IndustrialMixer.java | 11 +- ...aTileEntity_IndustrialMolecularTransformer.java | 11 +- ...gtechMetaTileEntity_IndustrialMultiMachine.java | 8 +- ...regtechMetaTileEntity_IndustrialPlatePress.java | 6 +- .../GregtechMetaTileEntity_IndustrialSifter.java | 9 +- ...MetaTileEntity_IndustrialThermalCentrifuge.java | 4 +- ...techMetaTileEntity_IndustrialVacuumFreezer.java | 2 +- ...GregtechMetaTileEntity_IndustrialWashPlant.java | 8 +- .../GregtechMetaTileEntity_IndustrialWireMill.java | 11 +- .../GregtechMetaTileEntity_IronBlastFurnace.java | 2 +- .../processing/GregtechMetaTileEntity_IsaMill.java | 2 +- .../GregtechMetaTileEntity_SpargeTower.java | 2 +- ...egtechMetaTileEntity_Adv_DistillationTower.java | 4 +- .../advanced/GregtechMetaTileEntity_Adv_EBF.java | 2 +- .../GregtechMetaTileEntity_Adv_Fusion_MK4.java | 3 +- .../GregtechMetaTileEntity_Adv_Fusion_MK5.java | 3 +- .../GregtechMetaTileEntity_Adv_HeatExchanger.java | 2 +- .../GregtechMetaTileEntity_Adv_Implosion.java | 9 +- .../GregtechMetaTileEntity_SteamCompressor.java | 4 +- .../GregtechMetaTileEntity_SteamMacerator.java | 4 +- .../multi/production/GT4Entity_ThermalBoiler.java | 2 +- .../GregtechMTE_ElementalDuplicator.java | 18 +- .../production/GregtechMTE_FrothFlotationCell.java | 10 +- .../production/GregtechMTE_NuclearReactor.java | 20 +- .../GregtechMetaTileEntityGeneratorArray.java | 2 +- .../production/GregtechMetaTileEntityTreeFarm.java | 7 +- .../GregtechMetaTileEntity_AlloyBlastSmelter.java | 8 +- .../GregtechMetaTileEntity_Cyclotron.java | 38 +- ...egtechMetaTileEntity_IndustrialFishingPond.java | 6 +- ...egtechMetaTileEntity_IndustrialRockBreaker.java | 11 +- .../GregtechMetaTileEntity_LargeRocketEngine.java | 7 +- ...techMetaTileEntity_LargeSemifluidGenerator.java | 9 +- .../GregtechMetaTileEntity_MassFabricator.java | 10 +- ...techMetaTileEntity_QuantumForceTransformer.java | 17 +- .../GregtechMetaTileEntity_Refinery.java | 7 +- .../GregtechMetaTileEntity_SolarTower.java | 14 +- .../algae/GregtechMTE_AlgaePondBase.java | 10 +- .../chemplant/GregtechMTE_ChemicalPlant.java | 3 +- .../GregtechMetaTileEntity_LargerTurbineBase.java | 2 +- ...chMetaTileEntity_PowerSubStationController.java | 2 +- .../tileentities/misc/TileEntitySolarHeater.java | 8 +- .../redstone/GT_MetaTileEntity_RedstoneBase.java | 9 +- .../GT_MetaTileEntity_RedstoneButtonPanel.java | 4 +- .../GT_MetaTileEntity_RedstoneCircuitBlock.java | 9 +- .../redstone/GT_MetaTileEntity_RedstoneLamp.java | 4 +- .../GT_MetaTileEntity_RedstoneStrengthDisplay.java | 4 +- .../GT_MetaTileEntity_RedstoneStrengthScale.java | 4 +- .../GT_MetaTileEntity_AdvancedCraftingTable.java | 17 +- .../GT_MetaTileEntity_BronzeCraftingTable.java | 11 +- .../GT_MetaTileEntity_ConnectableCrate.java | 7 +- .../storage/GT_MetaTileEntity_TieredChest.java | 13 +- .../storage/GT_MetaTileEntity_TieredTank.java | 24 +- .../storage/GregtechMetaEnergyBuffer.java | 28 - .../storage/GregtechMetaSafeBlock.java | 13 +- .../GT_MetaTileEntity_InfiniteItemHolder.java | 10 +- .../storage/shelving/GT4Entity_Shelf.java | 21 +- .../shelving/GT4Entity_Shelf_Compartment.java | 4 +- .../storage/shelving/GT4Entity_Shelf_Desk.java | 4 +- .../shelving/GT4Entity_Shelf_FileCabinet.java | 4 +- .../storage/shelving/GT4Entity_Shelf_Iron.java | 4 +- .../storage/shelving/GT4Entity_Shelf_Large.java | 8 +- .../common/tools/TOOL_Gregtech_AngleGrinder.java | 11 +- .../common/tools/TOOL_Gregtech_Choocher.java | 11 +- .../tools/TOOL_Gregtech_ElectricButcherKnife.java | 11 +- .../tools/TOOL_Gregtech_ElectricLighter.java | 11 +- .../loaders/ProcessingToolHeadChoocher.java | 15 +- .../xmod/gregtech/recipes/GregtechRecipeAdder.java | 7 - .../gregtech/GregtechBufferDynamos.java | 2 +- .../gregtech/GregtechComponentAssembler.java | 665 ------------- .../registration/gregtech/GregtechConduits.java | 30 +- .../gregtech/GregtechEnergyBuffer.java | 2 +- .../GregtechGeothermalThermalGenerator.java | 2 +- .../registration/gregtech/GregtechSafeBlock.java | 2 +- .../gregtech/GregtechThreadedBuffers.java | 78 -- .../xmod/ic2/item/CustomKineticRotor.java | 5 - .../xmod/thaumcraft/util/ThaumcraftUtils.java | 20 - 161 files changed, 615 insertions(+), 2979 deletions(-) delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_WorldAccelerator.java delete mode 100644 src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechComponentAssembler.java (limited to 'src/main/java/gtPlusPlus/xmod') diff --git a/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LeavesBase.java b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LeavesBase.java index b839f52d02..3fb8229b7f 100644 --- a/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LeavesBase.java +++ b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LeavesBase.java @@ -30,7 +30,6 @@ public class LeavesBase extends BlockLeaves { protected String[] treeType = new String[] {}; protected ItemStack[] bonusDrops; - @SuppressWarnings("deprecation") public LeavesBase(String blockNameLocalized, String blockNameUnlocalized, ItemStack[] bonusDrops) { this.bonusDrops = bonusDrops; String blockName = "block" + Utils.sanitizeString(blockNameLocalized) + "Leaves"; diff --git a/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LogBase.java b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LogBase.java index 3547c8b5bf..6c4ea6a556 100644 --- a/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LogBase.java +++ b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LogBase.java @@ -26,7 +26,6 @@ public abstract class LogBase extends BlockLog { protected IIcon[] textureSide; protected IIcon[] textureTop; - @SuppressWarnings("deprecation") public LogBase(String blockNameLocalized, String blockNameUnlocalized, String[] treeTypes) { this.treeType = treeTypes; String blockName = "block" + Utils.sanitizeString(blockNameLocalized) + "Log"; diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bees.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bees.java index d27f478169..64b744aaf8 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bees.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bees.java @@ -155,8 +155,8 @@ public class GTPP_Bees { } private Materials trySetValue(String material) { - Materials mTemp = Materials.valueOf(material); - if (mTemp != null) { + Materials mTemp = Materials.get(material); + if (mTemp != Materials._NULL) { return mTemp; } return Materials._NULL; diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/MB_ItemFrame.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/MB_ItemFrame.java index 70856235dd..e5d36d15e8 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/MB_ItemFrame.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/MB_ItemFrame.java @@ -78,7 +78,7 @@ public class MB_ItemFrame extends Item implements IHiveFrame { } @Override - public boolean hasEffect(final ItemStack par1ItemStack) { + public boolean hasEffect(final ItemStack par1ItemStack, final int pass) { if ((this.rarity_value == EnumRarity.uncommon) || (this.rarity_value == EnumRarity.common)) { return false; } diff --git a/src/main/java/gtPlusPlus/xmod/galacticraft/handler/HandlerTooltip_GC.java b/src/main/java/gtPlusPlus/xmod/galacticraft/handler/HandlerTooltip_GC.java index 54cde6194c..8d3a79c74b 100644 --- a/src/main/java/gtPlusPlus/xmod/galacticraft/handler/HandlerTooltip_GC.java +++ b/src/main/java/gtPlusPlus/xmod/galacticraft/handler/HandlerTooltip_GC.java @@ -64,6 +64,7 @@ public class HandlerTooltip_GC { for (int aMapKey : RocketFuels.mValidRocketFuels.keySet()) { Fluid aFuel = RocketFuels.mValidRocketFuels.get(aMapKey); if (aFuel != null) { + // noinspection deprecation mFuelNames.put(aMapKey, aFuel.getLocalizedName()); } } 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 e51b27f974..2343b6e76e 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java @@ -651,18 +651,6 @@ public enum GregtechItemList implements GregtechItemContainer { // Auto TC Research Creator Thaumcraft_Researcher, - // Threaded Buffers - Automation_Threaded_SuperBuffer_ULV, - Automation_Threaded_SuperBuffer_LV, - Automation_Threaded_SuperBuffer_MV, - Automation_Threaded_SuperBuffer_HV, - Automation_Threaded_SuperBuffer_EV, - Automation_Threaded_SuperBuffer_IV, - Automation_Threaded_SuperBuffer_LuV, - Automation_Threaded_SuperBuffer_ZPM, - Automation_Threaded_SuperBuffer_UV, - Automation_Threaded_SuperBuffer_MAX, - // infinite Items Infinite_Item_Chest, @@ -769,19 +757,6 @@ public enum GregtechItemList implements GregtechItemContainer { Charger_UV, Charger_MAX, - // Tiny Fusion - /* Miniature_Fusion, */ - - // Component Makers - Machine_LV_Component_Maker, - Machine_MV_Component_Maker, - Machine_HV_Component_Maker, - Machine_EV_Component_Maker, - Machine_IV_Component_Maker, - Machine_LuV_Component_Maker, - Machine_ZPM_Component_Maker, - Machine_UV_Component_Maker, - // Reactor Processing Unit ReactorProcessingUnit_IV, ReactorProcessingUnit_ZPM, @@ -969,18 +944,6 @@ public enum GregtechItemList implements GregtechItemContainer { Cover_Overflow_Item_EV, Cover_Overflow_Item_IV, - // Fake Hull Covers - FakeMachineCasingPlate_ULV, - FakeMachineCasingPlate_LV, - FakeMachineCasingPlate_MV, - FakeMachineCasingPlate_HV, - FakeMachineCasingPlate_EV, - FakeMachineCasingPlate_IV, - FakeMachineCasingPlate_LuV, - FakeMachineCasingPlate_ZPM, - FakeMachineCasingPlate_UV, - FakeMachineCasingPlate_MAX, - // ---------------------------------------------------------------------------- ; 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 96ff9f6aef..8812043cfe 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java @@ -350,7 +350,7 @@ public enum GregtechOrePrefixes { + "' with the Prefix '" + this.name() + "' and the Material '" - + aMaterial.name() + + aMaterial.mName + "' at " + GT_Utility.getClassName(tRegistrator)); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java index 680206596b..e194a4b3f5 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java @@ -216,19 +216,6 @@ public interface IGregtech_RecipeAdder { FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput1, ItemStack aOutput2, ItemStack aOutput3, ItemStack aOutput4, int aDuration, int aEUt); - /** - * Adds a Recipe for the Machine Component Assembler. (up to 6 Inputs) - * - * @param aInputs = ItemStack[] (not null, and respects StackSize) - * @param aFluidInput = Input of a fluid (can be null, and respects StackSize) - * @param aOutput1 = Output ItemStack (not null, and respects StackSize) - * @param aDuration = Duration (must be >= 0) - * @param aEUt = EU per tick needed for heating up (must be >= 0) - * @return true if the Recipe got added, otherwise false. - */ - boolean addComponentMakerRecipe(ItemStack[] aInputs, FluidStack aFluidInput, ItemStack aOutput1, int aDuration, - int aEUt); - boolean addMultiblockCentrifugeRecipe(ItemStack[] aInputs, FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs, ItemStack[] aOutputs, int[] aChances, int aDuration, int aEUtick, int aSpecial); 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 b5dd1ba16c..a66cce394d 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 @@ -69,7 +69,7 @@ public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool */ public Gregtech_MetaTool(final String aUnlocalized) { super(aUnlocalized); - GT_ModHandler.registerBoxableItemToToolBox(this); + GT_ModHandler.registerBoxableItemToToolBox(new ItemStack(this)); this.setCreativeTab(AddToCreativeTab.tabMachines); this.setMaxStackSize(1); sInstances.put(this.getUnlocalizedName(), this); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/GTPP_MTE_TieredMachineBlock.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/GTPP_MTE_TieredMachineBlock.java index 51596dd8cd..9a09ad6538 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/GTPP_MTE_TieredMachineBlock.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/GTPP_MTE_TieredMachineBlock.java @@ -12,9 +12,6 @@ public abstract class GTPP_MTE_TieredMachineBlock extends MetaTileEntityCustomPo */ public final byte mTier; - @Deprecated - public final String mDescription; - /** * A simple Description. */ @@ -30,7 +27,6 @@ public abstract class GTPP_MTE_TieredMachineBlock extends MetaTileEntityCustomPo super(aID, aName, aNameRegional, aInvSlotCount); mTier = (byte) Math.max(0, Math.min(aTier, 9)); mDescriptionArray = aDescription == null ? new String[0] : new String[] { aDescription }; - mDescription = mDescriptionArray.length > 0 ? mDescriptionArray[0] : ""; // must always be the last call! if (GT.isClientSide()) mTextures = getTextureSet(aTextures); else mTextures = null; @@ -41,7 +37,6 @@ public abstract class GTPP_MTE_TieredMachineBlock extends MetaTileEntityCustomPo super(aID, aName, aNameRegional, aInvSlotCount); mTier = (byte) Math.max(0, Math.min(aTier, 9)); mDescriptionArray = aDescription == null ? new String[0] : aDescription; - mDescription = mDescriptionArray.length > 0 ? mDescriptionArray[0] : ""; // must always be the last call! if (GT.isClientSide()) mTextures = getTextureSet(aTextures); @@ -53,7 +48,6 @@ public abstract class GTPP_MTE_TieredMachineBlock extends MetaTileEntityCustomPo super(aName, aInvSlotCount); mTier = (byte) aTier; mDescriptionArray = aDescription == null ? new String[0] : new String[] { aDescription }; - mDescription = mDescriptionArray.length > 0 ? mDescriptionArray[0] : ""; mTextures = aTextures; } @@ -62,7 +56,6 @@ public abstract class GTPP_MTE_TieredMachineBlock extends MetaTileEntityCustomPo super(aName, aInvSlotCount); mTier = (byte) aTier; mDescriptionArray = aDescription == null ? new String[0] : aDescription; - mDescription = mDescriptionArray.length > 0 ? mDescriptionArray[0] : ""; mTextures = aTextures; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/MetaTileEntityCustomPower.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/MetaTileEntityCustomPower.java index cc5f1eff85..79975d3ac8 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/MetaTileEntityCustomPower.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/custom/power/MetaTileEntityCustomPower.java @@ -6,6 +6,7 @@ import net.minecraft.world.World; import gregtech.api.GregTech_API; import gregtech.api.enums.GT_Values; +import gregtech.api.enums.SoundResource; import gregtech.api.util.GT_Utility; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.CustomMetaTileBase; @@ -57,14 +58,7 @@ public abstract class MetaTileEntityCustomPower extends CustomMetaTileBase { short tY = this.getBaseMetaTileEntity().getYCoord(); int tZ = this.getBaseMetaTileEntity().getZCoord(); World tWorld = this.getBaseMetaTileEntity().getWorld(); - GT_Utility.sendSoundToPlayers( - tWorld, - (String) GregTech_API.sSoundList.get(Integer.valueOf(209)), - 1.0F, - -1.0F, - tX, - tY, - tZ); + GT_Utility.sendSoundToPlayers(tWorld, SoundResource.IC2_MACHINES_MACHINE_OVERLOAD, 1.0F, -1.0F, tX, tY, tZ); tWorld.setBlock(tX, tY, tZ, Blocks.air); if (GregTech_API.sMachineExplosions) { tWorld.createExplosion( diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_AirIntake.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_AirIntake.java index 82174fad3a..7ceae20109 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_AirIntake.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_AirIntake.java @@ -17,14 +17,14 @@ public class GT_MetaTileEntity_Hatch_AirIntake extends GT_MetaTileEntity_Hatch_F super(aID, aName, aNameRegional, aTier); } - public GT_MetaTileEntity_Hatch_AirIntake(final String aName, final int aTier, final String aDescription, + public GT_MetaTileEntity_Hatch_AirIntake(final String aName, final int aTier, final String[] aDescription, final ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); } @Override public MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_Hatch_AirIntake(this.mName, this.mTier, this.mDescription, this.mTextures); + return new GT_MetaTileEntity_Hatch_AirIntake(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_AirIntake_Extreme.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_AirIntake_Extreme.java index d2760ef106..235354f396 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_AirIntake_Extreme.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_AirIntake_Extreme.java @@ -11,14 +11,18 @@ public class GT_MetaTileEntity_Hatch_AirIntake_Extreme extends GT_MetaTileEntity super(aID, aName, aNameRegional, aTier); } - public GT_MetaTileEntity_Hatch_AirIntake_Extreme(final String aName, final int aTier, final String aDescription, + public GT_MetaTileEntity_Hatch_AirIntake_Extreme(final String aName, final int aTier, final String[] aDescription, final ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); } @Override public MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_Hatch_AirIntake_Extreme(this.mName, this.mTier, this.mDescription, this.mTextures); + return new GT_MetaTileEntity_Hatch_AirIntake_Extreme( + this.mName, + this.mTier, + this.mDescriptionArray, + this.mTextures); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ControlCore.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ControlCore.java index dacde53cdb..e85cc1f6c2 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ControlCore.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ControlCore.java @@ -5,6 +5,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; +import org.apache.commons.lang3.ArrayUtils; + import com.gtnewhorizons.modularui.api.screen.ModularWindow; import com.gtnewhorizons.modularui.api.screen.UIBuildContext; @@ -48,7 +50,7 @@ public class GT_MetaTileEntity_Hatch_ControlCore extends GT_MetaTileEntity_Hatch @Override public String[] getDescription() { - return new String[] { this.mDescription, CORE.GT_Tooltip.get() }; + return ArrayUtils.add(this.mDescriptionArray, CORE.GT_Tooltip.get()); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_DynamoBuffer.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_DynamoBuffer.java index 03a188be0b..1811ee6183 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_DynamoBuffer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_DynamoBuffer.java @@ -15,16 +15,11 @@ public class GT_MetaTileEntity_Hatch_DynamoBuffer extends GT_MetaTileEntity_Hatc super(aID, aName, aNameRegional, aTier); } - public GT_MetaTileEntity_Hatch_DynamoBuffer(final String aName, final int aTier, final String aDescription, + public GT_MetaTileEntity_Hatch_DynamoBuffer(final String aName, final int aTier, final String[] aDescription, final ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); } - /* - * public GT_MetaTileEntity_Hatch_DynamoBuffer(final String aName, final int aTier, final String[] aDescription, - * final ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); } - */ - @Override public ITexture[] getTexturesActive(final ITexture aBaseTexture) { return new ITexture[] { aBaseTexture, TexturesGtBlock.OVERLAYS_ENERGY_OUT_MULTI_BUFFER[this.mTier] }; @@ -47,11 +42,7 @@ public class GT_MetaTileEntity_Hatch_DynamoBuffer extends GT_MetaTileEntity_Hatc @Override public MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return (MetaTileEntity) new GT_MetaTileEntity_Hatch_DynamoBuffer( - this.mName, - this.mTier, - this.mDescription, - this.mTextures); + return new GT_MetaTileEntity_Hatch_DynamoBuffer(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); } @Override 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 c1e0095726..6a8b3a9af6 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 @@ -20,7 +20,6 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; import gregtech.api.objects.GT_RenderedTexture; -import gregtech.api.util.GT_LanguageManager; import gregtech.api.util.GT_Recipe.GT_Recipe_Map; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; @@ -128,11 +127,6 @@ public class GT_MetaTileEntity_Hatch_ElementalDataOrbHolder extends GT_MetaTileE @Override public void onScrewdriverRightClick(ForgeDirection side, EntityPlayer aPlayer, float aX, float aY, float aZ) {} - @Override - public String trans(String aKey, String aEnglish) { - return GT_LanguageManager.addStringLocalization("Interaction_DESCRIPTION_Index_" + aKey, aEnglish, false); - } - @Override public boolean allowPullStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, ForgeDirection side, ItemStack aStack) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_FluidGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_FluidGenerator.java index cd696fbf56..34eb5ccf16 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_FluidGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_FluidGenerator.java @@ -33,7 +33,7 @@ public abstract class GT_MetaTileEntity_Hatch_FluidGenerator extends GT_MetaTile super(aID, aName, aNameRegional, aTier); } - public GT_MetaTileEntity_Hatch_FluidGenerator(final String aName, final int aTier, final String aDescription, + public GT_MetaTileEntity_Hatch_FluidGenerator(final String aName, final int aTier, final String[] aDescription, final ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); } 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 8294e5f9b7..1fca67d295 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 @@ -6,6 +6,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; +import org.apache.commons.lang3.ArrayUtils; + import com.gtnewhorizons.modularui.api.screen.ModularWindow; import com.gtnewhorizons.modularui.api.screen.UIBuildContext; @@ -31,7 +33,7 @@ public class GT_MetaTileEntity_Hatch_InputBattery extends GT_MetaTileEntity_Hatc super(aID, aName, aNameRegional, aTier, getSlots(aTier), "Chargeable Item Bus for Multiblocks"); } - public GT_MetaTileEntity_Hatch_InputBattery(String aName, int aTier, String aDescription, + public GT_MetaTileEntity_Hatch_InputBattery(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, aTier < 1 ? 1 : aTier == 1 ? 4 : aTier == 2 ? 4 : 16, aDescription, aTextures); } @@ -46,7 +48,7 @@ public class GT_MetaTileEntity_Hatch_InputBattery extends GT_MetaTileEntity_Hatc } else { mSlots = 16; } - return new String[] { this.mDescription, "Capacity: " + mSlots + " slots", CORE.GT_Tooltip.get() }; + return ArrayUtils.addAll(this.mDescriptionArray, "Capacity: " + mSlots + " slots", CORE.GT_Tooltip.get()); } @Override @@ -111,7 +113,7 @@ public class GT_MetaTileEntity_Hatch_InputBattery extends GT_MetaTileEntity_Hatc @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_Hatch_InputBattery(mName, mTier, mDescription, mTextures); + return new GT_MetaTileEntity_Hatch_InputBattery(mName, mTier, mDescriptionArray, mTextures); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Naquadah.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Naquadah.java index 9dae243444..232d8a8c55 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Naquadah.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Naquadah.java @@ -31,13 +31,6 @@ public class GT_MetaTileEntity_Hatch_Naquadah extends GT_MetaTileEntity_Hatch_In initHatch(); } - public GT_MetaTileEntity_Hatch_Naquadah(final String aName, final String aDescription, - final ITexture[][][] aTextures) { - super(aName, 6, aDescription, aTextures); - mFluidCapacity = 32000; - initHatch(); - } - public GT_MetaTileEntity_Hatch_Naquadah(final String aName, final String[] aDescription, final ITexture[][][] aTextures) { super(aName, 6, aDescription[0], aTextures); @@ -102,7 +95,7 @@ public class GT_MetaTileEntity_Hatch_Naquadah extends GT_MetaTileEntity_Hatch_In @Override public MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return (MetaTileEntity) new GT_MetaTileEntity_Hatch_Naquadah(this.mName, this.mDescription, this.mTextures); + return new GT_MetaTileEntity_Hatch_Naquadah(this.mName, this.mDescriptionArray, this.mTextures); } @Override 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 f46e9feece..502dd0ee0b 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 @@ -6,6 +6,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; +import org.apache.commons.lang3.ArrayUtils; + import com.gtnewhorizons.modularui.api.screen.ModularWindow; import com.gtnewhorizons.modularui.api.screen.UIBuildContext; @@ -27,7 +29,7 @@ public class GT_MetaTileEntity_Hatch_OutputBattery extends GT_MetaTileEntity_Hat super(aID, aName, aNameRegional, aTier, getSlots(aTier), "Dischargeable Item Bus for Multiblocks"); } - public GT_MetaTileEntity_Hatch_OutputBattery(String aName, int aTier, String aDescription, + public GT_MetaTileEntity_Hatch_OutputBattery(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, aTier < 1 ? 1 : aTier == 1 ? 4 : aTier == 2 ? 9 : 16, aDescription, aTextures); } @@ -42,7 +44,7 @@ public class GT_MetaTileEntity_Hatch_OutputBattery extends GT_MetaTileEntity_Hat } else { mSlots = 16; } - return new String[] { this.mDescription, "Capacity: " + mSlots + " slots", CORE.GT_Tooltip.get() }; + return ArrayUtils.addAll(this.mDescriptionArray, "Capacity: " + mSlots + " slots", CORE.GT_Tooltip.get()); } @Override @@ -102,7 +104,7 @@ public class GT_MetaTileEntity_Hatch_OutputBattery extends GT_MetaTileEntity_Hat @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_Hatch_OutputBattery(mName, mTier, mDescription, mTextures); + return new GT_MetaTileEntity_Hatch_OutputBattery(mName, mTier, mDescriptionArray, mTextures); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Reservoir.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Reservoir.java index eaf09ecbac..2e16d7783e 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Reservoir.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Reservoir.java @@ -17,14 +17,14 @@ public class GT_MetaTileEntity_Hatch_Reservoir extends GT_MetaTileEntity_Hatch_F super(aID, aName, aNameRegional, aTier); } - public GT_MetaTileEntity_Hatch_Reservoir(final String aName, final int aTier, final String aDescription, + public GT_MetaTileEntity_Hatch_Reservoir(final String aName, final int aTier, final String[] aDescription, final ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); } @Override public MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_Hatch_Reservoir(this.mName, this.mTier, this.mDescription, this.mTextures); + return new GT_MetaTileEntity_Hatch_Reservoir(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Steam_BusInput.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Steam_BusInput.java index 9631bbab6e..47e30ab50c 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Steam_BusInput.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Steam_BusInput.java @@ -20,7 +20,6 @@ import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.render.TextureFactory; -import gregtech.api.util.GT_LanguageManager; import gregtech.api.util.GT_Recipe.GT_Recipe_Map; import gregtech.api.util.GT_Utility; import gtPlusPlus.core.lib.CORE; @@ -148,16 +147,11 @@ public class GT_MetaTileEntity_Hatch_Steam_BusInput extends GT_MetaTileEntity_Ha disableSort = !disableSort; GT_Utility.sendChatToPlayer( aPlayer, - trans("200.1", "Automatic Item Shuffling: ") - + (disableSort ? trans("087", "Disabled") : trans("088", "Enabled"))); + GT_Utility.trans("200.1", "Automatic Item Shuffling: ") + + (disableSort ? GT_Utility.trans("087", "Disabled") : GT_Utility.trans("088", "Enabled"))); } } - @Override - public String trans(String aKey, String aEnglish) { - return GT_LanguageManager.addStringLocalization("Interaction_DESCRIPTION_Index_" + aKey, aEnglish, false); - } - @Override public boolean allowPullStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, ForgeDirection side, ItemStack aStack) { 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 34501bed7a..e8ef0a454b 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 @@ -8,12 +8,15 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; +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.SlotWidget; import gregtech.api.GregTech_API; import gregtech.api.enums.Materials; +import gregtech.api.enums.SoundResource; import gregtech.api.gui.modularui.GT_UIInfos; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; @@ -54,11 +57,14 @@ public class GT_MetaTileEntity_Hatch_Turbine extends GT_MetaTileEntity_Hatch { @Override public String[] getDescription() { - return new String[] { this.mDescription, "Right Click with a soldering iron to reset controller link", + return ArrayUtils.addAll( + this.mDescriptionArray, + "Right Click with a soldering iron to reset controller link", "Right Click with a wrench to remove turbine", "Right Click with a screwdriver for technical information", "Sneak + Right Click with a wrench to rotate", - "Sneak + Right Click with a screwdriver to disable animations", CORE.GT_Tooltip.get() }; + "Sneak + Right Click with a screwdriver to disable animations", + CORE.GT_Tooltip.get()); } @Override @@ -391,7 +397,7 @@ public class GT_MetaTileEntity_Hatch_Turbine extends GT_MetaTileEntity_Hatch { GT_Utility.sendChatToPlayer(aPlayer, tChat); GT_Utility.sendSoundToPlayers( g.getWorld(), - GregTech_API.sSoundList.get(101), + SoundResource.IC2_TOOLS_RUBBER_TRAMPOLINE, 1.0F, -1, g.getXCoord(), 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 4ab5ccece8..226086a1ff 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 @@ -31,19 +31,18 @@ public class GT_MetaTileEntity_Hatch_TurbineProvider extends GT_MetaTileEntity_H super(aID, aName, aNameRegional, aTier); } - public GT_MetaTileEntity_Hatch_TurbineProvider(String aName, int aTier, String aDescription, - ITexture[][][] aTextures) { - super(aName, aTier, aDescription, aTextures); - } - public GT_MetaTileEntity_Hatch_TurbineProvider(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { - super(aName, aTier, aDescription[0], aTextures); + super(aName, aTier, aDescription, aTextures); } @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_Hatch_TurbineProvider(this.mName, this.mTier, this.mDescription, this.mTextures); + return new GT_MetaTileEntity_Hatch_TurbineProvider( + this.mName, + this.mTier, + this.mDescriptionArray, + this.mTextures); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_SuperBus_Input.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_SuperBus_Input.java index 44174b4fc6..ac6cb4319a 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_SuperBus_Input.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_SuperBus_Input.java @@ -9,7 +9,6 @@ import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_InputBus; -import gregtech.api.util.extensions.ArrayExt; import gtPlusPlus.core.lib.CORE; public class GT_MetaTileEntity_SuperBus_Input extends GT_MetaTileEntity_Hatch_InputBus { @@ -34,11 +33,7 @@ public class GT_MetaTileEntity_SuperBus_Input extends GT_MetaTileEntity_Hatch_In @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_SuperBus_Input( - this.mName, - this.mTier, - ArrayExt.of(this.mDescription), - this.mTextures); + return new GT_MetaTileEntity_SuperBus_Input(this.mName, this.mTier, mDescriptionArray, this.mTextures); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_SuperBus_Output.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_SuperBus_Output.java index 50b18382da..e109d065bd 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_SuperBus_Output.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_SuperBus_Output.java @@ -12,7 +12,6 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_OutputBus; import gregtech.api.util.GT_Utility; -import gregtech.api.util.extensions.ArrayExt; import gtPlusPlus.core.lib.CORE; public class GT_MetaTileEntity_SuperBus_Output extends GT_MetaTileEntity_Hatch_OutputBus { @@ -42,11 +41,7 @@ public class GT_MetaTileEntity_SuperBus_Output extends GT_MetaTileEntity_Hatch_O @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_SuperBus_Output( - this.mName, - this.mTier, - ArrayExt.of(this.mDescription), - this.mTextures); + return new GT_MetaTileEntity_SuperBus_Output(this.mName, this.mTier, mDescriptionArray, this.mTextures); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntityFluid.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntityFluid.java index 79f8c4d381..67fbb22e92 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntityFluid.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntityFluid.java @@ -1,6 +1,5 @@ package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations; -import net.minecraft.util.EnumChatFormatting; import net.minecraftforge.common.util.ForgeDirection; import gregtech.api.enums.Dyes; @@ -29,7 +28,7 @@ public class GregtechMetaPipeEntityFluid extends GT_MetaPipeEntity_Fluid { public GregtechMetaPipeEntityFluid(int aID, String aName, String aNameRegional, float aThickNess, GT_Materials aMaterial, int aCapacity, int aHeatResistance, boolean aGasProof, int aFluidTypes) { - super(aID, aName, aNameRegional, aThickNess, null, aCapacity, aHeatResistance, aGasProof); + super(aID, aName, aNameRegional, aThickNess, null, aCapacity, aHeatResistance, aGasProof, aFluidTypes); this.mLastReceivedFrom = 0; this.oLastReceivedFrom = 0; this.mMaterial = aMaterial; @@ -37,7 +36,7 @@ public class GregtechMetaPipeEntityFluid extends GT_MetaPipeEntity_Fluid { public GregtechMetaPipeEntityFluid(String aName, float aThickNess, GT_Materials aMaterial, int aCapacity, int aHeatResistance, boolean aGasProof, int aFluidTypes) { - super(aName, aThickNess, null, aCapacity, aHeatResistance, aGasProof); + super(aName, aThickNess, null, aCapacity, aHeatResistance, aGasProof, aFluidTypes); this.mLastReceivedFrom = 0; this.oLastReceivedFrom = 0; this.mMaterial = aMaterial; @@ -115,17 +114,4 @@ public class GregtechMetaPipeEntityFluid extends GT_MetaPipeEntity_Fluid { aMaterial.mIconSet.mTextures[OrePrefixes.pipeHuge.mTextureIndex], Dyes.getModulation(aColorIndex, aMaterial.mRGBa)); } - - @Override - public String[] getDescription() { - return new String[] { - EnumChatFormatting.BLUE + "Fluid Capacity: %%%" - + (mCapacity * 20) - + "%%% L/sec" - + EnumChatFormatting.GRAY, - EnumChatFormatting.RED + "Heat Limit: %%%" + mHeatResistance + "%%% K" + EnumChatFormatting.GRAY, - EnumChatFormatting.DARK_GREEN + "Gas Proof: " + (this.mGasProof) + EnumChatFormatting.GRAY, - // CORE.GT_Tooltip - }; - } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaTreeFarmerStructural.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaTreeFarmerStructural.java index acd2e316aa..627ef2d65b 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaTreeFarmerStructural.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaTreeFarmerStructural.java @@ -11,23 +11,13 @@ import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.machines public class GregtechMetaTreeFarmerStructural extends GregtechMetaTreeFarmerBase { - @Override - public String[] getDescription() { - return new String[] { this.mDescription }; - } - public GregtechMetaTreeFarmerStructural(final int aID, final String aName, final String aNameRegional, final int aTier) { super(aID, aName, aNameRegional, aTier, 0, "Structural Blocks for the Tree Farmer."); } - public GregtechMetaTreeFarmerStructural(final int aID, final String aName, final String aNameRegional, - final int aTier, final int aInvSlotCount, final String aDescription) { - super(aID, aName, aNameRegional, aTier, aInvSlotCount, aDescription); - } - public GregtechMetaTreeFarmerStructural(final String aName, final int aTier, final int aInvSlotCount, - final String aDescription, final ITexture[][][] aTextures) { + final String[] aDescription, final ITexture[][][] aTextures) { super(aName, aTier, aInvSlotCount, aDescription, aTextures); } @@ -37,7 +27,7 @@ public class GregtechMetaTreeFarmerStructural extends GregtechMetaTreeFarmerBase this.mName, this.mTier, this.mInventory.length, - this.mDescription, + this.mDescriptionArray, this.mTextures); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GT_MetaTileEntity_Hatch_CustomFluidBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GT_MetaTileEntity_Hatch_CustomFluidBase.java index 69a9c67d57..1aa319652f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GT_MetaTileEntity_Hatch_CustomFluidBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GT_MetaTileEntity_Hatch_CustomFluidBase.java @@ -43,13 +43,6 @@ public class GT_MetaTileEntity_Hatch_CustomFluidBase extends GT_MetaTileEntity_H this.mFluidCapacity = aAmount; } - public GT_MetaTileEntity_Hatch_CustomFluidBase(Fluid aFluid, int aAmount, final String aName, - final String aDescription, final ITexture[][][] aTextures) { - super(aName, 6, 3, aDescription, aTextures); - this.mLockedFluid = aFluid; - this.mFluidCapacity = aAmount; - } - public GT_MetaTileEntity_Hatch_CustomFluidBase(Fluid aFluid, int aAmount, final String aName, final String[] aDescription, final ITexture[][][] aTextures) { super(aName, 6, 3, aDescription[0], aTextures); @@ -202,7 +195,7 @@ public class GT_MetaTileEntity_Hatch_CustomFluidBase extends GT_MetaTileEntity_H this.mLockedFluid, this.mFluidCapacity, this.mName, - this.mDescription, + this.mDescriptionArray, this.mTextures); } 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 34afa0b440..a9dd8d3a97 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 @@ -4,6 +4,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; +import org.apache.commons.lang3.ArrayUtils; + import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; @@ -21,7 +23,7 @@ public class GregtechMetaTransformerHiAmp extends GT_MetaTileEntity_Transformer super(aID, aName, aNameRegional, aTier, aDescription); } - public GregtechMetaTransformerHiAmp(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { + public GregtechMetaTransformerHiAmp(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); } @@ -80,13 +82,16 @@ public class GregtechMetaTransformerHiAmp extends GT_MetaTileEntity_Transformer @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GregtechMetaTransformerHiAmp(this.mName, this.mTier, this.mDescription, this.mTextures); + return new GregtechMetaTransformerHiAmp(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); } @Override public String[] getDescription() { - return new String[] { this.mDescription, "Accepts 4A and outputs 16A", - "Toggle 2A/8A half-mode with Screwdriver", CORE.GT_Tooltip.get() }; + return ArrayUtils.addAll( + this.mDescriptionArray, + "Accepts 4A and outputs 16A", + "Toggle 2A/8A half-mode with Screwdriver", + CORE.GT_Tooltip.get()); } @Override 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 11e2e8661b..6841f93ebb 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 @@ -28,6 +28,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; @@ -435,7 +436,7 @@ public abstract class GregtechMeta_MultiBlockBase