From 49b41b34b4569e18ba27637d23653fcddf48e401 Mon Sep 17 00:00:00 2001 From: MuXiu1997 Date: Sun, 27 Mar 2022 23:27:25 +0800 Subject: Fix secondary description --- dependencies.gradle | 2 +- .../tileentities/GTMTE_FluidMultiStorage.java | 34 +++++++++++++++------- 2 files changed, 25 insertions(+), 11 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 550fcf6042..a6a2f5a6cb 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,7 +1,7 @@ // Add your dependencies here dependencies { - compile 'com.github.GTNewHorizons:GT5-Unofficial:5.09.40.34:dev' + compile 'com.github.GTNewHorizons:GT5-Unofficial:5.09.40.40:dev' compile 'com.github.GTNewHorizons:TecTech:5.0.5.1:dev' compile 'com.github.GTNewHorizons:bartworks:0.5.39:dev' compile 'com.github.GTNewHorizons:StructureLib:1.0.16:dev' diff --git a/src/main/java/common/tileentities/GTMTE_FluidMultiStorage.java b/src/main/java/common/tileentities/GTMTE_FluidMultiStorage.java index a12f4130cb..8a3503fd0d 100644 --- a/src/main/java/common/tileentities/GTMTE_FluidMultiStorage.java +++ b/src/main/java/common/tileentities/GTMTE_FluidMultiStorage.java @@ -4,6 +4,7 @@ import common.Blocks; import common.blocks.*; import gregtech.api.enums.Textures.BlockIcons; import gregtech.api.gui.GT_GUIContainer_MultiMachine; +import gregtech.api.interfaces.ISecondaryDescribable; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; @@ -28,7 +29,7 @@ import util.Vector3ic; import java.util.ArrayList; import java.util.HashSet; -public class GTMTE_FluidMultiStorage extends GT_MetaTileEntity_MultiBlockBase { +public class GTMTE_FluidMultiStorage extends GT_MetaTileEntity_MultiBlockBase implements ISecondaryDescribable { private final static String glassNameIC2Reinforced = "blockAlloyGlass"; private final static Block CASING = Blocks.tfftCasing; @@ -59,9 +60,26 @@ public class GTMTE_FluidMultiStorage extends GT_MetaTileEntity_MultiBlockBase { return new GTMTE_FluidMultiStorage(super.mName); } - @Override - public String[] getDescription() { - final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + @Override + public String[] getDescription() { + return getCurrentDescription(); + } + + @Override + public boolean isDisplaySecondaryDescription() { + return Keyboard.isKeyDown(Keyboard.KEY_LSHIFT); + } + + public String[] getPrimaryDescription() { + return getTooltip().getInformation(); + } + + public String[] getSecondaryDescription() { + return getTooltip().getStructureInformation(); + } + + protected GT_Multiblock_Tooltip_Builder getTooltip() { + final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); tt.addMachineType("Fluid Tank") .addInfo("High-Tech fluid tank that can hold up to 25 different fluids!") .addInfo("Has 1/25th of the total capacity as capacity for each fluid.") @@ -86,12 +104,8 @@ public class GTMTE_FluidMultiStorage extends GT_MetaTileEntity_MultiBlockBase { .addStructureInfo("Use MIOH with conduits or fluid storage busses to see all fluids at once. If it's fixed.") .addStructureInfo("Ask someone else why there's 4 versions, with 2 uncraftable ones") .toolTipFinisher("KekzTech"); - if (!Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) { - return tt.getInformation(); - } else { - return tt.getStructureInformation(); - } - } + return tt; + } @Override public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, -- cgit From 0f808163a4683a4a9bff060d487750ce4f44c6b2 Mon Sep 17 00:00:00 2001 From: MuXiu1997 Date: Wed, 30 Mar 2022 16:25:40 +0800 Subject: Fix secondary description --- dependencies.gradle | 2 +- .../tileentities/GTMTE_FluidMultiStorage.java | 27 ++++------------------ 2 files changed, 5 insertions(+), 24 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 9ae7f4ed82..51b8c4a0ca 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,7 +1,7 @@ // Add your dependencies here dependencies { - compile 'com.github.GTNewHorizons:GT5-Unofficial:5.09.40.40:dev' + compile 'com.github.GTNewHorizons:GT5-Unofficial:5.09.40.41:dev' compile 'com.github.GTNewHorizons:TecTech:5.0.6:dev' compile 'com.github.GTNewHorizons:bartworks:0.5.39:dev' compile 'com.github.GTNewHorizons:StructureLib:1.0.16:dev' diff --git a/src/main/java/common/tileentities/GTMTE_FluidMultiStorage.java b/src/main/java/common/tileentities/GTMTE_FluidMultiStorage.java index 8a3503fd0d..a73943b618 100644 --- a/src/main/java/common/tileentities/GTMTE_FluidMultiStorage.java +++ b/src/main/java/common/tileentities/GTMTE_FluidMultiStorage.java @@ -4,7 +4,6 @@ import common.Blocks; import common.blocks.*; import gregtech.api.enums.Textures.BlockIcons; import gregtech.api.gui.GT_GUIContainer_MultiMachine; -import gregtech.api.interfaces.ISecondaryDescribable; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; @@ -22,15 +21,14 @@ import net.minecraft.util.ChatComponentText; import net.minecraft.util.EnumChatFormatting; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; -import org.lwjgl.input.Keyboard; import util.Vector3i; import util.Vector3ic; import java.util.ArrayList; import java.util.HashSet; -public class GTMTE_FluidMultiStorage extends GT_MetaTileEntity_MultiBlockBase implements ISecondaryDescribable { - +public class GTMTE_FluidMultiStorage extends GT_MetaTileEntity_TooltipMultiBlockBase { + private final static String glassNameIC2Reinforced = "blockAlloyGlass"; private final static Block CASING = Blocks.tfftCasing; private final static Block_TFFTStorageFieldBlockT1 STORAGE_FIELD1 = (Block_TFFTStorageFieldBlockT1) Blocks.tfftStorageField1; @@ -61,24 +59,7 @@ public class GTMTE_FluidMultiStorage extends GT_MetaTileEntity_MultiBlockBase im } @Override - public String[] getDescription() { - return getCurrentDescription(); - } - - @Override - public boolean isDisplaySecondaryDescription() { - return Keyboard.isKeyDown(Keyboard.KEY_LSHIFT); - } - - public String[] getPrimaryDescription() { - return getTooltip().getInformation(); - } - - public String[] getSecondaryDescription() { - return getTooltip().getStructureInformation(); - } - - protected GT_Multiblock_Tooltip_Builder getTooltip() { + protected GT_Multiblock_Tooltip_Builder createTooltip() { final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); tt.addMachineType("Fluid Tank") .addInfo("High-Tech fluid tank that can hold up to 25 different fluids!") @@ -545,4 +526,4 @@ public class GTMTE_FluidMultiStorage extends GT_MetaTileEntity_MultiBlockBase im public boolean explodesOnComponentBreak(ItemStack var1) { return false; } -} \ No newline at end of file +} -- cgit