diff options
| author | Martin Robertz <dream-master@gmx.net> | 2022-03-31 07:03:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-31 07:03:22 +0200 |
| commit | bfd0adad233c44469aeaf70f3ebcf43474972481 (patch) | |
| tree | 69015a74e6625928a0357a847148ee48a9ae1443 | |
| parent | 8d19a1e9c7ea092d9bc80cd3ac9b2e3d57e73447 (diff) | |
| parent | 0f808163a4683a4a9bff060d487750ce4f44c6b2 (diff) | |
| download | GT5-Unofficial-bfd0adad233c44469aeaf70f3ebcf43474972481.tar.gz GT5-Unofficial-bfd0adad233c44469aeaf70f3ebcf43474972481.tar.bz2 GT5-Unofficial-bfd0adad233c44469aeaf70f3ebcf43474972481.zip | |
Merge pull request #32 from MuXiu1997/fix-secondary-description
Fix secondary description not written to language file
| -rw-r--r-- | dependencies.gradle | 2 | ||||
| -rw-r--r-- | src/main/java/common/tileentities/GTMTE_FluidMultiStorage.java | 21 |
2 files changed, 9 insertions, 14 deletions
diff --git a/dependencies.gradle b/dependencies.gradle index cc608d87d1..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.39: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 a12f4130cb..a73943b618 100644 --- a/src/main/java/common/tileentities/GTMTE_FluidMultiStorage.java +++ b/src/main/java/common/tileentities/GTMTE_FluidMultiStorage.java @@ -21,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 { - +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; @@ -59,9 +58,9 @@ 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 + 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!") .addInfo("Has 1/25th of the total capacity as capacity for each fluid.") @@ -86,12 +85,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, @@ -531,4 +526,4 @@ public class GTMTE_FluidMultiStorage extends GT_MetaTileEntity_MultiBlockBase { public boolean explodesOnComponentBreak(ItemStack var1) { return false; } -}
\ No newline at end of file +} |