From 18c642dd00f20ec975e1027f827ebba8e3978c5d Mon Sep 17 00:00:00 2001 From: Ghzdude <44148655+ghzdude@users.noreply.github.com> Date: Fri, 4 Aug 2023 19:52:05 -0700 Subject: [PATCH] move chest tooltip to super remove addinfo super call in qtank --- .../storage/MetaTileEntityQuantumChest.java | 1 - .../storage/MetaTileEntityQuantumExtender.java | 12 ------------ .../storage/MetaTileEntityQuantumProxy.java | 6 ------ .../storage/MetaTileEntityQuantumStorage.java | 11 +++++++++++ .../storage/MetaTileEntityQuantumTank.java | 1 - 5 files changed, 11 insertions(+), 20 deletions(-) diff --git a/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityQuantumChest.java b/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityQuantumChest.java index 71f07c4020e..a9216b9a86c 100644 --- a/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityQuantumChest.java +++ b/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityQuantumChest.java @@ -198,7 +198,6 @@ protected void addDisplayInformation(List textList) { @Override public void addInformation(ItemStack stack, @Nullable World player, List tooltip, boolean advanced) { super.addInformation(stack, player, tooltip, advanced); - tooltip.add(I18n.format("gregtech.machine.quantum_chest.tooltip")); tooltip.add(I18n.format("gregtech.universal.tooltip.item_storage_total", maxStoredItems)); NBTTagCompound compound = stack.getTagCompound(); diff --git a/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityQuantumExtender.java b/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityQuantumExtender.java index c76ac041bcb..5c0df7c08db 100644 --- a/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityQuantumExtender.java +++ b/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityQuantumExtender.java @@ -8,15 +8,8 @@ import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.interfaces.IGregTechTileEntity; import gregtech.client.renderer.texture.Textures; -import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import net.minecraft.world.World; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import java.util.List; public class MetaTileEntityQuantumExtender extends MetaTileEntityQuantumStorage { public MetaTileEntityQuantumExtender(ResourceLocation metaTileEntityId) { @@ -57,9 +50,4 @@ public IDualHandler getTypeValue() { return null; } - @Override - public void addInformation(ItemStack stack, @Nullable World world, @NotNull List tooltip, boolean advanced) { - tooltip.add(I18n.format("gregtech.machine.quantum_chest.tooltip")); - tooltip.add(I18n.format("gregtech.machine.quantum_storage_proxy.tooltip")); - } } diff --git a/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityQuantumProxy.java b/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityQuantumProxy.java index 2396c835f63..eb8bd09f63a 100644 --- a/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityQuantumProxy.java +++ b/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityQuantumProxy.java @@ -76,10 +76,4 @@ public IDualHandler getTypeValue() { if (getController() == null) return null; return getController().getHandler(); } - - @Override - public void addInformation(ItemStack stack, @Nullable World world, @NotNull List tooltip, boolean advanced) { - tooltip.add(I18n.format("gregtech.machine.quantum_chest.tooltip")); - tooltip.add(I18n.format("gregtech.machine.quantum_storage_proxy.tooltip")); - } } diff --git a/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityQuantumStorage.java b/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityQuantumStorage.java index 0dcfc57d752..8d6c7a2d057 100644 --- a/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityQuantumStorage.java +++ b/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityQuantumStorage.java @@ -5,14 +5,20 @@ import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.util.GTLog; import gregtech.api.util.GTUtility; +import net.minecraft.client.resources.I18n; import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.PacketBuffer; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import java.lang.ref.WeakReference; +import java.util.List; import static gregtech.api.capability.GregtechDataCodes.UPDATE_CONTROLLER_POS; import static gregtech.api.capability.GregtechDataCodes.REMOVE_CONTROLLER; @@ -176,4 +182,9 @@ public void readFromNBT(NBTTagCompound data) { this.controllerPos = BlockPos.fromLong(data.getLong("ControllerPos")); } } + + @Override + public void addInformation(ItemStack stack, @Nullable World world, @NotNull List tooltip, boolean advanced) { + tooltip.add(I18n.format("gregtech.machine.quantum_chest.tooltip")); + } } diff --git a/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityQuantumTank.java b/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityQuantumTank.java index 705c401dd52..603b9d6d0cd 100644 --- a/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityQuantumTank.java +++ b/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityQuantumTank.java @@ -289,7 +289,6 @@ public Pair getParticleTexture() { @Override public void addInformation(ItemStack stack, @Nullable World player, List tooltip, boolean advanced) { - super.addInformation(stack, player, tooltip, advanced); tooltip.add(I18n.format("gregtech.machine.quantum_tank.tooltip")); tooltip.add(I18n.format("gregtech.universal.tooltip.fluid_storage_capacity", maxFluidCapacity)); NBTTagCompound tag = stack.getTagCompound();