diff options
author | MuXiu1997 <49554020+MuXiu1997@users.noreply.github.com> | 2022-03-26 23:58:25 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-03-26 16:58:25 +0100 |
commit | d6f93569b6be8df76e028eb3762e3b82deb75294 (patch) | |
tree | 0af4ffe94603cffec1a689266da1dfd0add01c29 /src/main/java/gregtech/api/metatileentity/implementations | |
parent | 42538c27b6faf4392b8ada7d7fb55340e0f240b5 (diff) | |
download | GT5-Unofficial-d6f93569b6be8df76e028eb3762e3b82deb75294.tar.gz GT5-Unofficial-d6f93569b6be8df76e028eb3762e3b82deb75294.tar.bz2 GT5-Unofficial-d6f93569b6be8df76e028eb3762e3b82deb75294.zip |
Fix secondary description not written to language file (#987)
* Fix secondary description not written to language file
* Extract ISecondaryDescribable interface
* Recover isDisplaySecondaryDescription in MetaTileEntity
Diffstat (limited to 'src/main/java/gregtech/api/metatileentity/implementations')
-rw-r--r-- | src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java index a2de864f41..e2574e60dd 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java @@ -11,6 +11,7 @@ import com.gtnewhorizon.structurelib.alignment.enumerable.Rotation; import com.gtnewhorizon.structurelib.structure.IStructureDefinition; import cpw.mods.fml.common.network.NetworkRegistry; import gregtech.api.GregTech_API; +import gregtech.api.interfaces.ISecondaryDescribable; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.util.GT_Multiblock_Tooltip_Builder; import net.minecraft.entity.player.EntityPlayer; @@ -29,7 +30,7 @@ import java.util.concurrent.atomic.AtomicReferenceArray; * * @param <T> type of this */ -public abstract class GT_MetaTileEntity_EnhancedMultiBlockBase<T extends GT_MetaTileEntity_EnhancedMultiBlockBase<T>> extends GT_MetaTileEntity_MultiBlockBase implements IAlignment, IConstructable { +public abstract class GT_MetaTileEntity_EnhancedMultiBlockBase<T extends GT_MetaTileEntity_EnhancedMultiBlockBase<T>> extends GT_MetaTileEntity_MultiBlockBase implements IAlignment, IConstructable, ISecondaryDescribable { private static final AtomicReferenceArray<GT_Multiblock_Tooltip_Builder> tooltips = new AtomicReferenceArray<>(GregTech_API.METATILEENTITIES.length); private ExtendedFacing mExtendedFacing = ExtendedFacing.DEFAULT; private IAlignmentLimits mLimits = getInitialAlignmentLimits(); @@ -109,14 +110,23 @@ public abstract class GT_MetaTileEntity_EnhancedMultiBlockBase<T extends GT_Meta protected abstract GT_Multiblock_Tooltip_Builder createTooltip(); - @Override - public String[] getDescription() { - if (Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) { - return getTooltip().getStructureInformation(); - } else { - return getTooltip().getInformation(); - } - } + @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() { int tId = getBaseMetaTileEntity().getMetaTileID(); |