diff options
author | Glease <4586901+Glease@users.noreply.github.com> | 2022-01-23 21:28:13 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-01-23 14:28:13 +0100 |
commit | 0bb36cbb957053d4d91053d152ebddd6f0ed1009 (patch) | |
tree | 6d967b5509828981e71b20ff78b9996d8534920b /src/main/java/gregtech/common/blocks/GT_Item_Machines.java | |
parent | b5b8478b20bfd01bc20ff0a175ea53a4da4983a9 (diff) | |
download | GT5-Unofficial-0bb36cbb957053d4d91053d152ebddd6f0ed1009.tar.gz GT5-Unofficial-0bb36cbb957053d4d91053d152ebddd6f0ed1009.tar.bz2 GT5-Unofficial-0bb36cbb957053d4d91053d152ebddd6f0ed1009.zip |
AE2 Cable facade as cover (#887)
* initial work on facade covers
* fix colorMultiplier
also removed derp
* Clean up drop cover texture reset code
What was I thinking actually? Send a packet to reset client states?
* Fix cover display stack
Diffstat (limited to 'src/main/java/gregtech/common/blocks/GT_Item_Machines.java')
-rw-r--r-- | src/main/java/gregtech/common/blocks/GT_Item_Machines.java | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Machines.java b/src/main/java/gregtech/common/blocks/GT_Item_Machines.java index bcc6d7e14c..73443006b2 100644 --- a/src/main/java/gregtech/common/blocks/GT_Item_Machines.java +++ b/src/main/java/gregtech/common/blocks/GT_Item_Machines.java @@ -6,15 +6,18 @@ import gregtech.api.enums.Materials; import gregtech.api.interfaces.metatileentity.IConnectable; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; +import gregtech.api.metatileentity.CoverableGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Cable; import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Fluid; import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Frame; import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Item; +import gregtech.api.util.GT_CoverBehaviorBase; import gregtech.api.util.GT_ItsNotMyFaultException; import gregtech.api.util.GT_LanguageManager; import gregtech.api.util.GT_Log; import gregtech.api.util.GT_Utility; +import gregtech.api.util.ISerializableObject; import gregtech.common.tileentities.storage.*; import net.minecraft.block.Block; import net.minecraft.entity.Entity; @@ -144,9 +147,14 @@ public class GT_Item_Machines extends ItemBlock implements IFluidContainerItem { if (mCoverSides != null && mCoverSides.length == 6) { for (byte i = 0; i < 6; i++) { int coverId = mCoverSides[i]; - ItemStack coverStack = GT_Utility.intToStack(coverId); - if (coverStack != null) { - aList.add(String.format("Cover on %s side: %s", directionNames[i], coverStack.getDisplayName())); + if (coverId == 0) continue; + GT_CoverBehaviorBase<?> behavior = GregTech_API.getCoverBehaviorNew(coverId); + if (behavior == null || behavior == GregTech_API.sNoBehavior) continue; + if (!aNBT.hasKey(CoverableGregTechTileEntity.COVER_DATA_NBT_KEYS[i])) continue; + ISerializableObject dataObject = behavior.createDataObject(aNBT.getTag(CoverableGregTechTileEntity.COVER_DATA_NBT_KEYS[i])); + ItemStack itemStack = behavior.getDisplayStack(coverId, dataObject); + if (itemStack != null) { + aList.add(String.format("Cover on %s side: %s", directionNames[i], itemStack.getDisplayName())); } } } |