From a798d2146d543123e6e257ebbfce969bd7ef337c Mon Sep 17 00:00:00 2001 From: dibbydoda <93301589+dibbydoda@users.noreply.github.com> Date: Mon, 26 May 2025 21:38:39 +1000 Subject: [PATCH] Remove deprecated CapacitorBank (#197) --- .../java/crazypants/enderio/ClientProxy.java | 10 - src/main/java/crazypants/enderio/EnderIO.java | 3 - .../java/crazypants/enderio/ModObject.java | 1 - .../conduit/power/ItemPowerConduit.java | 2 +- .../endergy/ItemPowerConduitEndergy.java | 2 +- .../enderio/enderface/GuiEnderface.java | 2 +- .../enderio/gui/TooltipHandlerBurnTime.java | 2 +- .../enderio/gui/TooltipHandlerFluid.java | 2 +- .../crazypants/enderio/item/ItemMagnet.java | 2 +- .../enderio/item/PacketConduitProbe.java | 2 +- .../item/darksteel/ItemDarkSteelPickaxe.java | 2 +- .../item/darksteel/upgrade/EnergyUpgrade.java | 2 +- .../enderio/machine/MachineRecipes.java | 4 - .../enderio/machine/buffer/GuiBuffer.java | 2 +- .../enderio/machine/capbank/BlockCapBank.java | 2 +- .../machine/capbank/ConvertOldRecipe.java | 66 - .../enderio/machine/capbank/GuiCapBank.java | 2 +- .../enderio/machine/capbank/TileCapBank.java | 2 +- .../machine/capbank/render/IoDisplay.java | 2 +- .../enderio/machine/crafter/GuiCrafter.java | 2 +- .../combustion/GuiCombustionGenerator.java | 2 +- .../stirling/GuiStirlingGenerator.java | 2 +- .../generator/zombie/GuiZombieGenerator.java | 2 +- .../machine/gui/GuiPoweredMachineBase.java | 2 +- .../machine/hypercube/GuiHyperCube.java | 2 +- .../machine/monitor/GuiPowerMonitor.java | 6 +- .../machine/power/BlockCapacitorBank.java | 369 ----- .../machine/power/BlockItemCapacitorBank.java | 109 -- .../machine/power/CapBankRenderer2.java | 280 ---- .../machine/power/CapacitorBankRenderer.java | 339 ----- .../machine/power/ContainerCapacitorBank.java | 172 --- .../enderio/machine/power/GaugeBounds.java | 157 --- .../machine/power/GuiCapacitorBank.java | 335 ----- .../machine/power/PacketClientState.java | 76 -- .../machine/power/PacketPowerStorage.java | 82 -- .../machine/power/TileCapacitorBank.java | 1185 ----------------- .../machine/solar/BlockItemSolarPanel.java | 2 +- .../enderio/machine/tank/BlockTank.java | 2 +- .../machine/transceiver/gui/GeneralTab.java | 2 +- .../nei/AlloySmelterRecipeHandler.java | 2 +- .../enderio/nei/NEIEnderIOConfig.java | 2 - .../enderio/nei/SagMillRecipeHandler.java | 2 +- .../nei/SliceAndSpliceRecipeHandler.java | 2 +- .../enderio/nei/SoulBinderRecipeHandler.java | 2 +- .../enderio/nei/VatRecipeHandler.java | 2 +- .../{machine => }/power/PowerDisplayUtil.java | 2 +- .../enderio/teleport/ItemTeleportStaff.java | 2 +- .../enderio/teleport/ItemTravelStaff.java | 2 +- .../enderio/teleport/telepad/GuiTelePad.java | 2 +- .../crazypants/enderio/waila/WailaCompat.java | 2 +- .../resources/assets/enderio/lang/cs_CZ.lang | 6 - .../resources/assets/enderio/lang/de_DE.lang | 6 - .../resources/assets/enderio/lang/en_US.lang | 5 - .../resources/assets/enderio/lang/es_AR.lang | 5 - .../resources/assets/enderio/lang/es_ES.lang | 5 - .../resources/assets/enderio/lang/es_MX.lang | 5 - .../resources/assets/enderio/lang/es_UY.lang | 5 - .../resources/assets/enderio/lang/es_VE.lang | 5 - .../resources/assets/enderio/lang/fr_FR.lang | 6 - .../resources/assets/enderio/lang/ko_KR.lang | 6 - .../resources/assets/enderio/lang/pl_PL.lang | 2 - .../resources/assets/enderio/lang/pt_BR.lang | 6 - .../resources/assets/enderio/lang/pt_PT.lang | 6 - .../resources/assets/enderio/lang/ru_RU.lang | 6 - .../resources/assets/enderio/lang/zh_CN.lang | 6 - .../resources/assets/enderio/lang/zh_TW.lang | 6 - .../textures/blocks/old/capBankInfoPanel.png | Bin 175 -> 0 bytes .../textures/blocks/old/capacitorBank.png | Bin 467 -> 0 bytes .../old/capacitorBankActivatedBorder.png | Bin 1338 -> 0 bytes .../old/capacitorBankCreativeBorder.png | Bin 1453 -> 0 bytes .../blocks/old/capacitorBankFillBar.png | Bin 290 -> 0 bytes .../blocks/old/capacitorBankInput.png | Bin 540 -> 0 bytes .../blocks/old/capacitorBankLocked.png | Bin 521 -> 0 bytes .../blocks/old/capacitorBankOutput.png | Bin 492 -> 0 bytes .../blocks/old/capacitorBankOverlays.png | Bin 215 -> 0 bytes .../blocks/old/capacitorBankSimple.png | Bin 1338 -> 0 bytes .../blocks/old/capacitorBankSimpleBorder.png | Bin 964 -> 0 bytes .../blocks/old/capacitorBankVibrantBorder.png | Bin 1419 -> 0 bytes 78 files changed, 36 insertions(+), 3312 deletions(-) delete mode 100644 src/main/java/crazypants/enderio/machine/capbank/ConvertOldRecipe.java delete mode 100644 src/main/java/crazypants/enderio/machine/power/BlockCapacitorBank.java delete mode 100644 src/main/java/crazypants/enderio/machine/power/BlockItemCapacitorBank.java delete mode 100644 src/main/java/crazypants/enderio/machine/power/CapBankRenderer2.java delete mode 100644 src/main/java/crazypants/enderio/machine/power/CapacitorBankRenderer.java delete mode 100644 src/main/java/crazypants/enderio/machine/power/ContainerCapacitorBank.java delete mode 100644 src/main/java/crazypants/enderio/machine/power/GaugeBounds.java delete mode 100644 src/main/java/crazypants/enderio/machine/power/GuiCapacitorBank.java delete mode 100644 src/main/java/crazypants/enderio/machine/power/PacketClientState.java delete mode 100644 src/main/java/crazypants/enderio/machine/power/PacketPowerStorage.java delete mode 100644 src/main/java/crazypants/enderio/machine/power/TileCapacitorBank.java rename src/main/java/crazypants/enderio/{machine => }/power/PowerDisplayUtil.java (98%) delete mode 100644 src/main/resources/assets/enderio/textures/blocks/old/capBankInfoPanel.png delete mode 100644 src/main/resources/assets/enderio/textures/blocks/old/capacitorBank.png delete mode 100644 src/main/resources/assets/enderio/textures/blocks/old/capacitorBankActivatedBorder.png delete mode 100644 src/main/resources/assets/enderio/textures/blocks/old/capacitorBankCreativeBorder.png delete mode 100644 src/main/resources/assets/enderio/textures/blocks/old/capacitorBankFillBar.png delete mode 100644 src/main/resources/assets/enderio/textures/blocks/old/capacitorBankInput.png delete mode 100644 src/main/resources/assets/enderio/textures/blocks/old/capacitorBankLocked.png delete mode 100644 src/main/resources/assets/enderio/textures/blocks/old/capacitorBankOutput.png delete mode 100644 src/main/resources/assets/enderio/textures/blocks/old/capacitorBankOverlays.png delete mode 100644 src/main/resources/assets/enderio/textures/blocks/old/capacitorBankSimple.png delete mode 100644 src/main/resources/assets/enderio/textures/blocks/old/capacitorBankSimpleBorder.png delete mode 100644 src/main/resources/assets/enderio/textures/blocks/old/capacitorBankVibrantBorder.png diff --git a/src/main/java/crazypants/enderio/ClientProxy.java b/src/main/java/crazypants/enderio/ClientProxy.java index 9a85531c..0ad856ae 100644 --- a/src/main/java/crazypants/enderio/ClientProxy.java +++ b/src/main/java/crazypants/enderio/ClientProxy.java @@ -103,9 +103,6 @@ import crazypants.enderio.machine.painter.BlockPaintedFenceGateRenderer; import crazypants.enderio.machine.painter.BlockPaintedGlowstone; import crazypants.enderio.machine.painter.PaintedBlockRenderer; import crazypants.enderio.machine.painter.PaintedItemRenderer; -import crazypants.enderio.machine.power.BlockCapacitorBank; -import crazypants.enderio.machine.power.CapBankRenderer2; -import crazypants.enderio.machine.power.CapacitorBankRenderer; import crazypants.enderio.machine.ranged.RangeEntity; import crazypants.enderio.machine.ranged.RangeRenderer; import crazypants.enderio.machine.reservoir.ReservoirRenderer; @@ -321,13 +318,6 @@ public class ClientProxy extends CommonProxy { ClientRegistry.bindTileEntitySpecialRenderer(TileCapBank.class, newCbr); } - CapacitorBankRenderer capr = new CapacitorBankRenderer(); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockCapacitorBank), capr); - - BlockCapacitorBank.renderId = RenderingRegistry.getNextAvailableRenderId(); - CapBankRenderer2 cbr2 = new CapBankRenderer2(); - RenderingRegistry.registerBlockHandler(cbr2); - BlockVacuumChest.renderId = RenderingRegistry.getNextAvailableRenderId(); VacuumChestRenderer vcr = new VacuumChestRenderer(); RenderingRegistry.registerBlockHandler(vcr); diff --git a/src/main/java/crazypants/enderio/EnderIO.java b/src/main/java/crazypants/enderio/EnderIO.java index 85999162..53497daa 100644 --- a/src/main/java/crazypants/enderio/EnderIO.java +++ b/src/main/java/crazypants/enderio/EnderIO.java @@ -132,7 +132,6 @@ import crazypants.enderio.machine.painter.BlockPaintedStair; import crazypants.enderio.machine.painter.BlockPaintedWall; import crazypants.enderio.machine.painter.BlockPainter; import crazypants.enderio.machine.painter.PaintSourceValidator; -import crazypants.enderio.machine.power.BlockCapacitorBank; import crazypants.enderio.machine.ranged.RangeEntity; import crazypants.enderio.machine.reservoir.BlockReservoir; import crazypants.enderio.machine.slicensplice.BlockSliceAndSplice; @@ -286,7 +285,6 @@ public class EnderIO { public static BlockSolarPanel blockSolarPanel; public static BlockReservoir blockReservoir; public static BlockAlloySmelter blockAlloySmelter; - public static BlockCapacitorBank blockCapacitorBank; public static BlockCapBank blockCapBank; public static BlockWirelessCharger blockWirelessCharger; public static BlockCrusher blockCrusher; @@ -396,7 +394,6 @@ public class EnderIO { blockCrusher = BlockCrusher.create(); blockAlloySmelter = BlockAlloySmelter.create(); - blockCapacitorBank = BlockCapacitorBank.create(); blockCapBank = BlockCapBank.create(); blockPainter = BlockPainter.create(); diff --git a/src/main/java/crazypants/enderio/ModObject.java b/src/main/java/crazypants/enderio/ModObject.java index a2a268d0..1ecb50e5 100644 --- a/src/main/java/crazypants/enderio/ModObject.java +++ b/src/main/java/crazypants/enderio/ModObject.java @@ -55,7 +55,6 @@ public enum ModObject { blockReservoir, blockAlloySmelter, blockSolarPanel, - blockCapacitorBank, blockCapBank, blockSagMill, blockHyperCube, diff --git a/src/main/java/crazypants/enderio/conduit/power/ItemPowerConduit.java b/src/main/java/crazypants/enderio/conduit/power/ItemPowerConduit.java index 4cfdde2a..181e5b87 100644 --- a/src/main/java/crazypants/enderio/conduit/power/ItemPowerConduit.java +++ b/src/main/java/crazypants/enderio/conduit/power/ItemPowerConduit.java @@ -12,8 +12,8 @@ import crazypants.enderio.ModObject; import crazypants.enderio.conduit.AbstractItemConduit; import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.ItemConduitSubtype; -import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.power.ICapacitor; +import crazypants.enderio.power.PowerDisplayUtil; public class ItemPowerConduit extends AbstractItemConduit { diff --git a/src/main/java/crazypants/enderio/conduit/power/endergy/ItemPowerConduitEndergy.java b/src/main/java/crazypants/enderio/conduit/power/endergy/ItemPowerConduitEndergy.java index 0516b0d3..56aa2050 100644 --- a/src/main/java/crazypants/enderio/conduit/power/endergy/ItemPowerConduitEndergy.java +++ b/src/main/java/crazypants/enderio/conduit/power/endergy/ItemPowerConduitEndergy.java @@ -13,8 +13,8 @@ import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.ItemConduitSubtype; import crazypants.enderio.conduit.power.IPowerConduit; import crazypants.enderio.conduit.power.ItemPowerConduit; -import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.power.ICapacitor; +import crazypants.enderio.power.PowerDisplayUtil; public class ItemPowerConduitEndergy extends ItemPowerConduit { diff --git a/src/main/java/crazypants/enderio/enderface/GuiEnderface.java b/src/main/java/crazypants/enderio/enderface/GuiEnderface.java index 8a38208d..7d6f5d48 100644 --- a/src/main/java/crazypants/enderio/enderface/GuiEnderface.java +++ b/src/main/java/crazypants/enderio/enderface/GuiEnderface.java @@ -214,7 +214,7 @@ public class GuiEnderface extends GuiScreen { if (hit != null) { Block block = world.getBlock(hit.blockX, hit.blockY, hit.blockZ); - if (block == EnderIO.blockHyperCube || block == EnderIO.blockCapacitorBank) { + if (block == EnderIO.blockHyperCube) { block.onBlockActivated(world, hit.blockX, hit.blockY, hit.blockZ, player, 0, 0, 0, 0); } else { openInterface(hit.blockX, hit.blockY, hit.blockZ, hit.sideHit, hit.hitVec); diff --git a/src/main/java/crazypants/enderio/gui/TooltipHandlerBurnTime.java b/src/main/java/crazypants/enderio/gui/TooltipHandlerBurnTime.java index 8b337ca6..67f704ff 100644 --- a/src/main/java/crazypants/enderio/gui/TooltipHandlerBurnTime.java +++ b/src/main/java/crazypants/enderio/gui/TooltipHandlerBurnTime.java @@ -14,7 +14,7 @@ import crazypants.enderio.config.Config; import crazypants.enderio.machine.AbstractMachineEntity; import crazypants.enderio.machine.generator.stirling.StirlingGeneratorContainer; import crazypants.enderio.machine.generator.stirling.TileEntityStirlingGenerator; -import crazypants.enderio.machine.power.PowerDisplayUtil; +import crazypants.enderio.power.PowerDisplayUtil; public class TooltipHandlerBurnTime implements ITooltipCallback { diff --git a/src/main/java/crazypants/enderio/gui/TooltipHandlerFluid.java b/src/main/java/crazypants/enderio/gui/TooltipHandlerFluid.java index 36e5a400..83368156 100644 --- a/src/main/java/crazypants/enderio/gui/TooltipHandlerFluid.java +++ b/src/main/java/crazypants/enderio/gui/TooltipHandlerFluid.java @@ -15,7 +15,7 @@ import crazypants.enderio.EnderIO; import crazypants.enderio.fluid.FluidFuelRegister; import crazypants.enderio.fluid.IFluidCoolant; import crazypants.enderio.fluid.IFluidFuel; -import crazypants.enderio.machine.power.PowerDisplayUtil; +import crazypants.enderio.power.PowerDisplayUtil; public class TooltipHandlerFluid implements ITooltipCallback { diff --git a/src/main/java/crazypants/enderio/item/ItemMagnet.java b/src/main/java/crazypants/enderio/item/ItemMagnet.java index 7c41d0af..d3c86df0 100644 --- a/src/main/java/crazypants/enderio/item/ItemMagnet.java +++ b/src/main/java/crazypants/enderio/item/ItemMagnet.java @@ -28,7 +28,7 @@ import crazypants.enderio.EnderIOTab; import crazypants.enderio.ModObject; import crazypants.enderio.config.Config; import crazypants.enderio.item.darksteel.DarkSteelItems; -import crazypants.enderio.machine.power.PowerDisplayUtil; +import crazypants.enderio.power.PowerDisplayUtil; import crazypants.util.BaublesUtil; @Optional.Interface(iface = "baubles.api.IBauble", modid = "Baubles|API") diff --git a/src/main/java/crazypants/enderio/item/PacketConduitProbe.java b/src/main/java/crazypants/enderio/item/PacketConduitProbe.java index fa87bb81..a6f6f8da 100644 --- a/src/main/java/crazypants/enderio/item/PacketConduitProbe.java +++ b/src/main/java/crazypants/enderio/item/PacketConduitProbe.java @@ -24,10 +24,10 @@ import crazypants.enderio.conduit.power.IPowerConduit; import crazypants.enderio.conduit.power.NetworkPowerManager; import crazypants.enderio.conduit.power.PowerConduitNetwork; import crazypants.enderio.conduit.power.PowerTracker; -import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.power.EnergyHandlerPI; import crazypants.enderio.power.IInternalPowerReceiver; import crazypants.enderio.power.IInternalPoweredTile; +import crazypants.enderio.power.PowerDisplayUtil; import io.netty.buffer.ByteBuf; public class PacketConduitProbe implements IMessage, IMessageHandler { diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java index 1dff56d8..750580a7 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java @@ -34,7 +34,7 @@ import crazypants.enderio.config.Config; import crazypants.enderio.item.darksteel.upgrade.EnergyUpgrade; import crazypants.enderio.item.darksteel.upgrade.SpoonUpgrade; import crazypants.enderio.item.darksteel.upgrade.TravelUpgrade; -import crazypants.enderio.machine.power.PowerDisplayUtil; +import crazypants.enderio.power.PowerDisplayUtil; import crazypants.enderio.teleport.TravelController; public class ItemDarkSteelPickaxe extends ItemPickaxe diff --git a/src/main/java/crazypants/enderio/item/darksteel/upgrade/EnergyUpgrade.java b/src/main/java/crazypants/enderio/item/darksteel/upgrade/EnergyUpgrade.java index 86841f7a..6b7c7737 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/upgrade/EnergyUpgrade.java +++ b/src/main/java/crazypants/enderio/item/darksteel/upgrade/EnergyUpgrade.java @@ -17,8 +17,8 @@ import crazypants.enderio.EnderIO; import crazypants.enderio.config.Config; import crazypants.enderio.item.darksteel.IDarkSteelItem; import crazypants.enderio.item.darksteel.IDarkSteelItem.IEndSteelItem; -import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.material.Material; +import crazypants.enderio.power.PowerDisplayUtil; public class EnergyUpgrade extends AbstractUpgrade { diff --git a/src/main/java/crazypants/enderio/machine/MachineRecipes.java b/src/main/java/crazypants/enderio/machine/MachineRecipes.java index e342982b..84ccbfe7 100644 --- a/src/main/java/crazypants/enderio/machine/MachineRecipes.java +++ b/src/main/java/crazypants/enderio/machine/MachineRecipes.java @@ -28,7 +28,6 @@ import crazypants.enderio.item.skull.BlockEndermanSkull; import crazypants.enderio.machine.buffer.BlockItemBuffer.Type; import crazypants.enderio.machine.capbank.BlockItemCapBank; import crazypants.enderio.machine.capbank.CapBankType; -import crazypants.enderio.machine.capbank.ConvertOldRecipe; import crazypants.enderio.machine.light.BlockItemElectricLight; import crazypants.enderio.material.FrankenSkull; import crazypants.enderio.material.MachinePart; @@ -343,9 +342,6 @@ public class MachineRecipes { .createItemStackWithPower(CapBankType.getMetaFromType(CapBankType.VIBRANT), 0); RecipeUtil.addShaped(capBank3, "bcb", "cmc", "bcb", 'b', electricalSteel, 'c', capacitor3, 'm', vibCry); - ConvertOldRecipe convertRecipe = new ConvertOldRecipe(); - GameRegistry.addRecipe(convertRecipe); - GameRegistry.addRecipe( new UpgradeCapBankRecipe( capBank2, diff --git a/src/main/java/crazypants/enderio/machine/buffer/GuiBuffer.java b/src/main/java/crazypants/enderio/machine/buffer/GuiBuffer.java index fa6948b7..ab07f95f 100644 --- a/src/main/java/crazypants/enderio/machine/buffer/GuiBuffer.java +++ b/src/main/java/crazypants/enderio/machine/buffer/GuiBuffer.java @@ -11,8 +11,8 @@ import com.enderio.core.client.render.RenderUtil; import crazypants.enderio.EnderIO; import crazypants.enderio.machine.IoMode; import crazypants.enderio.machine.gui.GuiPoweredMachineBase; -import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.network.PacketHandler; +import crazypants.enderio.power.PowerDisplayUtil; public class GuiBuffer extends GuiPoweredMachineBase { diff --git a/src/main/java/crazypants/enderio/machine/capbank/BlockCapBank.java b/src/main/java/crazypants/enderio/machine/capbank/BlockCapBank.java index 6f89ee1b..f3f9d036 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/BlockCapBank.java +++ b/src/main/java/crazypants/enderio/machine/capbank/BlockCapBank.java @@ -49,8 +49,8 @@ import crazypants.enderio.machine.capbank.packet.PacketNetworkIdRequest; import crazypants.enderio.machine.capbank.packet.PacketNetworkIdResponse; import crazypants.enderio.machine.capbank.packet.PacketNetworkStateRequest; import crazypants.enderio.machine.capbank.packet.PacketNetworkStateResponse; -import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.network.PacketHandler; +import crazypants.enderio.power.PowerDisplayUtil; import crazypants.enderio.power.PowerHandlerUtil; import crazypants.enderio.tool.ToolUtil; import crazypants.enderio.waila.IWailaInfoProvider; diff --git a/src/main/java/crazypants/enderio/machine/capbank/ConvertOldRecipe.java b/src/main/java/crazypants/enderio/machine/capbank/ConvertOldRecipe.java deleted file mode 100644 index e9e645c9..00000000 --- a/src/main/java/crazypants/enderio/machine/capbank/ConvertOldRecipe.java +++ /dev/null @@ -1,66 +0,0 @@ -package crazypants.enderio.machine.capbank; - -import net.minecraft.block.Block; -import net.minecraft.inventory.InventoryCrafting; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.IRecipe; -import net.minecraft.world.World; -import net.minecraftforge.oredict.RecipeSorter; -import net.minecraftforge.oredict.RecipeSorter.Category; - -import crazypants.enderio.EnderIO; -import crazypants.enderio.power.PowerHandlerUtil; - -public class ConvertOldRecipe implements IRecipe { - - static { - RecipeSorter.register( - "EnderIO:convertOldCapBankRecipe", - ConvertOldRecipe.class, - Category.SHAPELESS, - "after:minecraft:shapeless"); - } - - private ItemStack output; - - @Override - public boolean matches(InventoryCrafting inv, World world) { - ItemStack input = null; - for (int i = 0; i < inv.getSizeInventory(); i++) { - ItemStack checkStack = inv.getStackInSlot(i); - if (checkStack != null) { - if (input != null) { - return false; - } - if (Block.getBlockFromItem(checkStack.getItem()) == EnderIO.blockCapacitorBank) { - input = checkStack; - } else { - return false; - } - } - } - - if (input == null) { - return false; - } - - output = new ItemStack(EnderIO.blockCapBank, 1, CapBankType.getMetaFromType(CapBankType.ACTIVATED)); - PowerHandlerUtil.setStoredEnergyForItem(output, PowerHandlerUtil.getStoredEnergyForItem(input)); - return true; - } - - @Override - public ItemStack getCraftingResult(InventoryCrafting inv) { - return output.copy(); - } - - @Override - public int getRecipeSize() { - return 1; - } - - @Override - public ItemStack getRecipeOutput() { - return output; - } -} diff --git a/src/main/java/crazypants/enderio/machine/capbank/GuiCapBank.java b/src/main/java/crazypants/enderio/machine/capbank/GuiCapBank.java index 3ca577c8..0a207044 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/GuiCapBank.java +++ b/src/main/java/crazypants/enderio/machine/capbank/GuiCapBank.java @@ -30,8 +30,8 @@ import crazypants.enderio.machine.capbank.packet.PacketNetworkStateRequest; import crazypants.enderio.machine.gui.GuiButtonIoConfig; import crazypants.enderio.machine.gui.GuiOverlayIoConfig; import crazypants.enderio.machine.gui.GuiPoweredMachineBase; -import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.network.PacketHandler; +import crazypants.enderio.power.PowerDisplayUtil; public class GuiCapBank extends GuiContainerBaseEIO { diff --git a/src/main/java/crazypants/enderio/machine/capbank/TileCapBank.java b/src/main/java/crazypants/enderio/machine/capbank/TileCapBank.java index 1fec0072..904829e1 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/TileCapBank.java +++ b/src/main/java/crazypants/enderio/machine/capbank/TileCapBank.java @@ -747,7 +747,7 @@ public class TileCapBank extends TileEntityEio @Override public String getInventoryName() { - return EnderIO.blockCapacitorBank.getUnlocalizedName() + ".name"; + return EnderIO.blockCapBank.getUnlocalizedName() + ".name"; } @Override diff --git a/src/main/java/crazypants/enderio/machine/capbank/render/IoDisplay.java b/src/main/java/crazypants/enderio/machine/capbank/render/IoDisplay.java index 2914303e..0d5fcbc6 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/render/IoDisplay.java +++ b/src/main/java/crazypants/enderio/machine/capbank/render/IoDisplay.java @@ -17,7 +17,7 @@ import com.enderio.core.client.render.RenderUtil; import crazypants.enderio.EnderIO; import crazypants.enderio.machine.capbank.TileCapBank; import crazypants.enderio.machine.capbank.network.CapBankClientNetwork; -import crazypants.enderio.machine.power.PowerDisplayUtil; +import crazypants.enderio.power.PowerDisplayUtil; public class IoDisplay implements IInfoRenderer { diff --git a/src/main/java/crazypants/enderio/machine/crafter/GuiCrafter.java b/src/main/java/crazypants/enderio/machine/crafter/GuiCrafter.java index 2efc5d7f..13029708 100644 --- a/src/main/java/crazypants/enderio/machine/crafter/GuiCrafter.java +++ b/src/main/java/crazypants/enderio/machine/crafter/GuiCrafter.java @@ -17,8 +17,8 @@ import crazypants.enderio.config.Config; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.machine.PacketItemBuffer; import crazypants.enderio.machine.gui.GuiPoweredMachineBase; -import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.network.PacketHandler; +import crazypants.enderio.power.PowerDisplayUtil; public class GuiCrafter extends GuiPoweredMachineBase { diff --git a/src/main/java/crazypants/enderio/machine/generator/combustion/GuiCombustionGenerator.java b/src/main/java/crazypants/enderio/machine/generator/combustion/GuiCombustionGenerator.java index 5c21c07a..6d7f69f3 100644 --- a/src/main/java/crazypants/enderio/machine/generator/combustion/GuiCombustionGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/combustion/GuiCombustionGenerator.java @@ -16,7 +16,7 @@ import crazypants.enderio.EnderIO; import crazypants.enderio.fluid.Fluids; import crazypants.enderio.machine.IoMode; import crazypants.enderio.machine.gui.GuiPoweredMachineBase; -import crazypants.enderio.machine.power.PowerDisplayUtil; +import crazypants.enderio.power.PowerDisplayUtil; public class GuiCombustionGenerator extends GuiPoweredMachineBase { diff --git a/src/main/java/crazypants/enderio/machine/generator/stirling/GuiStirlingGenerator.java b/src/main/java/crazypants/enderio/machine/generator/stirling/GuiStirlingGenerator.java index d78ba4ce..25db9cc7 100644 --- a/src/main/java/crazypants/enderio/machine/generator/stirling/GuiStirlingGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/stirling/GuiStirlingGenerator.java @@ -19,8 +19,8 @@ import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; import crazypants.enderio.config.Config; import crazypants.enderio.machine.gui.GuiPoweredMachineBase; -import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.power.Capacitors; +import crazypants.enderio.power.PowerDisplayUtil; @SideOnly(Side.CLIENT) public class GuiStirlingGenerator extends GuiPoweredMachineBase { diff --git a/src/main/java/crazypants/enderio/machine/generator/zombie/GuiZombieGenerator.java b/src/main/java/crazypants/enderio/machine/generator/zombie/GuiZombieGenerator.java index 2de6231d..c60121ef 100644 --- a/src/main/java/crazypants/enderio/machine/generator/zombie/GuiZombieGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/zombie/GuiZombieGenerator.java @@ -17,7 +17,7 @@ import crazypants.enderio.fluid.Fluids; import crazypants.enderio.machine.IoMode; import crazypants.enderio.machine.generator.zombie.TileZombieGenerator.TileEnderGenerator; import crazypants.enderio.machine.gui.GuiPoweredMachineBase; -import crazypants.enderio.machine.power.PowerDisplayUtil; +import crazypants.enderio.power.PowerDisplayUtil; public class GuiZombieGenerator extends GuiPoweredMachineBase { diff --git a/src/main/java/crazypants/enderio/machine/gui/GuiPoweredMachineBase.java b/src/main/java/crazypants/enderio/machine/gui/GuiPoweredMachineBase.java index 542d4b36..3dd405c2 100644 --- a/src/main/java/crazypants/enderio/machine/gui/GuiPoweredMachineBase.java +++ b/src/main/java/crazypants/enderio/machine/gui/GuiPoweredMachineBase.java @@ -11,7 +11,7 @@ import org.lwjgl.opengl.GL11; import com.enderio.core.client.gui.widget.GuiToolTip; import crazypants.enderio.machine.AbstractPoweredMachineEntity; -import crazypants.enderio.machine.power.PowerDisplayUtil; +import crazypants.enderio.power.PowerDisplayUtil; public abstract class GuiPoweredMachineBase extends GuiMachineBase { diff --git a/src/main/java/crazypants/enderio/machine/hypercube/GuiHyperCube.java b/src/main/java/crazypants/enderio/machine/hypercube/GuiHyperCube.java index ebbc8a8c..cadba947 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/GuiHyperCube.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/GuiHyperCube.java @@ -27,8 +27,8 @@ import crazypants.enderio.gui.IconEIO; import crazypants.enderio.gui.RedstoneModeButton; import crazypants.enderio.machine.hypercube.TileHyperCube.IoMode; import crazypants.enderio.machine.hypercube.TileHyperCube.SubChannel; -import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.network.PacketHandler; +import crazypants.enderio.power.PowerDisplayUtil; public class GuiHyperCube extends GuiContainerBaseEIO { diff --git a/src/main/java/crazypants/enderio/machine/monitor/GuiPowerMonitor.java b/src/main/java/crazypants/enderio/machine/monitor/GuiPowerMonitor.java index d3851acd..32ce389e 100644 --- a/src/main/java/crazypants/enderio/machine/monitor/GuiPowerMonitor.java +++ b/src/main/java/crazypants/enderio/machine/monitor/GuiPowerMonitor.java @@ -1,7 +1,7 @@ package crazypants.enderio.machine.monitor; -import static crazypants.enderio.machine.power.PowerDisplayUtil.formatPower; -import static crazypants.enderio.machine.power.PowerDisplayUtil.formatPowerFloat; +import static crazypants.enderio.power.PowerDisplayUtil.formatPower; +import static crazypants.enderio.power.PowerDisplayUtil.formatPowerFloat; import java.awt.Color; import java.awt.Rectangle; @@ -25,8 +25,8 @@ import crazypants.enderio.EnderIO; import crazypants.enderio.gui.GuiContainerBaseEIO; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.machine.ContainerNoInv; -import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.network.PacketHandler; +import crazypants.enderio.power.PowerDisplayUtil; public class GuiPowerMonitor extends GuiContainerBaseEIO { diff --git a/src/main/java/crazypants/enderio/machine/power/BlockCapacitorBank.java b/src/main/java/crazypants/enderio/machine/power/BlockCapacitorBank.java deleted file mode 100644 index 20cf03d4..00000000 --- a/src/main/java/crazypants/enderio/machine/power/BlockCapacitorBank.java +++ /dev/null @@ -1,369 +0,0 @@ -package crazypants.enderio.machine.power; - -import java.util.List; -import java.util.Random; - -import net.minecraft.block.Block; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; - -import com.enderio.core.api.client.gui.IAdvancedTooltipProvider; -import com.enderio.core.client.handlers.SpecialTooltipHandler; -import com.enderio.core.common.TileEntityEnder; -import com.enderio.core.common.util.BlockCoord; -import com.enderio.core.common.util.ChatUtil; -import com.enderio.core.common.util.Util; -import com.enderio.core.common.vecmath.Vector3d; - -import cpw.mods.fml.common.network.IGuiHandler; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.BlockEio; -import crazypants.enderio.EnderIO; -import crazypants.enderio.GuiHandler; -import crazypants.enderio.ModObject; -import crazypants.enderio.machine.IoMode; -import crazypants.enderio.network.PacketHandler; -import crazypants.enderio.power.PowerHandlerUtil; -import crazypants.enderio.tool.ToolUtil; -import crazypants.enderio.waila.IWailaInfoProvider; - -public class BlockCapacitorBank extends BlockEio implements IGuiHandler, IAdvancedTooltipProvider, IWailaInfoProvider { - - public static int renderId = -1; - - public static BlockCapacitorBank create() { - PacketHandler.INSTANCE - .registerMessage(PacketClientState.class, PacketClientState.class, PacketHandler.nextID(), Side.SERVER); - PacketHandler.INSTANCE.registerMessage( - PacketPowerStorage.class, - PacketPowerStorage.class, - PacketHandler.nextID(), - Side.CLIENT); - - BlockCapacitorBank res = new BlockCapacitorBank(); - res.init(); - return res; - } - - IIcon overlayIcon; - IIcon fillBarIcon; - - private IIcon blockIconInput; - private IIcon blockIconOutput; - private IIcon blockIconLocked; - - protected BlockCapacitorBank() { - super(ModObject.blockCapacitorBank.unlocalisedName, TileCapacitorBank.class); - setHardness(2.0F); - setCreativeTab(null); - } - - @Override - protected void init() { - - GameRegistry.registerBlock(this, BlockItemCapacitorBank.class, name); - if (teClass != null) { - GameRegistry.registerTileEntity(teClass, name + "TileEntity"); - } - - EnderIO.guiHandler.registerGuiHandler(GuiHandler.GUI_ID_CAPACITOR_BANK, this); - setLightOpacity(255); - } - - @Override - @SideOnly(Side.CLIENT) - public void getSubBlocks(Item p_149666_1_, CreativeTabs p_149666_2_, List list) {} - - @Override - public int damageDropped(int par1) { - return par1; - } - - @Override - @SideOnly(Side.CLIENT) - public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) {} - - @Override - @SideOnly(Side.CLIENT) - public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - list.add( - PowerDisplayUtil.formatStoredPower( - PowerHandlerUtil.getStoredEnergyForItem(itemstack), - TileCapacitorBank.BASE_CAP.getMaxEnergyStored())); - } - - @Override - @SideOnly(Side.CLIENT) - public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - SpecialTooltipHandler.addDetailedTooltipFromResources(list, itemstack); - } - - @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityPlayer, int side, float par7, - float par8, float par9) { - - TileEntity te = world.getTileEntity(x, y, z); - if (!(te instanceof TileCapacitorBank)) { - return false; - } - - if (ToolUtil.isToolEquipped(entityPlayer)) { - - ForgeDirection faceHit = ForgeDirection.getOrientation(side); - TileCapacitorBank tcb = (TileCapacitorBank) te; - tcb.toggleIoModeForFace(faceHit); - if (world.isRemote) { - world.markBlockForUpdate(x, y, z); - } else { - world.notifyBlocksOfNeighborChange(x, y, z, EnderIO.blockCapacitorBank); - world.markBlockForUpdate(x, y, z); - } - - return true; - } - - return super.onBlockActivated(world, x, y, z, entityPlayer, side, par7, par8, par9); - } - - @Override - protected boolean openGui(World world, int x, int y, int z, EntityPlayer entityPlayer, int side) { - if (!world.isRemote) { - entityPlayer.openGui(EnderIO.instance, GuiHandler.GUI_ID_CAPACITOR_BANK, world, x, y, z); - } - return true; - } - - @Override - public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - TileEntity te = world.getTileEntity(x, y, z); - if (te instanceof TileCapacitorBank) { - return new ContainerCapacitorBank(player, player.inventory, ((TileCapacitorBank) te).getController()); - } - return null; - } - - @Override - public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - TileEntity te = world.getTileEntity(x, y, z); - if (te instanceof TileCapacitorBank) { - return new GuiCapacitorBank(player, player.inventory, ((TileCapacitorBank) te).getController()); - } - return null; - } - - @SideOnly(Side.CLIENT) - @Override - public void registerBlockIcons(IIconRegister IIconRegister) { - blockIcon = IIconRegister.registerIcon("enderio:capacitorBank"); - blockIconInput = IIconRegister.registerIcon("enderio:capacitorBankInput"); - blockIconOutput = IIconRegister.registerIcon("enderio:capacitorBankOutput"); - blockIconLocked = IIconRegister.registerIcon("enderio:capacitorBankLocked"); - overlayIcon = IIconRegister.registerIcon("enderio:capacitorBankOverlays"); - fillBarIcon = IIconRegister.registerIcon("enderio:capacitorBankFillBar"); - } - - @Override - public int getRenderType() { - return renderId; - } - - @Override - public boolean isSideSolid(IBlockAccess world, int x, int y, int z, ForgeDirection side) { - return true; - } - - @Override - public boolean isOpaqueCube() { - return false; - } - - @Override - public boolean renderAsNormalBlock() { - return false; - } - - @Override - @SideOnly(Side.CLIENT) - public boolean shouldSideBeRendered(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) { - Block i1 = par1IBlockAccess.getBlock(par2, par3, par4); - return i1 == this ? false : super.shouldSideBeRendered(par1IBlockAccess, par2, par3, par4, par5); - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(IBlockAccess ba, int x, int y, int z, int side) { - TileEntity te = ba.getTileEntity(x, y, z); - if (!(te instanceof TileCapacitorBank)) { - return blockIcon; - } - TileCapacitorBank cb = (TileCapacitorBank) te; - IoMode mode = cb.getIoMode(ForgeDirection.values()[side]); - if (mode == null || mode == IoMode.NONE) { - return blockIcon; - } - if (mode == IoMode.PULL) { - return blockIconInput; - } - if (mode == IoMode.PUSH) { - return blockIconOutput; - } - return blockIconLocked; - } - - @Override - public void onBlockAdded(World world, int x, int y, int z) { - if (world.isRemote) { - return; - } - TileEntity te = world.getTileEntity(x, y, z); - if (te instanceof TileCapacitorBank) { - TileCapacitorBank tr = (TileCapacitorBank) te; - int meta = world.getBlockMetadata(x, y, z); - if (meta == 1) { - tr.setCreativeMode(); - } - tr.onBlockAdded(); - } - } - - @Override - public void onNeighborBlockChange(World world, int x, int y, int z, Block blockId) { - if (world.isRemote) { - return; - } - TileEntity tile = world.getTileEntity(x, y, z); - if (tile instanceof TileCapacitorBank) { - TileCapacitorBank te = (TileCapacitorBank) tile; - te.onNeighborBlockChange(blockId); - } - } - - @Override - public boolean doNormalDrops(World world, int x, int y, int z) { - return false; - } - - @Override - protected void processDrop(World world, int x, int y, int z, TileEntityEnder te, ItemStack drop) { - PowerHandlerUtil.setStoredEnergyForItem(drop, ((TileCapacitorBank) te).doGetEnergyStored()); - } - - @Override - public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack) { - if (world.isRemote) { - return; - } - TileEntity te = world.getTileEntity(x, y, z); - if (te instanceof TileCapacitorBank) { - TileCapacitorBank cb = (TileCapacitorBank) te; - cb.addEnergy(PowerHandlerUtil.getStoredEnergyForItem(stack)); - if (player instanceof EntityPlayerMP) { - for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - BlockCoord bc = new BlockCoord(x, y, z); - bc = bc.getLocation(dir); - te = world.getTileEntity(bc.x, bc.y, bc.z); - if (te instanceof TileCapacitorBank) { - if (((TileCapacitorBank) te).isMaxSize()) { - ChatUtil.sendNoSpam((EntityPlayerMP) player, "Capacitor bank is at maximum size"); - } - } - } - } - } - world.markBlockForUpdate(x, y, z); - } - - @Override - public int quantityDropped(Random r) { - return 0; - } - - @Override - public void breakBlock(World world, int x, int y, int z, Block par5, int par6) { - if (!world.isRemote && world.getGameRules().getGameRuleBooleanValue("doTileDrops")) { - TileEntity te = world.getTileEntity(x, y, z); - if (!(te instanceof TileCapacitorBank)) { - super.breakBlock(world, x, y, z, par5, par6); - return; - } - TileCapacitorBank cb = (TileCapacitorBank) te; - Util.dropItems(world, cb, x, y, z, true); - } - } - - @Override - @SideOnly(Side.CLIENT) - public AxisAlignedBB getSelectedBoundingBoxFromPool(World world, int x, int y, int z) { - TileEntity te = world.getTileEntity(x, y, z); - if (!(te instanceof TileCapacitorBank)) { - return super.getSelectedBoundingBoxFromPool(world, x, y, z); - } - TileCapacitorBank tr = (TileCapacitorBank) te; - if (!tr.isMultiblock()) { - return super.getSelectedBoundingBoxFromPool(world, x, y, z); - } - - Vector3d min = new Vector3d(Double.MAX_VALUE, Double.MAX_VALUE, Double.MAX_VALUE); - Vector3d max = new Vector3d(-Double.MAX_VALUE, -Double.MAX_VALUE, -Double.MAX_VALUE); - for (BlockCoord bc : tr.multiblock) { - min.x = Math.min(min.x, bc.x); - max.x = Math.max(max.x, bc.x + 1); - min.y = Math.min(min.y, bc.y); - max.y = Math.max(max.y, bc.y + 1); - min.z = Math.min(min.z, bc.z); - max.z = Math.max(max.z, bc.z + 1); - } - return AxisAlignedBB.getBoundingBox(min.x, min.y, min.z, max.x, max.y, max.z); - } - - @Override - public void getWailaInfo(List tooltip, EntityPlayer player, World world, int x, int y, int z) { - TileEntity te = world.getTileEntity(x, y, z); - if (te instanceof TileCapacitorBank) { - TileCapacitorBank cap = (TileCapacitorBank) te; - String format = Util.TAB + Util.ALIGNRIGHT + EnumChatFormatting.WHITE; - - tooltip.add( - String.format( - "%s : %s%s%sRF/t ", - EnderIO.lang.localize("capbank.maxIO"), - format, - PowerDisplayUtil.formatPower(cap.getMaxIO()), - Util.TAB + Util.ALIGNRIGHT)); - tooltip.add( - String.format( - "%s : %s%s%sRF/t ", - EnderIO.lang.localize("capbank.maxIn"), - format, - PowerDisplayUtil.formatPower(cap.getMaxInput()), - Util.TAB + Util.ALIGNRIGHT)); - tooltip.add( - String.format( - "%s : %s%s%sRF/t ", - EnderIO.lang.localize("capbank.maxOut"), - format, - PowerDisplayUtil.formatPower(cap.getMaxOutput()), - Util.TAB + Util.ALIGNRIGHT)); - tooltip.add("Deprecated. Convert by placing in crafting grid"); - } - } - - @Override - public int getDefaultDisplayMask(World world, int x, int y, int z) { - return IWailaInfoProvider.BIT_DETAILED; - } -} diff --git a/src/main/java/crazypants/enderio/machine/power/BlockItemCapacitorBank.java b/src/main/java/crazypants/enderio/machine/power/BlockItemCapacitorBank.java deleted file mode 100644 index f4e98226..00000000 --- a/src/main/java/crazypants/enderio/machine/power/BlockItemCapacitorBank.java +++ /dev/null @@ -1,109 +0,0 @@ -package crazypants.enderio.machine.power; - -import java.util.List; - -import net.minecraft.block.Block; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; - -import cofh.api.energy.IEnergyContainerItem; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.EnderIO; -import crazypants.enderio.EnderIOTab; -import crazypants.enderio.power.PowerHandlerUtil; - -public class BlockItemCapacitorBank extends ItemBlock implements IEnergyContainerItem { - - public static ItemStack createItemStackWithPower(int storedEnergy) { - ItemStack res = new ItemStack(EnderIO.blockCapacitorBank); - PowerHandlerUtil.setStoredEnergyForItem(res, storedEnergy); - return res; - } - - public BlockItemCapacitorBank() { - super(EnderIO.blockCapacitorBank); - setHasSubtypes(true); - } - - public BlockItemCapacitorBank(Block block) { - super(block); - setHasSubtypes(true); - setCreativeTab(EnderIOTab.tabEnderIO); - } - - @Override - public int getMetadata(int par1) { - return par1; - } - - @Override - public String getUnlocalizedName(ItemStack par1ItemStack) { - int meta = par1ItemStack.getItemDamage(); - String result = super.getUnlocalizedName(par1ItemStack); - if (meta == 1) { - result += ".creative"; - } - return result; - } - - @Override - @SideOnly(Side.CLIENT) - public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) {} - - @Override - public boolean showDurabilityBar(ItemStack itemStack) { - return itemStack.getItemDamage() != 1; - } - - @Override - public double getDurabilityForDisplay(ItemStack itemStack) { - double stored = getMaxEnergyStored(itemStack) - getEnergyStored(itemStack) + 1; - double max = getMaxEnergyStored(itemStack) + 1; - return stored / max; - } - - @Override - public int receiveEnergy(ItemStack container, int maxReceive, boolean simulate) { - if (container.stackSize > 1) { - return 0; - } - int energy = getEnergyStored(container); - int maxInput = TileCapacitorBank.BASE_CAP.getMaxEnergyReceived(); - int energyReceived = Math.min(getMaxEnergyStored(container) - energy, Math.min(maxReceive, maxInput)); - - if (!simulate && container.getItemDamage() != 1) { - energy += energyReceived; - PowerHandlerUtil.setStoredEnergyForItem(container, energy); - } - return energyReceived; - } - - @Override - public int extractEnergy(ItemStack container, int maxExtract, boolean simulate) { - if (container.stackSize > 1) { - return 0; - } - int energy = getEnergyStored(container); - int maxOutput = TileCapacitorBank.BASE_CAP.getMaxEnergyExtracted(); - int energyExtracted = Math.min(energy, Math.min(maxExtract, maxOutput)); - - if (!simulate && container.getItemDamage() != 1) { - energy -= energyExtracted; - PowerHandlerUtil.setStoredEnergyForItem(container, energy); - } - return energyExtracted; - } - - @Override - public int getEnergyStored(ItemStack container) { - return PowerHandlerUtil.getStoredEnergyForItem(container); - } - - @Override - public int getMaxEnergyStored(ItemStack container) { - return TileCapacitorBank.BASE_CAP.getMaxEnergyStored(); - } -} diff --git a/src/main/java/crazypants/enderio/machine/power/CapBankRenderer2.java b/src/main/java/crazypants/enderio/machine/power/CapBankRenderer2.java deleted file mode 100644 index fedd4180..00000000 --- a/src/main/java/crazypants/enderio/machine/power/CapBankRenderer2.java +++ /dev/null @@ -1,280 +0,0 @@ -package crazypants.enderio.machine.power; - -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.block.Block; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; -import net.minecraftforge.common.util.ForgeDirection; - -import com.enderio.core.api.client.render.IRenderFace; -import com.enderio.core.client.render.ConnectedTextureRenderer; -import com.enderio.core.client.render.CustomCubeRenderer; -import com.enderio.core.client.render.CustomRenderBlocks; -import com.enderio.core.client.render.IconUtil; -import com.enderio.core.client.render.RenderUtil; -import com.enderio.core.common.util.BlockCoord; -import com.enderio.core.common.util.ForgeDirectionOffsets; -import com.enderio.core.common.vecmath.Vector2f; -import com.enderio.core.common.vecmath.Vector3d; -import com.enderio.core.common.vecmath.Vector4d; -import com.enderio.core.common.vecmath.Vector4f; -import com.enderio.core.common.vecmath.Vertex; -import com.gtnewhorizons.angelica.api.ThreadSafeISBRH; - -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import crazypants.enderio.EnderIO; -import crazypants.enderio.machine.power.GaugeBounds.VPos; - -@ThreadSafeISBRH(perThread = true) -public class CapBankRenderer2 implements ISimpleBlockRenderingHandler { - - private static final BlockCoord DEFAULT_BC = new BlockCoord(0, 0, 0); - private static final BlockCoord[] DEFAULT_MB = new BlockCoord[] { DEFAULT_BC }; - private static final double PIXEL_SIZE = 1 / 16d; - - private final List renderers = new ArrayList<>(2); - - private ConnectedTextureRenderer connectedTexRenderer; - - public CapBankRenderer2() { - connectedTexRenderer = new ConnectedTextureRenderer(); - connectedTexRenderer.setMatchMeta(true); - - GaugueRenderer gaugeRenderer = new GaugueRenderer(); - renderers.add(connectedTexRenderer); - renderers.add(gaugeRenderer); - } - - @Override - public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) {} - - @Override - public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, - RenderBlocks renderer) { - TileEntity te = world.getTileEntity(x, y, z); - if (te instanceof TileCapacitorBank) { - TileCapacitorBank cb = ((TileCapacitorBank) te); - cb.energyAtLastRender = cb.getEnergyStored(); - } - int meta = world.getBlockMetadata(x, y, z); - if (meta == 1) { - connectedTexRenderer.setEdgeTexture(IconUtil.whiteTexture); - connectedTexRenderer.setForceAllEdges(true); - } else { - connectedTexRenderer.setEdgeTexture(EnderIO.blockAlloySmelter.getBlockTextureFromSide(3)); - connectedTexRenderer.setForceAllEdges(false); - } - CustomCubeRenderer.get().renderBlock(world, block, x, y, z, renderers); - return true; - } - - @Override - public boolean shouldRender3DInInventory(int modelId) { - return true; - } - - @Override - public int getRenderId() { - return BlockCapacitorBank.renderId; - } - - private class GaugueRenderer implements IRenderFace { - - @Override - public void renderFace(CustomRenderBlocks rb, ForgeDirection face, Block par1Block, double x, double y, - double z, IIcon texture, List refVertices, boolean translateToXyz) { - // Gauge - TileEntity te = rb.blockAccess.getTileEntity((int) x, (int) y, (int) z); - if (!(te instanceof TileCapacitorBank)) { - return; - } - TileCapacitorBank capBank = ((TileCapacitorBank) te); - List gaugeBounds = null; - gaugeBounds = capBank.getGaugeBounds(); - - if (gaugeBounds == null || gaugeBounds.isEmpty()) { - return; - } - - for (GaugeBounds gb : gaugeBounds) { - if (gb.face == face) { - Tessellator tes = Tessellator.instance; - tes.addTranslation((float) x, (float) y, (float) z); - int b = 0; - Vector4f col = new Vector4f(); - int colCount = 0; - for (Vertex v : refVertices) { - b += v.brightness; - if (v.color != null) { - colCount++; - col.add(v.color); - } - } - if (b > 0) { - b /= 4; - tes.setBrightness(b); - } else { - tes.setBrightness(15 << 20 | 0 << 4); - } - if (colCount > 0) { - col.scale(0.25); - tes.setColorRGBA_F(col.x, col.y, col.z, col.w); - } - renderGaugeOnFace(gb, EnderIO.blockCapacitorBank.overlayIcon, refVertices, x, y, z); - renderFillBarOnFace( - gb, - EnderIO.blockCapacitorBank.fillBarIcon, - capBank.getEnergyStoredRatio(), - refVertices, - x, - y, - z); - capBank.lastRenderStoredRatio = capBank.getEnergyStoredRatio(); - tes.addTranslation((float) -x, (float) -y, (float) -z); - return; - } - } - } - - private List calculateGaugeBounds(BlockCoord me, BlockCoord[] mb) { - List res = new ArrayList(); - for (ForgeDirection face : ForgeDirection.VALID_DIRECTIONS) { - if (face != ForgeDirection.UP && face != ForgeDirection.DOWN) { - boolean isRight = isRightFace(me, mb, face); - if (isRight) { - res.add(new GaugeBounds(me, mb, face)); - } - } - } - return res; - } - - private void renderGaugeOnFace(GaugeBounds gb, IIcon icon, List vertices, double x, double y, - double z) { - Tessellator tes = Tessellator.instance; - Vector2f u = gb.getMinMaxU(icon); - List corners = gb.bb.getCornersWithUvForFace(gb.face, u.x, u.y, icon.getMinV(), icon.getMaxV()); - for (Vertex coord : corners) { - coord.xyz.add(ForgeDirectionOffsets.offsetScaled(gb.face, 0.001f)); - Vector3d xyz = new Vector3d(coord.xyz); - xyz.x += x; - xyz.y += y; - xyz.z += z; - Vertex v = getClosestVertex(vertices, xyz); - if (v != null) { - if (v.color != null) { - tes.setColorRGBA_F(v.color.x, v.color.y, v.color.z, v.color.w); - } else { - tes.setColorOpaque_F(0.7f, 0.7f, 0.7f); - } - if (v.brightness > 0) { - tes.setBrightness(v.brightness); - } - } - if (coord.uv != null) { - tes.addVertexWithUV(coord.x(), coord.y(), coord.z(), coord.u(), coord.v()); - } else { - tes.addVertexWithUV(coord.x(), coord.y(), coord.z(), 0, 0); - } - } - } - - private void renderFillBarOnFace(GaugeBounds gb, IIcon icon, double filledRatio, List vertices, - double x, double y, double z) { - - int totalPixels; - if (gb.vInfo.verticalHeight == 1) { - totalPixels = VPos.SINGLE_BLOCK.numFillPixels; - } else { - totalPixels = VPos.BOTTOM.numFillPixels + VPos.TOP.numFillPixels - + (VPos.MIDDLE.numFillPixels * (gb.vInfo.verticalHeight - 2)); - } - - int targetPixelCount = (int) Math.max(0, Math.round(totalPixels * filledRatio)); - int pixelsBellowFace; - if (gb.vInfo.index < 2) { - // either none or a bottom section - pixelsBellowFace = gb.vInfo.index * VPos.BOTTOM.numFillPixels; - } else { // has middle section - pixelsBellowFace = VPos.BOTTOM.numFillPixels + (VPos.MIDDLE.numFillPixels * (gb.vInfo.index - 1)); - } - - if (pixelsBellowFace >= targetPixelCount) { - return; - } - - VPos yPos = gb.vInfo.pos; - int numPixelsLeft = targetPixelCount - pixelsBellowFace; - int fillPixels = Math.min(numPixelsLeft, yPos.numFillPixels); - - double maxY = (yPos.fillOffset * PIXEL_SIZE) + (fillPixels * PIXEL_SIZE); - float vWidth = icon.getMaxV() - icon.getMinV(); - float maxV = icon.getMinV() + ((float) maxY * vWidth); - - Tessellator tes = Tessellator.instance; - Vector2f u = gb.getMinMaxU(icon); - List corners = gb.bb - .getCornersWithUvForFace(gb.face, u.x, u.y, icon.getMinV(), maxV); - for (Vertex coord : corners) { - coord.xyz.add(ForgeDirectionOffsets.offsetScaled(gb.face, 0.002f)); - - Vector3d xyz = new Vector3d(coord.xyz); - xyz.x += x; - xyz.y += y; - xyz.z += z; - Vertex v = getClosestVertex(vertices, xyz); - if (v != null) { - if (v.color != null) { - tes.setColorRGBA_F(v.color.x, v.color.y, v.color.z, v.color.w); - } else { - tes.setColorOpaque_F(0.7f, 0.7f, 0.7f); - } - if (v.brightness > 0) { - tes.setBrightness(v.brightness); - } - } - - if (coord.uv != null) { - tes.addVertexWithUV(coord.x(), Math.min(coord.y(), maxY), coord.z(), coord.u(), coord.v()); - } else { - tes.addVertexWithUV(coord.x(), Math.min(coord.y(), maxY), coord.z(), 0, 0); - } - } - } - - private boolean isRightFace(BlockCoord me, BlockCoord[] mb, ForgeDirection dir) { - Vector4d uPlane = RenderUtil.getUPlaneForFace(dir); - - int myRightVal = (int) uPlane.x * me.x + (int) uPlane.y * me.y + (int) uPlane.z * me.z; - int max = myRightVal; - for (BlockCoord bc : mb) { - int val = (int) uPlane.x * bc.x + (int) uPlane.y * bc.y + (int) uPlane.z * bc.z; - if (val > max) { - max = val; - } - } - return myRightVal == max; - } - - private Vertex getClosestVertex(List vertices, Vector3d corner) { - Vertex result = null; - double d2 = Double.MAX_VALUE; - for (Vertex v : vertices) { - double tmp = corner.distanceSquared(v.xyz); - if (tmp <= d2) { - result = v; - d2 = tmp; - } - } - return result; - } - } - - // ------------ Inner Classes - -} diff --git a/src/main/java/crazypants/enderio/machine/power/CapacitorBankRenderer.java b/src/main/java/crazypants/enderio/machine/power/CapacitorBankRenderer.java deleted file mode 100644 index dd25a0ff..00000000 --- a/src/main/java/crazypants/enderio/machine/power/CapacitorBankRenderer.java +++ /dev/null @@ -1,339 +0,0 @@ -package crazypants.enderio.machine.power; - -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; -import net.minecraftforge.client.IItemRenderer; -import net.minecraftforge.common.util.ForgeDirection; - -import org.lwjgl.opengl.GL11; - -import com.enderio.core.client.render.BoundingBox; -import com.enderio.core.client.render.CubeRenderer; -import com.enderio.core.client.render.IconUtil; -import com.enderio.core.client.render.RenderUtil; -import com.enderio.core.common.util.BlockCoord; -import com.enderio.core.common.vecmath.Vector2f; -import com.enderio.core.common.vecmath.Vector4d; -import com.enderio.core.common.vecmath.Vertex; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.EnderIO; -import crazypants.enderio.power.PowerHandlerUtil; - -@SideOnly(Side.CLIENT) -public class CapacitorBankRenderer extends TileEntitySpecialRenderer implements IItemRenderer { - - private static final BlockCoord DEFAULT_BC = new BlockCoord(0, 0, 0); - private static final BlockCoord[] DEFAULT_MB = new BlockCoord[] { DEFAULT_BC }; - private static final double PIXEL_SIZE = 1 / 16d; - - // ------------------------- Item renderer - - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { - return true; - } - - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { - return true; - } - - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - renderBlock( - null, - PowerHandlerUtil.getStoredEnergyForItem(item) / TileCapacitorBank.BASE_CAP.getMaxEnergyStored(), - item.getItemDamage()); - } - - // ------------------------- Entity renderer - - @Override - public void renderTileEntityAt(TileEntity te, double x, double y, double z, float f) { - if (!(te instanceof TileCapacitorBank)) { - return; - } - - Minecraft.getMinecraft().entityRenderer.disableLightmap(0); - GL11.glPushMatrix(); - GL11.glTranslated(x, y, z); - - TileCapacitorBank cb = (TileCapacitorBank) te; - renderBlock(cb, cb.getEnergyStoredRatio(), 0); - - GL11.glPopMatrix(); - Minecraft.getMinecraft().entityRenderer.enableLightmap(0); - } - - private void renderBlock(TileCapacitorBank te, double filledRatio, int meta) { - RenderUtil.bindBlockTexture(); - Tessellator tes = Tessellator.instance; - - BlockCoord myBC; - BlockCoord[] mb; - if (te != null && te.isMultiblock()) { - myBC = new BlockCoord(te); - mb = te.multiblock; - } else { - myBC = DEFAULT_BC; - mb = DEFAULT_MB; - } - - List gaugeBounds = calculateGaugeBounds(myBC, mb); - - float[] brightness; - float maxBrightness = 0; - if (te != null) { - brightness = new float[6]; - for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - brightness[dir.ordinal()] = RenderUtil.claculateTotalBrightnessForLocation( - te.getWorldObj(), - te.xCoord + dir.offsetX, - te.yCoord + dir.offsetY, - te.zCoord + dir.offsetZ); - maxBrightness = Math.max(brightness[dir.ordinal()], maxBrightness); - } - } else { - brightness = new float[] { 1, 1, 1, 1, 1, 1 }; - maxBrightness = 1; - } - - tes.startDrawingQuads(); - CubeRenderer.get() - .render(BoundingBox.UNIT_CUBE, EnderIO.blockCapacitorBank.getIcon(0, 0), null, brightness, true); - tes.draw(); - - GL11.glEnable(GL11.GL_POLYGON_OFFSET_FILL); - GL11.glPolygonOffset(-1.0f, -1.0f); - - tes.startDrawingQuads(); - tes.setColorRGBA_F(maxBrightness, maxBrightness, maxBrightness, 1); - if (te != null) { - renderBorder(te.getWorldObj(), te.xCoord, te.yCoord, te.zCoord, meta); - } else { - renderBorder(null, 0, 0, 0, meta); - } - for (GaugeBounds gb : gaugeBounds) { - renderGaugeOnFace(gb, EnderIO.blockCapacitorBank.overlayIcon); - } - tes.draw(); - - GL11.glPolygonOffset(-3.0F, -3.0F); - tes.startDrawingQuads(); - tes.setColorRGBA_F(maxBrightness, maxBrightness, maxBrightness, 1); - - for (GaugeBounds gb : gaugeBounds) { - renderFillBarOnFace(gb, EnderIO.blockCapacitorBank.fillBarIcon, filledRatio); - } - tes.draw(); - - GL11.glDisable(GL11.GL_POLYGON_OFFSET_FILL); - } - - private void renderBorder(IBlockAccess blockAccess, int x, int y, int z, int meta) { - IIcon texture; - if (meta == 0) { - texture = EnderIO.blockAlloySmelter.getBlockTextureFromSide(3); - } else { - texture = IconUtil.whiteTexture; - } - for (ForgeDirection face : ForgeDirection.VALID_DIRECTIONS) { - RenderUtil.renderConnectedTextureFace( - blockAccess, - EnderIO.blockCapacitorBank, - x, - y, - z, - face, - texture, - blockAccess == null, - false, - false); - } - } - - private List calculateGaugeBounds(BlockCoord me, BlockCoord[] mb) { - List res = new ArrayList(); - for (ForgeDirection face : ForgeDirection.VALID_DIRECTIONS) { - if (face != ForgeDirection.UP && face != ForgeDirection.DOWN) { - boolean isRight = isRightFace(me, mb, face); - if (isRight) { - res.add(new GaugeBounds(me, mb, face)); - } - } - } - return res; - } - - private void renderGaugeOnFace(GaugeBounds gb, IIcon icon) { - Tessellator tes = Tessellator.instance; - tes.setNormal(gb.face.offsetX, gb.face.offsetY, gb.face.offsetZ); - Vector2f u = gb.getMinMaxU(icon); - List corners = gb.bb.getCornersWithUvForFace(gb.face, u.x, u.y, icon.getMinV(), icon.getMaxV()); - for (Vertex coord : corners) { - tes.setNormal(coord.nx(), coord.ny(), coord.nz()); - if (coord.uv != null) { - tes.addVertexWithUV(coord.x(), coord.y(), coord.z(), coord.u(), coord.v()); - } else { - tes.addVertexWithUV(coord.x(), coord.y(), coord.z(), 0, 0); - } - } - } - - private void renderFillBarOnFace(GaugeBounds gb, IIcon icon, double filledRatio) { - - int totalPixels; - if (gb.vInfo.verticalHeight == 1) { - totalPixels = VPos.SINGLE_BLOCK.numFillPixels; - } else { - totalPixels = VPos.BOTTOM.numFillPixels + VPos.TOP.numFillPixels - + (VPos.MIDDLE.numFillPixels * (gb.vInfo.verticalHeight - 2)); - } - - int targetPixelCount = (int) Math.max(0, Math.round(totalPixels * filledRatio)); - int pixelsBellowFace; - if (gb.vInfo.index < 2) { - // either none or a bottom section - pixelsBellowFace = gb.vInfo.index * VPos.BOTTOM.numFillPixels; - } else { // has middle section - pixelsBellowFace = VPos.BOTTOM.numFillPixels + (VPos.MIDDLE.numFillPixels * (gb.vInfo.index - 1)); - } - - if (pixelsBellowFace >= targetPixelCount) { - return; - } - - VPos yPos = gb.vInfo.pos; - int numPixelsLeft = targetPixelCount - pixelsBellowFace; - int fillPixels = Math.min(numPixelsLeft, yPos.numFillPixels); - - double maxY = (yPos.fillOffset * PIXEL_SIZE) + (fillPixels * PIXEL_SIZE); - float vWidth = icon.getMaxV() - icon.getMinV(); - float maxV = icon.getMinV() + ((float) maxY * vWidth); - - Tessellator tes = Tessellator.instance; - tes.setNormal(gb.face.offsetX, gb.face.offsetY, gb.face.offsetZ); - Vector2f u = gb.getMinMaxU(icon); - List corners = gb.bb - .getCornersWithUvForFace(gb.face, u.x, u.y, icon.getMinV(), maxV); - for (Vertex coord : corners) { - if (coord.uv != null) { - tes.addVertexWithUV(coord.x(), Math.min(coord.y(), maxY), coord.z(), coord.u(), coord.v()); - } else { - tes.addVertexWithUV(coord.x(), Math.min(coord.y(), maxY), coord.z(), 0, 0); - } - } - } - - private boolean isRightFace(BlockCoord me, BlockCoord[] mb, ForgeDirection dir) { - Vector4d uPlane = RenderUtil.getUPlaneForFace(dir); - - int myRightVal = (int) uPlane.x * me.x + (int) uPlane.y * me.y + (int) uPlane.z * me.z; - int max = myRightVal; - for (BlockCoord bc : mb) { - int val = (int) uPlane.x * bc.x + (int) uPlane.y * bc.y + (int) uPlane.z * bc.z; - if (val > max) { - max = val; - } - } - return myRightVal == max; - } - - // ------------ Inner Classes - - enum VPos { - - SINGLE_BLOCK(0, 10, 3), - BOTTOM(0.5f, 13, 3), - MIDDLE(0.75f, 16, 0), - TOP(0.25f, 13, 0); - - final float uOffset; - final int numFillPixels; - final int fillOffset; - - private VPos(float uOffset, int numFillPixels, int fillOffset) { - this.uOffset = uOffset; - this.numFillPixels = numFillPixels; - this.fillOffset = fillOffset; - } - } - - static class VInfo { - - VPos pos; - int verticalHeight; - int index; - - VInfo(VPos pos, int verticalHeight, int index) { - this.pos = pos; - this.verticalHeight = verticalHeight; - this.index = index; - } - } - - static class GaugeBounds { - - final BoundingBox bb; - final VInfo vInfo; - final ForgeDirection face; - - GaugeBounds(BlockCoord me, BlockCoord[] mb, ForgeDirection face) { - this.face = face; - vInfo = getVPosForFace(me, mb, face); - - Vector4d uPlane = RenderUtil.getUPlaneForFace(face); - float scaleX = uPlane.x != 0 ? 0.25f : 1; - float scaleY = uPlane.y != 0 ? 0.25f : 1; - float scaleZ = uPlane.z != 0 ? 0.25f : 1; - bb = BoundingBox.UNIT_CUBE.scale(scaleX, scaleY, scaleZ); - } - - Vector2f getMinMaxU(IIcon icon) { - VPos yPos = vInfo.pos; - float uWidth = icon.getMaxU() - icon.getMinU(); - float uOffset = yPos.uOffset * uWidth; - float minU = icon.getMinU() + uOffset; - float maxU = minU + (uWidth * 0.25f); - return new Vector2f(minU, maxU); - } - - private VInfo getVPosForFace(BlockCoord me, BlockCoord[] mb, ForgeDirection face) { - int maxY = me.y; - int minY = me.y; - for (BlockCoord bc : mb) { - if (bc.x == me.x && bc.z == me.z && !containsLocaction(mb, bc.getLocation(face))) { - maxY = Math.max(maxY, bc.y); - minY = Math.min(minY, bc.y); - } - } - if (maxY == me.y && minY == me.y) { - return new VInfo(VPos.SINGLE_BLOCK, 1, 0); - } - int height = maxY - minY + 1; - if (maxY > me.y) { - return me.y > minY ? new VInfo(VPos.MIDDLE, height, me.y - minY) : new VInfo(VPos.BOTTOM, height, 0); - } - return new VInfo(VPos.TOP, height, height - 1); - } - - private boolean containsLocaction(BlockCoord[] mb, BlockCoord location) { - for (BlockCoord bc : mb) { - if (location.equals(bc)) { - return true; - } - } - return false; - } - } -} diff --git a/src/main/java/crazypants/enderio/machine/power/ContainerCapacitorBank.java b/src/main/java/crazypants/enderio/machine/power/ContainerCapacitorBank.java deleted file mode 100644 index 96316bc9..00000000 --- a/src/main/java/crazypants/enderio/machine/power/ContainerCapacitorBank.java +++ /dev/null @@ -1,172 +0,0 @@ -package crazypants.enderio.machine.power; - -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemArmor; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -public class ContainerCapacitorBank extends Container { - - private final TileCapacitorBank tileEntity; - - public ContainerCapacitorBank(final Entity player, InventoryPlayer playerInv, TileCapacitorBank te) { - - tileEntity = te; - int armorOffset = 21; - addSlotToContainer(new Slot(tileEntity, 0, 59 + armorOffset, 59) { - - @Override - public boolean isItemValid(ItemStack itemStack) { - return tileEntity.isItemValidForSlot(0, itemStack); - } - }); - - addSlotToContainer(new Slot(tileEntity, 1, 79 + armorOffset, 59) { - - @Override - public boolean isItemValid(ItemStack itemStack) { - return tileEntity.isItemValidForSlot(1, itemStack); - } - }); - - addSlotToContainer(new Slot(tileEntity, 2, 99 + armorOffset, 59) { - - @Override - public boolean isItemValid(ItemStack itemStack) { - return tileEntity.isItemValidForSlot(2, itemStack); - } - }); - - addSlotToContainer(new Slot(tileEntity, 3, 119 + armorOffset, 59) { - - @Override - public boolean isItemValid(ItemStack itemStack) { - return tileEntity.isItemValidForSlot(3, itemStack); - } - }); - - // add players inventory - for (int i = 0; i < 3; ++i) { - for (int j = 0; j < 9; ++j) { - addSlotToContainer(new Slot(playerInv, j + i * 9 + 9, +armorOffset + 8 + j * 18, 84 + i * 18)); - } - } - - for (int i = 0; i < 9; ++i) { - addSlotToContainer(new Slot(playerInv, i, +armorOffset + 8 + i * 18, 142)); - } - - // armor slots - for (int i = 0; i < 4; ++i) { - final int k = i; - addSlotToContainer( - new Slot(playerInv, playerInv.getSizeInventory() - 1 - i, -15 + armorOffset, 30 + i * 18) { - - @Override - public int getSlotStackLimit() { - return 1; - } - - @Override - public boolean isItemValid(ItemStack par1ItemStack) { - if (par1ItemStack == null) { - return false; - } - return par1ItemStack.getItem().isValidArmor(par1ItemStack, k, player); - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon getBackgroundIconIndex() { - return ItemArmor.func_94602_b(k); - } - }); - } - } - - @Override - public boolean canInteractWith(EntityPlayer entityplayer) { - return true; - } - - @Override - public ItemStack transferStackInSlot(EntityPlayer entityPlayer, int slotIndex) { - - int startPlayerSlot = 4; - int endPlayerSlot = startPlayerSlot + 26; - int startHotBarSlot = endPlayerSlot + 1; - int endHotBarSlot = startHotBarSlot + 9; - - ItemStack copystack = null; - Slot slot = (Slot) inventorySlots.get(slotIndex); - if (slot != null && slot.getHasStack()) { - - ItemStack origStack = slot.getStack(); - copystack = origStack.copy(); - - if (slotIndex < 4) { - // merge from machine input slots to inventory - if (!mergeItemStackIntoArmor(entityPlayer, origStack, slotIndex)) { - if (!mergeItemStack(origStack, startPlayerSlot, endHotBarSlot, false)) { - return null; - } - } - - } else { - // Check from inv-> charge then inv->hotbar or hotbar->inv - if (slotIndex >= startPlayerSlot) { - if (!tileEntity.isItemValidForSlot(0, origStack) || !mergeItemStack(origStack, 0, 4, false)) { - - if (slotIndex <= endPlayerSlot) { - if (!mergeItemStack(origStack, startHotBarSlot, endHotBarSlot, false)) { - return null; - } - } else if (slotIndex >= startHotBarSlot && slotIndex <= endHotBarSlot) { - if (!mergeItemStack(origStack, startPlayerSlot, endPlayerSlot, false)) { - return null; - } - } - } - } - } - - if (origStack.stackSize == 0) { - slot.putStack((ItemStack) null); - } else { - slot.onSlotChanged(); - } - - slot.onSlotChanged(); - - if (origStack.stackSize == copystack.stackSize) { - return null; - } - - slot.onPickupFromSlot(entityPlayer, origStack); - } - - return copystack; - } - - private boolean mergeItemStackIntoArmor(EntityPlayer entityPlayer, ItemStack origStack, int slotIndex) { - if (origStack == null || !(origStack.getItem() instanceof ItemArmor)) { - return false; - } - ItemArmor armor = (ItemArmor) origStack.getItem(); - int index = 3 - armor.armorType; - ItemStack[] ai = entityPlayer.inventory.armorInventory; - if (ai[index] == null) { - ai[index] = origStack.copy(); - origStack.stackSize = 0; - return true; - } - return false; - } -} diff --git a/src/main/java/crazypants/enderio/machine/power/GaugeBounds.java b/src/main/java/crazypants/enderio/machine/power/GaugeBounds.java deleted file mode 100644 index 732a3793..00000000 --- a/src/main/java/crazypants/enderio/machine/power/GaugeBounds.java +++ /dev/null @@ -1,157 +0,0 @@ -package crazypants.enderio.machine.power; - -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.util.IIcon; -import net.minecraftforge.common.util.ForgeDirection; - -import com.enderio.core.client.render.BoundingBox; -import com.enderio.core.client.render.RenderUtil; -import com.enderio.core.common.util.BlockCoord; -import com.enderio.core.common.vecmath.Vector2f; -import com.enderio.core.common.vecmath.Vector4d; - -class GaugeBounds { - - private static final BlockCoord DEFAULT_BC = new BlockCoord(0, 0, 0); - private static final BlockCoord[] DEFAULT_MB = new BlockCoord[] { DEFAULT_BC }; - - static List calculateGaugeBounds(BlockCoord me, BlockCoord[] mbIn) { - - BlockCoord[] mb; - if (mbIn != null) { - mb = mbIn; - } else { - DEFAULT_MB[0] = me; - mb = DEFAULT_MB; - } - - List res = new ArrayList(); - for (ForgeDirection face : ForgeDirection.VALID_DIRECTIONS) { - if (face != ForgeDirection.UP && face != ForgeDirection.DOWN) { - boolean isRight = isRightFace(me, mb, face); - if (isRight) { - res.add(new GaugeBounds(me, mb, face)); - } - } - } - return res; - } - - static boolean isRightFace(BlockCoord me, BlockCoord[] mb, ForgeDirection dir) { - - if (me == null || contains(mb, me.getLocation(dir))) { - return false; - } - if (mb == null) { - return true; - } - Vector4d uPlane = RenderUtil.getUPlaneForFace(dir); - - int myRightVal = (int) uPlane.x * me.x + (int) uPlane.y * me.y + (int) uPlane.z * me.z; - int max = myRightVal; - for (BlockCoord bc : mb) { - int val = (int) uPlane.x * bc.x + (int) uPlane.y * bc.y + (int) uPlane.z * bc.z; - if (val > max) { - max = val; - } - } - return myRightVal == max; - } - - private static boolean contains(BlockCoord[] mb, BlockCoord location) { - if (mb == null) { - return false; - } - for (BlockCoord bc : mb) { - if (location.equals(bc)) { - return true; - } - } - return false; - } - - final BoundingBox bb; - final VInfo vInfo; - final ForgeDirection face; - - GaugeBounds(BlockCoord me, BlockCoord[] mb, ForgeDirection face) { - this.face = face; - vInfo = getVPosForFace(me, mb, face); - - Vector4d uPlane = RenderUtil.getUPlaneForFace(face); - float scaleX = uPlane.x != 0 ? 0.25f : 1; - float scaleY = uPlane.y != 0 ? 0.25f : 1; - float scaleZ = uPlane.z != 0 ? 0.25f : 1; - bb = BoundingBox.UNIT_CUBE.scale(scaleX, scaleY, scaleZ); - } - - Vector2f getMinMaxU(IIcon icon) { - VPos yPos = vInfo.pos; - float uWidth = icon.getMaxU() - icon.getMinU(); - float uOffset = yPos.uOffset * uWidth; - float minU = icon.getMinU() + uOffset; - float maxU = minU + (uWidth * 0.25f); - return new Vector2f(minU, maxU); - } - - private VInfo getVPosForFace(BlockCoord me, BlockCoord[] mb, ForgeDirection face) { - int maxY = me.y; - int minY = me.y; - for (BlockCoord bc : mb) { - if (bc.x == me.x && bc.z == me.z && !containsLocaction(mb, bc.getLocation(face))) { - maxY = Math.max(maxY, bc.y); - minY = Math.min(minY, bc.y); - } - } - if (maxY == me.y && minY == me.y) { - return new VInfo(VPos.SINGLE_BLOCK, 1, 0); - } - int height = maxY - minY + 1; - if (maxY > me.y) { - return me.y > minY ? new VInfo(VPos.MIDDLE, height, me.y - minY) : new VInfo(VPos.BOTTOM, height, 0); - } - return new VInfo(VPos.TOP, height, height - 1); - } - - private boolean containsLocaction(BlockCoord[] mb, BlockCoord location) { - for (BlockCoord bc : mb) { - if (location.equals(bc)) { - return true; - } - } - return false; - } - - enum VPos { - - SINGLE_BLOCK(0, 10, 3), - BOTTOM(0.5f, 13, 3), - MIDDLE(0.75f, 16, 0), - TOP(0.25f, 13, 0); - - final float uOffset; - final int numFillPixels; - final int fillOffset; - - private VPos(float uOffset, int numFillPixels, int fillOffset) { - this.uOffset = uOffset; - this.numFillPixels = numFillPixels; - this.fillOffset = fillOffset; - } - } - - static class VInfo { - - VPos pos; - int verticalHeight; - int index; - - VInfo(VPos pos, int verticalHeight, int index) { - this.pos = pos; - this.verticalHeight = verticalHeight; - this.index = index; - } - } -} diff --git a/src/main/java/crazypants/enderio/machine/power/GuiCapacitorBank.java b/src/main/java/crazypants/enderio/machine/power/GuiCapacitorBank.java deleted file mode 100644 index 1ea5d41d..00000000 --- a/src/main/java/crazypants/enderio/machine/power/GuiCapacitorBank.java +++ /dev/null @@ -1,335 +0,0 @@ -package crazypants.enderio.machine.power; - -import java.awt.Rectangle; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.gui.GuiTextField; -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.InventoryPlayer; - -import org.lwjgl.opengl.GL11; - -import com.enderio.core.client.gui.button.IconButton; -import com.enderio.core.client.gui.widget.GuiToolTip; -import com.enderio.core.common.util.BlockCoord; - -import crazypants.enderio.EnderIO; -import crazypants.enderio.gui.GuiContainerBaseEIO; -import crazypants.enderio.gui.IconEIO; -import crazypants.enderio.gui.RedstoneModeButton; -import crazypants.enderio.machine.IRedstoneModeControlable; -import crazypants.enderio.machine.IoMode; -import crazypants.enderio.machine.RedstoneControlMode; -import crazypants.enderio.machine.gui.GuiOverlayIoConfig; -import crazypants.enderio.machine.gui.GuiPoweredMachineBase; -import crazypants.enderio.network.PacketHandler; - -public class GuiCapacitorBank extends GuiContainerBaseEIO { - - protected static final int INPUT_BUTTON_ID = 18; - protected static final int OUTPUT_BUTTON_ID = 37; - - protected static final int CONFIG_ID = 377996104; - - private static final int POWER_X = 11 + 18; - private static final int POWER_Y = 9; - private static final int POWER_WIDTH = 10; - private static final int POWER_HEIGHT = 68; - protected static final int BOTTOM_POWER_Y = POWER_Y + POWER_HEIGHT; - - private int inputX = 78 + 24; - private int inputY = 18; - - private int outputX = 78 + 24; - private int outputY = 36; - - private int rightMargin = 8 + 24; - - private final TileCapacitorBank capBank; - - private RedstoneModeButton inputRsButton; - private RedstoneModeButton outputRsButton; - - private GuiTextField maxInputTF; - private GuiTextField maxOutputTF; - - private GuiOverlayIoConfig configOverlay; - private IconButton configB; - - public GuiCapacitorBank(Entity player, InventoryPlayer playerInv, TileCapacitorBank te) { - super(new ContainerCapacitorBank(player, playerInv, te), "capacitorBank"); - this.capBank = te; - - xSize = 176 + 42; - - addToolTip(new GuiToolTip(new Rectangle(5, POWER_Y, POWER_WIDTH, POWER_HEIGHT), "") { - - @Override - protected void updateText() { - text.clear(); - text.add(PowerDisplayUtil.formatPower(capBank.getEnergyStored()) + " " + PowerDisplayUtil.ofStr()); - text.add( - PowerDisplayUtil.formatPower(capBank.getMaxEnergyStored()) + " " - + PowerDisplayUtil.abrevation()); - } - }); - - int x = xSize - rightMargin - GuiPoweredMachineBase.BUTTON_SIZE - 21; - int y = inputY; - inputRsButton = new RedstoneModeButton(this, -1, x, y, new IRedstoneModeControlable() { - - @Override - public void setRedstoneControlMode(RedstoneControlMode mode) { - capBank.setInputControlMode(mode); - PacketHandler.INSTANCE.sendToServer(new PacketClientState(capBank)); - } - - @Override - public RedstoneControlMode getRedstoneControlMode() { - return capBank.getInputControlMode(); - } - }); - inputRsButton.setTooltipKey("enderio.gui.capBank.inputRs"); - - y += 18; - outputRsButton = new RedstoneModeButton(this, -1, x, y, new IRedstoneModeControlable() { - - @Override - public void setRedstoneControlMode(RedstoneControlMode mode) { - capBank.setOutputControlMode(mode); - PacketHandler.INSTANCE.sendToServer(new PacketClientState(capBank)); - } - - @Override - public RedstoneControlMode getRedstoneControlMode() { - return capBank.getOutputControlMode(); - } - }); - outputRsButton.setTooltipKey("enderio.gui.capBank.outputRs"); - - y += 20; - configB = new IconButton(this, CONFIG_ID, x, y, IconEIO.IO_CONFIG_UP); - configB.setToolTip(EnderIO.lang.localize("gui.machine.ioMode.overlay.tooltip")); - - List coords = new ArrayList(); - if (te.isMultiblock()) { - BlockCoord[] mb = te.getController().multiblock; - if (mb != null) { - coords.addAll(Arrays.asList(mb)); - } - } - - if (coords.isEmpty()) { - coords.add(te.getLocation()); - } - - configOverlay = new GuiOverlayIoConfig(coords) { - - @Override - public void setVisible(boolean visible) { - super.setVisible(visible); - configB.setIcon(visible ? IconEIO.IO_CONFIG_DOWN : IconEIO.IO_CONFIG_UP); - } - - @Override - protected String getLabelForMode(IoMode mode) { - if (mode == IoMode.PUSH) { - return EnderIO.lang.localize("gui.capBank.outputMode"); - } else if (mode == IoMode.PULL) { - return EnderIO.lang.localize("gui.capBank.inputMode"); - } - return super.getLabelForMode(mode); - } - }; - addOverlay(configOverlay); - } - - @Override - protected void actionPerformed(GuiButton b) { - super.actionPerformed(b); - if (b.id == CONFIG_ID) { - boolean vis = !configOverlay.isVisible(); - configOverlay.setVisible(vis); - } - } - - @Override - public void initGui() { - super.initGui(); - - configB.onGuiInit(); - - int x = guiLeft + xSize - rightMargin - GuiPoweredMachineBase.BUTTON_SIZE; - int y = guiTop + inputY; - - FontRenderer fontRenderer = getFontRenderer(); - - inputRsButton.onGuiInit(); - outputRsButton.onGuiInit(); - - x = guiLeft + inputX; - y = guiTop + inputY; - maxInputTF = new GuiTextField(fontRenderer, x, y, 68, 16); - maxInputTF.setCanLoseFocus(true); - maxInputTF.setMaxStringLength(10); - maxInputTF.setFocused(false); - maxInputTF.setText(PowerDisplayUtil.formatPower(capBank.getMaxInput())); - - x = guiLeft + outputX; - y = guiTop + outputY; - maxOutputTF = new GuiTextField(fontRenderer, x, y, 68, 16); - maxOutputTF.setCanLoseFocus(true); - maxOutputTF.setMaxStringLength(10); - maxOutputTF.setFocused(true); - maxOutputTF.setText(PowerDisplayUtil.formatPower(capBank.getMaxOutput())); - } - - @Override - protected void keyTyped(char par1, int par2) { - super.keyTyped(par1, par2); - if (par1 == 'e') { - super.keyTyped(par1, 1); - } - maxInputTF.textboxKeyTyped(par1, par2); - maxOutputTF.textboxKeyTyped(par1, par2); - updateInputOutput(); - } - - private void updateInputOutput() { - int input = parsePower(maxInputTF); - if (input >= 0 && capBank.getMaxInput() != input) { - setMaxInput(input); - } - int output = parsePower(maxOutputTF); - if (output >= 0 && capBank.getMaxOutput() != output) { - setMaxOutput(output); - } - } - - private void setMaxOutput(int output) { - if (output != capBank.getMaxOutput()) { - capBank.setMaxOutput(output); - maxOutputTF.setText(PowerDisplayUtil.formatPower(capBank.getMaxOutput())); - PacketHandler.INSTANCE.sendToServer(new PacketClientState(capBank)); - } - } - - private void setMaxInput(int input) { - if (input != capBank.getMaxInput()) { - capBank.setMaxInput(input); - maxInputTF.setText(PowerDisplayUtil.formatPower(capBank.getMaxInput())); - PacketHandler.INSTANCE.sendToServer(new PacketClientState(capBank)); - } - } - - private int parsePower(GuiTextField tf) { - String txt = tf.getText(); - try { - Integer power = PowerDisplayUtil.parsePower(txt); - if (power == null) { - return -1; - } - return power.intValue(); - } catch (Exception e) { - return -1; - } - } - - @Override - protected void mouseClicked(int par1, int par2, int par3) { - super.mouseClicked(par1, par2, par3); - maxInputTF.mouseClicked(par1, par2, par3); - maxOutputTF.mouseClicked(par1, par2, par3); - } - - @Override - public void updateScreen() { - maxInputTF.updateCursorCounter(); - maxOutputTF.updateCursorCounter(); - } - - @Override - protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { - - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - bindGuiTexture(); - int sx = (width - xSize) / 2; - int sy = (height - ySize) / 2; - - drawTexturedModalRect(sx, sy, 0, 0, this.xSize - 21, this.ySize); - - int i1 = capBank.getEnergyStoredScaled(POWER_HEIGHT); - drawTexturedModalRect(sx + POWER_X, sy + BOTTOM_POWER_Y - i1, 176 + 21, 0, POWER_WIDTH, i1); - - for (int i = 0; i < buttonList.size(); ++i) { - GuiButton guibutton = (GuiButton) this.buttonList.get(i); - guibutton.drawButton(this.mc, 0, 0); - } - - maxInputTF.drawTextBox(); - maxOutputTF.drawTextBox(); - - int midX = sx + xSize / 2; - - String str = EnderIO.lang.localize("gui.capBank.maxIo") + " " - + PowerDisplayUtil.formatPower(capBank.getMaxIO()) - + " " - + PowerDisplayUtil.abrevation() - + PowerDisplayUtil.perTickStr(); - FontRenderer fontRenderer = getFontRenderer(); - int swid = fontRenderer.getStringWidth(str); - int x = midX - swid / 2; - int y = guiTop + 5; - - drawString(fontRenderer, str, x, y, -1); - - str = EnderIO.lang.localize("gui.capBank.maxInput") + ":"; - swid = fontRenderer.getStringWidth(str); - x = guiLeft + inputX - swid - 3; - y = guiTop + inputY + 2; - drawString(fontRenderer, str, x, y, -1); - - str = EnderIO.lang.localize("gui.capBank.maxOutput") + ":"; - swid = fontRenderer.getStringWidth(str); - x = guiLeft + outputX - swid - 3; - y = guiTop + outputY + 2; - drawString(fontRenderer, str, x, y, -1); - } - - @Override - public void drawHoveringText(List par1List, int par2, int par3, FontRenderer font) { - GL11.glPushAttrib(GL11.GL_ENABLE_BIT | GL11.GL_LIGHTING_BIT); - super.drawHoveringText(par1List, par2 + 24, par3, font); - GL11.glPopAttrib(); - } - - @Override - public int getGuiLeft() { - return guiLeft + 24; - } - - @Override - public int getGuiTop() { - return guiTop; - } - - @Override - public int getXSize() { - return xSize - 42; - } - - @Override - public int getOverlayOffsetX() { - return 21; - } - - @Override - public FontRenderer getFontRenderer() { - return Minecraft.getMinecraft().fontRenderer; - } -} diff --git a/src/main/java/crazypants/enderio/machine/power/PacketClientState.java b/src/main/java/crazypants/enderio/machine/power/PacketClientState.java deleted file mode 100644 index 4764eb81..00000000 --- a/src/main/java/crazypants/enderio/machine/power/PacketClientState.java +++ /dev/null @@ -1,76 +0,0 @@ -package crazypants.enderio.machine.power; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; - -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; -import crazypants.enderio.machine.RedstoneControlMode; -import crazypants.enderio.network.PacketUtil; -import io.netty.buffer.ByteBuf; - -public class PacketClientState implements IMessage, IMessageHandler { - - private int x; - private int y; - private int z; - private RedstoneControlMode inputMode; - private RedstoneControlMode outputMode; - private int maxInput; - private int maxOutput; - - public PacketClientState() {} - - public PacketClientState(TileCapacitorBank capBank) { - x = capBank.xCoord; - y = capBank.yCoord; - z = capBank.zCoord; - - inputMode = capBank.getInputControlMode(); - outputMode = capBank.getOutputControlMode(); - - maxInput = capBank.getMaxInput(); - maxOutput = capBank.getMaxOutput(); - } - - @Override - public void toBytes(ByteBuf dos) { - dos.writeInt(x); - dos.writeInt(y); - dos.writeInt(z); - dos.writeShort((short) inputMode.ordinal()); - dos.writeShort((short) outputMode.ordinal()); - dos.writeInt(maxInput); - dos.writeInt(maxOutput); - } - - @Override - public void fromBytes(ByteBuf data) { - x = data.readInt(); - y = data.readInt(); - z = data.readInt(); - short inputOrdinal = data.readShort(); - short outputOrdinal = data.readShort(); - outputMode = RedstoneControlMode.values()[outputOrdinal]; - inputMode = RedstoneControlMode.values()[inputOrdinal]; - - maxInput = data.readInt(); - maxOutput = data.readInt(); - } - - @Override - public IMessage onMessage(PacketClientState message, MessageContext ctx) { - EntityPlayer player = ctx.getServerHandler().playerEntity; - TileEntity te = player.worldObj.getTileEntity(message.x, message.y, message.z); - if (PacketUtil.isInvalidPacketForGui(ctx, te, getClass())) return null; - if (te instanceof TileCapacitorBank) { - TileCapacitorBank cb = (TileCapacitorBank) te; - cb.setInputControlMode(message.inputMode); - cb.setOutputControlMode(message.outputMode); - cb.setMaxInput(message.maxInput); - cb.setMaxOutput(message.maxOutput); - } - return null; - } -} diff --git a/src/main/java/crazypants/enderio/machine/power/PacketPowerStorage.java b/src/main/java/crazypants/enderio/machine/power/PacketPowerStorage.java deleted file mode 100644 index 7d52fe02..00000000 --- a/src/main/java/crazypants/enderio/machine/power/PacketPowerStorage.java +++ /dev/null @@ -1,82 +0,0 @@ -package crazypants.enderio.machine.power; - -import java.util.List; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; - -import com.enderio.core.common.util.BlockCoord; - -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; -import crazypants.enderio.EnderIO; -import io.netty.buffer.ByteBuf; - -public class PacketPowerStorage implements IMessage, IMessageHandler { - - private int x; - private int y; - private int z; - private int storedEnergy; - - public PacketPowerStorage() {} - - public PacketPowerStorage(TileCapacitorBank ent) { - x = ent.xCoord; - y = ent.yCoord; - z = ent.zCoord; - storedEnergy = ent.storedEnergyRF; - } - - @Override - public void toBytes(ByteBuf buf) { - buf.writeInt(x); - buf.writeInt(y); - buf.writeInt(z); - buf.writeInt(storedEnergy); - } - - @Override - public void fromBytes(ByteBuf buf) { - x = buf.readInt(); - y = buf.readInt(); - z = buf.readInt(); - storedEnergy = buf.readInt(); - } - - @Override - public IMessage onMessage(PacketPowerStorage message, MessageContext ctx) { - EntityPlayer player = EnderIO.proxy.getClientPlayer(); - TileEntity te = player.worldObj.getTileEntity(message.x, message.y, message.z); - if (te instanceof TileCapacitorBank) { - TileCapacitorBank me = (TileCapacitorBank) te; - me.storedEnergyRF = message.storedEnergy; - - double dif = Math.abs(me.lastRenderStoredRatio - me.getEnergyStoredRatio()); - if (dif > 0.025) { // update rendering at a 2.5% diff - if (!me.isMultiblock()) { - player.worldObj.markBlockForUpdate(message.x, message.y, message.z); - } else { - BlockCoord[] mb = me.multiblock; - for (BlockCoord bc : mb) { - updateGaugeRender(player.worldObj, bc); - } - } - } - } - return null; - } - - private void updateGaugeRender(World worldObj, BlockCoord bc) { - TileEntity te = worldObj.getTileEntity(bc.x, bc.y, bc.z); - if (te instanceof TileCapacitorBank) { - TileCapacitorBank me = (TileCapacitorBank) te; - List gb = me.getGaugeBounds(); - if (gb != null && !gb.isEmpty()) { - worldObj.markBlockForUpdate(bc.x, bc.y, bc.z); - } - } - } -} diff --git a/src/main/java/crazypants/enderio/machine/power/TileCapacitorBank.java b/src/main/java/crazypants/enderio/machine/power/TileCapacitorBank.java deleted file mode 100644 index 070ead19..00000000 --- a/src/main/java/crazypants/enderio/machine/power/TileCapacitorBank.java +++ /dev/null @@ -1,1185 +0,0 @@ -package crazypants.enderio.machine.power; - -import java.util.ArrayList; -import java.util.EnumMap; -import java.util.List; -import java.util.ListIterator; -import java.util.Map; -import java.util.Map.Entry; - -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.MathHelper; -import net.minecraftforge.common.util.ForgeDirection; - -import com.enderio.core.common.interfaces.IComparatorOutput; -import com.enderio.core.common.util.BlockCoord; -import com.enderio.core.common.util.Util; -import com.enderio.core.common.vecmath.VecmathUtil; - -import cofh.api.energy.IEnergyContainerItem; -import crazypants.enderio.EnderIO; -import crazypants.enderio.TileEntityEio; -import crazypants.enderio.conduit.ConnectionMode; -import crazypants.enderio.conduit.IConduitBundle; -import crazypants.enderio.conduit.power.IPowerConduit; -import crazypants.enderio.config.Config; -import crazypants.enderio.machine.IIoConfigurable; -import crazypants.enderio.machine.IoMode; -import crazypants.enderio.machine.RedstoneControlMode; -import crazypants.enderio.network.PacketHandler; -import crazypants.enderio.power.BasicCapacitor; -import crazypants.enderio.power.IInternalPowerHandler; -import crazypants.enderio.power.IInternalPoweredTile; -import crazypants.enderio.power.IPowerInterface; -import crazypants.enderio.power.IPowerStorage; -import crazypants.enderio.power.PowerHandlerUtil; - -public class TileCapacitorBank extends TileEntityEio - implements IInternalPowerHandler, IInventory, IIoConfigurable, IPowerStorage, IComparatorOutput { - - static final BasicCapacitor BASE_CAP = new BasicCapacitor( - Config.capacitorBankMaxIoRF, - Config.capacitorBankMaxStorageRF); - - private static final int MAX_SIZE = Integer.MAX_VALUE / Config.capacitorBankMaxStorageRF; - - BlockCoord[] multiblock = null; - - private int lastSyncPowerStored; - - int storedEnergyRF; - - private int maxStoredEnergy; - - private int maxIO; - - private int maxInput; - - private int maxOutput; - - private boolean multiblockDirty = false; - - private RedstoneControlMode inputControlMode; - - private RedstoneControlMode outputControlMode; - - private boolean outputEnabled; - - private boolean inputEnabled; - - private boolean isRecievingRedstoneSignal; - - private boolean redstoneStateDirty = true; - private int lastComparatorState = 0; - - private List masterReceptors; - private ListIterator receptorIterator; - - private List localReceptors; - private boolean receptorsDirty = true; - - private final ItemStack[] inventory; - - private List gaugeBounds; - - private Map faceModes; - - private boolean render = false; - - private boolean masterReceptorsDirty; - - private boolean notifyNeighbours = false; - - int energyAtLastRender = -1; - - private boolean isCreative = false; - - double lastRenderStoredRatio; - - public TileCapacitorBank() { - inventory = new ItemStack[4]; - storedEnergyRF = 0; - inputControlMode = RedstoneControlMode.IGNORE; - outputControlMode = RedstoneControlMode.IGNORE; - maxStoredEnergy = BASE_CAP.getMaxEnergyStored(); - maxIO = BASE_CAP.getMaxEnergyExtracted(); - maxInput = maxIO; - maxOutput = maxIO; - } - - @Override - public IoMode toggleIoModeForFace(ForgeDirection faceHit) { - IPowerInterface rec = getReceptorForFace(faceHit); - IoMode curMode = getIoMode(faceHit); - if (curMode == IoMode.PULL) { - setIoMode(faceHit, IoMode.PUSH, true); - return IoMode.PUSH; - } - if (curMode == IoMode.PUSH) { - setIoMode(faceHit, IoMode.DISABLED, true); - return IoMode.DISABLED; - } - if (curMode == IoMode.DISABLED) { - if (rec == null || rec.getDelegate() instanceof IConduitBundle) { - setIoMode(faceHit, IoMode.NONE, true); - return IoMode.NONE; - } - } - setIoMode(faceHit, IoMode.PULL, true); - return IoMode.PULL; - } - - @Override - public boolean supportsMode(ForgeDirection faceHit, IoMode mode) { - IPowerInterface rec = getReceptorForFace(faceHit); - if (mode == IoMode.NONE) { - return rec == null || rec.getDelegate() instanceof IConduitBundle; - } - return true; - } - - @Override - public void setIoMode(ForgeDirection faceHit, IoMode mode) { - setIoMode(faceHit, mode, true); - } - - @Override - public void clearAllIoModes() { - if (faceModes != null) { - faceModes = null; - receptorsDirty = true; - getController().masterReceptorsDirty = true; - notifyNeighbours = true; - render = true; - updateBlock(); - } - } - - public void setIoMode(ForgeDirection faceHit, IoMode mode, boolean updateReceptors) { - if (mode == IoMode.NONE && faceModes == null) { - return; - } - if (faceModes == null) { - faceModes = new EnumMap(ForgeDirection.class); - } - faceModes.put(faceHit, mode); - if (updateReceptors) { - receptorsDirty = true; - getController().masterReceptorsDirty = true; - notifyNeighbours = true; - } - render = true; - - updateBlock(); - } - - @Override - public IoMode getIoMode(ForgeDirection face) { - if (faceModes == null) { - return IoMode.NONE; - } - IoMode res = faceModes.get(face); - if (res == null) { - return IoMode.NONE; - } - return res; - } - - private IPowerInterface getReceptorForFace(ForgeDirection faceHit) { - BlockCoord checkLoc = new BlockCoord(this).getLocation(faceHit); - TileEntity te = worldObj.getTileEntity(checkLoc.x, checkLoc.y, checkLoc.z); - if (!(te instanceof TileCapacitorBank)) { - return PowerHandlerUtil.create(te); - } - return null; - } - - @Override - public void doUpdate() { - if (blockMetadata == -1) { - isCreative = getBlockMetadata() == 1; - } - - if (worldObj.isRemote) { - if (render) { - worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); - render = false; - } - return; - } // else is server, do all logic only on the server - - if (multiblockDirty) { - formMultiblock(); - multiblockDirty = false; - } - - // update any comparators, since they don't check themselves - int comparatorState = getComparatorOutput(); - if (lastComparatorState != comparatorState) { - worldObj.func_147453_f(xCoord, yCoord, zCoord, getBlockType()); - lastComparatorState = comparatorState; - } - - if (!isContoller()) { - if (notifyNeighbours) { - worldObj.notifyBlocksOfNeighborChange(xCoord, yCoord, zCoord, getBlockType()); - notifyNeighbours = false; - } - return; - } - - chargeItems(); - - boolean hasSignal = isRecievingRedstoneSignal(); - if (inputControlMode == RedstoneControlMode.IGNORE) { - inputEnabled = true; - } else if (inputControlMode == RedstoneControlMode.NEVER) { - inputEnabled = false; - } else { - inputEnabled = (inputControlMode == RedstoneControlMode.ON && hasSignal) - || (inputControlMode == RedstoneControlMode.OFF && !hasSignal); - } - if (outputControlMode == RedstoneControlMode.IGNORE) { - outputEnabled = true; - } else if (outputControlMode == RedstoneControlMode.NEVER) { - outputEnabled = false; - } else { - outputEnabled = (outputControlMode == RedstoneControlMode.ON && hasSignal) - || (outputControlMode == RedstoneControlMode.OFF && !hasSignal); - } - - updateMasterReceptors(); - if (outputEnabled) { - transmitEnergy(); - } - - if (isCreative) { - setEnergyStored(getMaxEnergyStored() / 2); - } - - if (lastSyncPowerStored != getEnergyStored() && shouldDoWorkThisTick(10)) { - lastSyncPowerStored = getEnergyStored(); - PacketHandler.sendToAllAround(new PacketPowerStorage(this), this, 64); - } - - if (notifyNeighbours) { - worldObj.notifyBlocksOfNeighborChange(xCoord, yCoord, zCoord, getBlockType()); - notifyNeighbours = false; - } - } - - @Override - public int getComparatorOutput() { - int stored = getEnergyStored(); - return stored == 0 ? 0 : 1 + (stored * 14) / getMaxEnergyStored(); - } - - public List getGaugeBounds() { - if (gaugeBounds == null) { - gaugeBounds = GaugeBounds.calculateGaugeBounds(new BlockCoord(this), multiblock); - } - return gaugeBounds; - } - - public boolean chargeItems(ItemStack[] items) { - boolean chargedItem = false; - int available = Math.min(maxIO, getEnergyStored()); - for (ItemStack item : items) { - if (item != null && available > 0) { - int used = 0; - if (item.getItem() instanceof IEnergyContainerItem) { - IEnergyContainerItem chargable = (IEnergyContainerItem) item.getItem(); - - int max = chargable.getMaxEnergyStored(item); - int cur = chargable.getEnergyStored(item); - int canUse = Math.min(available, max - cur); - if (cur < max) { - used = chargable.receiveEnergy(item, canUse, false); - } - } - if (used > 0) { - setEnergyStored(getEnergyStored() - used); - chargedItem = true; - available -= used; - } - } - } - return chargedItem; - } - - private void chargeItems() { - boolean chargedItem = chargeItems(inventory); - if (chargedItem) { - markDirty(); - } - } - - public boolean isOutputEnabled() { - return getController().outputEnabled; - } - - @Override - public boolean isOutputEnabled(ForgeDirection direction) { - IoMode mode = getIoMode(direction); - return mode == IoMode.PUSH || mode == IoMode.NONE && isOutputEnabled(); - } - - public boolean isInputEnabled() { - return getController().inputEnabled; - } - - @Override - public boolean isInputEnabled(ForgeDirection direction) { - IoMode mode = getIoMode(direction); - return mode == IoMode.PULL || mode == IoMode.NONE && isInputEnabled(); - } - - @Override - public boolean isNetworkControlledIo(ForgeDirection direction) { - IoMode mode = getIoMode(direction); - return mode == IoMode.NONE || mode == IoMode.PULL; - } - - private boolean transmitEnergy() { - - if (getEnergyStored() <= 0) { - return false; - } - int canTransmit = Math.min(getEnergyStored(), maxOutput); - int transmitted = 0; - - if (!masterReceptors.isEmpty() && !receptorIterator.hasNext()) { - receptorIterator = masterReceptors.listIterator(); - } - - int appliedCount = 0; - int numReceptors = masterReceptors.size(); - while (receptorIterator.hasNext() && canTransmit > 0 && appliedCount < numReceptors) { - - Receptor receptor = receptorIterator.next(); - IPowerInterface powerInterface = receptor.receptor; - IoMode mode = receptor.mode; - if (powerInterface != null && mode != IoMode.PULL - && mode != IoMode.DISABLED - && powerInterface.getMinEnergyReceived(receptor.fromDir.getOpposite()) <= canTransmit) { - double used; - if (receptor.receptor.getDelegate() instanceof IConduitBundle && !isCreative) { - // All other power transfer is handled by the conduit network - IConduitBundle bundle = (IConduitBundle) receptor.receptor.getDelegate(); - IPowerConduit conduit = bundle.getConduit(IPowerConduit.class); - if (conduit != null - && conduit.getConnectionMode(receptor.fromDir.getOpposite()) == ConnectionMode.INPUT) { - used = powerInterface.recieveEnergy(receptor.fromDir.getOpposite(), canTransmit); - } else { - used = 0; - } - } else { - used = powerInterface.recieveEnergy(receptor.fromDir.getOpposite(), canTransmit); - } - - transmitted += used; - canTransmit -= used; - } - - if (canTransmit <= 0) { - break; - } - - if (!masterReceptors.isEmpty() && !receptorIterator.hasNext()) { - receptorIterator = masterReceptors.listIterator(); - } - appliedCount++; - } - setEnergyStored(getEnergyStored() - transmitted); - - return transmitted > 0; - } - - private void updateMasterReceptors() { - if (!masterReceptorsDirty && masterReceptors != null) { - return; - } - - if (masterReceptors == null) { - masterReceptors = new ArrayList(); - } - masterReceptors.clear(); - - if (multiblock == null) { - updateReceptors(); - if (localReceptors != null) { - masterReceptors.addAll(localReceptors); - } - } else { - // TODO: Performance warning?? - for (BlockCoord bc : multiblock) { - TileEntity te = worldObj.getTileEntity(bc.x, bc.y, bc.z); - if (te instanceof TileCapacitorBank) { - TileCapacitorBank cb = ((TileCapacitorBank) te); - cb.updateReceptors(); - if (cb.localReceptors != null) { - masterReceptors.addAll(cb.localReceptors); - } - } - } - } - - receptorIterator = masterReceptors.listIterator(); - masterReceptorsDirty = false; - } - - private void updateReceptors() { - - if (!receptorsDirty) { - return; - } - if (localReceptors != null) { - localReceptors.clear(); - } - - BlockCoord bc = new BlockCoord(this); - for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - IoMode mode = getIoMode(dir); - if (mode != IoMode.DISABLED) { - BlockCoord checkLoc = bc.getLocation(dir); - TileEntity te = worldObj.getTileEntity(checkLoc.x, checkLoc.y, checkLoc.z); - if (!(te instanceof TileCapacitorBank)) { - IPowerInterface ph = PowerHandlerUtil.create(te); - if (ph != null && ph.canConduitConnect(dir)) { - if (localReceptors == null) { - localReceptors = new ArrayList(); - } - Receptor r = new Receptor(ph, dir, mode); - localReceptors.add(r); - if (mode == IoMode.NONE && !(ph.getDelegate() instanceof IInternalPoweredTile)) { - setIoMode(dir, IoMode.PULL, false); - r.mode = IoMode.PULL; - render = true; - } - } - } - } - } - - receptorsDirty = false; - } - - // ------------ Multiblock overrides - - public int getEnergyStoredScaled(int scale) { - return getController().doGetEnergyStoredScaled(scale); - } - - @Override - public int getMaxInput() { - return maxInput; - } - - public void setMaxInput(int maxInput) { - getController().doSetMaxInput(maxInput); - updateBlock(); - } - - @Override - public int getMaxOutput() { - return maxOutput; - } - - public void setMaxOutput(int maxOutput) { - getController().doSetMaxOutput(maxOutput); - updateBlock(); - } - - @Override - public int getEnergyStored() { - return getController().doGetEnergyStored(); - } - - @Override - public long getEnergyStoredL() { - return getEnergyStored(); - } - - public double getEnergyStoredRatio() { - return getController().doGetEnergyStoredRatio(); - } - - @Override - public int getMaxEnergyStored() { - return getController().doGetMaxEnergyStored(); - } - - @Override - public long getMaxEnergyStoredL() { - return getMaxEnergyStored(); - } - - public int getMaxIO() { - return getController().doGetMaxIO(); - } - - // RF Power - - @Override - public int getMaxEnergyRecieved(ForgeDirection dir) { - return getMaxEnergyStored(); - } - - @Override - public void setEnergyStored(int stored) { - getController().doSetEnergyStored(stored); - } - - @Override - public int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate) { - return 0; - } - - @Override - public boolean canConnectEnergy(ForgeDirection from) { - return getIoMode(from) != IoMode.DISABLED; - } - - @Override - public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { - IoMode mode = getIoMode(from); - if (mode == IoMode.DISABLED || mode == IoMode.PUSH) { - return 0; - } - return getController().doReceiveEnergy(from, maxReceive, simulate); - } - - @Override - public int getEnergyStored(ForgeDirection from) { - return getController().doGetEnergyStored(from); - } - - @Override - public int getMaxEnergyStored(ForgeDirection from) { - return getController().doGetMaxEnergyStored(); - } - - public int doReceiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { - return PowerHandlerUtil.recieveInternal(this, maxReceive, from, simulate); - } - - public int doGetEnergyStored(ForgeDirection from) { - return doGetEnergyStored(); - } - - public int doGetMaxEnergyStored(ForgeDirection from) { - return doGetMaxEnergyStored(); - } - - // end rf power - - @Override - public void addEnergy(int add) { - getController().doAddEnergy(add); - } - - private boolean isRecievingRedstoneSignal() { - if (!redstoneStateDirty) { - return isRecievingRedstoneSignal; - } - - isRecievingRedstoneSignal = false; - redstoneStateDirty = false; - - if (!isMultiblock()) { - isRecievingRedstoneSignal = worldObj.getStrongestIndirectPower(xCoord, yCoord, zCoord) > 0; - } else { - for (BlockCoord bc : multiblock) { - if (worldObj.getStrongestIndirectPower(bc.x, bc.y, bc.z) > 0) { - isRecievingRedstoneSignal = true; - break; - } - } - } - return isRecievingRedstoneSignal; - } - - public RedstoneControlMode getInputControlMode() { - return inputControlMode; - } - - public void setInputControlMode(RedstoneControlMode inputControlMode) { - if (!isMultiblock()) { - this.inputControlMode = inputControlMode; - } else { - for (BlockCoord bc : multiblock) { - TileCapacitorBank cp = getCapBank(bc); - if (cp != null) { - cp.inputControlMode = inputControlMode; - } - } - } - } - - public RedstoneControlMode getOutputControlMode() { - return outputControlMode; - } - - public void setOutputControlMode(RedstoneControlMode outputControlMode) { - if (!isMultiblock()) { - this.outputControlMode = outputControlMode; - } else { - for (BlockCoord bc : multiblock) { - TileCapacitorBank cp = getCapBank(bc); - if (cp != null) { - cp.outputControlMode = outputControlMode; - } - } - } - } - - // ------------ Multiblock implementations - - int doGetMaxIO() { - return maxIO; - } - - int doGetMaxEnergyStored() { - return maxStoredEnergy; - } - - int doGetEnergyStoredScaled(int scale) { - return (int) VecmathUtil.clamp(Math.round(scale * doGetEnergyStoredRatio()), 0, scale); - } - - int doGetEnergyStored() { - return storedEnergyRF; - } - - void doSetEnergyStored(int stored) { - storedEnergyRF = MathHelper.clamp_int(stored, 0, getMaxEnergyStored()); - } - - double doGetEnergyStoredRatio() { - return (double) doGetEnergyStored() / maxStoredEnergy; - } - - void doAddEnergy(int add) { - doSetEnergyStored(doGetEnergyStored() + add); - } - - void doSetMaxInput(int in) { - maxInput = Math.min(in, maxIO); - maxInput = Math.max(0, maxInput); - if (isMultiblock()) { - for (BlockCoord bc : multiblock) { - TileCapacitorBank cp = getCapBank(bc); - if (cp != null) { - cp.maxInput = maxInput; - } - } - } - } - - void doSetMaxOutput(int out) { - maxOutput = Math.min(out, maxIO); - maxOutput = Math.max(0, maxOutput); - if (isMultiblock()) { - for (BlockCoord bc : multiblock) { - TileCapacitorBank cp = getCapBank(bc); - if (cp != null) { - cp.maxOutput = maxOutput; - } - } - } - } - - // ------------ Multiblock management - - public void onBlockAdded() { - multiblockDirty = true; - } - - public void onNeighborBlockChange(Block block) { - if (block != EnderIO.blockCapacitorBank) { - receptorsDirty = true; - getController().masterReceptorsDirty = true; - getController().redstoneStateDirty = true; - } - redstoneStateDirty = true; - } - - public void onBreakBlock() { - TileCapacitorBank controller = getController(); - controller.clearCurrentMultiblock(); - } - - private void clearCurrentMultiblock() { - if (multiblock == null) { - return; - } - for (BlockCoord bc : multiblock) { - TileCapacitorBank res = getCapBank(bc); - if (res != null) { - res.setMultiblock(null); - } - } - multiblock = null; - redstoneStateDirty = true; - } - - private void formMultiblock() { - - if (isCreative || isMaxSize()) { - return; - } - List blocks = new ArrayList(); - blocks.add(this); - findNighbouringBanks(this, blocks); - - if (blocks.size() < 2) { - return; - } - for (TileCapacitorBank cb : blocks) { - cb.clearCurrentMultiblock(); - } - - BlockCoord[] mb = new BlockCoord[blocks.size()]; - for (int i = 0; i < blocks.size(); i++) { - mb[i] = new BlockCoord(blocks.get(i)); - } - - TileCapacitorBank secondary = blocks.get(1); - maxInput = maxOutput = -1; - - if (secondary.maxInput != secondary.maxIO) { - maxInput = secondary.maxInput; - } - - if (secondary.maxOutput != secondary.maxIO) { - maxOutput = secondary.maxOutput; - } - - for (TileCapacitorBank cb : blocks) { - cb.setMultiblock(mb); - } - } - - private void findNighbouringBanks(TileCapacitorBank tileCapacitorBank, List blocks) { - if (isCreative || blocks.size() >= MAX_SIZE) { - return; - } - BlockCoord bc = new BlockCoord(tileCapacitorBank); - for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - TileCapacitorBank cb = getCapBank(bc.getLocation(dir)); - if (cb != null && !blocks.contains(cb) && !cb.isCreative && !cb.isMaxSize()) { - if (blocks.size() >= MAX_SIZE) { - return; - } - blocks.add(cb); - findNighbouringBanks(cb, blocks); - } - } - } - - private void setMultiblock(BlockCoord[] mb) { - - if (multiblock != null && isMaster()) { - - // split up current multiblock and reconfigure all the internal capacitors - int powerPerBlock = storedEnergyRF / multiblock.length; - int remaining = storedEnergyRF % multiblock.length; - for (BlockCoord bc : multiblock) { - TileCapacitorBank cb = getCapBank(bc); - if (cb != null) { - cb.maxStoredEnergy = BASE_CAP.getMaxEnergyStored(); - cb.maxIO = BASE_CAP.getMaxEnergyExtracted(); - cb.maxInput = Math.min(cb.maxInput, cb.maxIO); - cb.maxOutput = Math.min(cb.maxOutput, cb.maxIO); - cb.doSetEnergyStored(powerPerBlock); - cb.multiblockDirty = true; - } - } - doAddEnergy(remaining); - } - multiblock = mb; - if (isMaster()) { - - List invItems = new ArrayList(); - - int totalStored = 0; - int totalCap = multiblock.length * BASE_CAP.getMaxEnergyStored(); - int totalIO = multiblock.length * BASE_CAP.getMaxEnergyExtracted(); - for (BlockCoord bc : multiblock) { - TileCapacitorBank cb = getCapBank(bc); - if (cb != null) { - totalStored += cb.doGetEnergyStored(); - } - ItemStack[] inv = cb.inventory; - for (int i = 0; i < inv.length; i++) { - if (inv[i] != null) { - invItems.add(inv[i]); - inv[i] = null; - } - } - cb.multiblockDirty = false; - } - maxStoredEnergy = totalCap; - doSetEnergyStored(totalStored); - maxIO = totalIO; - maxInput = maxInput < 0 ? maxIO : Math.min(maxInput, maxIO); - maxOutput = maxOutput < 0 ? maxIO : Math.min(maxOutput, maxIO); - for (BlockCoord bc : multiblock) { - TileCapacitorBank cb = getCapBank(bc); - if (cb != null && cb != this) { - cb.maxIO = totalIO; - cb.maxInput = maxInput; - cb.maxOutput = maxOutput; - } - } - - if (invItems.size() > inventory.length) { - for (int i = inventory.length; i < invItems.size(); i++) { - Util.dropItems(worldObj, invItems.get(i), xCoord, yCoord, zCoord, true); - } - } - for (int i = 0; i < inventory.length && i < invItems.size(); i++) { - inventory[i] = invItems.get(i); - } - } - receptorsDirty = true; - getController().masterReceptorsDirty = true; - redstoneStateDirty = true; - - // Forces an update - worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); - render = true; - } - - @Override - public TileCapacitorBank getController() { - if (isMaster() || !isMultiblock()) { - return this; - } - TileCapacitorBank res = getCapBank(multiblock[0]); - return res != null ? res : this; - } - - boolean isContoller() { - return multiblock == null ? true : isMaster(); - } - - boolean isMaster() { - if (multiblock != null) { - return multiblock[0].equals(xCoord, yCoord, zCoord); - } - return false; - } - - public boolean isMultiblock() { - return multiblock != null; - } - - private boolean isCurrentMultiblockValid() { - if (multiblock == null) { - return false; - } - for (BlockCoord bc : multiblock) { - TileCapacitorBank res = getCapBank(bc); - if (res == null || !res.isMultiblock()) { - return false; - } - } - return true; - } - - private TileCapacitorBank getCapBank(BlockCoord bc) { - return getCapBank(bc.x, bc.y, bc.z); - } - - private TileCapacitorBank getCapBank(int x, int y, int z) { - if (worldObj == null) { - return null; - } - TileEntity te = worldObj.getTileEntity(x, y, z); - if (te instanceof TileCapacitorBank) { - return (TileCapacitorBank) te; - } - return null; - } - - // ------------- Inventory - - @Override - public int getSizeInventory() { - return getController().doGetSizeInventory(); - } - - @Override - public ItemStack getStackInSlot(int i) { - return getController().doGetStackInSlot(i); - } - - @Override - public ItemStack decrStackSize(int i, int j) { - return getController().doDecrStackSize(i, j); - } - - @Override - public void setInventorySlotContents(int i, ItemStack itemstack) { - getController().doSetInventorySlotContents(i, itemstack); - } - - public ItemStack doGetStackInSlot(int i) { - if (i < 0 || i >= inventory.length) { - return null; - } - return inventory[i]; - } - - public int doGetSizeInventory() { - return inventory.length; - } - - public ItemStack doDecrStackSize(int fromSlot, int amount) { - if (fromSlot < 0 || fromSlot >= inventory.length) { - return null; - } - ItemStack item = inventory[fromSlot]; - if (item == null) { - return null; - } - if (item.stackSize <= amount) { - ItemStack result = item.copy(); - inventory[fromSlot] = null; - return result; - } - item.stackSize -= amount; - return item.copy(); - } - - public void doSetInventorySlotContents(int i, ItemStack itemstack) { - if (i < 0 || i >= inventory.length) { - return; - } - inventory[i] = itemstack; - } - - @Override - public ItemStack getStackInSlotOnClosing(int i) { - return null; - } - - @Override - public String getInventoryName() { - return EnderIO.blockCapacitorBank.getUnlocalizedName() + ".name"; - } - - @Override - public int getInventoryStackLimit() { - return 1; - } - - @Override - public boolean isUseableByPlayer(EntityPlayer entityplayer) { - return true; - } - - @Override - public void openInventory() {} - - @Override - public void closeInventory() {} - - @Override - public boolean isItemValidForSlot(int i, ItemStack itemstack) { - if (itemstack == null) { - return false; - } - return itemstack.getItem() instanceof IEnergyContainerItem; - } - - @Override - public void readCustomNBT(NBTTagCompound nbtRoot) { - - if (nbtRoot.hasKey("maxStoredEnergy")) { - nbtRoot.setInteger("maxStoredEnergyRF", nbtRoot.getInteger("maxStoredEnergy") * 10); - } - maxStoredEnergy = nbtRoot.getInteger("maxStoredEnergyRF"); - - double oldEnergy = storedEnergyRF; - if (nbtRoot.hasKey("storedEnergyD")) { - nbtRoot.setInteger("storedEnergyRF", (int) (nbtRoot.getDouble("storedEnergyD") * 10)); - } - doSetEnergyStored(nbtRoot.getInteger("storedEnergyRF")); - - double newEnergy = storedEnergyRF; - if (maxStoredEnergy != 0 && Math.abs(oldEnergy - newEnergy) / maxStoredEnergy > 0.05 - || nbtRoot.hasKey("render")) { - render = true; - } - if (energyAtLastRender != -1 && maxStoredEnergy != 0) { - double change = Math.abs(energyAtLastRender - storedEnergyRF) / (double) maxStoredEnergy; - if (change > 0.05) { - render = true; - } - } - - if (nbtRoot.hasKey("maxIO")) { - nbtRoot.setInteger("maxIoRF", nbtRoot.getInteger("maxIO") * 10); - } - maxIO = nbtRoot.getInteger("maxIoRF"); - - if (nbtRoot.hasKey("maxInput")) { - nbtRoot.setInteger("maxInputRF", nbtRoot.getInteger("maxInput") * 10); - } - if (nbtRoot.hasKey("maxInputRF")) { - maxInput = nbtRoot.getInteger("maxInputRF"); - } else { - maxOutput = maxIO; - } - - if (nbtRoot.hasKey("maxOutput")) { - nbtRoot.setInteger("maxOuputRF", nbtRoot.getInteger("maxOuput") * 10); - } - if (nbtRoot.hasKey("maxOutputRF")) { - maxOutput = nbtRoot.getInteger("maxOutputRF"); - } else { - maxInput = maxIO; - } - - inputControlMode = RedstoneControlMode.values()[nbtRoot.getShort("inputControlMode")]; - outputControlMode = RedstoneControlMode.values()[nbtRoot.getShort("outputControlMode")]; - - if (nbtRoot.getBoolean("isMultiblock")) { - int[] coords = nbtRoot.getIntArray("multiblock"); - multiblock = new BlockCoord[coords.length / 3]; - int c = 0; - for (int i = 0; i < multiblock.length; i++) { - multiblock[i] = new BlockCoord(coords[c++], coords[c++], coords[c++]); - } - - } else { - multiblock = null; - } - - for (int i = 0; i < inventory.length; i++) { - inventory[i] = null; - } - - NBTTagList itemList = (NBTTagList) nbtRoot.getTag("Items"); - if (itemList != null) { - for (int i = 0; i < itemList.tagCount(); i++) { - NBTTagCompound itemStack = itemList.getCompoundTagAt(i); - byte slot = itemStack.getByte("Slot"); - if (slot >= 0 && slot < inventory.length) { - inventory[slot] = ItemStack.loadItemStackFromNBT(itemStack); - } - } - } - - if (nbtRoot.hasKey("hasFaces")) { - for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - if (nbtRoot.hasKey("face" + dir.ordinal())) { - setIoMode(dir, IoMode.values()[nbtRoot.getShort("face" + dir.ordinal())], false); - } - } - } - gaugeBounds = null; - } - - @Override - public void writeCustomNBT(NBTTagCompound nbtRoot) { - - nbtRoot.setDouble("storedEnergyRF", storedEnergyRF); - nbtRoot.setInteger("maxStoredEnergyRF", maxStoredEnergy); - nbtRoot.setInteger("maxIoRF", maxIO); - nbtRoot.setInteger("maxInputRF", maxInput); - nbtRoot.setInteger("maxOutputRF", maxOutput); - nbtRoot.setShort("inputControlMode", (short) inputControlMode.ordinal()); - nbtRoot.setShort("outputControlMode", (short) outputControlMode.ordinal()); - - nbtRoot.setBoolean("isMultiblock", isMultiblock()); - if (isMultiblock()) { - int[] vals = new int[multiblock.length * 3]; - int i = 0; - for (BlockCoord bc : multiblock) { - vals[i++] = bc.x; - vals[i++] = bc.y; - vals[i++] = bc.z; - } - nbtRoot.setIntArray("multiblock", vals); - } - - // write inventory list - NBTTagList itemList = new NBTTagList(); - for (int i = 0; i < inventory.length; i++) { - if (inventory[i] != null) { - NBTTagCompound itemStackNBT = new NBTTagCompound(); - itemStackNBT.setByte("Slot", (byte) i); - inventory[i].writeToNBT(itemStackNBT); - itemList.appendTag(itemStackNBT); - } - } - nbtRoot.setTag("Items", itemList); - - // face modes - if (faceModes != null) { - nbtRoot.setByte("hasFaces", (byte) 1); - for (Entry e : faceModes.entrySet()) { - nbtRoot.setShort("face" + e.getKey().ordinal(), (short) e.getValue().ordinal()); - } - } - - if (render) { - nbtRoot.setBoolean("render", true); - render = false; - } - } - - static class Receptor { - - IPowerInterface receptor; - ForgeDirection fromDir; - IoMode mode; - - private Receptor(IPowerInterface rec, ForgeDirection fromDir, IoMode mode) { - receptor = rec; - this.fromDir = fromDir; - this.mode = mode; - } - - @Override - public String toString() { - return "Receptor [receptor=" + receptor + ", fromDir=" + fromDir + ", mode=" + mode + "]"; - } - } - - @Override - public boolean hasCustomInventoryName() { - - return false; - } - - public void setCreativeMode() { - isCreative = true; - maxIO = maxIO * 1000; - maxInput = maxIO; - maxOutput = maxIO; - } - - @Override - public boolean isCreative() { - return isCreative; - } - - public boolean isMaxSize() { - return isMultiblock() && multiblock.length >= MAX_SIZE; - } - - @Override - public boolean displayPower() { - return true; - } -} diff --git a/src/main/java/crazypants/enderio/machine/solar/BlockItemSolarPanel.java b/src/main/java/crazypants/enderio/machine/solar/BlockItemSolarPanel.java index 40ee07c9..13b73910 100644 --- a/src/main/java/crazypants/enderio/machine/solar/BlockItemSolarPanel.java +++ b/src/main/java/crazypants/enderio/machine/solar/BlockItemSolarPanel.java @@ -18,7 +18,7 @@ import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; import crazypants.enderio.EnderIOTab; import crazypants.enderio.config.Config; -import crazypants.enderio.machine.power.PowerDisplayUtil; +import crazypants.enderio.power.PowerDisplayUtil; public class BlockItemSolarPanel extends ItemBlockWithMetadata implements IAdvancedTooltipProvider, IResourceTooltipProvider { diff --git a/src/main/java/crazypants/enderio/machine/tank/BlockTank.java b/src/main/java/crazypants/enderio/machine/tank/BlockTank.java index 5e90ff55..88b77b8a 100644 --- a/src/main/java/crazypants/enderio/machine/tank/BlockTank.java +++ b/src/main/java/crazypants/enderio/machine/tank/BlockTank.java @@ -29,8 +29,8 @@ import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; import crazypants.enderio.machine.AbstractMachineBlock; import crazypants.enderio.machine.AbstractMachineEntity; -import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.network.PacketHandler; +import crazypants.enderio.power.PowerDisplayUtil; public class BlockTank extends AbstractMachineBlock implements IAdvancedTooltipProvider { diff --git a/src/main/java/crazypants/enderio/machine/transceiver/gui/GeneralTab.java b/src/main/java/crazypants/enderio/machine/transceiver/gui/GeneralTab.java index 21c0a603..c58bee04 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/gui/GeneralTab.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/gui/GeneralTab.java @@ -19,8 +19,8 @@ import crazypants.enderio.EnderIO; import crazypants.enderio.config.Config; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.machine.PacketItemBuffer; -import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.network.PacketHandler; +import crazypants.enderio.power.PowerDisplayUtil; public class GeneralTab implements ITabPanel { diff --git a/src/main/java/crazypants/enderio/nei/AlloySmelterRecipeHandler.java b/src/main/java/crazypants/enderio/nei/AlloySmelterRecipeHandler.java index 52adcdd7..dfbff4ce 100644 --- a/src/main/java/crazypants/enderio/nei/AlloySmelterRecipeHandler.java +++ b/src/main/java/crazypants/enderio/nei/AlloySmelterRecipeHandler.java @@ -21,9 +21,9 @@ import codechicken.nei.recipe.TemplateRecipeHandler; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.machine.alloy.AlloyRecipeManager; import crazypants.enderio.machine.alloy.GuiAlloySmelter; -import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.machine.recipe.IRecipe; import crazypants.enderio.machine.recipe.RecipeInput; +import crazypants.enderio.power.PowerDisplayUtil; public class AlloySmelterRecipeHandler extends TemplateRecipeHandler { diff --git a/src/main/java/crazypants/enderio/nei/NEIEnderIOConfig.java b/src/main/java/crazypants/enderio/nei/NEIEnderIOConfig.java index c9af3963..75aaa236 100644 --- a/src/main/java/crazypants/enderio/nei/NEIEnderIOConfig.java +++ b/src/main/java/crazypants/enderio/nei/NEIEnderIOConfig.java @@ -1,7 +1,6 @@ package crazypants.enderio.nei; import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; import codechicken.nei.api.API; import codechicken.nei.api.IConfigureNEI; @@ -71,7 +70,6 @@ public class NEIEnderIOConfig implements IConfigureNEI { API.hideItem(new ItemStack(EnderIO.itemGasConduit)); } API.hideItem(new ItemStack(EnderIO.blockHyperCube)); - API.hideItem(new ItemStack(EnderIO.blockCapacitorBank, 1, OreDictionary.WILDCARD_VALUE)); } @Override diff --git a/src/main/java/crazypants/enderio/nei/SagMillRecipeHandler.java b/src/main/java/crazypants/enderio/nei/SagMillRecipeHandler.java index 739352a8..c0b30dee 100644 --- a/src/main/java/crazypants/enderio/nei/SagMillRecipeHandler.java +++ b/src/main/java/crazypants/enderio/nei/SagMillRecipeHandler.java @@ -24,10 +24,10 @@ import crazypants.enderio.gui.IconEIO; import crazypants.enderio.machine.crusher.CrusherRecipeManager; import crazypants.enderio.machine.crusher.GrindingBall; import crazypants.enderio.machine.crusher.GuiCrusher; -import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.machine.recipe.Recipe; import crazypants.enderio.machine.recipe.RecipeInput; import crazypants.enderio.machine.recipe.RecipeOutput; +import crazypants.enderio.power.PowerDisplayUtil; public class SagMillRecipeHandler extends TemplateRecipeHandler { diff --git a/src/main/java/crazypants/enderio/nei/SliceAndSpliceRecipeHandler.java b/src/main/java/crazypants/enderio/nei/SliceAndSpliceRecipeHandler.java index f2476a2a..38eb691c 100644 --- a/src/main/java/crazypants/enderio/nei/SliceAndSpliceRecipeHandler.java +++ b/src/main/java/crazypants/enderio/nei/SliceAndSpliceRecipeHandler.java @@ -19,12 +19,12 @@ import codechicken.nei.PositionedStack; import codechicken.nei.recipe.TemplateRecipeHandler; import crazypants.enderio.gui.GuiContainerBaseEIO; import crazypants.enderio.gui.IconEIO; -import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.machine.recipe.IRecipe; import crazypants.enderio.machine.recipe.RecipeInput; import crazypants.enderio.machine.slicensplice.ContainerSliceAndSplice; import crazypants.enderio.machine.slicensplice.GuiSliceAndSplice; import crazypants.enderio.machine.slicensplice.SliceAndSpliceRecipeManager; +import crazypants.enderio.power.PowerDisplayUtil; public class SliceAndSpliceRecipeHandler extends TemplateRecipeHandler { diff --git a/src/main/java/crazypants/enderio/nei/SoulBinderRecipeHandler.java b/src/main/java/crazypants/enderio/nei/SoulBinderRecipeHandler.java index e40b2816..73d18632 100644 --- a/src/main/java/crazypants/enderio/nei/SoulBinderRecipeHandler.java +++ b/src/main/java/crazypants/enderio/nei/SoulBinderRecipeHandler.java @@ -24,9 +24,9 @@ import crazypants.enderio.gui.GuiContainerBaseEIO; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.machine.IMachineRecipe; import crazypants.enderio.machine.MachineRecipeRegistry; -import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.machine.soul.GuiSoulBinder; import crazypants.enderio.machine.soul.ISoulBinderRecipe; +import crazypants.enderio.power.PowerDisplayUtil; public class SoulBinderRecipeHandler extends TemplateRecipeHandler { diff --git a/src/main/java/crazypants/enderio/nei/VatRecipeHandler.java b/src/main/java/crazypants/enderio/nei/VatRecipeHandler.java index 1db2ae66..31c90a13 100644 --- a/src/main/java/crazypants/enderio/nei/VatRecipeHandler.java +++ b/src/main/java/crazypants/enderio/nei/VatRecipeHandler.java @@ -25,11 +25,11 @@ import codechicken.nei.recipe.GuiUsageRecipe; import codechicken.nei.recipe.TemplateRecipeHandler; import crazypants.enderio.gui.GuiContainerBaseEIO; import crazypants.enderio.gui.IconEIO; -import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.machine.recipe.IRecipe; import crazypants.enderio.machine.recipe.RecipeInput; import crazypants.enderio.machine.vat.GuiVat; import crazypants.enderio.machine.vat.VatRecipeManager; +import crazypants.enderio.power.PowerDisplayUtil; public class VatRecipeHandler extends TemplateRecipeHandler { diff --git a/src/main/java/crazypants/enderio/machine/power/PowerDisplayUtil.java b/src/main/java/crazypants/enderio/power/PowerDisplayUtil.java similarity index 98% rename from src/main/java/crazypants/enderio/machine/power/PowerDisplayUtil.java rename to src/main/java/crazypants/enderio/power/PowerDisplayUtil.java index 23e7d8a1..14b73c21 100644 --- a/src/main/java/crazypants/enderio/machine/power/PowerDisplayUtil.java +++ b/src/main/java/crazypants/enderio/power/PowerDisplayUtil.java @@ -1,4 +1,4 @@ -package crazypants.enderio.machine.power; +package crazypants.enderio.power; import java.text.DecimalFormat; import java.text.DecimalFormatSymbols; diff --git a/src/main/java/crazypants/enderio/teleport/ItemTeleportStaff.java b/src/main/java/crazypants/enderio/teleport/ItemTeleportStaff.java index dcc39a23..5c35127c 100644 --- a/src/main/java/crazypants/enderio/teleport/ItemTeleportStaff.java +++ b/src/main/java/crazypants/enderio/teleport/ItemTeleportStaff.java @@ -16,7 +16,7 @@ import crazypants.enderio.EnderIO; import crazypants.enderio.ModObject; import crazypants.enderio.api.teleport.TravelSource; import crazypants.enderio.config.Config; -import crazypants.enderio.machine.power.PowerDisplayUtil; +import crazypants.enderio.power.PowerDisplayUtil; public class ItemTeleportStaff extends ItemTravelStaff { diff --git a/src/main/java/crazypants/enderio/teleport/ItemTravelStaff.java b/src/main/java/crazypants/enderio/teleport/ItemTravelStaff.java index be3f14d5..7d68f344 100644 --- a/src/main/java/crazypants/enderio/teleport/ItemTravelStaff.java +++ b/src/main/java/crazypants/enderio/teleport/ItemTravelStaff.java @@ -27,7 +27,7 @@ import crazypants.enderio.ModObject; import crazypants.enderio.api.teleport.IItemOfTravel; import crazypants.enderio.api.teleport.TravelSource; import crazypants.enderio.config.Config; -import crazypants.enderio.machine.power.PowerDisplayUtil; +import crazypants.enderio.power.PowerDisplayUtil; @Optional.Interface(iface = "baubles.api.IBauble", modid = "Baubles|API") public class ItemTravelStaff extends ItemEnergyContainer implements IItemOfTravel, IResourceTooltipProvider, IBauble { diff --git a/src/main/java/crazypants/enderio/teleport/telepad/GuiTelePad.java b/src/main/java/crazypants/enderio/teleport/telepad/GuiTelePad.java index 0809e57a..90d06523 100644 --- a/src/main/java/crazypants/enderio/teleport/telepad/GuiTelePad.java +++ b/src/main/java/crazypants/enderio/teleport/telepad/GuiTelePad.java @@ -24,8 +24,8 @@ import crazypants.enderio.GuiHandler; import crazypants.enderio.config.Config; import crazypants.enderio.gui.GuiContainerBaseEIO; import crazypants.enderio.gui.IconEIO; -import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.network.PacketHandler; +import crazypants.enderio.power.PowerDisplayUtil; public class GuiTelePad extends GuiContainerBaseEIO implements IToggleableGui { diff --git a/src/main/java/crazypants/enderio/waila/WailaCompat.java b/src/main/java/crazypants/enderio/waila/WailaCompat.java index 72c7a73a..8bfc443c 100644 --- a/src/main/java/crazypants/enderio/waila/WailaCompat.java +++ b/src/main/java/crazypants/enderio/waila/WailaCompat.java @@ -42,8 +42,8 @@ import crazypants.enderio.machine.IIoConfigurable; import crazypants.enderio.machine.IoMode; import crazypants.enderio.machine.capbank.TileCapBank; import crazypants.enderio.machine.invpanel.TileInventoryPanel; -import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.power.IInternalPoweredTile; +import crazypants.enderio.power.PowerDisplayUtil; import crazypants.util.IFacade; import mcp.mobius.waila.api.ITaggedList; import mcp.mobius.waila.api.IWailaConfigHandler; diff --git a/src/main/resources/assets/enderio/lang/cs_CZ.lang b/src/main/resources/assets/enderio/lang/cs_CZ.lang index d1d35f3b..a4779bc4 100644 --- a/src/main/resources/assets/enderio/lang/cs_CZ.lang +++ b/src/main/resources/assets/enderio/lang/cs_CZ.lang @@ -238,12 +238,6 @@ item.itemLightInverted.name=Světlo (Obrácené) item.itemLightInverted.tooltip.detailed.line1=Vysílá světlo, vypne se s item.itemLightInverted.tooltip.detailed.line2=ruditovým signálem -tile.blockCapacitorBank.name=Banka kondenzátorů Bank -tile.blockCapacitorBank.creative.name=Kreativní banka kondenzátorů -tile.blockCapacitorBank.tooltip.detailed.line1=Multi-blokové energetické úložiště. -tile.blockCapacitorBank.tooltip.detailed.line2=Umí nabít předměty, které využívají RF. -tile.blockCapacitorBank.tooltipPrefix=Obsahuje - enderio.capbank.maxIO=Maximální I/O enderio.capbank.maxIn=Maximální vstup enderio.capbank.maxOut=Maximální výstup diff --git a/src/main/resources/assets/enderio/lang/de_DE.lang b/src/main/resources/assets/enderio/lang/de_DE.lang index 590c047a..b6982f46 100644 --- a/src/main/resources/assets/enderio/lang/de_DE.lang +++ b/src/main/resources/assets/enderio/lang/de_DE.lang @@ -364,12 +364,6 @@ item.itemWirelessLightInverted.tooltip.detailed.line2=Energie versorgt item.itemWirelessLightInverted.tooltip.detailed.line3=Schalte mit einem Redstonesignal ab. item.itemWirelessLightInverted.tooltip.detailed.line4=Kann Energie von Drahtlos-Ladegeräten empfangen. -tile.blockCapacitorBank.name=Kondensatorbank (Veraltet) -tile.blockCapacitorBank.creative.name=Kreative Kondensatorbank (Veraltet) -tile.blockCapacitorBank.tooltip.detailed.line1=In einen neuen Block umwandeln -tile.blockCapacitorBank.tooltip.detailed.line2=durch Platzieren in Fertigungsgitter. -tile.blockCapacitorBank.tooltipPrefix=Enthält - tile.blockCapBank.creative.name=Kreative Kondensatorbank tile.blockCapBank.simple.name=Basis-Kondensatorbank tile.blockCapBank.activated.name=Kondensatorbank diff --git a/src/main/resources/assets/enderio/lang/en_US.lang b/src/main/resources/assets/enderio/lang/en_US.lang index c18ff702..69f8f893 100644 --- a/src/main/resources/assets/enderio/lang/en_US.lang +++ b/src/main/resources/assets/enderio/lang/en_US.lang @@ -441,11 +441,6 @@ item.itemWirelessLightInverted.tooltip.detailed.line2=power. item.itemWirelessLightInverted.tooltip.detailed.line3=Turn off with a redstone signal. item.itemWirelessLightInverted.tooltip.detailed.line4=Can receive power from wireless chargers. -tile.blockCapacitorBank.name=Capacitor Bank (Deprecated) -tile.blockCapacitorBank.creative.name=Creative Capacitor Bank (Deprecated) -tile.blockCapacitorBank.tooltip.detailed.line1=Convert to new block by placing -tile.blockCapacitorBank.tooltip.detailed.line2=in a crafting grid -tile.blockCapacitorBank.tooltipPrefix=Contains tile.blockCapBank.name=Capacitor Bank tile.blockCapBank.creative.name=Creative Capacitor Bank diff --git a/src/main/resources/assets/enderio/lang/es_AR.lang b/src/main/resources/assets/enderio/lang/es_AR.lang index ebb7cdc0..e65d4e10 100644 --- a/src/main/resources/assets/enderio/lang/es_AR.lang +++ b/src/main/resources/assets/enderio/lang/es_AR.lang @@ -270,11 +270,6 @@ item.itemWirelessLightInverted.tooltip.detailed.line1=Ilumina una gran área cua item.itemWirelessLightInverted.tooltip.detailed.line2=Desactívala con una señal de redstone. item.itemWirelessLightInverted.tooltip.detailed.line3=Puede recibir energía de los cargadores inalámbricos. -tile.blockCapacitorBank.name=Condensador de Almacenaje (Obsoleto) -tile.blockCapacitorBank.creative.name=Condensador de Almacenaje Creativo (Obsoleto) -tile.blockCapacitorBank.tooltip.detailed.line1=Conviértelo en nuevo poniéndolo en una cuadrícula de fabricación. -tile.blockCapacitorBank.tooltipPrefix=Contiene - tile.blockCapBank.creative.name=Condensador de Almacenaje Creativo tile.blockCapBank.simple.name=Condensador de Almacenaje Básico tile.blockCapBank.activated.name=Condensador de Almacenaje diff --git a/src/main/resources/assets/enderio/lang/es_ES.lang b/src/main/resources/assets/enderio/lang/es_ES.lang index 06eead17..c67f86c9 100644 --- a/src/main/resources/assets/enderio/lang/es_ES.lang +++ b/src/main/resources/assets/enderio/lang/es_ES.lang @@ -272,11 +272,6 @@ item.itemWirelessLightInverted.tooltip.detailed.line1=Ilumina una gran área cua item.itemWirelessLightInverted.tooltip.detailed.line2=Desactívala con una señal de redstone. item.itemWirelessLightInverted.tooltip.detailed.line3=Puede recibir energía de los cargadores inalámbricos. -tile.blockCapacitorBank.name=Condensador de Almacenaje (Obsoleto) -tile.blockCapacitorBank.creative.name=Condensador de Almacenaje Creativo (Obsoleto) -tile.blockCapacitorBank.tooltip.detailed.line1=Conviértelo en nuevo poniéndolo en una cuadrícula de fabricación. -tile.blockCapacitorBank.tooltipPrefix=Contiene - tile.blockCapBank.creative.name=Condensador de Almacenaje Creativo tile.blockCapBank.simple.name=Condensador de Almacenaje Básico tile.blockCapBank.activated.name=Condensador de Almacenaje diff --git a/src/main/resources/assets/enderio/lang/es_MX.lang b/src/main/resources/assets/enderio/lang/es_MX.lang index ebb7cdc0..e65d4e10 100644 --- a/src/main/resources/assets/enderio/lang/es_MX.lang +++ b/src/main/resources/assets/enderio/lang/es_MX.lang @@ -270,11 +270,6 @@ item.itemWirelessLightInverted.tooltip.detailed.line1=Ilumina una gran área cua item.itemWirelessLightInverted.tooltip.detailed.line2=Desactívala con una señal de redstone. item.itemWirelessLightInverted.tooltip.detailed.line3=Puede recibir energía de los cargadores inalámbricos. -tile.blockCapacitorBank.name=Condensador de Almacenaje (Obsoleto) -tile.blockCapacitorBank.creative.name=Condensador de Almacenaje Creativo (Obsoleto) -tile.blockCapacitorBank.tooltip.detailed.line1=Conviértelo en nuevo poniéndolo en una cuadrícula de fabricación. -tile.blockCapacitorBank.tooltipPrefix=Contiene - tile.blockCapBank.creative.name=Condensador de Almacenaje Creativo tile.blockCapBank.simple.name=Condensador de Almacenaje Básico tile.blockCapBank.activated.name=Condensador de Almacenaje diff --git a/src/main/resources/assets/enderio/lang/es_UY.lang b/src/main/resources/assets/enderio/lang/es_UY.lang index ebb7cdc0..e65d4e10 100644 --- a/src/main/resources/assets/enderio/lang/es_UY.lang +++ b/src/main/resources/assets/enderio/lang/es_UY.lang @@ -270,11 +270,6 @@ item.itemWirelessLightInverted.tooltip.detailed.line1=Ilumina una gran área cua item.itemWirelessLightInverted.tooltip.detailed.line2=Desactívala con una señal de redstone. item.itemWirelessLightInverted.tooltip.detailed.line3=Puede recibir energía de los cargadores inalámbricos. -tile.blockCapacitorBank.name=Condensador de Almacenaje (Obsoleto) -tile.blockCapacitorBank.creative.name=Condensador de Almacenaje Creativo (Obsoleto) -tile.blockCapacitorBank.tooltip.detailed.line1=Conviértelo en nuevo poniéndolo en una cuadrícula de fabricación. -tile.blockCapacitorBank.tooltipPrefix=Contiene - tile.blockCapBank.creative.name=Condensador de Almacenaje Creativo tile.blockCapBank.simple.name=Condensador de Almacenaje Básico tile.blockCapBank.activated.name=Condensador de Almacenaje diff --git a/src/main/resources/assets/enderio/lang/es_VE.lang b/src/main/resources/assets/enderio/lang/es_VE.lang index 493157a8..80cfb2c7 100644 --- a/src/main/resources/assets/enderio/lang/es_VE.lang +++ b/src/main/resources/assets/enderio/lang/es_VE.lang @@ -270,11 +270,6 @@ item.itemWirelessLightInverted.tooltip.detailed.line1=Ilumina una gran área cua item.itemWirelessLightInverted.tooltip.detailed.line2=Desactívala con una señal de redstone. item.itemWirelessLightInverted.tooltip.detailed.line3=Puede recibir energía de los cargadores inalámbricos. -tile.blockCapacitorBank.name=Condensador de Almacenaje (Obsoleto) -tile.blockCapacitorBank.creative.name=Condensador de Almacenaje Creativo (Obsoleto) -tile.blockCapacitorBank.tooltip.detailed.line1=Conviértelo en nuevo poniéndolo en una cuadrícula de fabricación. -tile.blockCapacitorBank.tooltipPrefix=Contiene - tile.blockCapBank.creative.name=Condensador de Almacenaje Creativo tile.blockCapBank.simple.name=Condensador de Almacenaje Básico tile.blockCapBank.activated.name=Condensador de Almacenaje diff --git a/src/main/resources/assets/enderio/lang/fr_FR.lang b/src/main/resources/assets/enderio/lang/fr_FR.lang index afc5b786..da605933 100644 --- a/src/main/resources/assets/enderio/lang/fr_FR.lang +++ b/src/main/resources/assets/enderio/lang/fr_FR.lang @@ -288,12 +288,6 @@ item.itemWirelessLightInverted.tooltip.detailed.line2=en énergie. item.itemWirelessLightInverted.tooltip.detailed.line3=S'éteint avec un signal de redstone. item.itemWirelessLightInverted.tooltip.detailed.line4=Peut recevoir de l'énergie d'un Chargeur sans-fil. -enderio.blockCapacitorBank=Batterie de condensateurs (Obsolète) -tile.blockCapacitorBank.creative.name=Batterie de condensateurs Créative (Obsolète) -tile.blockCapacitorBank.tooltip.detailed.line1=Convertir en nouveau block en la plaçant -tile.blockCapacitorBank.tooltip.detailed.line2=sur une grille de craft -tile.blockCapacitorBank.tooltipPrefix=Contient - tile.blockCapBank.creative.name=Batterie de condensateurs Créative tile.blockCapBank.simple.name=Batterie de condensateurs basique tile.blockCapBank.activated.name=Batterie de condensateurs diff --git a/src/main/resources/assets/enderio/lang/ko_KR.lang b/src/main/resources/assets/enderio/lang/ko_KR.lang index 3ded7ddf..40ac4d0f 100644 --- a/src/main/resources/assets/enderio/lang/ko_KR.lang +++ b/src/main/resources/assets/enderio/lang/ko_KR.lang @@ -261,12 +261,6 @@ item.itemWirelessLightInverted.tooltip.detailed.line2=넓은 공간을 밝혀 item.itemWirelessLightInverted.tooltip.detailed.line3=레드스톤 신호로 끌 수 있습니다. item.itemWirelessLightInverted.tooltip.detailed.line4=무선 충전기로부터 전력을 받을 수 있습니다. -tile.blockCapacitorBank.name=축전기 -tile.blockCapacitorBank.creative.name=크리에이티브 축전기 -tile.blockCapacitorBank.tooltip.detailed.line1=멀티블럭 에너지 저장고입니다. -tile.blockCapacitorBank.tooltip.detailed.line2=RF를 사용하는 아이템들을 충전할 수 있습니다. -tile.blockCapacitorBank.tooltipPrefix=에너지 저장량: - enderio.capbank.maxIO=최대 입출력 enderio.capbank.maxIn=최대 입력 enderio.capbank.maxOut=최대 출력 diff --git a/src/main/resources/assets/enderio/lang/pl_PL.lang b/src/main/resources/assets/enderio/lang/pl_PL.lang index 3a8c4bdc..07758179 100644 --- a/src/main/resources/assets/enderio/lang/pl_PL.lang +++ b/src/main/resources/assets/enderio/lang/pl_PL.lang @@ -86,8 +86,6 @@ tile.enderio.blockReservoir.name=Zbiornik tile.enderio.blockAlloySmelter.name=Piec stopów tile.enderio.blockSolarPanel.name=Ogniwo fotowoltaiczne tile.enderio.blockElectricLight.name=Lampa -tile.enderio.blockCapacitorBank.name=Bateria energetyczna -tile.enderio.blockCapacitorBank.tooltipPrefix=Zawiera tile.enderio.blockCrusher.name=Rozdrabniarka tile.enderio.blockHyperCube.name=Międzywymiarowy odbiornik tile.enderio.blockPowerMonitor.name=Ekran energetyczny diff --git a/src/main/resources/assets/enderio/lang/pt_BR.lang b/src/main/resources/assets/enderio/lang/pt_BR.lang index 047b16e6..7e0af2d6 100644 --- a/src/main/resources/assets/enderio/lang/pt_BR.lang +++ b/src/main/resources/assets/enderio/lang/pt_BR.lang @@ -274,12 +274,6 @@ item.itemWirelessLightInverted.tooltip.detailed.line2=com energia. item.itemWirelessLightInverted.tooltip.detailed.line3=Desliga com um sinal de redstone. item.itemWirelessLightInverted.tooltip.detailed.line4=Pode receber energia de Carregadores Sem Fio -tile.blockCapacitorBank.name=Banco de Capacitores (Deprecado) -tile.blockCapacitorBank.creative.name=Banco de Capacitores Criativo (Deprecado) -tile.blockCapacitorBank.tooltip.detailed.line1=Converta a um novo bloco colocando-o -tile.blockCapacitorBank.tooltip.detailed.line2=em uma grade de crafting. -tile.blockCapacitorBank.tooltipPrefix=Contém - tile.blockCapBank.creative.name=Banco de Capacitores Criativo tile.blockCapBank.simple.name=Banco de Capacitores Básico tile.blockCapBank.activated.name=Banco de Capacitores diff --git a/src/main/resources/assets/enderio/lang/pt_PT.lang b/src/main/resources/assets/enderio/lang/pt_PT.lang index 731f00e5..29a72c20 100644 --- a/src/main/resources/assets/enderio/lang/pt_PT.lang +++ b/src/main/resources/assets/enderio/lang/pt_PT.lang @@ -276,12 +276,6 @@ item.itemWirelessLightInverted.tooltip.detailed.line2=com energia. item.itemWirelessLightInverted.tooltip.detailed.line3=Desliga com um sinal de redstone. item.itemWirelessLightInverted.tooltip.detailed.line4=Pode receber energia de Carregadores Sem Fio -tile.blockCapacitorBank.name=Banco de Capacitores (Deprecado) -tile.blockCapacitorBank.creative.name=Banco de Capacitores Criativo (Deprecado) -tile.blockCapacitorBank.tooltip.detailed.line1=Converta a um novo bloco colocando-o -tile.blockCapacitorBank.tooltip.detailed.line2=em uma grade de crafting. -tile.blockCapacitorBank.tooltipPrefix=Contém - tile.blockCapBank.creative.name=Banco de Capacitores Criativo tile.blockCapBank.simple.name=Banco de Capacitores Básico tile.blockCapBank.activated.name=Banco de Capacitores diff --git a/src/main/resources/assets/enderio/lang/ru_RU.lang b/src/main/resources/assets/enderio/lang/ru_RU.lang index 557d77e8..c8e7f2c9 100644 --- a/src/main/resources/assets/enderio/lang/ru_RU.lang +++ b/src/main/resources/assets/enderio/lang/ru_RU.lang @@ -413,12 +413,6 @@ item.itemWirelessLightInverted.tooltip.detailed.line2=энергии. item.itemWirelessLightInverted.tooltip.detailed.line3=Выключается по сигналу красного камня. item.itemWirelessLightInverted.tooltip.detailed.line4=Может получать энергию от беспроводных зарядников. -tile.blockCapacitorBank.name=Блок конденсаторов (Устаревший) -tile.blockCapacitorBank.creative.name=Творческий блок конденсаторов (Устаревший) -tile.blockCapacitorBank.tooltip.detailed.line1=Переделайте в новый блок, положив -tile.blockCapacitorBank.tooltip.detailed.line2=в сетку создания. -tile.blockCapacitorBank.tooltipPrefix=Содержит - tile.blockCapBank.creative.name=Творческий блок конденсаторов tile.blockCapBank.simple.name=Основной блок конденсаторов tile.blockCapBank.activated.name=Блок конденсаторов diff --git a/src/main/resources/assets/enderio/lang/zh_CN.lang b/src/main/resources/assets/enderio/lang/zh_CN.lang index 71bcec79..785ba77a 100644 --- a/src/main/resources/assets/enderio/lang/zh_CN.lang +++ b/src/main/resources/assets/enderio/lang/zh_CN.lang @@ -413,12 +413,6 @@ item.itemWirelessLightInverted.tooltip.detailed.line2=照亮大片区域. item.itemWirelessLightInverted.tooltip.detailed.line3=有红石信号时熄灭 item.itemWirelessLightInverted.tooltip.detailed.line4=可从无线充能器接收能量. -tile.blockCapacitorBank.name=电容储能库 -tile.blockCapacitorBank.creative.name=创造模式电容储能库 -tile.blockCapacitorBank.tooltip.detailed.line1=多方块能量存储. -tile.blockCapacitorBank.tooltip.detailed.line2=可以给使用RF能量的物品充能. -tile.blockCapacitorBank.tooltipPrefix=包含 - tile.blockCapBank.creative.name=创造模式电容库 tile.blockCapBank.simple.name=基础电容库 tile.blockCapBank.activated.name=电容库 diff --git a/src/main/resources/assets/enderio/lang/zh_TW.lang b/src/main/resources/assets/enderio/lang/zh_TW.lang index 3beea2ed..58aa4bf8 100644 --- a/src/main/resources/assets/enderio/lang/zh_TW.lang +++ b/src/main/resources/assets/enderio/lang/zh_TW.lang @@ -259,12 +259,6 @@ item.itemWirelessLightInverted.tooltip.detailed.line2=照亮大片區域. item.itemWirelessLightInverted.tooltip.detailed.line3=有紅石信號時熄滅 item.itemWirelessLightInverted.tooltip.detailed.line4=可從無線充能器接收能量. -tile.blockCapacitorBank.name=電容儲能庫 -tile.blockCapacitorBank.creative.name=創造模式電容儲能庫 -tile.blockCapacitorBank.tooltip.detailed.line1=多方塊能量存儲. -tile.blockCapacitorBank.tooltip.detailed.line2=可以給使用RF能量的物品充能. -tile.blockCapacitorBank.tooltipPrefix=包含 - tile.blockCapBank.creative.name=創造模式電容儲能庫 tile.blockCapBank.simple.name=基本電容儲能庫 tile.blockCapBank.activated.name=電容儲能庫 diff --git a/src/main/resources/assets/enderio/textures/blocks/old/capBankInfoPanel.png b/src/main/resources/assets/enderio/textures/blocks/old/capBankInfoPanel.png deleted file mode 100644 index 31918aa33f1b9766b75738219ccec449cc103704..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 175 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3 zQ$0figD*u3fvV&@T^vI!{F4>f&%_(f_b^%2C;`GQ>)3=Cn3)+~s+VZUcZS^ns$}qV L^>bP0l+XkK$44yV diff --git a/src/main/resources/assets/enderio/textures/blocks/old/capacitorBank.png b/src/main/resources/assets/enderio/textures/blocks/old/capacitorBank.png deleted file mode 100644 index 4d505554f9cfe8bb1770f6055286edbe9c4471ce..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 467 zcmV;^0WAKBP)P0000QbVXQnQ*UN;cVTj608n9RZgehA zMN}YmGcGkQF)%Rna-jeK0Zd6mK~y+TJyHpdgD?!_FMS7JLpG5NPt1{uyg~2!37O4=TQZ+AO*BVcZeWU!U~F9n&ARLfD}61 z<2u|&@M>3Q_l~}AdQ2#gi9HQV!x$W5COqmTeXU=>CU~V{8SRg@{EQ;UD^Wy7JURv^ zG8w&yS<1aoyGM)QjU&gcRwIH0em7^U-~6i`(F#d{TpU~k=UsfYPfV1hc04rruuT!n zfw;mUJd7(zW0#0lh<+eW3S-~7d_#mVc6wM>j{hNueE}?6{|8Gy!;^di)Gz=5002ov JPDHLkV1md&vVi~q diff --git a/src/main/resources/assets/enderio/textures/blocks/old/capacitorBankActivatedBorder.png b/src/main/resources/assets/enderio/textures/blocks/old/capacitorBankActivatedBorder.png deleted file mode 100644 index a6b17c20cdf3591d1ab2b21df48593060586201d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1338 zcmV-A1;zS_P)N2bPDNB8 zb~7$DE-^4L^m3s900g#4L_t(YOMRB-lH)iGg#B_mJHa!yl9jXNyzl?_J^-X7`);qQ z%YhQRfhGWH^J};J9R%-T_z^{4N&J;0+rt9>g3mYxA92JzhW98GgeyeC;I4)toNxO* z2LB{%bmVT${Ha%<)Ao=pzGc+K(df@M8EHaR9_~L(1 zmT}XheU}YGK00Jz=vhpng0u0F*0KC5vHIMRK)bg~%+G4PV60=CtpN z<5-@i%A=f)tccPuaP^={2}&xqf~>H9=vo6S$PhQ=8_dOoL)XDopHI!@(p)d{c{%fU zkvWbel#Edfc=ZG)wdZ_vSRVuY)`Ub@>AwAU*#_2pchPvlgH#?ds? zH?dCO%p4{4=~zyd_rwYsyDWoT1cI_)iFk$me(P>G5x87j1}Xr%!8DY2fEQt?xve^# z#DKHp%?d$q3|j;^bk2nP@C54K3A}{w*dcZ7LM>4*)R%L6xv-JXnqA{a5kkHQ!00nj zf6nJ8b~DEd%WWJE&%l_?{j8h;fKi&VqO2>8nhH>cB~ZGUXoAz+UL zW~x4Ia?wzkxULcorft%$C8C@%8;5dr22O)dg{-hXP31U7RYeKOxPII3-ot=n;Hh95 zDj*rewF^J9@P~n;L!fd39!kmz-3v9y`#vg5CLPbp&D%}{v>W6YoPheH;d^t0eUSb1 zun35T;t20dUGPBc`?PJtqTm4JiN8B$?B;&jb!v{VTlgYi8uo(~PhD_l*MURR z1e6eu%phSu~FdoFVX8 z;9uq_FEy^z!mExuUZn;J0<1U9jy9e%z#`h3>1r0q@vknDvC9bZaqu7kg!1+=5fC(z>yuv04 z;mf^L?hb9vNbkHCV wE&%R8Y=-Vx!M~&9zzp^-fLddR{nu{y51AfICxGfEegFUf07*qoM6N<$f;R4XHvj+t diff --git a/src/main/resources/assets/enderio/textures/blocks/old/capacitorBankCreativeBorder.png b/src/main/resources/assets/enderio/textures/blocks/old/capacitorBankCreativeBorder.png deleted file mode 100644 index 3a86d8449f404754f4c5da50b2168c3d78cbf8c5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1453 zcmV;e1ycHnP)N2bPDNB8 zb~7$DE-^4L^m3s900k*YL_t(YOMRB-cIrqFgn1_0fK3oWIU~S1W577#yYK&Jzn&Qd zeD>}+bwCaei%(2#|B(KjI8@17~l1WcZ1PwkH0D5t~_#xAwOww zd(}Hb2J#MH+&@|N%hcVt!K)v>`jLSXY`u`h^~8O#oR#gaZ0C7oKUveK;e9qg#Y0Q)cd^TlT_N_Ym0+lInv+v9EKMT=7@;%KkMg-_2szK2SN}iFxtJb9F)LyGmWzhIz!q3Z}Vh;O$dHKD# z_?RsY1egSC$K!ca)FrWwFD9ZYy?z=Re2?e zf0pMYL7P%qBfyk?99S|{^pF|L%rbMP8Zy5H>IS7dXQk>+iCxQ}M+OfQTXr&oo6&kV zkU`y=hytVWKLYIA4EEV)P8XFLEW*AGBSyvbU?}H-8mL2c2G~HRu{C|PJ+1Lqfh=c3 zLHAxr<7&%^kOfYtz9z*|#q;tcjx z5Z_Nd3Lqz%I`lcsjX=$=-QNTu=4f^uJ_67+yxF{_-ph-L636oWx-AXyyK;uuf3X{ZD3id`Qai3~fmgyWa`2p`ErFiAPDu+{ zvbn_fs;W>+*S7-K*KKFo?0*qBHanT7BygP3Rjt`|&$QY3sg506+SHiC^?^n8sK6Nl zuLXWvFYTYGl^AMxwc{paKY|oId7=DN#{|^C#}Z-h z_1R=1fR56r-_GS_y#bH4ZgE!s4F?*u-s7Q$4NlmXM<@RRM3AW|t>3V}00000NkvXX Hu0mjfswb|8 diff --git a/src/main/resources/assets/enderio/textures/blocks/old/capacitorBankFillBar.png b/src/main/resources/assets/enderio/textures/blocks/old/capacitorBankFillBar.png deleted file mode 100644 index abdfbad99ac9a34b01c78a024274bc140c3bed50..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 290 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{^MbQ4*Y=R#Ki=l*$m0n3-3i=jR%tP-d)Ws%L2E{@KYKsA`_4 zi(`m||I*0^IU5XkTsOOGKU(-rsiN?noa`aSIfr7E9KAm-H|=oZQ+x9FkD2PKn#__p zO^>5|i-M|GUzW06|IvIwwqF6~kD%idx2;U?%sIH~zOwiuJAR#sj4L{rS~`P0000QbVXQn zQ*UN;cVTj608n9RZgehAMN}YmGcGkQF)>H;LN@>a0fk9KK~y+TJyKh4gD?=xH5yF6 z8p0#@NW4%rHqg5i0#c7r2`4#fXVwsDKm3@PoqgS&l@T+EL)7vv0!%2&Y8C-e`?CCZ>H3o;639l$19YWQ7V_Z9U#UBcY=-8GI z1+hF_>mC3MaUGnBk@FHJlzXA=URwlj965eP0000QbVXQn zQ*UN;cVTj608n9RZgehAMN}YmGcGkQF)>H;LN@>a0dh%1K~y+TO_E!ZfQinhv$UZA z2Y+`qJPya~;@&#wM~S!MBIip3TmYuBpWjW;2oNH1H+-(8hE7?cTNn(qx|4|ig}cI= z>}e$Zyjc1G97AEmfN~wZp%c;-7>n14AoD~W5?M9F1tEYdOt_~U?juy{e6rod-1q$q zG8Du_YYdcJU&A3g(a~=*Rs9{<2Cq_Vm+|}h=C7qGaZ8%S$faX(PNrcqICdv6t$G(4 zH~KNwcXP%$Reu`V4z0t}w-c`R{k{0n0G@{=qlPiDY|$Maq

yh(61bHvO3Y-1_3d+U;sP0000QbVXQn zQ*UN;cVTj608n9RZgehAMN}YmGcGkQF)>H;LN@>a0aZyvK~y+TJ(63FgD?z5Sxid< z^tWrEF-UC!%<2ItZ0v>c=D{Ep|Le}6m*X91FZDVo-O zTI>Ayy}3`g3%?=-K(#PbXY~|hSICbOanMNCy;%Z)0RWC6Ap<(= zSE;bz3XH|BE=9&IEm9#7*NiNcga9bS73pvvq12+uM)v8=go2p3qB?B2F1ug3I@(ai47f0000u}!ZMZ+<+GynM+>RUPI-ph%x0-DI+>FVdQ&MBb@ E08!IJxBvhE diff --git a/src/main/resources/assets/enderio/textures/blocks/old/capacitorBankSimple.png b/src/main/resources/assets/enderio/textures/blocks/old/capacitorBankSimple.png deleted file mode 100644 index 2c1981fdfad3a45e97dc655932d81fe9209dc0bd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1338 zcmV-A1;zS_P)N2bPDNB8 zb~7$DE-^7j^FlWO00g#4L_t(YOMRB-lH)iGg#B_mJHa!yl9jXNyzl?_J^-X7`);qQ z%YhQRfhGWH^J};J9R%-T_z^{4N&J;0+rt9>g3mYxA92JzhW98GgeyeC;I4)toNxO* z2LB{%bmVT${Ha%<)Ao=pzGc+K(df@M8EHaR9_~L(1 zmT}XheU}YGK00Jz=vhpng0u0F*0KC5vHIMRK)bg~%+G4PV60=CtpN z<5-@i%A=f)tccPuaP^={2}&xqf~>H9=vo6S$PhQ=8_dOoL)XDopHI!@(p)d{c{%fU zkvWbel#Edfc=ZG)wdZ_vSRVuY)`Ub@>AwAU*#_2pchPvlgH#?ds? zH?dCO%p4{4=~zyd_rwYsyDWoT1cI_)iFk$me(P>G5x87j1}Xr%!8DY2fEQt?xve^# z#DKHp%?d$q3|j;^bk2nP@C54K3A}{w*dcZ7LM>4*)R%L6xv-JXnqA{a5kkHQ!00nj zf6nJ8b~DEd%WWJE&%l_?{j8h;fKi&VqO2>8nhH>cB~ZGUXoAz+UL zW~x4Ia?wzkxULcorft%$C8C@%8;5dr22O)dg{-hXP31U7RYeKOxPII3-ot=n;Hh95 zDj*rewF^J9@P~n;L!fd39!kmz-3v9y`#vg5CLPbp&D%}{v>W6YoPheH;d^t0eUSb1 zun35T;t20dUGPBc`?PJtqTm4JiN8B$?B;&jb!v{VTlgYi8uo(~PhD_l*MURR z1e6eu%phSu~FdoFVX8 z;9uq_FEy^z!mExuUZn;J0<1U9jy9e%z#`h3>1r0q@vknDvC9bZaqu7kg!1+=5fC(z>yuv04 z;mf^L?hb9vNbkHCV wE&%R8Y=-Vx!M~&9zzp^-fLddR{nu{y51AfICxGfEegFUf07*qoM6N<$f?z;+)Bpeg diff --git a/src/main/resources/assets/enderio/textures/blocks/old/capacitorBankSimpleBorder.png b/src/main/resources/assets/enderio/textures/blocks/old/capacitorBankSimpleBorder.png deleted file mode 100644 index 780659c419ff97e230741dfc589423bccc26aacc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 964 zcmV;#13UbQP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02*{fSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+qQF!XYv0009sNklE53F!CxWWBz= z&OJRnbvm7okB{GbR;$%|z20m#e*)+y;8zC7%F@|Hjt#PL)@4T`lqnG#k;WkbP9itg zNO7JYCt%1b=rJ0NaKd=NKg7ZVRAL{eU{tQepwl@4)`7_c*;zhiX%di%grwCCi7=#n z2n8!XB>@sqaKzyu#>!qbTwBOzpdXd3K&cY(hZ-knyWRc`pfl_zN2=TGiTdOzHVLRA zB&IqulBJdo33%kFB2rlW;2;qv39Z3kV9Vtg4CGfP$8h%g$Z8tBUXSG) zlS#m{HXIIhj|0(w+4*J2E^J>sKuo3tNJJHJ1J+S0REUH|$Dey7tKiZKlu@Es6-9M; zl*#8aM@6iP%yF~F#(s)J0wm&0=h~EuhgHGD4n(*ftH?3*kH=#x5&y!oh&CR|OyO)7 zrVKojS)Wb_piMvT18Xt~NTss~G@VwVWeP5p1{AZ$CiDIzdbiuTS@`AB z7ElD23SgA1||?TSd99S#X_m^T_G`y!q}VId50{y4hbE}s*o ziul9BOd7TVqzz#d^rcMi0VL_-Cgl{)tT0000N2bPDNB8 zb~7$DE-^4L^m3s900jq0L_t(YOMRBfZ2E1>Wed~ppy#J4UlI)Ag zBsr&!u`hO&RMM5*dkcQ_qnAPaI!ykY=KXQ@J}U+eT!K;hrjUDDya1kZ(3R$2F5!F+ z|A4&5&nOX=c{!Yw!$m#u)?)+b^J?U;$E?rF{we}hk3A{g?n$goh`SM)poYnjCsU?OI@4>yE#Wz zh|E&y@k8u9932<=HOy~8`4Jn6Tf_=VsPb=g^iYZpzKJ;y87r*E$Ay6vWQZH`9_C^~ zc<|w>K9lk@slH;4>#tNUTbcB-B%%1^1C$)d50EI(r1eNZ2Omoz@1cX;#0XdYoo((p zs9+bFsQ8eavg<0n1g4=f4I}49N(97_T|-DXvVw+JO&}M6N1!I4zD;hRN3;}v$!Eow(C zkALMn$g#Y}*(IV0A%6(KXc?$QanZ(Z>_+XvckEqiu~$xt>Xzi!cu~(pplcD%h(;Se zZg#DA?9OzJT|$O*b1%2w#r9{#$@(KL&LS`?Mvo#BuXN5=%&}A3M`3{puqYX~;cHmJ zzPp#ZUu!gwEN%(Lhya~LH7Ghk@eI^*)Yg<{(7onh0?+Kb{4c z1i{|pd7d=W9kn$+Fag-R0@MisTor+Px&K)KC(u~LW@AS%17s5lm-IL%vROL2$ux`| zf3)SBPQ8nG|jL^PPj{|HD1 zAG!%XMaIA)?8zx$R7|pgybmY?xsVYX0w5!(XQuIA0%FlkHEt@S;F1bg*EBjT=jB+2 z9RkfOLEkVyWY!`RZ06zCi*|mzM<7U#tLzly=SK}1jcaOp7E-cV(|1z9K*_Rt6K0 z@bQQ64{qFt56OhYO zRGwmU+-!jtMB4xa^|G6Rd@9jGBCwN>hDTMQ<~ySkcq8+h>Bj!=0z+nzR+y$FaCJtj z+Oju2(_!bYPVCt7pvD}|pDc2t0%r)kBk*jFN&@~;>XkWeytECZ3ZHdWynOt~KrLd6 zNq1U#+wK&jTF8o!lBMv%=mXpcY7a!UzgjQYU+e(FpJyXVOZ3gCU>3<|Xf0)+&f$K6 z5;PW!OQL;xK$$V2|nU5%In&vY-vS-lMh9C+3NYS@G`e0>Xk Z{0;o|8;p~TJAnWI002ovPDHLkV1kd=oml_?