From 6e975ee63283a6fb72584fb1e5364a743faafe5b Mon Sep 17 00:00:00 2001 From: Aidan Brady Date: Thu, 31 Jul 2014 19:29:49 -0400 Subject: [PATCH] Made them really infinite --- .../java/mekanism/common/item/ItemBlockEnergyCube.java | 7 ++++++- .../java/mekanism/common/tile/TileEntityEnergyCube.java | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java index 6d582bb90..c8c02cf88 100644 --- a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java +++ b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java @@ -12,6 +12,7 @@ import mekanism.api.energy.IEnergizedItem; import mekanism.common.IEnergyCube; import mekanism.common.ISustainedInventory; import mekanism.common.Mekanism; +import mekanism.common.Tier; import mekanism.common.Tier.EnergyCubeTier; import mekanism.common.integration.IC2ItemManager; import mekanism.common.network.PacketTileEntity.TileEntityMessage; @@ -31,7 +32,6 @@ import net.minecraftforge.common.util.Constants.NBT; import org.lwjgl.input.Keyboard; import cofh.api.energy.IEnergyContainerItem; - import cpw.mods.fml.common.Optional.Interface; import cpw.mods.fml.common.Optional.InterfaceList; import cpw.mods.fml.common.Optional.Method; @@ -212,6 +212,11 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IE @Override public void setEnergy(ItemStack itemStack, double amount) { + if(EnergyCubeTier.values()[getTier(itemStack)] == EnergyCubeTier.CREATIVE && amount != Integer.MAX_VALUE) + { + return; + } + if(itemStack.stackTagCompound == null) { itemStack.setTagCompound(new NBTTagCompound()); diff --git a/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java b/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java index 7c12ac636..f337efd26 100644 --- a/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java +++ b/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java @@ -245,7 +245,7 @@ public class TileEntityEnergyCube extends TileEntityElectricBlock implements IPe @Override public void setEnergy(double energy) { - if(tier == EnergyCubeTier.CREATIVE) + if(tier == EnergyCubeTier.CREATIVE && energy != Integer.MAX_VALUE) { return; }