From 3033ac1f6f071dbb8d2a5227957ccc6800616baa Mon Sep 17 00:00:00 2001 From: Alkalus <3060479+draknyte1@users.noreply.github.com> Date: Wed, 26 Dec 2018 20:16:10 +0000 Subject: % Overhauled Multiblock Tooltips. % Overhauled Multiblock structural checks, they are now able to utilise my Blueprint system for much faster, cleaner checks. --- .../common/blueprint/Blueprint_Generic_3x3.java | 84 ++++++++++++++++++++++ .../machines/multi/misc/GMTE_AmazonPackager.java | 7 +- .../multi/misc/GregtechMTE_TeslaTower.java | 7 +- ...regtechMetaTileEntity_IndustrialArcFurnace.java | 17 ++--- ...regtechMetaTileEntity_IndustrialCentrifuge.java | 11 ++- .../GregtechMetaTileEntity_IndustrialCokeOven.java | 17 ++--- ...echMetaTileEntity_IndustrialCuttingMachine.java | 7 +- ...gtechMetaTileEntity_IndustrialElectrolyzer.java | 48 +++++++++++-- .../GregtechMetaTileEntity_IndustrialExtruder.java | 17 ++--- ...GregtechMetaTileEntity_IndustrialMacerator.java | 15 ++-- .../GregtechMetaTileEntity_IndustrialMixer.java | 7 +- ...gtechMetaTileEntity_IndustrialMultiMachine.java | 20 ++++-- ...regtechMetaTileEntity_IndustrialPlatePress.java | 20 +++--- .../GregtechMetaTileEntity_IndustrialSifter.java | 9 +-- ...MetaTileEntity_IndustrialThermalCentrifuge.java | 11 +-- ...techMetaTileEntity_IndustrialVacuumFreezer.java | 6 +- ...GregtechMetaTileEntity_IndustrialWashPlant.java | 7 +- .../GregtechMetaTileEntity_IndustrialWireMill.java | 7 +- .../advanced/GregtechMetaTileEntity_Adv_EBF.java | 6 +- .../GregtechMetaTileEntity_Adv_Implosion.java | 12 ++-- .../multi/production/GT4Entity_AutoCrafter.java | 6 +- .../multi/production/GT4Entity_ThermalBoiler.java | 24 +++---- .../production/GregtechMTE_FastNeutronReactor.java | 16 ++--- .../production/GregtechMTE_LargeNaqReactor.java | 16 ++--- .../production/GregtechMTE_NuclearReactor.java | 19 +++-- .../GregtechMetaTileEntityGeneratorArray.java | 19 +++-- .../production/GregtechMetaTileEntityTreeFarm.java | 18 ++--- .../GregtechMetaTileEntity_AlloyBlastSmelter.java | 13 ++-- .../GregtechMetaTileEntity_Cyclotron.java | 23 +++--- ...egtechMetaTileEntity_IndustrialFishingPond.java | 25 +++---- .../GregtechMetaTileEntity_MassFabricator.java | 29 ++++---- .../GregtechMetaTileEntity_Refinery.java | 10 +-- .../GregtechMetaTileEntity_SolarTower.java | 21 ++---- .../turbines/GT_MTE_LargeTurbine_SHSteam.java | 2 +- .../turbines/GT_MTE_LargeTurbine_Steam.java | 2 +- .../storage/GregtechMetaTileEntity_MultiTank.java | 17 ++--- ...chMetaTileEntity_PowerSubStationController.java | 21 +++--- 37 files changed, 316 insertions(+), 300 deletions(-) create mode 100644 src/Java/gtPlusPlus/xmod/gregtech/common/blueprint/Blueprint_Generic_3x3.java (limited to 'src/Java/gtPlusPlus/xmod/gregtech/common') diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blueprint/Blueprint_Generic_3x3.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blueprint/Blueprint_Generic_3x3.java new file mode 100644 index 0000000000..af7a1ad97d --- /dev/null +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blueprint/Blueprint_Generic_3x3.java @@ -0,0 +1,84 @@ +package gtPlusPlus.xmod.gregtech.common.blueprint; + +import gregtech.api.GregTech_API; +import gtPlusPlus.xmod.gregtech.api.objects.MultiblockBlueprint; +import gtPlusPlus.xmod.gregtech.api.objects.MultiblockLayer; +import net.minecraft.init.Blocks; + +public class Blueprint_Generic_3x3 extends MultiblockBlueprint { + + public Blueprint_Generic_3x3(int aTextureID) { + super(3, 3, 3, 10, aTextureID); + + // Top/Bottom + MultiblockLayer a0 = new MultiblockLayer(3, 3); + a0.addBlockForPos(GregTech_API.sBlockCasings2, 4, 0, 0, true); + a0.addBlockForPos(GregTech_API.sBlockCasings2, 4, 0, 1, true); + a0.addBlockForPos(GregTech_API.sBlockCasings2, 4, 0, 2, true); + a0.addBlockForPos(GregTech_API.sBlockCasings2, 4, 1, 0, true); + a0.addBlockForPos(GregTech_API.sBlockCasings2, 4, 1, 1, true); + a0.addBlockForPos(GregTech_API.sBlockCasings2, 4, 1, 2, true); + a0.addBlockForPos(GregTech_API.sBlockCasings2, 4, 2, 0, true); + a0.addBlockForPos(GregTech_API.sBlockCasings2, 4, 2, 1, true); + a0.addBlockForPos(GregTech_API.sBlockCasings2, 4, 2, 1, true); + a0.lock(true); + + //Layer one + MultiblockLayer a1 = new MultiblockLayer(3, 3); + a1.addBlockForPos(GregTech_API.sBlockCasings2, 4, 0, 0, true); + a1.addBlockForPos(GregTech_API.sBlockCasings2, 4, 0, 1, true); + a1.addBlockForPos(GregTech_API.sBlockCasings2, 4, 0, 2, true); + a1.addBlockForPos(GregTech_API.sBlockCasings2, 4, 1, 0, true); + a1.addBlockForPos(Blocks.air, 0, 1, 1, true); + a1.addController(1, 2); + a1.addBlockForPos(GregTech_API.sBlockCasings2, 4, 2, 0, true); + a1.addBlockForPos(GregTech_API.sBlockCasings2, 4, 2, 1, true); + a1.addBlockForPos(GregTech_API.sBlockCasings2, 4, 2, 1, true); + a1.lock(true); + + this.setLayer(a0, 0); + this.setLayer(a1, 1); + this.setLayer(a0, 2); + } + + @Override + public int getMinimumInputBus() { + return 0; + } + + @Override + public int getMinimumInputHatch() { + return 0; + } + + @Override + public int getMinimumOutputBus() { + return 0; + } + + @Override + public int getMinimumOutputHatch() { + return 0; + } + + @Override + public int getMinimumInputEnergy() { + return 1; + } + + @Override + public int getMinimumOutputEnergy() { + return 0; + } + + @Override + public int getMinimumMaintHatch() { + return 1; + } + + @Override + public int getMinimumMufflers() { + return 1; + } + +} diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GMTE_AmazonPackager.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GMTE_AmazonPackager.java index 2bda87a25e..9f23145b23 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GMTE_AmazonPackager.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GMTE_AmazonPackager.java @@ -59,7 +59,7 @@ public class GMTE_AmazonPackager extends GregtechMeta_MultiBlockBase { } @Override - public String[] getDescription() { + public String[] getTooltip() { return new String[]{ "Controller Block for the Amazon Warehouse", "This Multiblock is used for EXTREME packaging requirements", @@ -76,10 +76,7 @@ public class GMTE_AmazonPackager extends GregtechMeta_MultiBlockBase { "1x Energy Hatch (anywhere)", "1x Maintenance Hatch (anywhere)", "1x Muffler (anywhere)", - "Supply Depot. Casings for the rest (10 at least!)", - getPollutionTooltip(), - getMachineTooltip(), - CORE.GT_Tooltip + "Supply Depot. Casings for the rest (10 at least!)" }; } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GregtechMTE_TeslaTower.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GregtechMTE_TeslaTower.java index 43f317d25c..983a8204ec 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GregtechMTE_TeslaTower.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GregtechMTE_TeslaTower.java @@ -86,7 +86,7 @@ public class GregtechMTE_TeslaTower extends GregtechMeta_MultiBlockBase { } @Override - public String[] getDescription() { + public String[] getTooltip() { String casings = getCasingBlockItem().get(0).getDisplayName(); return new String[]{ "Controller Block for the Tesla Defence Tower Mk3200", @@ -98,10 +98,7 @@ public class GregtechMTE_TeslaTower extends GregtechMeta_MultiBlockBase { "1x3x1 " + casings + " pillar (Center of base)", "1x3x1 " + MaterialUtils.getMaterialName(getFrameMaterial()) + " Frame Boxes (Each pillar side and on top)", "1x Maintenance Hatch (One of base casings)", - "1x " + VN[getMinTier()] + "+ Energy Hatch (Any bottom layer casing)", - getPollutionTooltip(), - getMachineTooltip(), - CORE.GT_Tooltip}; + "1x " + VN[getMinTier()] + "+ Energy Hatch (Any bottom layer casing)"}; } private final void initFields() { diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialArcFurnace.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialArcFurnace.java index b2b4cdfda5..8b1a829061 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialArcFurnace.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialArcFurnace.java @@ -1,10 +1,5 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing; -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumChatFormatting; import gregtech.api.GregTech_API; import gregtech.api.enums.TAE; import gregtech.api.enums.Textures; @@ -16,12 +11,16 @@ import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.block.ModBlocks; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.PlayerUtils; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumChatFormatting; public class GregtechMetaTileEntity_IndustrialArcFurnace extends GregtechMeta_MultiBlockBase { @@ -53,7 +52,7 @@ extends GregtechMeta_MultiBlockBase { } @Override - public String[] getDescription() { + public String[] getTooltip() { if (mCasingName.toLowerCase().contains(".name")) { mCasingName = ItemUtils.getLocalizedNameOfBlock(ModBlocks.blockCasings4Misc, 3); @@ -75,9 +74,7 @@ extends GregtechMeta_MultiBlockBase { "1x Muffler Hatch (anywhere)", "1x Maintenance Hatch (Back Center)", mCasingName+"s for the rest", - getPollutionTooltip(), - getMachineTooltip(), - CORE.GT_Tooltip}; + }; } @Override diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCentrifuge.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCentrifuge.java index 9a23567022..e59b7f57e9 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCentrifuge.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCentrifuge.java @@ -8,10 +8,11 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Maintenance; import gregtech.api.objects.GT_RenderedTexture; -import gregtech.api.util.*; +import gregtech.api.util.GT_Recipe; +import gregtech.api.util.GT_Utility; +import gregtech.api.util.Recipe_GT; import gtPlusPlus.api.objects.Logger; 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; @@ -53,7 +54,7 @@ extends GregtechMeta_MultiBlockBase { } @Override - public String[] getDescription() { + public String[] getTooltip() { return new String[]{ "Controller Block for the Industrial Centrifuge", "125% faster than using single block machines of the same voltage", @@ -70,9 +71,7 @@ extends GregtechMeta_MultiBlockBase { "1x Muffler Hatch", "1x Energy Hatch [Blue]", "Centrifuge Casings for the rest (10 at least)", - getPollutionTooltip(), - getMachineTooltip(), - CORE.GT_Tooltip}; + }; } @Override diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCokeOven.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCokeOven.java index 9d3b3bbe18..00a576f8c7 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCokeOven.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCokeOven.java @@ -1,26 +1,19 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing; -import gregtech.api.util.GT_Utility; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.item.ItemStack; - import gregtech.api.GregTech_API; import gregtech.api.enums.TAE; import gregtech.api.enums.Textures; -import gregtech.api.gui.GT_GUIContainer_MultiMachine; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_Recipe; +import gregtech.api.util.GT_Utility; import gregtech.api.util.Recipe_GT; - import gtPlusPlus.core.block.ModBlocks; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.Utils; -import gtPlusPlus.xmod.gregtech.api.gui.GUI_MultiMachine; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; +import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; public class GregtechMetaTileEntity_IndustrialCokeOven @@ -46,7 +39,7 @@ extends GregtechMeta_MultiBlockBase { } @Override - public String[] getDescription() { + public String[] getTooltip() { return new String[]{"Processes Logs and Coal into Charcoal and Coal Coke.", "Controller Block for the Industrial Coke Oven", "Gain 4% speed bonus per voltage tier increased", @@ -63,9 +56,7 @@ extends GregtechMeta_MultiBlockBase { "1x Maintenance Hatch (one of bottom)", "1x Muffler Hatch (top middle)", "Structural Coke Oven Casings for the rest", - getPollutionTooltip(), - getMachineTooltip(), - CORE.GT_Tooltip}; + }; } @Override diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCuttingMachine.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCuttingMachine.java index 3d12a1d7c7..dc7cc659f9 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCuttingMachine.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCuttingMachine.java @@ -40,7 +40,7 @@ extends GregtechMeta_MultiBlockBase { } @Override - public String[] getDescription() { + public String[] getTooltip() { return new String[]{ "Controller Block for the Industrial Cutting Factory", "200% faster than using single block machines of the same voltage", @@ -53,10 +53,7 @@ extends GregtechMeta_MultiBlockBase { "1x Input Hatch (top or bottom centered)", "1x Muffler Hatch (top)", "1x Maintenance Hatch (back centered)", - "Cutting Factory Frames for the rest (26 at least!)", - getPollutionTooltip(), - getMachineTooltip(), - CORE.GT_Tooltip + "Cutting Factory Frames for the rest (26 at least!)" }; } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialElectrolyzer.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialElectrolyzer.java index 0d676a3bfe..dd403207b7 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialElectrolyzer.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialElectrolyzer.java @@ -9,9 +9,9 @@ import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; import gtPlusPlus.core.block.ModBlocks; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; +import gtPlusPlus.xmod.gregtech.common.blueprint.Blueprint_Generic_3x3; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; @@ -37,7 +37,7 @@ extends GregtechMeta_MultiBlockBase { } @Override - public String[] getDescription() { + public String[] getTooltip() { return new String[]{"Controller Block for the Industrial Electrolyzer", "180% faster than using single block machines of the same voltage", "Only uses 90% of the eu/t normally required", @@ -51,10 +51,8 @@ extends GregtechMeta_MultiBlockBase { "1x Energy Hatch (anywhere)", "1x Maintenance Hatch (anywhere)", "1x Muffler (anywhere)", - "Electrolyzer Casings for the rest (10 at least!)", - getPollutionTooltip(), - getMachineTooltip(), - CORE.GT_Tooltip}; + "Electrolyzer Casings for the rest (10 at least!)" + }; } @Override @@ -90,8 +88,38 @@ extends GregtechMeta_MultiBlockBase { return checkRecipeGeneric(2* GT_Utility.getTier(this.getMaxInputVoltage()), 90, 180); } + private class Blueprint_Electrolyzer extends Blueprint_Generic_3x3 { + + public Blueprint_Electrolyzer() { + super(TAE.GTPP_INDEX(5)); + } + + @Override + public int getMinimumInputBus() { + return 0; + } + + @Override + public int getMinimumInputHatch() { + return 0; + } + + @Override + public int getMinimumOutputBus() { + return 0; + } + + @Override + public int getMinimumOutputHatch() { + return 0; + } + + } + + public Blueprint_Electrolyzer mBluePrint; + @Override - public boolean checkMachine(final IGregTechTileEntity aBaseMetaTileEntity, final ItemStack aStack) { + public boolean checkMachine(final IGregTechTileEntity aBaseMetaTileEntity, final ItemStack aStack) {/* final int xDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetX; final int zDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ; if (!aBaseMetaTileEntity.getAirOffset(xDir, 0, zDir)) { @@ -116,6 +144,12 @@ extends GregtechMeta_MultiBlockBase { } } return tAmount >= 10; + */ + + if (mBluePrint == null) { + mBluePrint = new Blueprint_Electrolyzer(); + } + return mBluePrint.checkMachine(aBaseMetaTileEntity); } @Override diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialExtruder.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialExtruder.java index ffbcfd36db..8fc7d369bd 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialExtruder.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialExtruder.java @@ -2,10 +2,6 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing; import java.util.ArrayList; -import gregtech.api.util.GT_Utility; -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; - import gregtech.api.GregTech_API; import gregtech.api.enums.TAE; import gregtech.api.enums.Textures; @@ -17,12 +13,13 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Maintenance; import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_Recipe; - +import gregtech.api.util.GT_Utility; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.block.ModBlocks; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; +import net.minecraft.block.Block; +import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; public class GregtechMetaTileEntity_IndustrialExtruder @@ -47,7 +44,7 @@ extends GregtechMeta_MultiBlockBase { } @Override - public String[] getDescription() { + public String[] getTooltip() { return new String[]{"Controller Block for the Material Extruder", "250% faster than using single block machines of the same voltage", "Processes four items per voltage tier", @@ -62,10 +59,8 @@ extends GregtechMeta_MultiBlockBase { "1x Energy Hatch (anywhere)", "1x Muffler Hatch (anywhere)", "1x Maintenance Hatch (Back Center)", - "Inconel Reinforced Casings for the rest (28 at least!)", - getPollutionTooltip(), - getMachineTooltip(), - CORE.GT_Tooltip}; + "Inconel Reinforced Casings for the rest (28 at least!)" + }; } @Override diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMacerator.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMacerator.java index cab062b7e0..e2a336f3d4 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMacerator.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMacerator.java @@ -2,9 +2,6 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing; import java.util.Random; -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; - import gregtech.api.GregTech_API; import gregtech.api.enums.TAE; import gregtech.api.enums.Textures; @@ -15,12 +12,12 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Outpu import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; - import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.block.ModBlocks; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; +import net.minecraft.block.Block; +import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; public class GregtechMetaTileEntity_IndustrialMacerator @@ -46,7 +43,7 @@ extends GregtechMeta_MultiBlockBase { } @Override - public String[] getDescription() { + public String[] getTooltip() { return new String[]{ "Controller Block for the Industrial Maceration Stack", "60% faster than using single block machines of the same voltage", @@ -61,10 +58,8 @@ extends GregtechMeta_MultiBlockBase { "1x Maintenance Hatch (Any casing)", "1x Energy Hatch (Any casing)", "1x Muffler Hatch (Any casing)", - "Maceration Stack Casings for the rest (26 at least!)", - getPollutionTooltip(), - getMachineTooltip(), - CORE.GT_Tooltip}; + "Maceration Stack Casings for the rest (26 at least!)" + }; } @Override diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMixer.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMixer.java index 1492175ffc..1891da25a4 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMixer.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMixer.java @@ -13,7 +13,6 @@ import gregtech.api.objects.GT_RenderedTexture; 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.minecraft.ItemUtils; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; @@ -54,7 +53,7 @@ extends GregtechMeta_MultiBlockBase { } @Override - public String[] getDescription() { + public String[] getTooltip() { if (mCasingName.toLowerCase().contains(".name")) { mCasingName = ItemUtils.getLocalizedNameOfBlock(ModBlocks.blockCasings3Misc, 2); @@ -76,9 +75,7 @@ extends GregtechMeta_MultiBlockBase { "1x Muffler Hatch (anywhere)", mCasingName+"s for the rest (16 at least!)", mCasingName2+"s for the internal blocks (2)", - getPollutionTooltip(), - getMachineTooltip(), - CORE.GT_Tooltip}; + }; } @Override diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java index cf780cbedf..c63b742718 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java @@ -7,19 +7,27 @@ import java.util.List; import org.apache.commons.lang3.ArrayUtils; -import gregtech.api.enums.*; +import gregtech.api.enums.Element; +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.TAE; +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_Hatch_InputBus; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_OutputBus; import gregtech.api.objects.GT_RenderedTexture; -import gregtech.api.util.*; +import gregtech.api.util.GT_LanguageManager; +import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.util.GT_Recipe; +import gregtech.api.util.GT_Utility; import gregtech.common.items.behaviors.Behaviour_DataOrb; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.core.block.ModBlocks; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.PlayerUtils; @@ -79,7 +87,7 @@ extends GregtechMeta_MultiBlockBase { @Override - public String[] getDescription() { + public String[] getTooltip() { String[] aBuiltStrings = new String[3]; aBuiltStrings[0] = aToolTipNames[0] + ", " + aToolTipNames[1] + ", " + aToolTipNames[2]; aBuiltStrings[1] = aToolTipNames[3] + ", " + aToolTipNames[4] + ", " + aToolTipNames[5]; @@ -92,11 +100,9 @@ extends GregtechMeta_MultiBlockBase { "Controller (front centered)", "6 Multi-Use casings required (Minimum)", "Read Multi-Machine Manual for extra information", - getPollutionTooltip(), "Machine Type: [A] - " + EnumChatFormatting.YELLOW + aBuiltStrings[0] + EnumChatFormatting.RESET, "Machine Type: [B] - " + EnumChatFormatting.YELLOW + aBuiltStrings[1] + EnumChatFormatting.RESET, - "Machine Type: [C] - " + EnumChatFormatting.YELLOW + aBuiltStrings[2] + EnumChatFormatting.RESET, - CORE.GT_Tooltip}; + "Machine Type: [C] - " + EnumChatFormatting.YELLOW + aBuiltStrings[2] + EnumChatFormatting.RESET}; } @Override diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialPlatePress.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialPlatePress.java index 36a880633f..751b74376b 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialPlatePress.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialPlatePress.java @@ -2,11 +2,6 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing; import java.util.ArrayList; -import gregtech.api.util.GT_Utility; -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import gregtech.api.GregTech_API; import gregtech.api.enums.TAE; import gregtech.api.enums.Textures; @@ -16,13 +11,16 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_InputBus; import gregtech.api.objects.GT_RenderedTexture; 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; +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; @@ -49,7 +47,7 @@ public class GregtechMetaTileEntity_IndustrialPlatePress extends GregtechMeta_Mu } @Override - public String[] getDescription() { + public String[] getTooltip() { return new String[]{"Controller Block for Advanced Bending & Forming", "Can be configured with a screwdriver to activate Forming Press Mode", "500% faster than using single block machines of the same voltage", @@ -63,10 +61,8 @@ public class GregtechMetaTileEntity_IndustrialPlatePress extends GregtechMeta_Mu "1x Energy Hatch (anywhere)", "1x Maintenance Hatch (anywhere)", "1x Muffler Hatch (anywhere)", - "Material Press Machine Casings for the rest (12 at least!)", - getPollutionTooltip(), - getMachineTooltip(), - CORE.GT_Tooltip}; + "Material Press Machine Casings for the rest (12 at least!)" + }; } @Override diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialSifter.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialSifter.java index f476ad520a..fec12c79e2 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialSifter.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialSifter.java @@ -14,7 +14,6 @@ import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.block.ModBlocks; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; import net.minecraft.block.Block; @@ -44,7 +43,7 @@ extends GregtechMeta_MultiBlockBase { } @Override - public String[] getDescription() { + public String[] getTooltip() { return new String[]{ "Controller Block for the Industrial Sifter", "400% faster than single-block machines of the same voltage", @@ -59,10 +58,8 @@ extends GregtechMeta_MultiBlockBase { "1x Muffler Hatch (Any top or bottom edge casing)", "1x Energy Hatch (Any top or bottom edge casing)", "18x Sieve Grate (Top and Middle 3x3)", - "Sieve Casings for the rest (35 min)", - getPollutionTooltip(), - getMachineTooltip(), - CORE.GT_Tooltip}; + "Sieve Casings for the rest (35 min)" + }; } @Override diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialThermalCentrifuge.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialThermalCentrifuge.java index 685efe5c7a..52a6ad0172 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialThermalCentrifuge.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialThermalCentrifuge.java @@ -1,8 +1,5 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing; -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; - import gregtech.api.GregTech_API; import gregtech.api.enums.TAE; import gregtech.api.enums.Textures; @@ -14,9 +11,10 @@ import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.block.ModBlocks; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; +import net.minecraft.block.Block; +import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; public class GregtechMetaTileEntity_IndustrialThermalCentrifuge @@ -40,7 +38,7 @@ extends GregtechMeta_MultiBlockBase { } @Override - public String[] getDescription() { + public String[] getTooltip() { return new String[]{ "Controller Block for the Industrial Thermal Centrifuge", "150% faster than using single block machines of the same voltage", @@ -54,9 +52,6 @@ extends GregtechMeta_MultiBlockBase { "1x Energy Hatch (Any bottom layer casing)", "Thermal processing Casings for the rest (8 at least!)", "Noise Hazard Sign Blocks also count as valid casings", - getPollutionTooltip(), - getMachineTooltip(), - CORE.GT_Tooltip }; } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialVacuumFreezer.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialVacuumFreezer.java index 0bf9ce5a5d..189c9a62aa 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialVacuumFreezer.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialVacuumFreezer.java @@ -54,7 +54,7 @@ public class GregtechMetaTileEntity_IndustrialVacuumFreezer extends GregtechMeta return "Vacuum Freezer"; } - public String[] getDescription() { + public String[] getTooltip() { if (mCasingName.toLowerCase().contains(".name")) { mCasingName = ItemUtils.getLocalizedNameOfBlock(ModBlocks.blockCasings3Misc, 10); @@ -76,9 +76,7 @@ public class GregtechMetaTileEntity_IndustrialVacuumFreezer extends GregtechMeta "1x Maintenance Hatch (Any casing)", "1x Energy Hatch (Any casing)", mCasingName+"s for the rest (10 at least!)", - getPollutionTooltip(), - getMachineTooltip(), - CORE.GT_Tooltip}; + }; } public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing, diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWashPlant.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWashPlant.java index c6ba185e77..9218334b8a 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWashPlant.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWashPlant.java @@ -50,7 +50,7 @@ extends GregtechMeta_MultiBlockBase { } @Override - public String[] getDescription() { + public String[] getTooltip() { return new String[]{ "Controller Block for the Industrial Ore Washing Plant", "Can be configured with a screwdriver to also process Chemical Bathing", @@ -67,10 +67,7 @@ extends GregtechMeta_MultiBlockBase { "1x Muffler Hatch (Any casing)", "1x Maintenance Hatch (Any casing)", "1x Energy Hatch (Any casing)", - "Wash Plant Casings for the rest", - getPollutionTooltip(), - getMachineTooltip(), - CORE.GT_Tooltip + "Wash Plant Casings for the rest" }; } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWireMill.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWireMill.java index a380bf0a26..bca5eebf0a 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWireMill.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWireMill.java @@ -41,7 +41,7 @@ extends GregtechMeta_MultiBlockBase { } @Override - public String[] getDescription() { + public String[] getTooltip() { return new String[]{ "Controller Block for the Industrial Wire Factory", "200% faster than using single block machines of the same voltage", @@ -53,10 +53,7 @@ extends GregtechMeta_MultiBlockBase { "1x Energy Hatch (top or bottom centered)", "1x Muffler Hatch (top or bottom centered)", "1x Maintenance Hatch (back centered)", - "Wire Factory Casings for the rest (32 at least!)", - getPollutionTooltip(), - getMachineTooltip(), - CORE.GT_Tooltip + "Wire Factory Casings for the rest (32 at least!)" }; } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java index 9b099744a5..1c6d149c0e 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java @@ -90,7 +90,7 @@ public class GregtechMetaTileEntity_Adv_EBF extends GregtechMeta_MultiBlockBase return new GregtechMetaTileEntity_Adv_EBF(this.mName); } - public String[] getDescription() { + public String[] getTooltip() { if (mCasingName.toLowerCase().contains(".name")) { mCasingName = ItemUtils.getLocalizedNameOfBlock(ModBlocks.blockCasings3Misc, 11); @@ -114,8 +114,8 @@ public class GregtechMetaTileEntity_Adv_EBF extends GregtechMeta_MultiBlockBase " Recovery scales with Muffler Hatch tier", mCasingName + "s for the rest", "Each 900K over the min. Heat Capacity grants 5% speedup (multiplicatively)", "Each 1800K over the min. Heat Capacity allows for one upgraded overclock", - "Upgraded overclocks reduce recipe time to 25% and increase EU/t to 400%", getPollutionTooltip(), - getMachineTooltip(), CORE.GT_Tooltip }; + "Upgraded overclocks reduce recipe time to 25% and increase EU/t to 400%" + }; } public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Implosion.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Implosion.java index be0747803c..9c37c9384c 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Implosion.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Implosion.java @@ -41,7 +41,7 @@ extends GregtechMeta_MultiBlockBase { return "Implosion Compressor"; } - public String[] getDescription() { + public String[] getTooltip() { if (mCasingName.contains("gt.blockcasings")) { mCasingName = ItemList.Casing_RobustTungstenSteel.get(1).getDisplayName(); } @@ -54,10 +54,8 @@ extends GregtechMeta_MultiBlockBase { "1x Maintenance Hatch (Any casing)", "1x Muffler Hatch (Any casing)", "1x Energy Hatch (Any casing)", - mCasingName+"s for the rest (16 at least!)", - getPollutionTooltip(), - getMachineTooltip(), - CORE.GT_Tooltip}; + mCasingName+"s for the rest (16 at least!)" + }; } public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) { @@ -66,7 +64,7 @@ extends GregtechMeta_MultiBlockBase { } return new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[48]}; } - + @Override public boolean hasSlotInGUI() { return true; @@ -76,7 +74,7 @@ extends GregtechMeta_MultiBlockBase { public String getCustomGUIResourceName() { return "ImplosionCompressor"; } - + @Override public boolean requiresVanillaGtGUI() { return true; diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_AutoCrafter.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_AutoCrafter.java index bb6a3c9631..c0cf169f04 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_AutoCrafter.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_AutoCrafter.java @@ -125,7 +125,7 @@ public class GT4Entity_AutoCrafter extends GregtechMeta_MultiBlockBase { } @Override - public String[] getDescription() { + public String[] getTooltip() { return new String[] { "Highly Advanced Autocrafter", "Right Click with a Screwdriver to change mode", "This Machine Can Autocraft, Assemble, Disassemble or Circuit Assemble", "200% faster than using single block machines of the same voltage", @@ -135,8 +135,8 @@ public class GT4Entity_AutoCrafter extends GregtechMeta_MultiBlockBase { "Size: 3x3x3 (Hollow)", "1x Input Bus", "1x Input Hatch", "1x Output Bus", "1x Output Hatch", "1x Muffler Hatch", "1x Maintenance Hatch", "1x Energy Hatch", "Hatches & Busses can be placed anywhere", "Rest is Autocrafter Frame", - "--------------------------------------", getPollutionTooltip(), - getMachineTooltip(), CORE.GT_Tooltip }; + "--------------------------------------", + }; } @Override diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_ThermalBoiler.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_ThermalBoiler.java index df775bb64c..45a8740ad1 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_ThermalBoiler.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_ThermalBoiler.java @@ -1,21 +1,23 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; - -import gregtech.api.enums.*; +import gregtech.api.enums.ItemList; +import gregtech.api.enums.Materials; +import gregtech.api.enums.TAE; +import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase; import gregtech.api.objects.GT_RenderedTexture; -import gregtech.api.util.*; - +import gregtech.api.util.GT_ModHandler; +import gregtech.api.util.GT_Recipe; +import gregtech.api.util.GT_Utility; +import gregtech.api.util.Recipe_GT; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.item.general.ItemLavaFilter; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; @@ -176,7 +178,7 @@ extends GregtechMeta_MultiBlockBase } @Override - public String[] getDescription() + public String[] getTooltip() { return new String[]{ "Thermal Boiler Controller", @@ -189,9 +191,7 @@ extends GregtechMeta_MultiBlockBase "Thermal Containment Casings for the rest", "Use 2 Output Hatches by default, change one to a Bus if filtering Lava", "Consult user manual for more information", - getPollutionTooltip(), - getMachineTooltip(), - CORE.GT_Tooltip}; + }; } @Override diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_FastNeutronReactor.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_FastNeutronReactor.java index b93943960a..b8d4ba3092 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_FastNeutronReactor.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_FastNeutronReactor.java @@ -1,18 +1,16 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production; -import net.minecraft.item.ItemStack; - -import gregtech.api.enums.*; +import gregtech.api.enums.TAE; +import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input; import gregtech.api.objects.GT_RenderedTexture; -import gregtech.api.util.*; - -import gtPlusPlus.core.lib.CORE; +import gregtech.api.util.GT_ModHandler; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; +import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; public class GregtechMTE_FastNeutronReactor @@ -177,7 +175,7 @@ extends GregtechMeta_MultiBlockBase } @Override - public String[] getDescription() + public String[] getTooltip() { return new String[]{ "Fukushima-Daiichi Reactor No. 6", @@ -186,9 +184,7 @@ extends GregtechMeta_MultiBlockBase "Harness the power of Nuclear Fission", "------------------------------------------", "Consult user manual for more information", - getPollutionTooltip(), - getMachineTooltip(), - CORE.GT_Tooltip}; + }; } @Override diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_LargeNaqReactor.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_LargeNaqReactor.java index 2019e26782..24a5c9cea7 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_LargeNaqReactor.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_LargeNaqReactor.java @@ -1,5 +1,8 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production; +import java.lang.reflect.InvocationTargetException; +import java.util.ArrayList; + import gregtech.api.GregTech_API; import gregtech.api.enums.TAE; import gregtech.api.enums.Textures.BlockIcons; @@ -9,19 +12,14 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; import gregtech.api.objects.GT_RenderedTexture; +import gregtech.api.util.GT_Recipe.GT_Recipe_Map; import gregtech.api.util.GT_Utility; import gtPlusPlus.core.block.ModBlocks; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Naquadah; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.advanced.GregtechMetaTileEntity_Adv_Fusion_MK4; -import gregtech.api.util.GT_Recipe.GT_Recipe_Map; - -import java.lang.reflect.InvocationTargetException; -import java.util.ArrayList; - import net.minecraft.block.Block; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; @@ -51,7 +49,7 @@ public class GregtechMTE_LargeNaqReactor extends GregtechMeta_MultiBlockBase { return new GregtechMTE_LargeNaqReactor(this.mName); } - public String[] getDescription() { + public String[] getTooltip() { if (mCasingName[0].toLowerCase().contains(".name")) { mCasingName[0] = ItemUtils.getLocalizedNameOfBlock(getCasing(4), 0); } @@ -85,9 +83,7 @@ public class GregtechMTE_LargeNaqReactor extends GregtechMeta_MultiBlockBase { "1x " + mHatchName + " (Any bottom layer casing)", "1x " + "Maintenance Hatch" + " (Any bottom layer side casing)", "1x " + "Energy Hatch" + " (Any top layer casing)", - getPollutionTooltip(), - getMachineTooltip(), - CORE.GT_Tooltip + }; } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java index c58793ffa4..fde2347c87 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java @@ -3,9 +3,6 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production; import java.util.ArrayList; import java.util.Collection; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.item.ItemStack; - import gregtech.api.enums.Materials; import gregtech.api.enums.TAE; import gregtech.api.enums.Textures; @@ -13,22 +10,24 @@ import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.implementations.*; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Dynamo; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Maintenance; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Muffler; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output; import gregtech.api.objects.GT_ItemStack; import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_Recipe; import gregtech.api.util.Recipe_GT; - import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.block.ModBlocks; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.material.ELEMENT; import gtPlusPlus.core.material.nuclear.FLUORIDES; import gtPlusPlus.core.material.nuclear.NUCLIDE; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.FluidUtils; -import gtPlusPlus.xmod.gregtech.api.gui.GUI_MultiMachine; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; +import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; @@ -60,7 +59,7 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase { } @Override - public String[] getDescription() { + public String[] getTooltip() { return new String[]{ "Controller Block for the Liquid Fluoride Thorium Reactor.", "Produces Heat & Energy from Radioactive Beta Decay.", @@ -78,9 +77,7 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase { "Input Fluorine and Helium for bonus byproducts", "Input Li2BeF4 and a molten salt as fuel.", "LiFBeF2ThF4UF4, LiFBeF2ZrF4UF4 or LiFBeF2ZrF4U235", - getPollutionTooltip(), - getMachineTooltip(), - CORE.GT_Tooltip}; + }; } @Override diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityGeneratorArray.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityGeneratorArray.java index 6e39cf2c9e..33f1b9dad7 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityGeneratorArray.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityGeneratorArray.java @@ -1,24 +1,23 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production; -import java.util.*; - -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.item.ItemStack; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.List; import gregtech.api.GregTech_API; import gregtech.api.enums.Textures; -import gregtech.api.gui.GT_GUIContainer_MultiMachine; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_Recipe; import gregtech.api.util.Recipe_GT.Gregtech_Recipe_Map; - import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; +import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; @@ -43,7 +42,7 @@ public class GregtechMetaTileEntityGeneratorArray extends GregtechMeta_MultiBloc } @Override - public String[] getDescription() { + public String[] getTooltip() { return new String[]{ "Controller Block for the Generator Array", "Runs supplied generators as if placed in the world", @@ -54,9 +53,7 @@ public class GregtechMetaTileEntityGeneratorArray extends GregtechMeta_MultiBloc "1x Energy Hatch (Any casing)", "Robust Tungstensteel Machine Casings for the rest (16 at least!)", "Place up to 16 Single Block GT Generators into the Controller Inventory", - getPollutionTooltip(), - getMachineTooltip(), - CORE.GT_Tooltip}; + }; } @Override diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java index 9c7e8f424a..af106951cf 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java @@ -1,11 +1,5 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production; -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; - import gregtech.api.GregTech_API; import gregtech.api.enums.GT_Values; import gregtech.api.enums.TAE; @@ -16,17 +10,20 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energ import gregtech.api.objects.GT_ItemStack; import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_Recipe; - import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.minecraft.BlockPos; import gtPlusPlus.core.block.ModBlocks; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.slots.SlotBuzzSaw.SAWTOOL; import gtPlusPlus.xmod.gregtech.api.gui.CONTAINER_TreeFarmer; import gtPlusPlus.xmod.gregtech.api.gui.GUI_TreeFarmer; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; import gtPlusPlus.xmod.gregtech.common.helpers.TreeFarmHelper; +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase { @@ -54,7 +51,7 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase } @Override - public String[] getDescription() { + public String[] getTooltip() { return new String[]{ "THIS MULTIBLOCK IS DISABLED - DO NOT BUILD", "Controller Block for the Tree Farmer", @@ -69,9 +66,6 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase "1x Input Hatch (anywhere)", "1x Energy Hatch (anywhere)", "1x Maintenance Hatch (anywhere)", - getPollutionTooltip(), - getMachineTooltip(), - CORE.GT_Tooltip }; } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_AlloyBlastSmelter.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_AlloyBlastSmelter.java index d0d4f22045..1a78824925 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_AlloyBlastSmelter.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_AlloyBlastSmelter.java @@ -3,9 +3,6 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production; import java.util.ArrayList; import java.util.Arrays; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - import gregtech.api.GregTech_API; import gregtech.api.enums.TAE; import gregtech.api.enums.Textures; @@ -16,12 +13,12 @@ import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; import gregtech.api.util.Recipe_GT; - import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.block.ModBlocks; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; @@ -52,7 +49,7 @@ extends GregtechMeta_MultiBlockBase { } @Override - public String[] getDescription() { + public String[] getTooltip() { return new String[]{ "Controller Block for the Alloy Blast Smelter", //Outputs 144mb fluid for every inputStack.stackSize; Time to use those hot metals. "20% Faster than the Electric Blast Furnace", @@ -68,9 +65,7 @@ extends GregtechMeta_MultiBlockBase { "1x Muffler Hatch (top middle)", "1x Fluid Input Hatch (optional, top layer)", "Blast Smelter Casings for the rest", - getPollutionTooltip(), - getMachineTooltip(), - CORE.GT_Tooltip}; + }; } @Override diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Cyclotron.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Cyclotron.java index 1f25e768f0..2ef681de33 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Cyclotron.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Cyclotron.java @@ -2,11 +2,6 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production; import java.util.ArrayList; -import net.minecraft.block.Block; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; - import gregtech.GT_Mod; import gregtech.api.enums.Dyes; import gregtech.api.enums.TAE; @@ -16,19 +11,25 @@ import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.implementations.*; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Maintenance; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Muffler; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output; import gregtech.api.objects.GT_ItemStack; import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; import gregtech.api.util.Recipe_GT; import gregtech.common.gui.GT_GUIContainer_FusionReactor; - import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.block.ModBlocks; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; +import net.minecraft.block.Block; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; @@ -257,7 +258,7 @@ public class GregtechMetaTileEntity_Cyclotron extends GregtechMeta_MultiBlockBas } @Override - public String[] getDescription() { + public String[] getTooltip() { return new String[]{ "Super Magnetic Speed Shooter", "------------------------------------------------------------", @@ -272,9 +273,7 @@ public class GregtechMetaTileEntity_Cyclotron extends GregtechMeta_MultiBlockBas "1-16 Output Busses", "1-16 Energy Hatches", "All Hatches must be IV or better", - getPollutionTooltip(), - getMachineTooltip(), - CORE.GT_Tooltip}; + }; } @Override diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialFishingPond.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialFishingPond.java index 871cab0f85..2cf8d793f8 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialFishingPond.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialFishingPond.java @@ -6,16 +6,8 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.Map; -import net.minecraft.block.Block; -import net.minecraft.entity.player.Invento