Fix part sharing tooltip missing on some parts (#2375)

GregTechCEu · Feb 5, 2024 · 0bee7e1 · 0bee7e1
1 parent 72954c4
commit 0bee7e1
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 1 deletion.
diff --git a/...gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityComputationHatch.java b/...gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityComputationHatch.java
@@ -13,10 +13,13 @@
 import gregtech.client.renderer.texture.Textures;
 import gregtech.common.pipelike.optical.tile.TileEntityOpticalPipe;
 
+import net.minecraft.client.resources.I18n;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.ResourceLocation;
+import net.minecraft.world.World;
 import net.minecraftforge.common.capabilities.Capability;
 
 import codechicken.lib.render.CCRenderState;
@@ -166,4 +169,11 @@ public <T> T getCapability(Capability<T> capability, EnumFacing side) {
         }
         return super.getCapability(capability, side);
     }
+
+    @Override
+    public void addInformation(ItemStack stack, @Nullable World world, @NotNull List<String> tooltip,
+                               boolean advanced) {
+        super.addInformation(stack, world, tooltip, advanced);
+        tooltip.add(I18n.format("gregtech.universal.disabled"));
+    }
 }
diff --git a/.../gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityDataAccessHatch.java b/.../gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityDataAccessHatch.java
@@ -175,6 +175,11 @@ public void addInformation(ItemStack stack, @Nullable World world, @NotNull List
         } else {
             tooltip.add(I18n.format("gregtech.machine.data_access_hatch.tooltip.2", getInventorySize()));
         }
+        if (canPartShare()) {
+            tooltip.add(I18n.format("gregtech.universal.enabled"));
+        } else {
+            tooltip.add(I18n.format("gregtech.universal.disabled"));
+        }
     }
 
     @NotNull
@@ -199,7 +204,7 @@ public List<ITextComponent> getDataInfo() {
 
     @Override
     public boolean canPartShare() {
-        return false;
+        return isCreative;
     }
 
     @Override

diff --git a/...ava/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityObjectHolder.java b/...ava/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityObjectHolder.java
@@ -18,19 +18,22 @@
 import gregtech.client.renderer.texture.Textures;
 import gregtech.client.renderer.texture.cube.SimpleOverlayRenderer;
 
+import net.minecraft.client.resources.I18n;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.network.PacketBuffer;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.NonNullList;
 import net.minecraft.util.ResourceLocation;
+import net.minecraft.world.World;
 import net.minecraftforge.items.IItemHandler;
 
 import codechicken.lib.render.CCRenderState;
 import codechicken.lib.render.pipeline.IVertexOperation;
 import codechicken.lib.vec.Matrix4;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
 
@@ -207,6 +210,18 @@ public void removeFromMultiBlock(MultiblockControllerBase controllerBase) {
         heldItems.removeNotifiableMetaTileEntity(controllerBase);
     }
 
+    @Override
+    public boolean canPartShare() {
+        return false;
+    }
+
+    @Override
+    public void addInformation(ItemStack stack, @Nullable World world, @NotNull List<String> tooltip,
+                               boolean advanced) {
+        super.addInformation(stack, world, tooltip, advanced);
+        tooltip.add(I18n.format("gregtech.universal.disabled"));
+    }
+
     private class ObjectHolderHandler extends NotifiableItemStackHandler {
 
         public ObjectHolderHandler(MetaTileEntity metaTileEntity) {

diff --git a/...gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityOpticalDataHatch.java b/...gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityOpticalDataHatch.java
@@ -14,16 +14,20 @@
 import gregtech.client.renderer.texture.Textures;
 import gregtech.common.pipelike.optical.tile.TileEntityOpticalPipe;
 
+import net.minecraft.client.resources.I18n;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.ResourceLocation;
+import net.minecraft.world.World;
 import net.minecraftforge.common.capabilities.Capability;
 
 import codechicken.lib.render.CCRenderState;
 import codechicken.lib.render.pipeline.IVertexOperation;
 import codechicken.lib.vec.Matrix4;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.Collection;
 import java.util.List;
@@ -134,4 +138,11 @@ public MultiblockAbility<IOpticalDataAccessHatch> getAbility() {
     public void registerAbilities(@NotNull List<IOpticalDataAccessHatch> abilityList) {
         abilityList.add(this);
     }
+
+    @Override
+    public void addInformation(ItemStack stack, @Nullable World world, @NotNull List<String> tooltip,
+                               boolean advanced) {
+        super.addInformation(stack, world, tooltip, advanced);
+        tooltip.add(I18n.format("gregtech.universal.disabled"));
+    }
 }