From 1d4f6831ddff142b4b20af7130bdce11a5460f1e Mon Sep 17 00:00:00 2001 From: 54M44R <26176694+54M44R@users.noreply.github.com> Date: Thu, 14 Nov 2024 08:32:38 -0500 Subject: [PATCH] Prevent Silver Capacitor from being used as Upgrade (#178) --- .../java/crazypants/enderio/machine/AbstractMachineEntity.java | 3 ++- src/main/java/crazypants/enderio/material/ItemCapacitor.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java b/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java index b2a6c256..8f5db05e 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java +++ b/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java @@ -168,7 +168,8 @@ public abstract class AbstractMachineEntity extends TileEntityEio public final boolean isItemValidForSlot(int i, ItemStack itemstack) { if (slotDefinition.isUpgradeSlot(i)) { return itemstack != null && itemstack.getItem() == EnderIO.itemBasicCapacitor - && itemstack.getItemDamage() > 0; + && itemstack.getItemDamage() > 0 + && itemstack.getItemDamage() != 7; } return isMachineItemValidForSlot(i, itemstack); } diff --git a/src/main/java/crazypants/enderio/material/ItemCapacitor.java b/src/main/java/crazypants/enderio/material/ItemCapacitor.java index d15bfcf4..f23c2f7a 100644 --- a/src/main/java/crazypants/enderio/material/ItemCapacitor.java +++ b/src/main/java/crazypants/enderio/material/ItemCapacitor.java @@ -103,7 +103,7 @@ public class ItemCapacitor extends Item implements ICapacitorItem { @Override @SideOnly(Side.CLIENT) public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { - if (par1ItemStack != null && par1ItemStack.getItemDamage() > 0) { + if (par1ItemStack != null && par1ItemStack.getItemDamage() > 0 && par1ItemStack.getItemDamage() != 7) { par3List.add(EnderIO.lang.localize("machine.tooltip.upgrade")); if (SpecialTooltipHandler.showAdvancedTooltips()) { SpecialTooltipHandler.addDetailedTooltipFromResources(par3List, "enderio.machine.tooltip.upgrade");