From 8a54668e453aa254e953654d1ac5ef661cecfe9f Mon Sep 17 00:00:00 2001 From: DarkStarDS9 Date: Fri, 16 Jan 2015 10:21:17 +0100 Subject: [PATCH 01/79] Different Item-Place-Logic MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit this fixes CrazyPants/EnderIO/#1648 the original way caused problems with items that relied on player.inventory.currentItem, like cables from AE2 - they would set the .currentItem-Stack to null when you placed the last cable, which in our case would kill the pick. Also, we’re now using the bult-in “can we place the item there?” logic and can therefore remove canPlaceBlockOnRightClick. It’s still not perfect though, because it doesn’t work with buckets… see the source-code-comments. A possible solution would be to implement a custom message that we send to ourself to switch back to the original item slot, but I’ll just go with “you’re holding the bucket wrong”. --- .../item/darksteel/ItemDarkSteelPickaxe.java | 63 ++++++++----------- 1 file changed, 27 insertions(+), 36 deletions(-) diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java index 70d0391f..a59c4753 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java @@ -5,6 +5,7 @@ import java.util.Set; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.client.Minecraft; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -12,12 +13,10 @@ import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemPickaxe; import net.minecraft.item.ItemStack; -import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.common.util.ForgeDirection; import cofh.api.energy.IEnergyContainerItem; import com.google.common.collect.Sets; @@ -33,8 +32,6 @@ import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.teleport.IItemOfTravel; import crazypants.enderio.teleport.TravelController; import crazypants.enderio.teleport.TravelSource; -import crazypants.render.BoundingBox; -import crazypants.util.BlockCoord; import crazypants.util.ItemUtil; import crazypants.util.Lang; @@ -125,39 +122,33 @@ public class ItemDarkSteelPickaxe extends ItemPickaxe implements IEnergyContaine } static boolean doRightClickItemPlace(EntityPlayer player, World world, int x, int y, int z, int side, float par8, float par9, float par10) { - int current = player.inventory.currentItem; - int slot = current == 0 && Config.slotZeroPlacesEight ? 8 : current + 1; - if(slot < 9 && player.inventory.mainInventory[slot] != null && !(player.inventory.mainInventory[slot].getItem() instanceof IDarkSteelItem)) { - - if(!canPlaceBlockOnRightClick(player, world, x, y, z, side, slot)) { - return false; - } - boolean ret = player.inventory.mainInventory[slot].getItem().onItemUse(player.inventory.mainInventory[slot], player, world, x, y, z, side, par8, - par9, par10); - if(player.inventory.mainInventory[slot].stackSize <= 0) { - player.inventory.mainInventory[slot] = null; - } - return ret; + if (world.isRemote) { + int current = player.inventory.currentItem; + int slot = current == 0 && Config.slotZeroPlacesEight ? 8 + : current + 1; + if (slot < 9 + && player.inventory.mainInventory[slot] != null + && !(player.inventory.mainInventory[slot].getItem() instanceof IDarkSteelItem)) { + /* + * this will not work with buckets unless we don't switch back + * to the current item (the pick); there's probably some client + * <-> server event thing going on with buckets, so our + * item-switch within the same tick would be a problem. + */ + player.inventory.currentItem = slot; + Minecraft mc = Minecraft.getMinecraft(); + boolean result = mc.playerController.onPlayerRightClick( + mc.thePlayer, mc.theWorld, + player.inventory.mainInventory[slot], + mc.objectMouseOver.blockX, mc.objectMouseOver.blockY, + mc.objectMouseOver.blockZ, mc.objectMouseOver.sideHit, + mc.objectMouseOver.hitVec); + player.inventory.currentItem = current; + return (result); + } + } + return false; } - return false; - } - - static boolean canPlaceBlockOnRightClick(EntityPlayer player, World world, int x, int y, int z, int side, int slot) { - BlockCoord placeCoord = new BlockCoord(x, y, z).getLocation(ForgeDirection.getOrientation(side)); - ItemStack toUse = player.inventory.mainInventory[slot]; - AxisAlignedBB aabb; - Block blk = Block.getBlockFromItem(toUse.getItem()); - if(blk != null) { - aabb = blk.getCollisionBoundingBoxFromPool(world, placeCoord.x, placeCoord.y, placeCoord.z); - } else { - BoundingBox bb = new BoundingBox(placeCoord); - aabb = bb.getAxisAlignedBB(); - } - if(aabb != null && aabb.intersectsWith(player.boundingBox)) { - return false; - } - return true; - } private void applyDamage(EntityLivingBase entity, ItemStack stack, int damage) { From c3257e4d50886b55b9b024587496b5269ee76915 Mon Sep 17 00:00:00 2001 From: DarkStarDS9 Date: Sat, 17 Jan 2015 14:07:57 +0100 Subject: [PATCH 02/79] SMP Fix --- .../item/darksteel/ItemDarkSteelPickaxe.java | 63 ++++++++++--------- 1 file changed, 32 insertions(+), 31 deletions(-) diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java index a59c4753..4a270d7e 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java @@ -113,39 +113,40 @@ public class ItemDarkSteelPickaxe extends ItemPickaxe implements IEnergyContaine return true; } - @Override - public boolean onItemUse(ItemStack item, EntityPlayer player, World world, int x, int y, int z, int side, float par8, float par9, float par10) { - if(!isTravelUpgradeActive(player, item)) { - return doRightClickItemPlace(player, world, x, y, z, side, par8, par9, par10); + @Override + public boolean onItemUse(ItemStack item, EntityPlayer player, World world, + int x, int y, int z, int side, float par8, float par9, float par10) { + if (!isTravelUpgradeActive(player, item) && world.isRemote) { + return doRightClickItemPlace(player, world, x, y, z, side, par8, + par9, par10); + } + return false; } - return false; - } - static boolean doRightClickItemPlace(EntityPlayer player, World world, int x, int y, int z, int side, float par8, float par9, float par10) { - if (world.isRemote) { - int current = player.inventory.currentItem; - int slot = current == 0 && Config.slotZeroPlacesEight ? 8 - : current + 1; - if (slot < 9 - && player.inventory.mainInventory[slot] != null - && !(player.inventory.mainInventory[slot].getItem() instanceof IDarkSteelItem)) { - /* - * this will not work with buckets unless we don't switch back - * to the current item (the pick); there's probably some client - * <-> server event thing going on with buckets, so our - * item-switch within the same tick would be a problem. - */ - player.inventory.currentItem = slot; - Minecraft mc = Minecraft.getMinecraft(); - boolean result = mc.playerController.onPlayerRightClick( - mc.thePlayer, mc.theWorld, - player.inventory.mainInventory[slot], - mc.objectMouseOver.blockX, mc.objectMouseOver.blockY, - mc.objectMouseOver.blockZ, mc.objectMouseOver.sideHit, - mc.objectMouseOver.hitVec); - player.inventory.currentItem = current; - return (result); - } + @SideOnly(Side.CLIENT) + static boolean doRightClickItemPlace(EntityPlayer player, World world, + int x, int y, int z, int side, float par8, float par9, float par10) { + int current = player.inventory.currentItem; + int slot = current == 0 && Config.slotZeroPlacesEight ? 8 : current + 1; + if (slot < 9 + && player.inventory.mainInventory[slot] != null + && !(player.inventory.mainInventory[slot].getItem() instanceof IDarkSteelItem)) { + /* + * this will not work with buckets unless we don't switch back to + * the current item (the pick); there's probably some client <-> + * server event thing going on with buckets, so our item-switch + * within the same tick would be a problem. + */ + player.inventory.currentItem = slot; + Minecraft mc = Minecraft.getMinecraft(); + boolean result = mc.playerController.onPlayerRightClick( + mc.thePlayer, mc.theWorld, + player.inventory.mainInventory[slot], + mc.objectMouseOver.blockX, mc.objectMouseOver.blockY, + mc.objectMouseOver.blockZ, mc.objectMouseOver.sideHit, + mc.objectMouseOver.hitVec); + player.inventory.currentItem = current; + return (result); } return false; } From b60a44fe7add7309f011800c58108e67a1fdee90 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Thu, 22 Jan 2015 09:48:30 -0500 Subject: [PATCH 03/79] Conduit connectors should now combine into a single box (experimental) --- .../enderio/conduit/TileConduitBundle.java | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java b/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java index fc719259..c66d78f9 100644 --- a/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java +++ b/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java @@ -6,6 +6,8 @@ import java.util.HashSet; import java.util.List; import java.util.Set; +import com.google.common.collect.Lists; + import mekanism.api.gas.Gas; import mekanism.api.gas.GasStack; import net.minecraft.block.Block; @@ -545,6 +547,33 @@ public class TileConduitBundle extends TileEntityEio implements IConduitBundle { } } } + + List internals = Lists.newArrayList(); + // Merge all internal conduit connectors into one box + for (int i = 0; i < result.size(); i++) { + CollidableComponent cc = result.get(i); + if (cc.conduitType == null && cc.data == ConduitConnectorType.INTERNAL) { + internals.add(cc); + result.remove(i); + i--; + cachedConnectors.remove(cc); + } + } + + BoundingBox conBB = null; + for (CollidableComponent cc : internals) { + if (conBB == null) { + conBB = cc.bound; + } else { + conBB = conBB.expandBy(cc.bound); + } + } + + if(conBB != null) { + CollidableComponent cc = new CollidableComponent(null, conBB, ForgeDirection.UNKNOWN, ConduitConnectorType.INTERNAL); + result.add(cc); + cachedConnectors.add(cc); + } // External Connectors Set externalDirs = new HashSet(); From 3a1da27d3cbf0b334cec03787ccfe5601863f71e Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Thu, 22 Jan 2015 10:44:12 -0500 Subject: [PATCH 04/79] Split internal and external connector textures --- .../enderio/conduit/BlockConduitBundle.java | 8 +++++--- .../enderio/conduit/TileConduitBundle.java | 14 ++------------ .../enderio/conduit/gas/GasConduitRenderer.java | 2 +- .../liquid/AdvancedLiquidConduitRenderer.java | 2 +- .../conduit/liquid/LiquidConduitRenderer.java | 2 +- .../conduit/redstone/RedstoneSwitchRenderer.java | 3 ++- .../conduit/render/ConduitBundleRenderer.java | 5 +++-- .../conduit/render/DefaultConduitRenderer.java | 2 +- 8 files changed, 16 insertions(+), 22 deletions(-) diff --git a/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java b/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java index 116c25b3..16b5fcc1 100644 --- a/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java +++ b/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java @@ -64,6 +64,7 @@ import crazypants.util.Util; public class BlockConduitBundle extends BlockEio implements IGuiHandler, IFacade, IRedNetOmniNode { private static final String KEY_CONNECTOR_ICON = "enderIO:conduitConnector"; + private static final String KEY_CONNECTOR_ICON_EXTERNAL = "enderIO:conduitConnectorExternal"; public static BlockConduitBundle create() { @@ -90,7 +91,7 @@ public class BlockConduitBundle extends BlockEio implements IGuiHandler, IFacade public static int rendererId = -1; - private IIcon connectorIcon; + private IIcon connectorIcon, connectorIconExternal; private IIcon lastRemovedComponetIcon = null; @@ -233,14 +234,15 @@ public class BlockConduitBundle extends BlockEio implements IGuiHandler, IFacade return 0; } - public IIcon getConnectorIcon() { - return connectorIcon; + public IIcon getConnectorIcon(Object data) { + return data == ConduitConnectorType.EXTERNAL ? connectorIconExternal : connectorIcon; } @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister IIconRegister) { connectorIcon = IIconRegister.registerIcon(KEY_CONNECTOR_ICON); + connectorIconExternal = IIconRegister.registerIcon(KEY_CONNECTOR_ICON_EXTERNAL); blockIcon = connectorIcon; } diff --git a/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java b/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java index c66d78f9..3fde5891 100644 --- a/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java +++ b/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java @@ -548,26 +548,17 @@ public class TileConduitBundle extends TileEntityEio implements IConduitBundle { } } - List internals = Lists.newArrayList(); // Merge all internal conduit connectors into one box + BoundingBox conBB = null; for (int i = 0; i < result.size(); i++) { CollidableComponent cc = result.get(i); if (cc.conduitType == null && cc.data == ConduitConnectorType.INTERNAL) { - internals.add(cc); + conBB = conBB == null ? cc.bound : conBB.expandBy(cc.bound); result.remove(i); i--; cachedConnectors.remove(cc); } } - - BoundingBox conBB = null; - for (CollidableComponent cc : internals) { - if (conBB == null) { - conBB = cc.bound; - } else { - conBB = conBB.expandBy(cc.bound); - } - } if(conBB != null) { CollidableComponent cc = new CollidableComponent(null, conBB, ForgeDirection.UNKNOWN, ConduitConnectorType.INTERNAL); @@ -595,7 +586,6 @@ public class TileConduitBundle extends TileEntityEio implements IConduitBundle { } connectorsDirty = false; - } private boolean axisOfConnectionsEqual(Set cons) { diff --git a/src/main/java/crazypants/enderio/conduit/gas/GasConduitRenderer.java b/src/main/java/crazypants/enderio/conduit/gas/GasConduitRenderer.java index 7dfc5d5e..69b2b7df 100644 --- a/src/main/java/crazypants/enderio/conduit/gas/GasConduitRenderer.java +++ b/src/main/java/crazypants/enderio/conduit/gas/GasConduitRenderer.java @@ -115,7 +115,7 @@ public class GasConduitRenderer extends DefaultConduitRenderer { } if(conduit.getConnectionMode(component.dir) == ConnectionMode.DISABLED) { - tex = EnderIO.blockConduitBundle.getConnectorIcon(); + tex = EnderIO.blockConduitBundle.getConnectorIcon(component.data); List corners = component.bound.getCornersWithUvForFace(component.dir, tex.getMinU(), tex.getMaxU(), tex.getMinV(), tex.getMaxV()); Tessellator tessellator = Tessellator.instance; for (Vertex c : corners) { diff --git a/src/main/java/crazypants/enderio/conduit/liquid/AdvancedLiquidConduitRenderer.java b/src/main/java/crazypants/enderio/conduit/liquid/AdvancedLiquidConduitRenderer.java index d28d40c1..2c1fa201 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/AdvancedLiquidConduitRenderer.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/AdvancedLiquidConduitRenderer.java @@ -118,7 +118,7 @@ public class AdvancedLiquidConduitRenderer extends DefaultConduitRenderer { } if(conduit.getConnectionMode(component.dir) == ConnectionMode.DISABLED) { - tex = EnderIO.blockConduitBundle.getConnectorIcon(); + tex = EnderIO.blockConduitBundle.getConnectorIcon(component.data); List corners = component.bound.getCornersWithUvForFace(component.dir, tex.getMinU(), tex.getMaxU(), tex.getMinV(), tex.getMaxV()); Tessellator tessellator = Tessellator.instance; for (Vertex c : corners) { diff --git a/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduitRenderer.java b/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduitRenderer.java index 920be03c..81386107 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduitRenderer.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduitRenderer.java @@ -66,7 +66,7 @@ public class LiquidConduitRenderer extends DefaultConduitRenderer { } if(conduit.getConnectionMode(component.dir) == ConnectionMode.DISABLED) { - tex = EnderIO.blockConduitBundle.getConnectorIcon(); + tex = EnderIO.blockConduitBundle.getConnectorIcon(component.data); List corners = component.bound.getCornersWithUvForFace(component.dir, tex.getMinU(), tex.getMaxU(), tex.getMinV(), tex.getMaxV()); Tessellator tessellator = Tessellator.instance; for (Vertex c : corners) { diff --git a/src/main/java/crazypants/enderio/conduit/redstone/RedstoneSwitchRenderer.java b/src/main/java/crazypants/enderio/conduit/redstone/RedstoneSwitchRenderer.java index 0ef62bb9..ae737713 100644 --- a/src/main/java/crazypants/enderio/conduit/redstone/RedstoneSwitchRenderer.java +++ b/src/main/java/crazypants/enderio/conduit/redstone/RedstoneSwitchRenderer.java @@ -8,6 +8,7 @@ import crazypants.enderio.EnderIO; import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.IConduitBundle; import crazypants.enderio.conduit.geom.CollidableComponent; +import crazypants.enderio.conduit.geom.ConduitConnectorType; import crazypants.enderio.conduit.geom.ConduitGeometryUtil; import crazypants.enderio.conduit.render.ConduitBundleRenderer; import crazypants.enderio.conduit.render.DefaultConduitRenderer; @@ -54,7 +55,7 @@ public class RedstoneSwitchRenderer extends DefaultConduitRenderer { IIcon[] icons = new IIcon[6]; for (int i = 0; i < icons.length; i++) { - icons[i] = EnderIO.blockConduitBundle.getConnectorIcon(); + icons[i] = EnderIO.blockConduitBundle.getConnectorIcon(ConduitConnectorType.INTERNAL); } icons[3] = sw.getSwitchIcon(); diff --git a/src/main/java/crazypants/enderio/conduit/render/ConduitBundleRenderer.java b/src/main/java/crazypants/enderio/conduit/render/ConduitBundleRenderer.java index ec2bb0bd..aedc7213 100644 --- a/src/main/java/crazypants/enderio/conduit/render/ConduitBundleRenderer.java +++ b/src/main/java/crazypants/enderio/conduit/render/ConduitBundleRenderer.java @@ -39,6 +39,7 @@ import crazypants.enderio.conduit.IConduitBundle.FacadeRenderState; import crazypants.enderio.conduit.TileConduitBundle; import crazypants.enderio.conduit.facade.BlockConduitFacade; import crazypants.enderio.conduit.geom.CollidableComponent; +import crazypants.enderio.conduit.geom.ConduitConnectorType; import crazypants.enderio.conduit.geom.ConduitGeometryUtil; import crazypants.enderio.config.Config; import crazypants.render.BoundingBox; @@ -244,7 +245,7 @@ public class ConduitBundleRenderer extends TileEntitySpecialRenderer implements } } else if(ConduitUtil.getDisplayMode(player) == ConduitDisplayMode.ALL && !rb.hasOverrideBlockTexture()) { - IIcon tex = EnderIO.blockConduitBundle.getConnectorIcon(); + IIcon tex = EnderIO.blockConduitBundle.getConnectorIcon(component.data); CubeRenderer.render(component.bound, tex); } } @@ -267,7 +268,7 @@ public class ConduitBundleRenderer extends TileEntitySpecialRenderer implements } private void renderExternalConnection(ForgeDirection dir) { - IIcon tex = EnderIO.blockConduitBundle.getConnectorIcon(); + IIcon tex = EnderIO.blockConduitBundle.getConnectorIcon(ConduitConnectorType.EXTERNAL); BoundingBox[] bbs = ConduitGeometryUtil.instance.getExternalConnectorBoundingBoxes(dir); for (BoundingBox bb : bbs) { CubeRenderer.render(bb, tex, true); diff --git a/src/main/java/crazypants/enderio/conduit/render/DefaultConduitRenderer.java b/src/main/java/crazypants/enderio/conduit/render/DefaultConduitRenderer.java index 9d644b01..587ab042 100644 --- a/src/main/java/crazypants/enderio/conduit/render/DefaultConduitRenderer.java +++ b/src/main/java/crazypants/enderio/conduit/render/DefaultConduitRenderer.java @@ -80,7 +80,7 @@ public class DefaultConduitRenderer implements ConduitRenderer { drawSection(bb, tex.getMinU(), tex.getMaxU(), tex.getMinV(), tex.getMaxV(), component.dir, false); if(conduit.getConnectionMode(component.dir) == ConnectionMode.DISABLED) { - tex = EnderIO.blockConduitBundle.getConnectorIcon(); + tex = EnderIO.blockConduitBundle.getConnectorIcon(component.data); List corners = component.bound.getCornersWithUvForFace(component.dir, tex.getMinU(), tex.getMaxU(), tex.getMinV(), tex.getMaxV()); Tessellator tessellator = Tessellator.instance; for (Vertex c : corners) { From 85fbb438bdabb618408cc6c1dd61b337f86c45f0 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Thu, 22 Jan 2015 10:44:52 -0500 Subject: [PATCH 05/79] Whoops, forgot the new texture --- .../textures/blocks/conduitConnectorExternal.png | Bin 0 -> 178 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 resources/assets/enderio/textures/blocks/conduitConnectorExternal.png diff --git a/resources/assets/enderio/textures/blocks/conduitConnectorExternal.png b/resources/assets/enderio/textures/blocks/conduitConnectorExternal.png new file mode 100644 index 0000000000000000000000000000000000000000..ac56f9260de9cf7aa6269276e219e425805102b6 GIT binary patch literal 178 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*u3fvOZeT^vI!{F4n-1shCm+_)vw>1Ha>48kX_IxrcSvNAOM+c396b?s`P OVg^rFKbLh*2~7Zw Date: Thu, 22 Jan 2015 13:44:05 -0500 Subject: [PATCH 06/79] Add world wrapper to waila, should fix sneaky facades --- .../crazypants/enderio/waila/WailaCompat.java | 76 +++++++++++++++---- 1 file changed, 61 insertions(+), 15 deletions(-) diff --git a/src/main/java/crazypants/enderio/waila/WailaCompat.java b/src/main/java/crazypants/enderio/waila/WailaCompat.java index c6dde37c..aa9f9108 100644 --- a/src/main/java/crazypants/enderio/waila/WailaCompat.java +++ b/src/main/java/crazypants/enderio/waila/WailaCompat.java @@ -1,7 +1,5 @@ package crazypants.enderio.waila; -import info.jbcs.minecraft.chisel.api.IFacade; - import java.util.List; import mcp.mobius.waila.api.IWailaConfigHandler; @@ -10,6 +8,7 @@ import mcp.mobius.waila.api.IWailaDataProvider; import mcp.mobius.waila.api.IWailaRegistrar; import mcp.mobius.waila.api.impl.ConfigHandler; import net.minecraft.block.Block; +import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.Item; @@ -20,6 +19,8 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; +import net.minecraft.world.WorldSettings; +import net.minecraft.world.chunk.IChunkProvider; import net.minecraftforge.common.util.ForgeDirection; import crazypants.enderio.EnderIO; import crazypants.enderio.TileEntityEio; @@ -39,11 +40,59 @@ import crazypants.enderio.machine.IoMode; import crazypants.enderio.machine.capbank.TileCapBank; import crazypants.enderio.machine.power.TileCapacitorBank; import crazypants.enderio.power.IInternalPoweredTile; +import crazypants.util.IFacade; import crazypants.util.Lang; import static crazypants.enderio.waila.IWailaInfoProvider.*; public class WailaCompat implements IWailaDataProvider { + + private class WailaWorldWrapper extends World { + private World wrapped; + + private WailaWorldWrapper(World wrapped) { + super(wrapped.getSaveHandler(), wrapped.getWorldInfo().getWorldName(), wrapped.provider, new WorldSettings(wrapped.getWorldInfo()), wrapped.theProfiler); + this.wrapped = wrapped; + } + + @Override + public Block getBlock(int x, int y, int z) { + Block block = wrapped.getBlock(x, y, z); + if (block instanceof IFacade) { + return ((IFacade)block).getFacade(wrapped, x, y, z, -1); + } + return block; + } + + @Override + public int getBlockMetadata(int x, int y, int z) { + Block block = wrapped.getBlock(x, y, z); + if (block instanceof IFacade) { + return ((IFacade)block).getFacadeMetadata(wrapped, x, y, z, -1); + } + return wrapped.getBlockMetadata(x, y, z); + } + + @Override + public TileEntity getTileEntity(int p_147438_1_, int p_147438_2_, int p_147438_3_) { + return wrapped.getTileEntity(p_147438_1_, p_147438_2_, p_147438_3_); + } + + @Override + protected IChunkProvider createChunkProvider() { + return null; + } + + @Override + protected int func_152379_p() { + return 0; + } + + @Override + public Entity getEntityByID(int p_73045_1_) { + return null; + } + } public static final WailaCompat INSTANCE = new WailaCompat(); @@ -75,11 +124,8 @@ public class WailaCompat implements IWailaDataProvider { if(accessor.getBlock() instanceof IFacade) { IFacade bundle = (IFacade) accessor.getBlock(); Block facade = bundle.getFacade(accessor.getWorld(), pos.blockX, pos.blockY, pos.blockZ, accessor.getSide().ordinal()); - if (facade != null) { - //accessor.getWorld().setBlockMetadataWithNotify(pos.blockX, pos.blockY, pos.blockZ, bundle.getFacadeMetadata(accessor.getWorld(), pos.blockX, pos.blockY, pos.blockZ, 0), 0); - // TODO metadata is wrong, this gives the wrong output - ItemStack ret = facade.getPickBlock(pos, accessor.getWorld(), pos.blockX, pos.blockY, pos.blockZ); - //accessor.getWorld().setBlockMetadataWithNotify(pos.blockX, pos.blockY, pos.blockZ, 0, 0); + if(facade != null) { + ItemStack ret = facade.getPickBlock(pos, new WailaWorldWrapper(accessor.getWorld()), pos.blockX, pos.blockY, pos.blockZ); return ret; } } @@ -99,17 +145,17 @@ public class WailaCompat implements IWailaDataProvider { public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { _accessor = accessor; - - Block block = accessor.getBlock(); - TileEntity te = accessor.getTileEntity(); - Item item = Item.getItemFromBlock(block); + EntityPlayer player = accessor.getPlayer(); - World world = player.worldObj; MovingObjectPosition pos = accessor.getPosition(); - int x = pos.blockX, y = pos.blockY, z = pos.blockZ; + World world = new WailaWorldWrapper(player.worldObj); + Block block = world.getBlock(x, y, z); + TileEntity te = world.getTileEntity(x, y, z); + Item item = Item.getItemFromBlock(block); - if(te instanceof IIoConfigurable) { + + if(te instanceof IIoConfigurable && block == accessor.getBlock()) { IIoConfigurable machine = (IIoConfigurable) te; ForgeDirection side = accessor.getSide(); IoMode mode = machine.getIoMode(side); @@ -163,7 +209,7 @@ public class WailaCompat implements IWailaDataProvider { } } - if(te instanceof IInternalPoweredTile && accessor.getNBTData().hasKey("storedEnergyRF") && !(te instanceof TileCapBank)) { + if(te instanceof IInternalPoweredTile && block == accessor.getBlock() && accessor.getNBTData().hasKey("storedEnergyRF") && !(te instanceof TileCapBank)) { IInternalPoweredTile power = (IInternalPoweredTile) te; if(power.displayPower()) { From 83eee6beb086c7f706d9401cbeb998cb09610cec Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Fri, 23 Jan 2015 00:07:35 -0500 Subject: [PATCH 07/79] Some more default hoes --- .../crazypants/enderio/config/Config.java | 26 ++++++++++++------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/src/main/java/crazypants/enderio/config/Config.java b/src/main/java/crazypants/enderio/config/Config.java index 0271f103..a74f1307 100644 --- a/src/main/java/crazypants/enderio/config/Config.java +++ b/src/main/java/crazypants/enderio/config/Config.java @@ -269,16 +269,22 @@ public final class Config { public static boolean farmEssenceBerriesEnabled = true; public static boolean farmManaBeansEnabled = false; public static boolean farmHarvestJungleWhenCocoa = false; - public static String[] hoeStrings = new String[] { - "minecraft:wooden_hoe", "minecraft:stone_hoe", "minecraft:iron_hoe", "minecraft:diamond_hoe", "minecraft:golden_hoe", - "MekanismTools:ObsidianHoe", "MekanismTools:LapisLazuliHoe", "MekanismTools:OsmiumHoe", "MekanismTools:BronzeHoe", "MekanismTools:GlowstoneHoe", "MekanismTools:SteelHoe", - "Steamcraft:hoeBrass", "Steamcraft:hoeGildedGold", - "Railcraft:tool.steel.hoe", - "TConstruct:mattock", - "appliedenergistics2:item.ToolCertusQuartzHoe", "appliedenergistics2:item.ToolNetherQuartzHoe", - "ProjRed|Exploration:projectred.exploration.hoeruby", "ProjRed|Exploration:projectred.exploration.hoesapphire", "ProjRed|Exploration:projectred.exploration.hoeperidot", - "magicalcrops:magicalcrops_AccioHoe", "magicalcrops:magicalcrops_CrucioHoe", "magicalcrops:magicalcrops_ImperioHoe", - // disabled as it is currently not unbreaking as advertised "magicalcrops:magicalcrops_ZivicioHoe", + public static String[] hoeStrings = new String[] { + "minecraft:wooden_hoe", "minecraft:stone_hoe", "minecraft:iron_hoe", "minecraft:diamond_hoe", "minecraft:golden_hoe", + "MekanismTools:ObsidianHoe", "MekanismTools:LapisLazuliHoe", "MekanismTools:OsmiumHoe", "MekanismTools:BronzeHoe", "MekanismTools:GlowstoneHoe", + "MekanismTools:SteelHoe", + "Steamcraft:hoeBrass", "Steamcraft:hoeGildedGold", + "Railcraft:tool.steel.hoe", + "TConstruct:mattock", + "appliedenergistics2:item.ToolCertusQuartzHoe", "appliedenergistics2:item.ToolNetherQuartzHoe", + "ProjRed|Exploration:projectred.exploration.hoeruby", "ProjRed|Exploration:projectred.exploration.hoesapphire", + "ProjRed|Exploration:projectred.exploration.hoeperidot", + "magicalcrops:magicalcrops_AccioHoe", "magicalcrops:magicalcrops_CrucioHoe", "magicalcrops:magicalcrops_ImperioHoe", + // disabled as it is currently not unbreaking as advertised "magicalcrops:magicalcrops_ZivicioHoe", + "BiomesOPlenty:hoeAmethyst", "BiomesOPlenty:hoeMud", + "Eln:Eln.Copper Hoe", + "Thaumcraft:ItemHoeThaumium", "Thaumcraft:ItemHoeElemental", "Thaumcraft:ItemHoeVoid", + "ThermalExpansion:tool.hoeInvar" }; public static List farmHoes = new ArrayList(); From 27e3288655e9bb890f8928755502691d639af9ef Mon Sep 17 00:00:00 2001 From: Adaptivity Date: Fri, 23 Jan 2015 19:51:38 +0300 Subject: [PATCH 08/79] Localized waila and tooltips --- resources/assets/enderio/lang/en_US.lang | 15 ++++++--- resources/assets/enderio/lang/ru_RU.lang | 33 ++++++++++++++++--- .../crazypants/enderio/gui/TooltipAddera.java | 8 ++--- .../crazypants/enderio/waila/WailaCompat.java | 2 +- 4 files changed, 43 insertions(+), 15 deletions(-) diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index 10ac6012..9535cb34 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -894,19 +894,24 @@ enderio.config.fluid.tooltip=Pure liquid energy! enderio.config.spawner=PoweredSpawner Settings enderio.config.spawner.tooltip=I ran out of witty tooltips. -//Keybinds/Waila/NEI +//Keybinds/Waila/NEI/Tooltips enderio.category.darksteelarmor=Dark Steel Armor enderio.category.tools=Tools enderio.keybind.glidertoggle=Glider Toggle -enderio.keybind.soundlocator=Sound Locator -enderio.keybind.nightvision=Night Vision enderio.keybind.gogglesofrevealing=Goggles of Revealing -enderio.keybind.stepassist=Step Assist +enderio.keybind.nightvision=Night Vision +enderio.keybind.soundlocator=Sound Locator enderio.keybind.speed=Speed +enderio.keybind.stepassist=Step Assist enderio.keybind.yetawrenchmode=Yeta Wrench Mode enderio.nei.alloysmelter=Alloy Smelter enderio.nei.enchanter=Enchanter enderio.nei.sagmill=SAG Mill enderio.nei.slicensplice=Slice'N'Splice enderio.nei.soulbinder=Soul Binder -enderio.nei.vat=Vat \ No newline at end of file +enderio.nei.vat=Vat +enderio.tooltip.burntime=Burn Time: +enderio.tooltip.oredict=Ore Dictionary: +enderio.tooltip.meta=Meta: +enderio.tooltip.uid=UID: +enderio.waila.config.hiddenfacades=Sneaky Facades \ No newline at end of file diff --git a/resources/assets/enderio/lang/ru_RU.lang b/resources/assets/enderio/lang/ru_RU.lang index 1f3e984e..11c79724 100644 --- a/resources/assets/enderio/lang/ru_RU.lang +++ b/resources/assets/enderio/lang/ru_RU.lang @@ -534,6 +534,7 @@ item.enderio.itemConduitProbe.tooltip.detailed.line6=Используйте Shif item.itemSoulVessel.name=Флакон для душ enderio.item.itemSoulVessel.tooltip.health=Здоровье: enderio.item.itemSoulVessel.tooltip.fluidname=Название жидкости: +enderio.item.itemSoulVessel.tooltip.color=Цвет: item.itemSoulVessel.tooltip.detailed.line1=ПКМ по мобу, чтобы item.itemSoulVessel.tooltip.detailed.line2=захватить его душу item.itemSoulVessel.tooltip.detailed.line3=Нажмите ПКМ снова, чтобы выпустить её @@ -620,6 +621,21 @@ enderio.darksteel.upgrade.sound.disabled=Звуколокатор отключе enderio.darksteel.upgrade.gogglesOfRevealing.name=Откровение enderio.darksteel.upgrade.gogglesOfRevealing.tooltip.detailed.line1=Снижение затрат Вис: 5% +enderio.darksteel.upgrade.naturalistEye.name=Глаз натуралиста +enderio.darksteel.upgrade.naturalistEye.tooltip.detailed.line1=Показывает опылённую листву + +enderio.darksteel.upgrade.apiaristArmor.helmet.name=Шапка пчеловода +enderio.darksteel.upgrade.apiaristArmor.helmet.tooltip.detailed.line1=Защита от пчёл + +enderio.darksteel.upgrade.apiaristArmor.chestplate.name=Рубашка пчеловода +enderio.darksteel.upgrade.apiaristArmor.chestplate.tooltip.detailed.line1=Защита от пчёл + +enderio.darksteel.upgrade.apiaristArmor.leggings.name=Брюки пчеловода +enderio.darksteel.upgrade.apiaristArmor.leggings.tooltip.detailed.line1=Защита от пчёл + +enderio.darksteel.upgrade.apiaristArmor.boots.name=Обувь пчеловода +enderio.darksteel.upgrade.apiaristArmor.boots.tooltip.detailed.line1=Защита от пчёл + item.itemGliderWing.name=Крыло планёра item.itemGliderWings.name=Крылья планёра item.itemGliderWings.tooltip.detailed.line1=Улучшите кирасой @@ -824,6 +840,8 @@ enderio.gui.conduit.redstone.signalStrengh.tooltip=Испускает сильн enderio.gui.conduit.fluid.autoExtract=Авто-извлечение enderio.gui.conduit.fluid.filter=Фильтр +enderio.gui.conduit.fluid.whitelist=Белый список +enderio.gui.conduit.fluid.blacklist=Чёрный список enderio.gui.conduit.gas.autoExtract=Авто-извлечение @@ -876,19 +894,24 @@ enderio.config.fluid.tooltip=Чистая энергия жидкостей! enderio.config.spawner=Настройки электрического спаунера enderio.config.spawner.tooltip=У меня закончились остроумные подсказки. -//Keybinds/Waila/NEI +//Keybinds/Waila/NEI/Tooltips enderio.category.darksteelarmor=Броня из тёмной стали enderio.category.tools=Инструменты enderio.keybind.glidertoggle=Переключить планер -enderio.keybind.soundlocator=Звуколокатор -enderio.keybind.nightvision=Ночное зрение enderio.keybind.gogglesofrevealing=Очки откровения -enderio.keybind.stepassist=Шаг вверх +enderio.keybind.nightvision=Ночное зрение +enderio.keybind.soundlocator=Звуколокатор enderio.keybind.speed=Скорость +enderio.keybind.stepassist=Шаг вверх enderio.keybind.yetawrenchmode=Режим ключа Yeta enderio.nei.alloysmelter=Завод сплавов enderio.nei.enchanter=Зачарователь enderio.nei.sagmill=Дробилка enderio.nei.slicensplice=«Отрубатель и сращиватель» enderio.nei.soulbinder=Связыватель душ -enderio.nei.vat=Чан \ No newline at end of file +enderio.nei.vat=Чан +enderio.tooltip.burntime=Время горения: +enderio.tooltip.oredict=Словарь руд: +enderio.tooltip.meta=Метаданные: +enderio.tooltip.uid=UID: +enderio.waila.config.hiddenfacades=Скрытые фасады \ No newline at end of file diff --git a/src/main/java/crazypants/enderio/gui/TooltipAddera.java b/src/main/java/crazypants/enderio/gui/TooltipAddera.java index 0de80de8..ca14abc5 100644 --- a/src/main/java/crazypants/enderio/gui/TooltipAddera.java +++ b/src/main/java/crazypants/enderio/gui/TooltipAddera.java @@ -62,7 +62,7 @@ public class TooltipAddera { if(!addStirlinGeneratorTooltip(evt)) { int time = TileEntityFurnace.getItemBurnTime(evt.itemStack); if(time > 0) { - evt.toolTip.add("Burn time " + time); + evt.toolTip.add(Lang.localize("tooltip.burntime") + " " + time); } } } @@ -108,7 +108,7 @@ public class TooltipAddera { uid = GameRegistry.findUniqueIdentifierFor(evt.itemStack.getItem()); } if(uid != null) { - evt.toolTip.add(EnumChatFormatting.AQUA + "UID: " + uid.toString() + " Meta: " + evt.itemStack.getItemDamage()); + evt.toolTip.add(EnumChatFormatting.AQUA + Lang.localize("tooltip.uid") + " " + uid.toString() + " " + Lang.localize("tooltip.meta") + " " + evt.itemStack.getItemDamage()); } } @@ -116,9 +116,9 @@ public class TooltipAddera { int[] ids = OreDictionary.getOreIDs(evt.itemStack); if(ids != null && ids.length > 0) { if(ids.length == 1) { - evt.toolTip.add(EnumChatFormatting.AQUA + "Ore Dictionary: " + OreDictionary.getOreName(ids[0])); + evt.toolTip.add(EnumChatFormatting.AQUA + Lang.localize("tooltip.oredict") + " " + OreDictionary.getOreName(ids[0])); } else { - evt.toolTip.add(EnumChatFormatting.AQUA + "Ore Dictionary:"); + evt.toolTip.add(EnumChatFormatting.AQUA + Lang.localize("tooltip.oredict")); for (int id : ids) { String name = OreDictionary.getOreName(id); evt.toolTip.add(EnumChatFormatting.AQUA + " " + name); diff --git a/src/main/java/crazypants/enderio/waila/WailaCompat.java b/src/main/java/crazypants/enderio/waila/WailaCompat.java index aa9f9108..1bbd65d8 100644 --- a/src/main/java/crazypants/enderio/waila/WailaCompat.java +++ b/src/main/java/crazypants/enderio/waila/WailaCompat.java @@ -113,7 +113,7 @@ public class WailaCompat implements IWailaDataProvider { // registrar.registerHeadProvider(INSTANCE, IInternalPowerReceptor.class); // registrar.registerSyncedNBTKey("*", IInternalPowerReceptor.class); - ConfigHandler.instance().addConfig(EnderIO.MOD_NAME, "facades.hidden", "Sneaky Facades"); + ConfigHandler.instance().addConfig(EnderIO.MOD_NAME, "facades.hidden", Lang.localize("waila.config.hiddenfacades")); IWailaInfoProvider.fmt.setMaximumFractionDigits(1); } From 3cb8da4e87df87c82e07f5d006d8c90d37539c13 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Fri, 23 Jan 2015 13:33:04 -0500 Subject: [PATCH 09/79] #1662 add interfaces to control hiding conduits and display modes --- .../java/crazypants/enderio/ClientProxy.java | 2 +- .../enderio/api/tool/IConduitControl.java | 23 +++++++++++++++++++ .../enderio/api/tool/IHideFacades.java | 10 ++++++++ .../crazypants/enderio/api/tool/ITool.java | 4 +--- .../enderio/conduit/ConduitDisplayMode.java | 22 ++++++++++++++---- .../enderio/conduit/ConduitUtil.java | 21 ++++++++++++----- .../enderio/conduit/IConduitItem.java | 3 ++- .../enderio/conduit/gas/ItemGasConduit.java | 5 ++++ .../enderio/conduit/item/ItemItemConduit.java | 5 ++++ .../conduit/liquid/ItemLiquidConduit.java | 5 +++- .../enderio/conduit/me/ItemMEConduit.java | 6 +++++ .../conduit/power/ItemPowerConduit.java | 6 ++++- .../conduit/redstone/ItemRedstoneConduit.java | 5 ++++ .../enderio/item/ItemConduitProbe.java | 17 ++++++-------- .../enderio/item/ItemYetaWrench.java | 8 ++++++- .../crazypants/enderio/item/KeyTracker.java | 3 ++- .../enderio/item/ToolTickHandler.java | 13 +++++++---- .../item/YetaWrenchOverlayRenderer.java | 14 +++++------ 18 files changed, 131 insertions(+), 41 deletions(-) create mode 100644 src/main/java/crazypants/enderio/api/tool/IConduitControl.java create mode 100644 src/main/java/crazypants/enderio/api/tool/IHideFacades.java diff --git a/src/main/java/crazypants/enderio/ClientProxy.java b/src/main/java/crazypants/enderio/ClientProxy.java index 51cf184c..03cbf25f 100644 --- a/src/main/java/crazypants/enderio/ClientProxy.java +++ b/src/main/java/crazypants/enderio/ClientProxy.java @@ -375,7 +375,7 @@ public class ClientProxy extends CommonProxy { MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockTransceiver), tr); } - new YetaWrenchOverlayRenderer(EnderIO.itemYetaWench); + new YetaWrenchOverlayRenderer(); new ConduitProbeOverlayRenderer(); if(Config.useSneakMouseWheelYetaWrench) { ToolTickHandler th = new ToolTickHandler(); diff --git a/src/main/java/crazypants/enderio/api/tool/IConduitControl.java b/src/main/java/crazypants/enderio/api/tool/IConduitControl.java new file mode 100644 index 00000000..fbbb8a09 --- /dev/null +++ b/src/main/java/crazypants/enderio/api/tool/IConduitControl.java @@ -0,0 +1,23 @@ +package crazypants.enderio.api.tool; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; + +/** + * Interface for items which support the overlay and conduit view modes + */ +public interface IConduitControl extends IHideFacades { + + /** + * Controls whether the overlay is shown and the player can change the display + * mode. + * + * @param stack + * The itemstack + * @param player + * The player holding the itemstack + * @return True if the overlay should be rendered and the player should be + * able to change modes. False otherwise. + */ + boolean showOverlay(ItemStack stack, EntityPlayer player); +} diff --git a/src/main/java/crazypants/enderio/api/tool/IHideFacades.java b/src/main/java/crazypants/enderio/api/tool/IHideFacades.java new file mode 100644 index 00000000..8641c53d --- /dev/null +++ b/src/main/java/crazypants/enderio/api/tool/IHideFacades.java @@ -0,0 +1,10 @@ +package crazypants.enderio.api.tool; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; + +public interface IHideFacades { + + boolean shouldHideFacades(ItemStack stack, EntityPlayer player); + +} diff --git a/src/main/java/crazypants/enderio/api/tool/ITool.java b/src/main/java/crazypants/enderio/api/tool/ITool.java index 79fe5684..084551c5 100644 --- a/src/main/java/crazypants/enderio/api/tool/ITool.java +++ b/src/main/java/crazypants/enderio/api/tool/ITool.java @@ -4,12 +4,10 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -public interface ITool { +public interface ITool extends IHideFacades { boolean canUse(ItemStack stack, EntityPlayer player, int x, int y, int z); void used(ItemStack stack, EntityPlayer player, int x, int y, int z); - - boolean shouldHideFacades(ItemStack stack, EntityPlayer player); } diff --git a/src/main/java/crazypants/enderio/conduit/ConduitDisplayMode.java b/src/main/java/crazypants/enderio/conduit/ConduitDisplayMode.java index d437e3f8..bad968c0 100644 --- a/src/main/java/crazypants/enderio/conduit/ConduitDisplayMode.java +++ b/src/main/java/crazypants/enderio/conduit/ConduitDisplayMode.java @@ -1,8 +1,9 @@ package crazypants.enderio.conduit; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.MathHelper; -import crazypants.enderio.EnderIO; +import crazypants.enderio.api.tool.IConduitControl; import crazypants.enderio.conduit.gas.GasUtil; import crazypants.enderio.conduit.me.MEUtil; @@ -45,20 +46,31 @@ public enum ConduitDisplayMode { return res; } + private static final String NBT_KEY = "enderio.displaymode"; + public static ConduitDisplayMode getDisplayMode(ItemStack equipped) { - if(equipped == null || equipped.getItem() != EnderIO.itemYetaWench) { + if(equipped == null || !(equipped.getItem() instanceof IConduitControl)) { return ALL; } - int index = equipped.getItemDamage(); + initDisplayModeTag(equipped); + int index = equipped.stackTagCompound.getInteger(NBT_KEY); index = MathHelper.clamp_int(index, 0, ConduitDisplayMode.values().length - 1); return ConduitDisplayMode.values()[index]; } public static void setDisplayMode(ItemStack equipped, ConduitDisplayMode mode) { - if(mode == null || equipped == null) { + if(mode == null || equipped == null || !(equipped.getItem() instanceof IConduitControl)) { return; } - equipped.setItemDamage(mode.ordinal()); + initDisplayModeTag(equipped); + equipped.stackTagCompound.setInteger(NBT_KEY, mode.ordinal()); + } + + private static void initDisplayModeTag(ItemStack stack) { + if (stack.stackTagCompound == null) { + stack.stackTagCompound = new NBTTagCompound(); + stack.stackTagCompound.setInteger(NBT_KEY, ConduitDisplayMode.ALL.ordinal()); + } } public ConduitDisplayMode next() { diff --git a/src/main/java/crazypants/enderio/conduit/ConduitUtil.java b/src/main/java/crazypants/enderio/conduit/ConduitUtil.java index 648f0875..f49c6716 100644 --- a/src/main/java/crazypants/enderio/conduit/ConduitUtil.java +++ b/src/main/java/crazypants/enderio/conduit/ConduitUtil.java @@ -24,6 +24,8 @@ import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; import crazypants.enderio.GuiHandler; import crazypants.enderio.Log; +import crazypants.enderio.api.tool.IConduitControl; +import crazypants.enderio.api.tool.IHideFacades; import crazypants.enderio.conduit.IConduitBundle.FacadeRenderState; import crazypants.enderio.conduit.gas.GasConduitNetwork; import crazypants.enderio.conduit.gas.IGasConduit; @@ -44,7 +46,6 @@ import crazypants.enderio.conduit.redstone.IRedstoneConduit; import crazypants.enderio.conduit.redstone.RedstoneConduitNetwork; import crazypants.enderio.conduit.redstone.Signal; import crazypants.enderio.machine.RedstoneControlMode; -import crazypants.enderio.tool.ToolUtil; import crazypants.util.BlockCoord; import crazypants.util.DyeColor; @@ -177,7 +178,7 @@ public class ConduitUtil { } public static boolean isFacadeHidden(IConduitBundle bundle, EntityPlayer player) { - return bundle.getFacadeId() != null && ((ToolUtil.isToolEquipped(player) && (player == null || ToolUtil.getEquippedTool(player).shouldHideFacades(player.getCurrentEquippedItem(), player))) || isConduitEquipped(player) || isProbeEquipped(player)); + return bundle.getFacadeId() != null && shouldHeldItemHideFacades(player); } public static ConduitDisplayMode getDisplayMode(EntityPlayer player) { @@ -190,10 +191,6 @@ public class ConduitUtil { return ConduitDisplayMode.ALL; } - if(equipped.getItem() != EnderIO.itemYetaWench) { - return ConduitDisplayMode.ALL; - } - ConduitDisplayMode result = ConduitDisplayMode.getDisplayMode(equipped); if(result == null) { return ConduitDisplayMode.ALL; @@ -234,6 +231,18 @@ public class ConduitUtil { return true; } + public static boolean shouldHeldItemHideFacades(EntityPlayer player) { + player = player == null ? EnderIO.proxy.getClientPlayer() : player; + if (player == null) { + return false; + } + ItemStack held = player.getCurrentEquippedItem(); + if (held != null && held.getItem() instanceof IHideFacades) { + return ((IHideFacades)held.getItem()).shouldHideFacades(held, player); + } + return false; + } + public static boolean isConduitEquipped(EntityPlayer player) { player = player == null ? EnderIO.proxy.getClientPlayer() : player; if(player == null) { diff --git a/src/main/java/crazypants/enderio/conduit/IConduitItem.java b/src/main/java/crazypants/enderio/conduit/IConduitItem.java index b36514da..c6172109 100644 --- a/src/main/java/crazypants/enderio/conduit/IConduitItem.java +++ b/src/main/java/crazypants/enderio/conduit/IConduitItem.java @@ -1,8 +1,9 @@ package crazypants.enderio.conduit; import net.minecraft.item.ItemStack; +import crazypants.enderio.api.tool.IHideFacades; -public interface IConduitItem { +public interface IConduitItem extends IHideFacades { Class getBaseConduitType(); diff --git a/src/main/java/crazypants/enderio/conduit/gas/ItemGasConduit.java b/src/main/java/crazypants/enderio/conduit/gas/ItemGasConduit.java index 07c61986..a382d1fa 100644 --- a/src/main/java/crazypants/enderio/conduit/gas/ItemGasConduit.java +++ b/src/main/java/crazypants/enderio/conduit/gas/ItemGasConduit.java @@ -65,5 +65,10 @@ public class ItemGasConduit extends AbstractItemConduit implements IAdvancedTool list.add(Lang.localize("itemGasConduit.tooltip.maxIo") + " " + maxIo + gpt); TooltipAddera.addDetailedTooltipFromResources(list, "enderio.itemGasConduit"); } + + @Override + public boolean shouldHideFacades(ItemStack stack, EntityPlayer player) { + return true; + } } diff --git a/src/main/java/crazypants/enderio/conduit/item/ItemItemConduit.java b/src/main/java/crazypants/enderio/conduit/item/ItemItemConduit.java index 3f15a317..fab4955e 100644 --- a/src/main/java/crazypants/enderio/conduit/item/ItemItemConduit.java +++ b/src/main/java/crazypants/enderio/conduit/item/ItemItemConduit.java @@ -1,5 +1,6 @@ package crazypants.enderio.conduit.item; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import crazypants.enderio.ModObject; import crazypants.enderio.conduit.AbstractItemConduit; @@ -36,4 +37,8 @@ public class ItemItemConduit extends AbstractItemConduit { return new ItemConduit(item.getItemDamage()); } + @Override + public boolean shouldHideFacades(ItemStack stack, EntityPlayer player) { + return true; + } } diff --git a/src/main/java/crazypants/enderio/conduit/liquid/ItemLiquidConduit.java b/src/main/java/crazypants/enderio/conduit/liquid/ItemLiquidConduit.java index 305b2075..887efed3 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/ItemLiquidConduit.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/ItemLiquidConduit.java @@ -88,6 +88,9 @@ public class ItemLiquidConduit extends AbstractItemConduit implements IAdvancedT } - + @Override + public boolean shouldHideFacades(ItemStack stack, EntityPlayer player) { + return true; + } } diff --git a/src/main/java/crazypants/enderio/conduit/me/ItemMEConduit.java b/src/main/java/crazypants/enderio/conduit/me/ItemMEConduit.java index 7f138de4..bf95e5a4 100644 --- a/src/main/java/crazypants/enderio/conduit/me/ItemMEConduit.java +++ b/src/main/java/crazypants/enderio/conduit/me/ItemMEConduit.java @@ -1,5 +1,6 @@ package crazypants.enderio.conduit.me; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import crazypants.enderio.ModObject; import crazypants.enderio.conduit.AbstractItemConduit; @@ -34,4 +35,9 @@ public class ItemMEConduit extends AbstractItemConduit { public IConduit createConduit(ItemStack item) { return new MEConduit(item.getItemDamage()); } + + @Override + public boolean shouldHideFacades(ItemStack stack, EntityPlayer player) { + return true; + } } \ No newline at end of file diff --git a/src/main/java/crazypants/enderio/conduit/power/ItemPowerConduit.java b/src/main/java/crazypants/enderio/conduit/power/ItemPowerConduit.java index e78ec630..55b7465b 100644 --- a/src/main/java/crazypants/enderio/conduit/power/ItemPowerConduit.java +++ b/src/main/java/crazypants/enderio/conduit/power/ItemPowerConduit.java @@ -56,5 +56,9 @@ public class ItemPowerConduit extends AbstractItemConduit { ICapacitor cap = PowerConduit.getCapacitors()[itemStack.getItemDamage()]; list.add(PREFIX + PowerDisplayUtil.formatPower(cap.getMaxEnergyExtracted()) + POSTFIX); } - + + @Override + public boolean shouldHideFacades(ItemStack stack, EntityPlayer player) { + return true; + } } diff --git a/src/main/java/crazypants/enderio/conduit/redstone/ItemRedstoneConduit.java b/src/main/java/crazypants/enderio/conduit/redstone/ItemRedstoneConduit.java index 57ee35aa..209dab15 100644 --- a/src/main/java/crazypants/enderio/conduit/redstone/ItemRedstoneConduit.java +++ b/src/main/java/crazypants/enderio/conduit/redstone/ItemRedstoneConduit.java @@ -1,5 +1,6 @@ package crazypants.enderio.conduit.redstone; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import crazypants.enderio.ModObject; import crazypants.enderio.conduit.AbstractItemConduit; @@ -42,4 +43,8 @@ public class ItemRedstoneConduit extends AbstractItemConduit { } } + @Override + public boolean shouldHideFacades(ItemStack stack, EntityPlayer player) { + return true; + } } diff --git a/src/main/java/crazypants/enderio/item/ItemConduitProbe.java b/src/main/java/crazypants/enderio/item/ItemConduitProbe.java index 448c5dd5..d85aba1d 100644 --- a/src/main/java/crazypants/enderio/item/ItemConduitProbe.java +++ b/src/main/java/crazypants/enderio/item/ItemConduitProbe.java @@ -2,12 +2,8 @@ package crazypants.enderio.item; import java.text.NumberFormat; import java.util.Collection; -import java.util.HashSet; -import java.util.Set; -import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.enchantment.Enchantment; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -19,18 +15,15 @@ import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.EnderIO; import crazypants.enderio.EnderIOTab; -import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; -import crazypants.enderio.conduit.ConduitUtil; +import crazypants.enderio.api.tool.IHideFacades; import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.IConduitBundle; -import crazypants.enderio.conduit.redstone.IInsulatedRedstoneConduit; import crazypants.enderio.gui.IResourceTooltipProvider; import crazypants.enderio.network.PacketHandler; -public class ItemConduitProbe extends Item implements IResourceTooltipProvider { +public class ItemConduitProbe extends Item implements IResourceTooltipProvider, IHideFacades { private static final NumberFormat NF = NumberFormat.getIntegerInstance(); @@ -124,5 +117,9 @@ public class ItemConduitProbe extends Item implements IResourceTooltipProvider { public boolean doesSneakBypassUse(World world, int x, int y, int z, EntityPlayer player) { return true; } - + + @Override + public boolean shouldHideFacades(ItemStack stack, EntityPlayer player) { + return true; + } } diff --git a/src/main/java/crazypants/enderio/item/ItemYetaWrench.java b/src/main/java/crazypants/enderio/item/ItemYetaWrench.java index 7607065d..b211081c 100644 --- a/src/main/java/crazypants/enderio/item/ItemYetaWrench.java +++ b/src/main/java/crazypants/enderio/item/ItemYetaWrench.java @@ -19,6 +19,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIOTab; import crazypants.enderio.ModObject; +import crazypants.enderio.api.tool.IConduitControl; import crazypants.enderio.api.tool.ITool; import crazypants.enderio.conduit.ConduitDisplayMode; import crazypants.enderio.config.Config; @@ -27,7 +28,7 @@ import crazypants.enderio.network.PacketHandler; import crazypants.enderio.tool.ToolUtil; import crazypants.util.Lang; -public class ItemYetaWrench extends Item implements ITool, IAdvancedTooltipProvider, InvocationHandler { +public class ItemYetaWrench extends Item implements ITool, IConduitControl, IAdvancedTooltipProvider, InvocationHandler { public static ItemYetaWrench create() { if(Config.useSneakMouseWheelYetaWrench) { @@ -107,6 +108,11 @@ public class ItemYetaWrench extends Item implements ITool, IAdvancedTooltipProvi public boolean shouldHideFacades(ItemStack stack, EntityPlayer player) { return true; } + + @Override + public boolean showOverlay(ItemStack stack, EntityPlayer player) { + return true; + } /* IAdvancedTooltipProvider */ diff --git a/src/main/java/crazypants/enderio/item/KeyTracker.java b/src/main/java/crazypants/enderio/item/KeyTracker.java index 799a32c6..0424f85b 100644 --- a/src/main/java/crazypants/enderio/item/KeyTracker.java +++ b/src/main/java/crazypants/enderio/item/KeyTracker.java @@ -15,6 +15,7 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.InputEvent.KeyInputEvent; import crazypants.enderio.EnderIO; import crazypants.enderio.item.darksteel.DarkSteelItems; +import crazypants.enderio.api.tool.IConduitControl; import crazypants.enderio.conduit.ConduitDisplayMode; import crazypants.enderio.item.darksteel.DarkSteelController; import crazypants.enderio.item.darksteel.GogglesOfRevealingUpgrade; @@ -143,7 +144,7 @@ public class KeyTracker { if(equipped == null) { return; } - if(equipped.getItem() == EnderIO.itemYetaWench) { + if(equipped.getItem() instanceof IConduitControl) { ConduitDisplayMode curMode = ConduitDisplayMode.getDisplayMode(equipped); if(curMode == null) { curMode = ConduitDisplayMode.ALL; diff --git a/src/main/java/crazypants/enderio/item/ToolTickHandler.java b/src/main/java/crazypants/enderio/item/ToolTickHandler.java index 3d71d3b8..4c124cfa 100644 --- a/src/main/java/crazypants/enderio/item/ToolTickHandler.java +++ b/src/main/java/crazypants/enderio/item/ToolTickHandler.java @@ -2,6 +2,7 @@ package crazypants.enderio.item; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.EntityClientPlayerMP; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import org.lwjgl.input.Mouse; @@ -12,6 +13,7 @@ import cpw.mods.fml.common.gameevent.TickEvent.Phase; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; +import crazypants.enderio.api.tool.IConduitControl; import crazypants.enderio.conduit.ConduitDisplayMode; import crazypants.enderio.network.PacketHandler; @@ -47,8 +49,8 @@ public class ToolTickHandler { } if(stack.getItem() == EnderIO.itemConduitProbe) { changeConduitProbeMode(stack); - } else if(stack.getItem() ==EnderIO.itemYetaWench) { - changeYetaWrenchMode(stack); + } else if(stack.getItem() instanceof IConduitControl) { + changeDisplayMode(stack, player); } } slotSelected = -1; @@ -57,7 +59,10 @@ public class ToolTickHandler { } } - private void changeYetaWrenchMode(ItemStack stack) { + private void changeDisplayMode(ItemStack stack, EntityPlayer player) { + if (!((IConduitControl)stack.getItem()).showOverlay(stack, player)) { + return; + } ConduitDisplayMode curMode = ConduitDisplayMode.getDisplayMode(stack); if(curMode == null) { curMode = ConduitDisplayMode.ALL; @@ -85,7 +90,7 @@ public class ToolTickHandler { private boolean isToolSelected(EntityClientPlayerMP player) { return player != null && player.getCurrentEquippedItem() != null && - (player.getCurrentEquippedItem().getItem() == EnderIO.itemYetaWench || player.getCurrentEquippedItem().getItem() == EnderIO.itemConduitProbe); + (player.getCurrentEquippedItem().getItem() instanceof IConduitControl || player.getCurrentEquippedItem().getItem() == EnderIO.itemConduitProbe); } } diff --git a/src/main/java/crazypants/enderio/item/YetaWrenchOverlayRenderer.java b/src/main/java/crazypants/enderio/item/YetaWrenchOverlayRenderer.java index f9c8144b..d4edfaac 100644 --- a/src/main/java/crazypants/enderio/item/YetaWrenchOverlayRenderer.java +++ b/src/main/java/crazypants/enderio/item/YetaWrenchOverlayRenderer.java @@ -6,6 +6,7 @@ import java.util.Map; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraftforge.client.event.RenderGameOverlayEvent; import net.minecraftforge.client.event.RenderGameOverlayEvent.ElementType; @@ -14,6 +15,7 @@ import net.minecraftforge.common.MinecraftForge; import org.lwjgl.opengl.GL11; import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import crazypants.enderio.api.tool.IConduitControl; import crazypants.enderio.conduit.ConduitDisplayMode; import crazypants.enderio.conduit.gas.GasUtil; import crazypants.enderio.conduit.me.MEUtil; @@ -21,15 +23,12 @@ import crazypants.enderio.gui.IconEIO; public class YetaWrenchOverlayRenderer { - private ItemYetaWrench wrench; - private IconEIO[] onIcons; private IconEIO[] offIcons; private Point[] iconOffsets; private Map indices = new EnumMap(ConduitDisplayMode.class); - public YetaWrenchOverlayRenderer(ItemYetaWrench wrench) { - this.wrench = wrench; + public YetaWrenchOverlayRenderer() { MinecraftForge.EVENT_BUS.register(this); } @@ -42,9 +41,10 @@ public class YetaWrenchOverlayRenderer { } private ItemStack getEquippedWrench() { - ItemStack equipped = Minecraft.getMinecraft().thePlayer.getCurrentEquippedItem(); - if(equipped != null && equipped.getItem() == wrench) { - return equipped; + EntityPlayer player = Minecraft.getMinecraft().thePlayer; + ItemStack equipped = player.getCurrentEquippedItem(); + if(equipped != null && equipped.getItem() instanceof IConduitControl) { + return ((IConduitControl) equipped.getItem()).showOverlay(equipped, player) ? equipped : null; } return null; } From 9c639f59fac3724df60a97885c8f4d133fff24fc Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Fri, 23 Jan 2015 15:47:44 -0500 Subject: [PATCH 10/79] #1742 Fix "dead" entities being still attacked by the killer joe --- .../java/crazypants/enderio/machine/killera/TileKillerJoe.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java b/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java index 2e88f290..cfb5f36a 100644 --- a/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java +++ b/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java @@ -168,7 +168,7 @@ public class TileKillerJoe extends AbstractMachineEntity implements IFluidHandle if(!entsInBounds.isEmpty()) { for (EntityLivingBase ent : entsInBounds) { - if(!ent.isDead && !ent.isEntityInvulnerable()) { + if(!ent.isDead && ent.deathTime <= 0 && !ent.isEntityInvulnerable()) { if (ent instanceof EntityPlayer && ((EntityPlayer)ent).capabilities.disableDamage) continue; //Ignore players in creative, can't damage them; if (Config.killerJoeMustSee && !canJoeSee(ent)) continue; FakePlayer fakee = getAttackera(); From 89ff8d2af4057506fcc77a5c55120f8dedc98075 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Fri, 23 Jan 2015 17:06:59 -0500 Subject: [PATCH 11/79] Move unused icons to "old" folder --- .../textures/blocks/{ => old}/blockEnderIo.png | Bin .../textures/blocks/{ => old}/conduitBundle.png | Bin .../enderio/textures/blocks/{ => old}/lock.png | Bin .../assets/enderio/textures/gui/{ => old}/cog.png | Bin .../enderio/textures/gui/{ => old}/lockLocked.png | Bin .../enderio/textures/gui/{ => old}/lockUnlocked.png | Bin .../enderio/textures/items/{ => old}/blueSteel.png | Bin .../textures/items/{ => old}/enderface2Off.png | Bin .../textures/items/{ => old}/enderface2On.png | Bin .../textures/items/{ => old}/ingotBronze.png | Bin .../textures/items/{ => old}/ingotCopper.png | Bin .../textures/items/{ => old}/ingotElectrum.png | Bin .../enderio/textures/items/{ => old}/ingotLead.png | Bin .../textures/items/{ => old}/ingotSilver.png | Bin .../enderio/textures/items/{ => old}/ingotTin.png | Bin .../textures/items/{ => old}/powderBronze.png | Bin .../enderio/textures/items/{ => old}/powderLead.png | Bin .../textures/items/{ => old}/powderSilver.png | Bin .../textures/items/{ => old}/upgradeBlank.png | Bin .../textures/items/{ => old}/upgradeEfficieny.png | Bin .../textures/items/{ => old}/upgradeEnergy_1.png | Bin .../textures/items/{ => old}/upgradeEnergy_2.png | Bin .../textures/items/{ => old}/upgradeEnergy_3.png | Bin 23 files changed, 0 insertions(+), 0 deletions(-) rename resources/assets/enderio/textures/blocks/{ => old}/blockEnderIo.png (100%) rename resources/assets/enderio/textures/blocks/{ => old}/conduitBundle.png (100%) rename resources/assets/enderio/textures/blocks/{ => old}/lock.png (100%) rename resources/assets/enderio/textures/gui/{ => old}/cog.png (100%) rename resources/assets/enderio/textures/gui/{ => old}/lockLocked.png (100%) rename resources/assets/enderio/textures/gui/{ => old}/lockUnlocked.png (100%) rename resources/assets/enderio/textures/items/{ => old}/blueSteel.png (100%) rename resources/assets/enderio/textures/items/{ => old}/enderface2Off.png (100%) rename resources/assets/enderio/textures/items/{ => old}/enderface2On.png (100%) rename resources/assets/enderio/textures/items/{ => old}/ingotBronze.png (100%) rename resources/assets/enderio/textures/items/{ => old}/ingotCopper.png (100%) rename resources/assets/enderio/textures/items/{ => old}/ingotElectrum.png (100%) rename resources/assets/enderio/textures/items/{ => old}/ingotLead.png (100%) rename resources/assets/enderio/textures/items/{ => old}/ingotSilver.png (100%) rename resources/assets/enderio/textures/items/{ => old}/ingotTin.png (100%) rename resources/assets/enderio/textures/items/{ => old}/powderBronze.png (100%) rename resources/assets/enderio/textures/items/{ => old}/powderLead.png (100%) rename resources/assets/enderio/textures/items/{ => old}/powderSilver.png (100%) rename resources/assets/enderio/textures/items/{ => old}/upgradeBlank.png (100%) rename resources/assets/enderio/textures/items/{ => old}/upgradeEfficieny.png (100%) rename resources/assets/enderio/textures/items/{ => old}/upgradeEnergy_1.png (100%) rename resources/assets/enderio/textures/items/{ => old}/upgradeEnergy_2.png (100%) rename resources/assets/enderio/textures/items/{ => old}/upgradeEnergy_3.png (100%) diff --git a/resources/assets/enderio/textures/blocks/blockEnderIo.png b/resources/assets/enderio/textures/blocks/old/blockEnderIo.png similarity index 100% rename from resources/assets/enderio/textures/blocks/blockEnderIo.png rename to resources/assets/enderio/textures/blocks/old/blockEnderIo.png diff --git a/resources/assets/enderio/textures/blocks/conduitBundle.png b/resources/assets/enderio/textures/blocks/old/conduitBundle.png similarity index 100% rename from resources/assets/enderio/textures/blocks/conduitBundle.png rename to resources/assets/enderio/textures/blocks/old/conduitBundle.png diff --git a/resources/assets/enderio/textures/blocks/lock.png b/resources/assets/enderio/textures/blocks/old/lock.png similarity index 100% rename from resources/assets/enderio/textures/blocks/lock.png rename to resources/assets/enderio/textures/blocks/old/lock.png diff --git a/resources/assets/enderio/textures/gui/cog.png b/resources/assets/enderio/textures/gui/old/cog.png similarity index 100% rename from resources/assets/enderio/textures/gui/cog.png rename to resources/assets/enderio/textures/gui/old/cog.png diff --git a/resources/assets/enderio/textures/gui/lockLocked.png b/resources/assets/enderio/textures/gui/old/lockLocked.png similarity index 100% rename from resources/assets/enderio/textures/gui/lockLocked.png rename to resources/assets/enderio/textures/gui/old/lockLocked.png diff --git a/resources/assets/enderio/textures/gui/lockUnlocked.png b/resources/assets/enderio/textures/gui/old/lockUnlocked.png similarity index 100% rename from resources/assets/enderio/textures/gui/lockUnlocked.png rename to resources/assets/enderio/textures/gui/old/lockUnlocked.png diff --git a/resources/assets/enderio/textures/items/blueSteel.png b/resources/assets/enderio/textures/items/old/blueSteel.png similarity index 100% rename from resources/assets/enderio/textures/items/blueSteel.png rename to resources/assets/enderio/textures/items/old/blueSteel.png diff --git a/resources/assets/enderio/textures/items/enderface2Off.png b/resources/assets/enderio/textures/items/old/enderface2Off.png similarity index 100% rename from resources/assets/enderio/textures/items/enderface2Off.png rename to resources/assets/enderio/textures/items/old/enderface2Off.png diff --git a/resources/assets/enderio/textures/items/enderface2On.png b/resources/assets/enderio/textures/items/old/enderface2On.png similarity index 100% rename from resources/assets/enderio/textures/items/enderface2On.png rename to resources/assets/enderio/textures/items/old/enderface2On.png diff --git a/resources/assets/enderio/textures/items/ingotBronze.png b/resources/assets/enderio/textures/items/old/ingotBronze.png similarity index 100% rename from resources/assets/enderio/textures/items/ingotBronze.png rename to resources/assets/enderio/textures/items/old/ingotBronze.png diff --git a/resources/assets/enderio/textures/items/ingotCopper.png b/resources/assets/enderio/textures/items/old/ingotCopper.png similarity index 100% rename from resources/assets/enderio/textures/items/ingotCopper.png rename to resources/assets/enderio/textures/items/old/ingotCopper.png diff --git a/resources/assets/enderio/textures/items/ingotElectrum.png b/resources/assets/enderio/textures/items/old/ingotElectrum.png similarity index 100% rename from resources/assets/enderio/textures/items/ingotElectrum.png rename to resources/assets/enderio/textures/items/old/ingotElectrum.png diff --git a/resources/assets/enderio/textures/items/ingotLead.png b/resources/assets/enderio/textures/items/old/ingotLead.png similarity index 100% rename from resources/assets/enderio/textures/items/ingotLead.png rename to resources/assets/enderio/textures/items/old/ingotLead.png diff --git a/resources/assets/enderio/textures/items/ingotSilver.png b/resources/assets/enderio/textures/items/old/ingotSilver.png similarity index 100% rename from resources/assets/enderio/textures/items/ingotSilver.png rename to resources/assets/enderio/textures/items/old/ingotSilver.png diff --git a/resources/assets/enderio/textures/items/ingotTin.png b/resources/assets/enderio/textures/items/old/ingotTin.png similarity index 100% rename from resources/assets/enderio/textures/items/ingotTin.png rename to resources/assets/enderio/textures/items/old/ingotTin.png diff --git a/resources/assets/enderio/textures/items/powderBronze.png b/resources/assets/enderio/textures/items/old/powderBronze.png similarity index 100% rename from resources/assets/enderio/textures/items/powderBronze.png rename to resources/assets/enderio/textures/items/old/powderBronze.png diff --git a/resources/assets/enderio/textures/items/powderLead.png b/resources/assets/enderio/textures/items/old/powderLead.png similarity index 100% rename from resources/assets/enderio/textures/items/powderLead.png rename to resources/assets/enderio/textures/items/old/powderLead.png diff --git a/resources/assets/enderio/textures/items/powderSilver.png b/resources/assets/enderio/textures/items/old/powderSilver.png similarity index 100% rename from resources/assets/enderio/textures/items/powderSilver.png rename to resources/assets/enderio/textures/items/old/powderSilver.png diff --git a/resources/assets/enderio/textures/items/upgradeBlank.png b/resources/assets/enderio/textures/items/old/upgradeBlank.png similarity index 100% rename from resources/assets/enderio/textures/items/upgradeBlank.png rename to resources/assets/enderio/textures/items/old/upgradeBlank.png diff --git a/resources/assets/enderio/textures/items/upgradeEfficieny.png b/resources/assets/enderio/textures/items/old/upgradeEfficieny.png similarity index 100% rename from resources/assets/enderio/textures/items/upgradeEfficieny.png rename to resources/assets/enderio/textures/items/old/upgradeEfficieny.png diff --git a/resources/assets/enderio/textures/items/upgradeEnergy_1.png b/resources/assets/enderio/textures/items/old/upgradeEnergy_1.png similarity index 100% rename from resources/assets/enderio/textures/items/upgradeEnergy_1.png rename to resources/assets/enderio/textures/items/old/upgradeEnergy_1.png diff --git a/resources/assets/enderio/textures/items/upgradeEnergy_2.png b/resources/assets/enderio/textures/items/old/upgradeEnergy_2.png similarity index 100% rename from resources/assets/enderio/textures/items/upgradeEnergy_2.png rename to resources/assets/enderio/textures/items/old/upgradeEnergy_2.png diff --git a/resources/assets/enderio/textures/items/upgradeEnergy_3.png b/resources/assets/enderio/textures/items/old/upgradeEnergy_3.png similarity index 100% rename from resources/assets/enderio/textures/items/upgradeEnergy_3.png rename to resources/assets/enderio/textures/items/old/upgradeEnergy_3.png From a201b48dc074fe767529006809d7c25c21f170b3 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Fri, 23 Jan 2015 17:47:46 -0500 Subject: [PATCH 12/79] Fix conduit facades not showing break animation --- .../enderio/conduit/render/ConduitBundleRenderer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/crazypants/enderio/conduit/render/ConduitBundleRenderer.java b/src/main/java/crazypants/enderio/conduit/render/ConduitBundleRenderer.java index aedc7213..ee3a6324 100644 --- a/src/main/java/crazypants/enderio/conduit/render/ConduitBundleRenderer.java +++ b/src/main/java/crazypants/enderio/conduit/render/ConduitBundleRenderer.java @@ -163,7 +163,7 @@ public class ConduitBundleRenderer extends TileEntitySpecialRenderer implements res = !isFacadeOpaque; if((isFacadeOpaque && BlockConduitBundle.theRenderPass == 0) || - (!isFacadeOpaque && BlockConduitBundle.theRenderPass == 1)) { + (rb.hasOverrideBlockTexture() || (!isFacadeOpaque && BlockConduitBundle.theRenderPass == 1))) { IBlockAccess origBa = rb.blockAccess; rb.blockAccess = new FacadeAccessWrapper(origBa); try { From 4f1faad4f1c4b59db0fa9bc16e11ad9d374ef24d Mon Sep 17 00:00:00 2001 From: Matthias Mann Date: Sat, 24 Jan 2015 10:38:02 +0100 Subject: [PATCH 13/79] don't drop painted slabs in creative mode --- .../machine/painter/BlockPaintedSlab.java | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedSlab.java b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedSlab.java index 1c39c9ac..09e44496 100644 --- a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedSlab.java +++ b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedSlab.java @@ -12,7 +12,7 @@ import net.minecraft.client.particle.EntityDiggingFX; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -205,9 +205,8 @@ public class BlockPaintedSlab extends BlockSlab implements ITileEntityProvider, * Remove the tile entity too. */ @Override - public void breakBlock(World world, int x, int y, int z, Block par5, int par6) { - - if(!world.isRemote && world.getGameRules().getGameRuleBooleanValue("doTileDrops")) { + public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean doHarvest) { + if(!world.isRemote && !player.capabilities.isCreativeMode) { TileEntity te = world.getTileEntity(x, y, z); if(te instanceof TileEntityPaintedSlab && !((TileEntityPaintedSlab) te).isConvertingToFullBlock) { @@ -216,17 +215,11 @@ public class BlockPaintedSlab extends BlockSlab implements ITileEntityProvider, for (int i = 0; i < super.quantityDropped(null); i++) { ItemStack itemStack = createItemStackForSourceBlock(tef.getSourceBlock(), tef.getSourceBlockMetadata()); - float f = 0.7F; - double d0 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; - double d1 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; - double d2 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; - EntityItem entityitem = new EntityItem(world, x + d0, y + d1, z + d2, itemStack); - entityitem.delayBeforeCanPickup = 10; - world.spawnEntityInWorld(entityitem); + dropBlockAsItem(world, x, y, z, itemStack); } } } - world.removeTileEntity(x, y, z); + return super.removedByPlayer(world, player, x, y, z, doHarvest); } @Override From e8ca0c1067e764a07984bd8ea565c5932d71065b Mon Sep 17 00:00:00 2001 From: Matthias Mann Date: Sat, 24 Jan 2015 15:12:45 +0100 Subject: [PATCH 14/79] #1731 Add progression percentage tooltip to machines --- resources/assets/enderio/lang/en_US.lang | 1 + .../machine/alloy/GuiAlloySmelter.java | 61 ++++++++----------- .../enderio/machine/crusher/GuiCrusher.java | 12 ++-- .../enderio/machine/gui/GuiMachineBase.java | 56 +++++++++++++++-- .../enderio/machine/painter/GuiPainter.java | 14 +++-- .../slicensplice/GuiSliceAndSplice.java | 13 ++-- .../enderio/machine/soul/GuiSoulBinder.java | 16 +++-- .../enderio/machine/vat/GuiVat.java | 8 +-- 8 files changed, 116 insertions(+), 65 deletions(-) diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index 10ac6012..fe18bd44 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -687,6 +687,7 @@ enderio.gui.disabled=Disabled enderio.gui.send=Send enderio.gui.recieve=Receive enderio.gui.sendRecieve=Send & Receive +enderio.gui.progress=Progress {0,number}% //Redstone controls enderio.gui.tooltip.redstoneControlMode=Redstone Mode diff --git a/src/main/java/crazypants/enderio/machine/alloy/GuiAlloySmelter.java b/src/main/java/crazypants/enderio/machine/alloy/GuiAlloySmelter.java index d601c45b..8da3937c 100644 --- a/src/main/java/crazypants/enderio/machine/alloy/GuiAlloySmelter.java +++ b/src/main/java/crazypants/enderio/machine/alloy/GuiAlloySmelter.java @@ -1,6 +1,7 @@ package crazypants.enderio.machine.alloy; import java.awt.Rectangle; +import java.text.MessageFormat; import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.InventoryPlayer; @@ -20,35 +21,21 @@ import crazypants.vecmath.Vector4f; public class GuiAlloySmelter extends GuiPoweredMachineBase { - private IconButton vanillaFurnaceButton; + private final IconButton vanillaFurnaceButton; + private final GuiToolTip vanillaFurnaceTooltip; protected static final int SMELT_MODE_BUTTON_ID = 76; public GuiAlloySmelter(InventoryPlayer par1InventoryPlayer, TileAlloySmelter furnaceInventory) { super(furnaceInventory, new ContainerAlloySmelter(par1InventoryPlayer, furnaceInventory)); - addToolTip(new GuiToolTip(new Rectangle(0, 0, 0, 0), "") { + vanillaFurnaceButton = new IconButton(getFontRenderer(), SMELT_MODE_BUTTON_ID, 0, 0, null, RenderUtil.BLOCK_TEX); + vanillaFurnaceButton.setSize(BUTTON_SIZE, BUTTON_SIZE); - @Override - protected void updateText() { - text.clear(); - text.add(Lang.localize("gui.alloy.mode.heading")); - String txt = Lang.localize("gui.alloy.mode.all"); - if(getTileEntity().getMode() == Mode.ALLOY) { - txt = Lang.localize("gui.alloy.mode.alloy"); - } else if(getTileEntity().getMode() == Mode.FURNACE) { - txt = Lang.localize("gui.alloy.mode.furnace"); - } - text.add(txt); - } + vanillaFurnaceTooltip = new GuiToolTip(new Rectangle(xSize - 5 - BUTTON_SIZE, 62, BUTTON_SIZE, BUTTON_SIZE), (String[])null); - @Override - public void onTick(int mouseX, int mouseY) { - bounds.setBounds(xSize - 5 - BUTTON_SIZE, 60, BUTTON_SIZE, BUTTON_SIZE); - super.onTick(mouseX, mouseY); - } - - }); + addProgressTooltip(55, 35, 14, 14); + addProgressTooltip(103, 35, 14, 14); } @SuppressWarnings("unchecked") @@ -56,13 +43,13 @@ public class GuiAlloySmelter extends GuiPoweredMachineBase { public void initGui() { super.initGui(); - int x = guiLeft + xSize - 5 - BUTTON_SIZE; - int y = guiTop + 62; - - vanillaFurnaceButton = new IconButton(getFontRenderer(), SMELT_MODE_BUTTON_ID, x, y, getIconForMode(), RenderUtil.BLOCK_TEX); - vanillaFurnaceButton.setSize(BUTTON_SIZE, BUTTON_SIZE); + vanillaFurnaceButton.xPosition = guiLeft + vanillaFurnaceTooltip.getBounds().x; + vanillaFurnaceButton.yPosition = guiTop + vanillaFurnaceTooltip.getBounds().y; buttonList.add(vanillaFurnaceButton); + addToolTip(vanillaFurnaceTooltip); + + updateVanillaFurnaceButton(); } @Override @@ -78,21 +65,27 @@ public class GuiAlloySmelter extends GuiPoweredMachineBase { protected void actionPerformed(GuiButton par1GuiButton) { if(par1GuiButton.id == SMELT_MODE_BUTTON_ID) { getTileEntity().setMode(getTileEntity().getMode().next()); - vanillaFurnaceButton.setIcon(getIconForMode()); + updateVanillaFurnaceButton(); PacketHandler.INSTANCE.sendToServer(new PacketClientState(getTileEntity())); } else { super.actionPerformed(par1GuiButton); } } - private IIcon getIconForMode() { + private void updateVanillaFurnaceButton() { IIcon icon = EnderIO.blockAlloySmelter.vanillaSmeltingOn; + String unlocText = "gui.alloy.mode.all"; if(getTileEntity().getMode() == Mode.ALLOY) { icon = EnderIO.blockAlloySmelter.vanillaSmeltingOff; + unlocText = "gui.alloy.mode.alloy"; } else if(getTileEntity().getMode() == Mode.FURNACE) { icon = EnderIO.blockAlloySmelter.vanillaSmeltingOnly; + unlocText = "gui.alloy.mode.furnace"; } - return icon; + vanillaFurnaceButton.setIcon(icon); + vanillaFurnaceTooltip.setToolTipText( + Lang.localize("gui.alloy.mode.heading"), + Lang.localize(unlocText)); } /** @@ -103,15 +96,13 @@ public class GuiAlloySmelter extends GuiPoweredMachineBase { protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); RenderUtil.bindTexture("enderio:textures/gui/alloySmelter.png"); - int sx = (width - xSize) / 2; - int sy = (height - ySize) / 2; + int sx = guiLeft; + int sy = guiTop; drawTexturedModalRect(sx, sy, 0, 0, this.xSize, this.ySize); - int scaled; - - if(getTileEntity().getProgress() < 1 && getTileEntity().getProgress() > 0) { - scaled = getTileEntity().getProgressScaled(14) + 1; + if(shouldRenderProgress()) { + int scaled = getTileEntity().getProgressScaled(14) + 1; drawTexturedModalRect(sx + 55, sy + 49 - scaled, 176, 14 - scaled, 14, scaled); drawTexturedModalRect(sx + 103, sy + 49 - scaled, 176, 14 - scaled, 14, scaled); } diff --git a/src/main/java/crazypants/enderio/machine/crusher/GuiCrusher.java b/src/main/java/crazypants/enderio/machine/crusher/GuiCrusher.java index 9dbc14a0..2b91592f 100644 --- a/src/main/java/crazypants/enderio/machine/crusher/GuiCrusher.java +++ b/src/main/java/crazypants/enderio/machine/crusher/GuiCrusher.java @@ -22,6 +22,8 @@ public class GuiCrusher extends GuiPoweredMachineBase { text.add(getTileEntity().getBallDurationScaled(100) + "%"); } }); + + addProgressTooltip(79, 31, 18, 24); } /** @@ -32,15 +34,15 @@ public class GuiCrusher extends GuiPoweredMachineBase { protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); RenderUtil.bindTexture("enderio:textures/gui/crusher.png"); - int guiLeft = (width - xSize) / 2; - int guiTop = (height - ySize) / 2; drawTexturedModalRect(guiLeft, guiTop, 0, 0, this.xSize, this.ySize); - int barHeight = getTileEntity().getProgressScaled(24); - drawTexturedModalRect(guiLeft + 79, guiTop + 31, 200, 0, 18, barHeight + 1); + if(shouldRenderProgress()) { + int barHeight = getTileEntity().getProgressScaled(24); + drawTexturedModalRect(guiLeft + 79, guiTop + 31, 200, 0, 18, barHeight + 1); + } - barHeight = getTileEntity().getBallDurationScaled(16); + int barHeight = getTileEntity().getBallDurationScaled(16); if(barHeight > 0) { drawTexturedModalRect(guiLeft + 142, guiTop + 23 + (16 - barHeight), 186, 31, 4, barHeight); } diff --git a/src/main/java/crazypants/enderio/machine/gui/GuiMachineBase.java b/src/main/java/crazypants/enderio/machine/gui/GuiMachineBase.java index 81396929..d3c74903 100644 --- a/src/main/java/crazypants/enderio/machine/gui/GuiMachineBase.java +++ b/src/main/java/crazypants/enderio/machine/gui/GuiMachineBase.java @@ -1,5 +1,10 @@ package crazypants.enderio.machine.gui; +import java.awt.Rectangle; +import java.text.MessageFormat; +import java.util.ArrayList; +import java.util.List; + import net.minecraft.client.gui.GuiButton; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; @@ -16,6 +21,7 @@ import crazypants.enderio.machine.AbstractMachineEntity; import crazypants.enderio.machine.IoMode; import crazypants.enderio.machine.SlotDefinition; import crazypants.gui.GuiContainerBase; +import crazypants.gui.GuiToolTip; import crazypants.render.RenderUtil; import crazypants.util.BlockCoord; import crazypants.util.Lang; @@ -30,22 +36,23 @@ public abstract class GuiMachineBase extends Gu private static final int CONFIG_ID = 8962349; private static final int RECIPE_ID = CONFIG_ID + 1; - private T tileEntity; + private final T tileEntity; protected RedstoneModeButton redstoneButton; - private GuiOverlayIoConfig configOverlay; + private final GuiOverlayIoConfig configOverlay; protected ToggleButtonEIO configB; protected IconButtonEIO recipeButton; + protected List progressTooltips; + protected int lastProgressTooltipValue = -1; + protected GuiMachineBase(T machine, Container par1Container) { super(par1Container); tileEntity = machine; - xSize = getXSize(); - ySize = getYSize(); int x = getXSize() - 5 - BUTTON_SIZE; int y = 5; redstoneButton = new RedstoneModeButton(this, -1, x, y, tileEntity, new BlockCoord(tileEntity)); @@ -151,4 +158,45 @@ public abstract class GuiMachineBase extends Gu protected T getTileEntity() { return tileEntity; } + + protected void addProgressTooltip(int x, int y, int w, int h) { + if(progressTooltips == null) { + progressTooltips = new ArrayList(); + } + + GuiToolTip tt = new GuiToolTip(new Rectangle(x, y, w, h), (String[])null); + progressTooltips.add(tt); + addToolTip(tt); + } + + private void updateProgressTooltips(int progress) { + if(lastProgressTooltipValue == progress || progressTooltips == null) { + return; + } + lastProgressTooltipValue = progress; + + if(progress < 0) { + for(GuiToolTip tt : progressTooltips) { + tt.setVisible(false); + } + return; + } + + String msg = MessageFormat.format(Lang.localize("gui.progress"), progress); + for(GuiToolTip tt : progressTooltips) { + tt.setToolTipText(msg); + tt.setVisible(true); + } + } + + protected boolean shouldRenderProgress() { + float progress = tileEntity.getProgress(); + if(progress > 0 && progress < 1) { + updateProgressTooltips((int)(progress * 100)); + return true; + } else { + updateProgressTooltips(-1); + return false; + } + } } diff --git a/src/main/java/crazypants/enderio/machine/painter/GuiPainter.java b/src/main/java/crazypants/enderio/machine/painter/GuiPainter.java index cad09957..be39558f 100644 --- a/src/main/java/crazypants/enderio/machine/painter/GuiPainter.java +++ b/src/main/java/crazypants/enderio/machine/painter/GuiPainter.java @@ -6,7 +6,6 @@ import org.lwjgl.opengl.GL11; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.machine.AbstractMachineEntity; import crazypants.enderio.machine.gui.GuiPoweredMachineBase; import crazypants.render.RenderUtil; import crazypants.vecmath.Vector4f; @@ -16,6 +15,8 @@ public class GuiPainter extends GuiPoweredMachineBase { public GuiPainter(InventoryPlayer par1InventoryPlayer, TileEntityPainter te) { super(te, new PainterContainer(par1InventoryPlayer, te)); + + addProgressTooltip(88, 34, 24, 16); } /** @@ -26,14 +27,15 @@ public class GuiPainter extends GuiPoweredMachineBase { protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); RenderUtil.bindTexture("enderio:textures/gui/painter.png"); - int k = (width - xSize) / 2; - int l = (height - ySize) / 2; + int k = guiLeft; + int l = guiTop; drawTexturedModalRect(k, l, 0, 0, xSize, ySize); - int i1; - i1 = getTileEntity().getProgressScaled(24); - drawTexturedModalRect(k + 88, l + 34, 176, 14, i1 + 1, 16); + if(shouldRenderProgress()) { + int scaled = getTileEntity().getProgressScaled(24); + drawTexturedModalRect(k + 88, l + 34, 176, 14, scaled + 1, 16); + } super.drawGuiContainerBackgroundLayer(par1, par2, par3); } diff --git a/src/main/java/crazypants/enderio/machine/slicensplice/GuiSliceAndSplice.java b/src/main/java/crazypants/enderio/machine/slicensplice/GuiSliceAndSplice.java index fe9c31cf..ecfdd239 100644 --- a/src/main/java/crazypants/enderio/machine/slicensplice/GuiSliceAndSplice.java +++ b/src/main/java/crazypants/enderio/machine/slicensplice/GuiSliceAndSplice.java @@ -11,6 +11,8 @@ public class GuiSliceAndSplice extends GuiPoweredMachineBase public GuiSliceAndSplice(InventoryPlayer par1InventoryPlayer, TileSliceAndSplice te) { super(te, new ContainerSliceAndSplice(par1InventoryPlayer, te)); + + addProgressTooltip(101, 46, 24, 16); } /** @@ -21,14 +23,15 @@ public class GuiSliceAndSplice extends GuiPoweredMachineBase protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); RenderUtil.bindTexture("enderio:textures/gui/sliceAndSplice.png"); - int k = (width - xSize) / 2; - int l = (height - ySize) / 2; + int k = guiLeft; + int l = guiTop; drawTexturedModalRect(k, l, 0, 0, xSize, ySize); - int i1; - i1 = getTileEntity().getProgressScaled(24); - drawTexturedModalRect(k + 101, l + 46, 176, 14, i1 + 1, 16); + if(shouldRenderProgress()) { + int scaled = getTileEntity().getProgressScaled(24); + drawTexturedModalRect(k + 101, l + 46, 176, 14, scaled + 1, 16); + } super.drawGuiContainerBackgroundLayer(par1, par2, par3); } diff --git a/src/main/java/crazypants/enderio/machine/soul/GuiSoulBinder.java b/src/main/java/crazypants/enderio/machine/soul/GuiSoulBinder.java index d2db73c0..9789d55c 100644 --- a/src/main/java/crazypants/enderio/machine/soul/GuiSoulBinder.java +++ b/src/main/java/crazypants/enderio/machine/soul/GuiSoulBinder.java @@ -20,13 +20,15 @@ public class GuiSoulBinder extends GuiPoweredMachineBase { private static final int PLAYER_XP_ID = 985162394; - private IconButtonEIO usePlayerXP; + private final IconButtonEIO usePlayerXP; public GuiSoulBinder(InventoryPlayer par1InventoryPlayer, TileSoulBinder te) { super(te, new ContainerSoulBinder(par1InventoryPlayer, te)); usePlayerXP = new IconButtonEIO(this, PLAYER_XP_ID, 125, 57, IconEIO.XP); usePlayerXP.visible = false; usePlayerXP.setToolTip("Use Player XP"); + + addProgressTooltip(80, 34, 24, 16); } @Override @@ -55,18 +57,20 @@ public class GuiSoulBinder extends GuiPoweredMachineBase { protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); RenderUtil.bindTexture("enderio:textures/gui/soulFuser.png"); - int k = (width - xSize) / 2; - int l = (height - ySize) / 2; + int k = guiLeft; + int l = guiTop; drawTexturedModalRect(k, l, 0, 0, this.xSize, this.ySize); int i1; TileSoulBinder binder = getTileEntity(); - i1 = binder.getProgressScaled(24); - drawTexturedModalRect(k + 80, l + 34, 176, 14, i1 + 1, 16); + if(shouldRenderProgress()) { + i1 = binder.getProgressScaled(24); + drawTexturedModalRect(k + 80, l + 34, 176, 14, i1 + 1, 16); + } - boolean needsXp = getTileEntity().getCurrentlyRequiredLevel() > 0 && binder.getCurrentlyRequiredLevel() > binder.getContainer().getExperienceLevel(); + boolean needsXp = binder.getCurrentlyRequiredLevel() > 0 && binder.getCurrentlyRequiredLevel() > binder.getContainer().getExperienceLevel(); usePlayerXP.visible = needsXp; ExperienceBarRenderer.render(this, getGuiLeft() + 56, getGuiTop() + 68, 65, binder.getContainer(), binder.getCurrentlyRequiredLevel()); diff --git a/src/main/java/crazypants/enderio/machine/vat/GuiVat.java b/src/main/java/crazypants/enderio/machine/vat/GuiVat.java index aba584d9..43decedf 100644 --- a/src/main/java/crazypants/enderio/machine/vat/GuiVat.java +++ b/src/main/java/crazypants/enderio/machine/vat/GuiVat.java @@ -26,7 +26,7 @@ public class GuiVat extends GuiPoweredMachineBase { private static final String GUI_TEXTURE = "enderio:textures/gui/vat.png"; - private IconButtonEIO dump1, dump2; + private final IconButtonEIO dump1, dump2; public GuiVat(InventoryPlayer inventory, TileVat te) { super(te, new ContainerVat(inventory, te)); @@ -65,6 +65,8 @@ public class GuiVat extends GuiPoweredMachineBase { dump1.setToolTip(Lang.localize("gui.machine.vat.dump.1")); dump2 = new IconButtonEIO(this, 2, 131, 62, IconEIO.REDSTONE_MODE_NEVER); dump2.setToolTip(Lang.localize("gui.machine.vat.dump.2")); + + addProgressTooltip(81, 63, 14, 14); } @Override @@ -97,12 +99,10 @@ public class GuiVat extends GuiPoweredMachineBase { protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); RenderUtil.bindTexture(GUI_TEXTURE); - int guiLeft = (width - xSize) / 2; - int guiTop = (height - ySize) / 2; drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize); TileVat vat = getTileEntity(); - if(vat.getProgress() < 1 && vat.getProgress() > 0) { + if(shouldRenderProgress()) { int scaled = vat.getProgressScaled(14) + 1; drawTexturedModalRect(guiLeft + 81, guiTop + 77 - scaled, 176, 14 - scaled, 14, scaled); From b06c6d17c48a98a51e99bbf3022351a585ff430e Mon Sep 17 00:00:00 2001 From: Adaptivity Date: Sat, 24 Jan 2015 18:36:18 +0300 Subject: [PATCH 15/79] Some more localization --- resources/assets/enderio/lang/en_US.lang | 3 ++ resources/assets/enderio/lang/ru_RU.lang | 53 +++++++++++-------- .../conduit/facade/ItemConduitFacade.java | 3 +- .../enderio/item/ItemSoulVessel.java | 2 +- .../darksteel/DarkSteelRecipeManager.java | 2 +- 5 files changed, 38 insertions(+), 25 deletions(-) diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index 9535cb34..fb6b8232 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -20,6 +20,7 @@ item.enderio.itemEnderface.name=Enderface enderio.blockConduitBundle=Conduit Bundle enderio.blockConduitFacade=Conduit Facade item.enderio.itemConduitFacade.name=Conduit Facade +enderio.item.itemConduitFacade.tooltip.notpainted=Not Painted item.enderio.itemConduitFacade.tooltip.detailed.line1=Painted in the Painting Machine item.enderio.itemConduitFacade.tooltip.detailed.line2=R-Click on a conduit to place item.enderio.itemConduitFacade.tooltip.detailed.line3=Hidden when a wrench or conduit @@ -535,6 +536,7 @@ item.itemSoulVessel.name=Soul Vial enderio.item.itemSoulVessel.tooltip.health=Health: enderio.item.itemSoulVessel.tooltip.fluidname=Fluid Name: enderio.item.itemSoulVessel.tooltip.color=Color: +enderio.item.itemSoulVessel.tooltip.empty=Empty item.itemSoulVessel.tooltip.detailed.line1=R-Click on a mob to item.itemSoulVessel.tooltip.detailed.line2=capture its soul item.itemSoulVessel.tooltip.detailed.line3=R-Click again to release it @@ -914,4 +916,5 @@ enderio.tooltip.burntime=Burn Time: enderio.tooltip.oredict=Ore Dictionary: enderio.tooltip.meta=Meta: enderio.tooltip.uid=UID: +enderio.tooltip.anvilupgrades=Anvil Upgrades: enderio.waila.config.hiddenfacades=Sneaky Facades \ No newline at end of file diff --git a/resources/assets/enderio/lang/ru_RU.lang b/resources/assets/enderio/lang/ru_RU.lang index 11c79724..322dc8a6 100644 --- a/resources/assets/enderio/lang/ru_RU.lang +++ b/resources/assets/enderio/lang/ru_RU.lang @@ -20,6 +20,7 @@ item.enderio.itemEnderface.name=Лицо Края enderio.blockConduitBundle=Связка труб enderio.blockConduitFacade=Фасад для труб item.enderio.itemConduitFacade.name=Фасад для труб +enderio.item.itemConduitFacade.tooltip.notpainted=Не покрашен item.enderio.itemConduitFacade.tooltip.detailed.line1=Окрашивается в покрасочном механизме item.enderio.itemConduitFacade.tooltip.detailed.line2=ПКМ по трубе, чтобы поставить item.enderio.itemConduitFacade.tooltip.detailed.line3=Скрыт, когда гаечный ключ или труба @@ -84,9 +85,14 @@ item.itemPowerItemFilter.tooltip.detailed.line2=количества RF в пр item.itemExtractSpeedUpgrade.name=Улучшение скорости для предметной трубы item.itemExtractSpeedUpgrade.tooltip.basic.line1=Улучшение для предметных труб item.itemExtractSpeedUpgrade.tooltip.detailed.line1=Увеличивает скорость на 4 -item.itemExtractSpeedUpgrade.tooltip.detailed.line2=предметов за извлечение +item.itemExtractSpeedUpgrade.tooltip.detailed.line2=предмета за извлечение item.itemExtractSpeedUpgrade.tooltip.detailed.line3=Макс. улучшений - 15 +item.itemExtractSpeedDowngrade.name=Снижение скорости для предметной трубы +item.itemExtractSpeedDowngrade.tooltip.basic.line1=Снижает скорость предметных труб +item.itemExtractSpeedDowngrade.tooltip.detailed.line1=Снижает скорость на 1 +item.itemExtractSpeedDowngrade.tooltip.detailed.line2=предмет за извлечение + enderio.itemGasConduit.name=Газовая труба enderio.itemGasConduit.tooltip.maxExtract=Макс. извлечение: @@ -110,7 +116,7 @@ tile.blockEndermanSkull.name=Череп странника Края tile.blockEndermanSkull.base.name=Голова странника Края tile.blockEndermanSkull.reanimated.name=Реанимированная голова странника Края tile.blockEndermanSkull.tormented.name=Измученная голова странника Края -enderio.blastResistant=Взрывоустойчивая +enderio.blastResistant=Взрывоустойчиво enderio.lightEmitter=Излучает свет enderio.tooltip.isBeaconBase=Может быть использовано, как основа для маяка @@ -202,7 +208,7 @@ enderio.ingotEnderiumBase.name=Основа Края //Capacitors enderio.itemBasicCapacitor.name=Конденсатор -enderio.basicCapacitor.name=Базовый конденсатор +enderio.basicCapacitor.name=Основной конденсатор enderio.activatedCapacitor.name=Двухслойный конденсатор enderio.enderCapacitor.name=Восьмислойный конденсатор @@ -229,7 +235,7 @@ tile.blockAlloySmelter.name=Завод сплавов tile.blockAlloySmelter.tooltip.detailed.line1=Используется для создания сплавов EnderIO tile.blockAlloySmelter.tooltip.detailed.line2=Может также использоваться как печь, tile.blockAlloySmelter.tooltip.detailed.line3=питающаяся энергией -tile.blockAlloySmelter.tooltip.detailed.line4=Улучшите конденсаторами, чтобы увеличить +tile.blockAlloySmelter.tooltip.detailed.line4=Добавьте конденсаторы, чтобы увеличить tile.blockAlloySmelter.tooltip.detailed.line5=скорость и хранилище энергии tile.blockSolarPanel.name=Фотовольтовая ячейка @@ -279,7 +285,7 @@ tile.blockCapBank.simple.name=Основной блок конденсаторо tile.blockCapBank.activated.name=Блок конденсаторов tile.blockCapBank.vibrant.name=Вибрирующий блок конденсаторов tile.blockCapBank.tooltip.detailed.line1=Мульти-блок для хранения энергии. -tile.blockCapBank.tooltip.detailed.line2=Может заряжать РФ-предметы. +tile.blockCapBank.tooltip.detailed.line2=Может заряжать RF-предметы. tile.blockCapBank.tooltip.detailed.line3=Shift-ПКМ, по экрану пустой рукой, tile.blockCapBank.tooltip.detailed.line4=чтобы изменить отображаемую информацию tile.blockCapBank.tooltipPrefix=Содержит @@ -296,11 +302,11 @@ tile.blockWirelessCharger.name=Беспроводной зарядник tile.blockWirelessCharger.tooltip.detailed.line1=Заряжает ближайшие предметы tile.blockWirelessCharger.tooltip.detailed.line2=в инвентарях игроков -tile.blockSagMill.name=Дробилка +tile.blockSagMill.name=Дробитель tile.blockSagMill.tooltip.detailed.line1=Дробит руду и другие предметы tile.blockSagMill.tooltip.detailed.line2=Добавьте измельчающие шарики, чтобы увеличить tile.blockSagMill.tooltip.detailed.line3=выход и эффективность -tile.blockSagMill.tooltip.detailed.line4=Улучшите конденсаторами, чтобы увеличить +tile.blockSagMill.tooltip.detailed.line4=Добавьте конденсаторы, чтобы увеличить tile.blockSagMill.tooltip.detailed.line5=скорость и хранилище энергии tile.blockSagMill.tooltipPrefix=Содержит @@ -343,9 +349,9 @@ tile.blockVat.name=Чан tile.blockVat.tooltip.detailed.line1=Используется для варки жидкостей EnderIO tile.blockEnchanter.name=Зачарователь -tile.blockEnchanter.tooltip.detailed.line1=Использует опыт, чтобы комбинировать предметы -tile.blockEnchanter.tooltip.detailed.line2=Книга и перо создаёт -tile.blockEnchanter.tooltip.detailed.line2=зачарованные книги +tile.blockEnchanter.tooltip.detailed.line1=Использует опыт, чтобы объединять +tile.blockEnchanter.tooltip.detailed.line2=предметы с книгой и пером для создания +tile.blockEnchanter.tooltip.detailed.line2=зачарованных книг tile.blockCombustionGenerator.name=Генератор внутреннего сгорания tile.blockCombustionGenerator.tooltip.detailed.line1=Сжигает жидкое топливо для производства энергии @@ -378,7 +384,7 @@ tile.blockFarmStation.tooltip.detailed.line2=Требует энергию и tile.blockFarmStation.tooltip.detailed.line3=надлежащие инструменты (мотыгу, топор) tile.blockFarmStation.tooltip.detailed.line4=Добыча / Удача на инструментах tile.blockFarmStation.tooltip.detailed.line5=применяется при сборе урожая -tile.blockFarmStation.tooltip.detailed.line6=Улучшите конденсаторами, чтобы увеличить +tile.blockFarmStation.tooltip.detailed.line6=Добавьте конденсаторы, чтобы увеличить tile.blockFarmStation.tooltip.detailed.line7=дальность, улучшение также повышает потребление энергии enderio.farm.note.outputFull=Выход полон @@ -412,11 +418,11 @@ tile.blockPoweredSpawner.empty.tooltip.detailed.line1=Объедините со tile.blockPoweredSpawner.empty.tooltip.detailed.line2=спаунером в наковальне tile.blockPoweredSpawner.tooltip.detailed.line1=Подайте питание, чтобы tile.blockPoweredSpawner.tooltip.detailed.line2=активировать -tile.blockPoweredSpawner.tooltip.detailed.line3=Улучшите конденсаторами, чтобы увеличить +tile.blockPoweredSpawner.tooltip.detailed.line3=Добавьте конденсаторы, чтобы увеличить tile.blockPoweredSpawner.tooltip.detailed.line4=скорость и хранилище энергии item.itemBrokenSpawner.name=Сломанный спаунер -item.itemBrokenSpawner.tooltip.detailed.line1=Объедините электрический спаунер +item.itemBrokenSpawner.tooltip.detailed.line1=Объедините с электрическим спаунером item.itemBrokenSpawner.tooltip.detailed.line2=в наковальне, чтобы установить тип спауна tile.blockSoulBinder.name=Связыватель душ @@ -482,8 +488,8 @@ enderio.blockTravelPlatform.outOfRange=Место назначения за пр item.itemTravelStaff.name=Посох путешествия item.itemTravelStaff.tooltip.detailed.line1=Когда якори путешествия и EnderIO экипированы item.itemTravelStaff.tooltip.detailed.line2=блоки становятся видимыми и могут быть -item.itemTravelStaff.tooltip.detailed.line3=активированы -item.itemTravelStaff.tooltip.detailed.line4= телепортирует +item.itemTravelStaff.tooltip.detailed.line3=активированы ПКМ +item.itemTravelStaff.tooltip.detailed.line4=Shift-ПКМ телепортирует item.itemTravelStaff.tooltip.detailed.line5=игрока на короткую дистанцию enderio.itemTravelStaff.notEnoughPower=Недостаточно энергии @@ -510,11 +516,11 @@ tile.blockPainter.tooltip.detailed.line6=якорей путешествия //Items item.itemYetaWrench.name=Гаечный ключ Yeta item.itemYetaWrench.tooltip.detailed.line1=Скрывает фасады труб, когда в руке -item.itemYetaWrench.tooltip.detailed.line2=Shift-ПКМ, чтобы демонтировать механизмы -item.itemYetaWrench.tooltip.detailed.line3=и трубы моментально -item.itemYetaWrench.tooltip.detailed.line4=Используйте Shift-колёсико мыши, чтобы отображать -item.itemYetaWrench.tooltip.detailed.line5=одиночный тип трубы -item.itemYetaWrench.tooltip.detailed.line6=Используйте Shift-колёсико мыши или 'Y', чтобы +item.itemYetaWrench.tooltip.detailed.line2=Shift-ПКМ, чтобы моментально демонтировать +item.itemYetaWrench.tooltip.detailed.line3=механизм или трубы +item.itemYetaWrench.tooltip.detailed.line4=Shift-ЛКМ по трубе, чтобы +item.itemYetaWrench.tooltip.detailed.line5=открыть интерфейс настроек +item.itemYetaWrench.tooltip.detailed.line6=Используйте Shift-колёсико мыши или '%s', чтобы item.itemYetaWrench.tooltip.detailed.line7=отображать только один вид труб item.itemMagnet.name=Электромагнит @@ -535,6 +541,7 @@ item.itemSoulVessel.name=Флакон для душ enderio.item.itemSoulVessel.tooltip.health=Здоровье: enderio.item.itemSoulVessel.tooltip.fluidname=Название жидкости: enderio.item.itemSoulVessel.tooltip.color=Цвет: +enderio.item.itemSoulVessel.tooltip.empty=Пустой item.itemSoulVessel.tooltip.detailed.line1=ПКМ по мобу, чтобы item.itemSoulVessel.tooltip.detailed.line2=захватить его душу item.itemSoulVessel.tooltip.detailed.line3=Нажмите ПКМ снова, чтобы выпустить её @@ -569,7 +576,7 @@ enderio.item.darkSteel_pickaxe.tooltip.effObs=Эффективность уни enderio.item.darkSteel_axe.tooltip.multiHarvest=Присядьте, чтобы срубить несколько брёвен -enderio.item.darkSteel_sword.tooltip.line1=Увеличено выпадение черепов жемчуга Края. +enderio.item.darkSteel_sword.tooltip.line1=Увеличено выпадение черепов и жемчуга Края. enderio.item.darkSteel_sword.tooltip.line2=Странник Края не может телепортироваться после удара. enderio.item.darkSteel_sword.tooltip.line3=+1 Урон, при питании @@ -638,7 +645,7 @@ enderio.darksteel.upgrade.apiaristArmor.boots.tooltip.detailed.line1=Защит item.itemGliderWing.name=Крыло планёра item.itemGliderWings.name=Крылья планёра -item.itemGliderWings.tooltip.detailed.line1=Улучшите кирасой +item.itemGliderWings.tooltip.detailed.line1=Улучшается кирасой item.itemGliderWings.tooltip.detailed.line2=из чёрной стали enderio.darksteel.upgrade.jump_one.name=Прыжок @@ -687,6 +694,7 @@ enderio.gui.disabled=Выключено enderio.gui.send=Отправлять enderio.gui.recieve=Получать enderio.gui.sendRecieve=Отправлять и получать +enderio.gui.progress=Прогресс {0,number}% //Redstone controls enderio.gui.tooltip.redstoneControlMode=Режим красного камня @@ -914,4 +922,5 @@ enderio.tooltip.burntime=Время горения: enderio.tooltip.oredict=Словарь руд: enderio.tooltip.meta=Метаданные: enderio.tooltip.uid=UID: +enderio.tooltip.anvilupgrades=Улучшения на наковальне: enderio.waila.config.hiddenfacades=Скрытые фасады \ No newline at end of file diff --git a/src/main/java/crazypants/enderio/conduit/facade/ItemConduitFacade.java b/src/main/java/crazypants/enderio/conduit/facade/ItemConduitFacade.java index 0205070f..9f2c08dc 100644 --- a/src/main/java/crazypants/enderio/conduit/facade/ItemConduitFacade.java +++ b/src/main/java/crazypants/enderio/conduit/facade/ItemConduitFacade.java @@ -26,6 +26,7 @@ import crazypants.enderio.machine.painter.IPaintedBlock; import crazypants.enderio.machine.painter.PaintSourceValidator; import crazypants.enderio.machine.painter.PainterUtil; import crazypants.util.Util; +import crazypants.util.Lang; public class ItemConduitFacade extends Item implements IAdvancedTooltipProvider { @@ -119,7 +120,7 @@ public class ItemConduitFacade extends Item implements IAdvancedTooltipProvider @SideOnly(Side.CLIENT) public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { if(PainterUtil.getSourceBlock(itemstack) == null) { - list.add("Not Painted"); + list.add(Lang.localize("item.itemConduitFacade.tooltip.notpainted")); } else { list.add(PainterUtil.getTooltTipText(itemstack)); } diff --git a/src/main/java/crazypants/enderio/item/ItemSoulVessel.java b/src/main/java/crazypants/enderio/item/ItemSoulVessel.java index 0c0c702a..e33de3a7 100644 --- a/src/main/java/crazypants/enderio/item/ItemSoulVessel.java +++ b/src/main/java/crazypants/enderio/item/ItemSoulVessel.java @@ -364,7 +364,7 @@ public class ItemSoulVessel extends Item implements IResourceTooltipProvider { if(mobName != null) { par3List.add(EntityUtil.getDisplayNameForEntity(mobName)); } else { - par3List.add("Empty"); + par3List.add(Lang.localize("item.itemSoulVessel.tooltip.empty")); } float health = getHealthFromStack(par1ItemStack); diff --git a/src/main/java/crazypants/enderio/item/darksteel/DarkSteelRecipeManager.java b/src/main/java/crazypants/enderio/item/darksteel/DarkSteelRecipeManager.java index e71c0a9a..28aa6394 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/DarkSteelRecipeManager.java +++ b/src/main/java/crazypants/enderio/item/darksteel/DarkSteelRecipeManager.java @@ -187,7 +187,7 @@ public class DarkSteelRecipeManager { } } if(!applyableUpgrades.isEmpty()) { - list.add(EnumChatFormatting.YELLOW + "Anvil Upgrades: "); + list.add(EnumChatFormatting.YELLOW + Lang.localize("tooltip.anvilupgrades") + " "); for (IDarkSteelUpgrade up : applyableUpgrades) { list.add(EnumChatFormatting.DARK_AQUA + "" + "" + Lang.localize(up.getUnlocalizedName() + ".name", false) + ": "); list.add(EnumChatFormatting.DARK_AQUA + "" + EnumChatFormatting.ITALIC + " " + up.getUpgradeItemName() + " + " + up.getLevelCost() From c6fe880ef0205e54ba6b1916c7ccfff46a53df72 Mon Sep 17 00:00:00 2001 From: Matthias Mann Date: Sat, 24 Jan 2015 18:30:09 +0100 Subject: [PATCH 16/79] fixed enchanter tooltip line numbers, display yeta wrench detailed tooltip as detailed --- resources/assets/enderio/lang/en_US.lang | 2 +- .../enderio/item/ItemYetaWrench.java | 20 +++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index 10ac6012..bb702ad8 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -345,7 +345,7 @@ tile.blockVat.tooltip.detailed.line1=Used to brew EnderIO fluids tile.blockEnchanter.name=Enchanter tile.blockEnchanter.tooltip.detailed.line1=Uses XP to combine items tile.blockEnchanter.tooltip.detailed.line2=and a book and quill to -tile.blockEnchanter.tooltip.detailed.line2=created enchanted books +tile.blockEnchanter.tooltip.detailed.line3=created enchanted books tile.blockCombustionGenerator.name=Combustion Generator tile.blockCombustionGenerator.tooltip.detailed.line1=Burns liquid fuel to generate power diff --git a/src/main/java/crazypants/enderio/item/ItemYetaWrench.java b/src/main/java/crazypants/enderio/item/ItemYetaWrench.java index b211081c..417e3c9d 100644 --- a/src/main/java/crazypants/enderio/item/ItemYetaWrench.java +++ b/src/main/java/crazypants/enderio/item/ItemYetaWrench.java @@ -2,6 +2,7 @@ package crazypants.enderio.item; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; +import java.util.ArrayList; import java.util.List; import net.minecraft.block.Block; @@ -24,9 +25,9 @@ import crazypants.enderio.api.tool.ITool; import crazypants.enderio.conduit.ConduitDisplayMode; import crazypants.enderio.config.Config; import crazypants.enderio.gui.IAdvancedTooltipProvider; +import crazypants.enderio.gui.TooltipAddera; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.tool.ToolUtil; -import crazypants.util.Lang; public class ItemYetaWrench extends Item implements ITool, IConduitControl, IAdvancedTooltipProvider, InvocationHandler { @@ -116,26 +117,25 @@ public class ItemYetaWrench extends Item implements ITool, IConduitControl, IAdv /* IAdvancedTooltipProvider */ - @SuppressWarnings({ "rawtypes", "unchecked" }) + @SuppressWarnings("rawtypes") @Override public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - int line = 1; - String unloc = getUnlocalizedName() + ".tooltip.detailed.line", loc = null; - while (!(loc = Lang.localize(unloc + line, false)).equals(unloc + line++)) { - list.add(String.format(loc, Keyboard.getKeyName(KeyTracker.instance.getYetaWrenchMode().getKeyCode()))); - } } @SuppressWarnings("rawtypes") @Override public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - ; // none } - @SuppressWarnings("rawtypes") + @SuppressWarnings({ "rawtypes", "unchecked" }) @Override public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - ; // none + ArrayList tmp = new ArrayList(); + TooltipAddera.addDetailedTooltipFromResources(tmp, getUnlocalizedName()); + String keyName = Keyboard.getKeyName(KeyTracker.instance.getYetaWrenchMode().getKeyCode()); + for(String line : tmp) { + list.add(String.format(line, keyName)); + } } /* InvocationHandler */ From 259ccdd1b8de34a59a80fa5673eabc3bf4620e22 Mon Sep 17 00:00:00 2001 From: Matthias Mann Date: Sat, 24 Jan 2015 11:52:09 +0100 Subject: [PATCH 17/79] #746 added speed downgrade to item conduit --- resources/assets/enderio/lang/en_US.lang | 5 ++ .../textures/items/extractSpeedDowngrade.png | Bin 0 -> 203 bytes .../enderio/conduit/ConduitRecipes.java | 6 ++- .../gui/ExternalConnectionContainer.java | 14 ++++- .../enderio/conduit/item/ItemConduit.java | 20 +++---- .../conduit/item/ItemExtractSpeedUpgrade.java | 51 +++++++++++++++--- .../enderio/conduit/item/SpeedUpgrade.java | 32 +++++++++++ 7 files changed, 106 insertions(+), 22 deletions(-) create mode 100644 resources/assets/enderio/textures/items/extractSpeedDowngrade.png create mode 100644 src/main/java/crazypants/enderio/conduit/item/SpeedUpgrade.java diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index 10ac6012..f7d991a1 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -87,6 +87,11 @@ item.itemExtractSpeedUpgrade.tooltip.detailed.line1=Increases speed by 4 item.itemExtractSpeedUpgrade.tooltip.detailed.line2=items per extraction item.itemExtractSpeedUpgrade.tooltip.detailed.line3=Max upgrades is 15 +item.itemExtractSpeedDowngrade.name=Item Conduit Speed Downgrade +item.itemExtractSpeedDowngrade.tooltip.basic.line1=Downgrade for item conduits +item.itemExtractSpeedDowngrade.tooltip.detailed.line1=Reduces speed to 1 +item.itemExtractSpeedDowngrade.tooltip.detailed.line2=item per extraction + enderio.itemGasConduit.name=Gas Conduit enderio.itemGasConduit.tooltip.maxExtract=Max Extract: diff --git a/resources/assets/enderio/textures/items/extractSpeedDowngrade.png b/resources/assets/enderio/textures/items/extractSpeedDowngrade.png new file mode 100644 index 0000000000000000000000000000000000000000..0a98aedb92ce210b9061902c4d7735dace3b87de GIT binary patch literal 203 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4$}%o!BpvgYpqif|Tq zL>4nJ@ErzW#^d=bQhsI~Y7&{an^LB{Ts5lNv(1 literal 0 HcmV?d00001 diff --git a/src/main/java/crazypants/enderio/conduit/ConduitRecipes.java b/src/main/java/crazypants/enderio/conduit/ConduitRecipes.java index e5ec4515..ee1b667f 100644 --- a/src/main/java/crazypants/enderio/conduit/ConduitRecipes.java +++ b/src/main/java/crazypants/enderio/conduit/ConduitRecipes.java @@ -89,7 +89,11 @@ public class ConduitRecipes { ItemStack speedUpgrade = new ItemStack(EnderIO.itemExtractSpeedUpgrade, 1, 0); GameRegistry.addShapedRecipe(speedUpgrade, "iii","epe","ere", 'p', Blocks.piston, 'e', electricalSteel, 'r', Blocks.redstone_torch, 'i', Items.iron_ingot); - + + ItemStack speedDowngrade = new ItemStack(EnderIO.itemExtractSpeedUpgrade, 1, 1); + GameRegistry.addRecipe(new ShapedOreRecipe(speedDowngrade, "iii","ese","ete", 's', "slimeball", 'e', electricalSteel, 't', "stickWood", 'i', Items.iron_ingot)); + GameRegistry.addRecipe(new ShapedOreRecipe(speedDowngrade, "iii","ese","ete", 's', "slimeball", 'e', electricalSteel, 't', "woodStick", 'i', Items.iron_ingot)); + if (MEUtil.isMEEnabled()) { addAeRecipes(); } diff --git a/src/main/java/crazypants/enderio/conduit/gui/ExternalConnectionContainer.java b/src/main/java/crazypants/enderio/conduit/gui/ExternalConnectionContainer.java index d8bb8803..9791f87b 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/ExternalConnectionContainer.java +++ b/src/main/java/crazypants/enderio/conduit/gui/ExternalConnectionContainer.java @@ -11,10 +11,12 @@ import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; +import crazypants.enderio.EnderIO; import crazypants.enderio.conduit.IConduitBundle; import crazypants.enderio.conduit.gui.item.InventoryFilterUpgrade; import crazypants.enderio.conduit.gui.item.InventorySpeedUpgrades; import crazypants.enderio.conduit.item.IItemConduit; +import crazypants.enderio.conduit.item.SpeedUpgrade; import crazypants.enderio.conduit.item.filter.IItemFilter; public class ExternalConnectionContainer extends Container { @@ -24,6 +26,7 @@ public class ExternalConnectionContainer extends Container { private ForgeDirection dir; private IItemConduit itemConduit; + private int speedUpgradeSlotLimit = 15; private IItemFilter inputFilter; private IItemFilter outputFilter; @@ -86,7 +89,11 @@ public class ExternalConnectionContainer extends Container { public boolean isItemValid(ItemStack par1ItemStack) { return si.isItemValidForSlot(0, par1ItemStack); } - + + @Override + public int getSlotStackLimit() { + return speedUpgradeSlotLimit; + } }); slotLocations.add(new Point(x, y)); @@ -193,6 +200,11 @@ public class ExternalConnectionContainer extends Container { @Override public ItemStack slotClick(int par1, int par2, int par3, EntityPlayer par4EntityPlayer) { + ItemStack st = par4EntityPlayer.inventory.getItemStack(); + if(st != null && st.getItem() == EnderIO.itemExtractSpeedUpgrade) { + SpeedUpgrade speedUpgrade = EnderIO.itemExtractSpeedUpgrade.getSpeedUpgrade(st); + speedUpgradeSlotLimit = speedUpgrade.maxStackSize; + } if(par4EntityPlayer.worldObj != null) { if(par1 >= startFilterSlot && itemConduit != null) { itemConduit.setInputFilter(dir, inputFilter); diff --git a/src/main/java/crazypants/enderio/conduit/item/ItemConduit.java b/src/main/java/crazypants/enderio/conduit/item/ItemConduit.java index 6a87e831..9affd748 100644 --- a/src/main/java/crazypants/enderio/conduit/item/ItemConduit.java +++ b/src/main/java/crazypants/enderio/conduit/item/ItemConduit.java @@ -404,26 +404,18 @@ public class ItemConduit extends AbstractConduit implements IItemConduit { @Override public int getMaximumExtracted(ForgeDirection dir) { - int numUpgrades = getNumSpeedUpgrades(dir); - //int res = (int)Math.pow(4, numUpgrades); - int res = 4 + (numUpgrades * 4); - return res; + ItemStack stack = speedUpgrades.get(dir); + if(stack == null) { + return SpeedUpgrade.BASE_MAX_EXTRACTED; + } + SpeedUpgrade speedUpgrade = EnderIO.itemExtractSpeedUpgrade.getSpeedUpgrade(stack); + return speedUpgrade.getMaximumExtracted(stack.stackSize); } @Override public float getTickTimePerItem(ForgeDirection dir) { - int numUpgrades = getNumSpeedUpgrades(dir); float maxExtract = 10f / getMaximumExtracted(dir); return maxExtract; - - } - - private int getNumSpeedUpgrades(ForgeDirection dir) { - ItemStack stack = speedUpgrades.get(dir); - if(stack == null) { - return 0; - } - return stack.stackSize; } @Override diff --git a/src/main/java/crazypants/enderio/conduit/item/ItemExtractSpeedUpgrade.java b/src/main/java/crazypants/enderio/conduit/item/ItemExtractSpeedUpgrade.java index 5415235b..2b8ab801 100644 --- a/src/main/java/crazypants/enderio/conduit/item/ItemExtractSpeedUpgrade.java +++ b/src/main/java/crazypants/enderio/conduit/item/ItemExtractSpeedUpgrade.java @@ -1,8 +1,13 @@ package crazypants.enderio.conduit.item; +import java.util.List; + import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.util.MathHelper; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -11,7 +16,11 @@ import crazypants.enderio.ModObject; import crazypants.enderio.gui.IResourceTooltipProvider; public class ItemExtractSpeedUpgrade extends Item implements IResourceTooltipProvider { - + + private static final SpeedUpgrade UPGRADES[] = SpeedUpgrade.values(); + + private final IIcon[] icons; + public static ItemExtractSpeedUpgrade create() { ItemExtractSpeedUpgrade result = new ItemExtractSpeedUpgrade(); result.init(); @@ -21,22 +30,52 @@ public class ItemExtractSpeedUpgrade extends Item implements IResourceTooltipPro protected ItemExtractSpeedUpgrade() { setCreativeTab(EnderIOTab.tabEnderIO); setUnlocalizedName(ModObject.itemExtractSpeedUpgrade.unlocalisedName); + setHasSubtypes(true); + setMaxDamage(0); setMaxStackSize(64); + + icons = new IIcon[UPGRADES.length]; } - + protected void init() { GameRegistry.registerItem(this, ModObject.itemExtractSpeedUpgrade.unlocalisedName); } + @Override + public IIcon getIconFromDamage(int damage) { + damage = MathHelper.clamp_int(damage, 0, icons.length - 1); + return icons[damage]; + } + @Override @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister IIconRegister) { - itemIcon = IIconRegister.registerIcon("enderio:extractSpeedUpgrade"); + public void registerIcons(IIconRegister iconRegister) { + for (int i = 0; i < UPGRADES.length; i++) { + icons[i] = iconRegister.registerIcon(UPGRADES[i].iconName); + } + } + + @Override + public String getUnlocalizedName(ItemStack par1ItemStack) { + return getSpeedUpgrade(par1ItemStack).unlocName; + } + + @Override + @SuppressWarnings({ "rawtypes", "unchecked" }) + public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) { + for (int j = 0; j < UPGRADES.length; ++j) { + par3List.add(new ItemStack(par1, 1, j)); + } + } + + public SpeedUpgrade getSpeedUpgrade(ItemStack par1ItemStack) { + int i = MathHelper.clamp_int(par1ItemStack.getItemDamage(), 0, UPGRADES.length - 1); + return UPGRADES[i]; } @Override public String getUnlocalizedNameForTooltip(ItemStack itemStack) { - return getUnlocalizedName(); + return getUnlocalizedName(itemStack); } - + } diff --git a/src/main/java/crazypants/enderio/conduit/item/SpeedUpgrade.java b/src/main/java/crazypants/enderio/conduit/item/SpeedUpgrade.java new file mode 100644 index 00000000..844f9eb0 --- /dev/null +++ b/src/main/java/crazypants/enderio/conduit/item/SpeedUpgrade.java @@ -0,0 +1,32 @@ +package crazypants.enderio.conduit.item; + +public enum SpeedUpgrade { + + UPGRADE("enderio:extractSpeedUpgrade", "item.itemExtractSpeedUpgrade", 15) { + @Override + public int getMaximumExtracted(int stackSize) { + return BASE_MAX_EXTRACTED + Math.min(stackSize, maxStackSize) * 4; + } + }, + DOWNGRADE("enderio:extractSpeedDowngrade", "item.itemExtractSpeedDowngrade", 1) { + @Override + public int getMaximumExtracted(int stackSize) { + return 1; + } + }; + + public static final int BASE_MAX_EXTRACTED = 4; + + public final String iconName; + public final String unlocName; + public final int maxStackSize; + + private SpeedUpgrade(String iconName, String unlocName, int maxStackSize) { + this.iconName = iconName; + this.unlocName = unlocName; + this.maxStackSize = maxStackSize; + } + + public abstract int getMaximumExtracted(int stackSize); + +} From 931be1bd6257ee373085436da79fcc0a1b6a8f4a Mon Sep 17 00:00:00 2001 From: Matthias Mann Date: Sat, 24 Jan 2015 21:45:40 +0100 Subject: [PATCH 18/79] align the progress arrow and output slot with the input slots --- .../enderio/textures/gui/sliceAndSplice.png | Bin 2439 -> 1769 bytes .../slicensplice/ContainerSliceAndSplice.java | 2 +- .../slicensplice/GuiSliceAndSplice.java | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/assets/enderio/textures/gui/sliceAndSplice.png b/resources/assets/enderio/textures/gui/sliceAndSplice.png index 8559f204b505115bf2a32dc9ddb216ed3d60e449..770c359b65c9f8b521583d16b7cec86707aee8b8 100644 GIT binary patch delta 988 zcmZn{e#tvQnUk3zz$e6&fq`M8l* z!&%@FS21s-)EE%(G=XY;+Z}J19Ot6i(^Q|t+%&d7cDZ7 zXn3fg7qxo#4Q1}X+qSg*-hY%=Av8ODEjQG6&77nSUMmyoEi{*wESi1B z`l^$o;hdfZzsXf^tUO(-&Hg#Dd%X@Zw_nTnVxh@gHmj2^uXR?|-(tMb%;e$S@JZlA zkUirjr&pi%pE%;)pyGWx_`see&tyIbDCi1Z^xXN~n~R@umGOZ$HJ`IYY*;k7ir;#3 z8!m5{&v5l(ye!*HOUar&+#;@=6Y5{S>YXlr@Dp1A-@QHA@(G)~tEyN!EdSca-D026 z-!+d(M$9b#4U>~$)&40f7xNSq#pZBp$E%8rz9_ap`e7>CF_Q(C_a+q7z`88J5 zr?Na^OV~Ik^l|-0K7pOPIM&HM|H;@e59598Cu zKrJB^`TwsoWKW!(_Tw9aQn-BEx9|VIiA1b_TVF5Mu|>P#@89W-mNv%KbmtuOuA4i#|BMt&efb za|Wpf<6xch48Jz1uz{^@c+XI_?9g9Ui?7@NU+=o0z;NWy_SouwIUAlcLY(EG&T!rK z>&Bg_+zW24W89H7E4!E*=3pRQ4`p94J5cIho0IqQ7e|6?M>diQD073-kuCvkrx-{e zAj>z1E(~1H!Tap~GmvOl>rP%KWN8R{4cBIni{lu4b~6Mx{;XyXW@pg)Q1i##Ex|%l di3IRz+kVfG`Jo+QJwHGud%F6$taD0e0stQmh}i%D literal 2439 zcmeHI2~$&76h1ErBw=fy7BZ|sp%jaerHF&A1ck7u5ZNh6A1DF^1wuj$i+KfV3n>CJ zfFei+1r;nJD!~eps^F4Vuu<6tv4YeoVzpXU$?L!qoKi^h`l&rjRd5Ps`3o6N|+e85vnwSrUolkhMwu$0lu`n&<5nURh~* z$8lNzM$dv=5#9dr$8x@a|OL z@0{{eix))@;1@`o&;K();55~m=nOr@J3I|Q@9g40wx;gCN(h+(&oDt?@^*nJnjZ@( z(Fr>R?47X!)@N*cwnNOrsVw4sne_2+584$qIVj~Hv}b7WToTOvesfLk%j-_Khf7MD zdNq*LHB2kc-ORWu>z2_LYP3^rV{KShY3(O1J3>5Lx1rlYx|SE&EG?e=fiv4*w-#dl zbn6N6ET23go`0gr`peMkMo;L#DxcGKCAO&f!x#@8xcfy86RSq-16d{1pO_^xurCsR znXQph2=EYE^PjW5+{%tO-=;My>8Rw8PZiMas zU`a2XcSFrLw&FX!G-4_1X080kbc%Ha4omfS(<)bjsy%6zIy1hsG%3}=iB+cRRDZ+f z9?@nc7uco7FtPL-JZjIk(Xii&ZQHP+m@WXB0mscNjs;PHHn?j}MaHj|K$F!Rb}~dy z+bXLd1QtxIOW!$#UWa0in>5)*lzCg398`251~ zX|V%03Foqy*p73h1F&|gb2@aqE1j~?sSLMYp%{ofsu=g9j9E3q#E`NDmtRBJ<8zGm z%nO5Z2vFghyfJA=gF24XHZP3rq;0@j@LN+Bda~*UTnu9~Lxq}(xt2!~Ur^z8&?M1* z^6bkd(oSW9y)|b5H-+u$PzOj(m|H(6U+|}*^EHSp^~DNBc4buPq(2o?AEm~dOSFsc zYP(nGL&GZwXB_o8X2cG$($mrxWbzD>7B-D#kXPNzMkx55h+t@&F$7+RhuF|c^+>a_#p`D$s zwpc61#mX^XtRC~j_FyDJU497yyd>pH9n|K zBJ0lSMCmU-c)8Wb4*Ji#dR37o_uDjwbC*GDQaK3=kEmOdnN32;;X0reA31Mij_?}o zXlS5~6~|=*X=X12^~EmW=kIMp=Jo)E1ut`?XdFAdM0Viuh4~15MY7#t>%Wpy3T%&5jQFL8@u?#OGVGC1+{{apbEy}JprR!iq zqY5l>%`tWdcO4n6zfE6#;Jd;%E}X?!ZviPU;@VSZ113zc*+^eHZ%amDo~B}BLxbH;QXh8H0lhCeK!piDdxZve8e-#fN`Kdsiqsx)t2etf2fvP;>v4uZ~FLc<^f zf_KochE)_!un9@lpo{Qs?}1}quYZTs*O7wzEBPMIks(DV4=w&>KAwIaP3zE{e*qD< BT5kXV diff --git a/src/main/java/crazypants/enderio/machine/slicensplice/ContainerSliceAndSplice.java b/src/main/java/crazypants/enderio/machine/slicensplice/ContainerSliceAndSplice.java index fd0c0ccb..0cfbc508 100644 --- a/src/main/java/crazypants/enderio/machine/slicensplice/ContainerSliceAndSplice.java +++ b/src/main/java/crazypants/enderio/machine/slicensplice/ContainerSliceAndSplice.java @@ -21,7 +21,7 @@ public class ContainerSliceAndSplice extends AbstractMachineContainer { new Point(72,16) }; - public static final Point OUTPUT_SLOT = new Point(134, 48); + public static final Point OUTPUT_SLOT = new Point(134, 49); public ContainerSliceAndSplice(InventoryPlayer playerInv, AbstractMachineEntity te) { super(playerInv, te); diff --git a/src/main/java/crazypants/enderio/machine/slicensplice/GuiSliceAndSplice.java b/src/main/java/crazypants/enderio/machine/slicensplice/GuiSliceAndSplice.java index ecfdd239..4da189bd 100644 --- a/src/main/java/crazypants/enderio/machine/slicensplice/GuiSliceAndSplice.java +++ b/src/main/java/crazypants/enderio/machine/slicensplice/GuiSliceAndSplice.java @@ -12,7 +12,7 @@ public class GuiSliceAndSplice extends GuiPoweredMachineBase public GuiSliceAndSplice(InventoryPlayer par1InventoryPlayer, TileSliceAndSplice te) { super(te, new ContainerSliceAndSplice(par1InventoryPlayer, te)); - addProgressTooltip(101, 46, 24, 16); + addProgressTooltip(103, 49, 24, 16); } /** @@ -30,7 +30,7 @@ public class GuiSliceAndSplice extends GuiPoweredMachineBase if(shouldRenderProgress()) { int scaled = getTileEntity().getProgressScaled(24); - drawTexturedModalRect(k + 101, l + 46, 176, 14, scaled + 1, 16); + drawTexturedModalRect(k + 103, l + 49, 176, 14, scaled + 1, 16); } super.drawGuiContainerBackgroundLayer(par1, par2, par3); From 8db386c62685584b0525b9819adc0a1386e37496 Mon Sep 17 00:00:00 2001 From: Matthias Mann Date: Sun, 25 Jan 2015 04:10:06 +0100 Subject: [PATCH 19/79] #1768 improve double chest support for existing item filter's snapshot/merge operation --- .../conduit/gui/item/PacketExistingItemFilterSnapshot.java | 1 + .../crazypants/enderio/conduit/item/NetworkedInventory.java | 3 +-- .../enderio/conduit/item/filter/ItemExistingItemFilter.java | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/crazypants/enderio/conduit/gui/item/PacketExistingItemFilterSnapshot.java b/src/main/java/crazypants/enderio/conduit/gui/item/PacketExistingItemFilterSnapshot.java index 834eb77d..4020d1a0 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/item/PacketExistingItemFilterSnapshot.java +++ b/src/main/java/crazypants/enderio/conduit/gui/item/PacketExistingItemFilterSnapshot.java @@ -76,6 +76,7 @@ public class PacketExistingItemFilterSnapshot extends AbstractConduitPacket Date: Sun, 25 Jan 2015 16:09:33 +0300 Subject: [PATCH 20/79] Localized Existing Item Filter buttons --- resources/assets/enderio/lang/en_US.lang | 4 ++++ resources/assets/enderio/lang/ru_RU.lang | 16 ++++++++++------ .../conduit/gui/item/ExistingItemFilterGui.java | 8 ++++---- 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index cdd68179..731cdd69 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -62,6 +62,10 @@ enderio.itemConduitFilterUpgrade.clearConfigMethod=Place in crafting grid to cle enderio.itemConduitFilterUpgrade.clearConfigWarning=This will clear all stored filter settings! item.itemExistingItemFilter.name=Existing Item Filter +enderio.item.itemExistingItemFilter.button.clear=Clear +enderio.item.itemExistingItemFilter.button.merge=Merge +enderio.item.itemExistingItemFilter.button.show=Show +enderio.item.itemExistingItemFilter.button.snap=Snapshot item.itemExistingItemFilter.tooltip.basic.line1=Upgrade for item conduits item.itemExistingItemFilter.tooltip.detailed.line1=Selects only items already item.itemExistingItemFilter.tooltip.detailed.line2=in the inventory diff --git a/resources/assets/enderio/lang/ru_RU.lang b/resources/assets/enderio/lang/ru_RU.lang index 322dc8a6..62d6f6dc 100644 --- a/resources/assets/enderio/lang/ru_RU.lang +++ b/resources/assets/enderio/lang/ru_RU.lang @@ -62,6 +62,10 @@ enderio.itemConduitFilterUpgrade.clearConfigMethod=Положите в сетк enderio.itemConduitFilterUpgrade.clearConfigWarning=Это очистит все сохранённые настройки фильтра! item.itemExistingItemFilter.name=Существующий предметный фильтр +enderio.item.itemExistingItemFilter.button.clear=Очистить +enderio.item.itemExistingItemFilter.button.merge=Соединить +enderio.item.itemExistingItemFilter.button.show=Показать +enderio.item.itemExistingItemFilter.button.snap=Снимок item.itemExistingItemFilter.tooltip.basic.line1=Улучшение для предметных труб item.itemExistingItemFilter.tooltip.detailed.line1=Выбирает предметы только item.itemExistingItemFilter.tooltip.detailed.line2=в инвентаре @@ -351,7 +355,7 @@ tile.blockVat.tooltip.detailed.line1=Используется для варки tile.blockEnchanter.name=Зачарователь tile.blockEnchanter.tooltip.detailed.line1=Использует опыт, чтобы объединять tile.blockEnchanter.tooltip.detailed.line2=предметы с книгой и пером для создания -tile.blockEnchanter.tooltip.detailed.line2=зачарованных книг +tile.blockEnchanter.tooltip.detailed.line3=зачарованных книг tile.blockCombustionGenerator.name=Генератор внутреннего сгорания tile.blockCombustionGenerator.tooltip.detailed.line1=Сжигает жидкое топливо для производства энергии @@ -821,20 +825,20 @@ enderio.gui.conduit.ioMode.disabled=Отключен enderio.gui.conduit.ioMode.notSet=По-умолчанию tile.blockConduitBundle.name=Коннектор для труб -enderio.gui.conduit.item.insertionFilter=Фильтр на помещение -enderio.gui.conduit.item.extractionFilter=Фильтр на извлечение +enderio.gui.conduit.item.insertionFilter=Помещение +enderio.gui.conduit.item.extractionFilter=Извлечение enderio.gui.conduit.item.sigCol=Цвет сигнала enderio.gui.conduit.item.channel=Канал enderio.gui.conduit.item.ignoreMetaData=Игнорировать метаданные enderio.gui.conduit.item.matchMetaData=Соблюдать метаданные enderio.gui.conduit.item.whitelist=Белый список enderio.gui.conduit.item.blacklist=Чёрный список -enderio.gui.conduit.item.stickyEnabled=Включён "липкий" режим|Выбранные предметы будут|отправляться только на|"липкие" выходы. +enderio.gui.conduit.item.stickyEnabled=Включён "липкий" режим|Выбранные предметы будут|отправляться только на этот|или другие "липкие" выходы. enderio.gui.conduit.item.stickyDisbaled="Липкий" режим выключен enderio.gui.conduit.item.ignoreNBT=Игнорировать NBT enderio.gui.conduit.item.matchNBT=Соблюдать NBT -enderio.gui.conduit.item.oreDicEnabled=Использовать Ore Dictionary -enderio.gui.conduit.item.oreDicDisabled=Игнорировать Ore Dictionary +enderio.gui.conduit.item.oreDicEnabled=Использовать словарь руд +enderio.gui.conduit.item.oreDicDisabled=Игнорировать словарь руд enderio.gui.conduit.item.selfFeedEnabled=Авто-подача активна enderio.gui.conduit.item.selfFeedDisabled=Авто-подача отключена enderio.gui.conduit.item.roundRobinEnabled=Цикл включён diff --git a/src/main/java/crazypants/enderio/conduit/gui/item/ExistingItemFilterGui.java b/src/main/java/crazypants/enderio/conduit/gui/item/ExistingItemFilterGui.java index 062abc8c..c7c84a08 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/item/ExistingItemFilterGui.java +++ b/src/main/java/crazypants/enderio/conduit/gui/item/ExistingItemFilterGui.java @@ -102,10 +102,10 @@ public class ExistingItemFilterGui implements IItemFilterGui { useOreDictB.setUnselectedToolTip(Lang.localize("gui.conduit.item.oreDicDisabled")); useOreDictB.setPaintSelectedBorder(false); - snapshotB = new GuiButton(ID_SNAPSHOT, 0, 0, 60, 20, "Snapshot"); - mergeB = new GuiButton(ID_MERGE, 0, 0, 40, 20, "Merge"); - clearB = new GuiButton(ID_CLEAR, 0, 0, 60, 20, "Clear"); - showB = new GuiButton(ID_SHOW, 0, 0, 40, 20, "Show"); + snapshotB = new GuiButton(ID_SNAPSHOT, 0, 0, 60, 20, Lang.localize("item.itemExistingItemFilter.button.snap")); + mergeB = new GuiButton(ID_MERGE, 0, 0, 40, 20, Lang.localize("item.itemExistingItemFilter.button.merge")); + clearB = new GuiButton(ID_CLEAR, 0, 0, 60, 20, Lang.localize("item.itemExistingItemFilter.button.clear")); + showB = new GuiButton(ID_SHOW, 0, 0, 40, 20, Lang.localize("item.itemExistingItemFilter.button.show")); snapshotOverlay = new SnapshotOverlay(); gui.addOverlay(snapshotOverlay); From 1df6f408bdb864181e64de38d675712b473a6cd8 Mon Sep 17 00:00:00 2001 From: Adaptivity Date: Sun, 25 Jan 2015 16:28:32 +0300 Subject: [PATCH 21/79] As @MatthiasMann requested --- resources/assets/enderio/lang/en_US.lang | 8 ++++---- resources/assets/enderio/lang/ru_RU.lang | 8 ++++---- .../enderio/conduit/gui/item/ExistingItemFilterGui.java | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index 731cdd69..7f68d73d 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -62,10 +62,6 @@ enderio.itemConduitFilterUpgrade.clearConfigMethod=Place in crafting grid to cle enderio.itemConduitFilterUpgrade.clearConfigWarning=This will clear all stored filter settings! item.itemExistingItemFilter.name=Existing Item Filter -enderio.item.itemExistingItemFilter.button.clear=Clear -enderio.item.itemExistingItemFilter.button.merge=Merge -enderio.item.itemExistingItemFilter.button.show=Show -enderio.item.itemExistingItemFilter.button.snap=Snapshot item.itemExistingItemFilter.tooltip.basic.line1=Upgrade for item conduits item.itemExistingItemFilter.tooltip.detailed.line1=Selects only items already item.itemExistingItemFilter.tooltip.detailed.line2=in the inventory @@ -825,6 +821,10 @@ enderio.gui.conduit.ioMode.disabled=Disabled enderio.gui.conduit.ioMode.notSet=Default tile.blockConduitBundle.name=Conduit Connector +enderio.gui.conduit.button.clear=Clear +enderio.gui.conduit.button.merge=Merge +enderio.gui.conduit.button.show=Show +enderio.gui.conduit.button.snap=Snapshot enderio.gui.conduit.item.insertionFilter=Insert enderio.gui.conduit.item.extractionFilter=Extract enderio.gui.conduit.item.sigCol=Signal Color diff --git a/resources/assets/enderio/lang/ru_RU.lang b/resources/assets/enderio/lang/ru_RU.lang index 62d6f6dc..705eddc9 100644 --- a/resources/assets/enderio/lang/ru_RU.lang +++ b/resources/assets/enderio/lang/ru_RU.lang @@ -62,10 +62,6 @@ enderio.itemConduitFilterUpgrade.clearConfigMethod=Положите в сетк enderio.itemConduitFilterUpgrade.clearConfigWarning=Это очистит все сохранённые настройки фильтра! item.itemExistingItemFilter.name=Существующий предметный фильтр -enderio.item.itemExistingItemFilter.button.clear=Очистить -enderio.item.itemExistingItemFilter.button.merge=Соединить -enderio.item.itemExistingItemFilter.button.show=Показать -enderio.item.itemExistingItemFilter.button.snap=Снимок item.itemExistingItemFilter.tooltip.basic.line1=Улучшение для предметных труб item.itemExistingItemFilter.tooltip.detailed.line1=Выбирает предметы только item.itemExistingItemFilter.tooltip.detailed.line2=в инвентаре @@ -825,6 +821,10 @@ enderio.gui.conduit.ioMode.disabled=Отключен enderio.gui.conduit.ioMode.notSet=По-умолчанию tile.blockConduitBundle.name=Коннектор для труб +enderio.gui.conduit.button.clear=Очистить +enderio.gui.conduit.button.merge=Соединить +enderio.gui.conduit.button.show=Показать +enderio.gui.conduit.button.snap=Снимок enderio.gui.conduit.item.insertionFilter=Помещение enderio.gui.conduit.item.extractionFilter=Извлечение enderio.gui.conduit.item.sigCol=Цвет сигнала diff --git a/src/main/java/crazypants/enderio/conduit/gui/item/ExistingItemFilterGui.java b/src/main/java/crazypants/enderio/conduit/gui/item/ExistingItemFilterGui.java index c7c84a08..278ad914 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/item/ExistingItemFilterGui.java +++ b/src/main/java/crazypants/enderio/conduit/gui/item/ExistingItemFilterGui.java @@ -102,10 +102,10 @@ public class ExistingItemFilterGui implements IItemFilterGui { useOreDictB.setUnselectedToolTip(Lang.localize("gui.conduit.item.oreDicDisabled")); useOreDictB.setPaintSelectedBorder(false); - snapshotB = new GuiButton(ID_SNAPSHOT, 0, 0, 60, 20, Lang.localize("item.itemExistingItemFilter.button.snap")); - mergeB = new GuiButton(ID_MERGE, 0, 0, 40, 20, Lang.localize("item.itemExistingItemFilter.button.merge")); - clearB = new GuiButton(ID_CLEAR, 0, 0, 60, 20, Lang.localize("item.itemExistingItemFilter.button.clear")); - showB = new GuiButton(ID_SHOW, 0, 0, 40, 20, Lang.localize("item.itemExistingItemFilter.button.show")); + snapshotB = new GuiButton(ID_SNAPSHOT, 0, 0, 60, 20, Lang.localize("gui.conduit.button.snap")); + mergeB = new GuiButton(ID_MERGE, 0, 0, 40, 20, Lang.localize("gui.conduit.button.merge")); + clearB = new GuiButton(ID_CLEAR, 0, 0, 60, 20, Lang.localize("gui.conduit.button.clear")); + showB = new GuiButton(ID_SHOW, 0, 0, 40, 20, Lang.localize("gui.conduit.button.show")); snapshotOverlay = new SnapshotOverlay(); gui.addOverlay(snapshotOverlay); From dbf38c7a47fb69276dc827ba3a6409d5579f255b Mon Sep 17 00:00:00 2001 From: Adaptivity Date: Mon, 26 Jan 2015 17:08:52 +0300 Subject: [PATCH 22/79] Localize GUIs --- resources/assets/enderio/lang/cs_CZ.lang | 6 ++-- resources/assets/enderio/lang/de_DE.lang | 4 +-- resources/assets/enderio/lang/en_US.lang | 35 +++++++++++++++--- resources/assets/enderio/lang/fr_FR.lang | 4 +-- resources/assets/enderio/lang/ko_KR.lang | 6 ++-- resources/assets/enderio/lang/pl_PL.lang | 4 +-- resources/assets/enderio/lang/pt_BR.lang | 6 ++-- resources/assets/enderio/lang/ru_RU.lang | 35 +++++++++++++++--- resources/assets/enderio/lang/zh_CN.lang | 4 +-- resources/assets/enderio/lang/zh_TW.lang | 4 +-- .../enderio/conduit/gui/LiquidSettings.java | 2 +- .../crazypants/enderio/config/Config.java | 36 +++++++++---------- .../enderio/machine/crafter/GuiCrafter.java | 7 ++-- .../combustion/GuiCombustionGenerator.java | 4 +-- .../zombie/BlockZombieGenerator.java | 3 +- .../generator/zombie/GuiZombieGenerator.java | 2 +- .../enderio/machine/gui/GuiMachineBase.java | 4 ++- .../machine/gui/GuiPoweredMachineBase.java | 3 +- .../machine/hypercube/TileHyperCube.java | 4 +-- .../machine/spawner/GuiPoweredSpawner.java | 5 +-- .../machine/transceiver/BlockTransceiver.java | 2 +- .../machine/transceiver/gui/ChannelTab.java | 6 ++-- .../machine/transceiver/gui/FilterTab.java | 5 +-- .../machine/transceiver/gui/GeneralTab.java | 17 ++++----- .../machine/xp/GuiExperianceObelisk.java | 13 +++---- 25 files changed, 140 insertions(+), 81 deletions(-) diff --git a/resources/assets/enderio/lang/cs_CZ.lang b/resources/assets/enderio/lang/cs_CZ.lang index 1f10eb8c..05f12700 100644 --- a/resources/assets/enderio/lang/cs_CZ.lang +++ b/resources/assets/enderio/lang/cs_CZ.lang @@ -269,7 +269,7 @@ enderio.trans.power=Energie enderio.trans.item=Předmět enderio.trans.fluid=Tekutina -enderio.trans.recieving=Přijímám +enderio.trans.receiving=Přijímám enderio.trans.sending=Odesílám tile.blockPowerMonitor.name=Monitor energie @@ -587,8 +587,8 @@ enderio.darksteel.upgrade.nightVision.disabled=Noční vidění zakázáno enderio.gui.enabled=Povoleno enderio.gui.disabled=Zakázáno enderio.gui.send=Posílat -enderio.gui.recieve=Přijímat -enderio.gui.sendRecieve=Posílat & Přijímat +enderio.gui.receive=Přijímat +enderio.gui.sendReceive=Posílat & Přijímat //Redstone controls enderio.gui.tooltip.redstoneControlMode=Ruditový mód diff --git a/resources/assets/enderio/lang/de_DE.lang b/resources/assets/enderio/lang/de_DE.lang index 33bd812c..7745e140 100644 --- a/resources/assets/enderio/lang/de_DE.lang +++ b/resources/assets/enderio/lang/de_DE.lang @@ -432,8 +432,8 @@ enderio.darksteel.upgrade.nightVision.disabled=Nachtsicht Inaktiv enderio.gui.enabled=Aktiviert enderio.gui.disabled=Deaktiviert enderio.gui.send=Senden -enderio.gui.recieve=Empfangen -enderio.gui.sendRecieve=Senden & Empfangen +enderio.gui.receive=Empfangen +enderio.gui.sendReceive=Senden & Empfangen //Redstone controls enderio.gui.tooltip.redstoneControlMode=Redstone-Modus diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index 7f68d73d..8f31c093 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -2,6 +2,7 @@ //Power enderio.power.rf=RF +enderio.power.tmb=t/mB enderio.power.tick=/t enderio.power.maxOutput=Max Output enderio.power.generates=Generates @@ -334,7 +335,7 @@ enderio.trans.item=Item enderio.trans.fluid=Fluid enderio.trans.rail=Rail -enderio.trans.recieving=Recieving +enderio.trans.receiving=Receiving enderio.trans.sending=Sending tile.blockPowerMonitor.name=Power Monitor @@ -414,6 +415,7 @@ tile.blockVacuumChest.tooltip.detailed.line2=into its inventory tile.blockPoweredSpawner.name=Powered Spawner tile.blockPoweredSpawner.tooltip.empty=Empty +enderio.tile.blockPoweredSpawner.tooltip.none=None tile.blockPoweredSpawner.empty.tooltip.detailed.line1=Combine with a broken tile.blockPoweredSpawner.empty.tooltip.detailed.line2=spawner in an anvil tile.blockPoweredSpawner.tooltip.detailed.line1=Supply with power to @@ -689,12 +691,14 @@ enderio.darksteel.upgrade.solar_two.tooltip.detailed.line1=Generates power from enderio.gui.simple.in=Max In: enderio.gui.simple.out=Max Out: -enderio.gui.enabled=Enabled +enderio.gui.available=Available enderio.gui.disabled=Disabled -enderio.gui.send=Send -enderio.gui.recieve=Receive -enderio.gui.sendRecieve=Send & Receive +enderio.gui.enabled=Enabled +enderio.gui.max=Max: enderio.gui.progress=Progress {0,number}% +enderio.gui.receive=Receive +enderio.gui.send=Send +enderio.gui.sendReceive=Send & Receive //Redstone controls enderio.gui.tooltip.redstoneControlMode=Redstone Mode @@ -703,6 +707,17 @@ enderio.gui.tooltip.redstoneControlMode.on=Active with signal enderio.gui.tooltip.redstoneControlMode.off=Active without signal enderio.gui.tooltip.redstoneControlMode.never=Never active +enderio.gui.machine.button.storelevel=Store 1 +enderio.gui.machine.tooltip.storelevel=level of player XP +enderio.gui.machine.button.storelevels=Store 10 +enderio.gui.machine.tooltip.storelevels=levels of player XP +enderio.gui.machine.button.storeall=Store all +enderio.gui.machine.tooltip.storeall=player XP +enderio.gui.machine.button.retrievelevel=Retrieve 1 +enderio.gui.machine.tooltip.retrievelevel=player XP level +enderio.gui.machine.button.retrievelevels=Retrieve 10 +enderio.gui.machine.tooltip.retrievelevels=player XP levels +enderio.gui.machine.button.retrieveall=Retrieve all enderio.gui.machine.ioMode.overlay.tooltip=Configure IO enderio.gui.machine.ioMode.none=None enderio.gui.machine.ioMode.pull=Pull @@ -711,6 +726,16 @@ enderio.gui.machine.ioMode.disabled=Disabled enderio.gui.machine.ioMode.pullPush=Push / Pull enderio.gui.machine.ioMode.pullPush.colored=%sPush %s/ %sPull enderio.gui.machine.ioMode=Mode: %s +enderio.gui.machine.poweredspawner.capture=Capture +enderio.gui.machine.poweredspawner.spawn=Spawn +enderio.gui.machine.receivefilter=Receive Filter +enderio.gui.machine.sendfilter=Send Filter +enderio.gui.machine.sendReceivebuffer=Send/Receive Buffer +enderio.gui.machine.localbuffer=Local Buffer +enderio.gui.machine.upkeep=Upkeep: +enderio.gui.machine.bufferingstacks=Buffering item stacks +enderio.gui.machine.bufferingsingle=Buffering single items +enderio.gui.machine.percraft=Per Craft enderio.gui.machine.side=Side: %s enderio.gui.machine.side.north=North enderio.gui.machine.side.south=South diff --git a/resources/assets/enderio/lang/fr_FR.lang b/resources/assets/enderio/lang/fr_FR.lang index 452239fe..347ea3e7 100644 --- a/resources/assets/enderio/lang/fr_FR.lang +++ b/resources/assets/enderio/lang/fr_FR.lang @@ -117,8 +117,8 @@ enderio.itemEnderface.noSync=Le Masque d'Ender n'est pas synchronisé avec l'End enderio.gui.enabled=Activé enderio.gui.disabled=Désactivé enderio.gui.send=Envoyer -enderio.gui.recieve=Recevoir -enderio.gui.sendRecieve=Envoyer & Recevoir +enderio.gui.receive=Recevoir +enderio.gui.sendReceive=Envoyer & Recevoir //Redstone controls enderio.gui.tooltip.redstoneControlMode=Mode Redstone diff --git a/resources/assets/enderio/lang/ko_KR.lang b/resources/assets/enderio/lang/ko_KR.lang index 3413f989..f2d968fd 100644 --- a/resources/assets/enderio/lang/ko_KR.lang +++ b/resources/assets/enderio/lang/ko_KR.lang @@ -300,7 +300,7 @@ enderio.trans.power=전력 enderio.trans.item=아이템 enderio.trans.fluid=유체 -enderio.trans.recieving=수신 +enderio.trans.receiving=수신 enderio.trans.sending=송신 tile.blockPowerMonitor.name=전력 모니터 @@ -625,8 +625,8 @@ enderio.darksteel.upgrade.nightVision.disabled=Night Vision Disabled enderio.gui.enabled=활성화 enderio.gui.disabled=비활성화 enderio.gui.send=발신 -enderio.gui.recieve=수신 -enderio.gui.sendRecieve=수신 & 발신 +enderio.gui.receive=수신 +enderio.gui.sendReceive=수신 & 발신 //Redstone controls enderio.gui.tooltip.redstoneControlMode=레드스톤 모드 diff --git a/resources/assets/enderio/lang/pl_PL.lang b/resources/assets/enderio/lang/pl_PL.lang index cdf8c466..8e5870c3 100644 --- a/resources/assets/enderio/lang/pl_PL.lang +++ b/resources/assets/enderio/lang/pl_PL.lang @@ -140,8 +140,8 @@ enderio.color.white=Biały enderio.gui.enabled=Włączony enderio.gui.disabled=Wyłączony enderio.gui.send=Wysyłaj -enderio.gui.recieve=Odbieraj -enderio.gui.sendRecieve=Wysyłaj i odbieraj +enderio.gui.receive=Odbieraj +enderio.gui.sendReceive=Wysyłaj i odbieraj //Redstone controls enderio.gui.tooltip.redstoneControlMode=Tryb włącznika diff --git a/resources/assets/enderio/lang/pt_BR.lang b/resources/assets/enderio/lang/pt_BR.lang index 8ff1692a..00a692c9 100644 --- a/resources/assets/enderio/lang/pt_BR.lang +++ b/resources/assets/enderio/lang/pt_BR.lang @@ -331,7 +331,7 @@ enderio.trans.item=Item enderio.trans.fluid=Fluido enderio.trans.rail=Trilho -enderio.trans.recieving=Recebendo +enderio.trans.receiving=Recebendo enderio.trans.sending=Enviando tile.blockPowerMonitor.name=Monitor de Força @@ -672,8 +672,8 @@ enderio.gui.simple.out=Saída Máxima: enderio.gui.enabled=Ativado enderio.gui.disabled=Desativado enderio.gui.send=Enviar -enderio.gui.recieve=Receber -enderio.gui.sendRecieve=Enviar & Receber +enderio.gui.receive=Receber +enderio.gui.sendReceive=Enviar & Receber //Redstone controls enderio.gui.tooltip.redstoneControlMode=Modo de Redstone diff --git a/resources/assets/enderio/lang/ru_RU.lang b/resources/assets/enderio/lang/ru_RU.lang index 705eddc9..0a1f53be 100644 --- a/resources/assets/enderio/lang/ru_RU.lang +++ b/resources/assets/enderio/lang/ru_RU.lang @@ -2,6 +2,7 @@ //Power enderio.power.rf=RF +enderio.power.tmb=тик/мВ enderio.power.tick=/тик enderio.power.maxOutput=Макс. выход enderio.power.generates=Генерирует @@ -334,7 +335,7 @@ enderio.trans.item=Предмет enderio.trans.fluid=Жидкость enderio.trans.rail=Рельс -enderio.trans.recieving=Получение +enderio.trans.receiving=Получение enderio.trans.sending=Отправка tile.blockPowerMonitor.name=Индикатор мощности @@ -414,6 +415,7 @@ tile.blockVacuumChest.tooltip.detailed.line2=в свой инвентарь tile.blockPoweredSpawner.name=Электрический спаунер tile.blockPoweredSpawner.tooltip.empty=Пустой +enderio.tile.blockPoweredSpawner.tooltip.none=Нет tile.blockPoweredSpawner.empty.tooltip.detailed.line1=Объедините со сломанным tile.blockPoweredSpawner.empty.tooltip.detailed.line2=спаунером в наковальне tile.blockPoweredSpawner.tooltip.detailed.line1=Подайте питание, чтобы @@ -689,12 +691,14 @@ enderio.darksteel.upgrade.solar_two.tooltip.detailed.line1==Генерирует enderio.gui.simple.in=Макс. вход: enderio.gui.simple.out=Макс. выход: -enderio.gui.enabled=Включено +enderio.gui.available=Доступно enderio.gui.disabled=Выключено -enderio.gui.send=Отправлять -enderio.gui.recieve=Получать -enderio.gui.sendRecieve=Отправлять и получать +enderio.gui.enabled=Включено +enderio.gui.max=Макс: enderio.gui.progress=Прогресс {0,number}% +enderio.gui.receive=Получать +enderio.gui.send=Отправлять +enderio.gui.sendReceive=Отправлять и получать //Redstone controls enderio.gui.tooltip.redstoneControlMode=Режим красного камня @@ -703,6 +707,17 @@ enderio.gui.tooltip.redstoneControlMode.on=Активен по сигналу enderio.gui.tooltip.redstoneControlMode.off=Активен без сигнала enderio.gui.tooltip.redstoneControlMode.never=Всегда выключен +enderio.gui.machine.button.storelevel=Отдать 1 +enderio.gui.machine.tooltip.storelevel=уровень опыта игрока +enderio.gui.machine.button.storelevels=Отдать 10 +enderio.gui.machine.tooltip.storelevels=уровней опыта игрока +enderio.gui.machine.button.storeall=Отдать весь +enderio.gui.machine.tooltip.storeall=опыт игрока +enderio.gui.machine.button.retrievelevel=Забрать 1 +enderio.gui.machine.tooltip.retrievelevel=уровень опыта игрока +enderio.gui.machine.button.retrievelevels=Забрать 10 +enderio.gui.machine.tooltip.retrievelevels=уровней опыта игрока +enderio.gui.machine.button.retrieveall=Забрать весь опыт enderio.gui.machine.ioMode.overlay.tooltip=Настроить вход/выход enderio.gui.machine.ioMode.none=Нет enderio.gui.machine.ioMode.pull=Тянуть @@ -711,6 +726,16 @@ enderio.gui.machine.ioMode.disabled=Отключен enderio.gui.machine.ioMode.pullPush=Толкать/Тянуть enderio.gui.machine.ioMode.pullPush.colored=%sТолкать %s/ %sТянуть enderio.gui.machine.ioMode=Режим: %s +enderio.gui.machine.poweredspawner.capture=Захватить +enderio.gui.machine.poweredspawner.spawn=Призывать +enderio.gui.machine.receivefilter=Фильтр приёма +enderio.gui.machine.sendfilter=Фильтр отправки +enderio.gui.machine.sendReceivebuffer=Буфер отправки/приёма +enderio.gui.machine.localbuffer=Местный буфер +enderio.gui.machine.upkeep=Upkeep: +enderio.gui.machine.bufferingstacks=Буферизация стаков +enderio.gui.machine.bufferingsingle=Буферизация одиночных предметов +enderio.gui.machine.percraft=за создание enderio.gui.machine.side=Сторона: %s enderio.gui.machine.side.north=Север enderio.gui.machine.side.south=Юг diff --git a/resources/assets/enderio/lang/zh_CN.lang b/resources/assets/enderio/lang/zh_CN.lang index 30363e9a..6ea0dc99 100644 --- a/resources/assets/enderio/lang/zh_CN.lang +++ b/resources/assets/enderio/lang/zh_CN.lang @@ -624,8 +624,8 @@ enderio.enderio.gui.disabled=禁用 enderio.gui.enabled=启用 enderio.gui.disabled=禁用 enderio.gui.send=发送 -enderio.gui.recieve=接收 -enderio.gui.sendRecieve=发送和接收 +enderio.gui.receive=接收 +enderio.gui.sendReceive=发送和接收 //Redstone controls enderio.gui.tooltip.redstoneControlMode=红石模式 diff --git a/resources/assets/enderio/lang/zh_TW.lang b/resources/assets/enderio/lang/zh_TW.lang index 2307a540..3259511d 100644 --- a/resources/assets/enderio/lang/zh_TW.lang +++ b/resources/assets/enderio/lang/zh_TW.lang @@ -644,8 +644,8 @@ enderio.darksteel.upgrade.solar_two.tooltip.detailed.line1=太陽能發電產生 enderio.gui.enabled=啟用 enderio.gui.disabled=停用 enderio.gui.send=發送 -enderio.gui.recieve=接收 -enderio.gui.sendRecieve=發送和接收 +enderio.gui.receive=接收 +enderio.gui.sendReceive=發送和接收 //Redstone controls enderio.gui.tooltip.redstoneControlMode=紅石模式 diff --git a/src/main/java/crazypants/enderio/conduit/gui/LiquidSettings.java b/src/main/java/crazypants/enderio/conduit/gui/LiquidSettings.java index 773eda83..d2c1a6f7 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/LiquidSettings.java +++ b/src/main/java/crazypants/enderio/conduit/gui/LiquidSettings.java @@ -263,7 +263,7 @@ public class LiquidSettings extends BaseSettingsPanel { if(isEnder && isFilterVisible()) { if(conduit.getConnectionMode(gui.getDir()) == ConnectionMode.IN_OUT) { - String inOutStr = inOutShowIn ? "Extract" : "Insert"; + String inOutStr = inOutShowIn ? Lang.localize("gui.conduit.ioMode.input") : Lang.localize("gui.conduit.ioMode.output"); int x = gui.getGuiLeft() + gui.getXSize() - 20 - 5 - gui.getFontRenderer().getStringWidth(inOutStr); int y = top; gui.getFontRenderer().drawString(inOutStr, x, y, ColorUtil.getRGB(Color.DARK_GRAY)); diff --git a/src/main/java/crazypants/enderio/config/Config.java b/src/main/java/crazypants/enderio/config/Config.java index a74f1307..a1832193 100644 --- a/src/main/java/crazypants/enderio/config/Config.java +++ b/src/main/java/crazypants/enderio/config/Config.java @@ -573,22 +573,22 @@ public final class Config { "The range of the wireless charger").getInt(wirelessChargerRange); fluidConduitExtractRate = config.get(sectionEfficiency.name, "fluidConduitExtractRate", fluidConduitExtractRate, - "Number of millibuckects per tick extracted by a fluid conduits auto extracting").getInt(fluidConduitExtractRate); + "Number of millibuckets per tick extracted by a fluid conduits auto extracting").getInt(fluidConduitExtractRate); fluidConduitMaxIoRate = config.get(sectionEfficiency.name, "fluidConduitMaxIoRate", fluidConduitMaxIoRate, - "Number of millibuckects per tick that can pass through a single connection to a fluid conduit.").getInt(fluidConduitMaxIoRate); + "Number of millibuckets per tick that can pass through a single connection to a fluid conduit.").getInt(fluidConduitMaxIoRate); advancedFluidConduitExtractRate = config.get(sectionEfficiency.name, "advancedFluidConduitExtractRate", advancedFluidConduitExtractRate, - "Number of millibuckects per tick extracted by pressurised fluid conduits auto extracting").getInt(advancedFluidConduitExtractRate); + "Number of millibuckets per tick extracted by pressurised fluid conduits auto extracting").getInt(advancedFluidConduitExtractRate); advancedFluidConduitMaxIoRate = config.get(sectionEfficiency.name, "advancedFluidConduitMaxIoRate", advancedFluidConduitMaxIoRate, - "Number of millibuckects per tick that can pass through a single connection to an pressurised fluid conduit.").getInt(advancedFluidConduitMaxIoRate); + "Number of millibuckets per tick that can pass through a single connection to an pressurised fluid conduit.").getInt(advancedFluidConduitMaxIoRate); enderFluidConduitExtractRate = config.get(sectionEfficiency.name, "enderFluidConduitExtractRate", enderFluidConduitExtractRate, - "Number of millibuckects per tick extracted by ender fluid conduits auto extracting").getInt(enderFluidConduitExtractRate); + "Number of millibuckets per tick extracted by ender fluid conduits auto extracting").getInt(enderFluidConduitExtractRate); enderFluidConduitMaxIoRate = config.get(sectionEfficiency.name, "enderFluidConduitMaxIoRate", enderFluidConduitMaxIoRate, - "Number of millibuckects per tick that can pass through a single connection to an ender fluid conduit.").getInt(enderFluidConduitMaxIoRate); + "Number of millibuckets per tick that can pass through a single connection to an ender fluid conduit.").getInt(enderFluidConduitMaxIoRate); gasConduitExtractRate = config.get(sectionEfficiency.name, "gasConduitExtractRate", gasConduitExtractRate, "Amount of gas per tick extracted by gas conduits auto extracting").getInt(gasConduitExtractRate); @@ -604,7 +604,7 @@ public final class Config { transceiverUpkeepCostRF = config.get(sectionPower.name, "transceiverUpkeepCostRF", transceiverUpkeepCostRF, "Number of RF/t required to keep a Dimensional Transceiver connection open").getInt(transceiverUpkeepCostRF); transceiverMaxIoRF = config.get(sectionPower.name, "transceiverMaxIoRF", transceiverMaxIoRF, - "Maximum RF/t sent and recieved by a Dimensional Transceiver per tick. Input and output limits are not cumulative").getInt(transceiverMaxIoRF); + "Maximum RF/t sent and received by a Dimensional Transceiver per tick. Input and output limits are not cumulative").getInt(transceiverMaxIoRF); transceiverBucketTransmissionCostRF = config.get(sectionEfficiency.name, "transceiverBucketTransmissionCostRF", transceiverBucketTransmissionCostRF, "The cost in RF of transporting a bucket of fluid via a Dimensional Transceiver.").getInt(transceiverBucketTransmissionCostRF); @@ -690,7 +690,7 @@ public final class Config { enderIoRange = config.get(sectionEfficiency.name, "enderIoRange", enderIoRange, - "Range accessable (in blocks) when using the Ender IO.").getInt(enderIoRange); + "Range accessible (in blocks) when using the Ender IO.").getInt(enderIoRange); enderIoMeAccessEnabled = config.get(sectionPersonal.name, "enderIoMeAccessEnabled", enderIoMeAccessEnabled, "If false: you will not be able to access a ME access or crafting terminal using the Ender IO.").getBoolean(enderIoMeAccessEnabled); @@ -703,7 +703,7 @@ public final class Config { darkSteelPowerDamgeAbsorptionRatios = config .get(sectionDarkSteel.name, "darkSteelPowerDamgeAbsorptionRatios", darkSteelPowerDamgeAbsorptionRatios, - "A list of the amount of durabilty damage absorbed when items are powered. In order of upgrade level. 1=100% so items take no durablity damage when powered.") + "A list of the amount of durability damage absorbed when items are powered. In order of upgrade level. 1=100% so items take no durability damage when powered.") .getDoubleList(); darkSteelPowerStorageBase = config.get(sectionDarkSteel.name, "darkSteelPowerStorageBase", darkSteelPowerStorageBase, "Base amount of power stored by dark steel items.").getInt(darkSteelPowerStorageBase); @@ -761,9 +761,9 @@ public final class Config { darkSteelWalkPowerCost = config.get(sectionDarkSteel.name, "darkSteelWalkPowerCost", darkSteelWalkPowerCost, "Amount of power stored (RF) per block walked when wearing the dark steel boots.").getInt(darkSteelWalkPowerCost); darkSteelSprintPowerCost = config.get(sectionDarkSteel.name, "darkSteelSprintPowerCost", darkSteelWalkPowerCost, - "Amount of power stored (RF) per block walked when wearing the dark stell boots.").getInt(darkSteelSprintPowerCost); + "Amount of power stored (RF) per block walked when wearing the dark steel boots.").getInt(darkSteelSprintPowerCost); darkSteelDrainPowerFromInventory = config.get(sectionDarkSteel.name, "darkSteelDrainPowerFromInventory", darkSteelDrainPowerFromInventory, - "If true, dark steel armor will drain power stored (RF) in power containers in the players invenotry.").getBoolean(darkSteelDrainPowerFromInventory); + "If true, dark steel armor will drain power stored (RF) in power containers in the players inventory.").getBoolean(darkSteelDrainPowerFromInventory); darkSteelBootsJumpPowerCost = config.get(sectionDarkSteel.name, "darkSteelBootsJumpPowerCost", darkSteelBootsJumpPowerCost, "Base amount of power used per jump (RF) dark steel boots. The second jump in a 'double jump' uses 2x this etc").getInt(darkSteelBootsJumpPowerCost); @@ -840,7 +840,7 @@ public final class Config { vanillaSwordSkullLootingModifier); ticCleaverSkullDropChance = (float) config.get(sectionDarkSteel.name, "ticCleaverSkullDropChance", ticCleaverSkullDropChance, - "The base chance that an enderman skull will be dropped when using TiC Cleaver").getDouble( + "The base chance that an Enderman Skull will be dropped when using TiC Cleaver").getDouble( ticCleaverSkullDropChance); ticBeheadingSkullModifier = (float) config.get(sectionPersonal.name, "ticBeheadingSkullModifier", ticBeheadingSkullModifier, "The chance per level of Beheading that a skull will be dropped when using a TiC weapon").getDouble( @@ -869,7 +869,7 @@ public final class Config { darkSteelPickPowerUseObsidian = config.get(sectionDarkSteel.name, "darkSteelPickPowerUseObsidian", darkSteelPickPowerUseObsidian, "The amount of power (RF) used to break an obsidian block.").getInt(darkSteelPickPowerUseObsidian); darkSteelPickEffeciencyObsidian = config.get(sectionDarkSteel.name, "darkSteelPickEffeciencyObsidian", darkSteelPickEffeciencyObsidian, - "The effeciency when breaking obsidian with a powered Dark Pickaxe.").getInt(darkSteelPickEffeciencyObsidian); + "The efficiency when breaking obsidian with a powered Dark Pickaxe.").getInt(darkSteelPickEffeciencyObsidian); darkSteelPickApplyObsidianEffeciencyAtHardess = (float) config.get(sectionDarkSteel.name, "darkSteelPickApplyObsidianEffeciencyAtHardess", darkSteelPickApplyObsidianEffeciencyAtHardess, "If set to a value > 0, the obsidian speed and power use will be used for all blocks with hardness >= to this value.").getDouble( @@ -877,7 +877,7 @@ public final class Config { darkSteelPickPowerUsePerDamagePoint = config.get(sectionDarkSteel.name, "darkSteelPickPowerUsePerDamagePoint", darkSteelPickPowerUsePerDamagePoint, "Power use (RF) per damage/durability point avoided.").getInt(darkSteelPickPowerUsePerDamagePoint); darkSteelPickEffeciencyBoostWhenPowered = (float) config.get(sectionDarkSteel.name, "darkSteelPickEffeciencyBoostWhenPowered", - darkSteelPickEffeciencyBoostWhenPowered, "The increase in effciency when powered.").getDouble(darkSteelPickEffeciencyBoostWhenPowered); + darkSteelPickEffeciencyBoostWhenPowered, "The increase in efficiency when powered.").getDouble(darkSteelPickEffeciencyBoostWhenPowered); darkSteelPickMinesTiCArdite = config.getBoolean("darkSteelPickMinesTiCArdite", sectionDarkSteel.name, darkSteelPickMinesTiCArdite, "When true the dark steel pick will be able to mine TiC Ardite and Cobalt"); @@ -890,7 +890,7 @@ public final class Config { darkSteelAxeSpeedPenaltyMultiHarvest, "How much slower shift-harvesting logs is.").getDouble(darkSteelAxeSpeedPenaltyMultiHarvest); darkSteelAxeEffeciencyBoostWhenPowered = (float) config.get(sectionDarkSteel.name, "darkSteelAxeEffeciencyBoostWhenPowered", - darkSteelAxeEffeciencyBoostWhenPowered, "The increase in effciency when powered.").getDouble(darkSteelAxeEffeciencyBoostWhenPowered); + darkSteelAxeEffeciencyBoostWhenPowered, "The increase in efficiency when powered.").getDouble(darkSteelAxeEffeciencyBoostWhenPowered); darkSteelAnvilDamageChance = (float) config.get(sectionDarkSteel.name, "darkSteelAnvilDamageChance", darkSteelAnvilDamageChance, "Chance that the dark steel anvil will take damage after repairing something.").getDouble(); @@ -1100,7 +1100,7 @@ public final class Config { spawnGuardPowerPerTickLevelThree = config.get(sectionAttractor.name, "spawnGuardPowerPerTickLevelThree", spawnGuardPowerPerTickLevelThree, "The RF/t power use of a levele 3 spawn guard").getInt(spawnGuardPowerPerTickLevelThree); spawnGuardStopAllSlimesDebug = config.getBoolean("spawnGuardStopAllSlimesDebug", sectionAttractor.name, spawnGuardStopAllSlimesDebug, - "When true slimes wont be alowed to spawn at all. Only added to aid testing in super flat worlds."); + "When true slimes wont be allowed to spawn at all. Only added to aid testing in super flat worlds."); spawnGuardStopAllSquidSpawning = config.getBoolean("spawnGuardStopAllSquidSpawning", sectionAttractor.name, spawnGuardStopAllSquidSpawning, "When true no squid will be spawned."); @@ -1120,9 +1120,9 @@ public final class Config { enderRailEnabled = config.getBoolean("enderRailEnabled", sectionRailConfig.name, enderRailEnabled, "Wether Ender Rails are enabled"); enderRailPowerRequireCrossDimensions = config.get(sectionRailConfig.name, "enderRailPowerRequireCrossDimensions", enderRailPowerRequireCrossDimensions, - "The amount of power required to transpoer a cart accross dimensions").getInt(enderRailPowerRequireCrossDimensions); + "The amount of power required to transport a cart across dimensions").getInt(enderRailPowerRequireCrossDimensions); enderRailPowerRequiredPerBlock = config.get(sectionRailConfig.name, "enderRailPowerRequiredPerBlock", enderRailPowerRequiredPerBlock, - "The amout of power required to teleport a cart per block in the same dimension").getInt(enderRailPowerRequiredPerBlock); + "The amount of power required to teleport a cart per block in the same dimension").getInt(enderRailPowerRequiredPerBlock); enderRailCapSameDimensionPowerAtCrossDimensionCost = config.getBoolean("enderRailCapSameDimensionPowerAtCrossDimensionCost", sectionRailConfig.name, enderRailCapSameDimensionPowerAtCrossDimensionCost, "When set to true the RF cost of sending a cart within the same dimension will be capped to the cross dimension cost"); enderRailTicksBeforeForceSpawningLinkedCarts = config.get(sectionRailConfig.name, "enderRailTicksBeforeForceSpawningLinkedCarts", enderRailTicksBeforeForceSpawningLinkedCarts, diff --git a/src/main/java/crazypants/enderio/machine/crafter/GuiCrafter.java b/src/main/java/crazypants/enderio/machine/crafter/GuiCrafter.java index 37eef4ed..bb501738 100644 --- a/src/main/java/crazypants/enderio/machine/crafter/GuiCrafter.java +++ b/src/main/java/crazypants/enderio/machine/crafter/GuiCrafter.java @@ -16,6 +16,7 @@ import crazypants.enderio.machine.gui.GuiPoweredMachineBase; import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.network.PacketHandler; import crazypants.render.RenderUtil; +import crazypants.util.Lang; public class GuiCrafter extends GuiPoweredMachineBase { @@ -28,8 +29,8 @@ public class GuiCrafter extends GuiPoweredMachineBase { int x = getXSize() - 5 - 16; int y = 43; bufferSizeB = new ToggleButtonEIO(this, 4327, x, y, IconEIO.ITEM_SINGLE, IconEIO.ITEM_STACK); - bufferSizeB.setSelectedToolTip("Buffering item stacks"); - bufferSizeB.setUnselectedToolTip("Buffering single items"); + bufferSizeB.setSelectedToolTip(Lang.localize("gui.machine.bufferingstacks")); + bufferSizeB.setUnselectedToolTip(Lang.localize("gui.machine.bufferingsingle")); bufferSizeB.setSelected(te.isBufferStacks()); } @@ -71,7 +72,7 @@ public class GuiCrafter extends GuiPoweredMachineBase { @Override protected void updatePowerBarTooltip(List text) { text.add(PowerDisplayUtil.formatPower(Config.crafterRfPerCraft) + " " + PowerDisplayUtil.abrevation() - + " Per Craft"); + + " " + Lang.localize("gui.machine.percraft")); super.updatePowerBarTooltip(text); } 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 35428f72..fecb14b4 100644 --- a/src/main/java/crazypants/enderio/machine/generator/combustion/GuiCombustionGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/combustion/GuiCombustionGenerator.java @@ -102,7 +102,7 @@ public class GuiCombustionGenerator extends GuiPoweredMachineBase { @@ -151,7 +152,7 @@ public class BlockZombieGenerator extends AbstractMachineBlock tooltip, EntityPlayer player, World world, int x, int y, int z) { TileEntity te = world.getTileEntity(x, y, z); if(te != null && te instanceof TileZombieGenerator) { - tooltip.add(((TileZombieGenerator) te).getFluidStored(ForgeDirection.UNKNOWN) + " mB"); + tooltip.add(((TileZombieGenerator) te).getFluidStored(ForgeDirection.UNKNOWN) + " " + Lang.localize("fluid.millibucket.abr")); } } 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 d26d2137..1678ca74 100644 --- a/src/main/java/crazypants/enderio/machine/generator/zombie/GuiZombieGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/zombie/GuiZombieGenerator.java @@ -81,7 +81,7 @@ public class GuiZombieGenerator extends GuiPoweredMachineBase extends Gu protected GuiMachineBase(T machine, Container par1Container) { super(par1Container); tileEntity = machine; - + + xSize = getXSize(); + ySize = getYSize(); int x = getXSize() - 5 - BUTTON_SIZE; int y = 5; redstoneButton = new RedstoneModeButton(this, -1, x, y, tileEntity, new BlockCoord(tileEntity)); diff --git a/src/main/java/crazypants/enderio/machine/gui/GuiPoweredMachineBase.java b/src/main/java/crazypants/enderio/machine/gui/GuiPoweredMachineBase.java index 0620a769..65ffbb90 100644 --- a/src/main/java/crazypants/enderio/machine/gui/GuiPoweredMachineBase.java +++ b/src/main/java/crazypants/enderio/machine/gui/GuiPoweredMachineBase.java @@ -2,6 +2,7 @@ package crazypants.enderio.machine.gui; import java.awt.Rectangle; import java.util.List; +import net.minecraft.util.StatCollector; import net.minecraft.inventory.Container; @@ -37,7 +38,7 @@ public abstract class GuiPoweredMachineBase { @@ -58,9 +59,9 @@ public class GuiPoweredSpawner extends GuiPoweredMachineBase int left = getGuiLeft(); int top = getGuiTop(); - String txt = "Spawn"; + String txt = Lang.localize("gui.machine.poweredspawner.spawn"); if(!spawner.isSpawnMode()) { - txt = "Capture"; + txt = Lang.localize("gui.machine.poweredspawner.capture"); } FontRenderer fr = getFontRenderer(); int x = left + xSize / 2 - fr.getStringWidth(txt) / 2; diff --git a/src/main/java/crazypants/enderio/machine/transceiver/BlockTransceiver.java b/src/main/java/crazypants/enderio/machine/transceiver/BlockTransceiver.java index c88be3c8..9b27db4c 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/BlockTransceiver.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/BlockTransceiver.java @@ -136,7 +136,7 @@ public class BlockTransceiver extends AbstractMachineBlock { tooltip.add(EnumChatFormatting.WHITE + Lang.localize("trans." + type.name().toLowerCase())); if(!isEmpty(recieve)) { - tooltip.add(String.format("%s%s " + Util.TAB + ": %s%s", Util.TAB, Lang.localize("trans.recieving"), Util.TAB + Util.ALIGNRIGHT + tooltip.add(String.format("%s%s " + Util.TAB + ": %s%s", Util.TAB, Lang.localize("trans.receiving"), Util.TAB + Util.ALIGNRIGHT + EnumChatFormatting.WHITE, recieve)); } if(!isEmpty(send)) { diff --git a/src/main/java/crazypants/enderio/machine/transceiver/gui/ChannelTab.java b/src/main/java/crazypants/enderio/machine/transceiver/gui/ChannelTab.java index 80988e6c..9a6e5573 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/gui/ChannelTab.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/gui/ChannelTab.java @@ -186,13 +186,13 @@ public class ChannelTab implements ITabPanel { int top = parent.getGuiTop(); int x = left + 59; int y = top + 36; - parent.drawCenteredString(parent.getFontRenderer(), "Available", x, y, ColorUtil.getRGB(Color.white)); + parent.drawCenteredString(parent.getFontRenderer(), Lang.localize("gui.available"), x, y, ColorUtil.getRGB(Color.white)); x = left + 199; - parent.drawCenteredString(parent.getFontRenderer(), "Send", x, y, ColorUtil.getRGB(Color.white)); + parent.drawCenteredString(parent.getFontRenderer(), Lang.localize("gui.send"), x, y, ColorUtil.getRGB(Color.white)); y += 56; - parent.drawCenteredString(parent.getFontRenderer(), "Recieve", x, y, ColorUtil.getRGB(Color.white)); + parent.drawCenteredString(parent.getFontRenderer(), Lang.localize("gui.receive"), x, y, ColorUtil.getRGB(Color.white)); } @Override diff --git a/src/main/java/crazypants/enderio/machine/transceiver/gui/FilterTab.java b/src/main/java/crazypants/enderio/machine/transceiver/gui/FilterTab.java index ebe1eafe..4a405306 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/gui/FilterTab.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/gui/FilterTab.java @@ -19,6 +19,7 @@ import crazypants.enderio.machine.transceiver.TileTransceiver; import crazypants.enderio.network.PacketHandler; import crazypants.render.ColorUtil; import crazypants.render.RenderUtil; +import crazypants.util.Lang; public class FilterTab implements ITabPanel { @@ -98,9 +99,9 @@ public class FilterTab implements ITabPanel { recGui.renderCustomOptions(0, par1, par2, par3); } - String txt = "Send Filter"; + String txt = Lang.localize("gui.machine.sendfilter"); if(!showSend) { - txt = "Receive Filter"; + txt = Lang.localize("gui.machine.receivefilter"); } FontRenderer fr = parent.getFontRenderer(); int x = left + container.getFilterOffset().x; 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 09bd41d5..33fe9e2b 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/gui/GeneralTab.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/gui/GeneralTab.java @@ -20,6 +20,7 @@ import crazypants.enderio.network.PacketHandler; import crazypants.gui.GuiToolTip; import crazypants.render.ColorUtil; import crazypants.render.RenderUtil; +import crazypants.util.Lang; public class GeneralTab implements ITabPanel { @@ -37,8 +38,8 @@ public class GeneralTab implements ITabPanel { int x = parent.getXSize() - 5 - 16; int y = 43; bufferSizeB = new ToggleButtonEIO(parent, 4327, x, y, IconEIO.ITEM_SINGLE, IconEIO.ITEM_STACK); - bufferSizeB.setSelectedToolTip("Buffering item stacks"); - bufferSizeB.setUnselectedToolTip("Buffering single items"); + bufferSizeB.setSelectedToolTip(Lang.localize("gui.machine.bufferingstacks")); + bufferSizeB.setUnselectedToolTip(Lang.localize("gui.machine.bufferingsingle")); bufferSizeB.setSelected(parent.getTransciever().isBufferStacks()); sendPowerBarTT = new GuiToolTip(new Rectangle(parent.getPowerX() + SEND_BAR_OFFSET, parent.getPowerY(), parent.getPowerWidth(), parent.getPowerHeight()), "") { @@ -89,11 +90,11 @@ public class GeneralTab implements ITabPanel { parent.drawTexturedModalRect(left + invRoot.x - 1 + (18 * 4) + container.getItemBufferSpacing(), top + invRoot.y - 1, 24, 180, 72, 36); FontRenderer fr = parent.getFontRenderer(); - String sendTxt = "Send"; + String sendTxt = Lang.localize("gui.send"); int x = left + invRoot.x + 36 - fr.getStringWidth(sendTxt)/2; int y = top + invRoot.y - fr.FONT_HEIGHT - 3; fr.drawStringWithShadow(sendTxt, x, y, ColorUtil.getRGB(Color.WHITE)); - String recText = "Receive"; + String recText = Lang.localize("gui.receive"); x = left + invRoot.x + 72 + container.getItemBufferSpacing() + 36 - fr.getStringWidth(recText)/2; fr.drawStringWithShadow(recText, x, y, ColorUtil.getRGB(Color.WHITE)); @@ -125,16 +126,16 @@ public class GeneralTab implements ITabPanel { } public void updatePowerBarTooltip(List text) { - text.add("Local Buffer"); - text.add("Upkeep: " + PowerDisplayUtil.formatPowerPerTick(parent.getPowerOutputValue())); + text.add(Lang.localize("gui.machine.localbuffer")); + text.add(Lang.localize("gui.machine.upkeep") + " " + PowerDisplayUtil.formatPowerPerTick(parent.getPowerOutputValue())); int maxEnergy = parent.getTransciever().getCapacitor().getMaxEnergyStored()/2; int energyStored = Math.min(parent.getTransciever().getEnergyStored(), maxEnergy); text.add(PowerDisplayUtil.formatStoredPower(energyStored, maxEnergy)); } private void updateSendPowerBarTooltip(List text) { - text.add("Send/Recieve Buffer"); - text.add("Max IO: " + PowerDisplayUtil.formatPowerPerTick(Config.transceiverMaxIoRF)); + text.add(Lang.localize("gui.machine.sendReceivebuffer")); + text.add(Lang.localize("itemGasConduit.tooltip.maxIo") + " " + PowerDisplayUtil.formatPowerPerTick(Config.transceiverMaxIoRF)); int maxEnergy = parent.getTransciever().getCapacitor().getMaxEnergyStored()/2; int energyStored = Math.max(0, parent.getTransciever().getEnergyStored() - maxEnergy); text.add(PowerDisplayUtil.formatStoredPower(energyStored, maxEnergy)); diff --git a/src/main/java/crazypants/enderio/machine/xp/GuiExperianceObelisk.java b/src/main/java/crazypants/enderio/machine/xp/GuiExperianceObelisk.java index a57455e0..67b4b6d8 100644 --- a/src/main/java/crazypants/enderio/machine/xp/GuiExperianceObelisk.java +++ b/src/main/java/crazypants/enderio/machine/xp/GuiExperianceObelisk.java @@ -15,6 +15,7 @@ import crazypants.enderio.xp.ExperienceBarRenderer; import crazypants.enderio.xp.PacketDrainPlayerXP; import crazypants.enderio.xp.PacketGivePlayerXP; import crazypants.render.RenderUtil; +import crazypants.util.Lang; public class GuiExperianceObelisk extends GuiMachineBase { @@ -42,38 +43,38 @@ public class GuiExperianceObelisk extends GuiMachineBase { p = new IconButtonEIO(this, 800, x, y, IconEIO.SINGLE_PLUS); p.setSize(bw, bw); p.setIconMargin(2, 2); - p.setToolTip("Store 1", "level of player XP"); + p.setToolTip(Lang.localize("gui.machine.button.storelevel"), Lang.localize("gui.machine.tooltip.storelevel")); x += spacing + bw; pp = new IconButtonEIO(this, 801, x, y, IconEIO.DOUBLE_PLUS); pp.setSize(bw, bw); pp.setIconMargin(2, 2); - pp.setToolTip("Store 10", "levels of player XP"); + pp.setToolTip(Lang.localize("gui.machine.button.storelevels"), Lang.localize("gui.machine.tooltip.storelevels")); x += spacing + bw; ppp = new IconButtonEIO(this, 802, x, y, IconEIO.TRIPLE_PLUS); ppp.setSize(bw, bw); ppp.setIconMargin(2, 2); - ppp.setToolTip("Store all", "player XP"); + ppp.setToolTip(Lang.localize("gui.machine.button.storeall"), Lang.localize("gui.machine.tooltip.storeall")); x = startX; y = 75; m = new IconButtonEIO(this, 803, x, y, IconEIO.SINGLE_MINUS); m.setSize(bw, bw); m.setIconMargin(2, 2); - m.setToolTip("Retrieve 1", "player XP level"); + m.setToolTip(Lang.localize("gui.machine.button.retrievelevel"), Lang.localize("gui.machine.tooltip.retrievelevel")); x += spacing + bw; mm = new IconButtonEIO(this, 804, x, y, IconEIO.DOUBLE_MINUS); mm.setSize(bw, bw); mm.setIconMargin(2, 2); - mm.setToolTip("Retrieve 10", "player XP levels"); + mm.setToolTip(Lang.localize("gui.machine.button.retrievelevels"), Lang.localize("gui.machine.tooltip.retrievelevels")); x += spacing + bw; mmm = new IconButtonEIO(this, 805, x, y, IconEIO.TRIPLE_MINUS); mmm.setSize(bw, bw); mmm.setIconMargin(2, 2); - mmm.setToolTip("Retrieve all"); + mmm.setToolTip(Lang.localize("gui.machine.button.retrieveall")); } @Override From 8514cbafccf64e9ba00d5025b4d723a5aacf8157 Mon Sep 17 00:00:00 2001 From: Matthias Mann Date: Sun, 25 Jan 2015 14:41:29 +0100 Subject: [PATCH 23/79] ME counduits should now behave better --- .../enderio/conduit/AbstractConduit.java | 27 ++-- .../enderio/conduit/AbstractItemConduit.java | 12 +- .../enderio/conduit/BlockConduitBundle.java | 2 +- .../enderio/conduit/ConduitUtil.java | 6 + .../crazypants/enderio/conduit/IConduit.java | 2 + .../enderio/conduit/IConduitItem.java | 3 +- .../enderio/conduit/TileConduitBundle.java | 5 +- .../enderio/conduit/gas/ItemGasConduit.java | 2 +- .../enderio/conduit/item/ItemItemConduit.java | 2 +- .../conduit/liquid/ItemLiquidConduit.java | 2 +- .../enderio/conduit/liquid/LiquidConduit.java | 2 +- .../enderio/conduit/me/ItemMEConduit.java | 7 +- .../enderio/conduit/me/MEConduit.java | 139 ++++++------------ .../conduit/power/ItemPowerConduit.java | 2 +- .../redstone/InsulatedRedstoneConduit.java | 2 + .../conduit/redstone/ItemRedstoneConduit.java | 2 +- .../capbank/network/CapBankClientNetwork.java | 2 +- 17 files changed, 89 insertions(+), 130 deletions(-) diff --git a/src/main/java/crazypants/enderio/conduit/AbstractConduit.java b/src/main/java/crazypants/enderio/conduit/AbstractConduit.java index 4d0ff37a..cd6173e1 100644 --- a/src/main/java/crazypants/enderio/conduit/AbstractConduit.java +++ b/src/main/java/crazypants/enderio/conduit/AbstractConduit.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.EnumMap; -import java.util.HashSet; +import java.util.EnumSet; import java.util.Iterator; import java.util.List; import java.util.Set; @@ -26,9 +26,9 @@ import crazypants.util.BlockCoord; public abstract class AbstractConduit implements IConduit { - protected final Set conduitConnections = new HashSet(); + protected final Set conduitConnections = EnumSet.noneOf(ForgeDirection.class); - protected final Set externalConnections = new HashSet(); + protected final Set externalConnections = EnumSet.noneOf(ForgeDirection.class); public static final float STUB_WIDTH = 0.2f; @@ -52,8 +52,6 @@ public abstract class AbstractConduit implements IConduit { private boolean dodgyChangeSinceLastCallFlagForBundle = true; - private int lastNumConections = -1; - protected boolean connectionsDirty = true; protected AbstractConduit() { @@ -194,11 +192,7 @@ public abstract class AbstractConduit implements IConduit { if(bundle == null) { return null; } - TileEntity te = bundle.getEntity(); - if(te == null) { - return null; - } - return new BlockCoord(te.xCoord, te.yCoord, te.zCoord); + return bundle.getLocation(); } @Override @@ -225,13 +219,11 @@ public abstract class AbstractConduit implements IConduit { @Override public void conduitConnectionAdded(ForgeDirection fromDirection) { conduitConnections.add(fromDirection); - connectionsChanged(); } @Override public void conduitConnectionRemoved(ForgeDirection fromDirection) { conduitConnections.remove(fromDirection); - connectionsChanged(); } @Override @@ -275,13 +267,11 @@ public abstract class AbstractConduit implements IConduit { @Override public void externalConnectionAdded(ForgeDirection fromDirection) { externalConnections.add(fromDirection); - connectionsChanged(); } @Override public void externalConnectionRemoved(ForgeDirection fromDirection) { externalConnections.remove(fromDirection); - connectionsChanged(); } @Override @@ -428,7 +418,8 @@ public abstract class AbstractConduit implements IConduit { connectionsDirty = false; } - protected void connectionsChanged() { + @Override + public void connectionsChanged() { collidablesDirty = true; clientStateDirty = true; dodgyChangeSinceLastCallFlagForBundle = true; @@ -463,6 +454,7 @@ public abstract class AbstractConduit implements IConduit { if(neighbour != null && neighbour.canConnectToConduit(dir.getOpposite(), this)) { conduitConnections.add(dir); neighbour.conduitConnectionAdded(dir.getOpposite()); + neighbour.connectionsChanged(); } } @@ -485,6 +477,7 @@ public abstract class AbstractConduit implements IConduit { IConduit neighbour = ConduitUtil.getConduit(world, te, dir, getBaseConduitType()); if(neighbour != null) { neighbour.conduitConnectionRemoved(dir.getOpposite()); + neighbour.connectionsChanged(); } } conduitConnections.clear(); @@ -513,7 +506,7 @@ public abstract class AbstractConduit implements IConduit { // Check for changes to external connections, connections to conduits are // handled by the bundle - Set newCons = new HashSet(); + Set newCons = EnumSet.noneOf(ForgeDirection.class); for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { if(!containsConduitConnection(dir) && canConnectToExternal(dir, false)) { newCons.add(dir); @@ -560,8 +553,6 @@ public abstract class AbstractConduit implements IConduit { } List result = new ArrayList(); - CollidableCache cc = CollidableCache.instance; - for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { Collection col = getCollidables(dir); if(col != null) { diff --git a/src/main/java/crazypants/enderio/conduit/AbstractItemConduit.java b/src/main/java/crazypants/enderio/conduit/AbstractItemConduit.java index 186c55ae..e17af5ac 100644 --- a/src/main/java/crazypants/enderio/conduit/AbstractItemConduit.java +++ b/src/main/java/crazypants/enderio/conduit/AbstractItemConduit.java @@ -61,12 +61,10 @@ public abstract class AbstractItemConduit extends Item implements IConduitItem { TileEntity te = world.getTileEntity(placeAt.x, placeAt.y, placeAt.z); if(te instanceof IConduitBundle) { IConduitBundle bundle = (IConduitBundle) te; - if(bundle != null) { - bundle.addConduit(createConduit(stack)); - Block b = EnderIO.blockConduitBundle; - world.playSoundEffect(x + 0.5F, y + 0.5F, z + 0.5F, b.stepSound.getStepResourcePath(), - (b.stepSound.getVolume() + 1.0F) / 2.0F, b.stepSound.getPitch() * 0.8F); - } + bundle.addConduit(createConduit(stack, player)); + Block b = EnderIO.blockConduitBundle; + world.playSoundEffect(x + 0.5F, y + 0.5F, z + 0.5F, b.stepSound.getStepResourcePath(), + (b.stepSound.getVolume() + 1.0F) / 2.0F, b.stepSound.getPitch() * 0.8F); } } } @@ -89,7 +87,7 @@ public abstract class AbstractItemConduit extends Item implements IConduitItem { System.out.println("AbstractItemConduit.onItemUse: Bundle null"); return false; } - IConduit con = createConduit(stack); + IConduit con = createConduit(stack, player); if(con == null) { System.out.println("AbstractItemConduit.onItemUse: Conduit null."); return false; diff --git a/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java b/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java index 16b5fcc1..c439ce87 100644 --- a/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java +++ b/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java @@ -593,7 +593,7 @@ public class BlockConduitBundle extends BlockEio implements IGuiHandler, IFacade private boolean handleConduitClick(World world, int x, int y, int z, EntityPlayer player, IConduitBundle bundle, ItemStack stack) { IConduitItem equipped = (IConduitItem) stack.getItem(); if(!bundle.hasType(equipped.getBaseConduitType())) { - bundle.addConduit(equipped.createConduit(stack)); + bundle.addConduit(equipped.createConduit(stack, player)); if(!player.capabilities.isCreativeMode) { world.playSoundEffect(x + 0.5F, y + 0.5F, z + 0.5F, stepSound.getStepResourcePath(), (stepSound.getVolume() + 1.0F) / 2.0F, stepSound.getPitch() * 0.8F); diff --git a/src/main/java/crazypants/enderio/conduit/ConduitUtil.java b/src/main/java/crazypants/enderio/conduit/ConduitUtil.java index f49c6716..4f909e37 100644 --- a/src/main/java/crazypants/enderio/conduit/ConduitUtil.java +++ b/src/main/java/crazypants/enderio/conduit/ConduitUtil.java @@ -124,6 +124,10 @@ public class ConduitUtil { if(con.getNetwork() != null) { //this should have been destroyed when destroying the neighbours network but lets just make sure con.getNetwork().destroyNetwork(); } + con.connectionsChanged(); + if(neighbour != null) { + neighbour.connectionsChanged(); + } } public static boolean joinConduits(T con, ForgeDirection faceHit) { @@ -138,6 +142,8 @@ public class ConduitUtil { if(neighbour.getNetwork() != null) { neighbour.getNetwork().destroyNetwork(); } + con.connectionsChanged(); + neighbour.connectionsChanged(); return true; } return false; diff --git a/src/main/java/crazypants/enderio/conduit/IConduit.java b/src/main/java/crazypants/enderio/conduit/IConduit.java index 0f24241f..f201de9a 100644 --- a/src/main/java/crazypants/enderio/conduit/IConduit.java +++ b/src/main/java/crazypants/enderio/conduit/IConduit.java @@ -66,6 +66,8 @@ public interface IConduit { void conduitConnectionRemoved(ForgeDirection fromDirection); + void connectionsChanged(); + AbstractConduitNetwork getNetwork(); boolean setNetwork(AbstractConduitNetwork network); diff --git a/src/main/java/crazypants/enderio/conduit/IConduitItem.java b/src/main/java/crazypants/enderio/conduit/IConduitItem.java index c6172109..b55d50ad 100644 --- a/src/main/java/crazypants/enderio/conduit/IConduitItem.java +++ b/src/main/java/crazypants/enderio/conduit/IConduitItem.java @@ -1,12 +1,13 @@ package crazypants.enderio.conduit; import net.minecraft.item.ItemStack; +import net.minecraft.entity.player.EntityPlayer; import crazypants.enderio.api.tool.IHideFacades; public interface IConduitItem extends IHideFacades { Class getBaseConduitType(); - IConduit createConduit(ItemStack item); + IConduit createConduit(ItemStack item, EntityPlayer player); } diff --git a/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java b/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java index 3fde5891..0d019e7e 100644 --- a/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java +++ b/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java @@ -6,8 +6,6 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import com.google.common.collect.Lists; - import mekanism.api.gas.Gas; import mekanism.api.gas.GasStack; import net.minecraft.block.Block; @@ -894,8 +892,7 @@ public class TileConduitBundle extends TileEntityEio implements IConduitBundle { if (cond == null) { return AECableType.NONE; } else { - ConnectionMode mode = cond.getConnectionMode(dir); - return mode == ConnectionMode.DISABLED ? AECableType.NONE : AECableType.SMART; + return cond.isConnectedTo(dir) ? AECableType.SMART : AECableType.NONE; } } diff --git a/src/main/java/crazypants/enderio/conduit/gas/ItemGasConduit.java b/src/main/java/crazypants/enderio/conduit/gas/ItemGasConduit.java index a382d1fa..5a160933 100644 --- a/src/main/java/crazypants/enderio/conduit/gas/ItemGasConduit.java +++ b/src/main/java/crazypants/enderio/conduit/gas/ItemGasConduit.java @@ -40,7 +40,7 @@ public class ItemGasConduit extends AbstractItemConduit implements IAdvancedTool } @Override - public IConduit createConduit(ItemStack stack) { + public IConduit createConduit(ItemStack stack, EntityPlayer player) { return new GasConduit(); } diff --git a/src/main/java/crazypants/enderio/conduit/item/ItemItemConduit.java b/src/main/java/crazypants/enderio/conduit/item/ItemItemConduit.java index fab4955e..4e2ce9fb 100644 --- a/src/main/java/crazypants/enderio/conduit/item/ItemItemConduit.java +++ b/src/main/java/crazypants/enderio/conduit/item/ItemItemConduit.java @@ -33,7 +33,7 @@ public class ItemItemConduit extends AbstractItemConduit { } @Override - public IConduit createConduit(ItemStack item) { + public IConduit createConduit(ItemStack item, EntityPlayer player) { return new ItemConduit(item.getItemDamage()); } diff --git a/src/main/java/crazypants/enderio/conduit/liquid/ItemLiquidConduit.java b/src/main/java/crazypants/enderio/conduit/liquid/ItemLiquidConduit.java index 887efed3..7260c6df 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/ItemLiquidConduit.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/ItemLiquidConduit.java @@ -40,7 +40,7 @@ public class ItemLiquidConduit extends AbstractItemConduit implements IAdvancedT } @Override - public IConduit createConduit(ItemStack stack) { + public IConduit createConduit(ItemStack stack, EntityPlayer player) { if(stack.getItemDamage() == 1) { return new AdvancedLiquidConduit(); } else if(stack.getItemDamage() == 2) { diff --git a/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduit.java b/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduit.java index 553d5aad..a19251f8 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduit.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduit.java @@ -341,7 +341,7 @@ public class LiquidConduit extends AbstractTankConduit { // ----------------------------- @Override - protected void connectionsChanged() { + public void connectionsChanged() { super.connectionsChanged(); updateTank(); } diff --git a/src/main/java/crazypants/enderio/conduit/me/ItemMEConduit.java b/src/main/java/crazypants/enderio/conduit/me/ItemMEConduit.java index bf95e5a4..0b588c0b 100644 --- a/src/main/java/crazypants/enderio/conduit/me/ItemMEConduit.java +++ b/src/main/java/crazypants/enderio/conduit/me/ItemMEConduit.java @@ -1,5 +1,6 @@ package crazypants.enderio.conduit.me; +import appeng.api.AEApi; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import crazypants.enderio.ModObject; @@ -32,8 +33,10 @@ public class ItemMEConduit extends AbstractItemConduit { } @Override - public IConduit createConduit(ItemStack item) { - return new MEConduit(item.getItemDamage()); + public IConduit createConduit(ItemStack item, EntityPlayer player) { + MEConduit con = new MEConduit(item.getItemDamage()); + con.setPlayerID(AEApi.instance().registries().players().getID(player)); + return con; } @Override diff --git a/src/main/java/crazypants/enderio/conduit/me/MEConduit.java b/src/main/java/crazypants/enderio/conduit/me/MEConduit.java index d06d879f..7c285765 100644 --- a/src/main/java/crazypants/enderio/conduit/me/MEConduit.java +++ b/src/main/java/crazypants/enderio/conduit/me/MEConduit.java @@ -1,20 +1,15 @@ package crazypants.enderio.conduit.me; -import java.util.Arrays; import java.util.EnumSet; import java.util.List; -import java.util.Set; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.nbt.NBTTagString; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.World; -import net.minecraftforge.common.util.Constants; import net.minecraftforge.common.util.ForgeDirection; import appeng.api.AEApi; import appeng.api.networking.IGridHost; @@ -29,6 +24,7 @@ import crazypants.enderio.conduit.AbstractConduitNetwork; import crazypants.enderio.conduit.ConduitUtil; import crazypants.enderio.conduit.ConnectionMode; import crazypants.enderio.conduit.IConduit; +import crazypants.enderio.conduit.IConduitBundle; import crazypants.enderio.conduit.RaytraceResult; import crazypants.enderio.conduit.TileConduitBundle; import crazypants.enderio.conduit.geom.CollidableComponent; @@ -45,8 +41,7 @@ public class MEConduit extends AbstractConduit implements IMEConduit { public static IIcon[] longTextures; private boolean isDense; - - EnumSet validConnections = EnumSet.copyOf(Arrays.asList(ForgeDirection.VALID_DIRECTIONS)); + private int playerID = -1; public MEConduit() { this(0); @@ -107,39 +102,32 @@ public class MEConduit extends AbstractConduit implements IMEConduit { @Override public void writeToNBT(NBTTagCompound nbtRoot) { super.writeToNBT(nbtRoot); - NBTTagList list = new NBTTagList(); - for (ForgeDirection dir : validConnections) { - NBTTagString name = new NBTTagString(dir.name()); - list.appendTag(name); - } - nbtRoot.setTag("validConnections", list); nbtRoot.setBoolean("isDense", isDense); + nbtRoot.setInteger("playerID", playerID); } @Override public void readFromNBT(NBTTagCompound nbtRoot, short nbtVersion) { super.readFromNBT(nbtRoot, nbtVersion); - if(nbtRoot.hasKey("validConnections")) { - validConnections.clear(); - NBTTagList connections = nbtRoot.getTagList("validConnections", Constants.NBT.TAG_STRING); - for (int i = 0; i < connections.tagCount(); i++) { - validConnections.add(ForgeDirection.valueOf(connections.getStringTagAt(i))); - } - } isDense = nbtRoot.getBoolean("isDense"); + if(nbtRoot.hasKey("playerID")) { + playerID = nbtRoot.getInteger("playerID"); + } else { + playerID = -1; + } + } + + public void setPlayerID(int playerID) { + this.playerID = playerID; } @Override @Method(modid = "appliedenergistics2") - public boolean canConnectToExternal(ForgeDirection dir, boolean ignoreConnectionMode) { + public boolean canConnectToExternal(ForgeDirection dir, boolean ignoreDisabled) { World world = getBundle().getWorld(); BlockCoord pos = getLocation(); TileEntity te = world.getTileEntity(pos.x + dir.offsetX, pos.y + dir.offsetY, pos.z + dir.offsetZ); - if(!ignoreConnectionMode && getConnectionMode(dir) == ConnectionMode.DISABLED) { - return false; - } - if(te instanceof IPartHost) { IPart part = ((IPartHost) te).getPart(dir.getOpposite()); if(part == null) { @@ -178,6 +166,7 @@ public class MEConduit extends AbstractConduit implements IMEConduit { if(getNode() == null && !worldObj.isRemote) { IGridNode node = AEApi.instance().createGridNode(grid); if(node != null) { + node.setPlayerID(playerID); getBundle().setGridNode(node); getNode().updateState(); } @@ -193,58 +182,31 @@ public class MEConduit extends AbstractConduit implements IMEConduit { return mode; } - @Override - public ConnectionMode getConnectionMode(ForgeDirection dir) { - return validConnections.contains(dir) ? ConnectionMode.IN_OUT : ConnectionMode.DISABLED; - } - - @Override - public void setConnectionMode(ForgeDirection dir, ConnectionMode mode) { - super.setConnectionMode(dir, mode); - if(mode == ConnectionMode.DISABLED) { - validConnections.remove(dir); - } else { - validConnections.add(dir); - } - if(hasNode()) { - getNode().updateState(); - getNode().getWorld().markBlockForUpdate(getLocation().x, getLocation().y, getLocation().z); - } - } - @Override public boolean canConnectToConduit(ForgeDirection direction, IConduit conduit) { - if(conduit == null) { + if(!super.canConnectToConduit(direction, conduit)) { return false; } return conduit instanceof IMEConduit; } - @Override - public void conduitConnectionAdded(ForgeDirection fromDirection) { - super.conduitConnectionAdded(fromDirection); - validConnections.add(fromDirection); - } - - @Override - public void conduitConnectionRemoved(ForgeDirection fromDirection) { - super.conduitConnectionRemoved(fromDirection); -// validConnections.remove(fromDirection); // this causes more annoying behavior than wanted behavior. Let's leave it out for now. - } - @Override @Method(modid = "appliedenergistics2") - protected void connectionsChanged() { + public void connectionsChanged() { super.connectionsChanged(); - onNodeChanged(); - if(getNode() != null) { - getNode().updateState(); + BlockCoord loc = getLocation(); + if(loc != null) { + onNodeChanged(loc); + IGridNode node = getNode(); + if(node != null) { + node.updateState(); + node.getWorld().markBlockForUpdate(loc.x, loc.y, loc.z); + } } } @Override public boolean onBlockActivated(EntityPlayer player, RaytraceResult res, List all) { - super.onBlockActivated(player, res, all); if(ToolUtil.isToolEquipped(player)) { if(!getBundle().getEntity().getWorldObj().isRemote) { if(res != null && res.component != null) { @@ -252,20 +214,15 @@ public class MEConduit extends AbstractConduit implements IMEConduit { ForgeDirection faceHit = ForgeDirection.getOrientation(res.movingObjectPosition.sideHit); if(connDir == ForgeDirection.UNKNOWN || connDir == faceHit) { if(getConnectionMode(faceHit) == ConnectionMode.DISABLED) { - setConnectionMode(faceHit, getNextConnectionMode(faceHit)); + setConnectionMode(faceHit, ConnectionMode.IN_OUT); + return true; } - // Attempt to join networks - boolean retVal = ConduitUtil.joinConduits(this, faceHit); - if(retVal) { - onNodeChanged(); - } - return retVal; + return ConduitUtil.joinConduits(this, faceHit); } else if(externalConnections.contains(connDir)) { setConnectionMode(connDir, getNextConnectionMode(connDir)); return true; } else if(containsConduitConnection(connDir)) { ConduitUtil.disconectConduits(this, connDir); - onNodeChanged(); return true; } } @@ -275,14 +232,12 @@ public class MEConduit extends AbstractConduit implements IMEConduit { } @Method(modid = "appliedenergistics2") - public void onNodeChanged() { - boolean foundConnection = false; - + private void onNodeChanged(BlockCoord location) { + World world = getBundle().getWorld(); for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - TileEntity te = getBundle().getLocation().getLocation(dir).getTileEntity(getBundle().getWorld()); - if(te != null && te instanceof IGridHost) { + TileEntity te = location.getLocation(dir).getTileEntity(world); + if(te != null && te instanceof IGridHost && !(te instanceof IConduitBundle)) { IGridNode node = ((IGridHost) te).getGridNode(ForgeDirection.UNKNOWN); - foundConnection |= validConnections.contains(dir); if(node == null) { node = ((IGridHost) te).getGridNode(dir.getOpposite()); } @@ -291,9 +246,6 @@ public class MEConduit extends AbstractConduit implements IMEConduit { } } } - if(!foundConnection && hasNode()) { - getNode().destroy(); - } } @Override @@ -318,6 +270,16 @@ public class MEConduit extends AbstractConduit implements IMEConduit { getBundle().setGridNode(null); } + @Override + @Method(modid = "appliedenergistics2") + public void onChunkUnload(World worldObj) { + super.onChunkUnload(worldObj); + if(getNode() != null) { + getNode().destroy(); + getBundle().setGridNode(null); + } + } + @Override public MEConduitGrid getGrid() { return grid; @@ -328,21 +290,18 @@ public class MEConduit extends AbstractConduit implements IMEConduit { return getBundle().getGridNode(null); } - private boolean hasNode() { - return getNode() != null; - } - @Override public EnumSet getConnections() { - Set cons = getConduitConnections(); - cons.addAll(getExternalConnections()); - if(cons.isEmpty()) { - return EnumSet.noneOf(ForgeDirection.class); + EnumSet cons = EnumSet.noneOf(ForgeDirection.class); + cons.addAll(getConduitConnections()); + for(ForgeDirection dir : getExternalConnections()) { + if(getConnectionMode(dir) != ConnectionMode.DISABLED) { + cons.add(dir); + } } - return EnumSet.copyOf(cons); - // return validConnections; + return cons; } - + @Override public boolean isDense() { return isDense; diff --git a/src/main/java/crazypants/enderio/conduit/power/ItemPowerConduit.java b/src/main/java/crazypants/enderio/conduit/power/ItemPowerConduit.java index 55b7465b..ec4768f8 100644 --- a/src/main/java/crazypants/enderio/conduit/power/ItemPowerConduit.java +++ b/src/main/java/crazypants/enderio/conduit/power/ItemPowerConduit.java @@ -41,7 +41,7 @@ public class ItemPowerConduit extends AbstractItemConduit { } @Override - public IConduit createConduit(ItemStack stack) { + public IConduit createConduit(ItemStack stack, EntityPlayer player) { return new PowerConduit(stack.getItemDamage()); } diff --git a/src/main/java/crazypants/enderio/conduit/redstone/InsulatedRedstoneConduit.java b/src/main/java/crazypants/enderio/conduit/redstone/InsulatedRedstoneConduit.java index f736f9a1..d2bfde5e 100644 --- a/src/main/java/crazypants/enderio/conduit/redstone/InsulatedRedstoneConduit.java +++ b/src/main/java/crazypants/enderio/conduit/redstone/InsulatedRedstoneConduit.java @@ -197,6 +197,8 @@ public class InsulatedRedstoneConduit extends RedstoneConduit implements IInsula } neighbour.conduitConnectionRemoved(connDir.getOpposite()); conduitConnectionRemoved(connDir); + neighbour.connectionsChanged(); + connectionsChanged(); updateNetwork(); neighbour.updateNetwork(); return true; diff --git a/src/main/java/crazypants/enderio/conduit/redstone/ItemRedstoneConduit.java b/src/main/java/crazypants/enderio/conduit/redstone/ItemRedstoneConduit.java index 209dab15..0a88deb4 100644 --- a/src/main/java/crazypants/enderio/conduit/redstone/ItemRedstoneConduit.java +++ b/src/main/java/crazypants/enderio/conduit/redstone/ItemRedstoneConduit.java @@ -32,7 +32,7 @@ public class ItemRedstoneConduit extends AbstractItemConduit { } @Override - public IConduit createConduit(ItemStack stack) { + public IConduit createConduit(ItemStack stack, EntityPlayer player) { if(stack.getItemDamage() == 0) { return new RedstoneConduit(); } diff --git a/src/main/java/crazypants/enderio/machine/capbank/network/CapBankClientNetwork.java b/src/main/java/crazypants/enderio/machine/capbank/network/CapBankClientNetwork.java index e8ab9cb5..d92abc0a 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/network/CapBankClientNetwork.java +++ b/src/main/java/crazypants/enderio/machine/capbank/network/CapBankClientNetwork.java @@ -74,7 +74,7 @@ public class CapBankClientNetwork implements ICapBankNetwork { BlockCoord bc = state.getInventoryImplLocation(); if(bc == null) { inventory.setCapBank(null); - } else { + } else if(world != null) { TileEntity te = world.getTileEntity(bc.x, bc.y, bc.z); if(te instanceof TileCapBank) { inventory.setCapBank((TileCapBank) te); From b42add98c41a5ce97d5a31c79aac5ec9e4c92837 Mon Sep 17 00:00:00 2001 From: Matthias Mann Date: Tue, 27 Jan 2015 08:00:46 +0100 Subject: [PATCH 24/79] #1789 added null check for entityPlayer --- src/main/java/crazypants/enderio/gui/TooltipAddera.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/crazypants/enderio/gui/TooltipAddera.java b/src/main/java/crazypants/enderio/gui/TooltipAddera.java index ca14abc5..f0e0b767 100644 --- a/src/main/java/crazypants/enderio/gui/TooltipAddera.java +++ b/src/main/java/crazypants/enderio/gui/TooltipAddera.java @@ -130,7 +130,7 @@ public class TooltipAddera { } private static boolean addStirlinGeneratorTooltip(ItemTooltipEvent evt) { - if(evt.entityPlayer.openContainer instanceof StirlingGeneratorContainer) { + if(evt.entityPlayer != null && evt.entityPlayer.openContainer instanceof StirlingGeneratorContainer) { AbstractMachineEntity te = ((StirlingGeneratorContainer)evt.entityPlayer.openContainer).getTileEntity(); if(te instanceof TileEntityStirlingGenerator) { TileEntityStirlingGenerator gen = (TileEntityStirlingGenerator) te; From 49b5462dc931b51bed751299ef1458fb13bd5531 Mon Sep 17 00:00:00 2001 From: Adaptivity Date: Tue, 27 Jan 2015 13:47:38 +0300 Subject: [PATCH 25/79] Delete unused textures --- resources/assets/enderio/entity/enderCreeper.png | Bin 2739 -> 0 bytes resources/assets/enderio/entity/enderminy.png | Bin 759 -> 0 bytes .../assets/enderio/entity/enderminy_eyes.png | Bin 1205 -> 0 bytes 3 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 resources/assets/enderio/entity/enderCreeper.png delete mode 100644 resources/assets/enderio/entity/enderminy.png delete mode 100644 resources/assets/enderio/entity/enderminy_eyes.png diff --git a/resources/assets/enderio/entity/enderCreeper.png b/resources/assets/enderio/entity/enderCreeper.png deleted file mode 100644 index 73404288be0afdb7a42e8110ab7e087545a90388..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2739 zcmV;k3QYBhP)pF8gxZibW?9;ba!ELWdKlNX>N2bPDNB8 zb~7$DE-^4L^m3s9017WjL_t(&L)}?hS6WFL?KQK~Yu0ooNjtf;ooH(iP>}mwF)A^! zH7bG#B8V3hMFc?v5djfIjAMTDo?Ru~5A%|F$!Mn5Itw`G)HzkVzHjgS6+e8fz1<69 z?mUORMj5foGo%`4(5-lpySczfc^B4V9N9({mPQKhY7&ms0Fvz*3b&UyYE;m9%=g>+ zmuH{~&Jlz>9L+R5S2-AhUX;JIVT%T#Ifx+hxsH)q3KNBG9A7tJUhyGSFC)>ee*XX{ zk7F1t#bJ&uquZjzL@ti&>uXFkvlwe-QEWG0blPCgt|Q*Az_GLd56>IfC)qmt{sC|@ ztgWRT*csZ^$}TL2Ybf2c;5k2lvk=E&vx@Y28I48*?RHy!PMoKqV`PMC`R^Y9T`mS? zI)Y-eei!PwO*zS_( z0AId*!T5SauC_D1hJ2%j5A`(M>6iq=yzG@Ajc-P9{JHu41F+L5VVi{ZD83AHZVwfP zzjI{?BP#)nMM7}!yDl3;?dA$r0^|()rBb*>RFwC=e*i4`Jvd4U3BXUA0km&#Bml)$ z9p?2QtS50eTZeFD6VR3u7;U6s3HdPD&cSoM{qO0F7(GdA`&SJAII!t0?dG=2LRQf4GT27;wG6*0-{e*mO5924XU zbjITS1K_D7adUeMBU8b0k;X146Ya6< zF`17`FCZsPaKaY__A9|fxoq&fn#RP=Gi8YHXdCSn}){&(7(KAoQO3z#$%bX8fhSoci7`fIvpb5@nww6VJDe$Df2QQ6UXlEzzRImE#0B36%^ao}TY8LJ`O~L_m zDf-~&vz#Allc0(9E+`>#F3oXIwJm&tI+wWzL9zb8(l5+NBScx~& zqj+V};b(*Ts{>T{rZHHK!+f%Z3#OK{o}#LxV2&)o$#l|@JGPiE4xZ~hj7j1h$Zo;H z^X1#C`v;)PL5RF}=C|b5R+mAAXH0{C^t~Yf|6K%V$t#A#HB@ig?CW**_jsa%m4sR$hY1r(|GZu)o) z&Ce$?w@3+9DkQl(2#aZJV{j=k+(MQak7vwb~ z`v}$1G2E^62Z9S6=SkVW*P@q1`s>U)yfkYi4|Rt5?b>`j4{dc1%H#@y)uX$rZzl*B z_+@Fh>Vbv$W?F{qVH3KU; z2iaE)XR)iPu=ABc@V1&_QBslhH5F?Qw%t5d86f@+W9=j2iwV-sS z!ewgc96Q7OcI_P}`JsJ8>1xBwQ2fx&OSd*oS@N7FQEyzpRNjH>>X4KDB*VCmEH5Uk z2+uM6*P&qqi5%98%~P?OPAgt7c+h{a3PWxiU8z+(U*iOw7KASH(1d+*x5&P}0s}2~ zpKl6w-wgDXT^I?x0PQ);Z!06IGt6(-=KghpNjf*-;l)0GN9z9kthQUQ9&N}CP~q*v zqCl#W)N(Ny0YjApo(>PlaGfZV@N#jCh5YE58N=h(ujFK86p%B_i!)4_kLdAw&^7beg>mNF^AWJWhv)Ir#u5fec%r|CHHT1%Axfb5 zE&DIc$Y%|%P$^PTj%OKf{2yhy$U#2jrr@B(UscQEJoE=n?OR5V55=Ba!}u62&N&=Qmu6P&Cc_CGfsJ^sL1(J=j zEXO;qdAQA-zH@Wk41ELh_nq$(dKV@onTfpspGXZ}+hY;c`)Q2%?!+X)cxf}B*E@+f zl)RZ`9|VxUPP=7fSjyYbNn*`Dd;oe6q7r~UmeOxYbRw*O`81AK@13j%N|M}Ebb*2- zEi^=?(bj29=a=KbbaKmsKuYot7CB0id;6>MA-<$grx zH4nFGN@7Q;B=glP$uJ`&GS1(;@ tmgo@@%`#NksQf*|$mzW18?_&P_&4LA&iMNd7pnjO002ovPDHLkV1hY6AhrMi diff --git a/resources/assets/enderio/entity/enderminy.png b/resources/assets/enderio/entity/enderminy.png deleted file mode 100644 index 9edb08918892c940b215f37478fd4d650bf75f2a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 759 zcmVN2bPDNB8 zb~7$DE-^4L^m3s900MJKL_t(&L*-UMP6ROw;}!b>e!z(vkK+kQe1X%xaZr$5c|A$n ztr+bfELmw1Cv`_i?9&L(Z?9XAkewcv%VkrdJVrb+1{n4HFF!!Uzw`n4;EIsds2)y2 zc3P-sjU;3>_)uM-XUI+q^_oS~7LRP~EoRFOs z>eW9)#Nh)~tkm8NRjX(CJPf=?d2|2A*X#EF`Lb!`dA2_4YtQTOc^I;X-+TZsWX$^a z%=G5r^Dtz0DsMhOM3Mr}t2%SmJgP=>_&f}}OQ{})e*xF)wXs)oa;HbH!RKM%ofVrP z%qUglwVuX%u2V)2J`Y27ud@AC&YD5&DUrEb0-m5^5-@=Jc#l`2QNjs1N+YGLA}Rix@y+@ z5B~sRgruJJD)*V5mbq(Ld-w++X)L4nGVSa<&k=*&576roqxqSBFf*y=s;_yaiL+{y zcRgT~JEF&nQEJd0&BR&juF=|zhOx)pe*rGg;n_ThHSK|!MthojUvsVX=DZf?9(TXw pw7J52_fVhF`bP0l+XkKYe+f? From ec46f22dc2c8ca84d8043af57ec0f30820e1d7bb Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Tue, 27 Jan 2015 18:17:46 -0500 Subject: [PATCH 26/79] Update AE2 API --- src/api/java/appeng/api/AEApi.java | 27 ++++++- src/api/java/appeng/api/IAppEngApi.java | 23 ++++++ src/api/java/appeng/api/README.md | 19 ----- .../appeng/api/config/AccessRestriction.java | 33 ++++++-- .../java/appeng/api/config/ActionItems.java | 23 ++++++ .../java/appeng/api/config/Actionable.java | 23 ++++++ .../appeng/api/config/CondenserOutput.java | 23 ++++++ src/api/java/appeng/api/config/CopyMode.java | 23 ++++++ .../java/appeng/api/config/FullnessMode.java | 23 ++++++ src/api/java/appeng/api/config/FuzzyMode.java | 29 ++++++- .../appeng/api/config/IncludeExclude.java | 23 ++++++ .../appeng/api/config/LevelEmitterMode.java | 23 ++++++ src/api/java/appeng/api/config/LevelType.java | 23 ++++++ .../java/appeng/api/config/ModSettings.java | 23 ++++++ .../appeng/api/config/NetworkEmitterMode.java | 23 ++++++ .../java/appeng/api/config/OperationMode.java | 23 ++++++ .../java/appeng/api/config/OutputMode.java | 23 ++++++ .../appeng/api/config/PowerMultiplier.java | 27 ++++++- .../java/appeng/api/config/PowerUnits.java | 27 ++++++- .../java/appeng/api/config/RedstoneMode.java | 23 ++++++ .../appeng/api/config/RelativeDirection.java | 23 ++++++ .../java/appeng/api/config/SearchBoxMode.java | 23 ++++++ .../api/config/SecurityPermissions.java | 29 ++++++- src/api/java/appeng/api/config/Settings.java | 60 ++++++++++---- src/api/java/appeng/api/config/SortDir.java | 23 ++++++ src/api/java/appeng/api/config/SortOrder.java | 23 ++++++ .../java/appeng/api/config/StorageFilter.java | 23 ++++++ .../java/appeng/api/config/TerminalStyle.java | 23 ++++++ .../java/appeng/api/config/TunnelType.java | 23 ++++++ src/api/java/appeng/api/config/Upgrades.java | 56 +++++++++++-- src/api/java/appeng/api/config/ViewItems.java | 23 ++++++ src/api/java/appeng/api/config/YesNo.java | 23 ++++++ .../java/appeng/api/definitions/Blocks.java | 23 ++++++ .../java/appeng/api/definitions/Items.java | 23 ++++++ .../appeng/api/definitions/Materials.java | 23 ++++++ .../java/appeng/api/definitions/Parts.java | 24 +++++- .../api/events/LocatableEventAnnounce.java | 27 ++++++- .../api/exceptions/AppEngException.java | 23 ++++++ .../api/exceptions/FailedConnection.java | 23 ++++++ .../exceptions/MissingIngredientError.java | 23 ++++++ .../api/exceptions/ModNotInstalled.java | 23 ++++++ .../appeng/api/exceptions/RecipeError.java | 23 ++++++ .../api/exceptions/RegistrationError.java | 23 ++++++ .../appeng/api/features/IGrinderEntry.java | 23 ++++++ .../appeng/api/features/IGrinderRegistry.java | 23 ++++++ .../appeng/api/features/IItemComparison.java | 23 ++++++ .../api/features/IItemComparisonProvider.java | 23 ++++++ .../java/appeng/api/features/ILocatable.java | 23 ++++++ .../api/features/ILocatableRegistry.java | 23 ++++++ .../features/IMatterCannonAmmoRegistry.java | 23 ++++++ .../api/features/INetworkEncodable.java | 23 ++++++ .../api/features/IP2PTunnelRegistry.java | 23 ++++++ .../appeng/api/features/IPlayerRegistry.java | 23 ++++++ .../api/features/IRecipeHandlerRegistry.java | 23 ++++++ .../api/features/IRegistryContainer.java | 23 ++++++ .../features/ISpecialComparisonRegistry.java | 23 ++++++ .../api/features/IWirelessTermHandler.java | 23 ++++++ .../api/features/IWirelessTermRegistry.java | 23 ++++++ .../java/appeng/api/features/IWorldGen.java | 23 ++++++ .../implementations/ICraftingPatternItem.java | 23 ++++++ .../implementations/IPowerChannelState.java | 23 ++++++ .../api/implementations/IUpgradeableHost.java | 23 ++++++ .../api/implementations/TransitionResult.java | 27 ++++++- .../implementations/guiobjects/IGuiItem.java | 23 ++++++ .../guiobjects/IGuiItemObject.java | 23 ++++++ .../guiobjects/INetworkTool.java | 23 ++++++ .../guiobjects/IPortableCell.java | 23 ++++++ .../items/IAEItemPowerStorage.java | 23 ++++++ .../api/implementations/items/IAEWrench.java | 23 ++++++ .../implementations/items/IBiometricCard.java | 23 ++++++ .../items/IGrowableCrystal.java | 23 ++++++ .../api/implementations/items/IItemGroup.java | 23 ++++++ .../implementations/items/IMemoryCard.java | 23 ++++++ .../items/ISpatialStorageCell.java | 23 ++++++ .../implementations/items/IStorageCell.java | 27 ++++++- .../items/IStorageComponent.java | 23 ++++++ .../implementations/items/IUpgradeModule.java | 23 ++++++ .../items/MemoryCardMessages.java | 23 ++++++ .../api/implementations/parts/IPartCable.java | 23 ++++++ .../implementations/parts/IPartMonitor.java | 23 ++++++ .../parts/IPartStorageMonitor.java | 25 +++++- .../implementations/tiles/IChestOrDrive.java | 23 ++++++ .../implementations/tiles/IColorableTile.java | 23 ++++++ .../tiles/ICraftingMachine.java | 23 ++++++ .../api/implementations/tiles/ICrankable.java | 23 ++++++ .../tiles/ICrystalGrowthAccelerator.java | 23 ++++++ .../api/implementations/tiles/IMEChest.java | 23 ++++++ .../tiles/ISegmentedInventory.java | 23 ++++++ .../tiles/ITileStorageMonitorable.java | 23 ++++++ .../tiles/IViewCellStorage.java | 23 ++++++ .../tiles/IWirelessAccessPoint.java | 23 ++++++ .../api/integration/IBeeComparison.java | 23 ++++++ .../appeng/api/movable/IMovableHandler.java | 23 ++++++ .../appeng/api/movable/IMovableRegistry.java | 23 ++++++ .../java/appeng/api/movable/IMovableTile.java | 23 ++++++ .../java/appeng/api/networking/GridFlags.java | 23 ++++++ .../api/networking/GridNotification.java | 23 ++++++ src/api/java/appeng/api/networking/IGrid.java | 23 ++++++ .../appeng/api/networking/IGridBlock.java | 23 ++++++ .../appeng/api/networking/IGridCache.java | 23 ++++++ .../api/networking/IGridCacheRegistry.java | 25 +++++- .../api/networking/IGridConnection.java | 23 ++++++ .../networking/IGridConnectionVisitor.java | 23 ++++++ .../java/appeng/api/networking/IGridHost.java | 25 +++++- .../api/networking/IGridMultiblock.java | 23 ++++++ .../java/appeng/api/networking/IGridNode.java | 23 ++++++ .../appeng/api/networking/IGridStorage.java | 23 ++++++ .../appeng/api/networking/IGridVisitor.java | 23 ++++++ .../appeng/api/networking/IMachineSet.java | 23 ++++++ .../networking/crafting/CraftingItemList.java | 23 ++++++ .../api/networking/crafting/ICraftingCPU.java | 23 ++++++ .../crafting/ICraftingCallback.java | 23 ++++++ .../networking/crafting/ICraftingGrid.java | 23 ++++++ .../api/networking/crafting/ICraftingJob.java | 23 ++++++ .../networking/crafting/ICraftingLink.java | 23 ++++++ .../networking/crafting/ICraftingMedium.java | 23 ++++++ .../crafting/ICraftingPatternDetails.java | 27 ++++++- .../crafting/ICraftingProvider.java | 23 ++++++ .../crafting/ICraftingProviderHelper.java | 23 ++++++ .../crafting/ICraftingRequester.java | 23 ++++++ .../networking/crafting/ICraftingWatcher.java | 23 ++++++ .../crafting/ICraftingWatcherHost.java | 23 ++++++ .../networking/energy/IAEPowerStorage.java | 23 ++++++ .../api/networking/energy/IEnergyGrid.java | 23 ++++++ .../energy/IEnergyGridProvider.java | 23 ++++++ .../api/networking/energy/IEnergySource.java | 23 ++++++ .../api/networking/energy/IEnergyWatcher.java | 23 ++++++ .../networking/energy/IEnergyWatcherHost.java | 23 ++++++ .../events/MENetworkBootingStatusChange.java | 23 ++++++ .../events/MENetworkCellArrayUpdate.java | 23 ++++++ .../events/MENetworkChannelChanged.java | 25 +++++- .../events/MENetworkChannelsChanged.java | 23 ++++++ .../events/MENetworkControllerChange.java | 23 ++++++ .../events/MENetworkCraftingCpuChange.java | 25 +++++- .../MENetworkCraftingPatternChange.java | 27 ++++++- .../api/networking/events/MENetworkEvent.java | 31 ++++++- .../events/MENetworkEventSubscribe.java | 23 ++++++ .../MENetworkPostCacheConstruction.java | 23 ++++++ .../events/MENetworkPowerIdleChange.java | 25 +++++- .../events/MENetworkPowerStatusChange.java | 23 ++++++ .../events/MENetworkPowerStorage.java | 27 ++++++- .../events/MENetworkSecurityChange.java | 23 ++++++ .../events/MENetworkSpatialEvent.java | 31 ++++++- .../events/MENetworkStorageEvent.java | 27 ++++++- .../networking/pathing/ControllerState.java | 23 ++++++ .../api/networking/pathing/IPathingGrid.java | 25 +++++- .../networking/security/BaseActionSource.java | 23 ++++++ .../api/networking/security/IActionHost.java | 23 ++++++ .../networking/security/ISecurityGrid.java | 23 ++++++ .../security/ISecurityProvider.java | 23 ++++++ .../security/ISecurityRegistry.java | 23 ++++++ .../networking/security/MachineSource.java | 25 +++++- .../api/networking/security/PlayerSource.java | 27 ++++++- .../api/networking/spatial/ISpatialCache.java | 23 ++++++ .../api/networking/storage/IBaseMonitor.java | 23 ++++++ .../api/networking/storage/IStackWatcher.java | 23 ++++++ .../networking/storage/IStackWatcherHost.java | 23 ++++++ .../api/networking/storage/IStorageGrid.java | 23 ++++++ .../api/networking/ticking/IGridTickable.java | 23 ++++++ .../api/networking/ticking/ITickManager.java | 23 ++++++ .../ticking/TickRateModulation.java | 23 ++++++ .../networking/ticking/TickingRequest.java | 31 ++++++- src/api/java/appeng/api/package-info.java | 23 ++++++ src/api/java/appeng/api/parts/BusSupport.java | 23 ++++++ .../appeng/api/parts/CableRenderMode.java | 25 +++++- .../java/appeng/api/parts/IAlphaPassItem.java | 23 ++++++ .../java/appeng/api/parts/IBoxProvider.java | 23 ++++++ .../appeng/api/parts/IFacadeContainer.java | 23 ++++++ .../java/appeng/api/parts/IFacadePart.java | 23 ++++++ src/api/java/appeng/api/parts/IPart.java | 23 ++++++ .../api/parts/IPartCollisionHelper.java | 23 ++++++ .../java/appeng/api/parts/IPartHelper.java | 23 ++++++ src/api/java/appeng/api/parts/IPartHost.java | 25 +++++- src/api/java/appeng/api/parts/IPartItem.java | 29 ++++++- .../appeng/api/parts/IPartRenderHelper.java | 23 ++++++ .../appeng/api/parts/ISimplifiedBundle.java | 23 ++++++ src/api/java/appeng/api/parts/LayerBase.java | 23 ++++++ src/api/java/appeng/api/parts/LayerFlags.java | 23 ++++++ .../java/appeng/api/parts/PartItemStack.java | 23 ++++++ .../java/appeng/api/parts/SelectedPart.java | 33 ++++++-- .../appeng/api/recipes/ICraftHandler.java | 23 ++++++ .../java/appeng/api/recipes/IIngredient.java | 25 +++++- .../appeng/api/recipes/IRecipeHandler.java | 23 ++++++ .../appeng/api/recipes/IRecipeLoader.java | 23 ++++++ .../appeng/api/recipes/ISubItemResolver.java | 23 ++++++ .../appeng/api/recipes/ResolverResult.java | 35 ++++++-- .../appeng/api/recipes/ResolverResultSet.java | 27 ++++++- .../appeng/api/storage/ICellContainer.java | 25 +++++- .../java/appeng/api/storage/ICellHandler.java | 23 ++++++ .../appeng/api/storage/ICellInventory.java | 23 ++++++ .../api/storage/ICellInventoryHandler.java | 23 ++++++ .../appeng/api/storage/ICellProvider.java | 23 ++++++ .../appeng/api/storage/ICellRegistry.java | 23 ++++++ .../api/storage/ICellWorkbenchItem.java | 23 ++++++ .../api/storage/IExternalStorageHandler.java | 23 ++++++ .../api/storage/IExternalStorageRegistry.java | 23 ++++++ .../java/appeng/api/storage/IMEInventory.java | 23 ++++++ .../api/storage/IMEInventoryHandler.java | 23 ++++++ .../java/appeng/api/storage/IMEMonitor.java | 23 ++++++ .../storage/IMEMonitorHandlerReceiver.java | 23 ++++++ .../appeng/api/storage/ISaveProvider.java | 23 ++++++ .../appeng/api/storage/IStorageHelper.java | 31 ++++++- .../api/storage/IStorageMonitorable.java | 23 ++++++ .../appeng/api/storage/ITerminalHost.java | 23 ++++++ .../appeng/api/storage/MEMonitorHandler.java | 81 ++++++++++++------- .../appeng/api/storage/StorageChannel.java | 25 +++++- .../api/storage/data/IAEFluidStack.java | 23 ++++++ .../appeng/api/storage/data/IAEItemStack.java | 23 ++++++ .../appeng/api/storage/data/IAEStack.java | 23 ++++++ .../api/storage/data/IAETagCompound.java | 23 ++++++ .../api/storage/data/IItemContainer.java | 23 ++++++ .../appeng/api/storage/data/IItemList.java | 23 ++++++ src/api/java/appeng/api/util/AECableType.java | 23 ++++++ src/api/java/appeng/api/util/AEColor.java | 33 ++++++-- .../api/util/AEColoredItemDefinition.java | 23 ++++++ .../appeng/api/util/AEItemDefinition.java | 23 ++++++ .../appeng/api/util/DimensionalCoord.java | 47 ++++++++--- src/api/java/appeng/api/util/ICommonTile.java | 23 ++++++ .../java/appeng/api/util/IConfigManager.java | 23 ++++++ .../appeng/api/util/IConfigurableObject.java | 23 ++++++ .../appeng/api/util/INetworkToolAgent.java | 23 ++++++ src/api/java/appeng/api/util/IOrientable.java | 23 ++++++ .../appeng/api/util/IOrientableBlock.java | 23 ++++++ .../appeng/api/util/IReadOnlyCollection.java | 23 ++++++ src/api/java/appeng/api/util/WorldCoord.java | 81 ++++++++++++------- 225 files changed, 5351 insertions(+), 197 deletions(-) delete mode 100644 src/api/java/appeng/api/README.md diff --git a/src/api/java/appeng/api/AEApi.java b/src/api/java/appeng/api/AEApi.java index 1a2e31bc..89ab041c 100644 --- a/src/api/java/appeng/api/AEApi.java +++ b/src/api/java/appeng/api/AEApi.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api; /** @@ -15,7 +38,7 @@ public class AEApi /** * API Entry Point. * - * @return the {@link IAppEngApi} or null if the instance could not be retrieved + * @return the {@link IAppEngApi} or null if the INSTANCE could not be retrieved */ public static IAppEngApi instance() { @@ -24,7 +47,7 @@ public class AEApi try { Class c = Class.forName( "appeng.core.Api" ); - api = (IAppEngApi) c.getField( "instance" ).get( c ); + api = (IAppEngApi) c.getField( "INSTANCE" ).get( c ); } catch (Throwable e) { diff --git a/src/api/java/appeng/api/IAppEngApi.java b/src/api/java/appeng/api/IAppEngApi.java index c8546bdb..f791028a 100644 --- a/src/api/java/appeng/api/IAppEngApi.java +++ b/src/api/java/appeng/api/IAppEngApi.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api; import appeng.api.definitions.Blocks; diff --git a/src/api/java/appeng/api/README.md b/src/api/java/appeng/api/README.md deleted file mode 100644 index 2c43544e..00000000 --- a/src/api/java/appeng/api/README.md +++ /dev/null @@ -1,19 +0,0 @@ -Applied-Energistics-2-API -========================= - -The API for Applied Energistics 2. It is open source to discuss changes, improve documentation, and provide better add-on support in general. - -Development and standard builds can be obtained [Here](http://ae2.ae-mod.info/Downloads/). - -Maven -========================= - -When compiling against the AE2 API you can use gradle dependencies, just add - -dependencies { - compile "appeng:appliedenergistics2:rv_-_____-__:dev" -} - -or add the compile line to your existing dependencies task to your build.gradle - -Where the __ are filled in with the correct version criteria; AE2 is available from the default forge maven so no additional repositories are necessary. diff --git a/src/api/java/appeng/api/config/AccessRestriction.java b/src/api/java/appeng/api/config/AccessRestriction.java index 4867b539..12ff41e4 100644 --- a/src/api/java/appeng/api/config/AccessRestriction.java +++ b/src/api/java/appeng/api/config/AccessRestriction.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.config; public enum AccessRestriction @@ -7,27 +30,27 @@ public enum AccessRestriction private final int permissionBit; private AccessRestriction(int v) { - permissionBit = v; + this.permissionBit = v; } public boolean hasPermission(AccessRestriction ar) { - return (permissionBit & ar.permissionBit) == ar.permissionBit; + return ( this.permissionBit & ar.permissionBit) == ar.permissionBit; } public AccessRestriction restrictPermissions(AccessRestriction ar) { - return getPermByBit( permissionBit & ar.permissionBit); + return this.getPermByBit( this.permissionBit & ar.permissionBit); } public AccessRestriction addPermissions(AccessRestriction ar) { - return getPermByBit( permissionBit | ar.permissionBit); + return this.getPermByBit( this.permissionBit | ar.permissionBit); } public AccessRestriction removePermissions(AccessRestriction ar) { - return getPermByBit( permissionBit & (~ar.permissionBit) ); + return this.getPermByBit( this.permissionBit & (~ar.permissionBit) ); } private AccessRestriction getPermByBit(int bit) diff --git a/src/api/java/appeng/api/config/ActionItems.java b/src/api/java/appeng/api/config/ActionItems.java index 1a565910..07f2cc50 100644 --- a/src/api/java/appeng/api/config/ActionItems.java +++ b/src/api/java/appeng/api/config/ActionItems.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.config; public enum ActionItems diff --git a/src/api/java/appeng/api/config/Actionable.java b/src/api/java/appeng/api/config/Actionable.java index ce798f62..92089aed 100644 --- a/src/api/java/appeng/api/config/Actionable.java +++ b/src/api/java/appeng/api/config/Actionable.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.config; public enum Actionable diff --git a/src/api/java/appeng/api/config/CondenserOutput.java b/src/api/java/appeng/api/config/CondenserOutput.java index e2c501d4..db2b3983 100644 --- a/src/api/java/appeng/api/config/CondenserOutput.java +++ b/src/api/java/appeng/api/config/CondenserOutput.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.config; diff --git a/src/api/java/appeng/api/config/CopyMode.java b/src/api/java/appeng/api/config/CopyMode.java index 31cda813..45d0f7bb 100644 --- a/src/api/java/appeng/api/config/CopyMode.java +++ b/src/api/java/appeng/api/config/CopyMode.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.config; public enum CopyMode diff --git a/src/api/java/appeng/api/config/FullnessMode.java b/src/api/java/appeng/api/config/FullnessMode.java index 43b22bc4..3bd9ed64 100644 --- a/src/api/java/appeng/api/config/FullnessMode.java +++ b/src/api/java/appeng/api/config/FullnessMode.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.config; public enum FullnessMode diff --git a/src/api/java/appeng/api/config/FuzzyMode.java b/src/api/java/appeng/api/config/FuzzyMode.java index e5fa8ce7..37c68d35 100644 --- a/src/api/java/appeng/api/config/FuzzyMode.java +++ b/src/api/java/appeng/api/config/FuzzyMode.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.config; public enum FuzzyMode @@ -9,13 +32,13 @@ public enum FuzzyMode final public float percentage; private FuzzyMode(float p) { - percentage = p; - breakPoint = p / 100.0f; + this.percentage = p; + this.breakPoint = p / 100.0f; } public int calculateBreakPoint(int maxDamage) { - return (int) ((percentage * maxDamage) / 100.0f); + return (int) (( this.percentage * maxDamage) / 100.0f); } } \ No newline at end of file diff --git a/src/api/java/appeng/api/config/IncludeExclude.java b/src/api/java/appeng/api/config/IncludeExclude.java index 3e74db9a..07a3e12f 100644 --- a/src/api/java/appeng/api/config/IncludeExclude.java +++ b/src/api/java/appeng/api/config/IncludeExclude.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.config; public enum IncludeExclude diff --git a/src/api/java/appeng/api/config/LevelEmitterMode.java b/src/api/java/appeng/api/config/LevelEmitterMode.java index 46709c8a..70606ff0 100644 --- a/src/api/java/appeng/api/config/LevelEmitterMode.java +++ b/src/api/java/appeng/api/config/LevelEmitterMode.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.config; public enum LevelEmitterMode diff --git a/src/api/java/appeng/api/config/LevelType.java b/src/api/java/appeng/api/config/LevelType.java index 58d1a6b1..ee2671ba 100644 --- a/src/api/java/appeng/api/config/LevelType.java +++ b/src/api/java/appeng/api/config/LevelType.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.config; public enum LevelType diff --git a/src/api/java/appeng/api/config/ModSettings.java b/src/api/java/appeng/api/config/ModSettings.java index 9b578dc0..5d6db7e0 100644 --- a/src/api/java/appeng/api/config/ModSettings.java +++ b/src/api/java/appeng/api/config/ModSettings.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.config; public enum ModSettings diff --git a/src/api/java/appeng/api/config/NetworkEmitterMode.java b/src/api/java/appeng/api/config/NetworkEmitterMode.java index 19ae7023..85e1cc74 100644 --- a/src/api/java/appeng/api/config/NetworkEmitterMode.java +++ b/src/api/java/appeng/api/config/NetworkEmitterMode.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.config; public enum NetworkEmitterMode diff --git a/src/api/java/appeng/api/config/OperationMode.java b/src/api/java/appeng/api/config/OperationMode.java index f6d80ea5..ea4ebb0d 100644 --- a/src/api/java/appeng/api/config/OperationMode.java +++ b/src/api/java/appeng/api/config/OperationMode.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.config; public enum OperationMode diff --git a/src/api/java/appeng/api/config/OutputMode.java b/src/api/java/appeng/api/config/OutputMode.java index ebb8cda8..5a645e2a 100644 --- a/src/api/java/appeng/api/config/OutputMode.java +++ b/src/api/java/appeng/api/config/OutputMode.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.config; public enum OutputMode diff --git a/src/api/java/appeng/api/config/PowerMultiplier.java b/src/api/java/appeng/api/config/PowerMultiplier.java index d1a6800c..28b7e06f 100644 --- a/src/api/java/appeng/api/config/PowerMultiplier.java +++ b/src/api/java/appeng/api/config/PowerMultiplier.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.config; public enum PowerMultiplier @@ -11,11 +34,11 @@ public enum PowerMultiplier public double multiply(double in) { - return in * multiplier; + return in * this.multiplier; } public double divide(double in) { - return in / multiplier; + return in / this.multiplier; } } diff --git a/src/api/java/appeng/api/config/PowerUnits.java b/src/api/java/appeng/api/config/PowerUnits.java index edcf5d71..614d3feb 100644 --- a/src/api/java/appeng/api/config/PowerUnits.java +++ b/src/api/java/appeng/api/config/PowerUnits.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.config; public enum PowerUnits @@ -10,7 +33,7 @@ public enum PowerUnits MK("gui.appliedenergistics2.units.mekanism"); // Mekanism - Joules private PowerUnits(String un) { - unlocalizedName = un; + this.unlocalizedName = un; } /** @@ -36,7 +59,7 @@ public enum PowerUnits */ public double convertTo(PowerUnits target, double value) { - return (value * conversionRatio) / target.conversionRatio; + return (value * this.conversionRatio ) / target.conversionRatio; } } \ No newline at end of file diff --git a/src/api/java/appeng/api/config/RedstoneMode.java b/src/api/java/appeng/api/config/RedstoneMode.java index 91be1156..7aadd911 100644 --- a/src/api/java/appeng/api/config/RedstoneMode.java +++ b/src/api/java/appeng/api/config/RedstoneMode.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.config; public enum RedstoneMode diff --git a/src/api/java/appeng/api/config/RelativeDirection.java b/src/api/java/appeng/api/config/RelativeDirection.java index 6b02c3de..41909d6d 100644 --- a/src/api/java/appeng/api/config/RelativeDirection.java +++ b/src/api/java/appeng/api/config/RelativeDirection.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.config; public enum RelativeDirection diff --git a/src/api/java/appeng/api/config/SearchBoxMode.java b/src/api/java/appeng/api/config/SearchBoxMode.java index 64fc28f6..29766196 100644 --- a/src/api/java/appeng/api/config/SearchBoxMode.java +++ b/src/api/java/appeng/api/config/SearchBoxMode.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.config; public enum SearchBoxMode diff --git a/src/api/java/appeng/api/config/SecurityPermissions.java b/src/api/java/appeng/api/config/SecurityPermissions.java index 85d35740..cd76ad1a 100644 --- a/src/api/java/appeng/api/config/SecurityPermissions.java +++ b/src/api/java/appeng/api/config/SecurityPermissions.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.config; /** @@ -33,15 +56,15 @@ public enum SecurityPermissions */ SECURITY; - final private String unlocalizedName = "gui.appliedenergistics2.security." + name().toLowerCase(); + final private String unlocalizedName = "gui.appliedenergistics2.security." + this.name().toLowerCase(); public String getUnlocalizedName() { - return unlocalizedName + ".name"; + return this.unlocalizedName + ".name"; } public String getUnlocalizedTip() { - return unlocalizedName + ".tip"; + return this.unlocalizedName + ".tip"; } } diff --git a/src/api/java/appeng/api/config/Settings.java b/src/api/java/appeng/api/config/Settings.java index 691ad807..f755c7c0 100644 --- a/src/api/java/appeng/api/config/Settings.java +++ b/src/api/java/appeng/api/config/Settings.java @@ -1,46 +1,72 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.config; + import java.util.EnumSet; + public enum Settings { - LEVEL_EMITTER_MODE(EnumSet.allOf( LevelEmitterMode.class )), + LEVEL_EMITTER_MODE( EnumSet.allOf( LevelEmitterMode.class ) ), - REDSTONE_EMITTER(EnumSet.of( RedstoneMode.HIGH_SIGNAL, RedstoneMode.LOW_SIGNAL )), REDSTONE_CONTROLLED(EnumSet.allOf( RedstoneMode.class )), + REDSTONE_EMITTER( EnumSet.of( RedstoneMode.HIGH_SIGNAL, RedstoneMode.LOW_SIGNAL ) ), REDSTONE_CONTROLLED( EnumSet.allOf( RedstoneMode.class ) ), - CONDENSER_OUTPUT(EnumSet.allOf( CondenserOutput.class )), + CONDENSER_OUTPUT( EnumSet.allOf( CondenserOutput.class ) ), - POWER_UNITS(EnumSet.allOf( PowerUnits.class )), ACCESS(EnumSet.of( AccessRestriction.READ_WRITE, AccessRestriction.READ, AccessRestriction.WRITE )), + POWER_UNITS( EnumSet.allOf( PowerUnits.class ) ), ACCESS( EnumSet.of( AccessRestriction.READ_WRITE, AccessRestriction.READ, AccessRestriction.WRITE ) ), - SORT_DIRECTION(EnumSet.allOf( SortDir.class )), SORT_BY(EnumSet.allOf( SortOrder.class )), + SORT_DIRECTION( EnumSet.allOf( SortDir.class ) ), SORT_BY( EnumSet.allOf( SortOrder.class ) ), - SEARCH_TOOLTIPS(EnumSet.of( YesNo.YES, YesNo.NO )), VIEW_MODE(EnumSet.allOf( ViewItems.class )), SEARCH_MODE(EnumSet.allOf( SearchBoxMode.class )), + SEARCH_TOOLTIPS( EnumSet.of( YesNo.YES, YesNo.NO ) ), VIEW_MODE( EnumSet.allOf( ViewItems.class ) ), SEARCH_MODE( EnumSet.allOf( SearchBoxMode.class ) ), - ACTIONS(EnumSet.allOf( ActionItems.class )), IO_DIRECTION(EnumSet.of( RelativeDirection.LEFT, RelativeDirection.RIGHT )), + ACTIONS( EnumSet.allOf( ActionItems.class ) ), IO_DIRECTION( EnumSet.of( RelativeDirection.LEFT, RelativeDirection.RIGHT ) ), - BLOCK(EnumSet.of( YesNo.YES, YesNo.NO )), OPERATION_MODE(EnumSet.allOf( OperationMode.class )), + BLOCK( EnumSet.of( YesNo.YES, YesNo.NO ) ), OPERATION_MODE( EnumSet.allOf( OperationMode.class ) ), - FULLNESS_MODE(EnumSet.allOf( FullnessMode.class )), CRAFT_ONLY(EnumSet.of( YesNo.YES, YesNo.NO )), + FULLNESS_MODE( EnumSet.allOf( FullnessMode.class ) ), CRAFT_ONLY( EnumSet.of( YesNo.YES, YesNo.NO ) ), - FUZZY_MODE(EnumSet.allOf( FuzzyMode.class )), LEVEL_TYPE(EnumSet.allOf( LevelType.class )), + FUZZY_MODE( EnumSet.allOf( FuzzyMode.class ) ), LEVEL_TYPE( EnumSet.allOf( LevelType.class ) ), - TERMINAL_STYLE(EnumSet.of( TerminalStyle.TALL, TerminalStyle.SMALL )), COPY_MODE(EnumSet.allOf( CopyMode.class )), + TERMINAL_STYLE( EnumSet.of( TerminalStyle.TALL, TerminalStyle.SMALL ) ), COPY_MODE( EnumSet.allOf( CopyMode.class ) ), - INTERFACE_TERMINAL(EnumSet.of( YesNo.YES, YesNo.NO )), CRAFT_VIA_REDSTONE(EnumSet.of( YesNo.YES, YesNo.NO )), + INTERFACE_TERMINAL( EnumSet.of( YesNo.YES, YesNo.NO ) ), CRAFT_VIA_REDSTONE( EnumSet.of( YesNo.YES, YesNo.NO ) ), - STORAGE_FILTER(EnumSet.allOf( StorageFilter.class )); + STORAGE_FILTER( EnumSet.allOf( StorageFilter.class ) ), PLACE_BLOCK( EnumSet.of( YesNo.YES, YesNo.NO ) ); - private EnumSet values; + private final EnumSet values; public EnumSet getPossibleValues() { - return values; + return this.values; } - private Settings(EnumSet set) { + private Settings( EnumSet set ) + { if ( set == null || set.isEmpty() ) throw new RuntimeException( "Invalid configuration." ); - values = set; + this.values = set; } } diff --git a/src/api/java/appeng/api/config/SortDir.java b/src/api/java/appeng/api/config/SortDir.java index 140393bb..71f36b45 100644 --- a/src/api/java/appeng/api/config/SortDir.java +++ b/src/api/java/appeng/api/config/SortDir.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.config; public enum SortDir diff --git a/src/api/java/appeng/api/config/SortOrder.java b/src/api/java/appeng/api/config/SortOrder.java index 90d72c96..a2f3f937 100644 --- a/src/api/java/appeng/api/config/SortOrder.java +++ b/src/api/java/appeng/api/config/SortOrder.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.config; public enum SortOrder diff --git a/src/api/java/appeng/api/config/StorageFilter.java b/src/api/java/appeng/api/config/StorageFilter.java index 3b8f588f..1dfabea5 100644 --- a/src/api/java/appeng/api/config/StorageFilter.java +++ b/src/api/java/appeng/api/config/StorageFilter.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.config; public enum StorageFilter diff --git a/src/api/java/appeng/api/config/TerminalStyle.java b/src/api/java/appeng/api/config/TerminalStyle.java index 147aa9c9..b941e24c 100644 --- a/src/api/java/appeng/api/config/TerminalStyle.java +++ b/src/api/java/appeng/api/config/TerminalStyle.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.config; public enum TerminalStyle diff --git a/src/api/java/appeng/api/config/TunnelType.java b/src/api/java/appeng/api/config/TunnelType.java index f45b9874..f4b39999 100644 --- a/src/api/java/appeng/api/config/TunnelType.java +++ b/src/api/java/appeng/api/config/TunnelType.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.config; public enum TunnelType diff --git a/src/api/java/appeng/api/config/Upgrades.java b/src/api/java/appeng/api/config/Upgrades.java index cd3a2d22..e5287398 100644 --- a/src/api/java/appeng/api/config/Upgrades.java +++ b/src/api/java/appeng/api/config/Upgrades.java @@ -1,26 +1,54 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.config; + import java.util.HashMap; import net.minecraft.item.ItemStack; +import appeng.api.util.AEItemDefinition; + + public enum Upgrades { /** * Gold Tier Upgrades. */ - CAPACITY(0), REDSTONE(0), CRAFTING(0), + CAPACITY( 0 ), REDSTONE( 0 ), CRAFTING( 0 ), /** * Diamond Tier Upgrades. */ - FUZZY(1), SPEED(1), INVERTER(1); + FUZZY( 1 ), SPEED( 1 ), INVERTER( 1 ); public final int myTier; public final HashMap supportedMax = new HashMap(); - private Upgrades(int tier) { - myTier = tier; + private Upgrades( int tier ) + { + this.myTier = tier; } /** @@ -28,12 +56,26 @@ public enum Upgrades */ public HashMap getSupported() { - return supportedMax; + return this.supportedMax; } - public void registerItem(ItemStack myItem, int maxSupported) + + + public void registerItem( AEItemDefinition myItem, int maxSupported ) { if ( myItem != null ) - supportedMax.put( myItem, maxSupported ); + { + final ItemStack stack = myItem.stack( 1 ); + + this.registerItem( stack, maxSupported ); + } + } + + public void registerItem( ItemStack stack, int maxSupported ) + { + if ( stack != null ) + { + this.supportedMax.put( stack, maxSupported ); + } } } diff --git a/src/api/java/appeng/api/config/ViewItems.java b/src/api/java/appeng/api/config/ViewItems.java index ffb2e203..6f39dcb0 100644 --- a/src/api/java/appeng/api/config/ViewItems.java +++ b/src/api/java/appeng/api/config/ViewItems.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.config; public enum ViewItems diff --git a/src/api/java/appeng/api/config/YesNo.java b/src/api/java/appeng/api/config/YesNo.java index ccb35bd5..e4990e6f 100644 --- a/src/api/java/appeng/api/config/YesNo.java +++ b/src/api/java/appeng/api/config/YesNo.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.config; public enum YesNo diff --git a/src/api/java/appeng/api/definitions/Blocks.java b/src/api/java/appeng/api/definitions/Blocks.java index d850e6dc..06f1cc86 100644 --- a/src/api/java/appeng/api/definitions/Blocks.java +++ b/src/api/java/appeng/api/definitions/Blocks.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.definitions; import appeng.api.util.AEItemDefinition; diff --git a/src/api/java/appeng/api/definitions/Items.java b/src/api/java/appeng/api/definitions/Items.java index f0b6a2ab..cfb53797 100644 --- a/src/api/java/appeng/api/definitions/Items.java +++ b/src/api/java/appeng/api/definitions/Items.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.definitions; import appeng.api.util.AEColoredItemDefinition; diff --git a/src/api/java/appeng/api/definitions/Materials.java b/src/api/java/appeng/api/definitions/Materials.java index b6ae52c4..ad00f9c1 100644 --- a/src/api/java/appeng/api/definitions/Materials.java +++ b/src/api/java/appeng/api/definitions/Materials.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.definitions; import appeng.api.util.AEItemDefinition; diff --git a/src/api/java/appeng/api/definitions/Parts.java b/src/api/java/appeng/api/definitions/Parts.java index 00d6dad2..d6905418 100644 --- a/src/api/java/appeng/api/definitions/Parts.java +++ b/src/api/java/appeng/api/definitions/Parts.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.definitions; import appeng.api.util.AEColoredItemDefinition; @@ -50,5 +73,4 @@ public class Parts public AEItemDefinition partTerminal; public AEItemDefinition partStorageMonitor; public AEItemDefinition partConversionMonitor; - } diff --git a/src/api/java/appeng/api/events/LocatableEventAnnounce.java b/src/api/java/appeng/api/events/LocatableEventAnnounce.java index af9b6f85..7dca6d38 100644 --- a/src/api/java/appeng/api/events/LocatableEventAnnounce.java +++ b/src/api/java/appeng/api/events/LocatableEventAnnounce.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.events; import appeng.api.features.ILocatable; @@ -21,8 +44,8 @@ public class LocatableEventAnnounce extends Event final public LocatableEvent change; public LocatableEventAnnounce(ILocatable o, LocatableEvent ev) { - target = o; - change = ev; + this.target = o; + this.change = ev; } } diff --git a/src/api/java/appeng/api/exceptions/AppEngException.java b/src/api/java/appeng/api/exceptions/AppEngException.java index 9c3d9ea9..9b00693f 100644 --- a/src/api/java/appeng/api/exceptions/AppEngException.java +++ b/src/api/java/appeng/api/exceptions/AppEngException.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.exceptions; public class AppEngException extends Exception diff --git a/src/api/java/appeng/api/exceptions/FailedConnection.java b/src/api/java/appeng/api/exceptions/FailedConnection.java index f4abed64..53c71866 100644 --- a/src/api/java/appeng/api/exceptions/FailedConnection.java +++ b/src/api/java/appeng/api/exceptions/FailedConnection.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.exceptions; public class FailedConnection extends Exception diff --git a/src/api/java/appeng/api/exceptions/MissingIngredientError.java b/src/api/java/appeng/api/exceptions/MissingIngredientError.java index 51a200a0..6cc411bc 100644 --- a/src/api/java/appeng/api/exceptions/MissingIngredientError.java +++ b/src/api/java/appeng/api/exceptions/MissingIngredientError.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.exceptions; public class MissingIngredientError extends Exception { diff --git a/src/api/java/appeng/api/exceptions/ModNotInstalled.java b/src/api/java/appeng/api/exceptions/ModNotInstalled.java index 7744a1fb..f0b5ff1c 100644 --- a/src/api/java/appeng/api/exceptions/ModNotInstalled.java +++ b/src/api/java/appeng/api/exceptions/ModNotInstalled.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.exceptions; public class ModNotInstalled extends Exception diff --git a/src/api/java/appeng/api/exceptions/RecipeError.java b/src/api/java/appeng/api/exceptions/RecipeError.java index a07f6438..d92ac2d9 100644 --- a/src/api/java/appeng/api/exceptions/RecipeError.java +++ b/src/api/java/appeng/api/exceptions/RecipeError.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.exceptions; public class RecipeError extends Exception diff --git a/src/api/java/appeng/api/exceptions/RegistrationError.java b/src/api/java/appeng/api/exceptions/RegistrationError.java index 30592ba0..a8cd023e 100644 --- a/src/api/java/appeng/api/exceptions/RegistrationError.java +++ b/src/api/java/appeng/api/exceptions/RegistrationError.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.exceptions; public class RegistrationError extends Exception diff --git a/src/api/java/appeng/api/features/IGrinderEntry.java b/src/api/java/appeng/api/features/IGrinderEntry.java index a7549f2f..e5215f4e 100644 --- a/src/api/java/appeng/api/features/IGrinderEntry.java +++ b/src/api/java/appeng/api/features/IGrinderEntry.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.features; import net.minecraft.item.ItemStack; diff --git a/src/api/java/appeng/api/features/IGrinderRegistry.java b/src/api/java/appeng/api/features/IGrinderRegistry.java index e34a9225..0a13d7eb 100644 --- a/src/api/java/appeng/api/features/IGrinderRegistry.java +++ b/src/api/java/appeng/api/features/IGrinderRegistry.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.features; import net.minecraft.item.ItemStack; diff --git a/src/api/java/appeng/api/features/IItemComparison.java b/src/api/java/appeng/api/features/IItemComparison.java index 856049cc..73c898e5 100644 --- a/src/api/java/appeng/api/features/IItemComparison.java +++ b/src/api/java/appeng/api/features/IItemComparison.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.features; public interface IItemComparison diff --git a/src/api/java/appeng/api/features/IItemComparisonProvider.java b/src/api/java/appeng/api/features/IItemComparisonProvider.java index 6b7a11b1..d574807d 100644 --- a/src/api/java/appeng/api/features/IItemComparisonProvider.java +++ b/src/api/java/appeng/api/features/IItemComparisonProvider.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.features; import net.minecraft.item.ItemStack; diff --git a/src/api/java/appeng/api/features/ILocatable.java b/src/api/java/appeng/api/features/ILocatable.java index e81ff42e..6a42822a 100644 --- a/src/api/java/appeng/api/features/ILocatable.java +++ b/src/api/java/appeng/api/features/ILocatable.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.features; import appeng.api.events.LocatableEventAnnounce; diff --git a/src/api/java/appeng/api/features/ILocatableRegistry.java b/src/api/java/appeng/api/features/ILocatableRegistry.java index c07b2300..1531379f 100644 --- a/src/api/java/appeng/api/features/ILocatableRegistry.java +++ b/src/api/java/appeng/api/features/ILocatableRegistry.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.features; /** diff --git a/src/api/java/appeng/api/features/IMatterCannonAmmoRegistry.java b/src/api/java/appeng/api/features/IMatterCannonAmmoRegistry.java index 18d9683c..46c2af72 100644 --- a/src/api/java/appeng/api/features/IMatterCannonAmmoRegistry.java +++ b/src/api/java/appeng/api/features/IMatterCannonAmmoRegistry.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.features; import net.minecraft.item.ItemStack; diff --git a/src/api/java/appeng/api/features/INetworkEncodable.java b/src/api/java/appeng/api/features/INetworkEncodable.java index 2fa66bf9..b172c046 100644 --- a/src/api/java/appeng/api/features/INetworkEncodable.java +++ b/src/api/java/appeng/api/features/INetworkEncodable.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.features; import net.minecraft.item.ItemStack; diff --git a/src/api/java/appeng/api/features/IP2PTunnelRegistry.java b/src/api/java/appeng/api/features/IP2PTunnelRegistry.java index e1c85c71..d1e3fba9 100644 --- a/src/api/java/appeng/api/features/IP2PTunnelRegistry.java +++ b/src/api/java/appeng/api/features/IP2PTunnelRegistry.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.features; import net.minecraft.item.ItemStack; diff --git a/src/api/java/appeng/api/features/IPlayerRegistry.java b/src/api/java/appeng/api/features/IPlayerRegistry.java index d52b0a03..c2c0d254 100644 --- a/src/api/java/appeng/api/features/IPlayerRegistry.java +++ b/src/api/java/appeng/api/features/IPlayerRegistry.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.features; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/api/java/appeng/api/features/IRecipeHandlerRegistry.java b/src/api/java/appeng/api/features/IRecipeHandlerRegistry.java index ee8324bb..2332982b 100644 --- a/src/api/java/appeng/api/features/IRecipeHandlerRegistry.java +++ b/src/api/java/appeng/api/features/IRecipeHandlerRegistry.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.features; import appeng.api.recipes.ICraftHandler; diff --git a/src/api/java/appeng/api/features/IRegistryContainer.java b/src/api/java/appeng/api/features/IRegistryContainer.java index c2a74e7f..ada1d22b 100644 --- a/src/api/java/appeng/api/features/IRegistryContainer.java +++ b/src/api/java/appeng/api/features/IRegistryContainer.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.features; import appeng.api.movable.IMovableRegistry; diff --git a/src/api/java/appeng/api/features/ISpecialComparisonRegistry.java b/src/api/java/appeng/api/features/ISpecialComparisonRegistry.java index c51d85b4..eb274f33 100644 --- a/src/api/java/appeng/api/features/ISpecialComparisonRegistry.java +++ b/src/api/java/appeng/api/features/ISpecialComparisonRegistry.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.features; import net.minecraft.item.ItemStack; diff --git a/src/api/java/appeng/api/features/IWirelessTermHandler.java b/src/api/java/appeng/api/features/IWirelessTermHandler.java index 7c29ea48..0fa499b8 100644 --- a/src/api/java/appeng/api/features/IWirelessTermHandler.java +++ b/src/api/java/appeng/api/features/IWirelessTermHandler.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.features; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/api/java/appeng/api/features/IWirelessTermRegistry.java b/src/api/java/appeng/api/features/IWirelessTermRegistry.java index 9d6d911b..078f58e2 100644 --- a/src/api/java/appeng/api/features/IWirelessTermRegistry.java +++ b/src/api/java/appeng/api/features/IWirelessTermRegistry.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.features; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/api/java/appeng/api/features/IWorldGen.java b/src/api/java/appeng/api/features/IWorldGen.java index cadc56a7..5dfbb512 100644 --- a/src/api/java/appeng/api/features/IWorldGen.java +++ b/src/api/java/appeng/api/features/IWorldGen.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.features; import net.minecraft.world.World; diff --git a/src/api/java/appeng/api/implementations/ICraftingPatternItem.java b/src/api/java/appeng/api/implementations/ICraftingPatternItem.java index c3d0a52e..db98ffe5 100644 --- a/src/api/java/appeng/api/implementations/ICraftingPatternItem.java +++ b/src/api/java/appeng/api/implementations/ICraftingPatternItem.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.implementations; import net.minecraft.item.Item; diff --git a/src/api/java/appeng/api/implementations/IPowerChannelState.java b/src/api/java/appeng/api/implementations/IPowerChannelState.java index b17f9251..77522db2 100644 --- a/src/api/java/appeng/api/implementations/IPowerChannelState.java +++ b/src/api/java/appeng/api/implementations/IPowerChannelState.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.implementations; /** diff --git a/src/api/java/appeng/api/implementations/IUpgradeableHost.java b/src/api/java/appeng/api/implementations/IUpgradeableHost.java index 45a98af1..553c98b8 100644 --- a/src/api/java/appeng/api/implementations/IUpgradeableHost.java +++ b/src/api/java/appeng/api/implementations/IUpgradeableHost.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.implementations; import appeng.api.util.IConfigurableObject; diff --git a/src/api/java/appeng/api/implementations/TransitionResult.java b/src/api/java/appeng/api/implementations/TransitionResult.java index bc1e5e1f..f9fd8370 100644 --- a/src/api/java/appeng/api/implementations/TransitionResult.java +++ b/src/api/java/appeng/api/implementations/TransitionResult.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.implementations; /** @@ -10,7 +33,7 @@ public class TransitionResult public final double energyUsage; public TransitionResult(boolean _success, double power) { - success = _success; - energyUsage = power; + this.success = _success; + this.energyUsage = power; } } diff --git a/src/api/java/appeng/api/implementations/guiobjects/IGuiItem.java b/src/api/java/appeng/api/implementations/guiobjects/IGuiItem.java index 5ee7a832..bbc0c88e 100644 --- a/src/api/java/appeng/api/implementations/guiobjects/IGuiItem.java +++ b/src/api/java/appeng/api/implementations/guiobjects/IGuiItem.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.implementations.guiobjects; import net.minecraft.item.ItemStack; diff --git a/src/api/java/appeng/api/implementations/guiobjects/IGuiItemObject.java b/src/api/java/appeng/api/implementations/guiobjects/IGuiItemObject.java index 1b1dfe64..88023fa0 100644 --- a/src/api/java/appeng/api/implementations/guiobjects/IGuiItemObject.java +++ b/src/api/java/appeng/api/implementations/guiobjects/IGuiItemObject.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.implementations.guiobjects; import net.minecraft.item.ItemStack; diff --git a/src/api/java/appeng/api/implementations/guiobjects/INetworkTool.java b/src/api/java/appeng/api/implementations/guiobjects/INetworkTool.java index b4d19999..ef6a0ac3 100644 --- a/src/api/java/appeng/api/implementations/guiobjects/INetworkTool.java +++ b/src/api/java/appeng/api/implementations/guiobjects/INetworkTool.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.implementations.guiobjects; import net.minecraft.inventory.IInventory; diff --git a/src/api/java/appeng/api/implementations/guiobjects/IPortableCell.java b/src/api/java/appeng/api/implementations/guiobjects/IPortableCell.java index 779e741c..b3f18c93 100644 --- a/src/api/java/appeng/api/implementations/guiobjects/IPortableCell.java +++ b/src/api/java/appeng/api/implementations/guiobjects/IPortableCell.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.implementations.guiobjects; import appeng.api.networking.energy.IEnergySource; diff --git a/src/api/java/appeng/api/implementations/items/IAEItemPowerStorage.java b/src/api/java/appeng/api/implementations/items/IAEItemPowerStorage.java index 5ab2ac99..999e696b 100644 --- a/src/api/java/appeng/api/implementations/items/IAEItemPowerStorage.java +++ b/src/api/java/appeng/api/implementations/items/IAEItemPowerStorage.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.implementations.items; import net.minecraft.item.ItemStack; diff --git a/src/api/java/appeng/api/implementations/items/IAEWrench.java b/src/api/java/appeng/api/implementations/items/IAEWrench.java index 9f913fa7..9ce24714 100644 --- a/src/api/java/appeng/api/implementations/items/IAEWrench.java +++ b/src/api/java/appeng/api/implementations/items/IAEWrench.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.implementations.items; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/api/java/appeng/api/implementations/items/IBiometricCard.java b/src/api/java/appeng/api/implementations/items/IBiometricCard.java index bbf8f8e5..4e9f8d52 100644 --- a/src/api/java/appeng/api/implementations/items/IBiometricCard.java +++ b/src/api/java/appeng/api/implementations/items/IBiometricCard.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.implementations.items; import appeng.api.config.SecurityPermissions; diff --git a/src/api/java/appeng/api/implementations/items/IGrowableCrystal.java b/src/api/java/appeng/api/implementations/items/IGrowableCrystal.java index 391482ee..6b08ee76 100644 --- a/src/api/java/appeng/api/implementations/items/IGrowableCrystal.java +++ b/src/api/java/appeng/api/implementations/items/IGrowableCrystal.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.implementations.items; import net.minecraft.block.Block; diff --git a/src/api/java/appeng/api/implementations/items/IItemGroup.java b/src/api/java/appeng/api/implementations/items/IItemGroup.java index 2dce5719..d12f7b8e 100644 --- a/src/api/java/appeng/api/implementations/items/IItemGroup.java +++ b/src/api/java/appeng/api/implementations/items/IItemGroup.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.implementations.items; import net.minecraft.item.ItemStack; diff --git a/src/api/java/appeng/api/implementations/items/IMemoryCard.java b/src/api/java/appeng/api/implementations/items/IMemoryCard.java index 14692313..f04c2301 100644 --- a/src/api/java/appeng/api/implementations/items/IMemoryCard.java +++ b/src/api/java/appeng/api/implementations/items/IMemoryCard.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.implementations.items; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/api/java/appeng/api/implementations/items/ISpatialStorageCell.java b/src/api/java/appeng/api/implementations/items/ISpatialStorageCell.java index 5aaf997a..d296a846 100644 --- a/src/api/java/appeng/api/implementations/items/ISpatialStorageCell.java +++ b/src/api/java/appeng/api/implementations/items/ISpatialStorageCell.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.implementations.items; import net.minecraft.item.Item; diff --git a/src/api/java/appeng/api/implementations/items/IStorageCell.java b/src/api/java/appeng/api/implementations/items/IStorageCell.java index ef0d8420..ba2eaa78 100644 --- a/src/api/java/appeng/api/implementations/items/IStorageCell.java +++ b/src/api/java/appeng/api/implementations/items/IStorageCell.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.implementations.items; import net.minecraft.item.ItemStack; @@ -19,8 +42,8 @@ public interface IStorageCell extends ICellWorkbenchItem { /** - * If this returns something where N % 8 != 0 Then you will be shot on - * sight, or your car will explode, something like that least... + * It wont work if the return is not a multiple of 8. + * The limit is ({@link Integer#MAX_VALUE} + 1) / 8. * * @param cellItem item * @return number of bytes diff --git a/src/api/java/appeng/api/implementations/items/IStorageComponent.java b/src/api/java/appeng/api/implementations/items/IStorageComponent.java index 497d2768..24bfd7b3 100644 --- a/src/api/java/appeng/api/implementations/items/IStorageComponent.java +++ b/src/api/java/appeng/api/implementations/items/IStorageComponent.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.implementations.items; import net.minecraft.item.Item; diff --git a/src/api/java/appeng/api/implementations/items/IUpgradeModule.java b/src/api/java/appeng/api/implementations/items/IUpgradeModule.java index 55a8166b..5721e011 100644 --- a/src/api/java/appeng/api/implementations/items/IUpgradeModule.java +++ b/src/api/java/appeng/api/implementations/items/IUpgradeModule.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.implementations.items; import net.minecraft.item.ItemStack; diff --git a/src/api/java/appeng/api/implementations/items/MemoryCardMessages.java b/src/api/java/appeng/api/implementations/items/MemoryCardMessages.java index 6a7f958e..2c0326ab 100644 --- a/src/api/java/appeng/api/implementations/items/MemoryCardMessages.java +++ b/src/api/java/appeng/api/implementations/items/MemoryCardMessages.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.implementations.items; /** diff --git a/src/api/java/appeng/api/implementations/parts/IPartCable.java b/src/api/java/appeng/api/implementations/parts/IPartCable.java index 16009ca4..1c17ca0d 100644 --- a/src/api/java/appeng/api/implementations/parts/IPartCable.java +++ b/src/api/java/appeng/api/implementations/parts/IPartCable.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.implementations.parts; import appeng.api.networking.IGridHost; diff --git a/src/api/java/appeng/api/implementations/parts/IPartMonitor.java b/src/api/java/appeng/api/implementations/parts/IPartMonitor.java index 2bf93661..af75756e 100644 --- a/src/api/java/appeng/api/implementations/parts/IPartMonitor.java +++ b/src/api/java/appeng/api/implementations/parts/IPartMonitor.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.implementations.parts; import appeng.api.networking.IGridHost; diff --git a/src/api/java/appeng/api/implementations/parts/IPartStorageMonitor.java b/src/api/java/appeng/api/implementations/parts/IPartStorageMonitor.java index 44def099..acafc256 100644 --- a/src/api/java/appeng/api/implementations/parts/IPartStorageMonitor.java +++ b/src/api/java/appeng/api/implementations/parts/IPartStorageMonitor.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.implementations.parts; import appeng.api.networking.IGridHost; @@ -16,7 +39,7 @@ public interface IPartStorageMonitor extends IPartMonitor, IPart, IGridHost, INe * IAEFluidStack the quantity is important remember to use getStackSize() on the IAEStack, and not on the * FluidStack/ItemStack acquired from it. */ - IAEStack getDisplayed(); + IAEStack getDisplayed(); /** * @return the current locked state of the Storage Monitor diff --git a/src/api/java/appeng/api/implementations/tiles/IChestOrDrive.java b/src/api/java/appeng/api/implementations/tiles/IChestOrDrive.java index 0b1388b9..30aed321 100644 --- a/src/api/java/appeng/api/implementations/tiles/IChestOrDrive.java +++ b/src/api/java/appeng/api/implementations/tiles/IChestOrDrive.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.implementations.tiles; import appeng.api.networking.IGridHost; diff --git a/src/api/java/appeng/api/implementations/tiles/IColorableTile.java b/src/api/java/appeng/api/implementations/tiles/IColorableTile.java index 03874ae2..c7de98b2 100644 --- a/src/api/java/appeng/api/implementations/tiles/IColorableTile.java +++ b/src/api/java/appeng/api/implementations/tiles/IColorableTile.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.implementations.tiles; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/api/java/appeng/api/implementations/tiles/ICraftingMachine.java b/src/api/java/appeng/api/implementations/tiles/ICraftingMachine.java index 2f6071f5..20e4d5c7 100644 --- a/src/api/java/appeng/api/implementations/tiles/ICraftingMachine.java +++ b/src/api/java/appeng/api/implementations/tiles/ICraftingMachine.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.implementations.tiles; import net.minecraft.inventory.InventoryCrafting; diff --git a/src/api/java/appeng/api/implementations/tiles/ICrankable.java b/src/api/java/appeng/api/implementations/tiles/ICrankable.java index b709e23d..07f37d0b 100644 --- a/src/api/java/appeng/api/implementations/tiles/ICrankable.java +++ b/src/api/java/appeng/api/implementations/tiles/ICrankable.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.implementations.tiles; import net.minecraftforge.common.util.ForgeDirection; diff --git a/src/api/java/appeng/api/implementations/tiles/ICrystalGrowthAccelerator.java b/src/api/java/appeng/api/implementations/tiles/ICrystalGrowthAccelerator.java index a9cccf8c..e7aa1585 100644 --- a/src/api/java/appeng/api/implementations/tiles/ICrystalGrowthAccelerator.java +++ b/src/api/java/appeng/api/implementations/tiles/ICrystalGrowthAccelerator.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.implementations.tiles; public interface ICrystalGrowthAccelerator diff --git a/src/api/java/appeng/api/implementations/tiles/IMEChest.java b/src/api/java/appeng/api/implementations/tiles/IMEChest.java index 71a7ec3a..2d9cb4ec 100644 --- a/src/api/java/appeng/api/implementations/tiles/IMEChest.java +++ b/src/api/java/appeng/api/implementations/tiles/IMEChest.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.implementations.tiles; import appeng.api.networking.energy.IEnergySource; diff --git a/src/api/java/appeng/api/implementations/tiles/ISegmentedInventory.java b/src/api/java/appeng/api/implementations/tiles/ISegmentedInventory.java index b985b044..b32966e3 100644 --- a/src/api/java/appeng/api/implementations/tiles/ISegmentedInventory.java +++ b/src/api/java/appeng/api/implementations/tiles/ISegmentedInventory.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.implementations.tiles; import net.minecraft.inventory.IInventory; diff --git a/src/api/java/appeng/api/implementations/tiles/ITileStorageMonitorable.java b/src/api/java/appeng/api/implementations/tiles/ITileStorageMonitorable.java index f6ef62fb..4dc062dd 100644 --- a/src/api/java/appeng/api/implementations/tiles/ITileStorageMonitorable.java +++ b/src/api/java/appeng/api/implementations/tiles/ITileStorageMonitorable.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.implementations.tiles; import net.minecraftforge.common.util.ForgeDirection; diff --git a/src/api/java/appeng/api/implementations/tiles/IViewCellStorage.java b/src/api/java/appeng/api/implementations/tiles/IViewCellStorage.java index ab926a4e..4f0a5470 100644 --- a/src/api/java/appeng/api/implementations/tiles/IViewCellStorage.java +++ b/src/api/java/appeng/api/implementations/tiles/IViewCellStorage.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.implementations.tiles; import net.minecraft.inventory.IInventory; diff --git a/src/api/java/appeng/api/implementations/tiles/IWirelessAccessPoint.java b/src/api/java/appeng/api/implementations/tiles/IWirelessAccessPoint.java index bd9ed9a0..36b03631 100644 --- a/src/api/java/appeng/api/implementations/tiles/IWirelessAccessPoint.java +++ b/src/api/java/appeng/api/implementations/tiles/IWirelessAccessPoint.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.implementations.tiles; import appeng.api.networking.IGrid; diff --git a/src/api/java/appeng/api/integration/IBeeComparison.java b/src/api/java/appeng/api/integration/IBeeComparison.java index ab1ccb44..8a9b2c38 100644 --- a/src/api/java/appeng/api/integration/IBeeComparison.java +++ b/src/api/java/appeng/api/integration/IBeeComparison.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.integration; /** diff --git a/src/api/java/appeng/api/movable/IMovableHandler.java b/src/api/java/appeng/api/movable/IMovableHandler.java index 78817bb0..973c024e 100644 --- a/src/api/java/appeng/api/movable/IMovableHandler.java +++ b/src/api/java/appeng/api/movable/IMovableHandler.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.movable; import net.minecraft.tileentity.TileEntity; diff --git a/src/api/java/appeng/api/movable/IMovableRegistry.java b/src/api/java/appeng/api/movable/IMovableRegistry.java index 6a0d4a9f..f874d3c1 100644 --- a/src/api/java/appeng/api/movable/IMovableRegistry.java +++ b/src/api/java/appeng/api/movable/IMovableRegistry.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.movable; import net.minecraft.block.Block; diff --git a/src/api/java/appeng/api/movable/IMovableTile.java b/src/api/java/appeng/api/movable/IMovableTile.java index 9139a41b..6f28ee45 100644 --- a/src/api/java/appeng/api/movable/IMovableTile.java +++ b/src/api/java/appeng/api/movable/IMovableTile.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.movable; /** diff --git a/src/api/java/appeng/api/networking/GridFlags.java b/src/api/java/appeng/api/networking/GridFlags.java index 6351ee95..d3a64a7a 100644 --- a/src/api/java/appeng/api/networking/GridFlags.java +++ b/src/api/java/appeng/api/networking/GridFlags.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking; /** diff --git a/src/api/java/appeng/api/networking/GridNotification.java b/src/api/java/appeng/api/networking/GridNotification.java index 78c4d19d..bdd834d7 100644 --- a/src/api/java/appeng/api/networking/GridNotification.java +++ b/src/api/java/appeng/api/networking/GridNotification.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking; public enum GridNotification diff --git a/src/api/java/appeng/api/networking/IGrid.java b/src/api/java/appeng/api/networking/IGrid.java index 72c61154..e34853c5 100644 --- a/src/api/java/appeng/api/networking/IGrid.java +++ b/src/api/java/appeng/api/networking/IGrid.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking; import appeng.api.networking.events.MENetworkEvent; diff --git a/src/api/java/appeng/api/networking/IGridBlock.java b/src/api/java/appeng/api/networking/IGridBlock.java index a8d7df17..3f54772b 100644 --- a/src/api/java/appeng/api/networking/IGridBlock.java +++ b/src/api/java/appeng/api/networking/IGridBlock.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking; import appeng.api.parts.IPart; diff --git a/src/api/java/appeng/api/networking/IGridCache.java b/src/api/java/appeng/api/networking/IGridCache.java index f920d5ae..ba1cdbfb 100644 --- a/src/api/java/appeng/api/networking/IGridCache.java +++ b/src/api/java/appeng/api/networking/IGridCache.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking; /** diff --git a/src/api/java/appeng/api/networking/IGridCacheRegistry.java b/src/api/java/appeng/api/networking/IGridCacheRegistry.java index 8061f8cb..9f7b9c1f 100644 --- a/src/api/java/appeng/api/networking/IGridCacheRegistry.java +++ b/src/api/java/appeng/api/networking/IGridCacheRegistry.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking; import java.util.HashMap; @@ -16,7 +39,7 @@ public interface IGridCacheRegistry void registerGridCache(Class iface, Class implementation); /** - * requests a new instance of a grid cache for use, used internally + * requests a new INSTANCE of a grid cache for use, used internally * * @param grid grid * diff --git a/src/api/java/appeng/api/networking/IGridConnection.java b/src/api/java/appeng/api/networking/IGridConnection.java index 9d5bb666..b688d4c3 100644 --- a/src/api/java/appeng/api/networking/IGridConnection.java +++ b/src/api/java/appeng/api/networking/IGridConnection.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking; import net.minecraftforge.common.util.ForgeDirection; diff --git a/src/api/java/appeng/api/networking/IGridConnectionVisitor.java b/src/api/java/appeng/api/networking/IGridConnectionVisitor.java index d79ce670..ea3c24d6 100644 --- a/src/api/java/appeng/api/networking/IGridConnectionVisitor.java +++ b/src/api/java/appeng/api/networking/IGridConnectionVisitor.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking; public interface IGridConnectionVisitor extends IGridVisitor diff --git a/src/api/java/appeng/api/networking/IGridHost.java b/src/api/java/appeng/api/networking/IGridHost.java index 4af28c9a..08381c04 100644 --- a/src/api/java/appeng/api/networking/IGridHost.java +++ b/src/api/java/appeng/api/networking/IGridHost.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking; import net.minecraft.tileentity.TileEntity; @@ -23,7 +46,7 @@ public interface IGridHost * feel free to ignore this, most blocks will use the same node * for every side. * @return a new IGridNode, create these with - * AEApi.instance().createGridNode( MyIGridBlock ) + * AEApi.INSTANCE().createGridNode( MyIGridBlock ) */ public IGridNode getGridNode(ForgeDirection dir); diff --git a/src/api/java/appeng/api/networking/IGridMultiblock.java b/src/api/java/appeng/api/networking/IGridMultiblock.java index 83f580e7..2852e0ce 100644 --- a/src/api/java/appeng/api/networking/IGridMultiblock.java +++ b/src/api/java/appeng/api/networking/IGridMultiblock.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking; import java.util.Iterator; diff --git a/src/api/java/appeng/api/networking/IGridNode.java b/src/api/java/appeng/api/networking/IGridNode.java index 21bd2c20..fc76af45 100644 --- a/src/api/java/appeng/api/networking/IGridNode.java +++ b/src/api/java/appeng/api/networking/IGridNode.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking; import appeng.api.IAppEngApi; diff --git a/src/api/java/appeng/api/networking/IGridStorage.java b/src/api/java/appeng/api/networking/IGridStorage.java index c4c7c1e7..a566cac5 100644 --- a/src/api/java/appeng/api/networking/IGridStorage.java +++ b/src/api/java/appeng/api/networking/IGridStorage.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/api/java/appeng/api/networking/IGridVisitor.java b/src/api/java/appeng/api/networking/IGridVisitor.java index 2593160f..1a0859b9 100644 --- a/src/api/java/appeng/api/networking/IGridVisitor.java +++ b/src/api/java/appeng/api/networking/IGridVisitor.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking; /** diff --git a/src/api/java/appeng/api/networking/IMachineSet.java b/src/api/java/appeng/api/networking/IMachineSet.java index 080eeb2b..f879d532 100644 --- a/src/api/java/appeng/api/networking/IMachineSet.java +++ b/src/api/java/appeng/api/networking/IMachineSet.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking; import appeng.api.util.IReadOnlyCollection; diff --git a/src/api/java/appeng/api/networking/crafting/CraftingItemList.java b/src/api/java/appeng/api/networking/crafting/CraftingItemList.java index 1b2db3a2..7ae0a907 100644 --- a/src/api/java/appeng/api/networking/crafting/CraftingItemList.java +++ b/src/api/java/appeng/api/networking/crafting/CraftingItemList.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.crafting; public enum CraftingItemList diff --git a/src/api/java/appeng/api/networking/crafting/ICraftingCPU.java b/src/api/java/appeng/api/networking/crafting/ICraftingCPU.java index 0f00e53a..2e8d6362 100644 --- a/src/api/java/appeng/api/networking/crafting/ICraftingCPU.java +++ b/src/api/java/appeng/api/networking/crafting/ICraftingCPU.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.crafting; import appeng.api.networking.security.BaseActionSource; diff --git a/src/api/java/appeng/api/networking/crafting/ICraftingCallback.java b/src/api/java/appeng/api/networking/crafting/ICraftingCallback.java index e61ae2cc..86e2d243 100644 --- a/src/api/java/appeng/api/networking/crafting/ICraftingCallback.java +++ b/src/api/java/appeng/api/networking/crafting/ICraftingCallback.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.crafting; public interface ICraftingCallback diff --git a/src/api/java/appeng/api/networking/crafting/ICraftingGrid.java b/src/api/java/appeng/api/networking/crafting/ICraftingGrid.java index 8ac1dc83..6ed869a4 100644 --- a/src/api/java/appeng/api/networking/crafting/ICraftingGrid.java +++ b/src/api/java/appeng/api/networking/crafting/ICraftingGrid.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.crafting; import appeng.api.networking.IGrid; diff --git a/src/api/java/appeng/api/networking/crafting/ICraftingJob.java b/src/api/java/appeng/api/networking/crafting/ICraftingJob.java index 8eeb29eb..91c092d4 100644 --- a/src/api/java/appeng/api/networking/crafting/ICraftingJob.java +++ b/src/api/java/appeng/api/networking/crafting/ICraftingJob.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.crafting; import appeng.api.storage.data.IAEItemStack; diff --git a/src/api/java/appeng/api/networking/crafting/ICraftingLink.java b/src/api/java/appeng/api/networking/crafting/ICraftingLink.java index be7f4f38..946ef703 100644 --- a/src/api/java/appeng/api/networking/crafting/ICraftingLink.java +++ b/src/api/java/appeng/api/networking/crafting/ICraftingLink.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.crafting; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/api/java/appeng/api/networking/crafting/ICraftingMedium.java b/src/api/java/appeng/api/networking/crafting/ICraftingMedium.java index b84e7937..cfe57aa6 100644 --- a/src/api/java/appeng/api/networking/crafting/ICraftingMedium.java +++ b/src/api/java/appeng/api/networking/crafting/ICraftingMedium.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.crafting; import net.minecraft.inventory.InventoryCrafting; diff --git a/src/api/java/appeng/api/networking/crafting/ICraftingPatternDetails.java b/src/api/java/appeng/api/networking/crafting/ICraftingPatternDetails.java index 0fb4eb34..8b7bfa2e 100644 --- a/src/api/java/appeng/api/networking/crafting/ICraftingPatternDetails.java +++ b/src/api/java/appeng/api/networking/crafting/ICraftingPatternDetails.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.crafting; import net.minecraft.inventory.InventoryCrafting; @@ -9,7 +32,7 @@ import appeng.api.storage.data.IAEItemStack; /** * do not implement provided by {@link ICraftingPatternItem} * - * caching this instance will increase performance of validation and checks. + * caching this INSTANCE will increase performance of validation and checks. */ public interface ICraftingPatternDetails { @@ -59,7 +82,7 @@ public interface ICraftingPatternDetails boolean canSubstitute(); /** - * Allow using this instance of the pattern details to preform the crafting action with performance enhancements. + * Allow using this INSTANCE of the pattern details to preform the crafting action with performance enhancements. * * @param craftingInv inventory * @param world crafting world diff --git a/src/api/java/appeng/api/networking/crafting/ICraftingProvider.java b/src/api/java/appeng/api/networking/crafting/ICraftingProvider.java index edd05177..5341309a 100644 --- a/src/api/java/appeng/api/networking/crafting/ICraftingProvider.java +++ b/src/api/java/appeng/api/networking/crafting/ICraftingProvider.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.crafting; import appeng.api.networking.events.MENetworkCraftingPatternChange; diff --git a/src/api/java/appeng/api/networking/crafting/ICraftingProviderHelper.java b/src/api/java/appeng/api/networking/crafting/ICraftingProviderHelper.java index f31a01a8..0e041b65 100644 --- a/src/api/java/appeng/api/networking/crafting/ICraftingProviderHelper.java +++ b/src/api/java/appeng/api/networking/crafting/ICraftingProviderHelper.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.crafting; import appeng.api.storage.data.IAEItemStack; diff --git a/src/api/java/appeng/api/networking/crafting/ICraftingRequester.java b/src/api/java/appeng/api/networking/crafting/ICraftingRequester.java index 0f29bdcf..e156a274 100644 --- a/src/api/java/appeng/api/networking/crafting/ICraftingRequester.java +++ b/src/api/java/appeng/api/networking/crafting/ICraftingRequester.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.crafting; import appeng.api.config.Actionable; diff --git a/src/api/java/appeng/api/networking/crafting/ICraftingWatcher.java b/src/api/java/appeng/api/networking/crafting/ICraftingWatcher.java index 64cffd3e..bcfb38c9 100644 --- a/src/api/java/appeng/api/networking/crafting/ICraftingWatcher.java +++ b/src/api/java/appeng/api/networking/crafting/ICraftingWatcher.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.crafting; import java.util.Collection; diff --git a/src/api/java/appeng/api/networking/crafting/ICraftingWatcherHost.java b/src/api/java/appeng/api/networking/crafting/ICraftingWatcherHost.java index b5ae4384..757f98fb 100644 --- a/src/api/java/appeng/api/networking/crafting/ICraftingWatcherHost.java +++ b/src/api/java/appeng/api/networking/crafting/ICraftingWatcherHost.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.crafting; import appeng.api.storage.data.IAEItemStack; diff --git a/src/api/java/appeng/api/networking/energy/IAEPowerStorage.java b/src/api/java/appeng/api/networking/energy/IAEPowerStorage.java index a97c5e60..13b680b8 100644 --- a/src/api/java/appeng/api/networking/energy/IAEPowerStorage.java +++ b/src/api/java/appeng/api/networking/energy/IAEPowerStorage.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.energy; import appeng.api.config.AccessRestriction; diff --git a/src/api/java/appeng/api/networking/energy/IEnergyGrid.java b/src/api/java/appeng/api/networking/energy/IEnergyGrid.java index 38f9bbd1..eeca67da 100644 --- a/src/api/java/appeng/api/networking/energy/IEnergyGrid.java +++ b/src/api/java/appeng/api/networking/energy/IEnergyGrid.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.energy; import appeng.api.config.Actionable; diff --git a/src/api/java/appeng/api/networking/energy/IEnergyGridProvider.java b/src/api/java/appeng/api/networking/energy/IEnergyGridProvider.java index a7412630..ce13a367 100644 --- a/src/api/java/appeng/api/networking/energy/IEnergyGridProvider.java +++ b/src/api/java/appeng/api/networking/energy/IEnergyGridProvider.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.energy; import java.util.Set; diff --git a/src/api/java/appeng/api/networking/energy/IEnergySource.java b/src/api/java/appeng/api/networking/energy/IEnergySource.java index 52a8c272..ee96dff2 100644 --- a/src/api/java/appeng/api/networking/energy/IEnergySource.java +++ b/src/api/java/appeng/api/networking/energy/IEnergySource.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.energy; import appeng.api.config.Actionable; diff --git a/src/api/java/appeng/api/networking/energy/IEnergyWatcher.java b/src/api/java/appeng/api/networking/energy/IEnergyWatcher.java index 20e7a8ec..b4fdd2de 100644 --- a/src/api/java/appeng/api/networking/energy/IEnergyWatcher.java +++ b/src/api/java/appeng/api/networking/energy/IEnergyWatcher.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.energy; import java.util.Collection; diff --git a/src/api/java/appeng/api/networking/energy/IEnergyWatcherHost.java b/src/api/java/appeng/api/networking/energy/IEnergyWatcherHost.java index 775380ca..7b6bd0df 100644 --- a/src/api/java/appeng/api/networking/energy/IEnergyWatcherHost.java +++ b/src/api/java/appeng/api/networking/energy/IEnergyWatcherHost.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.energy; public interface IEnergyWatcherHost diff --git a/src/api/java/appeng/api/networking/events/MENetworkBootingStatusChange.java b/src/api/java/appeng/api/networking/events/MENetworkBootingStatusChange.java index 284c64e4..fc82f162 100644 --- a/src/api/java/appeng/api/networking/events/MENetworkBootingStatusChange.java +++ b/src/api/java/appeng/api/networking/events/MENetworkBootingStatusChange.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.events; import appeng.api.networking.IGridNode; diff --git a/src/api/java/appeng/api/networking/events/MENetworkCellArrayUpdate.java b/src/api/java/appeng/api/networking/events/MENetworkCellArrayUpdate.java index aec90e78..e12e006f 100644 --- a/src/api/java/appeng/api/networking/events/MENetworkCellArrayUpdate.java +++ b/src/api/java/appeng/api/networking/events/MENetworkCellArrayUpdate.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.events; /** diff --git a/src/api/java/appeng/api/networking/events/MENetworkChannelChanged.java b/src/api/java/appeng/api/networking/events/MENetworkChannelChanged.java index bce30749..a6675d8f 100644 --- a/src/api/java/appeng/api/networking/events/MENetworkChannelChanged.java +++ b/src/api/java/appeng/api/networking/events/MENetworkChannelChanged.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.events; import appeng.api.networking.IGridNode; @@ -12,7 +35,7 @@ public class MENetworkChannelChanged extends MENetworkEvent public final IGridNode node; public MENetworkChannelChanged(IGridNode n) { - node = n; + this.node = n; } } diff --git a/src/api/java/appeng/api/networking/events/MENetworkChannelsChanged.java b/src/api/java/appeng/api/networking/events/MENetworkChannelsChanged.java index ebfed6cb..07161d24 100644 --- a/src/api/java/appeng/api/networking/events/MENetworkChannelsChanged.java +++ b/src/api/java/appeng/api/networking/events/MENetworkChannelsChanged.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.events; import appeng.api.networking.IGridHost; diff --git a/src/api/java/appeng/api/networking/events/MENetworkControllerChange.java b/src/api/java/appeng/api/networking/events/MENetworkControllerChange.java index 97db1648..7e4a4b22 100644 --- a/src/api/java/appeng/api/networking/events/MENetworkControllerChange.java +++ b/src/api/java/appeng/api/networking/events/MENetworkControllerChange.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.events; /** diff --git a/src/api/java/appeng/api/networking/events/MENetworkCraftingCpuChange.java b/src/api/java/appeng/api/networking/events/MENetworkCraftingCpuChange.java index a52eab52..5bc716fa 100644 --- a/src/api/java/appeng/api/networking/events/MENetworkCraftingCpuChange.java +++ b/src/api/java/appeng/api/networking/events/MENetworkCraftingCpuChange.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.events; import appeng.api.networking.IGridNode; @@ -8,7 +31,7 @@ public class MENetworkCraftingCpuChange extends MENetworkEvent public final IGridNode node; public MENetworkCraftingCpuChange(IGridNode n) { - node = n; + this.node = n; } } diff --git a/src/api/java/appeng/api/networking/events/MENetworkCraftingPatternChange.java b/src/api/java/appeng/api/networking/events/MENetworkCraftingPatternChange.java index 13f735fd..871d7c1e 100644 --- a/src/api/java/appeng/api/networking/events/MENetworkCraftingPatternChange.java +++ b/src/api/java/appeng/api/networking/events/MENetworkCraftingPatternChange.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.events; import appeng.api.networking.IGridNode; @@ -10,8 +33,8 @@ public class MENetworkCraftingPatternChange extends MENetworkEvent public final IGridNode node; public MENetworkCraftingPatternChange(ICraftingProvider p, IGridNode n) { - provider = p; - node = n; + this.provider = p; + this.node = n; } } diff --git a/src/api/java/appeng/api/networking/events/MENetworkEvent.java b/src/api/java/appeng/api/networking/events/MENetworkEvent.java index 34a2731d..1ba95a35 100644 --- a/src/api/java/appeng/api/networking/events/MENetworkEvent.java +++ b/src/api/java/appeng/api/networking/events/MENetworkEvent.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.events; import appeng.api.networking.IGrid; @@ -18,7 +41,7 @@ public class MENetworkEvent */ public void cancel() { - canceled = true; + this.canceled = true; } /** @@ -28,7 +51,7 @@ public class MENetworkEvent */ public boolean isCanceled() { - return canceled; + return this.canceled; } /** @@ -38,7 +61,7 @@ public class MENetworkEvent */ public int getVisitedObjects() { - return visited; + return this.visited; } /** @@ -48,6 +71,6 @@ public class MENetworkEvent */ public void setVisitedObjects(int v) { - visited = v; + this.visited = v; } } diff --git a/src/api/java/appeng/api/networking/events/MENetworkEventSubscribe.java b/src/api/java/appeng/api/networking/events/MENetworkEventSubscribe.java index b3b8fb9a..eae8e0aa 100644 --- a/src/api/java/appeng/api/networking/events/MENetworkEventSubscribe.java +++ b/src/api/java/appeng/api/networking/events/MENetworkEventSubscribe.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.events; import java.lang.annotation.Retention; diff --git a/src/api/java/appeng/api/networking/events/MENetworkPostCacheConstruction.java b/src/api/java/appeng/api/networking/events/MENetworkPostCacheConstruction.java index 05b28128..6a05fc07 100644 --- a/src/api/java/appeng/api/networking/events/MENetworkPostCacheConstruction.java +++ b/src/api/java/appeng/api/networking/events/MENetworkPostCacheConstruction.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.events; /** diff --git a/src/api/java/appeng/api/networking/events/MENetworkPowerIdleChange.java b/src/api/java/appeng/api/networking/events/MENetworkPowerIdleChange.java index 803c5a7e..15ae375e 100644 --- a/src/api/java/appeng/api/networking/events/MENetworkPowerIdleChange.java +++ b/src/api/java/appeng/api/networking/events/MENetworkPowerIdleChange.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.events; import appeng.api.networking.IGridNode; @@ -15,7 +38,7 @@ public class MENetworkPowerIdleChange extends MENetworkEvent public final IGridNode node; public MENetworkPowerIdleChange(IGridNode nodeThatChanged) { - node = nodeThatChanged; + this.node = nodeThatChanged; } } diff --git a/src/api/java/appeng/api/networking/events/MENetworkPowerStatusChange.java b/src/api/java/appeng/api/networking/events/MENetworkPowerStatusChange.java index c89db973..9b90ebaa 100644 --- a/src/api/java/appeng/api/networking/events/MENetworkPowerStatusChange.java +++ b/src/api/java/appeng/api/networking/events/MENetworkPowerStatusChange.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.events; import appeng.api.networking.IGridNode; diff --git a/src/api/java/appeng/api/networking/events/MENetworkPowerStorage.java b/src/api/java/appeng/api/networking/events/MENetworkPowerStorage.java index 34643450..317e69b6 100644 --- a/src/api/java/appeng/api/networking/events/MENetworkPowerStorage.java +++ b/src/api/java/appeng/api/networking/events/MENetworkPowerStorage.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.events; import appeng.api.networking.energy.IAEPowerStorage; @@ -31,8 +54,8 @@ public class MENetworkPowerStorage extends MENetworkEvent public final PowerEventType type; public MENetworkPowerStorage(IAEPowerStorage t, PowerEventType y) { - storage = t; - type = y; + this.storage = t; + this.type = y; } } diff --git a/src/api/java/appeng/api/networking/events/MENetworkSecurityChange.java b/src/api/java/appeng/api/networking/events/MENetworkSecurityChange.java index b872f03b..f5c971dd 100644 --- a/src/api/java/appeng/api/networking/events/MENetworkSecurityChange.java +++ b/src/api/java/appeng/api/networking/events/MENetworkSecurityChange.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.events; /** diff --git a/src/api/java/appeng/api/networking/events/MENetworkSpatialEvent.java b/src/api/java/appeng/api/networking/events/MENetworkSpatialEvent.java index ba487aee..9cb430f7 100644 --- a/src/api/java/appeng/api/networking/events/MENetworkSpatialEvent.java +++ b/src/api/java/appeng/api/networking/events/MENetworkSpatialEvent.java @@ -1,9 +1,32 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.events; import appeng.api.networking.IGridHost; /** - * An event that is posted whenever a spatial IO is actived, called for IGridCache + * An event that is posted whenever a spatial IO is active, called for IGridCache */ public class MENetworkSpatialEvent extends MENetworkEvent { @@ -11,12 +34,12 @@ public class MENetworkSpatialEvent extends MENetworkEvent public final double spatialEnergyUsage; /** - * @param SpatialIO ( instance of the SpatialIO block ) + * @param SpatialIO ( INSTANCE of the SpatialIO block ) * @param EnergyUsage ( the amount of energy that the SpatialIO uses) */ public MENetworkSpatialEvent(IGridHost SpatialIO, double EnergyUsage) { - host = SpatialIO; - spatialEnergyUsage = EnergyUsage; + this.host = SpatialIO; + this.spatialEnergyUsage = EnergyUsage; } } diff --git a/src/api/java/appeng/api/networking/events/MENetworkStorageEvent.java b/src/api/java/appeng/api/networking/events/MENetworkStorageEvent.java index 36a93624..0901e6d8 100644 --- a/src/api/java/appeng/api/networking/events/MENetworkStorageEvent.java +++ b/src/api/java/appeng/api/networking/events/MENetworkStorageEvent.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.events; import appeng.api.storage.IMEMonitor; @@ -18,8 +41,8 @@ public class MENetworkStorageEvent extends MENetworkEvent public final StorageChannel channel; public MENetworkStorageEvent(IMEMonitor o, StorageChannel chan) { - monitor = o; - channel = chan; + this.monitor = o; + this.channel = chan; } } diff --git a/src/api/java/appeng/api/networking/pathing/ControllerState.java b/src/api/java/appeng/api/networking/pathing/ControllerState.java index 37042720..eb18eeec 100644 --- a/src/api/java/appeng/api/networking/pathing/ControllerState.java +++ b/src/api/java/appeng/api/networking/pathing/ControllerState.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.pathing; public enum ControllerState diff --git a/src/api/java/appeng/api/networking/pathing/IPathingGrid.java b/src/api/java/appeng/api/networking/pathing/IPathingGrid.java index 90f30e04..18b335be 100644 --- a/src/api/java/appeng/api/networking/pathing/IPathingGrid.java +++ b/src/api/java/appeng/api/networking/pathing/IPathingGrid.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.pathing; import appeng.api.networking.IGridCache; @@ -17,7 +40,7 @@ public interface IPathingGrid extends IGridCache ControllerState getControllerState(); /** - * trigger a network reset, booting, pathfinding and all. + * trigger a network reset, booting, path-finding and all. */ void repath(); diff --git a/src/api/java/appeng/api/networking/security/BaseActionSource.java b/src/api/java/appeng/api/networking/security/BaseActionSource.java index 193b37e8..4a8622aa 100644 --- a/src/api/java/appeng/api/networking/security/BaseActionSource.java +++ b/src/api/java/appeng/api/networking/security/BaseActionSource.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.security; public class BaseActionSource diff --git a/src/api/java/appeng/api/networking/security/IActionHost.java b/src/api/java/appeng/api/networking/security/IActionHost.java index e6aa7a19..f25fda27 100644 --- a/src/api/java/appeng/api/networking/security/IActionHost.java +++ b/src/api/java/appeng/api/networking/security/IActionHost.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.security; import appeng.api.networking.IGridHost; diff --git a/src/api/java/appeng/api/networking/security/ISecurityGrid.java b/src/api/java/appeng/api/networking/security/ISecurityGrid.java index aed72a7c..67463992 100644 --- a/src/api/java/appeng/api/networking/security/ISecurityGrid.java +++ b/src/api/java/appeng/api/networking/security/ISecurityGrid.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.security; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/api/java/appeng/api/networking/security/ISecurityProvider.java b/src/api/java/appeng/api/networking/security/ISecurityProvider.java index be9ad4a8..e76b2e9e 100644 --- a/src/api/java/appeng/api/networking/security/ISecurityProvider.java +++ b/src/api/java/appeng/api/networking/security/ISecurityProvider.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.security; import appeng.api.config.SecurityPermissions; diff --git a/src/api/java/appeng/api/networking/security/ISecurityRegistry.java b/src/api/java/appeng/api/networking/security/ISecurityRegistry.java index b1abf80c..7db244c0 100644 --- a/src/api/java/appeng/api/networking/security/ISecurityRegistry.java +++ b/src/api/java/appeng/api/networking/security/ISecurityRegistry.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.security; import appeng.api.config.SecurityPermissions; diff --git a/src/api/java/appeng/api/networking/security/MachineSource.java b/src/api/java/appeng/api/networking/security/MachineSource.java index ddce68fa..68fa5d95 100644 --- a/src/api/java/appeng/api/networking/security/MachineSource.java +++ b/src/api/java/appeng/api/networking/security/MachineSource.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.security; public class MachineSource extends BaseActionSource @@ -12,7 +35,7 @@ public class MachineSource extends BaseActionSource } public MachineSource(IActionHost v) { - via = v; + this.via = v; } } diff --git a/src/api/java/appeng/api/networking/security/PlayerSource.java b/src/api/java/appeng/api/networking/security/PlayerSource.java index 335a16ae..03dc9358 100644 --- a/src/api/java/appeng/api/networking/security/PlayerSource.java +++ b/src/api/java/appeng/api/networking/security/PlayerSource.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.security; import net.minecraft.entity.player.EntityPlayer; @@ -15,8 +38,8 @@ public class PlayerSource extends BaseActionSource } public PlayerSource(EntityPlayer p, IActionHost v) { - player = p; - via = v; + this.player = p; + this.via = v; } } diff --git a/src/api/java/appeng/api/networking/spatial/ISpatialCache.java b/src/api/java/appeng/api/networking/spatial/ISpatialCache.java index 2921553f..7fadac67 100644 --- a/src/api/java/appeng/api/networking/spatial/ISpatialCache.java +++ b/src/api/java/appeng/api/networking/spatial/ISpatialCache.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.spatial; import appeng.api.networking.IGridCache; diff --git a/src/api/java/appeng/api/networking/storage/IBaseMonitor.java b/src/api/java/appeng/api/networking/storage/IBaseMonitor.java index 9f1848f6..58e8f174 100644 --- a/src/api/java/appeng/api/networking/storage/IBaseMonitor.java +++ b/src/api/java/appeng/api/networking/storage/IBaseMonitor.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.storage; import appeng.api.storage.IMEMonitorHandlerReceiver; diff --git a/src/api/java/appeng/api/networking/storage/IStackWatcher.java b/src/api/java/appeng/api/networking/storage/IStackWatcher.java index f27ecf77..8ec1e0ac 100644 --- a/src/api/java/appeng/api/networking/storage/IStackWatcher.java +++ b/src/api/java/appeng/api/networking/storage/IStackWatcher.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.storage; import java.util.Collection; diff --git a/src/api/java/appeng/api/networking/storage/IStackWatcherHost.java b/src/api/java/appeng/api/networking/storage/IStackWatcherHost.java index 62b2541f..d6d071c7 100644 --- a/src/api/java/appeng/api/networking/storage/IStackWatcherHost.java +++ b/src/api/java/appeng/api/networking/storage/IStackWatcherHost.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.storage; import appeng.api.networking.security.BaseActionSource; diff --git a/src/api/java/appeng/api/networking/storage/IStorageGrid.java b/src/api/java/appeng/api/networking/storage/IStorageGrid.java index 774e96dc..6e9d3134 100644 --- a/src/api/java/appeng/api/networking/storage/IStorageGrid.java +++ b/src/api/java/appeng/api/networking/storage/IStorageGrid.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.storage; import appeng.api.networking.IGridCache; diff --git a/src/api/java/appeng/api/networking/ticking/IGridTickable.java b/src/api/java/appeng/api/networking/ticking/IGridTickable.java index 66d3c898..10460cba 100644 --- a/src/api/java/appeng/api/networking/ticking/IGridTickable.java +++ b/src/api/java/appeng/api/networking/ticking/IGridTickable.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.ticking; import appeng.api.networking.IGridNode; diff --git a/src/api/java/appeng/api/networking/ticking/ITickManager.java b/src/api/java/appeng/api/networking/ticking/ITickManager.java index d5cbbf0b..ae0eb214 100644 --- a/src/api/java/appeng/api/networking/ticking/ITickManager.java +++ b/src/api/java/appeng/api/networking/ticking/ITickManager.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.ticking; import appeng.api.networking.IGridCache; diff --git a/src/api/java/appeng/api/networking/ticking/TickRateModulation.java b/src/api/java/appeng/api/networking/ticking/TickRateModulation.java index 1298b5ab..7ec673f8 100644 --- a/src/api/java/appeng/api/networking/ticking/TickRateModulation.java +++ b/src/api/java/appeng/api/networking/ticking/TickRateModulation.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.ticking; public enum TickRateModulation diff --git a/src/api/java/appeng/api/networking/ticking/TickingRequest.java b/src/api/java/appeng/api/networking/ticking/TickingRequest.java index 02ac54e6..388e657a 100644 --- a/src/api/java/appeng/api/networking/ticking/TickingRequest.java +++ b/src/api/java/appeng/api/networking/ticking/TickingRequest.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.networking.ticking; /** @@ -45,10 +68,10 @@ public class TickingRequest public final boolean canBeAlerted; public TickingRequest(int min, int max, boolean sleep, boolean alertable) { - minTickRate = min; - maxTickRate = max; - isSleeping = sleep; - canBeAlerted = alertable; + this.minTickRate = min; + this.maxTickRate = max; + this.isSleeping = sleep; + this.canBeAlerted = alertable; } } diff --git a/src/api/java/appeng/api/package-info.java b/src/api/java/appeng/api/package-info.java index 0e52e08c..a04fb86d 100644 --- a/src/api/java/appeng/api/package-info.java +++ b/src/api/java/appeng/api/package-info.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + @API(apiVersion = "rv2", owner = "appliedenergistics2", provides = "appliedenergistics2|API") package appeng.api; diff --git a/src/api/java/appeng/api/parts/BusSupport.java b/src/api/java/appeng/api/parts/BusSupport.java index 1702bbce..6a193818 100644 --- a/src/api/java/appeng/api/parts/BusSupport.java +++ b/src/api/java/appeng/api/parts/BusSupport.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.parts; public enum BusSupport diff --git a/src/api/java/appeng/api/parts/CableRenderMode.java b/src/api/java/appeng/api/parts/CableRenderMode.java index 2e64f356..5061eb4b 100644 --- a/src/api/java/appeng/api/parts/CableRenderMode.java +++ b/src/api/java/appeng/api/parts/CableRenderMode.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.parts; public enum CableRenderMode @@ -12,6 +35,6 @@ public enum CableRenderMode private CableRenderMode(boolean hideFacades) { this.transparentFacades = hideFacades; - opaqueFacades = !hideFacades; + this.opaqueFacades = !hideFacades; } } diff --git a/src/api/java/appeng/api/parts/IAlphaPassItem.java b/src/api/java/appeng/api/parts/IAlphaPassItem.java index b2dba861..dc8a3156 100644 --- a/src/api/java/appeng/api/parts/IAlphaPassItem.java +++ b/src/api/java/appeng/api/parts/IAlphaPassItem.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.parts; import net.minecraft.item.ItemStack; diff --git a/src/api/java/appeng/api/parts/IBoxProvider.java b/src/api/java/appeng/api/parts/IBoxProvider.java index 653089a9..91faa619 100644 --- a/src/api/java/appeng/api/parts/IBoxProvider.java +++ b/src/api/java/appeng/api/parts/IBoxProvider.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.parts; public interface IBoxProvider diff --git a/src/api/java/appeng/api/parts/IFacadeContainer.java b/src/api/java/appeng/api/parts/IFacadeContainer.java index 397fbecc..bd240049 100644 --- a/src/api/java/appeng/api/parts/IFacadeContainer.java +++ b/src/api/java/appeng/api/parts/IFacadeContainer.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.parts; import io.netty.buffer.ByteBuf; diff --git a/src/api/java/appeng/api/parts/IFacadePart.java b/src/api/java/appeng/api/parts/IFacadePart.java index cbe647ae..7237c725 100644 --- a/src/api/java/appeng/api/parts/IFacadePart.java +++ b/src/api/java/appeng/api/parts/IFacadePart.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.parts; import net.minecraft.client.renderer.RenderBlocks; diff --git a/src/api/java/appeng/api/parts/IPart.java b/src/api/java/appeng/api/parts/IPart.java index fdc4e0da..15a990ce 100644 --- a/src/api/java/appeng/api/parts/IPart.java +++ b/src/api/java/appeng/api/parts/IPart.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.parts; import appeng.api.networking.IGridNode; diff --git a/src/api/java/appeng/api/parts/IPartCollisionHelper.java b/src/api/java/appeng/api/parts/IPartCollisionHelper.java index c7fcb9a6..174b6992 100644 --- a/src/api/java/appeng/api/parts/IPartCollisionHelper.java +++ b/src/api/java/appeng/api/parts/IPartCollisionHelper.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.parts; import net.minecraftforge.common.util.ForgeDirection; diff --git a/src/api/java/appeng/api/parts/IPartHelper.java b/src/api/java/appeng/api/parts/IPartHelper.java index 7cf451ed..23374621 100644 --- a/src/api/java/appeng/api/parts/IPartHelper.java +++ b/src/api/java/appeng/api/parts/IPartHelper.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.parts; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/api/java/appeng/api/parts/IPartHost.java b/src/api/java/appeng/api/parts/IPartHost.java index b18712dc..1dce8c02 100644 --- a/src/api/java/appeng/api/parts/IPartHost.java +++ b/src/api/java/appeng/api/parts/IPartHost.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.parts; import appeng.api.util.AEColor; @@ -60,7 +83,7 @@ public interface IPartHost * * @param side side of part * @param suppressUpdate - * - used if you need to replace a part's instance, without really removing it first. + * - used if you need to replace a part's INSTANCE, without really removing it first. */ void removePart(ForgeDirection side, boolean suppressUpdate); diff --git a/src/api/java/appeng/api/parts/IPartItem.java b/src/api/java/appeng/api/parts/IPartItem.java index ca7a4b4f..5829ed84 100644 --- a/src/api/java/appeng/api/parts/IPartItem.java +++ b/src/api/java/appeng/api/parts/IPartItem.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.parts; import net.minecraft.item.ItemStack; @@ -6,7 +29,7 @@ import net.minecraft.item.ItemStack; /** * This is a pretty basic requirement, once you implement the interface, and createPartFromItemStack * - * you must register your bus with the Bus renderer, using AEApi.instance().partHelper().setItemBusRenderer( this ); + * you must register your bus with the Bus renderer, using AEApi.INSTANCE().partHelper().setItemBusRenderer( this ); * * then simply add these two methods, which tell MC to use the Block Textures, and call AE's Bus Placement Code. * @@ -22,7 +45,7 @@ import net.minecraft.item.ItemStack; * {@literal @}Override * public boolean onItemUse(ItemStack is, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) * { - * return AEApi.instance().partHelper().placeBus( is, x, y, z, side, player, world ); + * return AEApi.INSTANCE().partHelper().placeBus( is, x, y, z, side, player, world ); * } * * @@ -32,7 +55,7 @@ public interface IPartItem { /** - * create a new part instance, from the item stack. + * create a new part INSTANCE, from the item stack. * * @param is item * @return part from item diff --git a/src/api/java/appeng/api/parts/IPartRenderHelper.java b/src/api/java/appeng/api/parts/IPartRenderHelper.java index b00a7ca6..20d32b73 100644 --- a/src/api/java/appeng/api/parts/IPartRenderHelper.java +++ b/src/api/java/appeng/api/parts/IPartRenderHelper.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.parts; import cpw.mods.fml.relauncher.Side; diff --git a/src/api/java/appeng/api/parts/ISimplifiedBundle.java b/src/api/java/appeng/api/parts/ISimplifiedBundle.java index ad093459..725dc8cc 100644 --- a/src/api/java/appeng/api/parts/ISimplifiedBundle.java +++ b/src/api/java/appeng/api/parts/ISimplifiedBundle.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.parts; diff --git a/src/api/java/appeng/api/parts/LayerBase.java b/src/api/java/appeng/api/parts/LayerBase.java index e976654b..8dd8eb13 100644 --- a/src/api/java/appeng/api/parts/LayerBase.java +++ b/src/api/java/appeng/api/parts/LayerBase.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.parts; import net.minecraft.tileentity.TileEntity; diff --git a/src/api/java/appeng/api/parts/LayerFlags.java b/src/api/java/appeng/api/parts/LayerFlags.java index 08d720be..52a75d33 100644 --- a/src/api/java/appeng/api/parts/LayerFlags.java +++ b/src/api/java/appeng/api/parts/LayerFlags.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.parts; public enum LayerFlags diff --git a/src/api/java/appeng/api/parts/PartItemStack.java b/src/api/java/appeng/api/parts/PartItemStack.java index 4c8c72dc..49a92ad3 100644 --- a/src/api/java/appeng/api/parts/PartItemStack.java +++ b/src/api/java/appeng/api/parts/PartItemStack.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.parts; public enum PartItemStack diff --git a/src/api/java/appeng/api/parts/SelectedPart.java b/src/api/java/appeng/api/parts/SelectedPart.java index b381e111..b302337d 100644 --- a/src/api/java/appeng/api/parts/SelectedPart.java +++ b/src/api/java/appeng/api/parts/SelectedPart.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.parts; import net.minecraftforge.common.util.ForgeDirection; @@ -24,19 +47,19 @@ public class SelectedPart public final ForgeDirection side; public SelectedPart() { - part = null; - facade = null; - side = ForgeDirection.UNKNOWN; + this.part = null; + this.facade = null; + this.side = ForgeDirection.UNKNOWN; } public SelectedPart(IPart part, ForgeDirection side) { this.part = part; - facade = null; + this.facade = null; this.side = side; } public SelectedPart(IFacadePart facade, ForgeDirection side) { - part = null; + this.part = null; this.facade = facade; this.side = side; } diff --git a/src/api/java/appeng/api/recipes/ICraftHandler.java b/src/api/java/appeng/api/recipes/ICraftHandler.java index df574c7f..bdb9af22 100644 --- a/src/api/java/appeng/api/recipes/ICraftHandler.java +++ b/src/api/java/appeng/api/recipes/ICraftHandler.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.recipes; import appeng.api.exceptions.MissingIngredientError; diff --git a/src/api/java/appeng/api/recipes/IIngredient.java b/src/api/java/appeng/api/recipes/IIngredient.java index 9a8cbb91..7e78e30e 100644 --- a/src/api/java/appeng/api/recipes/IIngredient.java +++ b/src/api/java/appeng/api/recipes/IIngredient.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.recipes; import net.minecraft.item.ItemStack; @@ -55,7 +78,7 @@ public interface IIngredient { public int getQty(); /** - * Bakes the lists in for faster runtime lookups. + * Bakes the lists in for faster runtime look-ups. * @throws MissingIngredientError * @throws RegistrationError */ diff --git a/src/api/java/appeng/api/recipes/IRecipeHandler.java b/src/api/java/appeng/api/recipes/IRecipeHandler.java index 153d1623..63d2756f 100644 --- a/src/api/java/appeng/api/recipes/IRecipeHandler.java +++ b/src/api/java/appeng/api/recipes/IRecipeHandler.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.recipes; /** diff --git a/src/api/java/appeng/api/recipes/IRecipeLoader.java b/src/api/java/appeng/api/recipes/IRecipeLoader.java index a85dbeba..25a189ec 100644 --- a/src/api/java/appeng/api/recipes/IRecipeLoader.java +++ b/src/api/java/appeng/api/recipes/IRecipeLoader.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.recipes; import java.io.BufferedReader; diff --git a/src/api/java/appeng/api/recipes/ISubItemResolver.java b/src/api/java/appeng/api/recipes/ISubItemResolver.java index 49a0bf31..acd5a73c 100644 --- a/src/api/java/appeng/api/recipes/ISubItemResolver.java +++ b/src/api/java/appeng/api/recipes/ISubItemResolver.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.recipes; public interface ISubItemResolver diff --git a/src/api/java/appeng/api/recipes/ResolverResult.java b/src/api/java/appeng/api/recipes/ResolverResult.java index 03e696f0..cf4e6ff2 100644 --- a/src/api/java/appeng/api/recipes/ResolverResult.java +++ b/src/api/java/appeng/api/recipes/ResolverResult.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.recipes; import net.minecraft.nbt.NBTTagCompound; @@ -10,15 +33,15 @@ public class ResolverResult final public NBTTagCompound compound; public ResolverResult(String name, int damage) { - itemName = name; - damageValue = damage; - compound = null; + this.itemName = name; + this.damageValue = damage; + this.compound = null; } public ResolverResult(String name, int damage, NBTTagCompound data) { - itemName = name; - damageValue = damage; - compound = data; + this.itemName = name; + this.damageValue = damage; + this.compound = data; } } diff --git a/src/api/java/appeng/api/recipes/ResolverResultSet.java b/src/api/java/appeng/api/recipes/ResolverResultSet.java index d9e34aa4..9865d700 100644 --- a/src/api/java/appeng/api/recipes/ResolverResultSet.java +++ b/src/api/java/appeng/api/recipes/ResolverResultSet.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.recipes; import java.util.Arrays; @@ -12,8 +35,8 @@ public class ResolverResultSet public final List results; public ResolverResultSet(String myName, ItemStack... set) { - results = Arrays.asList( set ); - name = myName; + this.results = Arrays.asList( set ); + this.name = myName; } } diff --git a/src/api/java/appeng/api/storage/ICellContainer.java b/src/api/java/appeng/api/storage/ICellContainer.java index 8b1f7c21..086c11d1 100644 --- a/src/api/java/appeng/api/storage/ICellContainer.java +++ b/src/api/java/appeng/api/storage/ICellContainer.java @@ -1,9 +1,32 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.storage; import appeng.api.networking.security.IActionHost; /** - * Represents a IGridhost that contributes to storage, such as a ME Chest, or ME Drive. + * Represents an {@link appeng.api.networking.IGridHost} that contributes to storage, such as a ME Chest, or ME Drive. */ public interface ICellContainer extends IActionHost, ICellProvider, ISaveProvider { diff --git a/src/api/java/appeng/api/storage/ICellHandler.java b/src/api/java/appeng/api/storage/ICellHandler.java index 1ddc839a..1b0d0fa0 100644 --- a/src/api/java/appeng/api/storage/ICellHandler.java +++ b/src/api/java/appeng/api/storage/ICellHandler.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.storage; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/api/java/appeng/api/storage/ICellInventory.java b/src/api/java/appeng/api/storage/ICellInventory.java index c48567d4..54098688 100644 --- a/src/api/java/appeng/api/storage/ICellInventory.java +++ b/src/api/java/appeng/api/storage/ICellInventory.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.storage; import net.minecraft.inventory.IInventory; diff --git a/src/api/java/appeng/api/storage/ICellInventoryHandler.java b/src/api/java/appeng/api/storage/ICellInventoryHandler.java index b7e0d610..752e6e65 100644 --- a/src/api/java/appeng/api/storage/ICellInventoryHandler.java +++ b/src/api/java/appeng/api/storage/ICellInventoryHandler.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.storage; import appeng.api.config.IncludeExclude; diff --git a/src/api/java/appeng/api/storage/ICellProvider.java b/src/api/java/appeng/api/storage/ICellProvider.java index 643439d6..33430d7e 100644 --- a/src/api/java/appeng/api/storage/ICellProvider.java +++ b/src/api/java/appeng/api/storage/ICellProvider.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.storage; import java.util.List; diff --git a/src/api/java/appeng/api/storage/ICellRegistry.java b/src/api/java/appeng/api/storage/ICellRegistry.java index 4e983102..12da94a2 100644 --- a/src/api/java/appeng/api/storage/ICellRegistry.java +++ b/src/api/java/appeng/api/storage/ICellRegistry.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.storage; import net.minecraft.item.ItemStack; diff --git a/src/api/java/appeng/api/storage/ICellWorkbenchItem.java b/src/api/java/appeng/api/storage/ICellWorkbenchItem.java index e4fab828..28d73b74 100644 --- a/src/api/java/appeng/api/storage/ICellWorkbenchItem.java +++ b/src/api/java/appeng/api/storage/ICellWorkbenchItem.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.storage; import net.minecraft.inventory.IInventory; diff --git a/src/api/java/appeng/api/storage/IExternalStorageHandler.java b/src/api/java/appeng/api/storage/IExternalStorageHandler.java index a17cdd6f..0d4b5ee6 100644 --- a/src/api/java/appeng/api/storage/IExternalStorageHandler.java +++ b/src/api/java/appeng/api/storage/IExternalStorageHandler.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.storage; import net.minecraft.tileentity.TileEntity; diff --git a/src/api/java/appeng/api/storage/IExternalStorageRegistry.java b/src/api/java/appeng/api/storage/IExternalStorageRegistry.java index 7edbc8b9..af07e0b4 100644 --- a/src/api/java/appeng/api/storage/IExternalStorageRegistry.java +++ b/src/api/java/appeng/api/storage/IExternalStorageRegistry.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.storage; import net.minecraft.tileentity.TileEntity; diff --git a/src/api/java/appeng/api/storage/IMEInventory.java b/src/api/java/appeng/api/storage/IMEInventory.java index d51be9fa..3c2a75c5 100644 --- a/src/api/java/appeng/api/storage/IMEInventory.java +++ b/src/api/java/appeng/api/storage/IMEInventory.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.storage; import appeng.api.config.Actionable; diff --git a/src/api/java/appeng/api/storage/IMEInventoryHandler.java b/src/api/java/appeng/api/storage/IMEInventoryHandler.java index a93d8b86..d05e1a81 100644 --- a/src/api/java/appeng/api/storage/IMEInventoryHandler.java +++ b/src/api/java/appeng/api/storage/IMEInventoryHandler.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.storage; import appeng.api.config.AccessRestriction; diff --git a/src/api/java/appeng/api/storage/IMEMonitor.java b/src/api/java/appeng/api/storage/IMEMonitor.java index 439bb00e..167a6732 100644 --- a/src/api/java/appeng/api/storage/IMEMonitor.java +++ b/src/api/java/appeng/api/storage/IMEMonitor.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.storage; import appeng.api.networking.storage.IBaseMonitor; diff --git a/src/api/java/appeng/api/storage/IMEMonitorHandlerReceiver.java b/src/api/java/appeng/api/storage/IMEMonitorHandlerReceiver.java index f0f50d97..4b322961 100644 --- a/src/api/java/appeng/api/storage/IMEMonitorHandlerReceiver.java +++ b/src/api/java/appeng/api/storage/IMEMonitorHandlerReceiver.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.storage; import appeng.api.networking.security.BaseActionSource; diff --git a/src/api/java/appeng/api/storage/ISaveProvider.java b/src/api/java/appeng/api/storage/ISaveProvider.java index a88bfc5b..2d92859f 100644 --- a/src/api/java/appeng/api/storage/ISaveProvider.java +++ b/src/api/java/appeng/api/storage/ISaveProvider.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.storage; diff --git a/src/api/java/appeng/api/storage/IStorageHelper.java b/src/api/java/appeng/api/storage/IStorageHelper.java index 3f3ceb7e..527dec0c 100644 --- a/src/api/java/appeng/api/storage/IStorageHelper.java +++ b/src/api/java/appeng/api/storage/IStorageHelper.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.storage; import appeng.api.networking.crafting.ICraftingLink; @@ -29,7 +52,7 @@ public interface IStorageHelper * @param is * An ItemStack * - * @return a new instance of {@link IAEItemStack} from a MC {@link ItemStack} + * @return a new INSTANCE of {@link IAEItemStack} from a MC {@link ItemStack} */ IAEItemStack createItemStack(ItemStack is); @@ -37,17 +60,17 @@ public interface IStorageHelper * @param is * A FluidStack * - * @return a new instance of {@link IAEFluidStack} from a Forge {@link FluidStack} + * @return a new INSTANCE of {@link IAEFluidStack} from a Forge {@link FluidStack} */ IAEFluidStack createFluidStack(FluidStack is); /** - * @return a new instance of {@link IItemList} for items + * @return a new INSTANCE of {@link IItemList} for items */ IItemList createItemList(); /** - * @return a new instance of {@link IItemList} for fluids + * @return a new INSTANCE of {@link IItemList} for fluids */ IItemList createFluidList(); diff --git a/src/api/java/appeng/api/storage/IStorageMonitorable.java b/src/api/java/appeng/api/storage/IStorageMonitorable.java index ea7293a8..cf0650c1 100644 --- a/src/api/java/appeng/api/storage/IStorageMonitorable.java +++ b/src/api/java/appeng/api/storage/IStorageMonitorable.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.storage; import appeng.api.implementations.tiles.ITileStorageMonitorable; diff --git a/src/api/java/appeng/api/storage/ITerminalHost.java b/src/api/java/appeng/api/storage/ITerminalHost.java index 70f76bd0..88207826 100644 --- a/src/api/java/appeng/api/storage/ITerminalHost.java +++ b/src/api/java/appeng/api/storage/ITerminalHost.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.storage; import appeng.api.util.IConfigurableObject; diff --git a/src/api/java/appeng/api/storage/MEMonitorHandler.java b/src/api/java/appeng/api/storage/MEMonitorHandler.java index 0af84ecc..425634a5 100644 --- a/src/api/java/appeng/api/storage/MEMonitorHandler.java +++ b/src/api/java/appeng/api/storage/MEMonitorHandler.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.storage; import appeng.api.config.AccessRestriction; @@ -28,23 +51,23 @@ public class MEMonitorHandler implements IMEMonitor< protected IMEInventoryHandler getHandler() { - return internalHandler; + return this.internalHandler; } protected Iterator, Object>> getListeners() { - return listeners.entrySet().iterator(); + return this.listeners.entrySet().iterator(); } protected void postChangesToListeners( Iterable changes, BaseActionSource src) { - notifyListenersOfChange( changes, src ); + this.notifyListenersOfChange( changes, src ); } protected void notifyListenersOfChange(Iterable diff, BaseActionSource src) { - hasChanged = true;// need to update the cache. - Iterator, Object>> i = getListeners(); + this.hasChanged = true;// need to update the cache. + Iterator, Object>> i = this.getListeners(); while (i.hasNext()) { Entry, Object> o = i.next(); @@ -66,108 +89,108 @@ public class MEMonitorHandler implements IMEMonitor< diff.decStackSize( leftOvers.getStackSize() ); if ( diff.getStackSize() != 0 ) - postChangesToListeners( ImmutableList.of( diff ), src ); + this.postChangesToListeners( ImmutableList.of( diff ), src ); return leftOvers; } public MEMonitorHandler(IMEInventoryHandler t) { - internalHandler = t; - cachedList = (IItemList) t.getChannel().createList(); + this.internalHandler = t; + this.cachedList = (IItemList) t.getChannel().createList(); } public MEMonitorHandler(IMEInventoryHandler t, StorageChannel chan) { - internalHandler = t; - cachedList = (IItemList) chan.createList(); + this.internalHandler = t; + this.cachedList = (IItemList) chan.createList(); } @Override public void addListener(IMEMonitorHandlerReceiver l, Object verificationToken) { - listeners.put( l, verificationToken ); + this.listeners.put( l, verificationToken ); } @Override public void removeListener(IMEMonitorHandlerReceiver l) { - listeners.remove( l ); + this.listeners.remove( l ); } @Override public StackType injectItems(StackType input, Actionable mode, BaseActionSource src) { if ( mode == Actionable.SIMULATE ) - return getHandler().injectItems( input, mode, src ); - return monitorDifference(input.copy(), getHandler().injectItems(input, mode, src), false, src); + return this.getHandler().injectItems( input, mode, src ); + return this.monitorDifference(input.copy(), this.getHandler().injectItems(input, mode, src), false, src); } @Override public StackType extractItems(StackType request, Actionable mode, BaseActionSource src) { if ( mode == Actionable.SIMULATE ) - return getHandler().extractItems( request, mode, src ); - return monitorDifference(request.copy(), getHandler().extractItems(request, mode, src), true, src); + return this.getHandler().extractItems( request, mode, src ); + return this.monitorDifference(request.copy(), this.getHandler().extractItems(request, mode, src), true, src); } @Override public IItemList getStorageList() { - if ( hasChanged ) + if ( this.hasChanged ) { - hasChanged = false; - cachedList.resetStatus(); - return getAvailableItems( cachedList ); + this.hasChanged = false; + this.cachedList.resetStatus(); + return this.getAvailableItems( this.cachedList ); } - return cachedList; + return this.cachedList; } @Override public IItemList getAvailableItems(IItemList out) { - return getHandler().getAvailableItems( out ); + return this.getHandler().getAvailableItems( out ); } @Override public StorageChannel getChannel() { - return getHandler().getChannel(); + return this.getHandler().getChannel(); } @Override public AccessRestriction getAccess() { - return getHandler().getAccess(); + return this.getHandler().getAccess(); } @Override public boolean isPrioritized(StackType input) { - return getHandler().isPrioritized( input ); + return this.getHandler().isPrioritized( input ); } @Override public boolean canAccept(StackType input) { - return getHandler().canAccept( input ); + return this.getHandler().canAccept( input ); } @Override public int getPriority() { - return getHandler().getPriority(); + return this.getHandler().getPriority(); } @Override public int getSlot() { - return getHandler().getSlot(); + return this.getHandler().getSlot(); } @Override public boolean validForPass(int i) { - return getHandler().validForPass( i ); + return this.getHandler().validForPass( i ); } } diff --git a/src/api/java/appeng/api/storage/StorageChannel.java b/src/api/java/appeng/api/storage/StorageChannel.java index 1ada1509..bba039b4 100644 --- a/src/api/java/appeng/api/storage/StorageChannel.java +++ b/src/api/java/appeng/api/storage/StorageChannel.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.storage; import appeng.api.AEApi; @@ -21,7 +44,7 @@ public enum StorageChannel public final Class type; private StorageChannel( Class t ) { - type = t; + this.type = t; } public IItemList createList() { diff --git a/src/api/java/appeng/api/storage/data/IAEFluidStack.java b/src/api/java/appeng/api/storage/data/IAEFluidStack.java index 9a1ad283..ea6faefd 100644 --- a/src/api/java/appeng/api/storage/data/IAEFluidStack.java +++ b/src/api/java/appeng/api/storage/data/IAEFluidStack.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.storage.data; import net.minecraftforge.fluids.Fluid; diff --git a/src/api/java/appeng/api/storage/data/IAEItemStack.java b/src/api/java/appeng/api/storage/data/IAEItemStack.java index 26cbbb58..c585da23 100644 --- a/src/api/java/appeng/api/storage/data/IAEItemStack.java +++ b/src/api/java/appeng/api/storage/data/IAEItemStack.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.storage.data; import net.minecraft.item.Item; diff --git a/src/api/java/appeng/api/storage/data/IAEStack.java b/src/api/java/appeng/api/storage/data/IAEStack.java index 64a5963c..aefbe729 100644 --- a/src/api/java/appeng/api/storage/data/IAEStack.java +++ b/src/api/java/appeng/api/storage/data/IAEStack.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.storage.data; import appeng.api.config.FuzzyMode; diff --git a/src/api/java/appeng/api/storage/data/IAETagCompound.java b/src/api/java/appeng/api/storage/data/IAETagCompound.java index ef283978..9b0928e5 100644 --- a/src/api/java/appeng/api/storage/data/IAETagCompound.java +++ b/src/api/java/appeng/api/storage/data/IAETagCompound.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.storage.data; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/api/java/appeng/api/storage/data/IItemContainer.java b/src/api/java/appeng/api/storage/data/IItemContainer.java index fb12493d..9e67bdc1 100644 --- a/src/api/java/appeng/api/storage/data/IItemContainer.java +++ b/src/api/java/appeng/api/storage/data/IItemContainer.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.storage.data; import appeng.api.config.FuzzyMode; diff --git a/src/api/java/appeng/api/storage/data/IItemList.java b/src/api/java/appeng/api/storage/data/IItemList.java index d8f06d11..e339d2b3 100644 --- a/src/api/java/appeng/api/storage/data/IItemList.java +++ b/src/api/java/appeng/api/storage/data/IItemList.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.storage.data; import java.util.Iterator; diff --git a/src/api/java/appeng/api/util/AECableType.java b/src/api/java/appeng/api/util/AECableType.java index c1ee4eed..92e40234 100644 --- a/src/api/java/appeng/api/util/AECableType.java +++ b/src/api/java/appeng/api/util/AECableType.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.util; public enum AECableType diff --git a/src/api/java/appeng/api/util/AEColor.java b/src/api/java/appeng/api/util/AEColor.java index 83a45894..b9675738 100644 --- a/src/api/java/appeng/api/util/AEColor.java +++ b/src/api/java/appeng/api/util/AEColor.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.util; import net.minecraft.util.StatCollector; @@ -66,9 +89,9 @@ public enum AEColor AEColor(String unlocalizedName, int blackHex, int medHex, int whiteHex) { this.unlocalizedName = unlocalizedName; - blackVariant = blackHex; - mediumVariant = medHex; - whiteVariant = whiteHex; + this.blackVariant = blackHex; + this.mediumVariant = medHex; + this.whiteVariant = whiteHex; } /** @@ -76,13 +99,13 @@ public enum AEColor */ public boolean matches(AEColor color) { - return equals(Transparent) || color.equals(Transparent) || equals(color); + return this == Transparent || color == Transparent || this == color; } @Override public String toString() { - return StatCollector.translateToLocal( unlocalizedName ); + return StatCollector.translateToLocal( this.unlocalizedName ); } } diff --git a/src/api/java/appeng/api/util/AEColoredItemDefinition.java b/src/api/java/appeng/api/util/AEColoredItemDefinition.java index 75a56f5e..97a25062 100644 --- a/src/api/java/appeng/api/util/AEColoredItemDefinition.java +++ b/src/api/java/appeng/api/util/AEColoredItemDefinition.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.util; import net.minecraft.block.Block; diff --git a/src/api/java/appeng/api/util/AEItemDefinition.java b/src/api/java/appeng/api/util/AEItemDefinition.java index 9fdd987c..c455097d 100644 --- a/src/api/java/appeng/api/util/AEItemDefinition.java +++ b/src/api/java/appeng/api/util/AEItemDefinition.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.util; import net.minecraft.block.Block; diff --git a/src/api/java/appeng/api/util/DimensionalCoord.java b/src/api/java/appeng/api/util/DimensionalCoord.java index 2f528a0a..7e35bb55 100644 --- a/src/api/java/appeng/api/util/DimensionalCoord.java +++ b/src/api/java/appeng/api/util/DimensionalCoord.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.util; import net.minecraft.tileentity.TileEntity; @@ -14,20 +37,20 @@ public class DimensionalCoord extends WorldCoord public DimensionalCoord(DimensionalCoord s) { super( s.x, s.y, s.z ); - w = s.w; - dimId = s.dimId; + this.w = s.w; + this.dimId = s.dimId; } public DimensionalCoord(TileEntity s) { super( s ); - w = s.getWorldObj(); - dimId = w.provider.dimensionId; + this.w = s.getWorldObj(); + this.dimId = this.w.provider.dimensionId; } public DimensionalCoord(World _w, int _x, int _y, int _z) { super( _x, _y, _z ); - w = _w; - dimId = _w.provider.dimensionId; + this.w = _w; + this.dimId = _w.provider.dimensionId; } @Override @@ -38,34 +61,34 @@ public class DimensionalCoord extends WorldCoord public boolean isEqual(DimensionalCoord c) { - return x == c.x && y == c.y && z == c.z && c.w == this.w; + return this.x == c.x && this.y == c.y && this.z == c.z && c.w == this.w; } @Override public boolean equals(Object obj) { - return obj instanceof DimensionalCoord && isEqual((DimensionalCoord) obj); + return obj instanceof DimensionalCoord && this.isEqual((DimensionalCoord) obj); } @Override public int hashCode() { - return super.hashCode() ^ dimId; + return super.hashCode() ^ this.dimId; } public boolean isInWorld(World world) { - return w == world; + return this.w == world; } @Override public String toString() { - return dimId + "," + super.toString(); + return this.dimId + "," + super.toString(); } public World getWorld() { - return w; + return this.w; } } diff --git a/src/api/java/appeng/api/util/ICommonTile.java b/src/api/java/appeng/api/util/ICommonTile.java index 2f8b3881..2cdb1032 100644 --- a/src/api/java/appeng/api/util/ICommonTile.java +++ b/src/api/java/appeng/api/util/ICommonTile.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.util; import net.minecraft.item.ItemStack; diff --git a/src/api/java/appeng/api/util/IConfigManager.java b/src/api/java/appeng/api/util/IConfigManager.java index d383f981..80b60342 100644 --- a/src/api/java/appeng/api/util/IConfigManager.java +++ b/src/api/java/appeng/api/util/IConfigManager.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.util; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/api/java/appeng/api/util/IConfigurableObject.java b/src/api/java/appeng/api/util/IConfigurableObject.java index 6a3ef669..80c6a0d2 100644 --- a/src/api/java/appeng/api/util/IConfigurableObject.java +++ b/src/api/java/appeng/api/util/IConfigurableObject.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.util; /** diff --git a/src/api/java/appeng/api/util/INetworkToolAgent.java b/src/api/java/appeng/api/util/INetworkToolAgent.java index c2e511be..6ec4605b 100644 --- a/src/api/java/appeng/api/util/INetworkToolAgent.java +++ b/src/api/java/appeng/api/util/INetworkToolAgent.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.util; import net.minecraft.util.MovingObjectPosition; diff --git a/src/api/java/appeng/api/util/IOrientable.java b/src/api/java/appeng/api/util/IOrientable.java index 8574a43a..4654a0b0 100644 --- a/src/api/java/appeng/api/util/IOrientable.java +++ b/src/api/java/appeng/api/util/IOrientable.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.util; import net.minecraftforge.common.util.ForgeDirection; diff --git a/src/api/java/appeng/api/util/IOrientableBlock.java b/src/api/java/appeng/api/util/IOrientableBlock.java index 84be3fc4..eefe2413 100644 --- a/src/api/java/appeng/api/util/IOrientableBlock.java +++ b/src/api/java/appeng/api/util/IOrientableBlock.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.util; import net.minecraft.world.IBlockAccess; diff --git a/src/api/java/appeng/api/util/IReadOnlyCollection.java b/src/api/java/appeng/api/util/IReadOnlyCollection.java index ab087ca7..a6fba46d 100644 --- a/src/api/java/appeng/api/util/IReadOnlyCollection.java +++ b/src/api/java/appeng/api/util/IReadOnlyCollection.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.util; public interface IReadOnlyCollection extends Iterable diff --git a/src/api/java/appeng/api/util/WorldCoord.java b/src/api/java/appeng/api/util/WorldCoord.java index e09f01ce..e495ca4a 100644 --- a/src/api/java/appeng/api/util/WorldCoord.java +++ b/src/api/java/appeng/api/util/WorldCoord.java @@ -1,3 +1,26 @@ +/* + * The MIT License (MIT) + * + * Copyright (c) 2013 AlgorithmX2 + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + package appeng.api.util; import net.minecraft.tileentity.TileEntity; @@ -16,56 +39,56 @@ public class WorldCoord public WorldCoord add(ForgeDirection direction, int length) { - x += direction.offsetX * length; - y += direction.offsetY * length; - z += direction.offsetZ * length; + this.x += direction.offsetX * length; + this.y += direction.offsetY * length; + this.z += direction.offsetZ * length; return this; } public WorldCoord subtract(ForgeDirection direction, int length) { - x -= direction.offsetX * length; - y -= direction.offsetY * length; - z -= direction.offsetZ * length; + this.x -= direction.offsetX * length; + this.y -= direction.offsetY * length; + this.z -= direction.offsetZ * length; return this; } public WorldCoord add(int _x, int _y, int _z) { - x += _x; - y += _y; - z += _z; + this.x += _x; + this.y += _y; + this.z += _z; return this; } public WorldCoord subtract(int _x, int _y, int _z) { - x -= _x; - y -= _y; - z -= _z; + this.x -= _x; + this.y -= _y; + this.z -= _z; return this; } public WorldCoord multiple(int _x, int _y, int _z) { - x *= _x; - y *= _y; - z *= _z; + this.x *= _x; + this.y *= _y; + this.z *= _z; return this; } public WorldCoord divide(int _x, int _y, int _z) { - x /= _x; - y /= _y; - z /= _z; + this.x /= _x; + this.y /= _y; + this.z /= _z; return this; } public WorldCoord(int _x, int _y, int _z) { - x = _x; - y = _y; - z = _z; + this.x = _x; + this.y = _y; + this.z = _z; } public WorldCoord(TileEntity s) { @@ -77,9 +100,9 @@ public class WorldCoord */ public ForgeDirection directionTo(WorldCoord loc) { - int ox = x - loc.x; - int oy = y - loc.y; - int oz = z - loc.z; + int ox = this.x - loc.x; + int oy = this.y - loc.y; + int oz = this.z - loc.z; int xlen = Math.abs( ox ); int ylen = Math.abs( oy ); @@ -108,29 +131,29 @@ public class WorldCoord public boolean isEqual(WorldCoord c) { - return x == c.x && y == c.y && z == c.z; + return this.x == c.x && this.y == c.y && this.z == c.z; } public WorldCoord copy() { - return new WorldCoord( x, y, z ); + return new WorldCoord( this.x, this.y, this.z ); } @Override public boolean equals(Object obj) { - return obj instanceof WorldCoord && isEqual((WorldCoord) obj); + return obj instanceof WorldCoord && this.isEqual((WorldCoord) obj); } @Override public String toString() { - return "" + x + "," + y + "," + z; + return "" + this.x + "," + this.y + "," + this.z; } @Override public int hashCode() { - return (y << 24) ^ x ^ z; + return ( this.y << 24) ^ this.x ^ this.z; } } From 4f761d5664e2ac412b116e7f6d50b8a3c7bfa47a Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Tue, 27 Jan 2015 19:15:30 -0500 Subject: [PATCH 27/79] #1784 Turns out that blockEnderIo texture is used --- .../textures/blocks/{old => }/blockEnderIo.png | Bin 1 file changed, 0 insertions(+), 0 deletions(-) rename resources/assets/enderio/textures/blocks/{old => }/blockEnderIo.png (100%) diff --git a/resources/assets/enderio/textures/blocks/old/blockEnderIo.png b/resources/assets/enderio/textures/blocks/blockEnderIo.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/blockEnderIo.png rename to resources/assets/enderio/textures/blocks/blockEnderIo.png From c8090b04f06eb27797daadf23d8a867f39d42cea Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Tue, 27 Jan 2015 19:26:35 -0500 Subject: [PATCH 28/79] Fix IItemDuct methods on item conduit ignoring filter settings --- .../java/crazypants/enderio/conduit/item/ItemConduit.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/crazypants/enderio/conduit/item/ItemConduit.java b/src/main/java/crazypants/enderio/conduit/item/ItemConduit.java index 9affd748..0d15d8da 100644 --- a/src/main/java/crazypants/enderio/conduit/item/ItemConduit.java +++ b/src/main/java/crazypants/enderio/conduit/item/ItemConduit.java @@ -35,6 +35,7 @@ import crazypants.enderio.tool.ToolUtil; import crazypants.render.IconUtil; import crazypants.util.BlockCoord; import crazypants.util.DyeColor; +import crazypants.util.ItemUtil; public class ItemConduit extends AbstractConduit implements IItemConduit { @@ -250,8 +251,13 @@ public class ItemConduit extends AbstractConduit implements IItemConduit { return item; } else if(network == null) { return item; + } else { + IItemFilter filter = inputFilters.get(from); + ItemConduitNetwork network = (ItemConduitNetwork) getNetwork(); + if(filter != null && !filter.doesItemPassFilter(network.getInventory(this, from.getOpposite()), item)) { + return item; + } } - return network.sendItems(this, item, from); } From 35324eaab0815158f5151bca30ec82760b7acbf1 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Tue, 27 Jan 2015 19:53:50 -0500 Subject: [PATCH 29/79] #1745 Add support for sending grinding balls via IMC --- .../enderio/machine/crusher/CrusherRecipeManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/crazypants/enderio/machine/crusher/CrusherRecipeManager.java b/src/main/java/crazypants/enderio/machine/crusher/CrusherRecipeManager.java index bd2feac8..cb0393fe 100644 --- a/src/main/java/crazypants/enderio/machine/crusher/CrusherRecipeManager.java +++ b/src/main/java/crazypants/enderio/machine/crusher/CrusherRecipeManager.java @@ -130,7 +130,7 @@ public class CrusherRecipeManager { public void addCustomRecipes(String xmlDef) { RecipeConfig config; try { - config = RecipeConfigParser.parse(xmlDef, null); + config = RecipeConfigParser.parse(xmlDef, new GrindingBallTagHandler()); } catch (Exception e) { Log.error("Error parsing custom xml"); return; From 4b8c8ba9194422c99058bc9994a5b1dc2a784bb4 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Tue, 27 Jan 2015 22:09:52 -0500 Subject: [PATCH 30/79] #1771 Add single UUID to share between killer joes --- .../crazypants/enderio/machine/killera/TileKillerJoe.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java b/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java index cfb5f36a..e598da3b 100644 --- a/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java +++ b/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java @@ -1,6 +1,7 @@ package crazypants.enderio.machine.killera; import java.util.List; +import java.util.UUID; import net.minecraft.command.IEntitySelector; import net.minecraft.entity.Entity; @@ -487,13 +488,15 @@ public class TileKillerJoe extends AbstractMachineEntity implements IFluidHandle xpCon.writeToNBT(nbtRoot); } + private static UUID uuid = UUID.fromString("3baa66fa-a69a-11e4-89d3-123b93f75cba"); + private static GameProfile DUMMY_PROFILE = new GameProfile(uuid, "[EioKillera]"); + private class Attackera extends FakePlayer { ItemStack prevWeapon; public Attackera() { - super(MinecraftServer.getServer().worldServerForDimension(getWorldObj().provider.dimensionId), new GameProfile(null, - BlockKillerJoe.USERNAME + ":" + getLocation())); + super(MinecraftServer.getServer().worldServerForDimension(getWorldObj().provider.dimensionId), DUMMY_PROFILE); posX = xCoord + 0.5; posY = yCoord + 0.5; posZ = zCoord + 0.5; From c9946e21ecfc78a6b270b6b0f9a0f0f4d2db2367 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Tue, 27 Jan 2015 22:57:32 -0500 Subject: [PATCH 31/79] Fix wither skeletons not spawning and fix their equipment/rendering --- .../enderio/entity/EntityWitherSkeleton.java | 78 ++++++++++--------- .../enderio/entity/SkeletonHandler.java | 51 +++++++----- 2 files changed, 71 insertions(+), 58 deletions(-) diff --git a/src/main/java/crazypants/enderio/entity/EntityWitherSkeleton.java b/src/main/java/crazypants/enderio/entity/EntityWitherSkeleton.java index 6f9a1e57..968566eb 100644 --- a/src/main/java/crazypants/enderio/entity/EntityWitherSkeleton.java +++ b/src/main/java/crazypants/enderio/entity/EntityWitherSkeleton.java @@ -11,45 +11,47 @@ import net.minecraft.world.World; import java.util.Calendar; -public class EntityWitherSkeleton extends EntitySkeleton -{ - public EntityWitherSkeleton(World world) - { - super(world); +public class EntityWitherSkeleton extends EntitySkeleton { + public EntityWitherSkeleton(World world) { + super(world); + } + + public EntityWitherSkeleton(EntitySkeleton entity) { + this(entity.worldObj); + this.copyLocationAndAnglesFrom(entity); + for (int i = 0; i < entity.getLastActiveItems().length; i++) { + this.setCurrentItemOrArmor(i, entity.getEquipmentInSlot(i)); + } + } + + @Override + public void setFire(int p_70015_1_) { + } + + @Override + public IEntityLivingData onSpawnWithEgg(IEntityLivingData entityData) { + this.getEntityAttribute(SharedMonsterAttributes.followRange) + .applyModifier(new AttributeModifier("Random spawn bonus", this.rand.nextGaussian() * 0.05D, 1)); + this.setSkeletonType(1); + this.setCurrentItemOrArmor(0, new ItemStack(Items.stone_sword)); + this.getEntityAttribute(SharedMonsterAttributes.attackDamage).setBaseValue(4.0D); + this.setCombatTask(); + this.setCanPickUpLoot(this.rand.nextFloat() < 0.55F * this.worldObj.func_147462_b(this.posX, this.posY, this.posZ)); + + if(this.getEquipmentInSlot(4) == null) { + Calendar calendar = this.worldObj.getCurrentDate(); + + if(calendar.get(2) + 1 == 10 && calendar.get(5) == 31 && this.rand.nextFloat() < 0.25F) { + this.setCurrentItemOrArmor(4, new ItemStack(this.rand.nextFloat() < 0.1F ? Blocks.lit_pumpkin : Blocks.pumpkin)); + this.equipmentDropChances[4] = 0.0F; + } } - public EntityWitherSkeleton(EntitySkeleton entity) - { - this(entity.worldObj); - this.copyLocationAndAnglesFrom(entity); - } + return entityData; + } - @Override - public void setFire(int p_70015_1_) - { - } - - @Override - public IEntityLivingData onSpawnWithEgg(IEntityLivingData entityData) - { - this.getEntityAttribute(SharedMonsterAttributes.followRange).applyModifier(new AttributeModifier("Random spawn bonus", this.rand.nextGaussian() * 0.05D, 1)); - this.setSkeletonType(1); - this.setCurrentItemOrArmor(0, new ItemStack(Items.stone_sword)); - this.getEntityAttribute(SharedMonsterAttributes.attackDamage).setBaseValue(4.0D); - this.setCombatTask(); - this.setCanPickUpLoot(this.rand.nextFloat() < 0.55F * this.worldObj.func_147462_b(this.posX, this.posY, this.posZ)); - - if (this.getEquipmentInSlot(4) == null) - { - Calendar calendar = this.worldObj.getCurrentDate(); - - if (calendar.get(2) + 1 == 10 && calendar.get(5) == 31 && this.rand.nextFloat() < 0.25F) - { - this.setCurrentItemOrArmor(4, new ItemStack(this.rand.nextFloat() < 0.1F ? Blocks.lit_pumpkin : Blocks.pumpkin)); - this.equipmentDropChances[4] = 0.0F; - } - } - - return entityData; - } + @Override + public int getSkeletonType() { + return 1; + } } diff --git a/src/main/java/crazypants/enderio/entity/SkeletonHandler.java b/src/main/java/crazypants/enderio/entity/SkeletonHandler.java index 426593d3..96fcf6a0 100644 --- a/src/main/java/crazypants/enderio/entity/SkeletonHandler.java +++ b/src/main/java/crazypants/enderio/entity/SkeletonHandler.java @@ -1,30 +1,41 @@ package crazypants.enderio.entity; +import net.minecraft.entity.Entity; +import net.minecraft.entity.monster.EntitySkeleton; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.entity.EntityJoinWorldEvent; +import net.minecraftforge.event.entity.living.LivingSpawnEvent; import cpw.mods.fml.common.eventhandler.EventPriority; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.registry.EntityRegistry; import crazypants.enderio.EnderIO; -import net.minecraft.entity.monster.EntitySkeleton; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.entity.EntityJoinWorldEvent; -public class SkeletonHandler -{ - @SubscribeEvent(priority = EventPriority.HIGHEST) - public void skeletonJoinWorld(EntityJoinWorldEvent event) - { - if (event.entity.getClass() == EntitySkeleton.class && ((EntitySkeleton)event.entity).getSkeletonType()==1) - { - event.setCanceled(true); - event.world.spawnEntityInWorld(new EntityWitherSkeleton((EntitySkeleton)event.entity)); - } - } +public class SkeletonHandler { - public static void registerSkeleton(EnderIO mod) - { - int entityID = EntityRegistry.findGlobalUniqueEntityId(); - EntityRegistry.registerGlobalEntityID(EntityWitherSkeleton.class,"witherSkeleton", entityID, 0x00003D, 0x751947); - EntityRegistry.registerModEntity(EntityWitherSkeleton.class,"witherSkeleton",entityID,mod,64,3,true); - MinecraftForge.EVENT_BUS.register(new SkeletonHandler()); + @SubscribeEvent(priority = EventPriority.HIGHEST) + public void skeletonJoinWorld(LivingSpawnEvent event) { + if(isWitherSkele(event.entity)) { + event.entity.setDead(); + event.world.spawnEntityInWorld(new EntityWitherSkeleton((EntitySkeleton) event.entity)); } + } + + @SubscribeEvent(priority = EventPriority.HIGHEST) + public void skeletonJoinWorld(EntityJoinWorldEvent event) { + if(isWitherSkele(event.entity)) { + event.setCanceled(true); + event.world.spawnEntityInWorld(new EntityWitherSkeleton((EntitySkeleton) event.entity)); + } + } + + private boolean isWitherSkele(Entity entity) { + return entity.getClass() == EntitySkeleton.class && ((EntitySkeleton) entity).getSkeletonType() == 1; + } + + public static void registerSkeleton(EnderIO mod) { + int entityID = EntityRegistry.findGlobalUniqueEntityId(); + EntityRegistry.registerGlobalEntityID(EntityWitherSkeleton.class, "witherSkeleton", entityID, 0x00003D, 0x751947); + EntityRegistry.registerModEntity(EntityWitherSkeleton.class, "witherSkeleton", entityID, mod, 64, 3, true); + MinecraftForge.EVENT_BUS.register(new SkeletonHandler()); + } } From bf211db416bfe78b3b6712e10a80ecf7044d7c15 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Tue, 27 Jan 2015 23:28:25 -0500 Subject: [PATCH 32/79] Wither skeletons will now drop necrotic bones and respect beheading --- .../enderio/entity/EntityWitherSkeleton.java | 40 ++++++++++++++++++- src/main/java/crazypants/util/EntityUtil.java | 33 +++++++++++++-- 2 files changed, 67 insertions(+), 6 deletions(-) diff --git a/src/main/java/crazypants/enderio/entity/EntityWitherSkeleton.java b/src/main/java/crazypants/enderio/entity/EntityWitherSkeleton.java index 968566eb..59bda4e0 100644 --- a/src/main/java/crazypants/enderio/entity/EntityWitherSkeleton.java +++ b/src/main/java/crazypants/enderio/entity/EntityWitherSkeleton.java @@ -1,15 +1,22 @@ package crazypants.enderio.entity; +import java.util.Calendar; + +import net.minecraft.enchantment.EnchantmentHelper; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.IEntityLivingData; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.monster.EntitySkeleton; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.DamageSource; import net.minecraft.world.World; - -import java.util.Calendar; +import cpw.mods.fml.common.registry.GameRegistry; +import crazypants.util.EntityUtil; public class EntityWitherSkeleton extends EntitySkeleton { public EntityWitherSkeleton(World world) { @@ -54,4 +61,33 @@ public class EntityWitherSkeleton extends EntitySkeleton { public int getSkeletonType() { return 1; } + + @Override + public void onDeath(DamageSource source) { + super.onDeath(source); + if(source.damageType.equals("player")) { + EntityPlayer player = (EntityPlayer) source.getEntity(); + ItemStack stack = player.getCurrentEquippedItem(); + if(stack != null && stack.hasTagCompound()) { + Item cleaver = GameRegistry.findItem("TConstruct", "cleaver"); + int beheading = stack.getTagCompound().getCompoundTag("InfiTool").getInteger("Beheading"); + if(stack.getItem() == cleaver) { + beheading += 2; + } + System.out.println(beheading); + if(beheading > 0 && worldObj.rand.nextInt(100) < beheading * 10) { + EntityUtil.spawnItemInWorldWithRandomMotion(worldObj, new ItemStack(Items.skull, 1, 1), posX, posY, posZ); + } + } + } + if(source.getEntity() instanceof EntityLivingBase) { + int lootingLevel = EnchantmentHelper.getLootingModifier((EntityLivingBase) source.getEntity()); + if(worldObj.rand.nextInt(Math.max(1, 1 - lootingLevel)) == 0) { + Item necroticBone = GameRegistry.findItem("TConstruct", "materials"); + if(necroticBone != null) { + EntityUtil.spawnItemInWorldWithRandomMotion(worldObj, new ItemStack(necroticBone, 1, 8), posX, posY, posZ); + } + } + } + } } diff --git a/src/main/java/crazypants/util/EntityUtil.java b/src/main/java/crazypants/util/EntityUtil.java index 024978e2..2a214658 100644 --- a/src/main/java/crazypants/util/EntityUtil.java +++ b/src/main/java/crazypants/util/EntityUtil.java @@ -5,18 +5,18 @@ import java.util.List; import java.util.Map; import java.util.Set; -import crazypants.vecmath.Vector3d; - import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.boss.IBossDisplayData; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.MathHelper; import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import crazypants.vecmath.Vector3d; public class EntityUtil { @@ -65,5 +65,30 @@ public class EntityUtil { } return collidingBoundingBoxes; } - + + public static void spawnItemInWorldWithRandomMotion(World world, ItemStack item, int x, int y, int z) { + if(item != null) { + spawnItemInWorldWithRandomMotion(world, item, x + 0.5, y + 0.5, z + 0.5); + } + } + + public static void spawnItemInWorldWithRandomMotion(World world, ItemStack item, double x, double y, double z) { + if(item != null) { + spawnItemInWorldWithRandomMotion(new EntityItem(world, x, y, z, item)); + } + } + + public static void spawnItemInWorldWithRandomMotion(EntityItem entity) { + entity.delayBeforeCanPickup = 10; + + float f = (entity.worldObj.rand.nextFloat() * 0.1f) - 0.05f; + float f1 = (entity.worldObj.rand.nextFloat() * 0.1f) - 0.05f; + float f2 = (entity.worldObj.rand.nextFloat() * 0.1f) - 0.05f; + + entity.motionX += f; + entity.motionY += f1; + entity.motionZ += f2; + + entity.worldObj.spawnEntityInWorld(entity); + } } From f0bf4a7b91947ddc6c6ba13b975ca4db71df6abc Mon Sep 17 00:00:00 2001 From: Matthias Mann Date: Wed, 28 Jan 2015 22:34:19 +0100 Subject: [PATCH 33/79] update task progress at least once per second --- .../machine/AbstractPoweredTaskEntity.java | 4 +++- .../machine/slicensplice/TileSliceAndSplice.java | 16 ++-------------- .../enderio/machine/soul/TileSoulBinder.java | 14 +------------- 3 files changed, 6 insertions(+), 28 deletions(-) diff --git a/src/main/java/crazypants/enderio/machine/AbstractPoweredTaskEntity.java b/src/main/java/crazypants/enderio/machine/AbstractPoweredTaskEntity.java index 65137325..15e77872 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractPoweredTaskEntity.java +++ b/src/main/java/crazypants/enderio/machine/AbstractPoweredTaskEntity.java @@ -22,6 +22,7 @@ public abstract class AbstractPoweredTaskEntity extends AbstractPowerConsumerEnt protected boolean startFailed = false; protected int lastProgressScaled = -1; + protected int ticksSinceLastProgressUpdate; public AbstractPoweredTaskEntity(SlotDefinition slotDefinition) { super(slotDefinition); @@ -124,6 +125,7 @@ public abstract class AbstractPoweredTaskEntity extends AbstractPowerConsumerEnt protected void sendTaskProgressPacket() { PacketHandler.sendToAllAround(new PacketCurrentTaskProgress(this), this); + ticksSinceLastProgressUpdate = 0; } protected boolean checkProgress(boolean redstoneChecksPassed) { @@ -140,7 +142,7 @@ public abstract class AbstractPoweredTaskEntity extends AbstractPowerConsumerEnt } int curScaled = getProgressScaled(16); - if(curScaled != lastProgressScaled) { + if(++ticksSinceLastProgressUpdate >= 20 || curScaled != lastProgressScaled) { sendTaskProgressPacket(); lastProgressScaled = curScaled; } diff --git a/src/main/java/crazypants/enderio/machine/slicensplice/TileSliceAndSplice.java b/src/main/java/crazypants/enderio/machine/slicensplice/TileSliceAndSplice.java index d31d7fdc..571a4626 100644 --- a/src/main/java/crazypants/enderio/machine/slicensplice/TileSliceAndSplice.java +++ b/src/main/java/crazypants/enderio/machine/slicensplice/TileSliceAndSplice.java @@ -4,12 +4,10 @@ import java.util.List; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemAxe; -import net.minecraft.item.ItemHoe; import net.minecraft.item.ItemShears; import net.minecraft.item.ItemStack; import net.minecraft.server.MinecraftServer; import net.minecraftforge.common.util.FakePlayerFactory; -import crazypants.enderio.Log; import crazypants.enderio.ModObject; import crazypants.enderio.config.Config; import crazypants.enderio.machine.AbstractPoweredTaskEntity; @@ -17,7 +15,6 @@ import crazypants.enderio.machine.IMachineRecipe; import crazypants.enderio.machine.MachineRecipeInput; import crazypants.enderio.machine.MachineRecipeRegistry; import crazypants.enderio.machine.SlotDefinition; -import crazypants.enderio.machine.alloy.VanillaSmeltingRecipe; import crazypants.enderio.machine.recipe.ManyToOneMachineRecipe; import crazypants.enderio.power.BasicCapacitor; import crazypants.enderio.power.Capacitors; @@ -40,8 +37,8 @@ public class TileSliceAndSplice extends AbstractPoweredTaskEntity { Capacitors.ENDER_CAPACITOR.capacitor.getMaxEnergyStored(), POWER_PER_TICK_THREE); - private int axeIndex = 6; - private int shearsIndex = 7; + private final int axeIndex = 6; + private final int shearsIndex = 7; private EntityLivingBase fakePlayer; private ICapacitor capacitor; @@ -94,15 +91,6 @@ public class TileSliceAndSplice extends AbstractPoweredTaskEntity { return POWER_PER_TICK_THREE; } - @Override - public int getProgressScaled(int scale) { - int res = super.getProgressScaled(scale); - if(currentTask != null) { - res = Math.max(1, res); - } - return res; - } - @Override protected IMachineRecipe canStartNextTask(float chance) { if(getAxe() == null || getShears() == null) { diff --git a/src/main/java/crazypants/enderio/machine/soul/TileSoulBinder.java b/src/main/java/crazypants/enderio/machine/soul/TileSoulBinder.java index d235e41b..4f5bde26 100644 --- a/src/main/java/crazypants/enderio/machine/soul/TileSoulBinder.java +++ b/src/main/java/crazypants/enderio/machine/soul/TileSoulBinder.java @@ -2,7 +2,6 @@ package crazypants.enderio.machine.soul; import java.util.List; -import scala.xml.persistent.SetStorage; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; @@ -10,7 +9,6 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; -import crazypants.enderio.EnderIO; import crazypants.enderio.ModObject; import crazypants.enderio.config.Config; import crazypants.enderio.machine.AbstractPoweredTaskEntity; @@ -22,7 +20,6 @@ import crazypants.enderio.network.PacketHandler; import crazypants.enderio.power.BasicCapacitor; import crazypants.enderio.power.Capacitors; import crazypants.enderio.power.ICapacitor; -import crazypants.enderio.power.PowerHandlerUtil; import crazypants.enderio.xp.ExperienceContainer; import crazypants.enderio.xp.IHaveExperience; import crazypants.enderio.xp.PacketExperianceContainer; @@ -45,7 +42,7 @@ public class TileSoulBinder extends AbstractPoweredTaskEntity implements IHaveEx private ICapacitor capacitor; - private ExperienceContainer xpCont = new ExperienceContainer(XpUtil.getExperienceForLevel(Config.soulBinderMaxXpLevel)); + private final ExperienceContainer xpCont = new ExperienceContainer(XpUtil.getExperienceForLevel(Config.soulBinderMaxXpLevel)); public TileSoulBinder() { super(new SlotDefinition(2, 2, 1)); @@ -174,15 +171,6 @@ public class TileSoulBinder extends AbstractPoweredTaskEntity implements IHaveEx return POWER_PER_TICK_THREE; } - @Override - public int getProgressScaled(int scale) { - int res = super.getProgressScaled(scale); - if(currentTask != null) { - res = Math.max(1, res); - } - return res; - } - @Override protected boolean doPull(ForgeDirection dir) { boolean res = super.doPull(dir); From a605736710202a17d1ec240e09374a675adefe45 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Thu, 29 Jan 2015 13:15:26 -0500 Subject: [PATCH 34/79] Fix tooltips rendering under IO config, also fix changing NEI lighting --- .../enderio/gui/IoConfigRenderer.java | 4 +- .../java/crazypants/gui/GuiContainerBase.java | 48 +++++++++++++------ 2 files changed, 36 insertions(+), 16 deletions(-) diff --git a/src/main/java/crazypants/enderio/gui/IoConfigRenderer.java b/src/main/java/crazypants/enderio/gui/IoConfigRenderer.java index e1b7aa8b..d408e3bc 100644 --- a/src/main/java/crazypants/enderio/gui/IoConfigRenderer.java +++ b/src/main/java/crazypants/enderio/gui/IoConfigRenderer.java @@ -230,6 +230,7 @@ public class IoConfigRenderer { if(!updateCamera(partialTick, vp.x, vp.y, vp.width, vp.height)) { return; } + GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS); applyCamera(partialTick); TravelController.instance.setSelectionEnabled(false); renderScene(); @@ -237,6 +238,7 @@ public class IoConfigRenderer { renderSelection(); renderOverlay(par1, par2); + GL11.glPopAttrib(); } private void renderSelection() { @@ -287,6 +289,7 @@ public class IoConfigRenderer { mx -= vpx; my -= vpy; + if(mx >= x && mx <= x + IconEIO.IO_WHATSIT.width && my >= y && my <= y + IconEIO.IO_WHATSIT.height) { RenderUtil.renderQuad2D(x, y, 0, IconEIO.IO_WHATSIT.width, IconEIO.IO_WHATSIT.height, new Vector4f(0.4f,0.4f,0.4f,0.6f)); @@ -298,7 +301,6 @@ public class IoConfigRenderer { GL11.glColor3f(1, 1, 1); IconEIO.IO_WHATSIT.renderIcon(x, y, true); - if(selection != null) { IconEIO ioIcon = null; // INPUT diff --git a/src/main/java/crazypants/gui/GuiContainerBase.java b/src/main/java/crazypants/gui/GuiContainerBase.java index 791c90a7..94d8138e 100644 --- a/src/main/java/crazypants/gui/GuiContainerBase.java +++ b/src/main/java/crazypants/gui/GuiContainerBase.java @@ -1,5 +1,6 @@ package crazypants.gui; +import java.lang.reflect.Field; import java.util.ArrayList; import java.util.Iterator; import java.util.List; @@ -10,6 +11,7 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.inventory.Container; +import net.minecraft.util.Timer; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; @@ -22,6 +24,8 @@ public abstract class GuiContainerBase extends GuiContainer implements ToolTipRe protected ToolTipManager ttMan = new ToolTipManager(); protected List overlays = new ArrayList(); + + private Field timer = null; protected GuiContainerBase(Container par1Container) { super(par1Container); @@ -94,18 +98,44 @@ public abstract class GuiContainerBase extends GuiContainer implements ToolTipRe public void removeOverlay(IGuiOverlay overlay) { overlays.remove(overlay); } + + private int realMx, realMy; @Override protected final void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { drawForegroundImpl(mouseX, mouseY); - ttMan.drawTooltips(this, mouseX, mouseY); + + Timer t = null; + try { + if(timer == null) { + timer = Minecraft.class.getDeclaredField("timer"); + timer.setAccessible(true); + } + t = (Timer) timer.get(this.mc); + } catch (Exception e) { + e.printStackTrace(); + return; + } + + GL11.glPushMatrix(); + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GL11.glDisable(GL11.GL_DEPTH_TEST); + for (IGuiOverlay overlay : overlays) { + if(overlay != null && overlay.isVisible()) { + overlay.draw(realMx, realMy, t.renderPartialTicks); + } + } + GL11.glEnable(GL11.GL_DEPTH_TEST); + GL11.glPopMatrix(); + + ttMan.drawTooltips(this, realMx, realMy); } @Override public void drawScreen(int par1, int par2, float par3) { - int mx = par1; - int my = par2; + int mx = realMx = par1; + int my = realMy = par2; for(IGuiOverlay overlay : overlays) { if(overlay != null && overlay.isVisible() && isMouseInOverlay(par1, par2, overlay)) { mx = -5000; @@ -114,18 +144,6 @@ public abstract class GuiContainerBase extends GuiContainer implements ToolTipRe } super.drawScreen(mx, my, par3); - - GL11.glPushMatrix(); - GL11.glTranslatef(guiLeft, guiTop, 0.0F); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - GL11.glDisable(GL11.GL_DEPTH_TEST); - for(IGuiOverlay overlay : overlays) { - if(overlay != null && overlay.isVisible()) { - overlay.draw(par1, par2, par3); - } - } - GL11.glEnable(GL11.GL_DEPTH_TEST); - GL11.glPopMatrix(); } private boolean isMouseInOverlay(int mouseX, int mouseY, IGuiOverlay overlay) { From 48b46db178bcc903470369d12b79c94860e17706 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Thu, 29 Jan 2015 13:35:55 -0500 Subject: [PATCH 35/79] Fix held itemstack being "moved" when held over IO config --- .../java/crazypants/gui/GuiContainerBase.java | 49 +++++++++++++------ 1 file changed, 34 insertions(+), 15 deletions(-) diff --git a/src/main/java/crazypants/gui/GuiContainerBase.java b/src/main/java/crazypants/gui/GuiContainerBase.java index 94d8138e..fb1cc43f 100644 --- a/src/main/java/crazypants/gui/GuiContainerBase.java +++ b/src/main/java/crazypants/gui/GuiContainerBase.java @@ -11,6 +11,7 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.inventory.Container; +import net.minecraft.item.ItemStack; import net.minecraft.util.Timer; import org.lwjgl.input.Mouse; @@ -24,7 +25,7 @@ public abstract class GuiContainerBase extends GuiContainer implements ToolTipRe protected ToolTipManager ttMan = new ToolTipManager(); protected List overlays = new ArrayList(); - + private Field timer = null; protected GuiContainerBase(Container par1Container) { @@ -34,14 +35,14 @@ public abstract class GuiContainerBase extends GuiContainer implements ToolTipRe @Override public void initGui() { super.initGui(); - for(IGuiOverlay overlay : overlays) { + for (IGuiOverlay overlay : overlays) { overlay.init(this); } } @Override protected void keyTyped(char par1, int par2) { - if (par2 == 1 || par2 == this.mc.gameSettings.keyBindInventory.getKeyCode()) { + if(par2 == 1 || par2 == this.mc.gameSettings.keyBindInventory.getKeyCode()) { //this.mc.thePlayer.closeScreen(); if(hideOverlays()) { return; @@ -51,7 +52,7 @@ public abstract class GuiContainerBase extends GuiContainer implements ToolTipRe } public boolean hideOverlays() { - for(IGuiOverlay overlay : overlays) { + for (IGuiOverlay overlay : overlays) { if(overlay.isVisible()) { overlay.setVisible(false); return true; @@ -60,7 +61,6 @@ public abstract class GuiContainerBase extends GuiContainer implements ToolTipRe return false; } - @Override public void addToolTip(GuiToolTip toolTip) { ttMan.addToolTip(toolTip); @@ -71,7 +71,7 @@ public abstract class GuiContainerBase extends GuiContainer implements ToolTipRe int x = Mouse.getEventX() * this.width / this.mc.displayWidth; int y = this.height - Mouse.getEventY() * this.height / this.mc.displayHeight - 1; int b = Mouse.getEventButton(); - for(IGuiOverlay overlay : overlays) { + for (IGuiOverlay overlay : overlays) { if(overlay != null && overlay.isVisible() && overlay.handleMouseInput(x, y, b)) { return; } @@ -80,10 +80,10 @@ public abstract class GuiContainerBase extends GuiContainer implements ToolTipRe } @Override - protected boolean func_146978_c(int p_146978_1_, int p_146978_2_, int p_146978_3_, int p_146978_4_, int p_146978_5_, int p_146978_6_) { + protected boolean func_146978_c(int p_146978_1_, int p_146978_2_, int p_146978_3_, int p_146978_4_, int p_146978_5_, int p_146978_6_) { int x = Mouse.getEventX() * this.width / this.mc.displayWidth; int y = this.height - Mouse.getEventY() * this.height / this.mc.displayHeight - 1; - for(IGuiOverlay overlay : overlays) { + for (IGuiOverlay overlay : overlays) { if(overlay != null && overlay.isVisible() && overlay.isMouseInBounds(x, y)) { return false; } @@ -98,7 +98,7 @@ public abstract class GuiContainerBase extends GuiContainer implements ToolTipRe public void removeOverlay(IGuiOverlay overlay) { overlays.remove(overlay); } - + private int realMx, realMy; @Override @@ -136,26 +136,45 @@ public abstract class GuiContainerBase extends GuiContainer implements ToolTipRe int mx = realMx = par1; int my = realMy = par2; - for(IGuiOverlay overlay : overlays) { + for (IGuiOverlay overlay : overlays) { if(overlay != null && overlay.isVisible() && isMouseInOverlay(par1, par2, overlay)) { mx = -5000; my = -5000; + this.drawItemStack(this.mc.thePlayer.inventory.getItemStack(), par1 - this.guiLeft - 8, par2 - this.guiTop - 8, null); } } super.drawScreen(mx, my, par3); } + // copied from super with hate + private void drawItemStack(ItemStack stack, int mouseX, int mouseY, String str) + { + GL11.glTranslatef(0.0F, 0.0F, 32.0F); + this.zLevel = 200.0F; + itemRender.zLevel = 200.0F; + FontRenderer font = null; + if(stack != null) { + font = stack.getItem().getFontRenderer(stack); + } + if(font == null) { + font = fontRendererObj; + } + itemRender.renderItemAndEffectIntoGUI(font, this.mc.getTextureManager(), stack, mouseX, mouseY); + itemRender.renderItemOverlayIntoGUI(font, this.mc.getTextureManager(), stack, mouseX, mouseY, str); + this.zLevel = 0.0F; + itemRender.zLevel = 0.0F; + } + private boolean isMouseInOverlay(int mouseX, int mouseY, IGuiOverlay overlay) { int x = mouseX - getGuiLeft(); int y = mouseY - getGuiTop(); - if(overlay.getBounds().contains(x,y)) { + if(overlay.getBounds().contains(x, y)) { return true; } return false; } - @Override public void removeToolTip(GuiToolTip toolTip) { ttMan.removeToolTip(toolTip); @@ -293,13 +312,13 @@ public abstract class GuiContainerBase extends GuiContainer implements ToolTipRe } @Override - public int getOverlayOffsetX() { + public int getOverlayOffsetX() { return 0; } - + @Override public void doActionPerformed(GuiButton guiButton) { - actionPerformed(guiButton); + actionPerformed(guiButton); } } From 8b78ac07a337aff7389ea0905179720114291f8f Mon Sep 17 00:00:00 2001 From: Matthias Mann Date: Fri, 30 Jan 2015 20:54:02 +0100 Subject: [PATCH 36/79] cache which wireless chargers are in range of a TE --- .../machine/killera/TileKillerJoe.java | 24 ++++++++--- .../machine/wireless/IWirelessCharger.java | 2 +- .../machine/wireless/TileWirelessCharger.java | 20 ++++----- .../wireless/WirelessChargedLocation.java | 43 +++++++++++++++++++ .../wireless/WirelessChargerController.java | 20 ++++++++- 5 files changed, 89 insertions(+), 20 deletions(-) create mode 100644 src/main/java/crazypants/enderio/machine/wireless/WirelessChargedLocation.java diff --git a/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java b/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java index e598da3b..b4043925 100644 --- a/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java +++ b/src/main/java/crazypants/enderio/machine/killera/TileKillerJoe.java @@ -31,7 +31,7 @@ import crazypants.enderio.config.Config; import crazypants.enderio.machine.AbstractMachineEntity; import crazypants.enderio.machine.SlotDefinition; import crazypants.enderio.machine.generator.zombie.NutrientTank; -import crazypants.enderio.machine.wireless.WirelessChargerController; +import crazypants.enderio.machine.wireless.WirelessChargedLocation; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.xp.ExperienceContainer; import crazypants.enderio.xp.IHaveExperience; @@ -45,7 +45,7 @@ import crazypants.vecmath.Vector3d; public class TileKillerJoe extends AbstractMachineEntity implements IFluidHandler, IEntitySelector, IHaveExperience { - private static int IO_MB_TICK = 250; + private static final int IO_MB_TICK = 250; protected AxisAlignedBB killBounds; @@ -55,6 +55,8 @@ public class TileKillerJoe extends AbstractMachineEntity implements IFluidHandle protected FakePlayer attackera; + protected WirelessChargedLocation chargedLocation; + final NutrientTank fuelTank = new NutrientTank(FluidContainerRegistry.BUCKET_VOLUME * 2); int lastFluidLevelUpdate; @@ -69,7 +71,7 @@ public class TileKillerJoe extends AbstractMachineEntity implements IFluidHandle private float prevSwingProgress; - private ExperienceContainer xpCon = new ExperienceContainer(XpUtil.getExperienceForLevel(Config.killerJoeMaxXpLevel)); + private final ExperienceContainer xpCon = new ExperienceContainer(XpUtil.getExperienceForLevel(Config.killerJoeMaxXpLevel)); private boolean hadSword; @@ -204,7 +206,7 @@ public class TileKillerJoe extends AbstractMachineEntity implements IFluidHandle frontFaceAndSides = new int[]{this.facing,ForgeDirection.ROTATION_MATRIX[0][this.facing],ForgeDirection.ROTATION_MATRIX[1][this.facing]}; } - private static double[][] faceMidPoints = new double[][]{{0.5D,0.0D,0.5D},{0.5D,1.0D,0.5D},{0.5D,0.5D,0.0D},{0.5D,0.5D,1.0D},{0.0D,0.5D,0.5D},{1.0D,0.5D,0.5D}}; + private static final double[][] faceMidPoints = new double[][]{{0.5D,0.0D,0.5D},{0.5D,1.0D,0.5D},{0.5D,0.5D,0.0D},{0.5D,0.5D,1.0D},{0.0D,0.5D,0.5D},{1.0D,0.5D,0.5D}}; //------------------------------- XP @@ -309,6 +311,13 @@ public class TileKillerJoe extends AbstractMachineEntity implements IFluidHandle return attackera; } + WirelessChargedLocation getChargedLocation() { + if(chargedLocation == null) { + chargedLocation = new WirelessChargedLocation(this); + } + return chargedLocation; + } + private AxisAlignedBB getKillBounds() { if(killBounds == null) { BoundingBox bb = new BoundingBox(getLocation()); @@ -488,8 +497,8 @@ public class TileKillerJoe extends AbstractMachineEntity implements IFluidHandle xpCon.writeToNBT(nbtRoot); } - private static UUID uuid = UUID.fromString("3baa66fa-a69a-11e4-89d3-123b93f75cba"); - private static GameProfile DUMMY_PROFILE = new GameProfile(uuid, "[EioKillera]"); + private static final UUID uuid = UUID.fromString("3baa66fa-a69a-11e4-89d3-123b93f75cba"); + private static final GameProfile DUMMY_PROFILE = new GameProfile(uuid, "[EioKillera]"); private class Attackera extends FakePlayer { @@ -519,7 +528,8 @@ public class TileKillerJoe extends AbstractMachineEntity implements IFluidHandle } prevWeapon = cur == null ? null : cur.copy(); } - WirelessChargerController.instance.chargePlayersItems(this); + + getChargedLocation().chargeItems(inventory.mainInventory); } } diff --git a/src/main/java/crazypants/enderio/machine/wireless/IWirelessCharger.java b/src/main/java/crazypants/enderio/machine/wireless/IWirelessCharger.java index d7aeaf60..1b62e106 100644 --- a/src/main/java/crazypants/enderio/machine/wireless/IWirelessCharger.java +++ b/src/main/java/crazypants/enderio/machine/wireless/IWirelessCharger.java @@ -10,7 +10,7 @@ public interface IWirelessCharger { BlockCoord getLocation(); - boolean chargeItems(ItemStack[] armorInventory); + boolean chargeItems(ItemStack[] items); int takeEnergy(int max); diff --git a/src/main/java/crazypants/enderio/machine/wireless/TileWirelessCharger.java b/src/main/java/crazypants/enderio/machine/wireless/TileWirelessCharger.java index 601ca9dd..ef2627e8 100644 --- a/src/main/java/crazypants/enderio/machine/wireless/TileWirelessCharger.java +++ b/src/main/java/crazypants/enderio/machine/wireless/TileWirelessCharger.java @@ -57,12 +57,12 @@ public class TileWirelessCharger extends TileEntityEio implements IInternalPower } @Override - public boolean chargeItems(ItemStack[] items) { + public boolean chargeItems(ItemStack[] items) { boolean chargedItem = false; int available = Math.min(MAX_ENERGY_OUT, storedEnergyRF); - for (ItemStack item : items) { - if(item != null && available > 0) { - int used = 0; + for (int i=0,end=items.length ; i0 ; i++) { + ItemStack item = items[i]; + if(item != null) { if(item.getItem() instanceof IEnergyContainerItem && item.stackSize == 1) { IEnergyContainerItem chargable = (IEnergyContainerItem) item.getItem(); @@ -70,14 +70,14 @@ public class TileWirelessCharger extends TileEntityEio implements IInternalPower int cur = chargable.getEnergyStored(item); int canUse = Math.min(available, max - cur); if(cur < max) { - used = chargable.receiveEnergy(item, canUse, false); + int used = chargable.receiveEnergy(item, canUse, false); + if(used > 0) { + storedEnergyRF = storedEnergyRF - used; + chargedItem = true; + available -= used; + } } } - if(used > 0) { - storedEnergyRF = storedEnergyRF - used; - chargedItem = true; - available -= used; - } } } return chargedItem; diff --git a/src/main/java/crazypants/enderio/machine/wireless/WirelessChargedLocation.java b/src/main/java/crazypants/enderio/machine/wireless/WirelessChargedLocation.java new file mode 100644 index 00000000..ef371b4e --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/wireless/WirelessChargedLocation.java @@ -0,0 +1,43 @@ +package crazypants.enderio.machine.wireless; + +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; + +import crazypants.util.BlockCoord; + +public class WirelessChargedLocation { + + private final TileEntity te; + private int lastChangeCount; + private final List chargers; + + public WirelessChargedLocation(TileEntity te) { + this.te = te; + this.chargers = new ArrayList(); + updateChargers(); + } + + private void updateChargers() { + WirelessChargerController wcc = WirelessChargerController.instance; + chargers.clear(); + lastChangeCount = wcc.getChangeCount(); + wcc.getChargers(te.getWorldObj(), new BlockCoord(te), chargers); + } + + public boolean chargeItems(ItemStack[] items) { + if(lastChangeCount != WirelessChargerController.instance.getChangeCount()) { + updateChargers(); + } + for(IWirelessCharger wc : chargers) { + if(wc.isActive()) { + if(wc.chargeItems(items)) { + return true; + } + } + } + return false; + } +} diff --git a/src/main/java/crazypants/enderio/machine/wireless/WirelessChargerController.java b/src/main/java/crazypants/enderio/machine/wireless/WirelessChargerController.java index 4c78f70b..41137920 100644 --- a/src/main/java/crazypants/enderio/machine/wireless/WirelessChargerController.java +++ b/src/main/java/crazypants/enderio/machine/wireless/WirelessChargerController.java @@ -26,7 +26,8 @@ public class WirelessChargerController { MinecraftForge.EVENT_BUS.register(WirelessChargerController.instance); } - private Map> perWorldChargers = new HashMap>(); + private final Map> perWorldChargers = new HashMap>(); + private int changeCount; private WirelessChargerController() { } @@ -34,9 +35,10 @@ public class WirelessChargerController { public void registerCharger(IWirelessCharger charger) { if(charger == null) { return; - } + } Map chargers = getChargersForWorld(charger.getWorld()); chargers.put(charger.getLocation(), charger); + changeCount++; } public void deregisterCharger(IWirelessCharger capBank) { @@ -45,6 +47,7 @@ public class WirelessChargerController { } Map chargers = getChargersForWorld(capBank.getWorld()); chargers.remove(capBank.getLocation()); + changeCount++; } @SubscribeEvent @@ -55,6 +58,19 @@ public class WirelessChargerController { chargePlayersItems(event.player); } + public int getChangeCount() { + return changeCount; + } + + public void getChargers(World world, BlockCoord bc, Collection res) { + Map chargers = getChargersForWorld(world); + for (IWirelessCharger wc : chargers.values()) { + if(wc.getLocation().distanceSquared(bc) <= RANGE_SQ) { + res.add(wc); + } + } + } + public void chargePlayersItems(EntityPlayer player) { Map chargers = getChargersForWorld(player.worldObj); if(chargers.isEmpty()) { From 073a716027616de9b1ceb46f13ab8a239a44f880 Mon Sep 17 00:00:00 2001 From: Matthias Mann Date: Fri, 30 Jan 2015 20:56:23 +0100 Subject: [PATCH 37/79] #1810 use the right math helper --- .../java/crazypants/enderio/block/BlockDarkSteelLadder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/crazypants/enderio/block/BlockDarkSteelLadder.java b/src/main/java/crazypants/enderio/block/BlockDarkSteelLadder.java index 066e0cd6..e1c3d790 100644 --- a/src/main/java/crazypants/enderio/block/BlockDarkSteelLadder.java +++ b/src/main/java/crazypants/enderio/block/BlockDarkSteelLadder.java @@ -5,8 +5,8 @@ import net.minecraft.block.BlockLadder; import net.minecraft.block.material.Material; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; +import net.minecraft.util.MathHelper; import net.minecraft.world.World; -import codechicken.lib.math.MathHelper; import cpw.mods.fml.common.registry.GameRegistry; import crazypants.enderio.EnderIO; import crazypants.enderio.EnderIOTab; From 11c51a7ef642338d0f3fce11e2f6690ce042beae Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Sat, 31 Jan 2015 19:00:22 -0500 Subject: [PATCH 38/79] Fix timer reflection not working out of dev, also fix up Log class --- src/main/java/crazypants/enderio/Log.java | 13 ++++++------ .../java/crazypants/gui/GuiContainerBase.java | 21 +++++++++++++------ 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/src/main/java/crazypants/enderio/Log.java b/src/main/java/crazypants/enderio/Log.java index 347be541..7fa9bd1d 100644 --- a/src/main/java/crazypants/enderio/Log.java +++ b/src/main/java/crazypants/enderio/Log.java @@ -1,26 +1,27 @@ package crazypants.enderio; -import cpw.mods.fml.common.FMLLog; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; public final class Log { - public static final String CHANNEL = EnderIO.MODID; + public static final Logger LOGGER = LogManager.getLogger(EnderIO.MODID); public static void warn(String msg) { - FMLLog.log(CHANNEL, org.apache.logging.log4j.Level.WARN, msg, (Object[])null); + LOGGER.warn(msg); } public static void error(String msg) { - FMLLog.log(CHANNEL, org.apache.logging.log4j.Level.ERROR, msg); + LOGGER.error(msg); } public static void info(String msg) { - FMLLog.log(CHANNEL, org.apache.logging.log4j.Level.INFO, msg); + LOGGER.info(msg); } public static void debug(String msg) { - FMLLog.log(CHANNEL, org.apache.logging.log4j.Level.DEBUG, msg); + LOGGER.debug(msg); } private Log() { diff --git a/src/main/java/crazypants/gui/GuiContainerBase.java b/src/main/java/crazypants/gui/GuiContainerBase.java index fb1cc43f..982d8b8c 100644 --- a/src/main/java/crazypants/gui/GuiContainerBase.java +++ b/src/main/java/crazypants/gui/GuiContainerBase.java @@ -18,6 +18,8 @@ import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; +import cpw.mods.fml.relauncher.ReflectionHelper; +import crazypants.enderio.Log; import crazypants.enderio.gui.IGuiOverlay; import crazypants.gui.ToolTipManager.ToolTipRenderer; @@ -26,7 +28,7 @@ public abstract class GuiContainerBase extends GuiContainer implements ToolTipRe protected ToolTipManager ttMan = new ToolTipManager(); protected List overlays = new ArrayList(); - private Field timer = null; + private static Field timerField = null; protected GuiContainerBase(Container par1Container) { super(par1Container); @@ -38,6 +40,17 @@ public abstract class GuiContainerBase extends GuiContainer implements ToolTipRe for (IGuiOverlay overlay : overlays) { overlay.init(this); } + if(timerField == null) { + try { + if(timerField == null) { + timerField = ReflectionHelper.findField(Minecraft.class, "field_71428_T", "timer", "Q"); + timerField.setAccessible(true); + } + } catch (Exception e) { + Log.error("Failed to initialize timer reflection for IO config."); + e.printStackTrace(); + } + } } @Override @@ -107,11 +120,7 @@ public abstract class GuiContainerBase extends GuiContainer implements ToolTipRe Timer t = null; try { - if(timer == null) { - timer = Minecraft.class.getDeclaredField("timer"); - timer.setAccessible(true); - } - t = (Timer) timer.get(this.mc); + t = (Timer) timerField.get(this.mc); } catch (Exception e) { e.printStackTrace(); return; From e505570c8d7aeb0067662ca4c3eaec8ac1411655 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Sat, 31 Jan 2015 19:34:49 -0500 Subject: [PATCH 39/79] Add API javadoc exporting to buildscript --- build.gradle | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 313a82da..1eaf487b 100644 --- a/build.gradle +++ b/build.gradle @@ -106,7 +106,12 @@ task deobfJar(type: Jar) { classifier = 'dev' } -build.dependsOn sourceJar, deobfJar, apiJar +task exportJavadoc(type: Javadoc) { + include 'crazypants/enderio/api/**/*' + source = sourceSets.main.allSource +} + +build.dependsOn sourceJar, deobfJar, apiJar, exportJavadoc publishing { tasks.publish.dependsOn 'build' From ab40c700036173cd134f74aa63db7f4087371cd4 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Sat, 31 Jan 2015 20:51:35 -0500 Subject: [PATCH 40/79] #1630 "Fix" item conduits preserving invalid stack sizes --- .../crazypants/enderio/conduit/item/NetworkedInventory.java | 1 - src/main/java/crazypants/util/ItemUtil.java | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/crazypants/enderio/conduit/item/NetworkedInventory.java b/src/main/java/crazypants/enderio/conduit/item/NetworkedInventory.java index 56005cb4..fa63c0a6 100644 --- a/src/main/java/crazypants/enderio/conduit/item/NetworkedInventory.java +++ b/src/main/java/crazypants/enderio/conduit/item/NetworkedInventory.java @@ -92,7 +92,6 @@ public class NetworkedInventory { } public void onTick(long tick) { - int transfered; if(tickDeficit > 0 || !canExtract() || !con.isExtractionRedstoneConditionMet(conDir)) { //do nothing } else { diff --git a/src/main/java/crazypants/util/ItemUtil.java b/src/main/java/crazypants/util/ItemUtil.java index 81451cba..f974783a 100644 --- a/src/main/java/crazypants/util/ItemUtil.java +++ b/src/main/java/crazypants/util/ItemUtil.java @@ -90,6 +90,7 @@ public class ItemUtil { ItemStack contents = sidedInv.getStackInSlot(slot); ItemStack toInsert = item.copy(); toInsert.stackSize = Math.min(toInsert.stackSize, sidedInv.getInventoryStackLimit()); + toInsert.stackSize = Math.min(toInsert.stackSize, toInsert.getMaxStackSize()); // some inventories like filing cap toInsert.stackSize = Math.min(toInsert.stackSize, numToInsert); int inserted = 0; if(contents == null) { @@ -126,6 +127,7 @@ public class ItemUtil { if(!isStackFull(contents)) { ItemStack toInsert = item.copy(); toInsert.stackSize = Math.min(toInsert.stackSize, inv.getInventoryStackLimit()); + toInsert.stackSize = Math.min(toInsert.stackSize, toInsert.getMaxDamage()); // some inventories like filing cap toInsert.stackSize = Math.min(toInsert.stackSize, numToInsert); int inserted = 0; if(contents == null) { From 0b3000cdeccabb4bc50a8906e5892d3e80e6c914 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Sat, 31 Jan 2015 21:35:39 -0500 Subject: [PATCH 41/79] #1585 Fix blocks not dropping in explosions --- .../enderio/machine/AbstractMachineBlock.java | 33 +++++++----- .../machine/enchanter/BlockEnchanter.java | 53 ++++++++++--------- src/main/java/crazypants/util/ItemUtil.java | 4 +- 3 files changed, 48 insertions(+), 42 deletions(-) diff --git a/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java b/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java index 553b7c63..a4fd1861 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java +++ b/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java @@ -9,7 +9,6 @@ import net.minecraft.block.material.MapColor; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -224,24 +223,30 @@ public abstract class AbstractMachineBlock exte if(!world.isRemote && (!player.capabilities.isCreativeMode)) { TileEntity te = world.getTileEntity(x, y, z); if(te instanceof AbstractMachineEntity && shouldDropDefaultItem(world, player, x, y, z)) { - AbstractMachineEntity machineEntity = (AbstractMachineEntity) te; - int meta = damageDropped(world.getBlockMetadata(x, y, z)); - ItemStack itemStack = new ItemStack(this, 1, meta); - machineEntity.writeToItemStack(itemStack); - - float f = 0.7F; - double d0 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; - double d1 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; - double d2 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; - EntityItem entityitem = new EntityItem(world, x + d0, y + d1, z + d2, itemStack); - - entityitem.delayBeforeCanPickup = 10; - world.spawnEntityInWorld(entityitem); + dropAsItem(world, x, y, z, (AbstractMachineEntity) te); + world.removeTileEntity(x, y, z); } } return super.removedByPlayer(world, player, x, y, z, doHarvest); } + @Override + public void breakBlock(World world, int x, int y, int z, Block block, int meta) { + TileEntity te = world.getTileEntity(x, y, z); + if(te instanceof AbstractMachineEntity) { + dropAsItem(world, x, y, z, (AbstractMachineEntity) te); + } + super.breakBlock(world, x, y, z, block, meta); + } + + private void dropAsItem(World world, int x, int y, int z, AbstractMachineEntity te) { + AbstractMachineEntity machineEntity = (AbstractMachineEntity) te; + int meta = damageDropped(world.getBlockMetadata(x, y, z)); + ItemStack itemStack = new ItemStack(this, 1, meta); + machineEntity.writeToItemStack(itemStack); + dropBlockAsItem(world, x, y, z, itemStack); + } + @Override public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack) { super.onBlockPlacedBy(world, x, y, z, player, stack); diff --git a/src/main/java/crazypants/enderio/machine/enchanter/BlockEnchanter.java b/src/main/java/crazypants/enderio/machine/enchanter/BlockEnchanter.java index 56e0f461..0917fa66 100644 --- a/src/main/java/crazypants/enderio/machine/enchanter/BlockEnchanter.java +++ b/src/main/java/crazypants/enderio/machine/enchanter/BlockEnchanter.java @@ -17,6 +17,7 @@ import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; import crazypants.enderio.api.tool.ITool; import crazypants.enderio.gui.IResourceTooltipProvider; +import crazypants.enderio.machine.AbstractMachineEntity; import crazypants.enderio.tool.ToolUtil; import crazypants.util.Util; @@ -93,30 +94,36 @@ public class BlockEnchanter extends BlockEio implements IGuiHandler, IResourceTo public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean harvested) { if(!world.isRemote) { TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileEnchanter) { - TileEnchanter enchanter = (TileEnchanter) te; - if(!player.capabilities.isCreativeMode) { - ItemStack itemStack = new ItemStack(this); - float f = 0.7F; - double d0 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; - double d1 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; - double d2 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; - EntityItem entityitem = new EntityItem(world, x + d0, y + d1, z + d2, itemStack); - entityitem.delayBeforeCanPickup = 10; - world.spawnEntityInWorld(entityitem); - - if(enchanter.getStackInSlot(0) != null) { - Util.dropItems(world, enchanter.getStackInSlot(0), x, y, z, true); - } - if(enchanter.getStackInSlot(1) != null) { - Util.dropItems(world, enchanter.getStackInSlot(1), x, y, z, true); - } - } + if(te instanceof TileEnchanter && !player.capabilities.isCreativeMode) { + dropAsItem(world, x, y, z, (TileEnchanter) te); + world.removeTileEntity(x, y, z); } } return super.removedByPlayer(world, player, x, y, z, harvested); } + @Override + public void breakBlock(World world, int x, int y, int z, Block block, int meta) { + TileEntity te = world.getTileEntity(x, y, z); + if(te instanceof TileEnchanter) { + dropAsItem(world, x, y, z, (TileEnchanter) te); + } + super.breakBlock(world, x, y, z, block, meta); + world.removeTileEntity(x, y, z); + } + + private void dropAsItem(World world, int x, int y, int z, TileEnchanter te) { + ItemStack itemStack = new ItemStack(this); + dropBlockAsItem(world, x, y, z, itemStack); + + if(te.getStackInSlot(0) != null) { + Util.dropItems(world, te.getStackInSlot(0), x, y, z, true); + } + if(te.getStackInSlot(1) != null) { + Util.dropItems(world, te.getStackInSlot(1), x, y, z, true); + } + } + @Override public int quantityDropped(Random p_149745_1_) { return 0; @@ -154,13 +161,7 @@ public class BlockEnchanter extends BlockEio implements IGuiHandler, IResourceTo } return null; } - - @Override - public void breakBlock(World world, int x, int y, int z, Block block, int p_149749_6_) { - super.breakBlock(world, x, y, z, block, p_149749_6_); - world.removeTileEntity(x, y, z); - } - + @Override public String getUnlocalizedNameForTooltip(ItemStack itemStack) { return getUnlocalizedName(); diff --git a/src/main/java/crazypants/util/ItemUtil.java b/src/main/java/crazypants/util/ItemUtil.java index f974783a..17e20eb6 100644 --- a/src/main/java/crazypants/util/ItemUtil.java +++ b/src/main/java/crazypants/util/ItemUtil.java @@ -90,7 +90,7 @@ public class ItemUtil { ItemStack contents = sidedInv.getStackInSlot(slot); ItemStack toInsert = item.copy(); toInsert.stackSize = Math.min(toInsert.stackSize, sidedInv.getInventoryStackLimit()); - toInsert.stackSize = Math.min(toInsert.stackSize, toInsert.getMaxStackSize()); // some inventories like filing cap + toInsert.stackSize = Math.min(toInsert.stackSize, toInsert.getMaxStackSize()); // some inventories like using itemstacks with invalid stack sizes toInsert.stackSize = Math.min(toInsert.stackSize, numToInsert); int inserted = 0; if(contents == null) { @@ -127,7 +127,7 @@ public class ItemUtil { if(!isStackFull(contents)) { ItemStack toInsert = item.copy(); toInsert.stackSize = Math.min(toInsert.stackSize, inv.getInventoryStackLimit()); - toInsert.stackSize = Math.min(toInsert.stackSize, toInsert.getMaxDamage()); // some inventories like filing cap + toInsert.stackSize = Math.min(toInsert.stackSize, toInsert.getMaxDamage()); // some inventories like using itemstacks with invalid stack sizes toInsert.stackSize = Math.min(toInsert.stackSize, numToInsert); int inserted = 0; if(contents == null) { From 7c418a2351cac1a77e962954fe9e5e553ef11c85 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Sun, 1 Feb 2015 00:02:41 -0500 Subject: [PATCH 42/79] #85 Add hardened conduit facade. Also fix hidden facades rendering box --- resources/assets/enderio/lang/en_US.lang | 2 + .../enderio/conduit/BlockConduitBundle.java | 35 ++++- .../enderio/conduit/IConduitBundle.java | 11 +- .../enderio/conduit/TileConduitBundle.java | 15 ++ .../conduit/facade/FacadeRenderer.java | 2 +- .../conduit/facade/ItemConduitFacade.java | 73 ++++++++-- .../conduit/render/ConduitBundleRenderer.java | 137 +++++++++--------- .../crazypants/enderio/gui/TooltipAddera.java | 12 +- 8 files changed, 199 insertions(+), 88 deletions(-) diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index 8f31c093..e68b1bc1 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -21,11 +21,13 @@ item.enderio.itemEnderface.name=Enderface enderio.blockConduitBundle=Conduit Bundle enderio.blockConduitFacade=Conduit Facade item.enderio.itemConduitFacade.name=Conduit Facade +item.enderio.itemConduitFacade.hardened.name=Hardened Conduit Facade enderio.item.itemConduitFacade.tooltip.notpainted=Not Painted item.enderio.itemConduitFacade.tooltip.detailed.line1=Painted in the Painting Machine item.enderio.itemConduitFacade.tooltip.detailed.line2=R-Click on a conduit to place item.enderio.itemConduitFacade.tooltip.detailed.line3=Hidden when a wrench or conduit item.enderio.itemConduitFacade.tooltip.detailed.line4=is equipped +item.enderio.itemConduitFacade.hardened.tooltip=Hardened: Resists breaking and explosions enderio.itemPowerConduit.name=Energy Conduit enderio.itemPowerConduitEnhanced.name=Enhanced Energy Conduit diff --git a/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java b/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java index c439ce87..50e59c50 100644 --- a/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java +++ b/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java @@ -36,6 +36,7 @@ import crazypants.enderio.EnderIO; import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; import crazypants.enderio.api.tool.ITool; +import crazypants.enderio.conduit.facade.ItemConduitFacade.FacadeType; import crazypants.enderio.conduit.geom.CollidableComponent; import crazypants.enderio.conduit.geom.ConduitConnectorType; import crazypants.enderio.conduit.gui.ExternalConnectionContainer; @@ -307,11 +308,35 @@ public class BlockConduitBundle extends BlockEio implements IGuiHandler, IFacade } return result; } - + + @Override + public float getBlockHardness(World world, int x, int y, int z) { + IConduitBundle te = (IConduitBundle) world.getTileEntity(x, y, z); + return te != null && te.getFacadeType() == FacadeType.HARDENED ? blockHardness * 10 : blockHardness; + } + + @Override + public float getExplosionResistance(Entity par1Entity, World world, int x, int y, int z, double explosionX, double explosionY, double explosionZ) { + float resist = getExplosionResistance(par1Entity); + IConduitBundle te = (IConduitBundle) world.getTileEntity(x, y, z); + return te != null && te.getFacadeType() == FacadeType.HARDENED ? resist * 10 : resist; + } + @SubscribeEvent public void onBreakSpeed(BreakSpeed event) { - if (event.block == this && event.entityPlayer.getCurrentEquippedItem() == null) { - event.newSpeed *= 3; + if(event.block == this) { + ItemStack held = event.entityPlayer.getCurrentEquippedItem(); + if(held == null || held.getItem().getHarvestLevel(held, "pickaxe") == -1) { + event.newSpeed += 2; + } + IConduitBundle te = (IConduitBundle) event.entity.worldObj.getTileEntity(event.x, event.y, event.z); + if(te != null && te.getFacadeType() == FacadeType.HARDENED) { + if(!ConduitUtil.isSolidFacadeRendered(te, event.entityPlayer)) { + event.newSpeed *= 6; + } else { + event.newSpeed *= 2; + } + } } } @@ -366,11 +391,12 @@ public class BlockConduitBundle extends BlockEio implements IGuiHandler, IFacade List drop = new ArrayList(); if(ConduitUtil.isSolidFacadeRendered(te, player)) { breakBlock = false; - ItemStack fac = new ItemStack(EnderIO.itemConduitFacade, 1, 0); + ItemStack fac = new ItemStack(EnderIO.itemConduitFacade, 1, te.getFacadeType().ordinal()); PainterUtil.setSourceBlock(fac, te.getFacadeId(), te.getFacadeMetadata()); drop.add(fac); te.setFacadeId(null); te.setFacadeMetadata(0); + te.setFacadeType(FacadeType.BASIC); } if(breakBlock) { @@ -616,6 +642,7 @@ public class BlockConduitBundle extends BlockEio implements IGuiHandler, IFacade bundle.setFacadeId(PainterUtil.getSourceBlock(player.getCurrentEquippedItem())); bundle.setFacadeMetadata(PainterUtil.getSourceBlockMetadata(player.getCurrentEquippedItem())); + bundle.setFacadeType(FacadeType.values()[player.getCurrentEquippedItem().getItemDamage()]); if(!player.capabilities.isCreativeMode) { stack.stackSize--; } diff --git a/src/main/java/crazypants/enderio/conduit/IConduitBundle.java b/src/main/java/crazypants/enderio/conduit/IConduitBundle.java index 755e5ff3..9c77d330 100644 --- a/src/main/java/crazypants/enderio/conduit/IConduitBundle.java +++ b/src/main/java/crazypants/enderio/conduit/IConduitBundle.java @@ -16,6 +16,7 @@ import cofh.api.transport.IItemDuct; import cpw.mods.fml.common.Optional.Interface; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.conduit.facade.ItemConduitFacade.FacadeType; import crazypants.enderio.conduit.geom.CollidableComponent; import crazypants.enderio.conduit.geom.Offset; import crazypants.enderio.power.IInternalPowerHandler; @@ -93,12 +94,16 @@ public interface IConduitBundle extends IInternalPowerHandler, IFluidHandler, II void setFacadeId(Block block, boolean triggerUpdate); - Block getFacadeId(); - void setFacadeMetadata(int meta); + void setFacadeType(FacadeType type); + + Block getFacadeId(); + int getFacadeMetadata(); - + + FacadeType getFacadeType(); + World getWorld(); void setGridNode(Object node); diff --git a/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java b/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java index 0d019e7e..11a99ca5 100644 --- a/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java +++ b/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java @@ -25,6 +25,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; import crazypants.enderio.TileEntityEio; +import crazypants.enderio.conduit.facade.ItemConduitFacade.FacadeType; import crazypants.enderio.conduit.gas.IGasConduit; import crazypants.enderio.conduit.geom.CollidableCache; import crazypants.enderio.conduit.geom.CollidableComponent; @@ -50,6 +51,7 @@ public class TileConduitBundle extends TileEntityEio implements IConduitBundle { private Block facadeId = null; private int facadeMeta = 0; + private FacadeType facadeType = FacadeType.BASIC; private boolean facadeChanged; @@ -100,6 +102,7 @@ public class TileConduitBundle extends TileEntityEio implements IConduitBundle { nbtRoot.setTag("conduits", conduitTags); if(facadeId != null) { nbtRoot.setString("facadeId", Block.blockRegistry.getNameForObject(facadeId)); + nbtRoot.setString("facadeType", facadeType.name()); } else { nbtRoot.setString("facadeId", "null"); } @@ -126,8 +129,10 @@ public class TileConduitBundle extends TileEntityEio implements IConduitBundle { String fs = nbtRoot.getString("facadeId"); if(fs == null || "null".equals(fs)) { facadeId = null; + facadeType = FacadeType.BASIC; } else { facadeId = Block.getBlockFromName(fs); + facadeType = FacadeType.valueOf(nbtRoot.getString("facadeType")); } facadeMeta = nbtRoot.getInteger("facadeMeta"); @@ -164,11 +169,21 @@ public class TileConduitBundle extends TileEntityEio implements IConduitBundle { public void setFacadeMetadata(int meta) { facadeMeta = meta; } + + @Override + public void setFacadeType(FacadeType type) { + facadeType = type; + } @Override public int getFacadeMetadata() { return facadeMeta; } + + @Override + public FacadeType getFacadeType() { + return facadeType; + } @Override @SideOnly(Side.CLIENT) diff --git a/src/main/java/crazypants/enderio/conduit/facade/FacadeRenderer.java b/src/main/java/crazypants/enderio/conduit/facade/FacadeRenderer.java index c2d6a2c9..1f9e7239 100644 --- a/src/main/java/crazypants/enderio/conduit/facade/FacadeRenderer.java +++ b/src/main/java/crazypants/enderio/conduit/facade/FacadeRenderer.java @@ -92,7 +92,7 @@ public class FacadeRenderer implements IItemRenderer { GL11.glDepthFunc(GL11.GL_LEQUAL); } else { - renderBlocks.setOverrideBlockTexture(EnderIO.itemConduitFacade.getIconFromDamage(0)); + renderBlocks.setOverrideBlockTexture(EnderIO.itemConduitFacade.getIconFromDamage(item.getItemDamage())); renderBlocks.renderBlockAsItem(Blocks.stone, 0, 1.0F); renderBlocks.clearOverrideBlockTexture(); } diff --git a/src/main/java/crazypants/enderio/conduit/facade/ItemConduitFacade.java b/src/main/java/crazypants/enderio/conduit/facade/ItemConduitFacade.java index 9f2c08dc..cc5d5bfa 100644 --- a/src/main/java/crazypants/enderio/conduit/facade/ItemConduitFacade.java +++ b/src/main/java/crazypants/enderio/conduit/facade/ItemConduitFacade.java @@ -5,6 +5,7 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.ITileEntityProvider; import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -20,6 +21,7 @@ import crazypants.enderio.ModObject; import crazypants.enderio.conduit.IConduitBundle; import crazypants.enderio.config.Config; import crazypants.enderio.gui.IAdvancedTooltipProvider; +import crazypants.enderio.gui.IResourceTooltipProvider; import crazypants.enderio.gui.TooltipAddera; import crazypants.enderio.machine.painter.BasicPainterTemplate; import crazypants.enderio.machine.painter.IPaintedBlock; @@ -28,7 +30,18 @@ import crazypants.enderio.machine.painter.PainterUtil; import crazypants.util.Util; import crazypants.util.Lang; -public class ItemConduitFacade extends Item implements IAdvancedTooltipProvider { +public class ItemConduitFacade extends Item implements IAdvancedTooltipProvider, IResourceTooltipProvider { + + public static enum FacadeType { + BASIC, + HARDENED; + + public String getUnlocName(Item me) { + return this == BASIC ? me.getUnlocalizedName() : me.getUnlocalizedName() + ".hardened"; + } + } + + private IIcon[] icons; public static ItemConduitFacade create() { ItemConduitFacade result = new ItemConduitFacade(); @@ -40,17 +53,37 @@ public class ItemConduitFacade extends Item implements IAdvancedTooltipProvider protected ItemConduitFacade() { setCreativeTab(EnderIOTab.tabEnderIO); - setUnlocalizedName("enderio." + ModObject.itemConduitFacade.name()); setMaxStackSize(64); + setHasSubtypes(true); } protected void init() { GameRegistry.registerItem(this, ModObject.itemConduitFacade.unlocalisedName); } + @SuppressWarnings({ "unchecked", "rawtypes" }) + @Override + public void getSubItems(Item item, CreativeTabs p_150895_2_, List list) { + for (FacadeType t : FacadeType.values()) { + list.add(new ItemStack(item, 1, t.ordinal())); + } + } + + @Override + public String getUnlocalizedName(ItemStack stack) { + return FacadeType.values()[stack.getItemDamage()].getUnlocName(this); + } + + @Override + public String getUnlocalizedName() { + return "item.enderio." + ModObject.itemConduitFacade.name(); + } + @Override public void registerIcons(IIconRegister IIconRegister) { - itemIcon = IIconRegister.registerIcon("enderio:conduitFacade"); + icons = new IIcon[FacadeType.values().length]; + icons[0] = itemIcon = IIconRegister.registerIcon("enderio:conduitFacade"); + icons[1] = IIconRegister.registerIcon("enderio:conduitFacadeHardened"); overlayIcon = IIconRegister.registerIcon("enderio:conduitFacadeOverlay"); } @@ -58,6 +91,16 @@ public class ItemConduitFacade extends Item implements IAdvancedTooltipProvider return overlayIcon; } + @Override + public IIcon getIconFromDamage(int damage) { + return icons[damage % icons.length]; + } + + @Override + public IIcon getIcon(ItemStack stack, int renderPass, EntityPlayer player, ItemStack usingItem, int useRemaining) { + return getIconFromDamage(stack.getItemDamage()); + } + @Override public boolean onItemUse(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float par8, float par9, float par10) { @@ -78,6 +121,7 @@ public class ItemConduitFacade extends Item implements IAdvancedTooltipProvider IConduitBundle bundle = (IConduitBundle) world.getTileEntity(placeX, placeY, placeZ); bundle.setFacadeId(PainterUtil.getSourceBlock(itemStack)); bundle.setFacadeMetadata(PainterUtil.getSourceBlockMetadata(itemStack)); + bundle.setFacadeType(FacadeType.values()[itemStack.getItemDamage()]); if(!player.capabilities.isCreativeMode) { itemStack.stackSize--; } @@ -92,7 +136,7 @@ public class ItemConduitFacade extends Item implements IAdvancedTooltipProvider public boolean isFull3D() { return true; } - + public ItemStack createItemStackForSourceBlock(Block id, int itemDamage) { if(id == null) { id = EnderIO.blockConduitFacade; @@ -102,20 +146,26 @@ public class ItemConduitFacade extends Item implements IAdvancedTooltipProvider return result; } + @SuppressWarnings("rawtypes") @Override @SideOnly(Side.CLIENT) public void addInformation(ItemStack item, EntityPlayer par2EntityPlayer, List list, boolean par4) { super.addInformation(item, par2EntityPlayer, list, par4); - } + @Override + public String getUnlocalizedNameForTooltip(ItemStack itemStack) { + return getUnlocalizedName(); + } + + @SuppressWarnings("rawtypes") @Override @SideOnly(Side.CLIENT) public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - } + @SuppressWarnings({ "unchecked", "rawtypes" }) @Override @SideOnly(Side.CLIENT) public void addBasicEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { @@ -126,10 +176,15 @@ public class ItemConduitFacade extends Item implements IAdvancedTooltipProvider } } + @SuppressWarnings({ "unchecked", "rawtypes" }) @Override @SideOnly(Side.CLIENT) public void addDetailedEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { TooltipAddera.addDetailedTooltipFromResources(list, itemstack); + if(itemstack.getItemDamage() == FacadeType.HARDENED.ordinal()) { + list.add(""); + list.add(Lang.localize(getUnlocalizedName(itemstack) + ".tooltip", false)); + } } public final class FacadePainterRecipe extends BasicPainterTemplate { @@ -157,11 +212,11 @@ public class ItemConduitFacade extends Item implements IAdvancedTooltipProvider } return block.getRenderType() == 0 || block.isOpaqueCube() || block.isNormalCube(); } - + @Override public boolean isValidTarget(ItemStack target) { return target != null && target.getItem() == ItemConduitFacade.this; - } + } } - + } diff --git a/src/main/java/crazypants/enderio/conduit/render/ConduitBundleRenderer.java b/src/main/java/crazypants/enderio/conduit/render/ConduitBundleRenderer.java index ee3a6324..db6473c7 100644 --- a/src/main/java/crazypants/enderio/conduit/render/ConduitBundleRenderer.java +++ b/src/main/java/crazypants/enderio/conduit/render/ConduitBundleRenderer.java @@ -120,8 +120,8 @@ public class ConduitBundleRenderer extends TileEntitySpecialRenderer implements IConduitBundle bundle = (IConduitBundle) world.getTileEntity(x, y, z); EntityClientPlayerMP player = Minecraft.getMinecraft().thePlayer; - boolean renderedFacade = !renderFacade(x, y, z, rb, bundle, player); - boolean renderConduit = !renderedFacade && (BlockConduitBundle.theRenderPass == 0 || rb.hasOverrideBlockTexture()); + boolean renderedFacade = renderFacade(x, y, z, rb, bundle, player); + boolean renderConduit = !renderedFacade; if(renderConduit) { BlockCoord loc = bundle.getLocation(); @@ -139,28 +139,29 @@ public class ConduitBundleRenderer extends TileEntitySpecialRenderer implements } private boolean renderFacade(int x, int y, int z, RenderBlocks rb, IConduitBundle bundle, EntityClientPlayerMP player) { - boolean res = true; + boolean res = false; if(bundle.hasFacade()) { Block facadeId = bundle.getFacadeId(); if(ConduitUtil.isFacadeHidden(bundle, player)) { + Tessellator.instance.setColorOpaque_F(1, 1, 1); bundle.setFacadeId(null, false); bundle.setFacadeRenderAs(FacadeRenderState.WIRE_FRAME); BlockConduitFacade facb = EnderIO.blockConduitFacade; facb.setBlockOverride(bundle); facb.setBlockBounds(0, 0, 0, 1, 1, 1); - rb.setRenderBoundsFromBlock(facb); - rb.renderStandardBlock(facb, x, y, z); + if(!rb.hasOverrideBlockTexture()) { + rb.setRenderBoundsFromBlock(facb); + rb.renderStandardBlock(facb, x, y, z); + } facb.setBlockOverride(null); - bundle.setFacadeId(facadeId, false); - - + bundle.setFacadeId(facadeId, false); } else if(facadeId != null) { bundle.setFacadeRenderAs(FacadeRenderState.FULL); boolean isFacadeOpaque = facadeId.isOpaqueCube(); - res = !isFacadeOpaque; + res = isFacadeOpaque; if((isFacadeOpaque && BlockConduitBundle.theRenderPass == 0) || (rb.hasOverrideBlockTexture() || (!isFacadeOpaque && BlockConduitBundle.theRenderPass == 1))) { @@ -179,7 +180,6 @@ public class ConduitBundleRenderer extends TileEntitySpecialRenderer implements } } - } else { bundle.setFacadeRenderAs(FacadeRenderState.NONE); } @@ -191,76 +191,79 @@ public class ConduitBundleRenderer extends TileEntitySpecialRenderer implements Tessellator tessellator = Tessellator.instance; tessellator.setColorOpaque_F(1, 1, 1); tessellator.addTranslation((float) x, (float) y, (float) z); - + // Conduits Set externals = new HashSet(); EntityClientPlayerMP player = Minecraft.getMinecraft().thePlayer; List wireBounds = new ArrayList(); - for (IConduit con : bundle.getConduits()) { + if(BlockConduitBundle.theRenderPass == 0) { + for (IConduit con : bundle.getConduits()) { - if(ConduitUtil.renderConduit(player, con)) { - ConduitRenderer renderer = EnderIO.proxy.getRendererForConduit(con); - renderer.renderEntity(this, bundle, con, x, y, z, partialTick, brightness, rb); - Set extCons = con.getExternalConnections(); - for (ForgeDirection dir : extCons) { - if(con.getConnectionMode(dir) != ConnectionMode.DISABLED && con.getConnectionMode(dir) != ConnectionMode.NOT_SET) { - externals.add(dir); - } - } - } else if(con != null) { - Collection components = con.getCollidableComponents(); - for (CollidableComponent component : components) { - wireBounds.add(component.bound); - } - } - } - - // Internal conectors between conduits - List connectors = bundle.getConnectors(); - List rendered = Lists.newArrayList(); - for (CollidableComponent component : connectors) { - if(component.conduitType != null) { - IConduit conduit = bundle.getConduit(component.conduitType); - if(conduit != null) { - if(ConduitUtil.renderConduit(player, component.conduitType)) { - if(rb.hasOverrideBlockTexture()) { - List results = EnderIO.blockConduitBundle.doRayTraceAll(bundle.getWorld(), MathHelper.floor_double(x), - MathHelper.floor_double(y), MathHelper.floor_double(z), EnderIO.proxy.getClientPlayer()); - for (RaytraceResult r : results) { - // the connectors can be rendered multiple times and this makes the break texture look funky - if(r.component.conduitType == component.conduitType && !rendered.contains(r.component)) { - rendered.add(r.component); - CubeRenderer.render(component.bound, rb.overrideBlockTexture, true); - } - } - } else { - tessellator.setBrightness((int) (brightness)); - CubeRenderer.render(component.bound, conduit.getTextureForState(component), true); + if(ConduitUtil.renderConduit(player, con)) { + ConduitRenderer renderer = EnderIO.proxy.getRendererForConduit(con); + renderer.renderEntity(this, bundle, con, x, y, z, partialTick, brightness, rb); + Set extCons = con.getExternalConnections(); + for (ForgeDirection dir : extCons) { + if(con.getConnectionMode(dir) != ConnectionMode.DISABLED && con.getConnectionMode(dir) != ConnectionMode.NOT_SET) { + externals.add(dir); } - } else { + } + } else if(con != null) { + Collection components = con.getCollidableComponents(); + for (CollidableComponent component : components) { wireBounds.add(component.bound); } } - - } else if(ConduitUtil.getDisplayMode(player) == ConduitDisplayMode.ALL && !rb.hasOverrideBlockTexture()) { - IIcon tex = EnderIO.blockConduitBundle.getConnectorIcon(component.data); - CubeRenderer.render(component.bound, tex); - } - } - - if(!rb.hasOverrideBlockTexture()) { - //render these after the 'normal' conduits so help with proper blending - for (BoundingBox wireBound : wireBounds) { - Tessellator.instance.setColorRGBA_F(1, 1, 1, 0.25f); - CubeRenderer.render(wireBound, EnderIO.blockConduitFacade.getIcon(0, 0)); } - Tessellator.instance.setColorRGBA_F(1, 1, 1, 1f); - // External connection terminations - for (ForgeDirection dir : externals) { - renderExternalConnection(dir); + // Internal conectors between conduits + List connectors = bundle.getConnectors(); + List rendered = Lists.newArrayList(); + for (CollidableComponent component : connectors) { + if(component.conduitType != null) { + IConduit conduit = bundle.getConduit(component.conduitType); + if(conduit != null) { + if(ConduitUtil.renderConduit(player, component.conduitType)) { + if(rb.hasOverrideBlockTexture()) { + List results = EnderIO.blockConduitBundle.doRayTraceAll(bundle.getWorld(), MathHelper.floor_double(x), + MathHelper.floor_double(y), MathHelper.floor_double(z), EnderIO.proxy.getClientPlayer()); + for (RaytraceResult r : results) { + // the connectors can be rendered multiple times and this makes the break texture look funky + if(r.component.conduitType == component.conduitType && !rendered.contains(r.component)) { + rendered.add(r.component); + CubeRenderer.render(component.bound, rb.overrideBlockTexture, true); + } + } + } else { + tessellator.setBrightness((int) (brightness)); + CubeRenderer.render(component.bound, conduit.getTextureForState(component), true); + } + } else { + wireBounds.add(component.bound); + } + } + + } else if(ConduitUtil.getDisplayMode(player) == ConduitDisplayMode.ALL && !rb.hasOverrideBlockTexture()) { + IIcon tex = EnderIO.blockConduitBundle.getConnectorIcon(component.data); + CubeRenderer.render(component.bound, tex); + } + } + } else { + + if(!rb.hasOverrideBlockTexture()) { + //render these after the 'normal' conduits so help with proper blending + for (BoundingBox wireBound : wireBounds) { + Tessellator.instance.setColorRGBA_F(1, 1, 1, 0.25f); + CubeRenderer.render(wireBound, EnderIO.blockConduitFacade.getIcon(0, 0)); + } + + Tessellator.instance.setColorRGBA_F(1, 1, 1, 1f); + // External connection terminations + for (ForgeDirection dir : externals) { + renderExternalConnection(dir); + } } } tessellator.addTranslation(-(float) x, -(float) y, -(float) z); diff --git a/src/main/java/crazypants/enderio/gui/TooltipAddera.java b/src/main/java/crazypants/enderio/gui/TooltipAddera.java index f0e0b767..cc8820b2 100644 --- a/src/main/java/crazypants/enderio/gui/TooltipAddera.java +++ b/src/main/java/crazypants/enderio/gui/TooltipAddera.java @@ -290,15 +290,19 @@ public class TooltipAddera { if(itemstack.getItem() == null) { return; } - String unlock = null; + String unloc = null; // Block blk = Block.getBlockFromItem(itemstack.getItem()); // if(blk != null && blk != Blocks.air) { // unlock = blk.getUnlocalizedName(); // } - if(unlock == null) { - unlock = itemstack.getItem().getUnlocalizedName(); + + if (itemstack.getItem() instanceof IResourceTooltipProvider) { + unloc = ((IResourceTooltipProvider)itemstack.getItem()).getUnlocalizedNameForTooltip(itemstack); } - addDetailedTooltipFromResources(list, unlock); + if(unloc == null) { + unloc = itemstack.getItem().getUnlocalizedName(itemstack); + } + addDetailedTooltipFromResources(list, unloc); } private static class BallTipProvider implements IAdvancedTooltipProvider { From 524b69f00b483994cb918dfee114901ff67dbc4c Mon Sep 17 00:00:00 2001 From: Matthias Mann Date: Sun, 1 Feb 2015 14:35:16 +0100 Subject: [PATCH 43/79] #1123 cleanup mod item filter GUI rendering --- .../gui/externalConduitConnection.png | Bin 1861 -> 1361 bytes .../conduit/gui/item/ModItemFilterGui.java | 50 +++++++++--------- 2 files changed, 24 insertions(+), 26 deletions(-) diff --git a/resources/assets/enderio/textures/gui/externalConduitConnection.png b/resources/assets/enderio/textures/gui/externalConduitConnection.png index 1ffad5ee9d414f79858f6ec1900920b00c1dbef5..6221124d0bad0d663d7097d7bde9b635d6d93688 100644 GIT binary patch delta 402 zcmX@gcadv?GAA=bfKP}k0|UcG%fC$ZNmD-O0@;iuL4Lsu4$p3+fjCLt?k)@+tg;?J z4rhT!WHAE+-)<0QJpSW~8BmbD#M9T6{XP>TuN3#8=MC{dJ*PZf978H@y}f;!?~sCk zL*Rx3|LZsHS}P&Ak^9*l)lPoD9>uw4OQ)1;o}GGI@9Bfz`K7PiKd`W`s4kJ2%pf{3 zaAUp1{r@5kr_P7xT>?@EzyBAwu~fx#5)zu*bU*Wo-_sWirZWyKvd&`!Is^>9G47bF zoo)a9+x=7T8J>nj^91~hVunbmG4y3H^zZUtz{Yk$Q_A5x=N%7*M{JlO4d@P=c?)l;hM z3*Yy-K}=_8;BTJT%Xo}UIg#OBtneL)gdBrSh6ipWumI&JGQ_RFy*_GZnx27`<__i{ W?k{_KeAgTS>GX82^QA&dRf`N&DBm;)v@9e6; zXy+{Oh%9Dc;M)ztjK_amF#`%pmAFQf1m~xflqVLYG6W=M=9TFAxrQi|8S9zq85$UT zDO$+Dz_ilS#WAEJ?(OZjdBTPQZ5LJLzt^8+TOYqksYO06G~}LTzl)FgT#e!dOsa3M z-71@UYv#6Xw(BoxHomp`Z7-kxPv{Lpe|E|4xhyCCd;%6=3emnSpmaDh-VR8ntnLJH z6h5D3XJBZ^F%<;yQtEyJ$q8%Kn1EEn8GU&mwdtx0kYt$f^C__ObJ#YE1H?1hUjrmh zgb9NRMu%t9`GM5UEF~bxFz79NV8pP!m?8J|Wbv0G4!4c=)~SDc&#-?VkKUz-%yq%e z;am>qHZh)vG-I$l&8Cokli`VubicIx5|n(g|6fLo{^e`)@ZOGf+iFK3zGxc!&Gv-iO z4KjJd{a_V_ziL1>PlNpXyTx*I_gs?yd-(DH>&J>;{FQ$2@7m|p>%O?>>&n*#KeqhB z@MZQIu;u&N6z2cpau95|zrK4qlf--WJ*)UO#IItVAb#X>-CnT+%Nd>o$1^faxW8wY t*#X;p5!u?SQ$POr`Czux`Gs4r)iHUgy%tqx(wq&7e@|CGmvv4FO#lv&EtdcQ diff --git a/src/main/java/crazypants/enderio/conduit/gui/item/ModItemFilterGui.java b/src/main/java/crazypants/enderio/conduit/gui/item/ModItemFilterGui.java index aac6d0c3..d21e5c7f 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/item/ModItemFilterGui.java +++ b/src/main/java/crazypants/enderio/conduit/gui/item/ModItemFilterGui.java @@ -20,20 +20,23 @@ import crazypants.render.RenderUtil; public class ModItemFilterGui implements IItemFilterGui { - - private IItemConduit itemConduit; - private GuiExternalConnection gui; + private static final int MOD_NAME_COLOR = ColorUtil.getRGB(Color.white); + + private final IItemConduit itemConduit; + private final GuiExternalConnection gui; boolean isInput; - private ModItemFilter filter; + private final ModItemFilter filter; - private Rectangle[] inputBounds; + private final Rectangle[] inputBounds; - private IconButtonEIO[] deleteButs; + private final IconButtonEIO[] deleteButs; - private int inputOffsetX; - private int tfWidth; + private final int inputOffsetX; + private final int tfWidth; + private final int tfTextureX; + private final int tfTextureY; public ModItemFilterGui(GuiExternalConnection gui, IItemConduit itemConduit, boolean isInput) { this.gui = gui; @@ -44,18 +47,22 @@ public class ModItemFilterGui implements IItemFilterGui { if(isInput) { filter = (ModItemFilter) itemConduit.getInputFilter(gui.getDir()); inputOffsetX = 50; - tfWidth = 86; + tfWidth = 96; + tfTextureX = 120; + tfTextureY = 214; } else { filter = (ModItemFilter) itemConduit.getOutputFilter(gui.getDir()); inputOffsetX = 32; - tfWidth = 104; + tfWidth = 114; + tfTextureX = 120; + tfTextureY = 238; } inputBounds = new Rectangle[] { - new Rectangle(inputOffsetX,48,16,16), - new Rectangle(inputOffsetX,69,16,16), - new Rectangle(inputOffsetX,90,16,16) + new Rectangle(inputOffsetX,47,16,16), + new Rectangle(inputOffsetX,68,16,16), + new Rectangle(inputOffsetX,89,16,16) }; deleteButs = new IconButtonEIO[inputBounds.length]; @@ -98,11 +105,9 @@ public class ModItemFilterGui implements IItemFilterGui { RenderUtil.bindTexture("enderio:textures/gui/externalConduitConnection.png"); for(Rectangle r : inputBounds) { //slot - gui.drawTexturedModalRect(gui.getGuiLeft() + r.x - 1, gui.getGuiTop() + r.y - 1, 24, 238, 18, 18); + gui.drawTexturedModalRect(gui.getGuiLeft() + r.x - 1, gui.getGuiTop() + r.y - 1, 24, 214, 18, 18); //text box - gui.drawTexturedModalRect(gui.getGuiLeft() + r.x + 38, gui.getGuiTop() + r.y - 1, 24, 238, 4, 18); - gui.drawTexturedModalRect(gui.getGuiLeft() + r.x + 42, gui.getGuiTop() + r.y - 1, 120, 238, tfWidth, 18); - gui.drawTexturedModalRect(gui.getGuiLeft() + r.x + 42 + tfWidth, gui.getGuiTop() + r.y - 1, 38, 238, 4, 18); + gui.drawTexturedModalRect(gui.getGuiLeft() + r.x + 38, gui.getGuiTop() + r.y - 1, tfTextureX, tfTextureY, tfWidth, 18); } FontRenderer fr = Minecraft.getMinecraft().fontRenderer; @@ -110,17 +115,10 @@ public class ModItemFilterGui implements IItemFilterGui { String mod = filter.getModAt(i); if(mod != null) { Rectangle r = inputBounds[i]; - fr.drawStringWithShadow(mod, gui.getGuiLeft() + r.x + 41, gui.getGuiTop() + r.y + 4 , ColorUtil.getRGB(Color.white)); + mod = fr.trimStringToWidth(mod, tfWidth - 6); + fr.drawStringWithShadow(mod, gui.getGuiLeft() + r.x + 41, gui.getGuiTop() + r.y + 4, MOD_NAME_COLOR); } } - - RenderUtil.bindTexture("enderio:textures/gui/externalConduitConnection.png"); - int edge = inputBounds[0].x + tfWidth + 46; - gui.drawTexturedModalRect(gui.getGuiLeft() + edge, gui.getGuiTop() + inputBounds[0].y, edge, 20, 30, 60); - for(Rectangle r : inputBounds) { - gui.drawTexturedModalRect(gui.getGuiLeft() + edge - 1, gui.getGuiTop() + r.y - 1, 41, 238, 1, 18); - } - } @Override From 903e85cf38ace8eae86f998b6c6a1d3ef15281d0 Mon Sep 17 00:00:00 2001 From: Matthias Mann Date: Sun, 1 Feb 2015 15:30:12 +0100 Subject: [PATCH 44/79] add SAG Mill support for emerald ore similar to diamond ore --- .../assets/enderio/config/SAGMillRecipes_Core.xml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/resources/assets/enderio/config/SAGMillRecipes_Core.xml b/resources/assets/enderio/config/SAGMillRecipes_Core.xml index e4808788..121282a1 100644 --- a/resources/assets/enderio/config/SAGMillRecipes_Core.xml +++ b/resources/assets/enderio/config/SAGMillRecipes_Core.xml @@ -418,6 +418,16 @@ addOreDictionaryTooltips=true + + + + + + + + + + @@ -850,7 +860,7 @@ addOreDictionaryTooltips=true - + From 45264f05274b90b74552777f23781fe9eb3b4cc5 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Sun, 1 Feb 2015 15:33:18 -0500 Subject: [PATCH 45/79] Fix old NBT data on conduits crashing --- .../java/crazypants/enderio/conduit/TileConduitBundle.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java b/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java index 11a99ca5..dbdb63e2 100644 --- a/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java +++ b/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java @@ -132,7 +132,9 @@ public class TileConduitBundle extends TileEntityEio implements IConduitBundle { facadeType = FacadeType.BASIC; } else { facadeId = Block.getBlockFromName(fs); - facadeType = FacadeType.valueOf(nbtRoot.getString("facadeType")); + if(nbtRoot.hasKey("facadeType")) { // backwards compat, never true in freshly placed bundles + facadeType = FacadeType.valueOf(nbtRoot.getString("facadeType")); + } } facadeMeta = nbtRoot.getInteger("facadeMeta"); From 85679e91c5b637e6b4aa44a3b73d35e30f491656 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Sun, 1 Feb 2015 20:04:07 -0500 Subject: [PATCH 46/79] #1818 Dimensional Transceiver dupe, fix machines dropping in creative --- .../java/crazypants/enderio/machine/AbstractMachineBlock.java | 2 +- .../enderio/machine/transceiver/BlockTransceiver.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java b/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java index a4fd1861..a8f36d27 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java +++ b/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java @@ -224,9 +224,9 @@ public abstract class AbstractMachineBlock exte TileEntity te = world.getTileEntity(x, y, z); if(te instanceof AbstractMachineEntity && shouldDropDefaultItem(world, player, x, y, z)) { dropAsItem(world, x, y, z, (AbstractMachineEntity) te); - world.removeTileEntity(x, y, z); } } + world.removeTileEntity(x, y, z); return super.removedByPlayer(world, player, x, y, z, doHarvest); } diff --git a/src/main/java/crazypants/enderio/machine/transceiver/BlockTransceiver.java b/src/main/java/crazypants/enderio/machine/transceiver/BlockTransceiver.java index 9b27db4c..ab9674d6 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/BlockTransceiver.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/BlockTransceiver.java @@ -49,14 +49,14 @@ public class BlockTransceiver extends AbstractMachineBlock { } @Override - public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z) { + public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean doHarvest) { if(!world.isRemote) { TileEntity te = world.getTileEntity(x, y, z); if(te instanceof TileTransceiver) { ((TileTransceiver)te).getRailController().dropNonSpawnedCarts(); } } - return super.removedByPlayer(world, player, x, y, z); + return super.removedByPlayer(world, player, x, y, z, doHarvest); } @Override From 3cb5b56fc021a4a7e4e47c4619e3c2824df761a6 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Sun, 1 Feb 2015 20:12:02 -0500 Subject: [PATCH 47/79] #1821 buffers ignoring redstone checks --- src/main/java/crazypants/enderio/machine/buffer/TileBuffer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/crazypants/enderio/machine/buffer/TileBuffer.java b/src/main/java/crazypants/enderio/machine/buffer/TileBuffer.java index 613659a7..25a271a5 100644 --- a/src/main/java/crazypants/enderio/machine/buffer/TileBuffer.java +++ b/src/main/java/crazypants/enderio/machine/buffer/TileBuffer.java @@ -53,7 +53,7 @@ public class TileBuffer extends AbstractPowerConsumerEntity implements IPaintabl @Override protected boolean processTasks(boolean redstoneCheckPassed) { - if(getEnergyStored() <= 0) { + if(getEnergyStored() <= 0 || !redstoneCheckPassed) { return false; } if(dist == null) { From 3b605179689592c52f88562167231c4284155125 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Sun, 1 Feb 2015 21:01:05 -0500 Subject: [PATCH 48/79] Add missing hardened facade textures and recipe --- .../config/OreDictionaryPreferences_Core.xml | 1 + resources/assets/enderio/lang/en_US.lang | 1 + .../textures/items/conduitFacadeHardened.png | Bin 0 -> 892 bytes .../enderio/textures/items/powderObsidian.png | Bin 0 -> 1166 bytes .../enderio/conduit/ConduitRecipes.java | 5 +++-- .../enderio/material/MaterialRecipes.java | 1 + .../crazypants/enderio/material/PowderIngot.java | 3 ++- 7 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 resources/assets/enderio/textures/items/conduitFacadeHardened.png create mode 100644 resources/assets/enderio/textures/items/powderObsidian.png diff --git a/resources/assets/enderio/config/OreDictionaryPreferences_Core.xml b/resources/assets/enderio/config/OreDictionaryPreferences_Core.xml index 8a6313da..136a1227 100644 --- a/resources/assets/enderio/config/OreDictionaryPreferences_Core.xml +++ b/resources/assets/enderio/config/OreDictionaryPreferences_Core.xml @@ -36,6 +36,7 @@ To write the contents of the ore dictionary to config/oreDictionaryRegistery.txt + diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index e68b1bc1..1906d381 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -207,6 +207,7 @@ enderio.powderGold.name=Gold Powder enderio.powderCopper.name=Copper Powder enderio.powderTin.name=Tin Powder enderio.powderEnder.name=Ender Pearl Powder +enderio.powderObsidian.name=Obsidian Powder enderio.ingotEnderiumBase.name=Enderium Base //Capacitors diff --git a/resources/assets/enderio/textures/items/conduitFacadeHardened.png b/resources/assets/enderio/textures/items/conduitFacadeHardened.png new file mode 100644 index 0000000000000000000000000000000000000000..658136866aa39015d9cef76c9c5953f89fd94395 GIT binary patch literal 892 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|oCO|{#S9F5hd`K7RKu$QD9B#o z>FdgVpNWxKj>A;O@-+hkv$Us+V~B<*qX6^!KMeo>{|Bl<13*Ds;*3D0mTUJ@#QPUw za6y;`pu3Tr4wM!adu?QJ^TuO_*AGw}$%F_#m`i}FMRd;VoBjXtjp5OK*-x)U;l=|M zv%onZ8~!nI@O=}IX2~xxXLxb=$t#ABZ{IU8AUpt6%*4ouu#rdiij)Zf z7JtlqPf?!z<>PxlzkYfprSSSa|LZF{5DoBjfY9*!D>uVk-AB*9K9IbnD*yHNqvx;h z1CyB|L<2A#0QCUb2n`U4@87u@?it>G^5d7_)Bi7(A%bu{Kn7BED7-5J;8XG(O0tp*Cv9q?8u(IMGh{VRm zFA$H7U`NTMold9MJsMS7U0XOe_nzGI_|7@sy}OI48Lt{r0eJOUEiJU4w%aAn$Qxf3 z%C$B>qk+>pI6c}E7SHbKAnGZ0ZZs%AF*!V9a3IDM0SfwTY$SX6Bcl zEfMiA^%&@6F&;t>uNNc#=IlZrAMKceW#@762>yT@Rx7q9KtzgjJ(@_Voqp4 zbvB^e*NdN=lsllA2U?P7P`r>N8K#v(&N5)+-#}HI0?@Dc5pC)NGGCmO0g8<309GOY zF}EQ;X~uj(-ZnpoBpygOr_W!CrTaHh=-Cp1q-eJhZilCwSP&rDLKddbx0x$czQ{KK zLj0UD))a@!p@?dBIg$L8$#ky*AR`F@Nvz~9inf0ymZJW`Idr&nmN?!Yqh9psly)+? GvhxlRDw!hy literal 0 HcmV?d00001 diff --git a/src/main/java/crazypants/enderio/conduit/ConduitRecipes.java b/src/main/java/crazypants/enderio/conduit/ConduitRecipes.java index ee1b667f..c1fcd73e 100644 --- a/src/main/java/crazypants/enderio/conduit/ConduitRecipes.java +++ b/src/main/java/crazypants/enderio/conduit/ConduitRecipes.java @@ -9,6 +9,7 @@ import appeng.api.AEApi; import cpw.mods.fml.common.Optional.Method; import cpw.mods.fml.common.registry.GameRegistry; import crazypants.enderio.EnderIO; +import crazypants.enderio.conduit.facade.ItemConduitFacade.FacadeType; import crazypants.enderio.conduit.item.filter.ClearFilterRecipe; import crazypants.enderio.conduit.item.filter.CopyFilterRecipe; import crazypants.enderio.conduit.me.MEUtil; @@ -18,7 +19,6 @@ import crazypants.enderio.material.Alloy; import crazypants.enderio.material.BlockFusedQuartz; import crazypants.enderio.material.FrankenSkull; import crazypants.enderio.material.Material; - import static crazypants.enderio.ModObject.*; public class ConduitRecipes { @@ -42,7 +42,8 @@ public class ConduitRecipes { ItemStack zombieController = new ItemStack(EnderIO.itemFrankenSkull, 1, FrankenSkull.ZOMBIE_CONTROLLER.ordinal()); //Recipes - GameRegistry.addShapedRecipe(new ItemStack(EnderIO.itemConduitFacade, 1, 0), "bbb", "b b", "bbb", 'b', conduitBinder); + GameRegistry.addShapedRecipe(new ItemStack(EnderIO.itemConduitFacade, 1, FacadeType.BASIC.ordinal()), "bbb", "b b", "bbb", 'b', conduitBinder); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(EnderIO.itemConduitFacade, 1, FacadeType.HARDENED.ordinal()), " o ", "oFo", " o ", 'F', EnderIO.itemConduitFacade, 'o', "dustObsidian")); int numConduits = Config.numConduitsPerRecipe; GameRegistry.addShapedRecipe(new ItemStack(EnderIO.itemLiquidConduit, numConduits, 0), "bbb", "###", "bbb", 'b', conduitBinder, '#', fusedGlass); diff --git a/src/main/java/crazypants/enderio/material/MaterialRecipes.java b/src/main/java/crazypants/enderio/material/MaterialRecipes.java index 494a151b..63530a82 100644 --- a/src/main/java/crazypants/enderio/material/MaterialRecipes.java +++ b/src/main/java/crazypants/enderio/material/MaterialRecipes.java @@ -44,6 +44,7 @@ public class MaterialRecipes { OreDictionary.registerOre("dustCoal", new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_COAL.ordinal())); OreDictionary.registerOre("dustIron", new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_IRON.ordinal())); OreDictionary.registerOre("dustGold", new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_GOLD.ordinal())); + OreDictionary.registerOre("dustObsidian", new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_OBSIDIAN.ordinal())); OreDictionary.registerOre("gearStone", new ItemStack(EnderIO.itemMachinePart, 1, MachinePart.BASIC_GEAR.ordinal())); OreDictionary.registerOre("itemSilicon", new ItemStack(EnderIO.itemMaterial, 1, Material.SILICON.ordinal())); diff --git a/src/main/java/crazypants/enderio/material/PowderIngot.java b/src/main/java/crazypants/enderio/material/PowderIngot.java index d4111b43..7af8f439 100644 --- a/src/main/java/crazypants/enderio/material/PowderIngot.java +++ b/src/main/java/crazypants/enderio/material/PowderIngot.java @@ -15,7 +15,8 @@ public enum PowderIngot { POWDER_COPPER("powderCopper", INGOT_COPPER), POWDER_TIN("powderTin", INGOT_TIN), POWDER_ENDER("powderEnder", DUST_ENDERPEARL), - INGOT_ENDERIUM_BASE("ingotEnderiumBase", INGOT_ENDERIUM); + INGOT_ENDERIUM_BASE("ingotEnderiumBase", INGOT_ENDERIUM), + POWDER_OBSIDIAN("powderObsidian", null); // POWDER_LEAD("powderLead", "Lead Powder", "powderLead"), // POWDER_SILVER("powderSilver", "Silver Powder", "powderSilver"), // POWDER_BRONZE("powderBronze", "Bronze Powder", "powderBronze"), From ef1f2441e5651da98565cc424fe91734627b7a8c Mon Sep 17 00:00:00 2001 From: Matthias Mann Date: Mon, 2 Feb 2015 19:45:28 +0100 Subject: [PATCH 49/79] #1824 #1825 use getMaxStackSize --- src/main/java/crazypants/util/ItemUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/crazypants/util/ItemUtil.java b/src/main/java/crazypants/util/ItemUtil.java index 17e20eb6..f1840d10 100644 --- a/src/main/java/crazypants/util/ItemUtil.java +++ b/src/main/java/crazypants/util/ItemUtil.java @@ -127,7 +127,7 @@ public class ItemUtil { if(!isStackFull(contents)) { ItemStack toInsert = item.copy(); toInsert.stackSize = Math.min(toInsert.stackSize, inv.getInventoryStackLimit()); - toInsert.stackSize = Math.min(toInsert.stackSize, toInsert.getMaxDamage()); // some inventories like using itemstacks with invalid stack sizes + toInsert.stackSize = Math.min(toInsert.stackSize, toInsert.getMaxStackSize()); // some inventories like using itemstacks with invalid stack sizes toInsert.stackSize = Math.min(toInsert.stackSize, numToInsert); int inserted = 0; if(contents == null) { From 569c92db49af23a0c08af902107eb94a98408573 Mon Sep 17 00:00:00 2001 From: Matthias Mann Date: Mon, 2 Feb 2015 22:08:40 +0100 Subject: [PATCH 50/79] add recipe handler to upgrade basic to normal capacitor banks --- .../enderio/machine/MachineRecipes.java | 14 +++++---- .../enderio/machine/UpgradeCapBankRecipe.java | 31 +++++++++++++++++++ 2 files changed, 39 insertions(+), 6 deletions(-) create mode 100644 src/main/java/crazypants/enderio/machine/UpgradeCapBankRecipe.java diff --git a/src/main/java/crazypants/enderio/machine/MachineRecipes.java b/src/main/java/crazypants/enderio/machine/MachineRecipes.java index 63db616e..63365cb2 100644 --- a/src/main/java/crazypants/enderio/machine/MachineRecipes.java +++ b/src/main/java/crazypants/enderio/machine/MachineRecipes.java @@ -135,16 +135,18 @@ public class MachineRecipes { //capacitor bank - ItemStack capBank = BlockItemCapBank.createItemStackWithPower(CapBankType.getMetaFromType(CapBankType.SIMPLE), 0); - GameRegistry.addShapedRecipe(capBank, "bcb", "cmc", "bcb", 'b', Items.iron_ingot, 'c', capacitor, 'm', Blocks.redstone_block); - capBank = BlockItemCapBank.createItemStackWithPower(CapBankType.getMetaFromType(CapBankType.ACTIVATED), 0); - GameRegistry.addShapedRecipe(capBank, "bcb", "cmc", "bcb", 'b', electricSteel, 'c', capacitor2, 'm', Blocks.redstone_block); - capBank = BlockItemCapBank.createItemStackWithPower(CapBankType.getMetaFromType(CapBankType.VIBRANT), 0); - GameRegistry.addShapedRecipe(capBank, "bcb", "cmc", "bcb", 'b', electricSteel, 'c', capacitor3, 'm', vibCry); + ItemStack capBank1 = BlockItemCapBank.createItemStackWithPower(CapBankType.getMetaFromType(CapBankType.SIMPLE), 0); + GameRegistry.addShapedRecipe(capBank1, "bcb", "cmc", "bcb", 'b', Items.iron_ingot, 'c', capacitor, 'm', Blocks.redstone_block); + ItemStack capBank2 = BlockItemCapBank.createItemStackWithPower(CapBankType.getMetaFromType(CapBankType.ACTIVATED), 0); + GameRegistry.addShapedRecipe(capBank2, "bcb", "cmc", "bcb", 'b', electricSteel, 'c', capacitor2, 'm', Blocks.redstone_block); + ItemStack capBank3 = BlockItemCapBank.createItemStackWithPower(CapBankType.getMetaFromType(CapBankType.VIBRANT), 0); + GameRegistry.addShapedRecipe(capBank3, "bcb", "cmc", "bcb", 'b', electricSteel, 'c', capacitor3, 'm', vibCry); ConvertOldRecipe convertRecipe = new ConvertOldRecipe(); GameRegistry.addRecipe(convertRecipe); + GameRegistry.addRecipe(new UpgradeCapBankRecipe(capBank2, "eee", "bcb", "eee", 'e', energeticAlloy, 'b', capBank1, 'c', capacitor2)); + //painter ItemStack painter = new ItemStack(EnderIO.blockPainter, 1, 0); if(Config.useHardRecipes) { diff --git a/src/main/java/crazypants/enderio/machine/UpgradeCapBankRecipe.java b/src/main/java/crazypants/enderio/machine/UpgradeCapBankRecipe.java new file mode 100644 index 00000000..d77b7a7f --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/UpgradeCapBankRecipe.java @@ -0,0 +1,31 @@ +package crazypants.enderio.machine; + +import net.minecraft.inventory.InventoryCrafting; +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.ShapedOreRecipe; + +import crazypants.enderio.power.PowerHandlerUtil; + +public class UpgradeCapBankRecipe extends ShapedOreRecipe { + + public UpgradeCapBankRecipe(ItemStack result, Object... recipe) { + super(result, recipe); + } + + @Override + public ItemStack getCraftingResult(InventoryCrafting var1) { + long energy = 0; + for(int y=0 ; y<3 ; y++) { + for(int x=0 ; x<3 ; x++) { + ItemStack st = var1.getStackInRowAndColumn(x, y); + if(st != null) { + energy += PowerHandlerUtil.getStoredEnergyForItem(st); + } + } + } + + ItemStack res = super.getCraftingResult(var1); + PowerHandlerUtil.setStoredEnergyForItem(res, (int)Math.min(Integer.MAX_VALUE, energy)); + return res; + } +} From d9863b7a2e6adbd4f9efdd60676b4f17fffe7c99 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Mon, 2 Feb 2015 18:23:09 -0500 Subject: [PATCH 51/79] Refactor how blocks drop into the base Block/TE class. Fixes drop issues --- .../java/crazypants/enderio/BlockEio.java | 50 ++++++++++++++++ .../crazypants/enderio/TileEntityEio.java | 10 ++++ .../conduit/facade/BlockConduitFacade.java | 13 +---- .../enderio/enderface/BlockEnderIO.java | 7 --- .../enderio/machine/AbstractMachineBlock.java | 58 +++---------------- .../enderio/machine/buffer/BlockBuffer.java | 36 ++---------- .../enderio/machine/capbank/BlockCapBank.java | 1 - .../machine/enchanter/BlockEnchanter.java | 22 ++----- .../machine/hypercube/BlockHyperCube.java | 9 --- .../machine/light/BlockElectricLight.java | 58 ++++++------------- .../enderio/machine/light/BlockLightNode.java | 1 - .../machine/monitor/BlockPowerMonitor.java | 4 +- .../painter/BlockPaintedGlowstone.java | 36 ++++-------- .../machine/painter/BlockPaintedSlab.java | 2 +- .../machine/power/BlockCapacitorBank.java | 1 - .../machine/solar/BlockSolarPanel.java | 12 +--- .../enderio/machine/tank/BlockTank.java | 5 -- .../machine/vacuum/BlockVacuumChest.java | 55 ++++-------------- .../machine/vacuum/TileVacuumChest.java | 46 +++++++-------- .../enderio/teleport/BlockTravelAnchor.java | 43 ++++++-------- 20 files changed, 168 insertions(+), 301 deletions(-) diff --git a/src/main/java/crazypants/enderio/BlockEio.java b/src/main/java/crazypants/enderio/BlockEio.java index 32337b31..fb1a0caf 100644 --- a/src/main/java/crazypants/enderio/BlockEio.java +++ b/src/main/java/crazypants/enderio/BlockEio.java @@ -1,14 +1,23 @@ package crazypants.enderio; +import java.util.ArrayList; + +import javax.annotation.Nullable; + +import com.google.common.collect.Lists; + import net.minecraft.block.Block; import net.minecraft.block.material.MapColor; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.machine.AbstractMachineEntity; public abstract class BlockEio extends Block { @@ -60,4 +69,45 @@ public abstract class BlockEio extends Block { blockIcon = iIconRegister.registerIcon("enderio:" + name); } + @Override + public ArrayList getDrops(World world, int x, int y, int z, int metadata, int fortune) { + return doNormalDrops(world, x, y, z) ? super.getDrops(world, x, y, z, metadata, fortune) : new ArrayList(); + } + + /* Subclass Helpers */ + + protected boolean doNormalDrops(World world, int x, int y, int z) { + return true; + } + + @Override + public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean doHarvest) { + TileEntity te = world.getTileEntity(x, y, z); + if(te instanceof TileEntityEio && ((TileEntityEio) te).shouldDrop()) { + if(!world.isRemote && (!player.capabilities.isCreativeMode) && !doNormalDrops(world, x, y, z)) { + dropAsItem(world, x, y, z, (AbstractMachineEntity) te); + } + ((TileEntityEio) te).preventDrops(); + } + return super.removedByPlayer(world, player, x, y, z, false); + } + + @Override + public void breakBlock(World world, int x, int y, int z, Block block, int meta) { + TileEntity te = world.getTileEntity(x, y, z); + if(te instanceof TileEntityEio && ((TileEntityEio) te).shouldDrop()) { + dropAsItem(world, x, y, z, (TileEntityEio) te); + } + super.breakBlock(world, x, y, z, block, meta); + } + + protected void dropAsItem(World world, int x, int y, int z, TileEntityEio te) { + int meta = damageDropped(world.getBlockMetadata(x, y, z)); + ItemStack itemStack = new ItemStack(this, 1, meta); + processDrop(world, x, y, z, te, itemStack); + dropBlockAsItem(world, x, y, z, itemStack); + } + + protected void processDrop(World world, int x, int y, int z, @Nullable TileEntityEio te, ItemStack drop) { + } } diff --git a/src/main/java/crazypants/enderio/TileEntityEio.java b/src/main/java/crazypants/enderio/TileEntityEio.java index 0475ba6c..dd8e83ff 100644 --- a/src/main/java/crazypants/enderio/TileEntityEio.java +++ b/src/main/java/crazypants/enderio/TileEntityEio.java @@ -11,6 +11,8 @@ import net.minecraft.tileentity.TileEntity; */ public abstract class TileEntityEio extends TileEntity { + private boolean shouldDrop = true; + @Override public final void readFromNBT(NBTTagCompound root) { super.readFromNBT(root); @@ -48,4 +50,12 @@ public abstract class TileEntityEio extends TileEntity { protected boolean isPoweredRedstone() { return worldObj.getStrongestIndirectPower(xCoord, yCoord, zCoord) > 0; } + + public void preventDrops() { + shouldDrop = false; + } + + public boolean shouldDrop() { + return shouldDrop; + } } diff --git a/src/main/java/crazypants/enderio/conduit/facade/BlockConduitFacade.java b/src/main/java/crazypants/enderio/conduit/facade/BlockConduitFacade.java index db8c180a..4fc9b819 100644 --- a/src/main/java/crazypants/enderio/conduit/facade/BlockConduitFacade.java +++ b/src/main/java/crazypants/enderio/conduit/facade/BlockConduitFacade.java @@ -8,14 +8,14 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -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.ModObject; import crazypants.enderio.conduit.IConduitBundle; import crazypants.enderio.machine.painter.IPaintedBlock; -public class BlockConduitFacade extends Block implements IPaintedBlock{ +public class BlockConduitFacade extends BlockEio implements IPaintedBlock { public static BlockConduitFacade create() { BlockConduitFacade result = new BlockConduitFacade(); @@ -26,18 +26,11 @@ public class BlockConduitFacade extends Block implements IPaintedBlock{ private Block blockOverride; private BlockConduitFacade() { - super(new Material(MapColor.stoneColor)); - setHardness(0.5F); + super(ModObject.blockConduitFacade.unlocalisedName, null, new Material(MapColor.stoneColor)); setStepSound(Block.soundTypeStone); - setHarvestLevel("pickaxe", 0); - setBlockName(ModObject.blockConduitFacade.unlocalisedName); setCreativeTab(null); } - private void init() { - GameRegistry.registerBlock(this, ModObject.blockConduitFacade.unlocalisedName); - } - @Override public void registerBlockIcons(IIconRegister IIconRegister) { blockIcon = IIconRegister.registerIcon("enderio:conduitFacade"); diff --git a/src/main/java/crazypants/enderio/enderface/BlockEnderIO.java b/src/main/java/crazypants/enderio/enderface/BlockEnderIO.java index 1f78fc3f..19ed8530 100644 --- a/src/main/java/crazypants/enderio/enderface/BlockEnderIO.java +++ b/src/main/java/crazypants/enderio/enderface/BlockEnderIO.java @@ -146,11 +146,4 @@ public class BlockEnderIO extends BlockEio implements IResourceTooltipProvider { public String getUnlocalizedNameForTooltip(ItemStack stack) { return getUnlocalizedName(); } - - public void breakBlock(World world, int x, int y, int z, Block block, int p_149749_6_) { - super.breakBlock(world, x, y, z, block, p_149749_6_); - world.removeTileEntity(x, y, z); - } - - } diff --git a/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java b/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java index a8f36d27..fad519c6 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java +++ b/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java @@ -4,7 +4,6 @@ import java.util.List; import java.util.Random; import net.minecraft.block.Block; -import net.minecraft.block.BlockContainer; import net.minecraft.block.material.MapColor; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -17,22 +16,23 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import cpw.mods.fml.common.FMLCommonHandler; 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.ClientProxy; import crazypants.enderio.EnderIO; import crazypants.enderio.EnderIOTab; import crazypants.enderio.ModObject; +import crazypants.enderio.TileEntityEio; import crazypants.enderio.api.tool.ITool; import crazypants.enderio.gui.IResourceTooltipProvider; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.tool.ToolUtil; import crazypants.enderio.waila.IWailaInfoProvider; -public abstract class AbstractMachineBlock extends BlockContainer implements IGuiHandler, IResourceTooltipProvider, +public abstract class AbstractMachineBlock extends BlockEio implements IGuiHandler, IResourceTooltipProvider, IWailaInfoProvider { public static int renderId; @@ -52,8 +52,6 @@ public abstract class AbstractMachineBlock exte protected final ModObject modObject; - protected final Class teClass; - static { PacketHandler.INSTANCE.registerMessage(PacketIoMode.class, PacketIoMode.class, PacketHandler.nextID(), Side.SERVER); PacketHandler.INSTANCE.registerMessage(PacketItemBuffer.class, PacketItemBuffer.class, PacketHandler.nextID(), Side.SERVER); @@ -62,12 +60,10 @@ public abstract class AbstractMachineBlock exte } protected AbstractMachineBlock(ModObject mo, Class teClass, Material mat) { - super(mat); + super(mo.unlocalisedName, teClass, mat); modObject = mo; - this.teClass = teClass; setHardness(2.0F); setStepSound(soundTypeMetal); - setBlockName(mo.unlocalisedName); setCreativeTab(EnderIOTab.tabEnderIO); setHarvestLevel("pickaxe", 0); random = new Random(); @@ -83,16 +79,6 @@ public abstract class AbstractMachineBlock exte EnderIO.guiHandler.registerGuiHandler(getGuiId(), this); } - @Override - public TileEntity createNewTileEntity(World var1, int var2) { - try { - return teClass.newInstance(); - } catch (Exception e) { - FMLCommonHandler.instance().raiseException(e, "Could not create tile entity from class " + teClass, true); - return null; - } - } - @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityPlayer, int side, float par7, float par8, float par9) { @@ -210,41 +196,13 @@ public abstract class AbstractMachineBlock exte } @Override - public int quantityDropped(Random r) { - return 0; - } - - protected boolean shouldDropDefaultItem(World world, EntityPlayer player, int x, int y, int z) { - return true; + protected boolean doNormalDrops(World world, int x, int y, int z) { + return false; } @Override - public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean doHarvest) { - if(!world.isRemote && (!player.capabilities.isCreativeMode)) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof AbstractMachineEntity && shouldDropDefaultItem(world, player, x, y, z)) { - dropAsItem(world, x, y, z, (AbstractMachineEntity) te); - } - } - world.removeTileEntity(x, y, z); - return super.removedByPlayer(world, player, x, y, z, doHarvest); - } - - @Override - public void breakBlock(World world, int x, int y, int z, Block block, int meta) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof AbstractMachineEntity) { - dropAsItem(world, x, y, z, (AbstractMachineEntity) te); - } - super.breakBlock(world, x, y, z, block, meta); - } - - private void dropAsItem(World world, int x, int y, int z, AbstractMachineEntity te) { - AbstractMachineEntity machineEntity = (AbstractMachineEntity) te; - int meta = damageDropped(world.getBlockMetadata(x, y, z)); - ItemStack itemStack = new ItemStack(this, 1, meta); - machineEntity.writeToItemStack(itemStack); - dropBlockAsItem(world, x, y, z, itemStack); + protected void processDrop(World world, int x, int y, int z, TileEntityEio te, ItemStack stack) { + ((AbstractMachineEntity) te).writeToItemStack(stack); } @Override diff --git a/src/main/java/crazypants/enderio/machine/buffer/BlockBuffer.java b/src/main/java/crazypants/enderio/machine/buffer/BlockBuffer.java index d6cbaafb..9080869c 100644 --- a/src/main/java/crazypants/enderio/machine/buffer/BlockBuffer.java +++ b/src/main/java/crazypants/enderio/machine/buffer/BlockBuffer.java @@ -38,11 +38,11 @@ public class BlockBuffer extends AbstractMachineBlock implements IFa res.init(); return res; } - + private static final String[] textureNames = new String[] { "blockBufferItem", "blockBufferPower", "blockBufferOmni", "blockBufferCreative" }; @SideOnly(Side.CLIENT) private IIcon[] textures; - + private BlockBuffer() { super(ModObject.blockBuffer, TileBuffer.class); } @@ -77,7 +77,7 @@ public class BlockBuffer extends AbstractMachineBlock implements IFa protected int getGuiId() { return GuiHandler.GUI_ID_BUFFER; } - + @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister iIconRegister) { @@ -87,7 +87,7 @@ public class BlockBuffer extends AbstractMachineBlock implements IFa textures[i] = iIconRegister.registerIcon("enderio:" + textureNames[i]); } } - + @Override protected String getMachineFrontIconKey(boolean active) { return getSideIconKey(active); @@ -97,7 +97,7 @@ public class BlockBuffer extends AbstractMachineBlock implements IFa public IIcon getIcon(int blockSide, int blockMeta) { return blockSide > 1 ? textures[blockMeta] : super.getIcon(blockSide, blockMeta); } - + @Override public IIcon getIcon(IBlockAccess world, int x, int y, int z, int blockSide) { TileEntity te = world.getTileEntity(x, y, z); @@ -105,7 +105,7 @@ public class BlockBuffer extends AbstractMachineBlock implements IFa TileBuffer tef = (TileBuffer) te; if(tef.getSourceBlock() != null) { return tef.getSourceBlock().getIcon(blockSide, tef.getSourceBlockMetadata()); - } else if (blockSide > 1){ + } else if(blockSide > 1) { return textures[world.getBlockMetadata(x, y, z)]; } } @@ -126,30 +126,6 @@ public class BlockBuffer extends AbstractMachineBlock implements IFa } } - @Override - public ArrayList getDrops(World world, int x, int y, int z, int metadata, int fortune) { - return Lists.newArrayList(); - } - - @Override - protected boolean shouldDropDefaultItem(World world, EntityPlayer player, int x, int y, int z) { - return false; - } - - @Override - public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean willHarvest) { - if(!world.isRemote) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileBuffer) { - TileBuffer cb = (TileBuffer) te; - if(!player.capabilities.isCreativeMode) { - dropBlockAsItem(world, x, y, z, createDrop(cb)); - } - } - } - return super.removedByPlayer(world, player, x, y, z, willHarvest); - } - // TODO refactor machines so all have this functionality @Override public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) { diff --git a/src/main/java/crazypants/enderio/machine/capbank/BlockCapBank.java b/src/main/java/crazypants/enderio/machine/capbank/BlockCapBank.java index 68de5b30..02bfb564 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/BlockCapBank.java +++ b/src/main/java/crazypants/enderio/machine/capbank/BlockCapBank.java @@ -482,7 +482,6 @@ public class BlockCapBank extends BlockEio implements IGuiHandler, IAdvancedTool Util.dropItems(world, cb.getInventory(), x, y, z, true); } } - world.removeTileEntity(x, y, z); } @Override diff --git a/src/main/java/crazypants/enderio/machine/enchanter/BlockEnchanter.java b/src/main/java/crazypants/enderio/machine/enchanter/BlockEnchanter.java index 0917fa66..832396a6 100644 --- a/src/main/java/crazypants/enderio/machine/enchanter/BlockEnchanter.java +++ b/src/main/java/crazypants/enderio/machine/enchanter/BlockEnchanter.java @@ -90,32 +90,20 @@ public class BlockEnchanter extends BlockEio implements IGuiHandler, IResourceTo return true; } - @Override - public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean harvested) { - if(!world.isRemote) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileEnchanter && !player.capabilities.isCreativeMode) { - dropAsItem(world, x, y, z, (TileEnchanter) te); - world.removeTileEntity(x, y, z); - } - } - return super.removedByPlayer(world, player, x, y, z, harvested); - } - @Override public void breakBlock(World world, int x, int y, int z, Block block, int meta) { TileEntity te = world.getTileEntity(x, y, z); if(te instanceof TileEnchanter) { - dropAsItem(world, x, y, z, (TileEnchanter) te); + dropItems(world, x, y, z, (TileEnchanter) te); } super.breakBlock(world, x, y, z, block, meta); - world.removeTileEntity(x, y, z); } - private void dropAsItem(World world, int x, int y, int z, TileEnchanter te) { - ItemStack itemStack = new ItemStack(this); - dropBlockAsItem(world, x, y, z, itemStack); + protected boolean doNormalDrops(World world, int x, int y, int z) { + return false; + } + private void dropItems(World world, int x, int y, int z, TileEnchanter te) { if(te.getStackInSlot(0) != null) { Util.dropItems(world, te.getStackInSlot(0), x, y, z, true); } diff --git a/src/main/java/crazypants/enderio/machine/hypercube/BlockHyperCube.java b/src/main/java/crazypants/enderio/machine/hypercube/BlockHyperCube.java index 6a5c8929..4e63f0b5 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/BlockHyperCube.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/BlockHyperCube.java @@ -272,8 +272,6 @@ public class BlockHyperCube extends BlockEio implements IGuiHandler, IResourceTo return true; } - - @Override public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { return new ContainerHyperCube(); @@ -293,11 +291,4 @@ public class BlockHyperCube extends BlockEio implements IGuiHandler, IResourceTo public String getUnlocalizedNameForTooltip(ItemStack stack) { return getUnlocalizedName(); } - - @Override - public void breakBlock(World world, int x, int y, int z, Block block, int p_149749_6_) { - super.breakBlock(world, x, y, z, block, p_149749_6_); - world.removeTileEntity(x, y, z); - } - } diff --git a/src/main/java/crazypants/enderio/machine/light/BlockElectricLight.java b/src/main/java/crazypants/enderio/machine/light/BlockElectricLight.java index c979683c..ba3cda9b 100644 --- a/src/main/java/crazypants/enderio/machine/light/BlockElectricLight.java +++ b/src/main/java/crazypants/enderio/machine/light/BlockElectricLight.java @@ -20,6 +20,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.BlockEio; import crazypants.enderio.ModObject; +import crazypants.enderio.TileEntityEio; import crazypants.enderio.api.redstone.IRedstoneConnectable; import crazypants.enderio.api.tool.ITool; import crazypants.enderio.tool.ToolUtil; @@ -178,17 +179,19 @@ public class BlockElectricLight extends BlockEio implements IRedstoneConnectable @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { ItemStack stack = player.getCurrentEquippedItem(); - if (stack == null) { + if(stack == null) { return false; } ITool tool = ToolUtil.getEquippedTool(player); if(tool != null && tool.canUse(stack, player, x, y, z) && player.isSneaking() && !world.isRemote) { TileEntity te = world.getTileEntity(x, y, z); - if (te instanceof TileElectricLight) { + if(te instanceof TileElectricLight) { ((TileElectricLight) te).onBlockRemoved(); world.setBlockToAir(x, y, z); if(!player.capabilities.isCreativeMode) { - dropBlockAsItem(world, x, y, z, createDrop((TileElectricLight) te)); + ItemStack drop = new ItemStack(this); + processDrop(world, x, y, z, (TileEntityEio) te, drop); + dropBlockAsItem(world, x, y, z, drop); } tool.used(stack, player, x, y, z); } @@ -199,55 +202,32 @@ public class BlockElectricLight extends BlockEio implements IRedstoneConnectable @Override public void breakBlock(World world, int x, int y, int z, Block par5, int par6) { - - TileEntity t = world.getTileEntity(x, y, z); - TileElectricLight te = null; - if(t instanceof TileElectricLight) { - te = (TileElectricLight) t; - } - if(t != null) { - te.onBlockRemoved(); - world.removeTileEntity(x, y, z); + TileEntity te = world.getTileEntity(x, y, z); + if(te instanceof TileElectricLight) { + ((TileElectricLight) te).onBlockRemoved(); } } @Override - public int quantityDropped(Random r) { - return 0; - } - - private ItemStack createDrop(TileElectricLight te) { - int meta = te.isInvereted() ? 1 : 0; - if(!te.isRequiresPower()) { + protected void processDrop(World world, int x, int y, int z, TileEntityEio te, ItemStack drop) { + TileElectricLight light = (TileElectricLight) te; + int meta = light.isInvereted() ? 1 : 0; + if(!light.isRequiresPower()) { meta += 2; - } else if (te.isWireless()) { + } else if(light.isWireless()) { meta += 4; } - ItemStack st = new ItemStack(this, 1, meta); - return st; + drop.setItemDamage(meta); } - @Override - public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean willHarvest) { - if(!world.isRemote) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileElectricLight) { - TileElectricLight cb = (TileElectricLight) te; - if(!player.capabilities.isCreativeMode) { - dropBlockAsItem(world, x, y, z, createDrop(cb)); - } - } - } - return super.removedByPlayer(world, player, x, y, z, willHarvest); - } - @Override public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) { TileEntity te = world.getTileEntity(x, y, z); - if (te != null && te instanceof TileElectricLight) { - return createDrop((TileElectricLight) te); + ItemStack stack = new ItemStack(this); + if(te instanceof TileElectricLight) { + processDrop(world, x, y, z, (TileEntityEio) te, stack); } - return new ItemStack(this); + return stack; } /* IRedstoneConnectable */ diff --git a/src/main/java/crazypants/enderio/machine/light/BlockLightNode.java b/src/main/java/crazypants/enderio/machine/light/BlockLightNode.java index f1737ac6..ea0d4ac6 100644 --- a/src/main/java/crazypants/enderio/machine/light/BlockLightNode.java +++ b/src/main/java/crazypants/enderio/machine/light/BlockLightNode.java @@ -62,7 +62,6 @@ public class BlockLightNode extends BlockEio { if(te != null) { te.onBlockRemoved(); } - world.removeTileEntity(x, y, z); } @Override diff --git a/src/main/java/crazypants/enderio/machine/monitor/BlockPowerMonitor.java b/src/main/java/crazypants/enderio/machine/monitor/BlockPowerMonitor.java index 44573076..39711caa 100644 --- a/src/main/java/crazypants/enderio/machine/monitor/BlockPowerMonitor.java +++ b/src/main/java/crazypants/enderio/machine/monitor/BlockPowerMonitor.java @@ -1,8 +1,6 @@ package crazypants.enderio.machine.monitor; -import net.minecraft.block.ITileEntityProvider; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -14,7 +12,7 @@ import crazypants.enderio.machine.AbstractMachineBlock; import crazypants.enderio.network.PacketHandler; import crazypants.util.DyeColor; -public class BlockPowerMonitor extends AbstractMachineBlock implements ITileEntityProvider { +public class BlockPowerMonitor extends AbstractMachineBlock { public static BlockPowerMonitor create() { diff --git a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedGlowstone.java b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedGlowstone.java index cc78d715..951529bf 100644 --- a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedGlowstone.java +++ b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedGlowstone.java @@ -28,14 +28,16 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent; 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.ModObject; +import crazypants.enderio.TileEntityEio; import crazypants.enderio.machine.MachineRecipeInput; import crazypants.enderio.machine.MachineRecipeRegistry; import crazypants.util.IFacade; import crazypants.util.Lang; -public class BlockPaintedGlowstone extends Block implements ITileEntityProvider, IPaintedBlock, IFacade { +public class BlockPaintedGlowstone extends BlockEio implements ITileEntityProvider, IPaintedBlock, IFacade { public static int renderId = -1; @@ -50,15 +52,15 @@ public class BlockPaintedGlowstone extends Block implements ITileEntityProvider, private Random rand = new Random(); protected BlockPaintedGlowstone() { - super(Material.glass); + super(ModObject.blockPaintedGlowstone.unlocalisedName, TileEntityPaintedBlock.class, Material.glass); setCreativeTab(null); - setBlockName(ModObject.blockPaintedGlowstone.unlocalisedName); setStepSound(soundTypeGlass); setHardness(0.7F); setLightLevel(1.0f); } - private void init() { + @Override + protected void init() { GameRegistry.registerBlock(this, BlockItemPaintedGlowstone.class, ModObject.blockPaintedGlowstone.unlocalisedName); GameRegistry.registerTileEntity(TileEntityPaintedBlock.class, ModObject.blockPaintedGlowstone.unlocalisedName + "TileEntity"); MachineRecipeRegistry.instance.registerRecipe(ModObject.blockPainter.unlocalisedName, new PainterTemplate()); @@ -207,29 +209,11 @@ public class BlockPaintedGlowstone extends Block implements ITileEntityProvider, super.onBlockPlacedBy(world, x, y, z, player, stack); } - /** - * Remove the tile entity too. - */ @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 TileEntityPaintedBlock) { - TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; - - ItemStack itemStack = createItemStackForSourceBlock(tef.getSourceBlock(), tef.getSourceBlockMetadata()); - - float f = 0.7F; - double d0 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; - double d1 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; - double d2 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; - EntityItem entityitem = new EntityItem(world, x + d0, y + d1, z + d2, itemStack); - entityitem.delayBeforeCanPickup = 10; - world.spawnEntityInWorld(entityitem); - } - } - world.removeTileEntity(x, y, z); + protected void processDrop(World world, int x, int y, int z, TileEntityEio te, ItemStack drop) { + TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; + ItemStack itemStack = createItemStackForSourceBlock(tef.getSourceBlock(), tef.getSourceBlockMetadata()); + drop.stackTagCompound = (NBTTagCompound) itemStack.stackTagCompound.copy(); } @Override diff --git a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedSlab.java b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedSlab.java index 09e44496..3c16a9ad 100644 --- a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedSlab.java +++ b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedSlab.java @@ -219,7 +219,7 @@ public class BlockPaintedSlab extends BlockSlab implements ITileEntityProvider, } } } - return super.removedByPlayer(world, player, x, y, z, doHarvest); + return super.removedByPlayer(world, player, x, y, z, false); } @Override diff --git a/src/main/java/crazypants/enderio/machine/power/BlockCapacitorBank.java b/src/main/java/crazypants/enderio/machine/power/BlockCapacitorBank.java index 5df96ef3..e7a268eb 100644 --- a/src/main/java/crazypants/enderio/machine/power/BlockCapacitorBank.java +++ b/src/main/java/crazypants/enderio/machine/power/BlockCapacitorBank.java @@ -346,7 +346,6 @@ public class BlockCapacitorBank extends BlockEio implements IGuiHandler, IAdvanc TileCapacitorBank cb = (TileCapacitorBank) te; Util.dropItems(world, cb, x, y, z, true); } - world.removeTileEntity(x, y, z); } @Override diff --git a/src/main/java/crazypants/enderio/machine/solar/BlockSolarPanel.java b/src/main/java/crazypants/enderio/machine/solar/BlockSolarPanel.java index 8826afb2..bea73b77 100644 --- a/src/main/java/crazypants/enderio/machine/solar/BlockSolarPanel.java +++ b/src/main/java/crazypants/enderio/machine/solar/BlockSolarPanel.java @@ -42,7 +42,7 @@ public class BlockSolarPanel extends BlockEio implements IResourceTooltipProvide IIcon sideIcon; IIcon advancedSideIcon; IIcon advancedIcon; - + IIcon borderIcon; IIcon advancedBorderIcon; @@ -104,7 +104,7 @@ public class BlockSolarPanel extends BlockEio implements IResourceTooltipProvide public IIcon getBorderIcon(int i, int meta) { return meta == 0 ? borderIcon : advancedBorderIcon; } - + @Override public int getRenderType() { return renderId; @@ -145,12 +145,6 @@ public class BlockSolarPanel extends BlockEio implements IResourceTooltipProvide super.addCollisionBoxesToList(par1World, par2, par3, par4, par5AxisAlignedBB, par6List, par7Entity); } - @Override - public void breakBlock(World world, int x, int y, int z, Block block, int p_149749_6_) { - super.breakBlock(world, x, y, z, block, p_149749_6_); - world.removeTileEntity(x, y, z); - } - @Override public String getUnlocalizedNameForTooltip(ItemStack itemStack) { return getUnlocalizedName(); @@ -158,7 +152,7 @@ public class BlockSolarPanel extends BlockEio implements IResourceTooltipProvide @Override public void getWailaInfo(List tooltip, EntityPlayer player, World world, int x, int y, int z) { - TileEntity te = world.getTileEntity(x, y, z); + TileEntity te = world.getTileEntity(x, y, z); if(te instanceof TileEntitySolarPanel) { TileEntitySolarPanel solar = (TileEntitySolarPanel) te; float efficiency = solar.calculateLightRatio(); diff --git a/src/main/java/crazypants/enderio/machine/tank/BlockTank.java b/src/main/java/crazypants/enderio/machine/tank/BlockTank.java index c8336c63..bb55ff17 100644 --- a/src/main/java/crazypants/enderio/machine/tank/BlockTank.java +++ b/src/main/java/crazypants/enderio/machine/tank/BlockTank.java @@ -134,11 +134,6 @@ public class BlockTank extends AbstractMachineBlock implements IAdvanc return super.onBlockActivated(world, x, y, z, entityPlayer, par6, par7, par8, par9); } - @Override - public TileEntity createNewTileEntity(World var1, int var2) { - return new TileTank(var2); - } - @Override public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { TileEntity te = world.getTileEntity(x, y, z); diff --git a/src/main/java/crazypants/enderio/machine/vacuum/BlockVacuumChest.java b/src/main/java/crazypants/enderio/machine/vacuum/BlockVacuumChest.java index 7ce4a782..8cc3055a 100644 --- a/src/main/java/crazypants/enderio/machine/vacuum/BlockVacuumChest.java +++ b/src/main/java/crazypants/enderio/machine/vacuum/BlockVacuumChest.java @@ -1,10 +1,6 @@ package crazypants.enderio.machine.vacuum; -import java.util.Random; - -import net.minecraft.block.Block; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -15,6 +11,7 @@ import crazypants.enderio.BlockEio; import crazypants.enderio.EnderIO; import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; +import crazypants.enderio.TileEntityEio; import crazypants.enderio.gui.IResourceTooltipProvider; import crazypants.enderio.tool.ToolUtil; @@ -32,9 +29,9 @@ public class BlockVacuumChest extends BlockEio implements IGuiHandler, IResource super(ModObject.blockVacuumChest.unlocalisedName, TileVacuumChest.class); setBlockTextureName("enderio:blockVacuumChest"); } - + @Override - protected void init() { + protected void init() { super.init(); EnderIO.guiHandler.registerGuiHandler(GuiHandler.GUI_ID_VACUUM_CHEST, this); } @@ -53,53 +50,31 @@ public class BlockVacuumChest extends BlockEio implements IGuiHandler, IResource } return true; } - + @Override - public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean harvested) { - if(!world.isRemote) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileVacuumChest) { - TileVacuumChest cb = (TileVacuumChest) te; - if(!player.capabilities.isCreativeMode || "true".equalsIgnoreCase(System.getProperty("blockCapBankAllwaysDrop"))) { - ItemStack itemStack = createItemStackWithInventory(cb); - float f = 0.7F; - double d0 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; - double d1 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; - double d2 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; - EntityItem entityitem = new EntityItem(world, x + d0, y + d1, z + d2, itemStack); - entityitem.delayBeforeCanPickup = 10; - world.spawnEntityInWorld(entityitem); - } - } - } - return super.removedByPlayer(world, player, x, y, z, harvested); + protected boolean doNormalDrops(World world, int x, int y, int z) { + return false; } @Override - public int quantityDropped(Random p_149745_1_) { - return 0; - } - - private ItemStack createItemStackWithInventory(TileVacuumChest cb) { - ItemStack stack = new ItemStack(this); - stack.stackTagCompound = new NBTTagCompound(); - cb.writeContentsToNBT(stack.stackTagCompound); - return stack; + protected void processDrop(World world, int x, int y, int z, TileEntityEio te, ItemStack drop) { + drop.stackTagCompound = new NBTTagCompound(); + ((TileVacuumChest) te).writeContentsToNBT(drop.stackTagCompound); } @Override public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase placedBy, ItemStack stack) { if(!world.isRemote) { TileEntity te = world.getTileEntity(x, y, z); - if(stack != null && stack.stackTagCompound != null && te instanceof TileVacuumChest) { - ((TileVacuumChest)te).readContentsFromNBT(stack.stackTagCompound); + if(stack != null && stack.stackTagCompound != null && te instanceof TileVacuumChest) { + ((TileVacuumChest) te).readContentsFromNBT(stack.stackTagCompound); world.markBlockForUpdate(x, y, z); } } } @Override - public int getRenderType() { + public int getRenderType() { return renderId; } @@ -126,12 +101,6 @@ public class BlockVacuumChest extends BlockEio implements IGuiHandler, IResource return null; } - @Override - public void breakBlock(World world, int x, int y, int z, Block block, int p_149749_6_) { - super.breakBlock(world, x, y, z, block, p_149749_6_); - world.removeTileEntity(x, y, z); - } - @Override public String getUnlocalizedNameForTooltip(ItemStack itemStack) { return getUnlocalizedName(); diff --git a/src/main/java/crazypants/enderio/machine/vacuum/TileVacuumChest.java b/src/main/java/crazypants/enderio/machine/vacuum/TileVacuumChest.java index c8ff0216..d4c488f4 100644 --- a/src/main/java/crazypants/enderio/machine/vacuum/TileVacuumChest.java +++ b/src/main/java/crazypants/enderio/machine/vacuum/TileVacuumChest.java @@ -11,17 +11,16 @@ 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.AxisAlignedBB; import crazypants.enderio.ModObject; +import crazypants.enderio.TileEntityEio; import crazypants.enderio.config.Config; import crazypants.render.BoundingBox; import crazypants.util.BlockCoord; import crazypants.util.ItemUtil; -public class TileVacuumChest extends TileEntity implements IEntitySelector, IInventory { +public class TileVacuumChest extends TileEntityEio implements IEntitySelector, IInventory { - private static final double RANGE = Config.vacuumChestRange; private ItemStack[] inv = new ItemStack[27]; @@ -31,7 +30,7 @@ public class TileVacuumChest extends TileEntity implements IEntitySelector, IIn doHoover(); } } - + @Override public boolean isEntityApplicable(Entity entity) { if(entity.isDead) { @@ -46,7 +45,6 @@ public class TileVacuumChest extends TileEntity implements IEntitySelector, IIn } return false; } - private void doHoover() { @@ -65,9 +63,9 @@ public class TileVacuumChest extends TileEntity implements IEntitySelector, IIn hooverEntity(entity); } else { double speed = 0.06; - double distScale = 1.0 - Math.min(0.9, distance / (RANGE*RANGE)); + double distScale = 1.0 - Math.min(0.9, distance / (RANGE * RANGE)); distScale *= distScale; - + entity.motionX += x / distance * distScale * speed; entity.motionY += y / distance * distScale * 0.2; entity.motionZ += z / distance * distScale * speed; @@ -75,7 +73,7 @@ public class TileVacuumChest extends TileEntity implements IEntitySelector, IIn } } - + private void hooverEntity(Entity entity) { if(!worldObj.isRemote) { if(entity instanceof EntityItem && !entity.isDead) { @@ -91,9 +89,9 @@ public class TileVacuumChest extends TileEntity implements IEntitySelector, IIn } } } - + private boolean isFull() { - for(ItemStack stack : inv) { + for (ItemStack stack : inv) { if(stack == null || stack.stackSize < stack.getMaxStackSize()) { return false; } @@ -143,12 +141,12 @@ public class TileVacuumChest extends TileEntity implements IEntitySelector, IIn @Override public void setInventorySlotContents(int slot, ItemStack contents) { - + if(slot < 0 || slot >= inv.length) { System.out.println("TileVacumChest.setInventorySlotContents: " + slot); return; } - + if(contents == null) { inv[slot] = contents; } else { @@ -164,9 +162,9 @@ public class TileVacuumChest extends TileEntity implements IEntitySelector, IIn public ItemStack getStackInSlotOnClosing(int var1) { return null; } - + @Override - public String getInventoryName() { + public String getInventoryName() { return ModObject.blockVacuumChest.unlocalisedName; } @@ -176,16 +174,16 @@ public class TileVacuumChest extends TileEntity implements IEntitySelector, IIn } @Override - public boolean isUseableByPlayer(EntityPlayer var1) { + public boolean isUseableByPlayer(EntityPlayer var1) { return true; } @Override - public void openInventory() { + public void openInventory() { } @Override - public void closeInventory() { + public void closeInventory() { } @Override @@ -194,11 +192,11 @@ public class TileVacuumChest extends TileEntity implements IEntitySelector, IIn } @Override - public void readFromNBT(NBTTagCompound nbtRoot) { - super.readFromNBT(nbtRoot); + public void readCustomNBT(NBTTagCompound nbtRoot) { + super.readFromNBT(nbtRoot); readContentsFromNBT(nbtRoot); } - + public void readContentsFromNBT(NBTTagCompound nbtRoot) { NBTTagList itemList = (NBTTagList) nbtRoot.getTag("Items"); if(itemList != null) { @@ -213,11 +211,11 @@ public class TileVacuumChest extends TileEntity implements IEntitySelector, IIn } @Override - public void writeToNBT(NBTTagCompound nbtRoot) { + public void writeCustomNBT(NBTTagCompound nbtRoot) { super.writeToNBT(nbtRoot); writeContentsToNBT(nbtRoot); - } - + } + public void writeContentsToNBT(NBTTagCompound nbtRoot) { NBTTagList itemList = new NBTTagList(); for (int i = 0; i < inv.length; i++) { @@ -230,5 +228,5 @@ public class TileVacuumChest extends TileEntity implements IEntitySelector, IIn } nbtRoot.setTag("Items", itemList); } - + } diff --git a/src/main/java/crazypants/enderio/teleport/BlockTravelAnchor.java b/src/main/java/crazypants/enderio/teleport/BlockTravelAnchor.java index 58c4ffe6..313d3d65 100644 --- a/src/main/java/crazypants/enderio/teleport/BlockTravelAnchor.java +++ b/src/main/java/crazypants/enderio/teleport/BlockTravelAnchor.java @@ -8,6 +8,7 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChatComponentText; import net.minecraft.util.IIcon; @@ -21,6 +22,7 @@ import crazypants.enderio.BlockEio; import crazypants.enderio.EnderIO; import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; +import crazypants.enderio.TileEntityEio; import crazypants.enderio.config.Config; import crazypants.enderio.gui.IResourceTooltipProvider; import crazypants.enderio.machine.MachineRecipeInput; @@ -44,7 +46,7 @@ public class BlockTravelAnchor extends BlockEio implements IGuiHandler, ITileEnt public static BlockTravelAnchor create() { PacketHandler.INSTANCE.registerMessage(PacketAccessMode.class, PacketAccessMode.class, PacketHandler.nextID(), Side.SERVER); - PacketHandler.INSTANCE.registerMessage(PacketLabel.class, PacketLabel.class, PacketHandler.nextID(), Side.SERVER); + PacketHandler.INSTANCE.registerMessage(PacketLabel.class, PacketLabel.class, PacketHandler.nextID(), Side.SERVER); PacketHandler.INSTANCE.registerMessage(PacketTravelEvent.class, PacketTravelEvent.class, PacketHandler.nextID(), Side.SERVER); PacketHandler.INSTANCE.registerMessage(PacketDrainStaff.class, PacketDrainStaff.class, PacketHandler.nextID(), Side.SERVER); PacketHandler.INSTANCE.registerMessage(PacketOpenAuthGui.class, PacketOpenAuthGui.class, PacketHandler.nextID(), Side.SERVER); @@ -163,31 +165,22 @@ public class BlockTravelAnchor extends BlockEio implements IGuiHandler, ITileEnt } return null; } - - @Override - public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean doHarvest) { - if(!world.isRemote && (!player.capabilities.isCreativeMode)) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileTravelAnchor) { - TileTravelAnchor anchor = (TileTravelAnchor) te; - - ItemStack itemStack; - Block srcBlk = anchor.getSourceBlock(); - if(srcBlk != null) { - itemStack = createItemStackForSourceBlock(anchor.getSourceBlock(), anchor.getSourceBlockMetadata()); - } else { - itemStack = new ItemStack(this); - } - dropBlockAsItem(world, x, y, z, itemStack); - } + @Override + protected void processDrop(World world, int x, int y, int z, TileEntityEio te, ItemStack drop) { + TileTravelAnchor anchor = (TileTravelAnchor) te; + + ItemStack itemStack = new ItemStack(this); + Block srcBlk = anchor.getSourceBlock(); + if(srcBlk != null) { + itemStack = createItemStackForSourceBlock(anchor.getSourceBlock(), anchor.getSourceBlockMetadata()); + drop.stackTagCompound = (NBTTagCompound) itemStack.stackTagCompound.copy(); } - return super.removedByPlayer(world, player, x, y, z, doHarvest); } @Override - public int quantityDropped(Random par1Random) { - return 0; // need to do custom dropping to maintain source metadata + protected boolean doNormalDrops(World world, int x, int y, int z) { + return false; } @Override @@ -246,8 +239,8 @@ public class BlockTravelAnchor extends BlockEio implements IGuiHandler, ITileEnt @Override public int getFacadeMetadata(IBlockAccess world, int x, int y, int z, int side) { TileEntity te = world.getTileEntity(x, y, z); - if (te instanceof TileTravelAnchor) { - return ((TileTravelAnchor)te).getSourceBlockMetadata(); + if(te instanceof TileTravelAnchor) { + return ((TileTravelAnchor) te).getSourceBlockMetadata(); } return 0; } @@ -255,8 +248,8 @@ public class BlockTravelAnchor extends BlockEio implements IGuiHandler, ITileEnt @Override public Block getFacade(IBlockAccess world, int x, int y, int z, int side) { TileEntity te = world.getTileEntity(x, y, z); - if (te instanceof TileTravelAnchor) { - return ((TileTravelAnchor)te).getSourceBlock(); + if(te instanceof TileTravelAnchor) { + return ((TileTravelAnchor) te).getSourceBlock(); } return this; } From 4824d3fddccc514c787e96de98c2b90162b3ddc1 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Mon, 2 Feb 2015 19:02:16 -0500 Subject: [PATCH 52/79] Update forge to latest --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 1a67e99f..027a3112 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ minecraft_version=1.7.10 -forge_version=10.13.0.1208 +forge_version=10.13.2.1291 mod_version=2.2.7 From 25dff28320b35fc30bdcde86d86a204c266c89c5 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Mon, 2 Feb 2015 20:12:59 -0500 Subject: [PATCH 53/79] Add upgrade recipe for vibrant capacitor --- src/main/java/crazypants/enderio/machine/MachineRecipes.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/crazypants/enderio/machine/MachineRecipes.java b/src/main/java/crazypants/enderio/machine/MachineRecipes.java index 63365cb2..0cc966f4 100644 --- a/src/main/java/crazypants/enderio/machine/MachineRecipes.java +++ b/src/main/java/crazypants/enderio/machine/MachineRecipes.java @@ -146,6 +146,7 @@ public class MachineRecipes { GameRegistry.addRecipe(convertRecipe); GameRegistry.addRecipe(new UpgradeCapBankRecipe(capBank2, "eee", "bcb", "eee", 'e', energeticAlloy, 'b', capBank1, 'c', capacitor2)); + GameRegistry.addRecipe(new UpgradeCapBankRecipe(capBank3, "vov", "NcN", "vov", 'v', phasedGold, 'o', capacitor3, 'N', capBank2, 'c', vibCry)); //painter ItemStack painter = new ItemStack(EnderIO.blockPainter, 1, 0); From 6e1032d0c80de71ef8cabbf25c16e0e3e0cff33e Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Mon, 2 Feb 2015 20:29:15 -0500 Subject: [PATCH 54/79] Update version to 2.2.8 and update release notes --- ReleaseNotes.txt | 37 +++++++++++++++++++++++++++++++++++++ gradle.properties | 2 +- 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index a802c513..540dcd84 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,3 +1,40 @@ +------------------------------------------------------ +Version 2.2.8 +------------------------------------------------------ +New +- #1703 Forestry upgrades for DS armor (MatthiasM2) +- #746 Add speed downgrade for item conduits. Allows conduits to pull only one item at a time (MatthiasM2) +- #1731 All machines will now have progress tooltips on the progress animation (MatthiasM2) +- #85 Add hardened conduit facades. Have a higher hardness and blast resistance (TNT-proof) than normal facades. +- Add recipe to upgrade capacitors to the next tier + +Changes +- All blocks now support the vanilla breaking animation properly +- Conduit connectors combine into a single box, this fixes z-fighting issues (especially with texture packs) +- Split internal and external conduit connector textures +- Some more default hoes added to the config +- Localized GUI names, WAILA configs, and the rest of the tooltips (Adaptivity) +- Improve double chest support on the mod item filter snapshot +- Add support for sending grinding balls via IMC +- #1771 All Killer Joes will now have the same UUID, for server admin purposes +- Wither skeletons will now drop Tcon necrotic bones and respect Tcon beheading +- Improve efficiency of wireless chargers (MatthiasM2) +- Refactor how all EIO blocks drop themselves, should resolve all™ issues with such in the future + +Bugs +- Fix crash with iguana tweaks level ups in farm +- Fix some crashes with facades and WAILA +- Painted slabs will no longer drop in creative mode (MatthiasM2) +- Fix enchanter and yeta wrench tooltips (MatthiasM2) +- Fix the alignment of the progress arrow in the slice'n'splice (MatthiasM2) +- Fix IItemDuct methods not checking filters. This should allow machines pushing to conduits to be filtered properly +- Fix wither skeletons not spawning and fix their equipment/rendering +- Fix tooltips rendering underneath the IO config +- Fix IO config changing NEI item lighting +- #1630 Item conduits pulling and preserving invalid stacksizes (fixes issues with filing cabinets) +- #1585 Fix blocks not dropping in explosions +- #1821 Fix buffers ignoring redstone mode + ------------------------------------------------------ Version 2.2.7 ------------------------------------------------------ diff --git a/gradle.properties b/gradle.properties index 027a3112..a957b4b9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ minecraft_version=1.7.10 forge_version=10.13.2.1291 -mod_version=2.2.7 +mod_version=2.2.8 #Comment out this line to get rid of the appendix #mod_appendix=beta From e35874cc106a4e9576d12fc347a1f9f47d802597 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Mon, 2 Feb 2015 20:43:18 -0500 Subject: [PATCH 55/79] Remove crap. Literally. --- src/main/java/crazypants/Crap.java | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 src/main/java/crazypants/Crap.java diff --git a/src/main/java/crazypants/Crap.java b/src/main/java/crazypants/Crap.java deleted file mode 100644 index b6e5d3de..00000000 --- a/src/main/java/crazypants/Crap.java +++ /dev/null @@ -1,19 +0,0 @@ -package crazypants; - -import java.io.BufferedReader; -import java.io.FileReader; - -public class Crap { - - public static void main(String[] args) throws Exception { - BufferedReader br = new BufferedReader(new FileReader("C:\\MyData\\Dev\\Minecraft\\Workspace17\\PamsSeeds.txt")); - String line = br.readLine(); - System.out.println("private static final String[] PAMS_SEEDS = new String[] {"); - while(line != null) { - System.out.println("\"" + line.trim() + "\","); - line = br.readLine(); - } - System.out.println("};"); - } - -} From 01194de2408290109422dcbc508dc4e406a620f1 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Mon, 2 Feb 2015 23:10:42 -0500 Subject: [PATCH 56/79] Fix infinite loop on vacuum chest NBT read/write --- .../java/crazypants/enderio/machine/vacuum/TileVacuumChest.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/crazypants/enderio/machine/vacuum/TileVacuumChest.java b/src/main/java/crazypants/enderio/machine/vacuum/TileVacuumChest.java index d4c488f4..57a49c9f 100644 --- a/src/main/java/crazypants/enderio/machine/vacuum/TileVacuumChest.java +++ b/src/main/java/crazypants/enderio/machine/vacuum/TileVacuumChest.java @@ -193,7 +193,6 @@ public class TileVacuumChest extends TileEntityEio implements IEntitySelector, I @Override public void readCustomNBT(NBTTagCompound nbtRoot) { - super.readFromNBT(nbtRoot); readContentsFromNBT(nbtRoot); } @@ -212,7 +211,6 @@ public class TileVacuumChest extends TileEntityEio implements IEntitySelector, I @Override public void writeCustomNBT(NBTTagCompound nbtRoot) { - super.writeToNBT(nbtRoot); writeContentsToNBT(nbtRoot); } From 17930325aa660db141ac5905d035b6ce8dfaab3d Mon Sep 17 00:00:00 2001 From: Matthias Mann Date: Tue, 3 Feb 2015 19:27:28 +0100 Subject: [PATCH 57/79] don't break conduits with the yeta wrench on left click --- .../java/crazypants/enderio/item/ItemYetaWrench.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/java/crazypants/enderio/item/ItemYetaWrench.java b/src/main/java/crazypants/enderio/item/ItemYetaWrench.java index 417e3c9d..918890ff 100644 --- a/src/main/java/crazypants/enderio/item/ItemYetaWrench.java +++ b/src/main/java/crazypants/enderio/item/ItemYetaWrench.java @@ -18,6 +18,7 @@ import org.lwjgl.input.Keyboard; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.EnderIO; import crazypants.enderio.EnderIOTab; import crazypants.enderio.ModObject; import crazypants.enderio.api.tool.IConduitControl; @@ -85,7 +86,13 @@ public class ItemYetaWrench extends Item implements ITool, IConduitControl, IAdv ConduitDisplayMode.setDisplayMode(equipped, newMode); return equipped; } - + + @Override + public boolean onBlockStartBreak(ItemStack itemstack, int x, int y, int z, EntityPlayer player) { + Block block = player.worldObj.getBlock(x, y, z); + return block == EnderIO.blockConduitBundle; + } + @Override public boolean isFull3D() { return true; From 7e9cd45f526292b63cd1baa48599ae5fc7a98b96 Mon Sep 17 00:00:00 2001 From: Matthias Mann Date: Tue, 3 Feb 2015 20:27:23 +0100 Subject: [PATCH 58/79] give achievements for smelting iron and cooking fish in the alloy smelter --- .../machine/alloy/ContainerAlloySmelter.java | 27 +++++++++++-------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/src/main/java/crazypants/enderio/machine/alloy/ContainerAlloySmelter.java b/src/main/java/crazypants/enderio/machine/alloy/ContainerAlloySmelter.java index 75309210..46f76c30 100644 --- a/src/main/java/crazypants/enderio/machine/alloy/ContainerAlloySmelter.java +++ b/src/main/java/crazypants/enderio/machine/alloy/ContainerAlloySmelter.java @@ -2,16 +2,18 @@ package crazypants.enderio.machine.alloy; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.init.Items; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import net.minecraft.stats.AchievementList; import crazypants.enderio.machine.gui.AbstractMachineContainer; import crazypants.util.Util; public class ContainerAlloySmelter extends AbstractMachineContainer { - private EntityPlayer thePlayer; - private TileAlloySmelter smelter; + private final EntityPlayer thePlayer; + private final TileAlloySmelter smelter; public ContainerAlloySmelter(InventoryPlayer playerInv, TileAlloySmelter te) { super(playerInv, te); @@ -85,18 +87,21 @@ public class ContainerAlloySmelter extends AbstractMachineContainer { @Override protected void onCrafting(ItemStack output) { output.onCrafting(thePlayer.worldObj, thePlayer, numResults); - if(output != null) { - if(!thePlayer.worldObj.isRemote) { - ItemStack outputSized = output.copy(); - outputSized.stackSize = numResults; - float experience = smelter.getExperienceForOutput(outputSized); - Util.giveExperience(thePlayer, experience); - } - + if(!thePlayer.worldObj.isRemote) { + ItemStack outputSized = output.copy(); + outputSized.stackSize = numResults; + float experience = smelter.getExperienceForOutput(outputSized); + Util.giveExperience(thePlayer, experience); } numResults = 0; - } + if(output.getItem() == Items.iron_ingot) { + thePlayer.addStat(AchievementList.acquireIron, 1); + } + if(output.getItem() == Items.cooked_fished) { + thePlayer.addStat(AchievementList.cookFish, 1); + } + } } } From d3417225d1e7c1520a41de4644ce53d18e4ff96f Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Tue, 3 Feb 2015 19:22:24 -0500 Subject: [PATCH 59/79] Finish refactoring wrenching/itemdrops into base classes. Also fix conduits not rendering break texture --- .../java/crazypants/enderio/BlockEio.java | 52 ++++++-- .../block/BlockReinforcedObsidian.java | 5 + .../conduit/render/ConduitBundleRenderer.java | 116 +++++++++--------- .../enderio/enderface/BlockEnderIO.java | 11 +- .../enderio/machine/AbstractMachineBlock.java | 35 ++---- .../enderio/machine/buffer/BlockBuffer.java | 5 + .../enderio/machine/capbank/BlockCapBank.java | 42 +++---- .../machine/enchanter/BlockEnchanter.java | 18 +-- .../machine/gui/AbstractMachineContainer.java | 2 - .../machine/hypercube/BlockHyperCube.java | 12 +- .../machine/light/BlockElectricLight.java | 27 +--- .../painter/BlockPaintedGlowstone.java | 6 +- .../machine/power/BlockCapacitorBank.java | 14 +-- .../machine/reservoir/BlockReservoir.java | 24 +--- .../machine/solar/BlockSolarPanel.java | 16 --- .../enderio/machine/tank/BlockTank.java | 27 ++-- .../enderio/machine/tank/TileTank.java | 2 +- .../machine/vacuum/BlockVacuumChest.java | 18 +-- .../wireless/BlockWirelessCharger.java | 15 --- .../enderio/material/BlockFusedQuartz.java | 50 +++----- .../enderio/material/BlockIngotStorage.java | 5 + .../enderio/teleport/BlockTravelAnchor.java | 22 ++-- .../crazypants/enderio/tool/ToolUtil.java | 7 ++ 23 files changed, 218 insertions(+), 313 deletions(-) diff --git a/src/main/java/crazypants/enderio/BlockEio.java b/src/main/java/crazypants/enderio/BlockEio.java index fb1a0caf..546f4de2 100644 --- a/src/main/java/crazypants/enderio/BlockEio.java +++ b/src/main/java/crazypants/enderio/BlockEio.java @@ -4,8 +4,6 @@ import java.util.ArrayList; import javax.annotation.Nullable; -import com.google.common.collect.Lists; - import net.minecraft.block.Block; import net.minecraft.block.material.MapColor; import net.minecraft.block.material.Material; @@ -14,10 +12,13 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.api.tool.ITool; import crazypants.enderio.machine.AbstractMachineEntity; +import crazypants.enderio.tool.ToolUtil; public abstract class BlockEio extends Block { @@ -75,8 +76,40 @@ public abstract class BlockEio extends Block { } /* Subclass Helpers */ + + @Override + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityPlayer, int side, float par7, float par8, float par9) { - protected boolean doNormalDrops(World world, int x, int y, int z) { + if(shouldWrench(world, x, y, z, entityPlayer, side) && ToolUtil.breakBlockWithTool(this, world, x, y, z, entityPlayer)) { + return true; + } + + ITool tool = ToolUtil.getEquippedTool(entityPlayer); + if(tool != null && !entityPlayer.isSneaking()) { + TileEntity te = world.getTileEntity(x, y, z); + if(te instanceof AbstractMachineEntity) { + ((AbstractMachineEntity) te).toggleIoModeForFace(ForgeDirection.getOrientation(side)); + world.markBlockForUpdate(x, y, z); + return true; + } + } + + if(entityPlayer.isSneaking()) { + return false; + } + + return openGui(world, x, y, z, entityPlayer, side); + } + + protected boolean shouldWrench(World world, int x, int y, int z, EntityPlayer entityPlayer, int side) { + return true; + } + + protected boolean openGui(World world, int x, int y, int z, EntityPlayer entityPlayer, int side) { + return false; + } + + public boolean doNormalDrops(World world, int x, int y, int z) { return true; } @@ -84,10 +117,12 @@ public abstract class BlockEio extends Block { public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean doHarvest) { TileEntity te = world.getTileEntity(x, y, z); if(te instanceof TileEntityEio && ((TileEntityEio) te).shouldDrop()) { - if(!world.isRemote && (!player.capabilities.isCreativeMode) && !doNormalDrops(world, x, y, z)) { - dropAsItem(world, x, y, z, (AbstractMachineEntity) te); + if(!world.isRemote && !player.capabilities.isCreativeMode && !doNormalDrops(world, x, y, z)) { + dropAsItem(world, x, y, z, (TileEntityEio) te); + ((TileEntityEio) te).preventDrops(); + } else if(player.capabilities.isCreativeMode) { + ((TileEntityEio) te).preventDrops(); } - ((TileEntityEio) te).preventDrops(); } return super.removedByPlayer(world, player, x, y, z, false); } @@ -95,13 +130,14 @@ public abstract class BlockEio extends Block { @Override public void breakBlock(World world, int x, int y, int z, Block block, int meta) { TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileEntityEio && ((TileEntityEio) te).shouldDrop()) { + if(te instanceof TileEntityEio && ((TileEntityEio) te).shouldDrop() && !doNormalDrops(world, x, y, z)) { dropAsItem(world, x, y, z, (TileEntityEio) te); + ((TileEntityEio)te).preventDrops(); } super.breakBlock(world, x, y, z, block, meta); } - protected void dropAsItem(World world, int x, int y, int z, TileEntityEio te) { + public void dropAsItem(World world, int x, int y, int z, TileEntityEio te) { int meta = damageDropped(world.getBlockMetadata(x, y, z)); ItemStack itemStack = new ItemStack(this, 1, meta); processDrop(world, x, y, z, te, itemStack); diff --git a/src/main/java/crazypants/enderio/block/BlockReinforcedObsidian.java b/src/main/java/crazypants/enderio/block/BlockReinforcedObsidian.java index a6d984d3..5db0d574 100644 --- a/src/main/java/crazypants/enderio/block/BlockReinforcedObsidian.java +++ b/src/main/java/crazypants/enderio/block/BlockReinforcedObsidian.java @@ -57,6 +57,11 @@ public class BlockReinforcedObsidian extends BlockEio implements IResourceToolti public String getUnlocalizedNameForTooltip(ItemStack itemStack) { return getUnlocalizedName(); } + + @Override + protected boolean shouldWrench(World world, int x, int y, int z, EntityPlayer entityPlayer, int side) { + return false; + } @Override public void getWailaInfo(List tooltip, EntityPlayer player, World world, int x, int y, int z) {} diff --git a/src/main/java/crazypants/enderio/conduit/render/ConduitBundleRenderer.java b/src/main/java/crazypants/enderio/conduit/render/ConduitBundleRenderer.java index db6473c7..3dc10aab 100644 --- a/src/main/java/crazypants/enderio/conduit/render/ConduitBundleRenderer.java +++ b/src/main/java/crazypants/enderio/conduit/render/ConduitBundleRenderer.java @@ -157,7 +157,7 @@ public class ConduitBundleRenderer extends TileEntitySpecialRenderer implements } facb.setBlockOverride(null); - bundle.setFacadeId(facadeId, false); + bundle.setFacadeId(facadeId, false); } else if(facadeId != null) { bundle.setFacadeRenderAs(FacadeRenderState.FULL); boolean isFacadeOpaque = facadeId.isOpaqueCube(); @@ -198,73 +198,67 @@ public class ConduitBundleRenderer extends TileEntitySpecialRenderer implements List wireBounds = new ArrayList(); - if(BlockConduitBundle.theRenderPass == 0) { - for (IConduit con : bundle.getConduits()) { + for (IConduit con : bundle.getConduits()) { - if(ConduitUtil.renderConduit(player, con)) { - ConduitRenderer renderer = EnderIO.proxy.getRendererForConduit(con); - renderer.renderEntity(this, bundle, con, x, y, z, partialTick, brightness, rb); - Set extCons = con.getExternalConnections(); - for (ForgeDirection dir : extCons) { - if(con.getConnectionMode(dir) != ConnectionMode.DISABLED && con.getConnectionMode(dir) != ConnectionMode.NOT_SET) { - externals.add(dir); - } + if(ConduitUtil.renderConduit(player, con)) { + ConduitRenderer renderer = EnderIO.proxy.getRendererForConduit(con); + renderer.renderEntity(this, bundle, con, x, y, z, partialTick, brightness, rb); + Set extCons = con.getExternalConnections(); + for (ForgeDirection dir : extCons) { + if(con.getConnectionMode(dir) != ConnectionMode.DISABLED && con.getConnectionMode(dir) != ConnectionMode.NOT_SET) { + externals.add(dir); } - } else if(con != null) { - Collection components = con.getCollidableComponents(); - for (CollidableComponent component : components) { + } + } else if(con != null) { + Collection components = con.getCollidableComponents(); + for (CollidableComponent component : components) { + wireBounds.add(component.bound); + } + } + } + + // Internal conectors between conduits + List connectors = bundle.getConnectors(); + List rendered = Lists.newArrayList(); + for (CollidableComponent component : connectors) { + if(component.conduitType != null) { + IConduit conduit = bundle.getConduit(component.conduitType); + if(conduit != null) { + if(ConduitUtil.renderConduit(player, component.conduitType)) { + if(rb.hasOverrideBlockTexture()) { + List results = EnderIO.blockConduitBundle.doRayTraceAll(bundle.getWorld(), MathHelper.floor_double(x), + MathHelper.floor_double(y), MathHelper.floor_double(z), EnderIO.proxy.getClientPlayer()); + for (RaytraceResult r : results) { + // the connectors can be rendered multiple times and this makes the break texture look funky + if(r.component.conduitType == component.conduitType && !rendered.contains(r.component)) { + rendered.add(r.component); + CubeRenderer.render(component.bound, rb.overrideBlockTexture, true); + } + } + } else { + tessellator.setBrightness((int) (brightness)); + CubeRenderer.render(component.bound, conduit.getTextureForState(component), true); + } + } else { wireBounds.add(component.bound); } } + + } else if(ConduitUtil.getDisplayMode(player) == ConduitDisplayMode.ALL && !rb.hasOverrideBlockTexture()) { + IIcon tex = EnderIO.blockConduitBundle.getConnectorIcon(component.data); + CubeRenderer.render(component.bound, tex); } + } + //render these after the 'normal' conduits so help with proper blending + for (BoundingBox wireBound : wireBounds) { + Tessellator.instance.setColorRGBA_F(1, 1, 1, 0.25f); + CubeRenderer.render(wireBound, EnderIO.blockConduitFacade.getIcon(0, 0)); + } - // Internal conectors between conduits - List connectors = bundle.getConnectors(); - List rendered = Lists.newArrayList(); - for (CollidableComponent component : connectors) { - if(component.conduitType != null) { - IConduit conduit = bundle.getConduit(component.conduitType); - if(conduit != null) { - if(ConduitUtil.renderConduit(player, component.conduitType)) { - if(rb.hasOverrideBlockTexture()) { - List results = EnderIO.blockConduitBundle.doRayTraceAll(bundle.getWorld(), MathHelper.floor_double(x), - MathHelper.floor_double(y), MathHelper.floor_double(z), EnderIO.proxy.getClientPlayer()); - for (RaytraceResult r : results) { - // the connectors can be rendered multiple times and this makes the break texture look funky - if(r.component.conduitType == component.conduitType && !rendered.contains(r.component)) { - rendered.add(r.component); - CubeRenderer.render(component.bound, rb.overrideBlockTexture, true); - } - } - } else { - tessellator.setBrightness((int) (brightness)); - CubeRenderer.render(component.bound, conduit.getTextureForState(component), true); - } - } else { - wireBounds.add(component.bound); - } - } - - } else if(ConduitUtil.getDisplayMode(player) == ConduitDisplayMode.ALL && !rb.hasOverrideBlockTexture()) { - IIcon tex = EnderIO.blockConduitBundle.getConnectorIcon(component.data); - CubeRenderer.render(component.bound, tex); - } - } - } else { - - if(!rb.hasOverrideBlockTexture()) { - //render these after the 'normal' conduits so help with proper blending - for (BoundingBox wireBound : wireBounds) { - Tessellator.instance.setColorRGBA_F(1, 1, 1, 0.25f); - CubeRenderer.render(wireBound, EnderIO.blockConduitFacade.getIcon(0, 0)); - } - - Tessellator.instance.setColorRGBA_F(1, 1, 1, 1f); - // External connection terminations - for (ForgeDirection dir : externals) { - renderExternalConnection(dir); - } - } + Tessellator.instance.setColorRGBA_F(1, 1, 1, 1f); + // External connection terminations + for (ForgeDirection dir : externals) { + renderExternalConnection(dir); } tessellator.addTranslation(-(float) x, -(float) y, -(float) z); diff --git a/src/main/java/crazypants/enderio/enderface/BlockEnderIO.java b/src/main/java/crazypants/enderio/enderface/BlockEnderIO.java index 19ed8530..6efb8968 100644 --- a/src/main/java/crazypants/enderio/enderface/BlockEnderIO.java +++ b/src/main/java/crazypants/enderio/enderface/BlockEnderIO.java @@ -87,19 +87,14 @@ public class BlockEnderIO extends BlockEio implements IResourceTooltipProvider { } @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityPlayer, int par6, float par7, float par8, float par9) { - if(entityPlayer.isSneaking()) { - return false; - } + public boolean openGui(World world, int x, int y, int z, EntityPlayer entityPlayer, int side) { TileEntity te = world.getTileEntity(x, y, z); if(te instanceof ITravelAccessable) { ITravelAccessable ta = (ITravelAccessable) te; if(ta.canUiBeAccessed(entityPlayer)) { - if(!world.isRemote) { - entityPlayer.openGui(EnderIO.instance, GuiHandler.GUI_ID_TRAVEL_ACCESSABLE, world, x, y, z); - } + entityPlayer.openGui(EnderIO.instance, GuiHandler.GUI_ID_TRAVEL_ACCESSABLE, world, x, y, z); } else { - if(world.isRemote) { + if(world.isRemote && !entityPlayer.isSneaking()) { entityPlayer.addChatComponentMessage(new ChatComponentText(Lang.localize("gui.travelAccessable.privateBlock1") + " " + ta.getPlacedBy() + " " + Lang.localize("gui.travelAccessable.privateBlock2"))); } diff --git a/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java b/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java index fad519c6..6202d614 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java +++ b/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java @@ -80,36 +80,17 @@ public abstract class AbstractMachineBlock exte } @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityPlayer, int side, float par7, float par8, float par9) { + public int getRenderType() { + return renderId; + } - if(ToolUtil.breakBlockWithTool(this, world, x, y, z, entityPlayer)) { - return true; - } - - ITool tool = ToolUtil.getEquippedTool(entityPlayer); - if(tool != null && !entityPlayer.isSneaking()) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof AbstractMachineEntity) { - ((AbstractMachineEntity) te).toggleIoModeForFace(ForgeDirection.getOrientation(side)); - world.markBlockForUpdate(x, y, z); - return true; - } - } - - if(entityPlayer.isSneaking()) { - return false; - } + public boolean openGui(World world, int x, int y, int z, EntityPlayer entityPlayer, int side) { if(!world.isRemote) { entityPlayer.openGui(EnderIO.instance, getGuiId(), world, x, y, z); } return true; } - - @Override - public int getRenderType() { - return renderId; - } - + @Override public boolean canSilkHarvest(World world, EntityPlayer player, int x, int y, int z, int metadata) { return false; @@ -196,13 +177,15 @@ public abstract class AbstractMachineBlock exte } @Override - protected boolean doNormalDrops(World world, int x, int y, int z) { + 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, TileEntityEio te, ItemStack stack) { - ((AbstractMachineEntity) te).writeToItemStack(stack); + if(te != null) { + ((AbstractMachineEntity) te).writeToItemStack(stack); + } } @Override diff --git a/src/main/java/crazypants/enderio/machine/buffer/BlockBuffer.java b/src/main/java/crazypants/enderio/machine/buffer/BlockBuffer.java index 9080869c..396f8ab7 100644 --- a/src/main/java/crazypants/enderio/machine/buffer/BlockBuffer.java +++ b/src/main/java/crazypants/enderio/machine/buffer/BlockBuffer.java @@ -126,6 +126,11 @@ public class BlockBuffer extends AbstractMachineBlock implements IFa } } + @Override + public int damageDropped(int meta) { + return meta; + } + // TODO refactor machines so all have this functionality @Override public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) { diff --git a/src/main/java/crazypants/enderio/machine/capbank/BlockCapBank.java b/src/main/java/crazypants/enderio/machine/capbank/BlockCapBank.java index 02bfb564..85deb851 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/BlockCapBank.java +++ b/src/main/java/crazypants/enderio/machine/capbank/BlockCapBank.java @@ -151,11 +151,7 @@ public class BlockCapBank extends BlockEio implements IGuiHandler, IAdvancedTool if(!(te instanceof TileCapBank)) { return false; } - - if(ToolUtil.breakBlockWithTool(this, world, x, y, z, entityPlayer)) { - return true; - } - + TileCapBank tcb = (TileCapBank) te; ForgeDirection faceHit = ForgeDirection.getOrientation(side); @@ -170,11 +166,7 @@ public class BlockCapBank extends BlockEio implements IGuiHandler, IAdvancedTool return true; } - if(entityPlayer.isSneaking()) { - return false; - } - - if(ToolUtil.isToolEquipped(entityPlayer)) { + if(!entityPlayer.isSneaking() && ToolUtil.isToolEquipped(entityPlayer)) { IoMode ioMode = tcb.getIoMode(faceHit); if(faceHit.offsetY == 0) { @@ -201,6 +193,16 @@ public class BlockCapBank extends BlockEio implements IGuiHandler, IAdvancedTool return true; } + return super.onBlockActivated(world, x, y, z, entityPlayer, side, par7, par8, par9); + } + + @Override + public boolean doNormalDrops(World world, int x, int y, int z) { + return false; + } + + @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_CAP_BANK, world, x, y, z); } @@ -433,31 +435,15 @@ public class BlockCapBank extends BlockEio implements IGuiHandler, IAdvancedTool } @Override - public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z) { + public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean doHarvest) { if(!world.isRemote && (!player.capabilities.isCreativeMode)) { TileEntity te = world.getTileEntity(x, y, z); if(te instanceof TileCapBank) { TileCapBank cb = (TileCapBank) te; cb.moveInventoryToNetwork(); - - ItemStack itemStack = createItemStack(world, x, y, z, cb); - - //Clear in the inventory as its now in the item stack - for (int i = 0; i < cb.getInventory().length; i++) { - cb.getInventory()[i] = null; - } - - float f = 0.7F; - double d0 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; - double d1 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; - double d2 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; - EntityItem entityitem = new EntityItem(world, x + d0, y + d1, z + d2, itemStack); - entityitem.delayBeforeCanPickup = 10; - - world.spawnEntityInWorld(entityitem); } } - return super.removedByPlayer(world, player, x, y, z); + return super.removedByPlayer(world, player, x, y, z, doHarvest); } protected ItemStack createItemStack(World world, int x, int y, int z, TileCapBank cb) { diff --git a/src/main/java/crazypants/enderio/machine/enchanter/BlockEnchanter.java b/src/main/java/crazypants/enderio/machine/enchanter/BlockEnchanter.java index 832396a6..0afe6dd3 100644 --- a/src/main/java/crazypants/enderio/machine/enchanter/BlockEnchanter.java +++ b/src/main/java/crazypants/enderio/machine/enchanter/BlockEnchanter.java @@ -69,21 +69,9 @@ public class BlockEnchanter extends BlockEio implements IGuiHandler, IResourceTo } world.markBlockForUpdate(x, y, z); } - + @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityPlayer, int side, float par7, float par8, float par9) { - - ITool tool = ToolUtil.getEquippedTool(entityPlayer); - if(tool != null) { - if(entityPlayer.isSneaking() && tool.canUse(entityPlayer.getCurrentEquippedItem(), entityPlayer, x, y, z)) { - removedByPlayer(world, entityPlayer, x, y, z, false); - tool.used(entityPlayer.getCurrentEquippedItem(), entityPlayer, x, y, z); - return true; - } - } - if(entityPlayer.isSneaking()) { - return false; - } + 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_ENCHANTER, world, x, y, z); } @@ -99,7 +87,7 @@ public class BlockEnchanter extends BlockEio implements IGuiHandler, IResourceTo super.breakBlock(world, x, y, z, block, meta); } - protected boolean doNormalDrops(World world, int x, int y, int z) { + public boolean doNormalDrops(World world, int x, int y, int z) { return false; } diff --git a/src/main/java/crazypants/enderio/machine/gui/AbstractMachineContainer.java b/src/main/java/crazypants/enderio/machine/gui/AbstractMachineContainer.java index 513caf29..f7acb65b 100644 --- a/src/main/java/crazypants/enderio/machine/gui/AbstractMachineContainer.java +++ b/src/main/java/crazypants/enderio/machine/gui/AbstractMachineContainer.java @@ -63,8 +63,6 @@ public abstract class AbstractMachineContainer extends Container { addSlotToContainer(slot); playerSlotLocations.put(slot, loc); } - - } @Override diff --git a/src/main/java/crazypants/enderio/machine/hypercube/BlockHyperCube.java b/src/main/java/crazypants/enderio/machine/hypercube/BlockHyperCube.java index 4e63f0b5..c9daeda3 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/BlockHyperCube.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/BlockHyperCube.java @@ -255,17 +255,7 @@ public class BlockHyperCube extends BlockEio implements IGuiHandler, IResourceTo } @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityPlayer, int par6, float par7, float par8, float par9) { - if(ToolUtil.breakBlockWithTool(this, world, x, y, z, entityPlayer)) { - return true; - } - if(entityPlayer.isSneaking()) { - return false; - } - TileEntity te = world.getTileEntity(x, y, z); - if(!(te instanceof TileHyperCube)) { - return false; - } + 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_HYPER_CUBE, world, x, y, z); } diff --git a/src/main/java/crazypants/enderio/machine/light/BlockElectricLight.java b/src/main/java/crazypants/enderio/machine/light/BlockElectricLight.java index ba3cda9b..37ad51ea 100644 --- a/src/main/java/crazypants/enderio/machine/light/BlockElectricLight.java +++ b/src/main/java/crazypants/enderio/machine/light/BlockElectricLight.java @@ -175,30 +175,6 @@ public class BlockElectricLight extends BlockEio implements IRedstoneConnectable ((TileElectricLight) te).onNeighborBlockChange(blockID); } } - - @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { - ItemStack stack = player.getCurrentEquippedItem(); - if(stack == null) { - return false; - } - ITool tool = ToolUtil.getEquippedTool(player); - if(tool != null && tool.canUse(stack, player, x, y, z) && player.isSneaking() && !world.isRemote) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileElectricLight) { - ((TileElectricLight) te).onBlockRemoved(); - world.setBlockToAir(x, y, z); - if(!player.capabilities.isCreativeMode) { - ItemStack drop = new ItemStack(this); - processDrop(world, x, y, z, (TileEntityEio) te, drop); - dropBlockAsItem(world, x, y, z, drop); - } - tool.used(stack, player, x, y, z); - } - return true; - } - return false; - } @Override public void breakBlock(World world, int x, int y, int z, Block par5, int par6) { @@ -211,6 +187,9 @@ public class BlockElectricLight extends BlockEio implements IRedstoneConnectable @Override protected void processDrop(World world, int x, int y, int z, TileEntityEio te, ItemStack drop) { TileElectricLight light = (TileElectricLight) te; + if(light == null) { + return; + } int meta = light.isInvereted() ? 1 : 0; if(!light.isRequiresPower()) { meta += 2; diff --git a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedGlowstone.java b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedGlowstone.java index 951529bf..b741730c 100644 --- a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedGlowstone.java +++ b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedGlowstone.java @@ -212,8 +212,10 @@ public class BlockPaintedGlowstone extends BlockEio implements ITileEntityProvid @Override protected void processDrop(World world, int x, int y, int z, TileEntityEio te, ItemStack drop) { TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; - ItemStack itemStack = createItemStackForSourceBlock(tef.getSourceBlock(), tef.getSourceBlockMetadata()); - drop.stackTagCompound = (NBTTagCompound) itemStack.stackTagCompound.copy(); + if(tef != null) { + ItemStack itemStack = createItemStackForSourceBlock(tef.getSourceBlock(), tef.getSourceBlockMetadata()); + drop.stackTagCompound = (NBTTagCompound) itemStack.stackTagCompound.copy(); + } } @Override diff --git a/src/main/java/crazypants/enderio/machine/power/BlockCapacitorBank.java b/src/main/java/crazypants/enderio/machine/power/BlockCapacitorBank.java index e7a268eb..7160e067 100644 --- a/src/main/java/crazypants/enderio/machine/power/BlockCapacitorBank.java +++ b/src/main/java/crazypants/enderio/machine/power/BlockCapacitorBank.java @@ -119,13 +119,6 @@ public class BlockCapacitorBank extends BlockEio implements IGuiHandler, IAdvanc @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityPlayer, int side, float par7, float par8, float par9) { - if(ToolUtil.breakBlockWithTool(this, world, x, y, z, entityPlayer)) { - return true; - } - - if(entityPlayer.isSneaking()) { - return false; - } TileEntity te = world.getTileEntity(x, y, z); if(!(te instanceof TileCapacitorBank)) { return false; @@ -145,7 +138,12 @@ public class BlockCapacitorBank extends BlockEio implements IGuiHandler, IAdvanc 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); } diff --git a/src/main/java/crazypants/enderio/machine/reservoir/BlockReservoir.java b/src/main/java/crazypants/enderio/machine/reservoir/BlockReservoir.java index 8c0599da..445a6087 100644 --- a/src/main/java/crazypants/enderio/machine/reservoir/BlockReservoir.java +++ b/src/main/java/crazypants/enderio/machine/reservoir/BlockReservoir.java @@ -1,7 +1,6 @@ package crazypants.enderio.machine.reservoir; import net.minecraft.block.Block; -import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; @@ -16,10 +15,9 @@ import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; -import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import crazypants.enderio.EnderIOTab; +import crazypants.enderio.BlockEio; import crazypants.enderio.ModObject; import crazypants.enderio.gui.IResourceTooltipProvider; import crazypants.enderio.machine.reservoir.TileReservoir.Pos; @@ -29,7 +27,7 @@ import crazypants.util.FluidUtil; import crazypants.util.Util; import crazypants.vecmath.Vector3d; -public class BlockReservoir extends BlockContainer implements IResourceTooltipProvider { +public class BlockReservoir extends BlockEio implements IResourceTooltipProvider { public static BlockReservoir create() { BlockReservoir result = new BlockReservoir(); @@ -59,21 +57,8 @@ public class BlockReservoir extends BlockContainer implements IResourceTooltipPr IIcon switchIcon; private BlockReservoir() { - super(Material.rock); - setHardness(0.5F); + super(ModObject.blockReservoir.unlocalisedName, TileReservoir.class, Material.rock); setStepSound(Block.soundTypeStone); - setBlockName(ModObject.blockReservoir.unlocalisedName); - setCreativeTab(EnderIOTab.tabEnderIO); - } - - @Override - public TileEntity createNewTileEntity(World var1, int var2) { - return new TileReservoir(); - } - - private void init() { - GameRegistry.registerBlock(this, ModObject.blockReservoir.unlocalisedName); - GameRegistry.registerTileEntity(TileReservoir.class, ModObject.blockReservoir.unlocalisedName + "TileEntity"); } @Override @@ -136,8 +121,7 @@ public class BlockReservoir extends BlockContainer implements IResourceTooltipPr } } - return false; - + return super.onBlockActivated(world, x, y, z, entityPlayer, par6, par7, par8, par9); } @Override diff --git a/src/main/java/crazypants/enderio/machine/solar/BlockSolarPanel.java b/src/main/java/crazypants/enderio/machine/solar/BlockSolarPanel.java index bea73b77..d33ef44b 100644 --- a/src/main/java/crazypants/enderio/machine/solar/BlockSolarPanel.java +++ b/src/main/java/crazypants/enderio/machine/solar/BlockSolarPanel.java @@ -77,22 +77,6 @@ public class BlockSolarPanel extends BlockEio implements IResourceTooltipProvide return false; } - @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityPlayer, int par6, float par7, float par8, float par9) { - ITool tool = ToolUtil.getEquippedTool(entityPlayer); - if(tool != null && entityPlayer.isSneaking() && tool.canUse(entityPlayer.getCurrentEquippedItem(), entityPlayer, x, y, z)) { - if(!world.isRemote && !entityPlayer.capabilities.isCreativeMode) { - int meta = world.getBlockMetadata(x, y, z); - ItemStack is = new ItemStack(this, 1, meta); - Util.dropItems(world, is, x, y, z, true); - } - removedByPlayer(world, entityPlayer, x, y, z, true); - tool.used(entityPlayer.getCurrentEquippedItem(), entityPlayer, x, y, z); - return true; - } - return false; - } - @Override public IIcon getIcon(int side, int meta) { if(side == ForgeDirection.UP.ordinal()) { diff --git a/src/main/java/crazypants/enderio/machine/tank/BlockTank.java b/src/main/java/crazypants/enderio/machine/tank/BlockTank.java index bb55ff17..701d32e9 100644 --- a/src/main/java/crazypants/enderio/machine/tank/BlockTank.java +++ b/src/main/java/crazypants/enderio/machine/tank/BlockTank.java @@ -3,8 +3,10 @@ package crazypants.enderio.machine.tank; import java.util.List; import net.minecraft.block.Block; +import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -13,7 +15,6 @@ import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; import net.minecraftforge.fluids.FluidStack; @@ -46,16 +47,14 @@ public class BlockTank extends AbstractMachineBlock implements IAdvanc protected BlockTank() { super(ModObject.blockTank, TileTank.class); setStepSound(Block.soundTypeGlass); + setLightOpacity(0); } - + @Override protected void init() { - GameRegistry.registerBlock(this, BlockItemTank.class, ModObject.blockTank.unlocalisedName); - if(teClass != null) { - GameRegistry.registerTileEntity(teClass, ModObject.blockTank.unlocalisedName + "TileEntity"); - } - EnderIO.guiHandler.registerGuiHandler(GuiHandler.GUI_ID_TANK, this); - setLightOpacity(0); + GameRegistry.registerBlock(this, BlockItemTank.class, modObject.unlocalisedName); + GameRegistry.registerTileEntity(teClass, modObject.unlocalisedName + "TileEntity"); + EnderIO.guiHandler.registerGuiHandler(getGuiId(), this); } @Override @@ -63,6 +62,18 @@ public class BlockTank extends AbstractMachineBlock implements IAdvanc return par1; } + @SuppressWarnings({ "unchecked", "rawtypes" }) + @Override + public void getSubBlocks(Item item, CreativeTabs p_149666_2_, List list) { + list.add(new ItemStack(this, 1, 0)); + list.add(new ItemStack(this, 1, 1)); + } + + @Override + public TileEntity createTileEntity(World world, int metadata) { + return new TileTank(metadata); + } + @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityPlayer, int par6, float par7, float par8, float par9) { diff --git a/src/main/java/crazypants/enderio/machine/tank/TileTank.java b/src/main/java/crazypants/enderio/machine/tank/TileTank.java index 1d5c03c9..72fd11d9 100644 --- a/src/main/java/crazypants/enderio/machine/tank/TileTank.java +++ b/src/main/java/crazypants/enderio/machine/tank/TileTank.java @@ -37,7 +37,7 @@ public class TileTank extends AbstractMachineEntity implements IFluidHandler { } public TileTank() { - super(new SlotDefinition(0, 1, 2, 3, -1, -1)); + this(0); } @Override diff --git a/src/main/java/crazypants/enderio/machine/vacuum/BlockVacuumChest.java b/src/main/java/crazypants/enderio/machine/vacuum/BlockVacuumChest.java index 8cc3055a..8f27803c 100644 --- a/src/main/java/crazypants/enderio/machine/vacuum/BlockVacuumChest.java +++ b/src/main/java/crazypants/enderio/machine/vacuum/BlockVacuumChest.java @@ -37,29 +37,23 @@ public class BlockVacuumChest extends BlockEio implements IGuiHandler, IResource } @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityPlayer, int side, float par7, float par8, float par9) { - - if(ToolUtil.breakBlockWithTool(this, world, x, y, z, entityPlayer)) { - return true; - } - if(entityPlayer.isSneaking()) { - return false; - } + 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_VACUUM_CHEST, world, x, y, z); - } - return true; + } return super.openGui(world, x, y, z, entityPlayer, side); } @Override - protected boolean doNormalDrops(World world, int x, int y, int z) { + 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, TileEntityEio te, ItemStack drop) { drop.stackTagCompound = new NBTTagCompound(); - ((TileVacuumChest) te).writeContentsToNBT(drop.stackTagCompound); + if(te != null) { + ((TileVacuumChest) te).writeContentsToNBT(drop.stackTagCompound); + } } @Override diff --git a/src/main/java/crazypants/enderio/machine/wireless/BlockWirelessCharger.java b/src/main/java/crazypants/enderio/machine/wireless/BlockWirelessCharger.java index e5f7e83e..0b2feb8a 100644 --- a/src/main/java/crazypants/enderio/machine/wireless/BlockWirelessCharger.java +++ b/src/main/java/crazypants/enderio/machine/wireless/BlockWirelessCharger.java @@ -38,21 +38,6 @@ public class BlockWirelessCharger extends BlockEio implements IResourceTooltipPr setLightOpacity(1); } - @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityPlayer, int side, float par7, float par8, float par9) { - ITool tool = ToolUtil.getEquippedTool(entityPlayer); - if(tool != null && entityPlayer.isSneaking() && tool.canUse(entityPlayer.getCurrentEquippedItem(), entityPlayer, x, y, z)) { - if(!world.isRemote) { - Util.dropItems(world, new ItemStack(this), x, y, z, true); - } - breakBlock(world, x, y, z, this, 0); - world.setBlockToAir(x, y, z); - tool.used(entityPlayer.getCurrentEquippedItem(), entityPlayer, x, y, z); - return true; - } - return false; - } - @Override public void registerBlockIcons(IIconRegister iIconRegister) { centerOn = iIconRegister.registerIcon("enderio:blockWirelessChargerOn"); diff --git a/src/main/java/crazypants/enderio/material/BlockFusedQuartz.java b/src/main/java/crazypants/enderio/material/BlockFusedQuartz.java index 0091d5eb..1ba10d08 100644 --- a/src/main/java/crazypants/enderio/material/BlockFusedQuartz.java +++ b/src/main/java/crazypants/enderio/material/BlockFusedQuartz.java @@ -8,6 +8,7 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -36,7 +37,8 @@ public class BlockFusedQuartz extends BlockEio { FUSED_QUARTZ("fusedQuartz", "enderio:fusedQuartz", "enderio:fusedQuartzFrame", "enderio:fusedQuartzItem"), GLASS("fusedGlass", "enderio:fusedGlass", Config.clearGlassSameTexture ? "enderio:fusedQuartzFrame" : "enderio:fusedGlassFrame", "enderio:fusedGlassItem"), ENLIGHTENED_FUSED_QUARTZ("enlightenedFusedQuartz", "enderio:fusedQuartz", "enderio:fusedQuartzFrame", "enderio:fusedQuartzItem"), - ENLIGHTENED_GLASS("enlightenedFusedGlass", "enderio:fusedGlass", Config.clearGlassSameTexture ? "enderio:fusedQuartzFrame" : "enderio:fusedGlassFrame", "enderio:fusedGlassItem"); + ENLIGHTENED_GLASS("enlightenedFusedGlass", "enderio:fusedGlass", Config.clearGlassSameTexture ? "enderio:fusedQuartzFrame" : "enderio:fusedGlassFrame", + "enderio:fusedGlassItem"); final String unlocalisedName; final String blockIcon; @@ -49,13 +51,13 @@ public class BlockFusedQuartz extends BlockEio { this.blockIcon = blockIcon; this.itemIcon = itemIcon; } - + public boolean connectTo(int otherMeta) { - if (otherMeta == ordinal() || Config.clearGlassConnectToFusedQuartz) { + if(otherMeta == ordinal() || Config.clearGlassConnectToFusedQuartz) { return true; } - - switch(this) { + + switch (this) { case FUSED_QUARTZ: return otherMeta == ENLIGHTENED_FUSED_QUARTZ.ordinal(); case ENLIGHTENED_FUSED_QUARTZ: @@ -65,7 +67,7 @@ public class BlockFusedQuartz extends BlockEio { case ENLIGHTENED_GLASS: return otherMeta == GLASS.ordinal(); } - + return false; } } @@ -180,13 +182,13 @@ public class BlockFusedQuartz extends BlockEio { } @Override - public boolean isSideSolid(IBlockAccess world, int x, int y, int z, ForgeDirection side) { + public boolean isSideSolid(IBlockAccess world, int x, int y, int z, ForgeDirection side) { if(side == ForgeDirection.UP) { //stop drips - return false; + return false; } - return true; + return true; } - + @Override public boolean canPlaceTorchOnTop(World arg0, int arg1, int arg2, int arg3) { return true; @@ -225,33 +227,9 @@ public class BlockFusedQuartz extends BlockEio { return frameIcons[meta]; } - /** - * Remove the tile entity too. - */ @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 TileEntityPaintedBlock) { - TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te; - - ItemStack itemStack = createItemStackForSourceBlock(world.getBlockMetadata(x, y, z), tef.getSourceBlock(), tef.getSourceBlockMetadata()); - if(itemStack != null) { - float f = 0.7F; - double d0 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; - double d1 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; - double d2 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D; - EntityItem entityitem = new EntityItem(world, x + d0, y + d1, z + d2, itemStack); - entityitem.delayBeforeCanPickup = 10; - world.spawnEntityInWorld(entityitem); - } - } - - } - - super.breakBlock(world, x, y, z, par5, par6); + protected boolean shouldWrench(World world, int x, int y, int z, EntityPlayer entityPlayer, int side) { + return false; } private ItemStack createItemStackForSourceBlock(int quartzBlockMeta, Block sourceBlock, int sourceBlockMetadata) { diff --git a/src/main/java/crazypants/enderio/material/BlockIngotStorage.java b/src/main/java/crazypants/enderio/material/BlockIngotStorage.java index 16d24db6..ede7ad1c 100644 --- a/src/main/java/crazypants/enderio/material/BlockIngotStorage.java +++ b/src/main/java/crazypants/enderio/material/BlockIngotStorage.java @@ -80,6 +80,11 @@ public class BlockIngotStorage extends BlockEio implements IAdvancedTooltipProvi public boolean isBeaconBase(IBlockAccess worldObj, int x, int y, int z, int beaconX, int beaconY, int beaconZ) { return true; } + + @Override + protected boolean shouldWrench(World world, int x, int y, int z, EntityPlayer entityPlayer, int side) { + return false; + } @Override public void addCommonEntries(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { diff --git a/src/main/java/crazypants/enderio/teleport/BlockTravelAnchor.java b/src/main/java/crazypants/enderio/teleport/BlockTravelAnchor.java index 313d3d65..95bc2559 100644 --- a/src/main/java/crazypants/enderio/teleport/BlockTravelAnchor.java +++ b/src/main/java/crazypants/enderio/teleport/BlockTravelAnchor.java @@ -116,28 +116,22 @@ public class BlockTravelAnchor extends BlockEio implements IGuiHandler, ITileEnt } } } - + @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityPlayer, int par6, float par7, float par8, float par9) { - if(entityPlayer.isSneaking()) { - return false; - } + public boolean openGui(World world, int x, int y, int z, EntityPlayer entityPlayer, int side) { TileEntity te = world.getTileEntity(x, y, z); if(te instanceof ITravelAccessable) { ITravelAccessable ta = (ITravelAccessable) te; if(ta.canUiBeAccessed(entityPlayer)) { - if(!world.isRemote) { - entityPlayer.openGui(EnderIO.instance, GuiHandler.GUI_ID_TRAVEL_ACCESSABLE, world, x, y, z); - } + entityPlayer.openGui(EnderIO.instance, GuiHandler.GUI_ID_TRAVEL_ACCESSABLE, world, x, y, z); } else { - if(world.isRemote) { + if(world.isRemote && !entityPlayer.isSneaking()) { entityPlayer.addChatComponentMessage(new ChatComponentText(Lang.localize("gui.travelAccessable.privateBlock1") + " " + ta.getPlacedBy() + " " + Lang.localize("gui.travelAccessable.privateBlock2"))); } } - return true; } - return false; + return true; } @Override @@ -170,6 +164,10 @@ public class BlockTravelAnchor extends BlockEio implements IGuiHandler, ITileEnt protected void processDrop(World world, int x, int y, int z, TileEntityEio te, ItemStack drop) { TileTravelAnchor anchor = (TileTravelAnchor) te; + if(anchor == null) { + return; + } + ItemStack itemStack = new ItemStack(this); Block srcBlk = anchor.getSourceBlock(); if(srcBlk != null) { @@ -179,7 +177,7 @@ public class BlockTravelAnchor extends BlockEio implements IGuiHandler, ITileEnt } @Override - protected boolean doNormalDrops(World world, int x, int y, int z) { + public boolean doNormalDrops(World world, int x, int y, int z) { return false; } diff --git a/src/main/java/crazypants/enderio/tool/ToolUtil.java b/src/main/java/crazypants/enderio/tool/ToolUtil.java index fca4871d..ce262cd1 100644 --- a/src/main/java/crazypants/enderio/tool/ToolUtil.java +++ b/src/main/java/crazypants/enderio/tool/ToolUtil.java @@ -13,8 +13,10 @@ import net.minecraft.world.World; import net.sf.cglib.proxy.Enhancer; import net.sf.cglib.proxy.MethodInterceptor; import net.sf.cglib.proxy.MethodProxy; +import crazypants.enderio.BlockEio; import crazypants.enderio.EnderIO; import crazypants.enderio.Log; +import crazypants.enderio.TileEntityEio; import crazypants.enderio.api.tool.ITool; import crazypants.enderio.item.ItemYetaWrench; @@ -35,6 +37,11 @@ public class ToolUtil { public static boolean breakBlockWithTool(Block block, World world, int x, int y, int z, EntityPlayer entityPlayer) { ITool tool = ToolUtil.getEquippedTool(entityPlayer); if(tool != null && entityPlayer.isSneaking() && tool.canUse(entityPlayer.getCurrentEquippedItem(), entityPlayer, x, y, z)) { + if(entityPlayer.capabilities.isCreativeMode && block instanceof BlockEio) { + ((BlockEio) block).dropAsItem(world, x, y, z, (TileEntityEio) world.getTileEntity(x, y, z)); + } else if(!(block instanceof BlockEio) || ((BlockEio) block).doNormalDrops(world, x, y, z)) { + block.dropBlockAsItem(world, x, y, z, world.getBlockMetadata(x, y, z), 0); + } block.removedByPlayer(world, entityPlayer, x, y, z, true); tool.used(entityPlayer.getCurrentEquippedItem(), entityPlayer, x, y, z); return true; From 10af591ceeea80b992bc590c975c0363697098b0 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Wed, 4 Feb 2015 12:25:38 -0500 Subject: [PATCH 60/79] Fix capacitor banks not saving to itemstacks --- .../enderio/machine/capbank/BlockCapBank.java | 39 ++++++------------- 1 file changed, 11 insertions(+), 28 deletions(-) diff --git a/src/main/java/crazypants/enderio/machine/capbank/BlockCapBank.java b/src/main/java/crazypants/enderio/machine/capbank/BlockCapBank.java index 85deb851..e1ce8eb8 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/BlockCapBank.java +++ b/src/main/java/crazypants/enderio/machine/capbank/BlockCapBank.java @@ -1,6 +1,5 @@ package crazypants.enderio.machine.capbank; -import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.Random; @@ -9,7 +8,6 @@ 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.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -30,6 +28,7 @@ import crazypants.enderio.BlockEio; import crazypants.enderio.EnderIO; import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; +import crazypants.enderio.TileEntityEio; import crazypants.enderio.api.redstone.IRedstoneConnectable; import crazypants.enderio.gui.IAdvancedTooltipProvider; import crazypants.enderio.gui.TooltipAddera; @@ -151,7 +150,7 @@ public class BlockCapBank extends BlockEio implements IGuiHandler, IAdvancedTool if(!(te instanceof TileCapBank)) { return false; } - + TileCapBank tcb = (TileCapBank) te; ForgeDirection faceHit = ForgeDirection.getOrientation(side); @@ -195,7 +194,7 @@ public class BlockCapBank extends BlockEio implements IGuiHandler, IAdvancedTool return super.onBlockActivated(world, x, y, z, entityPlayer, side, par7, par8, par9); } - + @Override public boolean doNormalDrops(World world, int x, int y, int z) { return false; @@ -421,19 +420,6 @@ public class BlockCapBank extends BlockEio implements IGuiHandler, IAdvancedTool } } - @Override - public ArrayList getDrops(World world, int x, int y, int z, int metadata, int fortune) { - ArrayList ret = new ArrayList(); - if(!world.isRemote) { - TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileCapBank) { - TileCapBank cb = (TileCapBank) te; - ret.add(createItemStack(world, x, y, z, cb)); - } - } - return ret; - } - @Override public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean doHarvest) { if(!world.isRemote && (!player.capabilities.isCreativeMode)) { @@ -446,12 +432,12 @@ public class BlockCapBank extends BlockEio implements IGuiHandler, IAdvancedTool return super.removedByPlayer(world, player, x, y, z, doHarvest); } - protected ItemStack createItemStack(World world, int x, int y, int z, TileCapBank cb) { - int meta = damageDropped(world.getBlockMetadata(x, y, z)); - ItemStack itemStack = new ItemStack(this, 1, meta); - itemStack.stackTagCompound = new NBTTagCompound(); - cb.writeCommonNBT(itemStack.stackTagCompound); - return itemStack; + @Override + protected void processDrop(World world, int x, int y, int z, TileEntityEio te, ItemStack drop) { + drop.stackTagCompound = new NBTTagCompound(); + if(te != null) { + ((TileCapBank) te).writeCommonNBT(drop.stackTagCompound); + } } @Override @@ -459,15 +445,12 @@ public class BlockCapBank extends BlockEio implements IGuiHandler, IAdvancedTool if(!world.isRemote) { TileEntity te = world.getTileEntity(x, y, z); if(!(te instanceof TileCapBank)) { - super.breakBlock(world, x, y, z, par5, par6); return; } TileCapBank cb = (TileCapBank) te; cb.onBreakBlock(); - if(world.getGameRules().getGameRuleBooleanValue("doTileDrops")) { - Util.dropItems(world, cb.getInventory(), x, y, z, true); - } } + super.breakBlock(world, x, y, z, par5, par6); } @Override @@ -562,7 +545,7 @@ public class BlockCapBank extends BlockEio implements IGuiHandler, IAdvancedTool } /* IRedstoneConnectable */ - + @Override public boolean shouldRedstoneConduitConnect(World world, int x, int y, int z, ForgeDirection from) { return true; From 3c4c153ad3365b6814e8500605dbd56501a6f725 Mon Sep 17 00:00:00 2001 From: Matthias Mann Date: Wed, 4 Feb 2015 20:08:58 +0100 Subject: [PATCH 61/79] let the wireless charger keep it's stored energy when picked up --- .../wireless/BlockWirelessCharger.java | 32 ++++++++++++++++--- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/src/main/java/crazypants/enderio/machine/wireless/BlockWirelessCharger.java b/src/main/java/crazypants/enderio/machine/wireless/BlockWirelessCharger.java index 0b2feb8a..b6daa47b 100644 --- a/src/main/java/crazypants/enderio/machine/wireless/BlockWirelessCharger.java +++ b/src/main/java/crazypants/enderio/machine/wireless/BlockWirelessCharger.java @@ -1,8 +1,9 @@ package crazypants.enderio.machine.wireless; import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; @@ -11,11 +12,9 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.BlockEio; import crazypants.enderio.ModObject; -import crazypants.enderio.api.tool.ITool; +import crazypants.enderio.TileEntityEio; import crazypants.enderio.gui.IResourceTooltipProvider; import crazypants.enderio.network.PacketHandler; -import crazypants.enderio.tool.ToolUtil; -import crazypants.util.Util; public class BlockWirelessCharger extends BlockEio implements IResourceTooltipProvider /* IGuiHandler */{ @@ -104,4 +103,29 @@ public class BlockWirelessCharger extends BlockEio implements IResourceTooltipPr return getUnlocalizedName(); } + @Override + public boolean doNormalDrops(World world, int x, int y, int z) { + return false; + } + + @Override + public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack) { + super.onBlockPlacedBy(world, x, y, z, player, stack); + + if(stack.stackTagCompound != null) { + TileEntity te = world.getTileEntity(x, y, z); + if(te instanceof TileWirelessCharger) { + ((TileWirelessCharger) te).readCustomNBT(stack.stackTagCompound); + } + } + } + + @Override + protected void processDrop(World world, int x, int y, int z, TileEntityEio te, ItemStack drop) { + drop.stackTagCompound = new NBTTagCompound(); + if(te instanceof TileWirelessCharger) { + ((TileWirelessCharger) te).writeCustomNBT(drop.stackTagCompound); + } + } + } From 8bd0310e96bd1ac37afb135899c93202efbc7fa6 Mon Sep 17 00:00:00 2001 From: Matthias Mann Date: Wed, 4 Feb 2015 23:04:18 +0100 Subject: [PATCH 62/79] hide NEI items under EIO GUI tabs --- .../conduit/gui/GuiExternalConnection.java | 24 +++++++++-- .../transceiver/gui/GuiTransceiver.java | 19 ++++++++- .../java/crazypants/gui/GuiContainerBase.java | 41 ++++++++++++++++++- 3 files changed, 79 insertions(+), 5 deletions(-) diff --git a/src/main/java/crazypants/enderio/conduit/gui/GuiExternalConnection.java b/src/main/java/crazypants/enderio/conduit/gui/GuiExternalConnection.java index 441bba53..adc85141 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/GuiExternalConnection.java +++ b/src/main/java/crazypants/enderio/conduit/gui/GuiExternalConnection.java @@ -8,6 +8,7 @@ import java.util.List; import java.util.Map; import net.minecraft.client.gui.GuiButton; +import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.Tessellator; import net.minecraft.entity.player.InventoryPlayer; import net.minecraftforge.common.util.ForgeDirection; @@ -27,6 +28,8 @@ import crazypants.enderio.gui.IconEIO; import crazypants.gui.GuiContainerBase; import crazypants.render.RenderUtil; +import cpw.mods.fml.common.Optional; + public class GuiExternalConnection extends GuiContainerBase { private static final int TAB_HEIGHT = 24; @@ -69,9 +72,9 @@ public class GuiExternalConnection extends GuiContainerBase { ySize = 166 + 29; xSize = 206; - getContainer().setInputSlotsVisible(false); - getContainer().setOutputSlotsVisible(false); - getContainer().setInventorySlotsVisible(false); + container.setInputSlotsVisible(false); + container.setOutputSlotsVisible(false); + container.setInventorySlotsVisible(false); List cons = new ArrayList(bundle.getConduits()); Collections.sort(cons, new Comparator() { @@ -94,6 +97,7 @@ public class GuiExternalConnection extends GuiContainerBase { for (IConduit con : cons) { if(con.containsExternalConnection(dir) || con.canConnectToExternal(dir, true)) { + @SuppressWarnings("LeakingThisInConstructor") ITabPanel tab = TabFactory.instance.createPanelForConduit(this, con); if(tab != null) { conduits.add(con); @@ -205,4 +209,18 @@ public class GuiExternalConnection extends GuiContainerBase { return container; } + @Override + @Optional.Method(modid = "NotEnoughItems") + public boolean hideItemPanelSlot(GuiContainer gc, int x, int y, int w, int h) { + if(tabs.size() > 0) { + int sx = (width - xSize) / 2; + int sy = (height - ySize) / 2; + int tabX = sx + xSize - 3; + int tabY = sy + tabYOffset; + + return (x+w) >= tabX && x < (tabX + 14) && (y+h) >= tabY && y < (tabY + tabs.size()*TAB_HEIGHT); + } + return false; + } + } diff --git a/src/main/java/crazypants/enderio/machine/transceiver/gui/GuiTransceiver.java b/src/main/java/crazypants/enderio/machine/transceiver/gui/GuiTransceiver.java index 6925b247..36bbae23 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/gui/GuiTransceiver.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/gui/GuiTransceiver.java @@ -4,11 +4,14 @@ import java.util.ArrayList; import java.util.List; import net.minecraft.client.gui.GuiButton; +import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.Tessellator; import net.minecraft.entity.player.InventoryPlayer; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.common.Optional; + import crazypants.enderio.config.Config; import crazypants.enderio.gui.IGuiOverlay; import crazypants.enderio.gui.ITabPanel; @@ -24,7 +27,7 @@ public class GuiTransceiver extends GuiPoweredMachineBase { private int activeTab = 0; private final List tabs = new ArrayList(); - private int tabYOffset = 4; + private final int tabYOffset = 4; GeneralTab generalTab; public GuiTransceiver(InventoryPlayer par1InventoryPlayer, TileTransceiver te) { @@ -233,4 +236,18 @@ public class GuiTransceiver extends GuiPoweredMachineBase { public ContainerTransceiver getContainer() { return (ContainerTransceiver) inventorySlots; } + + @Override + @Optional.Method(modid = "NotEnoughItems") + public boolean hideItemPanelSlot(GuiContainer gc, int x, int y, int w, int h) { + if(tabs.size() > 0) { + int sx = (width - xSize) / 2; + int sy = (height - ySize) / 2; + int tabX = sx + xSize - 3; + int tabY = sy + tabYOffset; + + return (x+w) >= tabX && x < (tabX + 14) && (y+h) >= tabY && y < (tabY + tabs.size()*TAB_HEIGHT); + } + return false; + } } diff --git a/src/main/java/crazypants/gui/GuiContainerBase.java b/src/main/java/crazypants/gui/GuiContainerBase.java index 982d8b8c..18626994 100644 --- a/src/main/java/crazypants/gui/GuiContainerBase.java +++ b/src/main/java/crazypants/gui/GuiContainerBase.java @@ -2,6 +2,7 @@ package crazypants.gui; import java.lang.reflect.Field; import java.util.ArrayList; +import java.util.Collections; import java.util.Iterator; import java.util.List; @@ -18,12 +19,21 @@ import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; +import cpw.mods.fml.common.Optional; import cpw.mods.fml.relauncher.ReflectionHelper; + +import codechicken.nei.VisiblityData; +import codechicken.nei.api.INEIGuiHandler; +import codechicken.nei.api.TaggedInventoryArea; + import crazypants.enderio.Log; import crazypants.enderio.gui.IGuiOverlay; import crazypants.gui.ToolTipManager.ToolTipRenderer; -public abstract class GuiContainerBase extends GuiContainer implements ToolTipRenderer, IGuiScreen { +@Optional.InterfaceList({ + @Optional.Interface(iface = "codechicken.nei.api.INEIGuiHandler", modid = "NotEnoughItems") +}) +public abstract class GuiContainerBase extends GuiContainer implements ToolTipRenderer, IGuiScreen, INEIGuiHandler { protected ToolTipManager ttMan = new ToolTipManager(); protected List overlays = new ArrayList(); @@ -330,4 +340,33 @@ public abstract class GuiContainerBase extends GuiContainer implements ToolTipRe actionPerformed(guiButton); } + @Override + @Optional.Method(modid = "NotEnoughItems") + public VisiblityData modifyVisiblity(GuiContainer gc, VisiblityData vd) { + return vd; + } + + @Override + @Optional.Method(modid = "NotEnoughItems") + public Iterable getItemSpawnSlots(GuiContainer gc, ItemStack is) { + return null; + } + + @Override + @Optional.Method(modid = "NotEnoughItems") + public List getInventoryAreas(GuiContainer gc) { + return Collections.emptyList(); + } + + @Override + @Optional.Method(modid = "NotEnoughItems") + public boolean handleDragNDrop(GuiContainer gc, int i, int i1, ItemStack is, int i2) { + return false; + } + + @Override + @Optional.Method(modid = "NotEnoughItems") + public boolean hideItemPanelSlot(GuiContainer gc, int x, int y, int w, int h) { + return false; + } } From 2d0fddc7da4ae6bfbf6855d3b09ef321707ce9e5 Mon Sep 17 00:00:00 2001 From: Mrkwtkr <1069894992@qq.com> Date: Thu, 5 Feb 2015 09:19:40 +0800 Subject: [PATCH 63/79] Update zh_CN.lang I need to learn more about how to squash, sorry for the new PR. :( --- resources/assets/enderio/lang/zh_CN.lang | 199 +++++++++++++++++++---- 1 file changed, 165 insertions(+), 34 deletions(-) diff --git a/resources/assets/enderio/lang/zh_CN.lang b/resources/assets/enderio/lang/zh_CN.lang index 6ea0dc99..0ad2fd5d 100644 --- a/resources/assets/enderio/lang/zh_CN.lang +++ b/resources/assets/enderio/lang/zh_CN.lang @@ -2,8 +2,11 @@ //Power enderio.power.rf=RF +enderio.power.tmb=t/mB enderio.power.tick=/t enderio.power.maxOutput=最大输出 +enderio.power.generates=产能 +enderio.power.generation_rate=速率 //Ender IO / Enderface tile.blockEnderIo.name=末影接口 @@ -18,10 +21,13 @@ item.enderio.itemEnderface.name=末影面板 enderio.blockConduitBundle=导管接口 enderio.blockConduitFacade=导管框架 item.enderio.itemConduitFacade.name=导管框架 -item.enderio.itemConduitFacade.tooltip.detailed.line1=可放入粉刷机粉刷 +item.enderio.itemConduitFacade.hardened.name=硬化导管框架 +enderio.item.itemConduitFacade.tooltip.notpainted=未喷涂 +item.enderio.itemConduitFacade.tooltip.detailed.line1=可放入喷涂机喷涂 item.enderio.itemConduitFacade.tooltip.detailed.line2=右击一个导管可放置 item.enderio.itemConduitFacade.tooltip.detailed.line3=当手里拿着一个扳手或者导管时 item.enderio.itemConduitFacade.tooltip.detailed.line4=导管框架隐藏 +item.enderio.itemConduitFacade.hardened.tooltip=硬化: 抵抗破坏以及爆炸 enderio.itemPowerConduit.name=能量导管 enderio.itemPowerConduitEnhanced.name=强化能量导管 @@ -32,10 +38,11 @@ enderio.itemRedstoneConduitSwitch.name=导管开关 enderio.itemRedstoneConduitInsulated.name=绝缘红石导管 enderio.itemLiquidConduit.name=液体导管 -enderio.itemLiquidConduitAdvanced.name=加压液体导管 +enderio.itemLiquidConduitAdvanced.name=高压液体导管 enderio.itemLiquidConduitEnder.name=末影液体导管 enderio.itemLiquidConduit.lockedType=液体种类锁定为 -enderio.itemLiquidConduit.unlockedType=液体种类解锁 +enderio.itemLiquidConduit.unlockedType=液体种类解锁 +enderio.itemLiquidConduit.lockedWaila=锁定为 enderio.itemLiquidConduit.tooltip.maxExtract=最大提取: enderio.itemLiquidConduit.tooltip.maxIo=最大流速: @@ -53,7 +60,6 @@ enderio.filterUpgradeBasic.name=基础物品过滤器 enderio.filterUpgradeAdvanced.name=高级物品过滤器 enderio.itemConduitFilterUpgrade=物品导管升级 - enderio.itemConduitFilterUpgrade.configured=已配置 enderio.itemConduitFilterUpgrade.clearConfigMethod=放到合成格里面清除 enderio.itemConduitFilterUpgrade.clearConfigWarning=这会清除所有存储的数据! @@ -62,18 +68,34 @@ item.itemExistingItemFilter.name=现有物品过滤器 item.itemExistingItemFilter.tooltip.basic.line1=给物品导管使用的升级 item.itemExistingItemFilter.tooltip.detailed.line1=筛选已在物品栏中 item.itemExistingItemFilter.tooltip.detailed.line2=的物品 +item.itemExistingItemFilter.tooltip.detailed.line3=潜行时右击一 +item.itemExistingItemFilter.tooltip.detailed.line4=容器来将其内 +item.itemExistingItemFilter.tooltip.detailed.line5=物品添入快照 + +enderio.item.itemExistingItemFilter.filterUpdated=新物品已添入快照 +enderio.item.itemExistingItemFilter.filterNotUpdated=快照已包含容器中的所有物品 item.itemModItemFilter.name=模组物品过滤器 item.itemModItemFilter.tooltip.basic.line1=给物品导管使用的升级 item.itemModItemFilter.tooltip.detailed.line1=只筛选一个或几个 item.itemModItemFilter.tooltip.detailed.line2=特定mod里的物品 +item.itemPowerItemFilter.name=充能物品过滤器 +item.itemPowerItemFilter.tooltip.basic.line1=物品导管的升级 +item.itemPowerItemFilter.tooltip.detailed.line1=根据存储的RF来 +item.itemPowerItemFilter.tooltip.detailed.line2=过滤可充能的物品 + item.itemExtractSpeedUpgrade.name=物品导管速度升级 item.itemExtractSpeedUpgrade.tooltip.basic.line1=给物品导管使用的升级 item.itemExtractSpeedUpgrade.tooltip.detailed.line1=每次提取 item.itemExtractSpeedUpgrade.tooltip.detailed.line2=速度增加4组 item.itemExtractSpeedUpgrade.tooltip.detailed.line3=最大升级数为15 +item.itemExtractSpeedDowngrade.name=物品导管速度降级 +item.itemExtractSpeedDowngrade.tooltip.basic.line1=给物品导管使用的降级 +item.itemExtractSpeedDowngrade.tooltip.detailed.line1=将每次提取的速度 +item.itemExtractSpeedDowngrade.tooltip.detailed.line2=减至1 + enderio.itemGasConduit.name=气体导管 enderio.itemGasConduit.tooltip.maxExtract=最大提取: @@ -81,6 +103,10 @@ enderio.itemGasConduit.tooltip.maxIo=最大IO: enderio.itemGasConduit.tooltip.detailed.line1=传送和通用机械兼容的气体 enderio.itemMEConduit.name=ME导管 +enderio.itemMEConduitDense.name=密集ME导管 + +//Entity +entity.witherSkeleton.name=凋零骷髅 //Materials enderio.itemMaterial.name=材料 @@ -115,7 +141,6 @@ fluid.eio.xpjuice=液态XP tile.fluid.eio.xpjuice.name=液态XP item.bucketXpjuice.name=桶装液态XP - enderio.fluid.millibucket.abr=mB enderio.fuel.tooltip.heading=燃料详情 @@ -125,7 +150,6 @@ coolant.tooltip.heading=冷却剂 enderio.fuel.tooltip.degreesPerBucket=deg per bucket enderio.gas.gasTick=Gas/t - //Materials enderio.itemMachinePart.name=机器零件 enderio.machineChassi.name=机器框架 @@ -183,6 +207,8 @@ enderio.powderGold.name=金粉 enderio.powderCopper.name=铜粉 enderio.powderTin.name=锡粉 enderio.powderEnder.name=末影珍珠粉 +enderio.powderObsidian.name=黑曜石粉 +enderio.ingotEnderiumBase.name=Enderium Base //Capacitors enderio.itemBasicCapacitor.name=电容 @@ -258,9 +284,23 @@ 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=电容库 +tile.blockCapBank.vibrant.name=谐振电容库 +tile.blockCapBank.tooltip.detailed.line1=多方块能量存储. +tile.blockCapBank.tooltip.detailed.line2=可以给使用RF能量的物品充能. +tile.blockCapBank.tooltip.detailed.line3=空手shift右击一面 +tile.blockCapBank.tooltip.detailed.line4=来改变显示的信息 +tile.blockCapBank.tooltipPrefix=包含 + enderio.capbank.maxIO=最大输入/输出 enderio.capbank.maxIn=最大输入 enderio.capbank.maxOut=最大输出 +enderio.capbank.change=I/O +enderio.capbank.iodisplay.stable=I/O +enderio.capbank.iodisplay.gain=In +enderio.capbank.iodisplay.loss=Out tile.blockWirelessCharger.name=无线充能器 tile.blockWirelessCharger.tooltip.detailed.line1=给附近玩家物品 @@ -296,6 +336,7 @@ enderio.trans.showChannels=<按下Shift显示频道> enderio.trans.power=能量 enderio.trans.item=物品 enderio.trans.fluid=流体 +enderio.trans.rail=轨道 enderio.trans.recieving=接收 enderio.trans.sending=发送 @@ -357,7 +398,7 @@ enderio.farm.note.noHoe=无锄头 enderio.farm.note.noPower=能量不足 tile.blockTank.name=流体箱 -tile.blockTank.advanced.name=加压流体箱 +tile.blockTank.advanced.name=高压流体箱 tile.blockTank.tooltip.detailed.line1=便携式流体箱 tile.blockTank.tooltip.detailed.line2=可用于清空或 tile.blockTank.tooltip.detailed.line3=注满液体容器 @@ -377,6 +418,7 @@ tile.blockVacuumChest.tooltip.detailed.line2=吸入其中 tile.blockPoweredSpawner.name=电动刷怪笼 tile.blockPoweredSpawner.tooltip.empty=空 +enderio.tile.blockPoweredSpawner.tooltip.none=无 tile.blockPoweredSpawner.empty.tooltip.detailed.line1=与破损的刷怪笼 tile.blockPoweredSpawner.empty.tooltip.detailed.line2=在铁砧里结合 tile.blockPoweredSpawner.tooltip.detailed.line1=提供能量 @@ -403,24 +445,27 @@ tile.blockSpawnGuard.tooltip.detailed.line1=在它的工作范围 tile.blockSpawnGuard.tooltip.detailed.line2=阻止生物的刷出 tile.blockExperienceObelisk.name=经验交换装置 -tile.blockExperienceObelisk.tooltip.detailed.line1=放在流体箱上 -tile.blockExperienceObelisk.tooltip.detailed.line2=右击使用储存的液态XP -tile.blockExperienceObelisk.tooltip.detailed.line3=用空手Shift右击 -tile.blockExperienceObelisk.tooltip.detailed.line4=从自身抽取XP -tile.blockExperienceObelisk.tooltip.detailed.line5=左击抽取玩家1级的XP +tile.blockExperienceObelisk.tooltip.detailed.line1=用于储存经验 +tile.blockExperienceObelisk.tooltip.detailed.line2=可将液态XP输出 +tile.blockExperienceObelisk.tooltip.detailed.line3=至相邻的储罐中 + +tile.blockBuffer.item.name=物品缓存器 +tile.blockBuffer.power.name=能量缓存器 +tile.blockBuffer.omni.name=多功能缓存器 +tile.blockBuffer.creative.name=创造缓存器 enderio.machine.tooltip.configured=(已配置) //Blocks tile.blockDarkSteelPressurePlate.name=玄钢压力板 tile.blockDarkSteelPressurePlate.tooltip.detailed.line1=只能被玩家激活 -tile.blockDarkSteelPressurePlate.tooltip.detailed.line2=可在粉刷机内粉刷, -tile.blockDarkSteelPressurePlate.tooltip.detailed.line3=当使用纯净玻璃粉刷 +tile.blockDarkSteelPressurePlate.tooltip.detailed.line2=可在喷涂机内喷涂, +tile.blockDarkSteelPressurePlate.tooltip.detailed.line3=当使用纯净玻璃喷涂 tile.blockDarkSteelPressurePlate.tooltip.detailed.line4=时,玄钢压力板能隐形 tile.blockDarkSteelPressurePlate.silent.tooltip.common.line1=无声 tile.blockDarkSteelPressurePlate.silent.tooltip.detailed.line1=只能被玩家激活 -tile.blockDarkSteelPressurePlate.silent.tooltip.detailed.line2=可在粉刷机内粉刷, -tile.blockDarkSteelPressurePlate.silent.tooltip.detailed.line3=当使用纯净玻璃粉刷时, +tile.blockDarkSteelPressurePlate.silent.tooltip.detailed.line2=可在喷涂机内喷涂, +tile.blockDarkSteelPressurePlate.silent.tooltip.detailed.line3=当使用纯净玻璃喷涂时, tile.blockDarkSteelPressurePlate.silent.tooltip.detailed.line4=无声玄钢压力板能隐形 tile.blockDarkSteelAnvil.intact.name=玄铁砧 @@ -430,6 +475,9 @@ tile.blockDarkSteelAnvil.tooltip.common.line1=经久耐用 tile.blockDarkSteelAnvil.tooltip.detailed.line1=比原版的铁砧 tile.blockDarkSteelAnvil.tooltip.detailed.line2=更加结实耐用 +tile.blockDarkSteelLadder.name=玄铁梯子 +tile.blockDarkSteelLadder.tooltip.common.line1=比普通的梯子更易攀爬 + //Travel tile.blockTravelAnchor.name=旅行锚 tile.blockTravelAnchor.tooltip.detailed.line1=允许在锚点之间传送 @@ -437,7 +485,7 @@ tile.blockTravelAnchor.tooltip.detailed.line2=站在一个锚上, 看着 tile.blockTravelAnchor.tooltip.detailed.line3=另外一个,然后跳跃即可传送 tile.blockTravelAnchor.tooltip.detailed.line4=也可以使用旅行权杖 tile.blockTravelAnchor.tooltip.detailed.line5=来使用旅行锚 -tile.blockTravelAnchor.tooltip.detailed.line6=可在粉刷机内粉刷 +tile.blockTravelAnchor.tooltip.detailed.line6=可在喷涂机内喷涂 enderio.blockTravelPlatform.invalidTarget=目标受阻 enderio.blockTravelPlatform.outOfRange=目标太远 @@ -451,19 +499,19 @@ item.itemTravelStaff.tooltip.detailed.line5=可短距离传送玩家 enderio.itemTravelStaff.notEnoughPower=能量不足 //Painter -tile.blockPainter.name=粉刷机 -enderio.blockPainter.paintedWith=粉刷: -tile.blockPaintedFence.name=粉刷栅栏 -tile.blockPaintedFenceGate.name=粉刷门 -tile.blockPaintedWall.name=粉刷墙 -tile.blockPaintedStair.name=粉刷楼梯 -tile.blockPaintedSlab.name=粉刷台阶 -tile.blockPaintedDoubleSlab.name=粉刷台阶 -tile.blockPaintedGlowstone.name=粉刷萤石 -tile.blockPaintedCarpet.name=粉刷地毯 +tile.blockPainter.name=喷涂机 +enderio.blockPainter.paintedWith=喷涂: +tile.blockPaintedFence.name=喷涂栅栏 +tile.blockPaintedFenceGate.name=喷涂门 +tile.blockPaintedWall.name=喷涂墙 +tile.blockPaintedStair.name=喷涂楼梯 +tile.blockPaintedSlab.name=喷涂台阶 +tile.blockPaintedDoubleSlab.name=喷涂台阶 +tile.blockPaintedGlowstone.name=喷涂萤石 +tile.blockPaintedCarpet.name=喷涂地毯 enderio.painter.tooltip.wasPainted=§o你认为这是干嘛用的? -tile.blockPainter.tooltip.detailed.line1=用于粉刷: +tile.blockPainter.tooltip.detailed.line1=用于喷涂: tile.blockPainter.tooltip.detailed.line2=导管框架, 楼梯, 栅栏, tile.blockPainter.tooltip.detailed.line3=门, 台阶, 圆石墙, tile.blockPainter.tooltip.detailed.line4=玻璃框, 萤石, 地毯 @@ -495,6 +543,10 @@ item.enderio.itemConduitProbe.tooltip.detailed.line5=右击以粘贴 item.enderio.itemConduitProbe.tooltip.detailed.line6=使用shift加鼠标滚轮或Y键切换模式 item.itemSoulVessel.name=灵魂瓶 +enderio.item.itemSoulVessel.tooltip.health=生命: +enderio.item.itemSoulVessel.tooltip.fluidname=流体名: +enderio.item.itemSoulVessel.tooltip.color=颜色: +enderio.item.itemSoulVessel.tooltip.empty=空 item.itemSoulVessel.tooltip.detailed.line1=右击一个怪物 item.itemSoulVessel.tooltip.detailed.line2=可捕获其灵魂 item.itemSoulVessel.tooltip.detailed.line3=再次右击则释放 @@ -559,7 +611,6 @@ enderio.darksteel.upgrade.empowered_four.tooltip.detailed.line1=能量: $P enderio.darksteel.upgrade.empowered_four.tooltip.detailed.line2=能量吸收抵消一半的 enderio.darksteel.upgrade.empowered_four.tooltip.detailed.line3=耐久损伤 - enderio.darksteel.upgrade.travel.name=旅行 enderio.darksteel.upgrade.travel.tooltip.detailed.line1=按住shift右击来传送或 enderio.darksteel.upgrade.travel.tooltip.detailed.line2=激活旅行锚和末影接口 @@ -582,6 +633,21 @@ enderio.darksteel.upgrade.sound.disabled=声波定位禁用 enderio.darksteel.upgrade.gogglesOfRevealing.name=揭示 enderio.darksteel.upgrade.gogglesOfRevealing.tooltip.detailed.line1=要素减免: 5% +enderio.darksteel.upgrade.naturalistEye.name=自然之眼 +enderio.darksteel.upgrade.naturalistEye.tooltip.detailed.line1=显示已授粉的树叶 + +enderio.darksteel.upgrade.apiaristArmor.helmet.name=养蜂人之帽 +enderio.darksteel.upgrade.apiaristArmor.helmet.tooltip.detailed.line1=提供保护以减少蜜蜂的伤害 + +enderio.darksteel.upgrade.apiaristArmor.chestplate.name=养蜂人之衣 +enderio.darksteel.upgrade.apiaristArmor.chestplate.tooltip.detailed.line1=提供保护以减少蜜蜂的伤害 + +enderio.darksteel.upgrade.apiaristArmor.leggings.name=养蜂人之裤 +enderio.darksteel.upgrade.apiaristArmor.leggings.tooltip.detailed.line1=提供保护以减少蜜蜂的伤害 + +enderio.darksteel.upgrade.apiaristArmor.boots.name=养蜂人之鞋 +enderio.darksteel.upgrade.apiaristArmor.boots.tooltip.detailed.line1=提供保护以减少蜜蜂的伤害 + item.itemGliderWing.name=滑翔翼 item.itemGliderWings.name=滑翔翼 item.itemGliderWings.tooltip.detailed.line1=用于升级 @@ -617,14 +683,24 @@ enderio.darksteel.upgrade.nightVision.name=夜视 enderio.darksteel.upgrade.nightVision.enabled=夜视已启用 enderio.darksteel.upgrade.nightVision.disabled=夜视已禁用 +enderio.darksteel.upgrade.solar_one.name=太阳能 I +enderio.darksteel.upgrade.solar_one.tooltip.detailed.line1=利用阳光产能. + +enderio.darksteel.upgrade.solar_two.name=太阳能 II +enderio.darksteel.upgrade.solar_two.tooltip.detailed.line1=利用阳光产能. + //------GUI -enderio.enderio.gui.enabled=启用 -enderio.enderio.gui.disabled=禁用 -enderio.gui.enabled=启用 +enderio.gui.simple.in=最大输入: +enderio.gui.simple.out=最大输出: + +enderio.gui.available=可用 enderio.gui.disabled=禁用 -enderio.gui.send=发送 +enderio.gui.enabled=启用 +enderio.gui.max=最大: +enderio.gui.progress=进程 {0,number}% enderio.gui.receive=接收 +enderio.gui.send=发送 enderio.gui.sendReceive=发送和接收 //Redstone controls @@ -634,6 +710,17 @@ enderio.gui.tooltip.redstoneControlMode.on=收到信号工作 enderio.gui.tooltip.redstoneControlMode.off=收到信号不工作 enderio.gui.tooltip.redstoneControlMode.never=从不工作 +enderio.gui.machine.button.storelevel=储存1级 +enderio.gui.machine.tooltip.storelevel=玩家XP +enderio.gui.machine.button.storelevels=储存10级 +enderio.gui.machine.tooltip.storelevels=玩家XP +enderio.gui.machine.button.storeall=储存玩家 +enderio.gui.machine.tooltip.storeall=全部XP +enderio.gui.machine.button.retrievelevel=取出1级 +enderio.gui.machine.tooltip.retrievelevel=玩家XP级数 +enderio.gui.machine.button.retrievelevels=取出10级 +enderio.gui.machine.tooltip.retrievelevels=玩家XP级数 +enderio.gui.machine.button.retrieveall=取出全部 enderio.gui.machine.ioMode.overlay.tooltip=配置IO enderio.gui.machine.ioMode.none=无 enderio.gui.machine.ioMode.pull=拉 @@ -642,7 +729,17 @@ enderio.gui.machine.ioMode.disabled=禁用 enderio.gui.machine.ioMode.pullPush=推 / 拉 enderio.gui.machine.ioMode.pullPush.colored=%s推 %s/ %s拉 enderio.gui.machine.ioMode=模式: %s -enderio.gui.machine.side=侧面: %s +enderio.gui.machine.poweredspawner.capture=收获 +enderio.gui.machine.poweredspawner.spawn=生成 +enderio.gui.machine.receivefilter=接收过滤 +enderio.gui.machine.sendfilter=发送过滤 +enderio.gui.machine.sendReceivebuffer=发送/接收缓存 +enderio.gui.machine.localbuffer=本地缓存 +enderio.gui.machine.upkeep=维持: +enderio.gui.machine.bufferingstacks=缓冲多个物品 +enderio.gui.machine.bufferingsingle=缓冲单个物品 +enderio.gui.machine.percraft=每次合成 +enderio.gui.machine.side=所在面: %s enderio.gui.machine.side.north=北 enderio.gui.machine.side.south=南 enderio.gui.machine.side.west=西 @@ -726,6 +823,8 @@ enderio.combustionGenerator.output=产能速率: //Stirling Gen enderio.stirlingGenerator.output=产能速率: enderio.stirlingGenerator.burnRate=燃烧速率: +enderio.stirlingGenerator.upgradeslot=升级栏 +enderio.stirlingGenerator.upgrades={0} 提供 {2}{1,number,#.#}x{3} 的效率 //Travel Blocks enderio.gui.travelAccessable.privateBlock1=只有 @@ -750,6 +849,10 @@ enderio.gui.conduit.ioMode.disabled=关闭 enderio.gui.conduit.ioMode.notSet=默认 tile.blockConduitBundle.name=导管接口 +enderio.gui.conduit.button.clear=清空 +enderio.gui.conduit.button.merge=合并 +enderio.gui.conduit.button.show=显示 +enderio.gui.conduit.button.snap=快照 enderio.gui.conduit.item.insertionFilter=加入物品过滤 enderio.gui.conduit.item.extractionFilter=提取物品过滤 enderio.gui.conduit.item.sigCol=信号颜色 @@ -777,9 +880,14 @@ enderio.gui.conduit.redstone.signalStrengh.tooltip=输出强红石信号 enderio.gui.conduit.fluid.autoExtract=自动提取 enderio.gui.conduit.fluid.filter=过滤器 +enderio.gui.conduit.fluid.whitelist=白名单 +enderio.gui.conduit.fluid.blacklist=黑名单 enderio.gui.conduit.gas.autoExtract=自动提取 +//Enchants +enchantment.enderio.soulBound=灵魂绑定 +description.enchantment.enderio.soulBound=该附魔使物品免于死亡掉落 //Configuration enderio.config.title=末影接口配置文件 @@ -825,3 +933,26 @@ enderio.config.fluid.tooltip=纯净的液态能量! enderio.config.spawner=电动刷怪笼设置 enderio.config.spawner.tooltip=我已经想不出什么有趣的提示文本了. + +//Keybinds/Waila/NEI/Tooltips +enderio.category.darksteelarmor=玄铁护甲 +enderio.category.tools=工具 +enderio.keybind.glidertoggle=滑翔开关 +enderio.keybind.gogglesofrevealing=揭示护目镜 +enderio.keybind.nightvision=夜视 +enderio.keybind.soundlocator=声波定位 +enderio.keybind.speed=速度 +enderio.keybind.stepassist=Step Assist +enderio.keybind.yetawrenchmode=以太扳手模式 +enderio.nei.alloysmelter=合金炉 +enderio.nei.enchanter=附魔器 +enderio.nei.sagmill=SAG磨粉机 +enderio.nei.slicensplice=头颅装配机 +enderio.nei.soulbinder=灵魂绑定器 +enderio.nei.vat=酿液锅 +enderio.tooltip.burntime=燃烧时间: +enderio.tooltip.oredict=矿物辞典: +enderio.tooltip.meta=Meta: +enderio.tooltip.uid=UID: +enderio.tooltip.anvilupgrades=铁砧升级: +enderio.waila.config.hiddenfacades=隐形栅栏 From 21c3613260991306023d3626df79e1d4d3cfaeab Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Wed, 4 Feb 2015 21:43:00 -0500 Subject: [PATCH 64/79] #1844 Fix WAILA plugin world wrapper not properly handling isRemote --- src/main/java/crazypants/enderio/waila/WailaCompat.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/crazypants/enderio/waila/WailaCompat.java b/src/main/java/crazypants/enderio/waila/WailaCompat.java index 1bbd65d8..d3dc6948 100644 --- a/src/main/java/crazypants/enderio/waila/WailaCompat.java +++ b/src/main/java/crazypants/enderio/waila/WailaCompat.java @@ -53,8 +53,9 @@ public class WailaCompat implements IWailaDataProvider { private WailaWorldWrapper(World wrapped) { super(wrapped.getSaveHandler(), wrapped.getWorldInfo().getWorldName(), wrapped.provider, new WorldSettings(wrapped.getWorldInfo()), wrapped.theProfiler); this.wrapped = wrapped; + this.isRemote = wrapped.isRemote; } - + @Override public Block getBlock(int x, int y, int z) { Block block = wrapped.getBlock(x, y, z); From eb8c8f5c132b24a5e813f22eaeda531dfa69d93c Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Wed, 4 Feb 2015 21:59:38 -0500 Subject: [PATCH 65/79] Add code to remove default WAILA RF tooltips, waiting on fix from WAILA --- .../java/crazypants/enderio/waila/WailaCompat.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/java/crazypants/enderio/waila/WailaCompat.java b/src/main/java/crazypants/enderio/waila/WailaCompat.java index d3dc6948..6e9acbb8 100644 --- a/src/main/java/crazypants/enderio/waila/WailaCompat.java +++ b/src/main/java/crazypants/enderio/waila/WailaCompat.java @@ -2,6 +2,7 @@ package crazypants.enderio.waila; import java.util.List; +import mcp.mobius.waila.api.ITaggedList; import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaDataAccessor; import mcp.mobius.waila.api.IWailaDataProvider; @@ -42,7 +43,6 @@ import crazypants.enderio.machine.power.TileCapacitorBank; import crazypants.enderio.power.IInternalPoweredTile; import crazypants.util.IFacade; import crazypants.util.Lang; - import static crazypants.enderio.waila.IWailaInfoProvider.*; public class WailaCompat implements IWailaDataProvider { @@ -126,13 +126,14 @@ public class WailaCompat implements IWailaDataProvider { IFacade bundle = (IFacade) accessor.getBlock(); Block facade = bundle.getFacade(accessor.getWorld(), pos.blockX, pos.blockY, pos.blockZ, accessor.getSide().ordinal()); if(facade != null) { - ItemStack ret = facade.getPickBlock(pos, new WailaWorldWrapper(accessor.getWorld()), pos.blockX, pos.blockY, pos.blockZ); + ItemStack ret = facade.getPickBlock(pos, new WailaWorldWrapper(accessor.getWorld()), pos.blockX, pos.blockY, pos.blockZ, accessor.getPlayer()); return ret; } } } else if(accessor.getBlock() instanceof BlockDarkSteelAnvil) { return accessor.getBlock().getPickBlock(accessor.getPosition(), accessor.getWorld(), accessor.getPosition().blockX, accessor.getPosition().blockY, - accessor.getPosition().blockZ); + accessor.getPosition().blockZ, accessor.getPlayer()); + } return null; } @@ -142,6 +143,7 @@ public class WailaCompat implements IWailaDataProvider { return currenttip; } + @SuppressWarnings("unchecked") @Override public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { @@ -154,7 +156,9 @@ public class WailaCompat implements IWailaDataProvider { Block block = world.getBlock(x, y, z); TileEntity te = world.getTileEntity(x, y, z); Item item = Item.getItemFromBlock(block); - + + // let's get rid of WAILA's default RF stuff, once that works + ((ITaggedList) currenttip).removeEntries("RFEnergyStorage"); if(te instanceof IIoConfigurable && block == accessor.getBlock()) { IIoConfigurable machine = (IIoConfigurable) te; From 0ed258ee8c78d98c43954171d76ec8ffb33472cf Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Wed, 4 Feb 2015 22:05:27 -0500 Subject: [PATCH 66/79] Update release notes --- ReleaseNotes.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 540dcd84..e219f3c3 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -20,6 +20,10 @@ Changes - Wither skeletons will now drop Tcon necrotic bones and respect Tcon beheading - Improve efficiency of wireless chargers (MatthiasM2) - Refactor how all EIO blocks drop themselves, should resolve all™ issues with such in the future +- It is now possible to use the yeta wrench shift+left click in creative mode (MatthiasM2) +- Alloy smelter will now give smelting achievements (iron, fish) (MatthiasM2) +- Wireless charger will now keep its stored energy when picked up (MatthiasM2) +- EnderIO GUIs with tabs will move NEI items out of the way (MatthiasM2) Bugs - Fix crash with iguana tweaks level ups in farm From 49523db9bee580bf32bf6d0c9cc51a2a91542a87 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Wed, 4 Feb 2015 22:25:15 -0500 Subject: [PATCH 67/79] Fix mod tools not hiding facades --- .../java/crazypants/enderio/conduit/ConduitUtil.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/crazypants/enderio/conduit/ConduitUtil.java b/src/main/java/crazypants/enderio/conduit/ConduitUtil.java index 4f909e37..7a9dc356 100644 --- a/src/main/java/crazypants/enderio/conduit/ConduitUtil.java +++ b/src/main/java/crazypants/enderio/conduit/ConduitUtil.java @@ -46,6 +46,7 @@ import crazypants.enderio.conduit.redstone.IRedstoneConduit; import crazypants.enderio.conduit.redstone.RedstoneConduitNetwork; import crazypants.enderio.conduit.redstone.Signal; import crazypants.enderio.machine.RedstoneControlMode; +import crazypants.enderio.tool.ToolUtil; import crazypants.util.BlockCoord; import crazypants.util.DyeColor; @@ -239,16 +240,16 @@ public class ConduitUtil { public static boolean shouldHeldItemHideFacades(EntityPlayer player) { player = player == null ? EnderIO.proxy.getClientPlayer() : player; - if (player == null) { + if(player == null) { return false; } ItemStack held = player.getCurrentEquippedItem(); - if (held != null && held.getItem() instanceof IHideFacades) { - return ((IHideFacades)held.getItem()).shouldHideFacades(held, player); + if(held != null && held.getItem() instanceof IHideFacades) { + return ((IHideFacades) held.getItem()).shouldHideFacades(held, player); } - return false; + return ToolUtil.isToolEquipped(player); } - + public static boolean isConduitEquipped(EntityPlayer player) { player = player == null ? EnderIO.proxy.getClientPlayer() : player; if(player == null) { From d09cf305fcd768021b2fadaa7c7aab7d5c2ff39a Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Thu, 5 Feb 2015 01:53:15 -0500 Subject: [PATCH 68/79] #1851 Add hard dep on forge 1234 --- src/main/java/crazypants/enderio/EnderIO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/crazypants/enderio/EnderIO.java b/src/main/java/crazypants/enderio/EnderIO.java index a9fa0ab9..2d1b0bc1 100644 --- a/src/main/java/crazypants/enderio/EnderIO.java +++ b/src/main/java/crazypants/enderio/EnderIO.java @@ -153,7 +153,7 @@ import static crazypants.enderio.EnderIO.MODID; import static crazypants.enderio.EnderIO.MOD_NAME; import static crazypants.enderio.EnderIO.VERSION; -@Mod(modid = MODID, name = MOD_NAME, version = VERSION, dependencies = "required-after:Forge@10.13.0.1150,);after:MineFactoryReloaded", guiFactory = "crazypants.enderio.config.ConfigFactoryEIO") +@Mod(modid = MODID, name = MOD_NAME, version = VERSION, dependencies = "required-after:Forge@10.13.2.1234,);after:MineFactoryReloaded", guiFactory = "crazypants.enderio.config.ConfigFactoryEIO") public class EnderIO { public static final String MODID = "EnderIO"; From 4a782d1eff80db4ffbb96098ba51477e0863f0a2 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Thu, 5 Feb 2015 01:58:36 -0500 Subject: [PATCH 69/79] Revert change to new pick block method to keep compat with cauldron --- src/main/java/crazypants/enderio/EnderIO.java | 2 +- src/main/java/crazypants/enderio/waila/WailaCompat.java | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/crazypants/enderio/EnderIO.java b/src/main/java/crazypants/enderio/EnderIO.java index 2d1b0bc1..a9fa0ab9 100644 --- a/src/main/java/crazypants/enderio/EnderIO.java +++ b/src/main/java/crazypants/enderio/EnderIO.java @@ -153,7 +153,7 @@ import static crazypants.enderio.EnderIO.MODID; import static crazypants.enderio.EnderIO.MOD_NAME; import static crazypants.enderio.EnderIO.VERSION; -@Mod(modid = MODID, name = MOD_NAME, version = VERSION, dependencies = "required-after:Forge@10.13.2.1234,);after:MineFactoryReloaded", guiFactory = "crazypants.enderio.config.ConfigFactoryEIO") +@Mod(modid = MODID, name = MOD_NAME, version = VERSION, dependencies = "required-after:Forge@10.13.0.1150,);after:MineFactoryReloaded", guiFactory = "crazypants.enderio.config.ConfigFactoryEIO") public class EnderIO { public static final String MODID = "EnderIO"; diff --git a/src/main/java/crazypants/enderio/waila/WailaCompat.java b/src/main/java/crazypants/enderio/waila/WailaCompat.java index 6e9acbb8..c8054270 100644 --- a/src/main/java/crazypants/enderio/waila/WailaCompat.java +++ b/src/main/java/crazypants/enderio/waila/WailaCompat.java @@ -118,6 +118,8 @@ public class WailaCompat implements IWailaDataProvider { IWailaInfoProvider.fmt.setMaximumFractionDigits(1); } + // IGNORE deprecation, the new method requires forge 1234 which is too new for cauldron! + @SuppressWarnings("deprecation") @Override public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { MovingObjectPosition pos = accessor.getPosition(); @@ -126,13 +128,13 @@ public class WailaCompat implements IWailaDataProvider { IFacade bundle = (IFacade) accessor.getBlock(); Block facade = bundle.getFacade(accessor.getWorld(), pos.blockX, pos.blockY, pos.blockZ, accessor.getSide().ordinal()); if(facade != null) { - ItemStack ret = facade.getPickBlock(pos, new WailaWorldWrapper(accessor.getWorld()), pos.blockX, pos.blockY, pos.blockZ, accessor.getPlayer()); + ItemStack ret = facade.getPickBlock(pos, new WailaWorldWrapper(accessor.getWorld()), pos.blockX, pos.blockY, pos.blockZ); return ret; } } } else if(accessor.getBlock() instanceof BlockDarkSteelAnvil) { return accessor.getBlock().getPickBlock(accessor.getPosition(), accessor.getWorld(), accessor.getPosition().blockX, accessor.getPosition().blockY, - accessor.getPosition().blockZ, accessor.getPlayer()); + accessor.getPosition().blockZ); } return null; From f628b988def7f9a0c740a02ba87634eeeeba6d5a Mon Sep 17 00:00:00 2001 From: Katrina Swales Date: Thu, 5 Feb 2015 23:02:37 +0100 Subject: [PATCH 70/79] Made endermen heads act as Thaumcraft infusion stabilisers --- .../api/crafting/IInfusionStabiliser.java | 19 +++++++++++++++++++ .../item/skull/BlockEndermanSkull.java | 11 ++++++++++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 src/api/java/thaumcraft/api/crafting/IInfusionStabiliser.java diff --git a/src/api/java/thaumcraft/api/crafting/IInfusionStabiliser.java b/src/api/java/thaumcraft/api/crafting/IInfusionStabiliser.java new file mode 100644 index 00000000..d137ff24 --- /dev/null +++ b/src/api/java/thaumcraft/api/crafting/IInfusionStabiliser.java @@ -0,0 +1,19 @@ +package thaumcraft.api.crafting; + +import net.minecraft.world.World; + +/** + * + * @author Azanor + * + * Blocks that implement this interface act as infusion crafting stabilisers like candles and skulls + * + */ +public interface IInfusionStabiliser { + + /** + * returns true if the block can stabilise things + */ + public boolean canStabaliseInfusion(World world, int x, int y, int z); + +} diff --git a/src/main/java/crazypants/enderio/item/skull/BlockEndermanSkull.java b/src/main/java/crazypants/enderio/item/skull/BlockEndermanSkull.java index 8fcdaa18..fc987b33 100644 --- a/src/main/java/crazypants/enderio/item/skull/BlockEndermanSkull.java +++ b/src/main/java/crazypants/enderio/item/skull/BlockEndermanSkull.java @@ -1,5 +1,6 @@ package crazypants.enderio.item.skull; +import cpw.mods.fml.common.Optional; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EntityLivingBase; @@ -13,8 +14,10 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.BlockEio; import crazypants.enderio.ModObject; +import thaumcraft.api.crafting.IInfusionStabiliser; -public class BlockEndermanSkull extends BlockEio { +@Optional.Interface(iface = "thaumcraft.api.crafting.IInfusionStabiliser", modid = "Thaumcraft") +public class BlockEndermanSkull extends BlockEio implements IInfusionStabiliser { public static int renderId = -1; @@ -118,4 +121,10 @@ public class BlockEndermanSkull extends BlockEio { public int damageDropped(int meta) { return meta; } + + @Override + @Optional.Method(modid = "Thaumcraft") + public boolean canStabaliseInfusion(World world, int x, int y, int z) { + return true; + } } From 72138026a6b9fcf74fba9b727c8ee1599794f3b1 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Thu, 5 Feb 2015 20:44:23 -0500 Subject: [PATCH 71/79] Implement retextured widgets --- .../enderio/textures/gui/old/widgets.png | Bin 0 -> 47687 bytes .../assets/enderio/textures/gui/widgets.png | Bin 47687 -> 37943 bytes .../conduit/gui/BaseSettingsPanel.java | 2 +- .../conduit/gui/GuiExternalConnection.java | 4 +- .../java/crazypants/enderio/gui/IconEIO.java | 169 +++++++++--------- .../enderio/gui/IoConfigRenderer.java | 4 +- .../enderio/machine/farm/GuiFarmStation.java | 4 +- .../machine/hypercube/GuiHyperCube.java | 12 +- .../transceiver/gui/GuiTransceiver.java | 4 +- .../enderio/xp/ExperienceBarRenderer.java | 30 ++-- 10 files changed, 111 insertions(+), 118 deletions(-) create mode 100644 resources/assets/enderio/textures/gui/old/widgets.png diff --git a/resources/assets/enderio/textures/gui/old/widgets.png b/resources/assets/enderio/textures/gui/old/widgets.png new file mode 100644 index 0000000000000000000000000000000000000000..62f5e115b6a56b5baf00319a2db31bb843314fa1 GIT binary patch literal 47687 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�FC8a|ODM&z{sdGT4?_>c zb&IeZ)aCZm-?F3dX$kIp>8tR%Ug>`Y68=sI({bQ=k1KPr&4w0%J_ouEy3oIpTkA3U zMs%4~VBJ)SL99BlEZBeXu+9a76>@|bY1kw5OiJ3Gopcuy9RIoWE1mp44nc-RMaEU} zs(Qoq(b8lo@dEmXt$uU)Q*uEw;TP<4rbK!g25iZyk==8JZiz4On>DASE6~=I5 z&gjrk7%`xx!Im~ZoGl;y_j%N&QNJfp`043sQ%KGEC3@DkZc}PXS4hJT)TF6&f)a}R ziTFA&(00t`<-Mla^Yb&$Q9JV!CHW*z+F9_-cAA<n%O zY?3I`cY(Xl5*;d7wjAc82Jrll1Pj0lgX_HiI?rq%##L&pmDU#4*8BN@fBi}D(}SxB zno7l$#N%#SN-f(Zmv*48`n5`IuO?z@84Q2*uhF8*ALartw!9?lCLR3BA6uNs@&ujx z$GCdYN8C%$m4DM?dZ!uWWYbTO*k9MEwHmIL6Ml(+1EwzRx2#Z_VWi=qzH=u!+8?n{ zdma!>-wwI;@P(PEPv5ne)87UJ06kJwRo%?rIg52qCkY=Be&8qi+BC*eK8>G5@bTW@ zBu(}v7X7^q#xO4;9DKxze1;|Aq%d!KF(2KJ9}^KNze8-Ue|#osvhr%$^VEMNx2r>u zXN(-8Anf3k%6-tip0y55xfp69>GPNp&x(N-i2BI?^|D-fU?T7XRr7JGH7RL{vA}V& zC`ht=;y&wE>+h|w2PVhP)m1^HASqi)Fi%dRNP#mezUTbpM3ytFhM8B{-?U0|qP!}d zpHAEBYGH-aXOH0@%wP~_b<0QB&T0c4V^>3mBy3GESQ;6~G>1pRH^PI0f;MTFZ4s|3 zKf^d!oPkwVMuI>}<1{mp)bK(zDn=Rd5kwLnYum03+TR;b^P+|$+nJ!j%tgqNh+K(? zl--wOW;g8Zujb0o0i7%%$n8`T-Otx z)ePa66_7IhDZAPgdb3_m){4u_%p5IV1oB(JXJgcl@fewq(>MkIWO5&}!u9r1wW@UF zdLl_ziKOS(Io;E5&a5ay28-g%et$o9{zwr*(2kvGcu2~?&HT%+$`jus6GMV-k|1qu zE=!tMr%Y~tOIHO{c#yB+jW5r0gUW(00ytjk$=xPwzZoPI+Q6nNh41EqFcgm^2%C@e z*KDXu`J_sz9|<)~22z{ihgd3s(`S^;i4&8jQzP2Ve}z>)6sdBB`Wm`v{WB9dG&?=_ z)zZ*fm*Q~kTC1<$pWGBbhA*UzfaVE41| zK?kLhP8C6R1qs0uQ2mt69gd29K?@RmaK(>C;su~k?Tlrh-`O9{TB^E2X-lsera_0L zfK!HK%a5TN6?&}|T518bhyCXI7&vN2a}WW9n38aRu>A9%8|GRez7VHa!8JL2Qd!RPM*U8ws z)^D=Yl=V~^l*~%B6Ht|5&5#DnjCOxzCl&u*|vz3Sy@1q1@BR}a}-!TnA zbxW1Yi>sNovC>Al-%%#cVlj37!{ud&OxIEyy`7^QYU_kPh92lxCcCmXG!h?*N zI~Cr-5Af3yH@ZU9YCa4dDpLQR;TV$!hyWLmrKOJoW1NNG`PP@g0=JT}Uu=)S-y*@v z_VlmiX&(d${Q!q8_t)E{9XP57P%!ivqOhN0(GM(urk0jPey%+&IH4~jY@Dd^Ebu_jIZQsiYAScHI)6>`oB}1WunC0)7 z;A0vF=r7-;?$;_hM1IX+mBLBp8yN?s4B{(>$I@K+jJW^MN8jmsacQ#0Ob8@X6vWud zcrQhb{L39pHE^@R8lWf>8e-RB{H;jf-#2gCossCEa-F!{@oACjog=iisXAKol;Xr3 zYbf!(pPrsh#}uh%YBQx(gPS!Lulz=^U)0n_Y74(`;Yy4sA}U%sow=eIjvY1>PqgFg z8bAj6uLVfp+(M5>Ohu)ju8xI>h***v`xg*z{)3^PIQ`O=Hl^hn&`h3Y@AsY=nZ23@ z?+Mn>(2$##H|)%llpL0vmc0kX%by08HeuyR*Q4e44Y+)WsQ5w}IHv~Djv$hTg-3CL z6x)G8smfTX@FTFQs)#O!Pnc)nLrz1mFhi4xN^FWh1SQ>nN7vV$qzLQv5bEj)`7su< zPa`8dIhtgdHka`6wIVKcJtv}gewe1hUjAWf|5`xibK=SY>)XP#ZfaUp<}2kA{?We& zrY*_5iISQcHf47TGP3xNN5xwp&Z;K`Lppt2J-bdGYK}#KhrlBug1Xvbn+SEdc-Tq) zG*u`rKyvSy=UvU6)=rVgPf`0D6!C2v9lbfEYt}@Ui60l;0Y>vH2EFLTwiWyH^W!)c zxs(Wwi*Go2nw)r9(k&HwzIr&$3$;uDrU<4BEIBRNOcQ~=U6oJ` zy9KLw9D+m0I@sObOs~=W&};<)O2hv5%Q4Dku2fZwQKzM{UDV$S8F6f3QTcFw761N! z9bE-b8-Ei`g1Z-Yid!iXoZ{{UTHL+3Tks;qtrT}DTC8aB7K)Wp+@UxGclhrAWg;_| z$>e@_d$+sqz1>|7b`9ZP0>d74d$y;(fe=7}Fs-)vfr=>X*ZA5u+6U(zj;Liad?dYs&$Rj!~ zArl{r;rta1w?yh>+t;WGVWW2ps$g|=r{3PriH!wX^W5My_XLd9VdV3Js{G*HH8xRP ze&tgk(O<~Ezx z#|aCFUR9sjBoZA8Etrx2C1&6e-5%JqB2Z{Xq$^Kq-@P7UNNi=VnOO++ztI=H)>c0K zsS&K57soW8jFF5)xXAqnVbCmF!1Qq6O)CtwMbgHKnML6pA|&s3S_6!)+jV;+-AC`> zlO|Vf-3D*ws4-+MG<*oOAv7vHTu;f_T~ymorz0BV9x?Cbpv*=8<~`SEs`57=->~AX zdopihSMDm^q*FU^=BPDU)EnqdA0M_|1R+HW4kO7AEb&zel$Yto;q>{Dw-J6u(AsG2 zd1h~eSHth%$g*wt8?t2wBFc7sv~2RUvPd52;SP_P0RoC?-&B_gt%K7TD! z98%%g`K|KRChVu%2SOvIgQar4oN0(i zf;2f^PLNk?Gy_lIX@?M}9?vsBA6D6!sI7{qy^S`{2lO;h*Yy!T~eVw7ME&>F*5B#Q2QAQ9My{4c5p# zxJ&wd!hF#8d*1gfV5%h1piFQCRo!uo;V-rT03b)!WZ}>=)oW1AN&rKI*~v;*+jfQ_ z0w5&ml_)EIfbg`O(=~XhRTMDUC{>26 z5o$TLx&XBa#XdXUW;<|U$rU*gmC&yw52@lo1wunxwPwjw`DprBZe&8iAKW@BHrp0y zSj|A~PV@i;eLK_r+oL6hx2yg)`3F;GBscn5;hm(zZdHUKUJv@T)Me^uB2=f6nG{lt z_u^+i7=5?X^$`F(zFri^9s7kqfE*sTc(qaC5w?1blc~i%pGC%_clga`PG$<6;G8d3 zRtv;m3?iD%e`1V`OeCEI#-Y(W$+ACbZF#22Y1malOSdv8M6;}SQtr+GG!peaK-!^2u=dH%Fv0p?LwW+_s1?uvt? zYxKiC+8OV8{`fGhnP$_tjg?S5?ermkv|SlI6#{%Eup=9QuNfZtM0q-$|3rM^HxcmX z5wDiW_3@dMU+NFeH`LyjfH@^w@nKHd**Qws>S@LxI?gvxz(*%M|;6nwQH zGz!}64JJu<2$I%cBYze4{o+ak?Vku9-8d*kxe?%c$#>fmh}5BAYHDggiz1T~WB=(6 zBl?_+##HFOm{M}l(-}L*NF8``A&Sguy9x05i-{EH{?j>*t$_?=#i8Bu4+iL zo~~-)bi`rmS1;lLY1F}ZY|nGPP`3}Jd-v5qEBn*R9S>U(k0|bds-V#umm)>dXp}SG&NsS@LQ!v01s{lzLdOt5Oz+*n%Ux#bQCM4hj$wpgk zoNdQDPv_pkG5 zws7(qqfO%gZ?m50YT*UM(wAeu`pR+-(ctFpcxvr9uBgk+;pcp$O1&*Sr~*VcVNYxLZ`O*KYu(~rxbLHXsM|Oc|vYgF0QW`bJdHhtFc;~ zH#^VA`|nq-C4h~a|Gv1$|4RFkfzywsP{gKnW{l_^dL84%_N{b_c4?6`Kr5X>%Bp&R zi6iDjA+@#Dn;X6Iry|qCxK1JjipD%b*PZx8`b38RgdjsdPcDbVHBu>jCNAfiegm{N z>L2ECosujxkHFwHj&`9m(?u%|6@-8JhEMmS`SZ6mgt;ULUkoumL+>rtyfdE`=-_J+{SfWi}OWsTabssO~7tkd*<5 zVyOfRe4iI5@SzrgAcqs0RkYJUICpqEx9VclafhAv=9J-`sm);6t^h6@@GKzKqF-3%h@(0-jr>Tkulu_gd(+axeMRg@T7t# zyw$E4%{s2u-hdQxeV+){kdpE&>7}ypHrfkH3AHUZ4TdnG?SsQ3Hnh}!1;T3d5qR<- z4PLu2IvH4w`nn(XJE9+Dtl8(x36vN0);#@xG4Mh-U#Yfv^SUH8$TAcA+<@Wls<|s~ z?uS+dgqTdm-wWuSUT=Omk!0Wp&E$Dgp_SQN0BVZe-CZdFI%7`#{98=+FVYX2%t~F% z??$-)5e;1dLQzpsK+Z;JefzdLAx`uGB5Ua`GOFv{UO5u_#*;gP z27q(dwr#|+VJ87p3VvBFmOJli2Tg~MTq7fMuaZnRctF_jL9D?plquL1wJ*@OBhEmN ztPg_=GTh|;)$SVHCxwnQgM)AJ20iqvI%r%hBePHBWDEV3roif6^^7GWfs%vg))fAkg=o-C#sPr*Efle%BK$4%8e(|972L>(>nd znFV_waq0==&6}K)@Y98N1*h*}o0(n~+Z$ruIEM-@wxl4lS$Ob+TV^8TFd7JXB{;vg ze$;gLXiHoBZS+xyCYimvX}EN{)_~IjNbCSH-&Al& zQ9-q;GjJCFACqP{NaOR)lNc0x1?g1b6@-`)6c@`KuH^P2WHETkql+I~PEIMRQ9i0{ zwN;uJr|`4hmfzqKX41k@&~5R<8C_8no?)M~V=PW8qTY%#`)5M~#|z$3uok+C(dGX% z>uX77rqIrIQZ5Qj=DbS4bP66D$}=aGA(D_+rojx7frlN#34F6up8WkluhSoz4@2mY zhlYof)yrS;^1|G|$0sKfTwGlh0VFm+6fFBWFUm8gzWHvHU^82--VS`(dADCpMnf}n za|6YUgc!|!lJ|dR3(Ll&q75|}JE6w!K{K8<%Laf3)FImqB*idB7Cb4CtSig|pF2tY z6{o$&8Wa^(UJYuEw)mUEr1g)~!nrxQ#P28!Un*4e*gggB+(Cn6%af1MHILj;@}p!N zuML>{i)?TgiPi=F*n?B++k$dS6?{P&bWwRj})`c}SIJE~Bo}R=Bn{>JAmh+9)Q^*!xWYIf*Kdkrw z)DTz|Zq#5xLXj?eFK_%uzdvWcPgZ+EFrT{4d`%@k?bPoM;vAf@S@O+XU*O*8_jMfikmM;6@Y>O^#_z%QgyU8x?SkE2tTS zp&|uDkIWe&>dn8vCw&P98>JR34CZjrQC-ywv>+P|70Nug?y6pL;{M$dDbdl<udK~L%&gof~%sOoPPtE9~)`jNicSq6cYs-2dB`8yT6h1t3d+4A?kkR}AyWIe) z!sDBL{hszyd|@yit!rSY`48GBBwK74zCFRPHeOQYCLifKYswXo6GHW#|a5s;p?Fq5iSviZXEy z6wd&K0Gy-J0Rf^SA|n4mpbZVLoR-=MGOW!n_h&$`u`fajD<72E8t0t`Jxx9vYE~2M z^bS8S^^fO@(o#@Tegh+1qadWxt^`f_m?3DS(!4`tn>il+lU)E}9}FZBPd6vePbY?b zn|Rbn6_h6mjaGFuBp<&#d70GGYr3gIj59E z7i>0&vMS{#chBvzQ31*G>T2TOzke%)dg8HN#~W-XXoxXU!~k<6a2x&EC5;~c3B_Eq zpLeaD8z4i(CRC^bym%2jhVg1>&#yyOfZp8ZAUs+vlhOW>7{aO@dm@85tD-~q&iZKu z{ZuKRZ!y@m1^Cd~X_RJ8vG#W`46{Ky!V}$`!~S`*^YcW5E$Yw9d}XTD}eJtCFyrL{fF?@f%4`Y*^Aj zeu+tE&-zgby&6oD7L~+KFldV_wk0PtIV^E3h{||O%7fy^dkP?u*woT=fP0AJ?~-}2 za^`N9;!ON!#Y{9`iP6B(^2lGyh)2waVK+1R!FPLXM(ebzPc?12Y7{YVuiJL=Lq3dn za7*kL*(*Kl{X_Y4|E{_$UprQpodjn-Co2mMg!EAWRBpvbZjgb(a#+uq3)7zY%a8M4 zU=G-11sL7XMBn(M(6Z-r8f816gk*o}emEN~Uwh6AIIav>I-ih~-1h&rCxa;e3BpZv z1%X2gbxM9y{n}K-LS9RBlXFIHFGGq5e`7Ylj6mtNOQusnUJwr7S(sdt znT7J>6r@G$)RiIq3TM(ao-KYCD2)!V763;9*n+C6Y5^cRWMHc>;#NSB(WcHElycZv z^Ml5d!_(S=ic_d@l!N)?Ry7`8&#Yjt(tt=M+}SYm-FD*{Y~8X@QKF;78L0$G5#M3* z0`X~3R{GsvMEI$_+@!rr4A}d9yuL{gPO_yUtR^eUQ&}p)zAvA)>JCOL8^v*fU@}=G zSGlyP`_cWO4WB{zD1EVHryJmp%7Dr&?tZ`th9!GGrH^jQ7}p5lMc1L?s~$t>c@=q$ zf1pVTU>c)+EGS6pKSz1dx`#mSRUzU=pP5X@;{)OBBb6YpW5b|GlY_3%zp#;&0fA1? zc|kTvyM5Fo@OQ>l5be>?(OQlr5SM0`$$8!Fe{>jjV}GCcTv__~w08%x_;4Tf`ms!x zK(CVds~|lz=Wvsd76K6|oJ2vv_dG`_EqL$RuZB7-`wl+IhE7n=k4Nzmy^J^>$xmnIL^63Xw_+!$+?Q#lXxY0AU-s;`h;$A+f;Z*gSQ@kBDFablI?43|K@z zykAL1B3%rqp0@9)Ojp#MfS9f&-DRLR-AZ?`iiI09$L zrHqP(Ny4(2>X<95wjMNok}6*GCBt|HaKqlf)YZ1%>3%ZL>vhejT2b zM#Hh)IF@TBHDvBY!v=t0y~AQ8WEl5BhVdpROFSI zd11YaB&xhoJh5@pHuAzbDrYX7h(;BsAPk1a*!u=0bP_bqMm4m4CpAw`ma|6o4|S-S zKc|c;kORed7GmR(#o5=U7F;ia^inBAnGK*702~mAlZwp?fv6iG*^`wDn15GXbH$hl zl91EVMjy0mA!)qRHmc$Grg@?gfYnQy(xqRTv1@i?By9FJkCM5M>{7W;3Xarwj>-x; z!>};lAQ`3;Vyb%*JE5Y(y#)@*tyu}E8ErU>KJ~R~n`IMtW2*lJrM&kU7QMZ2dG?a2 z7W{BN>wpz}!)lfaRVvli%3KDV-+whEK*-Y3A*y_+wHWX-V^)fH)fEsV_DRy^MxM5; zvokdxC-|Iw-^mN0=nGl;Cu!i^o2ZD&DoRKr{iQkA&*w;*sV_n_?0;ip%)(RO4%n|cLQZ}#}JEW?PX zjjrh{UW{WxAJkyq_px=~9w`4nE=k*nAW{cry3aLQV+F1bKRw06XAx3lBIu=SWhjOAX7UuOuh-gN*!flxtgG;S&{K&@Vxc9Z9ODD zgyI5>^owm|eCf&AS<)u^QJdo3P^KGSp&Y-NXI@K?Hm<=QolI?wqgH829v?lc&9wf{ z(?seQkAKFbBAZ69beTbBh-*U-eL-|-$6ZQfuNgj&v5TWm^h+$Fo|6CWxa*CS^0U_{ zSSX(^h{Bb@J5&=UV>09BZ;S5t1S`+9S65flF9JB*n+KQq5m6HYmR6UgwgwAUMSXpJ zr!{-te}>Euw{d`Z$5m!io&IV@mx3{{U^1bz+=)5~6Qt``Dg5(K7io$geGD|K27B#0 zY>hNt(kkOb6- zasI;czuzhC?X*U{>oVr`YZf%r>0%v0r|*JhY7M#mNlrf@O}mYZ@fX^ztotz8gD`Bs z5m~=hh~D7A3Vft~yxTHx4YMbb;5}gL3el4Y^Ix=K*xT_}J`q#h>>4jNqu~~JD^(-_ z_g|a4(w3R=!V9qo(zK(6_0y1F(_%2&O2+bLGx{b4v4x>dn1#UzAf)^^_|$o|{Vyqk zFE=vU4~};^x|yVqTOJSdi-IKG&lskvZta*Q&f2BaHx(&iZ;<kI}*#Lu9Th(zLR z^Uz)fi2qF?{gfjG#uC5#M~}9!HgxSKVK5nzm}XlTJSvKhA1WIy$4r4|F{HV|o=b?X~&}*c-VD9DGeK^e)0Z z1Cri?7r3xj;C!S!I#=XKE>>k}ndDto0whUaKmFy)mWPo#%n$r;c2mG}bSq@uPZ!Uh z61w){X{K!4njEmzL=^N$dHZa5xY3n!EW&i+p~U^F!)l2yO|P4#)rnHptar5qd6O5U za_9$Mb}huJ$}4TH{#QD;yaNn@TVeR)sBB;B0Le7={tW1gdDUJggBAC9?s=Dju9tD9 zFU625ka%cA9(DqRT;v6H4`S0SW~<&BblFc2KM_ydw+?d=zFVhP2;5>-puo;xHX{Vf z;C(bLPA!8;(cO~MBZ9zq$byWl9se#R(b^mR zUhNwE_cYSqqyzfEmqUf$8Ru@#l|0s7?_9(Rh8GU5{UC?vRiw0q75re67mqd1+}KR~ zVq7y>xSELO76{n?7uiP8aRnHhpEUKWKNXa|@lQ1H`us%%C6c32(m$ zz5(U0dM!84va-`Z>OfC?p6b8cWTU>wP}BJYpTyt{r&B{|Y)6l(-?uok1d&rzZ4`c{ zV?|*h&MOm;edr3ge78<1%*%yks?k5IgZRXsl@aA)wN5U4VRHJJ6%!Go;FAmy&}0%B znba&3ajGg-^&d1q6oa~< zpLXog5O|;!j5XHndt2}WGQ1UxJ=4+CW6}UAKb#BoUQ6#mIVJ^gS)4>! zGlYvq!L~K(3_|md=B6gkpD$xcNb?DgtC6n0!xJ+)kG<}<{Z23^FhJ{ml>Se~v&I2q zVT;`X53EVS$Tx9Z@T!e46fT63olL(0`k^tZlQ5C5+eW)%{!!Oa$7;3Dc#ou8s2zhu zwm_7a^^biB8@t&aj9Yfj@)e*WAH{H@Wp$6mC^Y{y%RA&1xIHL-8T0Hcgth8`G;7#9 zCf1f0I{C}hsuOL46p0H?4!(?Rq5~?{|eXUSShyfNCpZ5_^nkIcETpj?i0a*Vx1=>APGvoNTxC!w-6V}{fbPJo}hp~@L=ckoo5<^=_C9nX2ajW{~tS? zj-w9SM_xGPUp>F4PjDX^Fn181s{-QydrXMvq!%gTI1y4=vh&Q380RVU?<``1S@+^E?{0Ieq0?ns(Ru0k!mBVs~Ah~eRhUub$B0~Nx{(m=G;FSrc}9z}jb)B?8C$@=vTV<0#LN9ldyO)C;q$Q>3(RNpB(6#>Cj~856 zF89a6AjAor0#A`d?X{N&FOSQ}c?i(k}z|96vge z?(@H_G{5OiTz$G~CCLWSBLk&*_h0i`-!n{xaA2?bgG^%xcG)mg!P90S+PCOex**9c z=HB6TEKHeO*}f}!(5mj$Jvt0;z=vJzeo2@Z?goDrOPk`9oU~@xIK&b{gPetc@<*5{O*UE?FD+AwgE+CsauvVEZW4! zl+jfq~0!P(8u)rcaGXt53#b!qFJ7_1+BexGMb&y)*^wfyyq1_io0JtT63 z_K1_Vi6X60_G0FqJ;>nX`4B6fKr&YOwSW$OO(3EgP}+Ts?-L;`*z9f1`Ox}5mir&b zvs$nOLJTVB1Rxb+rglLow1mvae3%X;(O(8y{v+G)TMnk1)_i%ouj4snmK&2*dcD3c z@=$;HC7Xhu@kaBL^e%;%TDXi?T19Bl2j*y-eWv%9}R60dFnroTqEAo{BvRN zc`iP?HwF8;;?@T7za){ zaC-gI2NUQCx1r^~pu_QG{GYvS}aVuvUCZRq9rB3jeEaqg54OH_8Odk@K) z^*2PQZp}G!uaV#KLGKwy4|`S~+Uu=yjM3VM)^^pkZyJ}$43Iu=Po%uEa2=c+O?2sX zM+&2={wbWakD(9&$80vVk%M5SS1=cjo_vahc@7Y^#?-!>+IM*#f3KOt zjs>UAL+}mi`+p}cm9#jr*mHa7CIMY$&WRPzR zgq=Mjf7}E{PTRilIDOii6;%p#WR+Hkab$Jp`gl%6P3z~n^EJkNp5&Q5@HJi;+Pakd zYs4jIR$hN2N4G&H#;@iwcYw(wB;V9`26)*2s<9+vs3_h?Cv_J-bfLoEf!o%5p%|?O#nWnsog|3o zR-fbEw}0NzJU_JG|8sMZ?vs*+kehJOA-`bNqUo2BO9B&cE)| zc*wQk%-iqRSK`Y-)2k;ZIp?B5!5&_Y5BPH@J**HOq^%sW^t5F@Xx)sE=l3V6FQ-9$ z^M4VyS8fyf;a3^_qUT}{#~4#qmHdnAW7;}-?r~AN2cRdTyb(aq5LtUb7B$sSD!T1m zi2;I76S$pgT4)q{q2X=(Dl8Y>aJlGAxI8@a5eunH$bL(E)VBL*Y4i+%dXoIPM4{*t ze1Oil9{Z#=En@ie4g|X{;XS0XG$h9_OWSo|N__HubbyxZVs#R$C*0*S?X38E6Rj84 z49gam{3}BSH$PC+M#b@p^+h3*2x=()#0Twl_@aWGPx%tO5@|BXkF1JTW^_omv7Q)*GL(y$ zlUQ{yy3pFvPF+#6#noDxVAo#5dUNPgQHRcl%rH zajHiI8RM;(2r1^vI7=vs#3j_@vFDV^5~^<8YZ`&_@5;b0toJ}D=c&IU`HxI3vS;+B zacxg?TUPPpREOg#VjbJ0hu-GQ4RMF_RzT&XRstuIYw{ZU6*%Z|sMx+QNktxRc`{av zsaZNd%MCwI7Z~!P6byU8;ytNN^y$x^m6YIR%{#{oo z+|qnecW#=8vu~YXRRVLc!)zZ%<>X0;Z^nP}JMoPrnHRczRNoHilU4#=IO8|-5CdJ4 z2j-=~@E5g7@_O`odh{(Bi5J`S=~SA5ime{soEb{MdX%x`vSed+{*2is6Q8TfiBj6j zF(Yb`!9VCybn70xJL_u3;+r)@tlIw^4oR~|io{66jx!*`(i-XLG8a+Qc?#};>rT%}<-e{2Q5A?^3jYgIU6=x^lS9o(|&xbjnih3c%Mh=&! z{R|vr!XxVORLpn&yk$TtN2igsWqCGmal?@0(4P4^sRYW>C$4`aqjUSO$) ztrB6ey~RfkA8?_x`hqGkD%-$CY|mKo$>yEaJo9{6s42zPyhx%NTbzHb$If{A3Qg!r zq&mZ(*?5jHA0vp|sAacCI@cF^wVxPKB~(c9N$Dk7rUn%&Qbxk+@1J~X{EO0af-N7+ z$;WLB1^b#1?_SKeFcO1xYzIr;NjES;%(CWGHYeSI0IE&TQM^-h#nypd6rR^}DLyV?0EvC-V0limJ) zeaF`b{h5xZcOq(;5c4%;GH$o#xGNL+*5yfbZ{Su!Rc`Qw z+2RX9RPCrF8_M4f3fazPEtaGBE&L6okvLhgv6VLF74OoP9;8Ng&X-oi`#LVKp8bd7 z$@$z%t_fG~73*6iVMpJ2j0mzMg8b`ZV4ip45{zcC5!V6I$lAfs&e~da2r((?^^Ig% zMTH_HM?9cqv89}=t9Dw_V)ibGf#fXn>#8QM8E7Ii^J~3|N&^nk(US0SU9B+^;^>lc zM1!mAz7DN!6;XuGP>M@wNjg$py5%Y|Ym=A*#oVGINSTOBMOy%J(9}iAYnPJ3yLzp9 z0!7XeYZzu9Z*pv`)b}=4biz=SmQQJ@bEpxNQS;J++We^FUHW-`*Q-6r$EO#2)1^M4 zZ)dyoiBVh(d0o)gNIn`c)B_e$F}s*c69-v%sjKK~3XgalZ2HJEbTOFEF?~GC`kTHd zE{_O!v2!>2$uk^jN$gfhPXO(yVW0i4Wv`~0obYS1GURiW8y;&}66 z?Z>=8()*aBtlKNGHFEla8G<_#j#A%?Ny81vjRc5{jXhuWsX4uDL&R$#oXR_$nmQ}B z_Nz`ZvHO7EnvYrCpp5-tJ&*cyr;-h%Liz~IScrDpgU?^|Z_YW~p)dN}-64ILg;_@x zHdqqXIQcUpm8-)cX@AGSvI%z$D<@ZUubi{vGxn~zQ8$iIc8%$Uv+>*fz}H@1FTw2{ zjmZ&(<^*K#H?L3c27-|rt>3q#>HZ8kUJ?daOVYRa?J7?Iays1;@>~&?#CglI%9n79 z_iLBV3H=8LM@irntGp`3uad>#QRtSbW_z&AchFNcu=s-N*qeq7l9|6JC!hQ36kgOI zd?8qbsiwiE=nc&r@4&J#_??>F@L<6Yf3LO#by&}4wY8tM#s|K87(VS>Qjse!=Ebeg zhUi1k?F$W1V@af&7c|FS@OP1q*~v~*PDT>63s2umtV;V-nB0VfiHbj|I6Xv8POcF!-u4ooDQbdUeLcnPt@6s8!;3TY=6&k?ZJbzI zzVF7~0&vbBEJ^wOhr!dnzNr*5f7{)Vk`ov@mIF2u9;6Y{H)Z#Jyow)KT30ggU`}Xm z&%2oSPi+i{`OrJj?#GSf+$a0<*s*V%lJ^sfv;e@esyw?=v4>S+VaVDNYO$w&nL8h5 z!@oXFi6FncktUtIz`Bv%IgK1oojGVYRIasq2H0htWSeiKURP*0=NXYVx{w(B?%Qk zxT1_bM#jdaVicd7s%r@?JR>{RwC1oI1<8o})jtp&ogR|Rjp<8jUr#&7g}FRx^^p@a z&L&WI^Z=t)R*?gjr(vdO?e~)@LR1x_6B|9{I8r|el@@=e&<8Uqb>)8#p%w8|Odx+P zU!we==yn?X?`gRwB*gCqu^u6**wZL24VOGNUU_A4eJYBV&fmO`EN+31^WoaWL+Vt{ zP=)i~gS)6r%TUpd&v`GNtyiNp@)_)#TgSDD_(UEdbBHr9YaSw4&-i5o2PC>Rmdo<-pG|+RwtF2ucG~>NBO0DMqJtsnYuAdjy^_+OYexsiI6y2tD(&(`vZs;f>a#771r2 zeF3Z0U%!?#@|}v%AN;L}6CMe0_Fpw@b|3*{h01qmIDlnRLPzx$rA!RaeaPV;=%q8JTUKM5P`rxEmnt@FIrqyxoyXD zlmN*_(A`C0b8|YNh4n(0En(4oul?IPq>%N&d`DebMcGQt`N;Z!{(;@+^XuZ2zrV>6 z&=nPsS7;}{YP6ju9x1XC=e_Vy@&nbPGrcY-WFjx26Ku%tk1qEijLKg#($T zkMSyviF=T`Qc`6w59(K-7ID~Yq9KJ#p8qAjYsK?1oQvylu~nlJNW?9G9t{xu*EYXC z5;rAa``4F7a@F;4n*{E?JY6VL+W=;=95p^~N9pQI$Fe|(NW}#T+w0@chA67AP-j@! zU&IPyt;NDb1$L+(IXF0`8A3|X+jL@Arb2-3S8S=Pku=z+Gdo_OKQxsGb4F(@VXXlt zc;2*$4hOBR8U>|FETlL08skheByFW~fuKfXbT_XyTsnurm5MLhntfgPYC29zGbSbI zIahdhZnV{>wX#?3;MtnQOY-OYDFx#`7`3Q(TOkaiOxBO2qTyLNE|*W(g>aO0MbRyTYFlRy2+nmr8^pQ$d72J-<^3&(6-a zfHsWi$dIfuC01evGHgDtg(hwYh}V7KW64#I5pn^GVZmVI+ev?*sxCOq?UF^+1vMn=QF?a8OuLA& z{ce6cc}3E*cn962=w8$P01jWI5S6841ep?blEAv0c{m|)vOk`3?=Q?;us}(tpzb$G zn!6Hmtm`^pB9tcE;9qrGAph8hF7vt$MM29G5}4K11iDnKoEZlqV&iK>`WsYoqn|e+ XbHS!YB`b-QAmE`Sr!HG7Z5H-F5(f~d literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/gui/widgets.png b/resources/assets/enderio/textures/gui/widgets.png index 62f5e115b6a56b5baf00319a2db31bb843314fa1..4fe5e8a0396dcc2a4b36ce8f91efb94d98dd78be 100644 GIT binary patch literal 37943 zcmbSyby(AF^!F$!l?DSz5u`>+juD~=BB9bD-5}iz5JW&iBm^Z@x*LQIlu{Zb9Hn%R z++btdJHY38e%E{buJ@0Zf7rg&79KVLC2KcJ8;%Dq7IrqeHWt?Y?%!?X0RR$rhbIPJ z2AU6Lt=wFMEl$S>`?)+P%mx7D!G6yztekATI4o`K99%(Mh%YcM4hL%xm%gN?h~{$@ z8+!+}01unT0gs+o1vpvBSaX3DIOP3g2@AN`cv*1xxj4Ie%KCx0&eoMBd_H{)VQLrO+iR8m4lR8){dOhi;1C@KOJlMxaXm6ec^ z6}`jp_lJwHn}@ZntnS@=fA=DM1991Vc|Df}0)2gbg?+_^-8}4oqB1fvKoK#Zn3xb@ zgpjAdtCxkJkgF&6KP%j|@wD=Ac<$xk=E`xpqJ^cKw-<J+>e_g^d3#t9>|x9O&t!t`{@)v& z4kSn;tL5Q9Fp7oqT{kOl7aLcv2X{eSgue(|J6Ox!5wjGxmJ*c_k`TRPD`agYVJRdn zZD}PWCSq+PZYwHkV`FLg&pQ9xd?_(yNfBuoRVArY8>mVs%iL8`QW8@YRT5XZtD-FP z&)f&Do?aHNRyP0a?LgT3@7%lp&$+TH9yS(UZXQqE+?@aM0&ROYFE>wnx91!xDja=mXJZaj`*;m(rX$^REKp2AwP)N<=^F z3*EiFCy~+dPAM*WqTt?}D-5lVM3;|;7CVn#Gq6yGlXEFErjv(#Q~J$1&{8l9nnvrD zLAIXG71fmlYRv>r;0vPQrlxgzW9!@KuEVkn(R?Qg&WPkB*M{qtiV=JB^GNPN~{Ur+f z-2GYsnt}~r6G+L}kCra?W^<4$S~?igh|rcp%PMET*rr)9FB$VlxDRUvZ%$w%yXx#= zP`27wR26%L$^_Fo@Sw>GhGSdX?K)aTWV7kFu*+V?ZVXC#nX4`^Io`)ZN7y}ndtMIK zIy{QnW|^Qv2Sm49p!g}!8~o~-N2lMHkbwRd@HEYX~u z7ZNK7wHbORHep;bu`)ItBUqn!U(q-x;6yp~!od5?%>Fu3cX_iY!TO=#2nxfOs?6`| zwX0ktt~Fr}gE!nS`QMEhp!S#FIcE0vdfwVNnAlm4U?Cj!`ZfFzN-0oRnN1Rl8ATOz z)2*xxex5)yAP?-R%@U$;xD6j=6nnK}U~qhd{KaN4R%T=4lE2B~N#5X{13`*bbL-(K zg^!7LxetTzn7M{2JB9spl{LyMKe3}Eil+vp9VRZlxATb?C^|$8$+--q^lY^ z_Had|Quj(RVg#$N#MG`Nb~0Ai#t7O4o5H`|{y|Am$I$E++{&qSx3D#l=lWh^gkVFS zfy0~od3=wqRZFX6I}NXxTc<}s$z@a7@(ME(ZLaOfM|Ry$xW9_gmQXsG$Z@ZL58|7Ma4x2RJd{?M;x=bp;&_n|U2ZdX>cyf}Uo&N0bn$17v+A+RsUTmNcB=Q~yTH0`o?yk7Z*Kj-QA@dpimFpw zC5xt3U*dY6U7BG#;^t!XP_~`UKor{?7tI^wXzslR%Mm5-VSYE*=nLR%*)*c77OS+ z@#Rcrpl{B~^T%^)wD!EvIWVCDnKQ3nz3A^4Bk!)j&CR_ZLVoxOX$JDwV3A>|(;$y)Nn0IHB%n^kvLQSTH82uGJH1kuBpV<(drNQH@_i(vSCDF_vt3z>$6_!kv z;=P_paPFB0aC)+ZYF{kn%h$7h6DiomMcv3}3wOG)mB_;$lODC~8zq>VcVsl&GS3yu zC6VyO{!--7%C&3V+GJo*NNbl#EI-N1bIL67A&7 z3Y62OM!s9uGvjaD(iA1ApE;_X{Ine0kZ5-g zb$w6b;2O*2vFj9u^8wS!PV^Db1kQw~t09NpYnaW$7BhiYFBK3iKCvwd=r42`?s*Ul zIv6`e9b6FW7)KibAb>Be?kyU{p84C=p)u8-D$Fj0Uq940s+8n2b&9B<7^>9{gDr&1 zTw(Szs60a|)dj|pfx6DZnw7&~2Mv9@u_y)oOcL53G2;u2#dcIMd<2*?!Wi0d4u8YBL%Beo9&9RPaQ6Uqp0es3% zwpZdKwvnDzC^F`Kz4fickCs`r7w)266Ne*9ViLs0f3MYIIZz@ z0OeG(;bN=YBfU3Wrpb}z6%`YkzX{o}M|X(%K5YN93bR24!NNmWM#CSf``dw;b-6;E zrnx|`kRFCnr_PQ%*>zQB_nv+Fy@#uVtrLO=d2n3oc$oS6x(gP`UVSargZE(N$)XHj zh9>O~(X|F)C{k_pUC1z^V0Hg;Chvq!vJ~SUlF^?xRxki7I5s;Tsqmfx1R(GT3PTM- zRNZ(fF&9#^ukveZ-(jHDKt#3bS=sS|Y>Z>c$32tb^&rmJ&uRiRh6bw4K|S2GG3m^m zOtJE^xs!GkRU<>e%wyU#OD`GYj9~;=9otbJH!jT1D|W(;k02(h5x$U$EC9BN8GD&! zV{P>iMQ?PSOQKf^KkFW{>dSy;LuHI|R>XGkOTfSqA3xf6>VfX4&bj;t_l;ZiQ_|N? zMLicdm-v)0(DI*4-}*@gpl{-?s>K_j2Q%iMRG6~Elr#j#&*8c+O@YjOXS{s^f7ztz z5RaVUUE)Xppw?$nAb?GlzrzBG{rNL_#?p1Yr-yCNWcpmH)oiIKd77JNR=6yCIsvj(H@LfT5eq8!nkD~>{@+%KhU#h#9o?Fj z_nrmf0g!o1$m5W{X@MXNG%8qjx1Y=bUiVkSkVHT-uTScD6JAO8P;t?h&SCp*zOV#ausr~1#%Yfi5`IjEfk6C(%m0vA|B%R4s!7D z5JSnAMOL5gM3^~gj@<1nA(a+HNmG=ln?5xU)G9!{yu4;nzfS$c zsR3J^knJ3G$VT~(ou6H{PvIO4jR!i=7JR+-GhoZnzQ#Fws|H&)p^(k)d59tmRyid3 z>x#GEl5-?KxHclZt56-{J>v-SeQJE+pW)pV8EjIesGbjizmP=}Dmr26n>nL^Uj6us z#AKSnxbJo(vZzkSK5a-r#nb3qri$Q>%wB~M%Sf6H(91oEe|93uQ}XI$(m(KGwJkCA`DK%itq58Ycw6;coadmAyf0aL{uMX9zwhyq1{|ML z0m)tYOVxjouI55oORh+afyPYc-5fmR5{c;*z5JFMa)x?8nPib^i$lf zAly;kXfBm0!dv`3yOJ_9GSpkx%6;0c5TTq`Nz(LEON7d|4=cpdIkeML!8P_NGlfs6lo?N56r2rwEiXo zR!)_aH~(-oKbdDCC*uGChLVY^$gGp=ZIg%uWA1<6pe)X!XQpBW$<%H4iiJ8|IoLBbgb8Z|P*UR~AihLZnKH`S2T-^;RgtUNVWE>hQ zAlMD@tk6gk*p3qn>D079N8Cid%Ki)YwpOUR!wyWh0F zq+D|MmV--3KbiaIV!84uO|$ztJQ#StyfuapMHTJHT?gc-m>T4$j9nTWoFib1;@e|cqSb4K>N0VQuwHGyrcT9Y-GeWvho%9(^U)haxYyM}hkQp4=3$R23VVLKv-~8nr9U#(qfUT_6q+?qlE|xEUuFXV zi>ei;#1|q83Q)oSViX{xGZ7b`S3D}qU`n)GkQZ|=fK70@a{S)CbDXLDA1G_spgbeu zeuf3p-V>&F4YK3-ANo+Ss~>-or1Z~rzk60EpXnL8>Gxzv1*tIE05sI0`-QyrApuw0 z8JBl2cRy^K9aUpDn6)S__^v$+<&Kxe2O|QrXR-pfoBlbNqSHeVK={3WzkUbn$bhrJ z$IsioA7b@67ivGx>z#wg*$g@i75{O+RZG?g8ZwXy&mqS6;5j0 zkP1z|!3ms%qcdzz9)LbV!SGlg0h?FBu^~6LRq0l~5zo~*rOkvOYqI-IAge*8h5#*M zc~-Zeh3n!IOc`;Z`*kZMTffl<=Mckbg9L=Cjmh7;S5)*w+{h-dKHVSW8?x8@MwO$;meG)qKXHK-)N;gvXJ$reagm=h%=Xlk%+U%)44j-sJv+h3(7E8akz+H$Mj z{!)0}#(g}TfmW8ihF0OQNbArGZ$eFI5cCYu@-L5;(58wIo2=1((hWx)4?+~k8+u5F zd@@Mui)=s5>$Vr`3XczYWvC^Wn{L$_7DS&XbTdLiZ*(qhoFQa6ZP2j=heS=g86*gw z>!gJkzVTwB85uG>ue{1GLt(#S#f~x1vO*0fgh+UP(7PMZ6oQwvXi~XNRpuSK4?g~` zWeXo>V+_WhWJs@y$T}%JenfcG@oBkhXt{A_$aCQh z9jEhrC^@On4FtIwAl$Eb64SmP4+rty?dVY&77L=U>JI=IQ<|mjL6p6$t53EDKO7M!Lno6s7G*S5bGTSpUXX%w#pT zy_QBggy7RabIf%qS5|nSJR!Rw_W{2@(14aqtd}b4CR?J42JA``}^MT_&>ChhH{&_E@N5<`_ zBaiX*+$=WIglugA=22es^lS6ulF_XJ6fQ;pFr+{S2_G-4>#HS7D}p=U5l2{+plYz~ z^%YZpj;aX6D`<;m0VF(<$L6EerfrBDBmQGncF{-r+#<}m&w|jQ)L;CwLb-O?`fpU{ z#q`$2z5V!_SVUa>?XawlCRIf3ef!USjZO0hQ}&0fhci=RZ$GE^JX!7~+)36zyV^ojL@GZm5iVK9Mxyw#9rK zJ~!5qlR3ZZ3* zy>qyrU8K?+w>){TpyEdx$F%cSO{p*$Nmghq3Dt-th^W;Fhq(>t5ghYW>+bH}Vm|y7 zJLF{Obcnx#&>0<r`fkx3akZTzSdOJgcB&>8gnJe`59aIy`<~ z1fb|<^?W^}uwgj3UP9z|S#g+kEX0D~8rf%lF%LK27!2jvBiNK3z;w!eX>~1W+HBHH zQ-2XS8)xq(CCB+GtvSvMjfc}RKC{YN{eB|Ku_p&p10MUE`q}r-qK&}HC0I-poR%sc+JytJsfTB4>W9mJR}V>$^CP4tM`@8S^JL5*L4T z9D!V0f28m9Ya*re4t&dcCI8-buzis;L}aVLQSdBUZJZ!Mqe?1)34?N&qGODNmHU6#nm3!fNrw(H@8B!#6iS*2>7FSFm|M54vN; zeLOjMYJ9O5GJgT>TTp_E<1x*9-e(WcH)?q~tdGy@f*}%-``u+SGmZn+wfD+w!W~=R zu!6-ihmGRoTzvxIt)ly`~x^?Kq+DG;kg_dNoH4AVnf>W{Ys-8#O1hjrOYK<-J z`_DK%HCv%*-rwxFKkS>x4^lyv95okH;S56+OXuaeGEJNOdTNG7%=(j}3pyoB(5&~P z#p_RMuwnJ)*V)fOv2P3Geq;gberkCPjOGQT;wyL96XKd+^|nYbsA=P!M)*G~M&gFmXkm<tyRa-!*ukGdVw5xo$7ysULCb)Sh`EZ|J|3en+WDl!UIp zgRKgiTZjg`_vs6{$I8^5nExA9s*Kipw`28+oO=&RO}vIx1=cAI9C~5q|3jQYy1A^( zepZoc*I--ly!yMx*O;E96|WvKOtIS&NE)H>kOm8u(}$$Ulh79^S#pG|-d-v9>4ouX zDZ-e8V1ydQ2sa3Fb~Lo*jF2Zf4!l*G0uDj-#xVc#L8@hQ~a*1JoJyPYhl@-%vl1nQvJ2qc^_k0@K6$~ zxM`7jR3}WER~^!@FAtE!Em9I%1s)W^r;Rf)SY%_q;2$ma#3vXz7e~+A2v{GXLKXRY zgLS%R&$YS;i{rFIoWt?sGq#YLRC-$2(q*67e4l#kVrC0>zsY2nzZ}*>}Nf7pJ9QlVb1iS1|lM< z3yR8l1Q5bA<$UElW60#EaVI996&hv$?bYUd{&WV+bXuWC9Q09jouu6-+F2&wAH5lo z*zQMs!SU2My_Y>tJNSw8x>hzK$`lWd4v1J%=M~7G9lvEAn5K`L4S49AaTbXYr60&c zRS3EkxYzIuUmai_)wajJij6uIEJc{o8No1)pIq2*#y=+4Dz!ha3piC2ODWFS2T#>W zT0gzQ@pi@HX0VmRHjKU8WzMM=^jaPJMipj4X|>w8>@JqBV_38R zEkqj6{82Ll^!!BoNG&o#xKP~Ajjj52Zok5-dVpQ44$Stp6-o z(ye?$Ppd5h3Rxjr?aVW$?}gB*E1Lf|>e*=v!0>~rY)^=O?V~m$7@ke&qy=O4X5(GK zqqcB#!CANYiZQ_c6xoUmXip7d2qIv*!B?j}95}cwvSeY(H&oOOiZH*J914@!O#x;4 ze4DeI2!D3@6p*Wb>_mo?UKCX0{CK(+*6_m&y*Ud449gBXfEnL-i2ya_i zLU;KSo=Z!SQ8gWM>R}Oyl8cn@w9X-EJb&rEQVW3kfV4CkWA4IyqI<}$ON{#yPCfE> za8dwq;c3*vYl2t^xce66_EJ6;(u4-;o;|0yP3Gi%L9s$TR8Kh1wV~IIj1ZO_Nnx$@ zCImqIe05Zn3YEefF|3YCxE;QV&l9NlbQaf7i3~1hx$n-EcP3c(3joy54IPopv`pBH zf|KWy&vLq*Psvzu@UUw`|K#Mm-B#kG>%s!Rd}K2Z>RNyhtCGQzC;aIPga-PSg1-=! zax)uCQ;auuYn7b03Z>OmCsSm5xv;Q+43n0Wv|&&5%b6$Qhis4wvUT~+k4@2v+;?LZ?)8%O_Hm$GGvyu3{Gk_hPbPNW${ZcQ7k2 zjWu!*M?MB7prRfTt#2V8QTRzKp)c|iofIW5D8`Og+Aw|`z+MWh<;3uG#rkyK5J1#G zkl7P3Khj0{gM@l7{GM-_p2jyKI6AumLa=-p@$WC1`+~O`AJEy2DFYCgm3e6cSHDYX z74nlyt@l1w&ArIP)<9r12Iy4{0U{h!eu>oO_hbu>lJiqCRjAwTV;X(`599MuHl}Pj zvnmq6QCXl;Z?o5er>$vUT^`#{Svg}AzB(`$kJ(7^du^sB4UWs;2{M1q=Ct6uW@ z=oHrdqQ*jZ(A@E3ptV8=tRhv0s=CGg-NhM=#niBsSg#p*{|Y8UOrzU z?w-Sk^sm&TV6jjxT`xSrTOG+bn9xurX0YJ>g(#fC$#3UZ*YB)I<8#Z{+qV3sUb9y| z&Li!Z@);n3vlui(=y31v-RmRTom-eMPYFqsxHZ9mpNWoqs2`ygWHJHj+tqgKT6x&D zvKgQ7{=@WqE9FRZvKf+gHX`5C2be(ny+I}OvG~niN1Io z&J0bkscs;ERzs8h!!DQ(H<9J72kl%E{31MG^NK8XXoszOu=&__l$lHs6j9f!j{*)G z(&4ml>-zm_&XMCC)I=7X%ppN7etfnaBd<}CnMs`Z{7x=!1onUhGW>AGAXXKNS-m11 z4@1*%GnB9|tFjk=TEVQeQ6VGsVOYd$t6U9G>-RC@_`CbpmzS)EYvsSw`?7*|GHY z=vH~9FNwIN$@KJe>}+@NF}{`zp@rBN+A+hR>?n>F5}=4b-q&XDf-eNU-}Vs=%$5>?Mn7~zuME0IzEh#MK{FUon|S82rUkP zB%xg-H1V3l!OJi(NG#3#`e!{sLA@<912sIYQ5363Pslc8<}x}hc&foITfdFz5ICW* z++|LEEFZSr5Ic!e#&kDbf!y551zmmI$4YxwXLvWb<=*9Rq#olEBZ1Q0W(2sr*=FmD;dIPSWjlJJKKNQ8G zY!B2KBis1NxST(^=}#SkzNck-096_oc)bZATV6t@ri0%@mA=>E z_-cyFipOWA!WK}fl(b8C>+>jH4Y8L@lubeIGQBZW!y8dRj_TeR`c7Nqw{Bf1S?qyr zcaYegymQ|#ie28G^X&%a<6AaX9ZobuOoDTK>wtO2wi@$sGu z--_p05ZTcU^qBhyp#$!2jk#(qL93<<-kDfrMeM-IeDs@Nl|?T63*=qOkda!e*cxtp zJ=ngOJoDLQ`9h~G_h*4-0yT3u>}@yfYZy?QMI492puK^DwkKHas1p#OAcwBZaTf!A zh!U@3MI$g>RtH~xd2LAe1)4hGvl0qN~T7fe4< zKIWwizci7}bdd5%FYG4853>g+Z%NyV)eVf*@Ho*5hz}vww`oUz`4m*KNP=8sACK6g%BoJo*5J*G4Tflhvi z@7ao_sl^DCJ6cqiydA$q2-QZ&^b~v6sOa^}4aKk42D&h+tHw)(R`~6QT~?!4#5ZU* zGA6Rww(PLN`H+Xc8%`&2lt$3j1K_ULmd(4tYT!xU;V`V9XIF3QZJ7^t1B0s2XaT@A z#LQ0vxvUw=@g6$7`<%`~;aB z+4er!PY#Vd$X@ZLFxASEgNQC9AUmtm93cKY!Pq;$$!M2U>vQSHWPxF{%IZach@|F| z+cx`@UM_L%AOZJZ8OB@v`cx-H=D1ps8OYce$7-_--n8J=lM}xNr-E(d1N)riPlmpjk@o%GPc9Dq;-1{tc zc2maoc+QEy;iC=G_7F_k;NYNY&tq8+ySPO^D)bG=oMqa=ry;E@JFAWHvgJQf?6X>L zc07q*vB*XlA=|1eNn_N4Q5(C3&M0v+x!zNkhW)QEL@M9~vg z?dRBSI0==z6P(ypasN$D0dvxBgOS1F;hei_P)Dm=ZSl{Ne!^p``z#1`|SNK<4h#Mks@b2&xlO%OWfl>mPw!F=yJH8z&w8Hc&20b zo_p6#?)sHWUh4vVe_Mao@4LG#zR&BX^O9j)k?IwgYjY9g4a1R-QjWo-#@D%0YLZvK z6PN5=M$%XjaQb$u67nD5!El13x8QbD>t#Ij`)3@IbpXpaWP>MLc-a(v&N6Qrb~k+RnRj-ak!vEY$lH5eOm! z8yr)J^}PqBrGlC}!HrQmJhTr1n#(+L2E#dQtBkOo2(e*rz!rE^{tayniP4739GCLleFs{2Nyn zI`(z2A!a`bQTwzd5r?IH!Q3IcoV7xx2#dW6F&vmQr{JrlO+s?n^H6n$|J5f4BFyn^ zTL&4d@z@{~=1R*1#EER>^gk{I0+-`Xi5b+*=PKGmLqGaLh(Zf46qKz z?0ELtd7o^F2QPy=&8I;1ZK6y3hs1swwQ!UP6ZrcGg0y&gja2LasE6NfZ2c85e=FdugRrF4FvgJJ)9_y8jIY_3I>Lucl1RD%Nb&fhe z?dlGJ7RdqfINEZ1^9UgGtb_jo5HkWyy$+#+i}y<7LcZi;Xvzk9XaSs`eo`sg)1}30 zKx;;KcW8Ye1vG|(dyyjQbNYvi!PG#YgC+{UB~UR9RJsVUOMb15&!Q#J3FwX@UdS5{ z{d|K^@63&j;8Rp2a3M+@Gf=be#<{bCkRP!B^j&YsyJc`<9rbv_*X6)>nBZy%()=ex zjdKSx!A4}R^zLr~#}TQg-K1qwN6z}ZttDD-a>Y2rKl0hZH&$XLbV;L4z#lPN{3aw3 zOW;DcnE=OwU2)g9sBeGZ@+7=FQ5r0UGkY1Qg)Z{6(B+Zc?-TzLA~x|#|EvBNJ?y-I>}|nC zpRrD(-{JiO*>;4jMX+-oy+VDYHwph&0hgQIy}Uus)Ik=KVHeo_eiMDsDn>nk!0;HD8y?wPpO;-P^%mf638ImA8)lWcmtWCdeAlN@ z2srHw$1Q^7`pdXb3i@Ley6JaxY+Tt|)@~9P&!l*hTSvC@DO5P<%hry6vd*6<&L4H0 za)>t7r>mUWes{0cBBRW3s`+8=W`|4Por0}v#3_!QNL2bDw(Kf9d&7#_4CZ6JEWbGJ zXe#?L5S8OZ{H$c~ZQx-7Wbw`YO@*uAHH3FXU}iAQQaE-kFocc+mPk`-C!rgWUEXPl$R)?T?@FOxWDaQu)*W^Z5fQsZ1zC>luTZmr z75+Qz@i0z)2t`?7%Pz;N~-r>(*@5lX@)9P^E1jAi!Q@u(6=xcJ@+K|N{l{miHCtHwQ@T)0OOR8X5aHh~|szmDE!!oWP54vk*#eG`hK}dr@ zV0B9wg+1iN#`&)HQXH5O=ugwlnJz4WOS1MQs05DNZrLBO#$J%RWuQt!^#S zZSuD4m{nsGG@O`6_+w}jG?$~tmpqv3E=Tttak|f)s0&9E8!VT>Tn3^Z;OkU9RtvVM61y+m(#foVJ2lcxQNSX9Zc zHTo)a``n%*W1IRZA1%6zMSZV`N^>#H%+#GCB+Z?feK1&38H?a{dA^^ur2n-WDmAi;a800W}xm}?XSvFJE$_l&G&96s%`V0 zZ;=*Q%maVFt%T1Mj?*6z>BCtpbNo>NWOsY^V8TKUV7)V8G5d8a;`^Jx15e_eW5V0+ z=0|2nS+wTuVcmo-qxuHXBs4hCF*x=avs-8jv&OLR`yVg#XW4Ju&}@L0tyA-~jH^*7 zwp^rD-qTKvl8=b4rH-X}y1J8yVgkrKLWht1p=P8Iq2MqTy_~XEN+vfY@z%D2LAxrn zC|_xwr&L&fABV6j3so>yB=}ufWLMw~^0`9ecQ40TkprWA z^(#~NSDtL0(w0hMMhd>GN6N!qkUye7`vfwNZIVGihM^OkcaOrht0iSAOhX#fZJ?Mo4NwyW8N}2 z`VhSN*2>~()mO9lFZ;t&^9vuu7!rEv?z38efZ->>s2Se^DxE_0EH|B%)@&3TDVj5i zHHk_wJ%o2$inJ(*Su1Fs;jvbzNmP*D^L~uRdJOTcY~Bcgh&u`zYb5F< z%e-stB{!*P;S8LRjj{&YYV^m5CzOo`BN|_hwtGa`kJ`v}d(F%LycQo&!=w?I3O*!| zU7L;2qa$R{>;p3Dka`&>cxJsuVX;wIieb`N*-HU_MXsJa38c_?r9tmFzmJ|#osoFr z11{-~b*A3U)3=}m(eq#S1!k<3xEyMDqP?m_r?Om(d%u{K82!nj2tT@2eE3PQ>Vf56 zb%mJ*nvv(;k82GJcZyS*cESyE?i7iLp1j3)#>C#-iyqN->sT0e_=Rzvx(UMyIf5@_ zHm_K<^R0|6LN&$AgsvC3O;*|8DJV;N5{Ky2`u(EwqQEb$tWkm8&Yb4gk&0FphJV@dNafVRahNG9ki)WxcY%>*t?^ve|I15LMgl( z_vg^#4f$AqD&^)eYSQE5o2yZT*ed}Xh4(2OESdAV4;v9N)-fnKa`ARBgqc?eIQK?-lfv=F2GJ%N=68?a2b2+v7{c>xMIG z_)G4LE68z|?;BX8zaDh#*2^q{@58rZ>N?(M7WqNCU%MFC&FpLPK7Z58p&s^uH|C`u zD}1ZmRCh99mCi>*7&+sJkP5|>k_cEAGi@kUMSE6N7EhR_22CwpP~=c$k{ibzVelua zK0DBX$Q@6b6COYB6#2Q}gk6-U^icjm^vT7>S#0$e+R2{#Z6U|3yTQXY0ZV?nT#COG zleo%__4oD>PkCSDZH;PyK_8z#vjxCaq{+UEJD4TDrelg+7q{tX+XFDV%1yvtqaN#thrH)PwVX9sm7w5vt;ex)0{QV*(k zv9)X$cJb{*Z(j*?>HnTzx7|4m4Caz+l}s^FshO!IHWu7=EiJ5_XRx8lHkiw+t!y<(JcisZ3%F&9>>}F(;dH`Hg zMa*m&oP;}JC3at1fa9=p_?ecICE(ygYE=kMLc0U^#%+E@jL?8v0|8{aoFa25AX?fO zWnS(M9>W2D@}$)^lMqGQkjANvDAwP|mw@-_(Pbli%qQc;AL^=t3?nN?AL;RxR$LcN z2@t$%wEN90;$XAZA^MTnj2CF4v`s4WXr^%sogbI4!!F9b(RH(Ia5Ii9)NL5OyFUq) zl$wUTW$H_6Z4C19y>pz5c+z^1~n)e{vul zars2~;U3LnW^CUHA_Vni4MnvJ=~D>(x?+4J>#GzcnG-S3Y64^wg&8E8CjhYMKY)lZ z!jWsK+Hk`D=9Txm-fkT$-}<`22Lf|@y-wqOwp^+WlfD?wLS5MuSRww{Dz@nc_4h}6 zJNS(Q=0}xhz=5B`*Y-cT9zE5_ z+yJVwa=VrMra5oQ)G5xG8p_4ITlmySwwz)}&G|TXUc2OubJjOCtG)nYXRZ%d5A*YR zD5K);S^k;e|A;&pezPmFU`~HUl`|Bjq&2lqh6{2ULvbzE>E_JLtWKezuR^D5?6mUl zfGshwJpowK`13>v*A9)`rik1NB7vjh+%U*-8stGM^;%kg^laG5Eo_cxFa=R%Yb{_voJGx2aP0lJu&3*7>(&ZCA1! z_G`Lr`|b*QX~_q5l(IkAwy3{O9kynm^Dd)O{L0<*BH3I-T5{w>?u(>4Cf;{<|E%8n z9u^%gmIlgNlu`TO|0stiyd}wx@?kg9!A|HmasdUeDf7Dc`L2iu<+ErsSx^uUM+Jp0 z@Q30oCM54O823E00JX}qoXgKH82AwTB9G%S`tH@lAK_e$qK8@$A~Dz6(P@xZg9N6x zm;MLDcz4fErpK27am*9FB)xdCt>pK_+Z`1>Sr$MH+37v`XFWhivofnxRm_Y8crc)W zX0ULcfAXn#D)g<>cc+Rwp~cq{(-Yz+#Urx8h?xOcnl-EuR>*9O-r&z?GhaCL-Fn3o zS}f!D?NyOfvF*m)ev`d0H~2XCV0k5jTdF?;eN>npPX;sTJn$NQ#8PU|D-Yc^ptufX zVB7EeQa=kx%AG6o>EG@~d{_Iq0>bcu_NZ%@r4>-%^nx~QEk?LJU-hjO%WRPkb%THCd&=wSy81(%8M-U$e+$LVPzhN%q z%TvH7pHK=d9l$Jh+jq(nze9r`8uv=1ji(4vN+$2v9%k!e9dFotd*{uI-;8-Zu;oTg zxhozYTA;tfsl~)El{c>!Q&1%zG&qdrm&1M{*iYKot(A@0(L+&Ugkt^lR;WtnN?;O~m!@7nqlJKW+$rn`ky zSeatR42~pt3p9E4XhVPs+g06c;`%d!l)hg~j<_D&O&%g@VG+wVH$m&}O#mycOnZi3 z#f@ofkz{WCre0ESP3m!h)w;!3YOcTrGx``CB-n&%h!-WK`b8ioDBqP0@9nzE351jC zR~S3w5>aCpHu3etskakct4nTl>r&ItRf?rwJx5`hmr{+9#*5vkYBjmZf|A4IV{(tz z6^ZIPT(EK?C@)lulPYZS+L0u~$yGX>W2iROZ%Nw7$TL>52^)GyKiEL?_^AnxP~6lZ z2w>JHo4%jQOuWZ*frG}cF_o_OkOi9lZtdMLx-nDhSqT-K32CWuQe>5H!?1GGTEw!x z`(?gh7B^K}(fx_OVe$l{BBLA8WZuqOkl_88t$zPsF2OhzeaV$Tic9GI(MVS#Cp z)r0jZ^DBcwQq*bU^Gp83%;gTZuM2hwMralLH8vBEQ?Zp52>ahi7|2*W373i>USb|i z#5RJi1s1k)RUEMiO&jH3`o7VCoyX&R`i|_UZOgdwVP%R}e(?u!T}<+WX2xl2PVcB) z+}9X`&)>6!goReOzLLX4yZRG<`a@4cCx9xM`MeM+cs-RM#Zb1tRf9@qe>;qm-22JS&nXd%+uQGtsUOotp zMHq81DZi#8GY;M{0(kOlem|3LV3W5rw(%QH&`TgDp!b&4IXaox%8QwvZo-q`bppQ4 z*^_^J3?728LuN5|>pzuEiQ4%u)YH8vv6Q0yq-l@n=9&237o*x@YZKt+O4!7GdVZ+j zJ@Ijl%e=hGG6jjFe8`EcK&lm<3|yI%?;?DEpYcDeCR&ilpF}B#q7&%ayvZ`@F4O&3*+a_Qe3T>Wl!#j+gS}h zgfX;n#2Sn9p-8xbZJI3^J*YQwu|CFwjL$>0tu9&X>ZH=7gxt?e9UV}3jX{xf~~QYyhM6>#ADaN_SD z0Y~%w=K_jA{wb{3!K3ZcOv%5}GJJCN@9sNVSW?^d?*6sgaAIg@7vOzlo98ma&+#mo zg3h}UpHIE@Rozte#kBiuwO#B|j1BJsxpgqd|0JE6SL@SW;seTFhG)JbI|uJfm_MoktEedU%-RQgc+b2SQv z06cc}8w`ocYC$&7{Nu}B|TRv{p#T(I*Fca z9Z%{g2&9mw=A98-X66hM`MDNE{iaT3PB4JdJz4Mh^VyRg$xzBCx6k<+H-O75P6#k1 z$Lb|Ho>eC37vQIKAn`C3e?IUjP3(Nc?QRXo>a>7;9}}<&!M_VfK}om?YV}1pJb{n= z=9s36XT8~8CGT+bEtb?6<0tp$F76fUB`tOu&nkq~IA#uHSktlf@mlBG9SO6&V{frJxu6mCHww~V^UY=>|CLUPKz+FC^wqb547Yym zoUDzNxxP9qHY>5Wr}%1AJjC_Dswq5$fN-eJH}3o_IUAzy$e`Gw8lo?J8edWCA;GKm^oJ7Q7#L7F^uA@s=vNKB zNAkPodGPIyCB(~uD{rW;PhX3VkZb%|C?~*cuyn253!zr_X>xedSu*|IU9S_3@4eI5 z_HEONq-2uKZa}?x)ilwd#_8L)O#7v`U1w9@weMM(!mQX>Go+UMNz2?VI(084C0mO3 z4SK51tyU9yJ2gypjH&x_TX7GA_7fU-HNwBv!-dppMjodPDMA}FLRMpD$lYWewtE@b z^)t1^4why}`Vv|SIvs&yTD%+pX*I{>Cj;6*74Gp6kQ<&*pujX)f4k6l4Ol`wD0Lx* z;hzR&Z;G7@1Z0lz)2eh*dgeHz-$h=?Zv+x|Dv0;>E0GZ_x=$nFdx%PFb#`Iw0Orgb zabeValbpQKYv%pQJ>mBzsHs!~37$#-@^Y~P=(wx)$g?NktOB zd3%Bx$?RPH#ozqc9yi`culV>kyq&JL1R{nbVg>q;`^z&iG{FM(Vs~oF#b*9U+t!)5 zyP3FE7}{T}b^bsyc{MWjfnwgM>&x!Drk@abu0^BE-t^(${^*o&`j$?)8T3Mv%&-t8 z!d`VtvbQS#5s!(0=6xFZA;jjb+QejL$tK2Sku`czrGeV1*6z+w zjMrRxFbY}a`;Xnl%lHz$?o{+J6+d<4gwAYw1%DG;caS!SNCqg>r_wUy|2 zm1tw=wl!DKa)UPeaxfU?d*LI z9-^yWPPp8Si2w#`95e)rmb&MBi{QuO|ir)FUoIrsHzE<09O2) z{Q{H9dixP)hxx~4{m*su_|={(-mkvlZo7C_%FM1aQe`FP!^%nGA)6VMitr_ffJ*oN z#N(%!xmfq4Hz2U;bqY~6i~AH8rg);1O)gmH#q{G@PMA_BC2=SAP@V!5&B!Kykvwb8Sr=1EXp*Gb|!2_DAfpGhl&d{wR^*Kjs>s`WR{CKcsx43KDYvb^KAq&6vq| zp@%mfyYtD?P^#%hgeSq!G#?2I_M3wG4EwuJmYkW#-q+Q#{BkU2^JPh`DdiGkJ9{q4 zc6MBun?MT@iFabvj|HA_8_%00&};-ZCTMWXO08{V#gsf23b#t(P2rcgXSnESPVS6- zc&hf5_0_X767vuHtx|K4l~{urED{`a*EFZmsH{lLrIhwH-iOk{s9o$sqQl%6k|NFR zZYcCxFPQpk5*p3^WRNAsv)qIf5KFJRRiNb08ZWalWA@SDTI8a5gd%lI?s$|yI6)e} z@u3PVF1iO~Ec%0axW2*nk6^?K=+--8s@w3+Zh>0F8{@rf?Ori%2Q!*hMgas&6i^H0zN7em0oZj#&KDo?#nA~_cMVPhwS90Z@Kt&!R@AM5{z^X)7N-%7P9XIj&%nf2M(o(T29`MpK-|YcoNuF{f|MU z)po_=%Ey1SLKX8!{};Xm^*RySWrikaQ(Dt3dG9FFZZQ~qWB#j%7>rzbFFey5@APnF zj9g{jr!uQ>KbLJ`G#Vs*`)c}^<{Bn}b{_KsUm9h4o!Y`TH*H0_cVET# z*W7aPvn$T1d|j_v|C(v0D19TTZr%PG%1ZT8 zMQBaVb0%I#b|et`6--(V*|m&vU3qz41ilbBsUTfc_`*w{0XBv)9J~&{;C{9LXf}p` z;N6MoX4w5v`SRJov;3Rrz>v^4zAAPgy--$_WG#Cdc@wv%bf-%LwzTDvYn~9{0o62e zk-d3yLCm9k!P&IoVz~QL`i;mUIc^4$$@iz8InUy%R>RME79+c-eU~QXqd&O?s`ZsW zmYvG+GXD4?n#QZm=$R2yX;U+4%IsT&=-*L3iob#<&!k(syLt+F*Y4<(u1DUhzMNu} zAtTDNCz>RQINyzd2J~U8pin%YP!+hI78vYqFV<#o{{GLJ`9Xn5%&XAxFJiN6!Ve(P zui?6&B;C``txV8Wo?vm_O2XHd2KdB;Zh-BkFh_tuih5BNIW#=F3|K7LRyRzjDMjC9 zTzq$bT~c_W>B`xo1Mq;+Z#~Jmmsh@DFEYB#v*|y3$C`oBZh-r(fq?X4MyArZqq#$5 zTbxOnUZ0wez4X2MJ4S8YJJvnscIwynEE;Y2>z}eX)!HXgYsh|F(MnwDuHp3{`ihJT zb7uhsneZlsmVphKUAlHK#+Ogayo4@) z=cE{;@}ydkXvQB85yZXhL+FR)j~03%{>tPUSLx$i+#<61I6ldwVmM!U=X>Ep$^p^> zR7L%*?L`JDN0}%2nA-FgBSYU)>}&&^uo6f|An{*;$G#b+U^ z4oLiO{z&9v7ZLLki3Rf4L7>xd^`M*3McRnt;5Af*v=A$HU9u|+JJWXH!&z}Dq8!9P zfxXs#cq)o7mucx_gsFTS+WlY*r9h4bK1*V{5MtQ}OWvSHyz48_g~-{0lD;N#9dWBz z^I0J8z!cSF$nEO?!R9C@al7MJ%+IGIm+V)7@GLdnG1{V;1CM*WU=zp z0Sg8HQ#-i;jy2h5H=Jf2gC)}g)|eh_F;H?ddV}gg4sZPQ1t^h)AV*M4!)~v1#ygS6 zXF3PcWpj;fKQjxLzb_Pp@9#zGR$GONa_%KiyMXuSCXf4U)Q#w0%2BqnwnCOD&Kjc! zy4xURzWV$=H<@avefXglSVQw_qvwQUrB0b$;{*N(v|l^1r~FcO-ONt$)cbL*t+A~) z4-0s9h%hV~vZ(6?aL<)x@8p^|UblGZyKb?VdgHpVxD1c5D6_KHJNxKWSupfofK%wIf_mLQ~#d zkTNI6r_$5h}KNOt-K0at9d+EK(7n^84j$oi>7SU=&R)`>}v{_dv>AukN_;={;9|QYs zj&O_~CdpnJb~k@8VamWJ@BLSBRZgHw2jD0=s$nO+gnk?AxeTqbM2j#Xt%#>(32*ji ze)_ajzs@jW!^ZOVuzhD<1$$lASE8r&ZXUR;7Hv>%rYhxHEXM-#3SLOmulex+eln_{ zpD*ThQn$fKaUg8t&&ZP&zX0sBE$!*@LWE%Kdch*WAbfZRUOsEZfrQhiCp-@VuXGiO zBSeK5gzkM>TZulZV9%`)AKn%F!7}qfB8)Qh%pE0b%zov#?MfDn3f(!>UUsPveAQv=lg&T>VB6Yp+7u?Kp(1L3#m$`hgcKZtd7jDJ-uX*_qqViQ^;IB? zZW_oc8n4#=JJ_*45Ygk>StZ#e;V5A0x8{7*FYCgqxC=K_z-z0a%?4fhX&!jU-2i|5 zf;vp(hrp@VSWtlr+(@szxomEoZ^BWKvCtgu*OyV-3R#nZbS-1p;paWyR~q9KTur-z z9F#W(ns9DySop)7@Siv)nVQ}>2xZTDzvL>2Qb_LMlLn+Dnp~Vk1>VMfN zQ&8oA3iIeG5r3*L`E4iYpi$Ut;3PFOz6bt?$NxVMu~$Q+^s!+3CqFp3xkp-i*;3li z0B`GE7VI0y1@)jA3^iFw+#i1|+{d3n+UA;eID->vS-ha#ZlE>(7Sg%Tfci?>(R%(- z#u}^|2lpmT3t)fCJlXLLnyvX(!vVC_q23g=#`b8G(0c~PnOC6BJQrUDP{t`9 z_glftUx3B+$xDGJj^#mvC$Tz z+(H29$tg$ow4_b(iD|CLA}PKbBofxp@BSRnKWhQwxBn_q)IB*)E^9th$X?$y^2-Uc zUPVFQOTV++0M%(6V6KTRs}gdSrP;VKx4Q5A@uz-7jpSH0o?a0iWfqd74!~? zB~^ZTvPp=kIo0#Z3Db12e~9X$Vv-xWb%C_Dz2h6y{rt~?TTbw&kX%B8TnK0+WUTqVKF$GzGu=e%=VmlI!4wW;7e=WV6)X7} z!7jg}$a4Oya4RK>%9WWi^VB)$Y<`sd%VebxvRigg*2$=-`W0nQo-o&(K0t)$<-j%` zlf&2|pq`3IUMjjF%rUIw_ZPj~+TNmiYr$V}Ci?2MKcK?D*o-JWpVmU!50n7*wjG=o zT1u1rHz5iKeHLD9#Fx9*i;DNpjD=rrO3fmZ3N(vZV81}ixbfB*Ol>MYSmx!o1iePH z5_tyUdBhc#k|L`C3uIG;f3p(&mCo56nb(Loe!tZy#KlX!wTY6Vau^6bsh{Za)&ZXH z{{AeJ%6&pd#;(4N2fj$wk!v(j^b2ey_wfXY)a;|rd;T~%19L)kGNscMVWF;lLjop7 zLr{sFP}LVVCdj@n>_N(`fNI{XOi%`jfC@$`Xzzq=Nl~kkwV|^z$GPMyvV3`r!RoN{ z(?cpffDMssEpreq$ZI5hz36;cP<30X7H^zR2^bp#}lF> zmpvW7jwy*?@m!+?2hFQJNNyU)d`m`+ZxG?k(icZsoH0KGRbS`@aVjHBr2t!uDbVBN zL$9+pR=fPON{AhunMi?L4Hm3u+i z+~dMb(hM8LAc7;f&uOS_X7*n%O7fqieQRi+Gi{7zC3(-1?L&U&>yOsCk$JX6rB;MK zj(pF5l~@JaV^(@UVz)=Y60|VqM|IPqu9LDIdvk=w?b?Mi1_=I0v-mxn!x;LVr2ga> zM_NrL+2Ke8M4%O>E4L{lLz?fa8%~XQl7&?4Yd>G11*J(mU^7n_$9al3e8Wv*3+c~rzcmX~vks|@|D^gH`;46TQ*K1!H|0D>IAU*1w(yDF2RhZr! z0yf)drh8uaB-!%eazcylD;@o0&z&YDYFpX3wuk&tTr0gZOimeGMiqCBM`pj->eT&_ zU{rE%klQ{jPH#DAU1~jm=S~suaDx9c_`2{Ci5>V<b3X^~(oIX!>s{fgOxOxHYUPdwnCd2`QnXBGl?UTT)|f>z#L^+?Yi35+>x5@F4s zRkrG)%7gd4vA$v2ufZl|OJpzrJXQW|HZ?hKSmTAGvhQ2l{p|m<*gj+PY!_}jipM%+ z?88vfnmT)r7JxysS?@WcLlhi}0Nb?v;E@S+_K;Wsi( z7NetOXe97fHN=IXM=ugbnz7Ru)FX`YVWZsf$9?;udM#%ke8*xCscWuGLi*0&eoQf-xR;TE$PKheLej8Z)Lhf^q_u)-Jf}bDQ`gtOPF#K}|HMY-W3du>_esg(d+fftTT%YmhXD%6gE89iQCr=)x z$ksDh8tRyzX{6v^nO=Mxh_WFtlu^&>DGYHJB39Z9OMb0AAP4AEMN)x00F_Vs+R<@j zPg3w!-91Qk?eK>$t|H!_<#tPp)2go0roV>;Wu!j@Nzrm+yuIezCAWn54gK_K=~|sH8}R3SoEvmC6g7|WL06p+c!0GzglLG-YJv!U)@X4Q0Gj%Ca9y7px@_{aN( z&*VRrjnYesuD#+its}sDO^HaJjA5tc6-AIdh7z>;=q^L-kV|it0P$2kaWM>`IAsWE zbs~jEMl~B8X|qsET5lR?MhdL!0RK*w)qF0oRp z15z^}zBeO@=Cms zc%+5jbR1=IM|LVI_G<*RN@mZ&Crc>E04x8yYQ-!W%vPHbS2%Moa-;3GZ!t~;S!l=^ zuey8N+8h}%dYp`dNZV3qoH-m4vMHqqJOq6D{26WMC_eoM?3yyj^5A(2+^WJl&9s!( zx=D$Np^Tu%*g=U+MJ=+m{go5+#ppDQq=<$N`7i2P{e|*C(8kg7I zKQ)w5zEM{9@BHOF=l&1CMtkme>N+T4ku2JX9=sq%fRfNBM2Ys&8*C*JoDz?>;P@f< z6}xmfK*#h4Jc z8PPSl1Ff!Cw%y(|?NF2&Tnc!31uj%yu}dM6EcjZ=oH%6tMRF6~`7d)P%RQ2~L_`T0 zGp%=pMJ$efc;$M;E!hkTt8i?7WziiL(tP^dMLP4=`cyd}>G!cXOKzJ?)j0H|`;B2o zea%t6tE~@Q4}pHY8RWj5E;y@RdH=Q7{eU#ZbwwJozY}IH=$WpnlXO$g*7yd&jJ$!K z=ENB=w9SP?W@MWiTsaS;5c%ha>LO?m1UHs;TWPp2lO1B|U>V;DcZ zXZEz8rda%z`&?T<8E&P^*!9GHF2>&k!~c>(vz=4G;}Fw6r)O_d=BQqL z2qJ63r`{Tf&73rK!an}<^Z?eGsBb^36M7%iI?M<702+MeYp#(l}cKBDE88ux9MW_AjgTr0q~0wc(bg|XdUCo&6%+M(vl_U z5Mf9-P<3cl}W^~EUxe$1ZZh;f@wGoTLn^GwrW8R%2e z6;2CDG3Z~s*cvT>Yy}k1k`)Wr-`t!RNVTXg-5-J*;wr5|57~d|`6=8x1-xbW0Uo)Y z@_;Q)W$x)PP0y`AWT@&4VIcI$h<_)!4w))nbqJGLdS^ZL_;;40zzpWRi*d~9*9VcI zS|Hl?5AJu|8Sjm-waR71Ud9yj3XqLS{}$N%gF|kJuO4BhWFTO~sHI}8P%`s$!8eD~ z;F7b;^JUPGD6`p{e8wG|A35b(7<(~)(sq-G=|aFT>p)^JgfnPQJ&2FNZ9JD$`C!ZN z+(;Oi3vFM5pn?$Q8!S8N~j;`)qcwt)*68sx=WI5oWFFAlYELGPV z*pIsMgHq+`+)=U|_VeN4}VfB#cV%Y{*8agise0$6Hc>KD#I8u(5I~|3=dIz z8b=u#1r(t-xy`4;jdB`dX8^rrXzaiJgjBQtW`T~(wHb$w)XhYbX^OeG#8wC4;z8m=cm@n`?zrE-Ep6yT$y)RS`lb16{D(w25EoqoQ!L% zU;o#xCif}-azwaoQX#Ty+@_RxrmY7V&`6J@&zxYtQ}fxIIWWbxI*@&R21YD zE9bYQBqWnep3#{K@BmDBe?%f}etgW{5%G1wzI#Cm2n>|B{T;~@VVO8m?KYVpYBMnU zAiKu-{_j>oF=j*Lcii^y0#t}r1r}RhdKqVoqD6sC+qWFv@SCDt$ridN0b9Nyv685Z zz|Up%Sr}t~}VJIQ7)2Jj|cOWSTU^ z6D2G??ggxIA>KCRo_7nL(*Pg-EBxSI)h>JWS^j>N1Aj&7H+utSKtb1Y$vT>^*W^ZG zBu$~HOzr!92>Y#%S7)4}1>}~T?G&jlR!eHeoUZzT#G>+C3j!)YvMTqv%=-*{*qY-u z&bYjK&hz0RxHCJR_P2Vliu!mDW#xvds;Xsbu!5uC^afxr(=+#dEY|ik!_`P*WM5C| zk?W$v5?ZIldBtb#a{$hA3!`UFT;WFfM=cS1z<3Qk1c*e-5C(HPw#5_CJNJwN&qA-U zpB@)lY#|x{RU+=5)Cy+BFMFcbif#zW$x**7>0po=&iQDix(93m7=uH6^pKG|fL7v^ zcohy#IR6@?%#RqeY(QiOi!(m`hI!=t*02k6$OlHJ#QgDUg5>JAlOil)7)rT0Z~qNxPo_yf|7Zx(Dv4Z*xRC)C5&8 zxGkZ{!QDZL5U~jP=e>S~+w8@~5fS?kM~DwY9nU~3A|-w~C526`at-rv)X!1CaV>Cd zy^i?m*)+UX&*@AlWuB-=wobY2$h_Kw#Pqi}wXGqKZ@>_?H`MYC9PtWrZRZspL zJePrb*|F)81m#gl8gy+d_MlIg*22k;9A z-=O7Z$kabn@qO=pggu~B^8vI&*UEfJ6vf$ZFfxlMkKCa4gV}neJ5TQdA&=xxqd|q; zR4)$X0c3x+>X^_K&0j$HcNiPK;OkbWN_!D-kkv%T_KO2H>f77!|2)arB^6%Fo#Wu7 zAjq$0VqMA%`G_+e7*@J&9JV|bdL}w@JGL4zzkx%;dI%53fD69F-kh68)!(jV<|(=>tHpc?Q(N_PAjFuMI@Q+5HUbW)$32yApqe!Pw16bL_NRmQ~+sm2KQiakmOQ^c*ydtE;oZRly zh2(Xd=P}K|?r!;WMT(EuVnnZzrzHlQXhIxQ#L5N#OyyXo7MYsA+<%N{l7uG1qobpT zJ^oFCG2+%pk>A0on~v8|9>?uE++2AO#z8EEDQA>;e@L>5@VYQmOU;yNUA=lr&6H3K z*t+Z&2ofod7x-BQbaDLkKGYdW5SbQo!aB87_aD#H8qlatGI#jg2mqWCwzWJ1>)+RR zpKOMYIaEcBGT8Op=~L?)^}z+EsQk9rijm|fi1D(dRYnY?r{E~H@t zH>1eb`_i^mT`YiFP2MCz1@OYe4z=3xE}nS4O#?keuAtOuRIp3uG|=@rpz;>FCFme} ztbSn^o;kb=+R%s+SljcI)b-8@P02J2b0*=+=Q5nI7#z03PTG04@?Awp(+PXb4j}lX zs%-$X_lrLk+G~pcr&-J?*(nKG6^B=vk288vkYmrA#(v?8HFMMpraU2>H3hUB9!J8d z`PaE)H&Vs7TF3W7RZsF6Lq3At6NW0s)V3N3WDXhq3-jvyn`a-bZF4-o-<7kOt9-G_ ztddf5X`&nL^J&^rKqYkqW(qKDfZE?h6ohR=YlWuigzkzR1M;BRJrzonfzYjd$})<_7`RiLOPu--U|AbE*_hljl;T5;66u1r3>^N{88(j53!=R6S$H=D z-@+AFXt0xx5JTq7FZ9qunPRfJv?@^I55W}$ve)Mv@v5Lj=0vpMZoAWoC^NZKd)c-Bc z*0>kur2d5U(s5)6oPqKx!;zF`SXGq_rbs+wpnaJ zgP>%5RD-xlUC!;#c2PxrasU?e{be(eV%%^0ir?RRqbHswcJ9W7;=afDew4Bd0n+oC zedqr0RrllhNNS|bu+PR(ngU-?*0zfdVB}vN&S{%!{ffvLuGk54ClTlYg<5<8e2;8_ zgHSC^@nb*wJ9H>6Q2BsILeqe2fXFdn_$TcRz+s zbuJ5uGw4OiZfym%Ge2fZ6O1c-%xw3$aEl&W@L zO&Km(wtdCn5i^MW@^(Y$K8A?Q@j6(^{P1J6p?C(K-!Y?1(bUv*wR&c{K!aflHvqX+ z`Y0xxFPQex^n{kf&gxM!v&R+qPc|+IArDu8A{5OQ-)yGs_P7QEZt>lJgaWlSaV>g0pLkbU zXAkgB*)eug<5fy)Bg(RePR)SE`7Wrbg}ZTHNZpT=oQnRH_94UPf>zL0@Mtcmq8jk^ z+qZW)nr(`JHO*ffM4f%}8pN~cm4)OWK3KAgxxjbPyTRDGlX)UrehMw`crieb0T7mV z(jk98@HeB1H}wrsz~2{Pjir3;d8Y+brJad-$^(NNL#aXJfLg5Qu(2~$vi(Gm>6QW@ zFiuI<_x`A|U^|lr0`O9TOYV{#iWHX|5D@SV!iBl7DPZP<&S0+!R|^9h9GfXi-uLcjj~rK`tJRc-I}2616|Yn>SJ_wL<0km661$x9J-JD>^u4VXeB z)mwfYVF*#mmqIR1kA~iFp>}~nhntZ5%u*au6XT&NfSQz?@Ni0_ziFg23EM2+<Pu(3s-Mr-{I~d>w&*abU(YitAO*a}SNa6&E{A|2voewkhA4;)U9q&C%?Vj9rUQ zKm4+O3`^t?BH688_$0E4nso;=>)*u02qBzFV&P7Ji%&Vr5?1NJbQ+K4wx zyFpLlUJu0%@l6<{o;@&MG|Debk#-O>PnaxXaQ3_KJ`0-InbIW-FF{1WA?APrf5JmU zlp$Tg-#MTlK1`!+(SGHyl3M>0i_~4ibIX#bvY^>tp1(#n`|e+Uhdgym&kd?y{>bc( zm#yK9yBaNra(ee}HZWV>#|EyKCClud0?_N7AxgYZ8k&u_Yzh8riMOb*(xtZ|5QEGs zj|-1;QZ7$-E;6u|Ixk$VW_4Y_X6?mY$FPxfS9v&xQOqTVx9f^&qrClL)8NoxwE@LPr30?3e{1zF zr*A46@)K9sD`Inw*}}B&@DxR{^eXB!?)QGF@FVC!e3mI-_&Bke@m3G;@>s4ocHqC8 z|8KQ6V#GH`X7s5Gj^W@b+u_y8IC?fr& z?>n~X7g0O^Weq26l|6ocqE?)~k z(rkdCC^}_|>l(e(t;g&rWS=j}H*lntfT!UCjnMqNes`IGz%i?D?BZ6nO(#%wBzwSP z|4jC#Y;IDG#RD2)_!JVfn0{M*gM>dBbGi?qEfSZ*!3BWgY@!roKBilRDJHQ2VebP` za){gejxW4@$233;l$%TomF*lXeNSsD7r6D}MQ@S7zr%k_gWu?4G;MOlKGYXPCN|8t z6Qk@jH-N01Jy=yopyII-l9X}+qb4TYUV*udU_k()9V+v0#rN;8(PWpvzVl3}_n)HD znD6HTNvmB^rU5G*6h_Msg<%%(E6P3~JA2gY$s z6|PH0JS|#hm)t)=k$I|n_*OrxTs?lSP&1@p^Lm9m9{!{lD$Xq$eo=@JeKkl8aZpEBYK?A`g(Axgd|wTKE2h5E(Y1e9!=WHIr$Y zeX^)c_!R}Tv3tyME|4W0>cXu=IoR+~*t%OjhXJ(Tjx)hdXmGsO)6ucpnAPMJgF}|R z(^KmnAbkFeWXqBCI!NO;R@`n-;8RtwK&9Y_6ENHPkQ|A66skJ{aw*8jO%?4@S@m1R zUS=xPgneM>z9TMnyoM!PqnJe7;_0%G!IR%#{=C2(om9Cl$+tyyZ;uoR1&T@`ZeMDB zS#cxvM~bbbn>l6s&O%CZ`oe4FV+YZBvAFd7hO&p7u)$nQzXRO(F2^FQWzZXzTjpn5 z_@sKx_j50$2E@UZ7>n8Su+W>Z30EScQaeHx$7(UI~MT+g2jIO>`v)VPz}L( z5u?K34{}c$R`FmesF={`*fJt-6Y8&sL|nla-gPIEgm0Saf`6Pev|N|2(|<#E2=)v--m6oOlJaF7!(6E|X> z%{*=iX?qJW4r_mTE^m5HceD>-mYKDHL3%ShAA*ibGqeXKhNM{(~&O z+Oz*c>J#ScG6?eA3sG*Q(&l+U1KX{0rNEH~fwi6_UT0BJomWwvo>bA>(K4k+l9di)h+erif9gi76+I8`x3~X=s`fJ}| za4mISr1jKK!=IT3rdES($ue(BU*4NoI0!Sve87;McVI#Leh2h99StzflAWBs-Yyeo zt;^rv+Z-rm_pGg#l!PKDF;N|FCd#>mz2a1EVLnLhQWI6PphCtO;}biJ44!C&@|mj? z)S|Ql+==DWQ$ZVktd#ZHqDIn2LN};|urLtOqzC3fNW;NXFsIEvyS;-;Eq*2E5?~ea zgR5~VfMJ%R8=cXICk2V{TJ0DhNSDoi_dSdgA5Q#^4$6s>d=bz7(}tF_*KHIg&U41bnKYwyS^{sVj{5;nAA4_hHY$5kO-0wjA!aSunBnNZ{qNEKdcVGqe zqGM6UO4^~OkQhqx+nYL^?^D6Ge#T!=BruyvsTzgb{ zp(PHNJz=CTkqOmQTDkIhivYv+|GqumB6ADWiy`wA-~h85TH4y2q@%SyrDo2cMe3Qu z^B-QbEa>RtnKg`b(&BPVfr@r$KNuM0WX#h(3seFEgpmN1*WV(CKkuHOFkm2c)N*&_ zYg=-X;XENSCPgASO5+GTHAy{ym=x`sWPuCRGKo&aOutbK#FLM-o9?Br4)iLoy~9hq zc>h%a-U7zCF7uvSg*D;GXor!ysN#8TAtv`akMaJ-wMI#Zo37e=*@>IJ0VuAJoN$Bf z=vA_mf{Z2vJ4*ld9XT4*$Ra~KahsWL)u^uCZ=HL7RVzBA!&=8ue4ihp>Nr=CW##kY z5OGG)7~-nD-YWjr<1};nP36N#WC2{XiB=fok5V#9VGDaV`=v?4=XzAp@(4E5i>N6} z5*y7O!M1on`cG4byol_{Y*f(R;w(7u5c6~ukD?;6&W>@L6U+bRK61Ri2HWTZ*ahRY3W!txXlhDb&4`pT%>?{o%$?Q5}Kf3aPnVH$SZD;3Qe_XF9|Gxie zSAj)uO` zJC8S9zIISW=890C;%O8>STdxz3V7SgQcMsa-$j@xV0(MpnZn+v%XIpIB==8W{AYo) zg#DO_GIXklX+e{%-y)+j1=wxAbm#XKo&a%kF`P5=p_!w*f?+-P1Qz}NtaAm_IEd9%#5fMoxqj`xhp{gBrm zK*Q%zm;aR-eqKmthX(kC0O(Zluf_+;c<&#_an~x`35;1Vq~Upsw-=?f_tKA#e{OlMLfh>>8#8Xkd0+rg?hC1o1+j zG%y5T7jUibJK&C?8XF+I9?5vFp; z_#(Y!=PF7Me4C6|p5VBI>}A1l#l?_l&TR3L>?gq?!~qd)@-Onep*XDl9TOX?Uw0FW z#ftT<-u!W`n>*3fZ(c2gFmO$O@u2rYY->hOTK29vuaEbC)t~Ww^0rfl3v)=?fBM9y z_51g4Eq`XTGkwIROR!_W$3bw!7XcM*mss5G`@}HJ;^1IPw5S1EEL;5bMmZ^Jj;bO> z{X@GYbZPC+uV@_qePSHEd%@{;@z=-bpd%hBc(M8ws}^QO4$3rnWN7PV*$uc9fVjyh z^@&45P50TeFMrq8=1|ASp4*43U4Q25oVIV04`v&E#P zKZgH*%aER|EaVmeiD%Ap)e?ZpzhzXEYI*H~yEOUh&&BIsYHmlg1enE?JMZ%7rJC{8 zHm|6%hvpsZD%Z(JeQ}fSPkXqF{W9JyRm-dUtY1^%YktBnP%K0V2??y>w|55Ey_K1n zDc^F-Ek4~38iF7Y{L}#;gf6B$l|54F&)96Xt|}!y_rQ6%PI@k5S;~8sHvSVH50}E_ zv39))xdg-P$&8=S(E)v@=)UD&rd z!dB}u{y>HO8pw_xAM&a?1D}8Xxl~b6A!TJ{No8ea(!KZI>s5Xlf(U%PGHe)~gkb6b z5D1F$R~lIU;$KoxQKuRksjHLIC7V=fZ-{3-_+<7hE4h1r^g-cYnm%yiXl<*J(KW?V z^4U$_bUgm)4Zh+h=;Mty-eCO#hmWP(=G#|wIvj@}luu@6CS8aS!&}3L(@C%Z;d+W+ zRP=7CcfOu0J^|v`zgeIPZ;=S?LPb$2D?9h>^ovH6jC}!c%pSe{am*i8e=#?6HbX1G ztijs+Q(^x*u05#Qt_3eiqxHR|f);c3*D~JfjV2fyI^lh|y!Xl}PaVj!cM>*+HL|@p z;qm?Nt$(LarB&nwk!=>0w~dohayRW55c%^yIZB!){rt!1#jSr+?hAfz=Wp78WK)L`29@QBn0DtN4`R1?A(& zuS^<-{Pt_j_?3n~J3E_AC^mllcp3&E5L~eUxU2X@g|D}sxZM8RPz|HkKlbVW_ph&N zD*h%>jaAFb`110KDoaif^4D-nKr_)2uyUu$QeZWIAVIE^w`-|tbqu~u34^eA|K(nm zc0M@&^vz51_D`6)SaAqcIstNhCt!^?`Q5RsxSRvSz#?G8FS}?datZzW_m@YG94QqR z7D`D;NzCz18GA1+EtNWS=)m3q%5$!iW5)5>~EUoQ`Uxcrq@UU7K`wLJWt$)0F#5x^_})m5I&E-3O}m5K!bEdk1Jsm*UJ=O;kpdhFP- z`o>jJ-WM-klp-P`nD>84Nr{x3o6DACe10(T6Z{KDb+4uNN&S-rfZ$d6FI6h0c%BD9 zGXvk`+1c&w1si*>t&ulbMO|4bZ`a}%EdiHo(Z6q8TQS)cens`;$MJWAzg!N-W%MzN zxVSheHa1p@iHTvJ_}#mAm)f^)&&r!`zFF$ktCy6Vob0s**x&pFLQq-&#*ZJ*-U1so zY>=H<0?dy2iaup2^QB17NMrdWeYYB0M@lqK`qnB|y(70HXs^y9Js0 zmtL~B6^bLqM-M)keQ#KpjWxm<%X+hGnwGx5eWP&OMoE?;?Tz)OwJZ9ZS-ZlyqSI@* z9RK4DRHdC$n}0)w?Yr?)R$j0*dHz^+iznKi+uk^@&CtL8X~mFwes@gxj{Cv)!O~uV zk=MRP!z?cF>X^UQ^{T3>VhUXOt~lN`Y0`wL??#Opv1LlB{9j#N9d!H+4Z%Dnt{fMJ z0h0133jo0f_;7je*X&Kq-|P)jjJ@&QjmzzdT%Ix~dqr57bim#u-D0nEuu+)pQCAy4 zqmF?y{>5#6^TyhQ>2ofJ-w+=omtK4*|K05UX;Wj(HZ1sYWj{j=O2b-EP#|5oa)mkK z6&DvX6TH#@E1#mGBIcN<{O=8)34ikw2tjKBK$x`zn1!D5*He26zW!u~%~9d>74iY- zSp-n|S8?zAydU#e`Qx#(tTa0p0Ostkp9_HJ_Ai;LJtu*lC7{LnL#)iHs8DTpiRTT9 z-`;K&<#ppCBW5X`NfAjkrN?g5`XT6>h zwptnM@%z&X;OzLl1#ids`ihSj$!9`*|+&)(n6uEHPtrID1L3u|QCv}S3_ zF;}){GzGEP=o<0Aw`{<%r^Zi-Vvd0}TWh&a9?PrzCDg8!)g71Y>}*?~K7H6m^YZf8 zc2Ax>$;#ckch_?%pRBAb%X>@y<|hOuXb8YF*pwHA-b(^40W)XLRI6~Ev47FaUr+g) z!NB`Kfnz4W#Eyw7g|7!x{s>ns0Qln6n+?z?&p#^vddq}h0Wf+Yi;bbLW&?D!F;-0P zZ2Q~?z}F3yGyd=Fod78!Y^+pWw?+AlGYES0pjd1H@Rga`%zg*5$sG6p#?GCk6ZQt5 zpbd(HC%6Oh0SI#FP0V4%gdJ8j{_Zxidi=L;$f&sW;}1S&rTybh;SXUUGsi1V*wB?0p3*nu37{{ zxT^SFRYRghKm?BUyL&_U>qYLQAyGPsHNo;g1!@Pt)BW=#jFBt=1VU(b0LTJBHw>NU zAlScPzi-ax<gHz(qmDq!%fxSKBDSH zC~6Zhvo_QaR?ZdmvjSfb8k@DY7_#84s1c^=&|s0#fTEJN@HfPAJZ@e;h(Czi_3l4K zi6!^>8vGvXK6}XXx<04K+h_=tdeQf5Q?wnw&gV%_^t-#LVU_M@t506-l<1GOTx zdKdpEA4QsSxZ;@H$BaIf?%&f4u|jfhy#u+Pek6kmNFn*3I)eXsLmg4TuF9Z->cmk5 z`MW`8^>|TZCbc09O=iFzYq~sZTfFZ$*ECz|-uKi{Nhzp1UN;i4>vbHu-S|Vr#^!|k zOIQ)X&pmWGRCJ62*#5H|+Jjh)=Ls=`l^sgxF0q)t%ypt1{=7}9pk31yH~sR)X3gzG zr|?Zx)nlgjlMgj*?ZLNO6SDyyr-A(g^V)~g&V6I2r#z46*Z*#Z&+<)sza%XCQ?W-% zm*5Z$d${q8ct3svelAqs)YsQfoI&tkWe?(M(W$1OAzz*NG2XE@vUQP*!{&~>04b@sq7fWjUT;Vr zBuGW5(|0WGK7?vxhWyA^5BGl6=MCF9FF;xw42dned6EjA-<}fDku*7b?8B7YoDD~L zCx=!LpUyD4S(JRbF6|DBO&LH!vm7KOzWmmn=dh0Gm{2e#5M&S{0L_(JL7gY6)sZJNwps;?sc? zJSE1mvc*j5i1}=^`39Ag8fW%lU9iGSTCK1ovfI#}=xtgr&l8}Sh!7ClhMkyKU%%EK zro~qILC><(_A?X@fE;X}<@UKtd_)WtglH!W^hluLxC*}vo8$g5H$#3YBj)J|h;t~b zfr0`YBAAiqZ}!b4_4n;g`L1dQ}+3RYOwWPG;?>u*J`s zlz!G!B^yi{lkks@Vb%(6%T{0GF$TlRlo2goda)SuLIr1f4;C@}tGKP(dgBoj zRE{qfdgLHc+cS+GYE`@Gm3mezbTbM@*reSsinJfT9ez@+Q>U`j5VEL z$IkQ?AD4dCP%kbF-V)Z|#JvlIOxU;K7IMsCIVegQ?iPM7uXCE-xi=*?imkW}ydvB2 z|9z7bf@3D9Ij$dG;{Y<*9Omknd+yK8mt<4k9H#axO&B9jK>14r-XkLhuof=h&P-CT z2)l}wo{273yoIjN1z`%=VL2X0vFau&7OyK-Z$sO<9K%7Py5FMERN;o+a!k6X<988O z1*0Ix{Gs#-j#y%!*LU%|e#&4%+UwG|LZhs1e7cML?L+kvs)&^{pG#zIhQKb|TH=@~*RO z>)Qf9Ha(50(3D)VH7WYcla7~jZerANhK=#GFTp*-Wycn!T)(h&l`S539fx9qf_2ys z`Qve1;!3DjR777Kr=+8jO?Z2wJpjB|0CjgI2$Sv8+K$E@SI4&W!Q$u;DWt00lLjl0 zCJyI)loQkYSIe!T9wk04F+rJfS;&`~q)E#tK$?|^B~50)g(Cw$f1BU8?{^Eyz=XBH)FMa#RK-UyN>-sYdy4V0EP86TstV~9 zm0paU7tdBiW6VF)!^|he78c{RYWP^-?#>5Zv>fMN#0=KvHe<9AC40n^GFRw4CzY}a zRAoVu=z{7QphGP{NrD`J-ig4ZKoG+iyX)^<@wH*EyQA#p?ib2d3Y!EKefl~Mavb?& z85@qNkLa640CG-M#5@;RNCXTxy42lI21nuh-F8P>8fo{sDq-Wd^xA=a~4pW}qGz@`&LZ?Pk zPQyn$OSDMI&$RuLU`NK{!3O2p@5^u1YQGz}c$k}QE9-ABe4$$V+WGulHF1UBC*h)s z+@v*dZ=}6G_ACc?4ey@aP=o`?UZN5tzJh?8|vRNPzwT> zsI`7yM%fX?f(#AZ~73;R``;(1jVY2kl&saxQ&E%eA!d zuw7onRoIXMKaye;57AVAtU(PqZDKp&TJ<>2OX{l^zXS$WRPoe0TDQr}8O<-kjl$>1 z<>#mNQBh9PC<{TX48pdmvnV8@Y2etZMPRF>cE1KoTcMZT=d2}{yny6N|Amj`AO3XS zM2^Z;9X7KccN=zZ)lOyoX2COC3W=@JFqW{LiUj10)L5Yt$; zC<<_DW21lUiJO?@@eFF2ysKj$7eD&tmzD=E{VO7;Vox4}jTrS$WXLZZ`tU;fiHju5cd}U=6&z{tF z#(kRa1qJYfi_Pz5q(A}D16?jQ5JK$Gat#u=1D=Hg)2e63iG!67XJrEro32Ib&R82P zp+__&5fMJ0cHH$_uFXGlw!E;av#vYqyMOeDlg@@}*gM?f+VOs@8%xMbbIYcceQSH( z(z(xc{WGhG$A8=#q2kmp*Ae`9dlz@HcZ6jZQH{^E8^qd?bZ83cu=GlNx6;Bw_u4?o zE(2(-RnEj)`B$XIG*0X(WioGH)Q8>@Un_ilN&oSfs~7INh$jfcKn(Q|5XvZi@Fu!f@Sb2Tv43C_)&41YDFNyvQTVv)c}SEFE(P`5zaO{f|9dVu&Kr*` z&I{HX<5H zqkOYMiwN%V z^AxaB<45?9N^o5sxks7e3988mhJGyc%d6LT8KMn(L|)rL-1%FoSmrJLG$SJ&|D4}g z?kIF`TG}VK1wdv7aAmKs4||Ep9571m)n%FONr8G7+@|F-H8|>=SNjLFyu_}So++ZX z(J9M|=8IIt&DF1Oo?kz&;Xbb67T~*Q4JJU8m_b+Wwc~1x(ySdlvaH$BZMF&Z< z@m_XU)YhzoC%uhKE*m)-if;V(wH}V;iUxmZ9{ICw5Ews9guwCX;R!A(0%lV&{Ck(vIYPfOK@n?L4>XWGWDq^J%}2 z`)P;(9oie59SkG#@KXppW_hzm7~bvCMSpP-aA@ZyaHB{7RUpt%{7t4x3g)i(={sLr zAc7!?`*;cJ!xLI<_&dOD7|J{%c9~_HA31Cj4Uax{t_L0AegB2Y_*445rXRKVBWDYj z?;BhlJ43$!9`;G%p*mmKvFq`-3~9_o#bKh~;Tc;x`>v!=eP)+~b{szOL)9PS)X~g* zSH`rHk%4?I(_*#hQBDIQ_21V2J>P8Ox%tUWquIaHA}ip=Xq%j8iSHMO^2ELGx`%e> zW8OxJxeC zEq=m)B{B8pfoCEI0XALpZoLt(3t@)q1bU0+Udt+N$$)b6MLW_C;HYJmZ@g0&Bu|FM z3^G3bl&mT!en%s`_!f!f{J{`C|!2M36B)_ZY$<$jk7^&n%73lCKh)DEj`8 zAMco~LSiahC0;o4OwR&8pX}Zk-uWr0r!4oZq=q!cnEh2n70`FhX9eswX1jOuVyqMtNvc#iG9^TJ|SVM}7`fA9g^F`OB%?01Ts z9t{UL-qI>{KVFLR88fom6BGd*$rj9yY?fACom{wzokvXa${fzpeqLXHNNm^^zBYH_ zZG`G#vqG(q{${N|63jq_EWQ+o=&ZXLbV_3_bJy3OIz z=TA_~WH>wnwgD0abtuw$Ri1CQGo{98>e`y4S{+W96{KnrmEO7%UuuKz?6_Ac7nx?z zDrSt!;YM;fC6k3(`BUl}hG2!Wi1#le`wDn5I(Y2gziN`3azPw zImz6_sc)v_t946}ubp*)(dn0$Wxx4!Ll*Lufa5{GJv%O0 zI%COO@6TKXPz1(PAsq6=V88KQPe!ri5oPt3h7q=UI_T<08XW$iO{tJS6C~(QYg`-e zLmpGuT;>%4v3@s(Id2k^(uZgmk{ZnORxDPR&vX2h=V|A4lm*EX0)~|YRBQyZ3)xjC z_Ak=m1c*cL8J4n9#_d0($kWn~=!l4`5te=7T#Y9QpiC<-L5y)CQM4WPB4eUfL&f<{ zz>fbqTP_v#QYk=ZWGcR=!B6SnB`rOx=~NSLc6PSYw`VO#M5G+pa@YU&WWH7fOKn9* zfe+PT5)wM0prAma5utUq<E9@=>$(q%y#HV|X;T zo8gaL&zn=4+5Uuif{%wPy-}3JzOl}1F+G1J6cx9k<~uL4@+uWcxZ30 zOh{^;W#muA9v)7HP8cq6_Pj0G5%yxZ06C1l>YaKBF?7D`TO@Uis4O!jdX4C}D5${8 zAKzO%RL)@>N_bRt2{6+ZHvt^&Vw$%#a;JAbfp5rX`A=sWE1$qE&@jokZG_I{R^!eZ zFG_V49O;VcVW}%Oj?@qr56#1~WtHp&Hz@O%{^P zAJZX%>wloW%M9LVmEhN+bCu@Lh2(yg>eBExa2Xg51K5>xJdEHz0PFyn(ZRKNGvK?Vs;2W7|nyyiZ|<0wwl58Noq;o z#Y_?FfY{JBU!%MyXi+OcTmrq~b6Dt-oQ9khzj%C!#$E#&d2$#lNnWh!7YfiKuNK4b zw6UG^covJ!R)D=F1@NoZ3>V&c`F;f(2=MsFC7*xe-$?aTfPs5aoJyri6wbJEbfm!5 zPF~aod`gVrcz>nJ$;p&T45PsKJV9|YX{%~ zEd?}N)-%^Y+r$_>lDCRCe$i|mD<1gv_lxQuB@VHp*1sYX?kU>cVw2`$MDYU&TTr1;@-a_{mJE3I34pke$Q_e);~s@z>xyQDEU{!NsgQ9YMl9lhMd0 zm>|Dz`&Te7m@t-{-`LJfy^j_lJ>V=iOHsR~bdLm(Q%BLpcjx%n)By^(a%O3eiUnj6 z8jCn=v6DS9Aktb=LbnD7TUn1XA3GbX=gdaLGN=S8$ETzeRyAbT$!ebx%DWH;q}}{l znAg%gpnT6es%53@`sgQqEs1WE$?c_)WyJR|f4xYTcC=LBj(bd5wO2G+YtJ1WfDuqZICB|~w&i4e4kIC6A7XpU}?T#8-@Y-fhK5h&ur zH5Tr(Y_nP4W1%Z8SLhdOTINc>ViKWPa`N-e#Wyzpv)W_p(0k>FQY{DB zB8px)NudO`yu|8}@k^(rY1`(!(@I+AHPc!h@FJQX=@=xu>=54th#e2*YaLy3IBZC5 z5dA?q$570m@@tEKxT&#m>kRw&Ph>Fh{>9xJv3mDM%dZw!#rELHv!&u@|GXP`v84bN z$I;k>gJ{%QX{s->p^2C^F01}V?2}zWE|ZFMnqx=em6fO>9gm~eq88%kDwZ^sG@o}g zR|<)1oU4D;O<0(?yfh4O3QZ zekDMa$@G~w>|T}BN4vlHbWCoCXzyoqNH{IHT~}Qinr^A^_PSbS zFSNerxJ$xBDxCVS@Np)O@<6!`^`Fm^66Y{myZ3A$HA}0&x#C4hJzbZIiV+QxClUwP zuWE}YR={R<&tbNEKRU_g&S+};aox9*ND^~h@`4);pvcHC0rPWs#d;pR!Oj+ zBB!hf*V_2B_ubBTaeNn_4b>qez&OL4BC3!V&n~L=d&M2N3O^lWxKmWx#m|;NZruFy zmR;QiFL5F283(VHFri%j|3O%&}^1ABYM<0AD- z%SEc(M$1l4GE*^u=;M;;1o-wc?71dz;))@+0<~b2FzOzD!A<)~zwkUd^fr3WK{F5* zygWc1rOMSkU%yuSbv<_Dp?l*+m<0AmH_JYjISl*cc5uBe{6524HYWf0)Y^j5XjwhL;} zu96i)7mM23`rU6xD#?%JvJ7r{UYjOPB52bX?grY%lAgxF_V z_4^-^B{k@0IUbH$&++l`$Cuk-%1Wi(+X+if9+-TI5J>w1_d&Q$A4A2@b~};%zz*oz zVdUy3>An4K-bA@{{rlV55ITuz12gTpSMTFd|8(fKey^V^C~QT-IKxsj7vFYN+XPo- z*XKKz!!`jyMXIvX=|$GhpFg`J@*DcLJIiw3VjBpQ@siB~1~MniX5`7QLY&g1C7xC| zgOyF}fgICEd=x2GvtGAgMav3aQ^SRTPQm#GYmiL~ZDRX}KgNd4GRGG@zlv?zeANAi z!q0RsREudG1s$-`j_Z$WqBB2#hEzD@MRo%R{EzNXVUDa=(TgJD=Hi35z8k?pfX!X5 zP!aQom8GI8)*NwvLV)|U#Lex-g>U}j4)dwi>jxvRUICPlecupF%%%U9jX_VBn*aFC zFJMc!du2&?8`o`Lw?5%;o=^OXHSGEoB2gX=3q#)7I($4t;l@uZ*Za83brTx;^XK~B zzmWe1G;zHjx@*@TMX&7yp>?<1kJx~&{qQ;rk>oTUY5k6ES&x<;6-zKmA=&roUlp|l zEA3ME&Q_)$ze7IN2d}rdq(^Z=6MENFIprx|1Qa1wep4l&r?dy=g$)1sPM~E_eWv=$ zwMzlLuhaLC@-{G-b90?yboI^|O3(XSCOUpKJI*oZz0TjCKvVcyyB}fO9A+x z_tnf5)u|%@#z#XI2B(x52MOCjXAkRf7SDHQWMEXl35XDD7XFm=#}FQN_Aq`^XDJz1 z)~JjiwK1lL7Nf|#o8b?@{lb{x7_S)fb93lD|C<^954$1`M;dR56(S+LwQ{90Fh!Z; zzZgDi@A%(5o~>e-{Bwgw_DTi$#f#TJ-o~Reu`6oN*Y(SZ_0B^6Y_}~=ezc;z4@4O4 z_($?5B$e?DZMUeG)@d!NJN*^4Ph_zavf5U%0&fxZSWgDK@?;sdE5UI9(En%~T<|$|K^%yh-fckCt?a5^3?3{(&c5}j-?N;BeQiys~x6Z3a7{Kh3~d_DZ7EV-PbbZr(QL#brMIi9Xa z!J1}j#65KV0V-bav7ej2Mt}`ya0@_W0|50QKKq08vVJt&p_+gs%O>{U1aC7$iX6$0 zv%=KU_63eQ``>E^mhoedCK9FDgeN2{6UkCiXzGnU4tZynO<3sr9D7fQqX;E@A5vT- z5)7~alf^4yzlw8hKI``VO(qzNJI61Zw-gfM|NAp1!!1Kh5<@ccSe2(0vT~VqcLWrYUISXv42;!)xAC4>t*4g;YCnm7>C0ThDIfKg1zG22yEb0g^GfnZxJ13`z zCTFb-fxQb<^;9}&E_e2{>b%ePQmq4f3WF?6@!5FXW&wzdr|-9ZlO<9$>wtVeEw#y( zIiP=i^^T`j$3a{|o#^5W_CGBElLK3X@J0Yf)6N5=E0w`jD$!Q}6O5gMznzcc_795M z*DoACTY>mH#nx4Y4U5_mj;nHPm|#;gQKTWT&AI@%O|uRr|H19suVncBuALr#Sg(~t zo&keUGNznO;k3u_lkRDbjb-~-oBNzY*C@l)h399+Yw{WYEP5`|%Bzg=s^AclhX$LV zeNdGp?kuW+Kh?`L5jzILVQ*O4nqWBD&UVd&6$>cl=)xM=>DnN{2KxF*9752Zd_?Bk6`okm3-bGV_^7qWi*bGJA=^y1FVXB1C zw(ZA2LVzPq!mz8%h`YL#_7Z;2Up~jQL;mm9Dc76Em|M7lLcG(aEi%}|EJiixOsQzw z9!CPnu3374*4JCkA|ubr-`mWMS3Dvsl6_L)0+SU{#t?e^St25Dp1C9G17;Gg|GqohyDx zN8mI|^xK*NINb^DF3?gunJb`h8`JVT%7ctGzmmZCP^S1g)-aujyCjRVZR+Yb+}ApU z8L*X(PfRjQG(5!DCD-11856Gs7SPBs3fOi3B_GM)0cWehZjS@`^_hkz$c&|2Xa0$= zTj{9F^~T+tce$lB*EXtI$pCmkPGtfdiCHpeS}ws?C_A7kIe2UAmW@2>ZYkxXek z_OtmH+A|YH+@uNb=UcDJFrI{cTqL?@i$h_BHc;|Aas7KdpcV3?8BRlcJ&r6F3N6Ixwlm;lfMhC`m>%X-lO~A7Din1yDsE zMf&|!51jQ~$7p%=3WeT}j_8EZZ-U@^cSZ1aA41QI+?%D%nZjh|_@s|-|Mq#q-ls8U zasg+lb8SD<-LQ-P`y~wD8o>VBR<&R;c^g+7o`Th>TqT0U3$Pp;~)w z?ZjE_ePj-z=}=-RVY)k%HwMjNh4^*)@53cT>l|ss+c5(Bbp$J*OI`g}P1TCrrn`q; zD%mzaFgGA=Gk1H`p^|>Tlr$lSYQMnjq;JPyUxo zHJ!7x_@eeKBT@re;h2Bv$~2%^p^!0IzsSAmD+Bvz`&Cx2B<6%$0g*BhnvUfE$J zdtrAWN+rX)^F=sekH*X@N%*%jyX@GEMlr)_*Q3vQ_mvhjUK(|RmxKx7p3T$ZpSmdT zPRnhDi%&&P55;{oJ|^}IrV~>>T5s)0E@Y=rW5WB}b@ao3@vRzD%ndcOO3N?wv%Nji zM0}2D$~p5)tt?Ar)e84_dXW?5u+ln;*HnO_Mbp@o89O7QnHH~_r*8e-cU=E8i4tTZ zdQCXloSm(aZSfkoyZrJsxmBP+OW>^kzuazf6^~SFM!nG)DuVEyuWlHE++`Or@rsun z-eoUlWA80e7>4}7R_zE+8#VFIMVfsxWHVjjFoluGOC%r2ew+9x*|sM%JT z({WUBz3bC;h)+zCz|F!H;eKAsVXAot|56#d0Y3i$_QR9M0iuYP4yzZY=Lc_T8^~p zTfDDE1`;E6$BnR(`5$AfkTh-V`fraPM;<7uV$H8caLg4^VvDYsmbM10^z;!?N1~x} zFh%4XN=#Z^6;)!P>b3?=u}tSm7wYQBeX!)j%8ll1Ik1ni-2PG1H>9{1sb^-A_#yMB z`^oK`lx{lEK{oP}D7U67S0m5qL;|EK4_{vkku#fv3NvsZKdYn}SsF<9CNpvEw>^a$ zIjvZwB}6NlRg}RYaoxQIRphH)(_L2qVhI{9>PEleR#O@|8hi{M5vRr|G;bU4z-5t! z#*29>=`x2cI0C#v0ZvXW@c1`<^X~e)vKsuF_D;M`Fk1E~=mA-IY8pP5qYv-u^@sI< z-|EvU3YKpyg?C=iSZOJHH*{Pcs}w5tPUy6h^JwUjC?xz5mdP_5@!Ee~NR;tV93u)e z#NJ;Z*^c#1W1GcPi141*ZcbFhjx8D*QjEIm8bnq+cMwe4GD~IVjryJRcw@j6w7MrC(NtKFA z>`Yvc15QJCx^L{U<;H#kWpUV6Y{aqAbTLF1X1gzvDlE{Ph$f5q-aZe4;-;p{zLF{I zaxSdVWt9@qFJ-no>9>K29fv;#jS;2DhxZeNZfNgi78#Fno3gVxtLc_F#HTWQNpS&5 zn3%M^{)ogE%p7Jg@U*qvkE$CFeacy^PX!v;=_r`@?fUPYx?jN&VA^>m!m$e=!eOyT z>MuNPtN(iw-1~hO2x0WJrx^9U=|rL6sMA5)y!?*p#nP$hviWa}8#$sy{;~dsLZIUf zS-{O(oQeHi<7#YDbBpofJ_(cp5Hu+zLQQxjvgUq}FaJw7X-|OfC@A8ZLDI287|Nad zp##nPer8JigY)c4-Xc*GFVwXRfu+ucQaZlrwembT+O+^OAdEFY=gBo_HvYjUbHIkJ ztwh4B8bF@n@LlECo@ttZU>Qpa!(VsUv3muclVHNBh~*)8Ct$HP{A#Mp^UrT?^6eyr zXh*Ek@unl5;LM{_xDUar@g^#y7vMf(^qyU`Q+$o?&)R~Vx6m9R0u-mf&&Soi(<^E+ zexWZnMo099yMk?!7|c8oL;P1*8CV}z^7o>OmA191=wB&VCX*1S2*w;fze5Gl=BP7( zDw{_Mr~p7=tx7Qe5 zCSy0ynUusUHH~MF|6)MG(Xl4LF?XPfPo4Z_zJTEAT!HFYW=>n1ofK+HfUbkMhP%B} z1ad7g$^$#l%MfV$n%mvek$m^0l|NKiOE9#Jwx28Xr{^;=d+g3FuF9!Lx-viYHU9IS z7rX$f4lpm3PUG`M?PPMMl)ZNP6)4xr6Tmy3ZwGg;(b-YGE?r>S`L(t(yhf!MQS1TH-eBX7_V(q!TjAe6DFQjR+k=e_u zlvfdtOMl-+<4*xm-Q{O|4{#aZYav)XDqME|o?5w4T!3O*&nt(-TNiA;ewW}l+H{E@ zh#r!l$eg0wpB1Xb?0o$f5#(RCPMFaCMp~UB-5n~aAW4f`vOS5-cI(c74#lC(%4ke6 zSIdUE3$mF&63lh)%Q1RY&NSrQRDG>=}3K&6qEl%aUX!70*(&TVh zdA*MeHP;go)Xd5$?Fw(Hno3`*1PeC%AJWrVxOx0DD+ZX2)uDs@C*_s!wmWhaeXoAv zzb4fq=1IYOq$f_*tfcuN~H0t zug32e#;}EWn^oglsnfkfqVQF?RW+>k8N3OJCedN)5t}9^SlQ;;lNg_s;9%{{uLH>^ER%t z3Uu1c^v)Qp+>EONqf1dt>tTAAQecjFF}sAOMhJF^VXehBG9-S#h!$@(p^+DnTsO|1 zTe{$QTm`??b3!evw3rrFK}Kro8thCPPCsW{Seu%$oethS+JsJ;f))|?_`C3H>-9m$ z8#<_!S{YHALWfTKykRD%>R=$UIwW+(MNb~!|bhgdEw%)%G703!O}%ui0c zzAR1qv=bnJQmS`@`mWv63#LIkUZL&a|#)ddEgtRgjE6Y;Q#5E~%7KM%wy>0^`#sYH)EnbwcI*Vt!!c z@R`SmNUL+}(h*supT!MKn=u7UoAx{CR$v7U0EPfcDUP96V|$`lFjl!|+5z=OYG$2Qmwk`V!>gZB6W@u;FV%Vh&$FT`wA9l8VIGJ=V? zVkd-0PO7{v8~l3t`K4cp6&-!oJL`hCHQ+L*Cjb5u&-%2hyRj8Ls6!~bG!_jbm59;w^`a{7pk(nwqD?tbA=|2vs`R(-+6Q#Q#nlwDp z5L4^c_w+&%N$5#jw4@`Fa;NN??@9#y8MXtNGx;5@`Lr3E+z})5D~hTnx_{1sG6Y-S zMO{MO>Y=jHchQB(=1X#dup;4fIA|00Ws) zvfyQv;FKWA{d$3iA9hKTx`Kj&0XLBs=OOu>=BgD(;`)V?d+gS-*TPzX<~O;rA6N8&Z6zGX`%#hs7}xp9Yy-gQP`J zko27biCN2>q2#LRg7=Y`dP>RC@2s0@#G41SC>`U#zm2m|qV7>G*g}8Kw+19i3gf5o z2gPW~6$C7W)_p3%s9Yd@_aYa$Npp*4RWUxn0~JFv4^b_!>j{KNlPWh>x1Wbu!&Kiww1wAZ@rW>M*+eqq<$(5j##tv50*O5D2%M7IuAQ!1{ zXj^UZ=AN&-5EzR*ee*Hzc96Nw1}0{H{>W^4nekPUA6bild^dhP>Wdi7KGdaNOyp=C2 zc_jw)7CraF588>cjHNtZq@LfG4F6}v%Sc^;2oj(bFYS_;e0YwmPh3BUGz89Z+CI$#(lFL8YR?_&1IBjxyy9^31HhdVJTRDj=QsTD8CC`sCfqBfuR;cAZ9yh%e_D&p2UR!Fo$$TI$qJ)JYf)T9aft7q!d-{dPrmSPU; z(|;;vXuykSExW?Q)w0nMLrkS_MyfnUmXVlrhv_xB9(34BUOQsfGX^Q1KOJaY6J9c( zB$TyPP_TYQvd-~{1W%i@&Twm}Vp@GIZpER-f%t@3EV8;~vl$LuN+vTNrx)VG?UQV? zAgYaWmQ_nXjSa&$_PRGYPKC-YSdH2!5vMy#JW>Gbu<-lP8{gp9`0l5|Ak+uT%}$?* z;quMU%pb?6i6Kj>9^<*Ml(=|q=SlMHdA#`vF*w&x0n@WFzJBChku@DI z7*nMhV^vPe@D`{12e^>h`}MW!s<7+|NDjDhaWTUIETLRKFv0{;TurZ&`>d`99%swL z4(>HTIlzk-eH^}TyB<42BQ%4z{68q6NV|zsgzMn2SntTP?dZ|%omFsvKSZ~E6Gf@C z8Q$h8LsUlJMk7~&&ZTBctt5ojl8(CTs{F-h)l|^~_HaLOMOazS#uq7Reze@#6sogz&B}u>Rz%0S@6I);>oY#)7>iN&p;nS!hU>_ zK7W^u%ULC64r_DCo%alYDKUS-8`PydzE?buM{^G9&U(1 z*Jt~&fLlEL>5%HwxHzh)DY!G&)d8EX=Ro=oE;_|?Pz_^mqis}CnU8=Sh} znXzm;n4HY~C>3mr>aWlqDPUky-~=X*(y&4*zh_>Jw5tA8Qx0*B@3-bX%z9%z2P#5z z41u!X$DMVJM(hEf<*2HIr1ptn#yMVwFZy`!^1pIY=oZV7Q{&zQ)=I1ZF?=Xf@H_I3 zK=U3I(=^jw>|az93+xwcxU2#XCWT%Aexo#8edk)Ue|sB>*5~za*2?3%uUUuZ zv;>Dvdrh}5mmzNE&?D~iU}kVOAhGAtWv|sO6d!8-9?6VdnNoHSZvOZGg8+*1;L4b> zkY=HmePT66&h$Q8qiv*qq20HP7R^YH%WF@>t2l+}oPu|=X$xB6m3vxzVF%LKzL3?* zw=q~Ukwv2Q!sb)q69q0q<4uC)?T)iK! zYv;F*oz)IEbIT`0a;-yA@G0^b_RV$P)90RY`^Qs;8itn3$|H zD-1Rw$x%ML%zT;V1h}9)XP4kl56;&Qr0PW-1b`j~zW!pV(CIOWI2^9a*^f`Ay$>m8 z-;aB)=5##)l9z-e-M4>3Kmdt5IVh#9SZkwl8c+tQJ&UWEDA5s|M_WZ3${cM`NqHwu z9eApACYYtJo-`v>FiK4;!{=Ro&6EY1PdiF5u%kf7&WZ&|q^<@Hm8+OItdbxefxL}N(-35xV;OsUkJTW%tG{OUYeYT^l1TfjQZd5-UT<#zIwvI2~dnPV|HRt(VJuIbqa?KxO6%uyq(k z0#7Cr_HUHB(_kU8d_tn?i#xp_fYkN%{^kpzU~;Ly*ZU`vn9@HJCMMCBNL@&&cVyMe z5$2h(Q=F{>K0E@(@&Z6AaioetY?42vfI7$r4c{dL$atlV>))YIlysM_g{04sZQpNo zPn%g$f-m4B%Hmj5rv1~rnQH>6vv3g;>-48&RT!w*SB<6mo44R zst%sMy`HYC88xg65r&oZ-vNFT({ewrQgsL31R#wM&evnO=-oV>?vMOp8ZPERE9s7K zxh46A^)WrU(n_<{dBoeAGaVM89sTn4@6wwnwaN~(hy_^RKp-)1)W|2bD%|3%NXKu{ zbKa23&mTAiqL>OGjw0R%NlMH|KWAEOuA+3S=M>9ReXOjk7%yDcR9cbFq&TVf5NK;H zq5Ga{3$m)u%taLk9wdK7Pp7M_IkezjGB>=pw+CFsmkZV7-f|c$f*^faSE}Ja94%F( z&9`VY3uQMj#*qb06~l_@{&xE|5B|LccSGCwF5%glr|dmem{l#vPwN?NI)p!+HMa>h=2n{^h9WB_r2)1y4ROe*(gu@(j zpC)`5bCyP8c}e$cXVI9j2ny{+NOisr~R4>xKB#(URfz`CpyU@uu#*{1YRA z!et=O<70$H8XP$ zVEh$iXn%zg!Q;=EQmCgtS<74)b+=ok5;f-}cSsfWzT$^6C~ZEXTa+nk$g|S2;B5|w zciIaXEBC9P(I)NnF6bv>^#TnelXykYzpOL?Ll;_TFR6e6QLqHH0C2&TU6U{MGA$A>=4Nwr%+Xp6k!+XSrsOq7185m$<$-DA0%qd zi=vYnfYPH!H(g7@&o>e?U8BwNliH61Yq&GkyX~ z$YiR{npI~6??<7WQyHee@GHE9st-GqS%)gjM)q$jk-15rUjR2)@JMgxjNh6<^lh}W z$HHF+*uB&n)v5@{yLsroSKHUGPtE*;6m!wk20xJ!w9Gu*6yWly|+H$v{mA2^jgkr~v#Yh?CNF0}=rj^)~p`9gA=_4*o9fOsU)cK+&qsss6zds86~9{Dl|;)50=vU#{pdy&^@| zJwRUXR9-;;wmi*IXubrw*{8x5GAQhg-1vm)@fl;03aaw}ldrN=cGO<5?=-hI$o)#~ zm8Zr;O>ihfju-xidm^b}>q1T`JMS71FC`JwqH91)KzcUYQ5{MzpCC4ySLVr9v%f5$ zMzKy&gaQ-TxXay$L8>aC;!QBZpaC&XO_I1)jtI^4JI$-2;D3MjpOZ!XC%erAY-v6FqIxu#(^^7EEO?wy6rzB^!)vPjaoZ)|3BG|M?lB6w5 zTVe;&15{S>$t%BEwltSOM@tR^CUVn8!tHpoaDknLak5I2DO#U(;vA?W7MH|Lw+Enlpd0Yo@5G)d;)fHHvJxQUH41ETT*YKc_}%lPH{%eEXiYRj%4G{)kl zu@RXA$CaAFM{iO3j-UM~Ge1eUK7qDx(E4yJZe_)j79&w+U46E4A61f!)BwkR$nt=+zQBzh2E!!GP<}Idv_KdhzM{c)S_tuvO z*E1mz(^M5*Zg;m zuVeAAZ;+b?dOYgU0C^8qZlZw#DAhm}7+esqsUXCxpS0yaltfR*QZbRP{yzXj&t}2v z=q}0Hj2;0Cb9s6;b3%RN;CzL5(#k}m>UHCY+BPk|1`BI*c-Ml&VBYgnpP3Uia9Gyu z^TT7Mear>~6J7`E>-R_v_Bf&r@px9^xBeuy^=%SFSz<~GaCkWcwc zHJXOp?QVb;nr`%oxK#+_hpaZj-b)Ff^dsNxg$c;}gEW`XRQFXR5%miJltU~wPZDb9 zqZOjFH|l+DAA;+dHiy7AjnS|$4_qT0oLkW=N3nY%sK*KUduy_}HcWWsJenyI3CW7n zUJ@W*L}OQVc6RYU6O5cfKA%xhT_CE(Wk;{R)?SRI$jiUYAfunr<3ASSi26$p397I( zu_Ni)5Dm)&fK~j@aY1yG)Z)cE3M91ivrG`FtJb8JS~nSBSMBitNvANhKmLurgI39n z)zwjKq{Qa>{P@Z7A7vWpb~KWqvC(&wPm&Ek{X#sjHIN5s5w>^IS^lBy+U1Cx%P7m}6ZoxAa#=mB@_We~xdzINXUaCNqxgQP3y91 z#~Sl<`vv}wrmu{Oqv^UG+}+*XH8=!^;1=A1JHd5um*5V; z0|ZELhu{hB1RE^4yU*?C{nq6Ni#0%Zt*+`i=j^lhuFNrqNZ}5~(hF6_1s@Y;n9s!XDBORqt&FG0TA=^vURQiRuZ!o7#7Dt6AT>)pNTxC?abd5( zs~B4p4@Hvg0T=PY=j3oSwHF3*?GN78vM$Z$n|Qqw*Qbw$7+@uz+|aUw3nw;2sj>yn>1(KuPDjwFDpqg$0)k1A0TQ8&W(TNvTE~xo1dIgj^Hq+sm1(oXU>@?4!@o%qUA+w^xFcLk_skKz!Zt) zJWu_t6LI2FJ1xiHTz@s$8Dr+{i55d~5@eH`lXcdfsDr8er1*|&qC%1iwgPb3SfKspn}3s?(9fm1LnuHZi6zK!s(}+&X+nKy zKPV*VTw!@43b)j3ly=B}YbT`%y7v%ddoitw^2U&3t9NhLOX6gm8bsgcB2>k)0C+J& z4TC^$hdwsQ$b~h$?gLj|Ysu2Ib_!lzy+f;gt4j(P;-)IKDx(Kr{MwiS?R9V`C?Igl zRLpxgVl?uWzBG_n_quc*s2)Cq^kG4d)x-o&5O%|>A|(XE<8b|Hge;+9aDcu4_YAZ5 zx^EUiOABxPZN=QYk4_?OcZvuN+GE|0ETlcqkLe(Te23OVjJIMXqa#A^8WF+?rXkSeHUSY%4{E} z_qFErFXCv##i-box?lLz4ximkn$dn7kLQ2)#9>5bMIByWr!=|Q0*zKE&SESe!dRezrRn(=VBYzQ|ZH;-=*e$mf-Ri-|$M9FN|ZYz+)Qhz}0W2 zO3p=V`Y7C+)K=0$;I)2DM;|K#0{9IdgN>FJTW1hMYHM-+H2iWhHJ>d3Eq(5~P>hKA zTJ1m|i}zLS*eifHr_3~F*nM7x6X^M1<)Rh1oe;;}gNEx9X^GE@QJa)HnIirMMLX;k z_XfAh-{3))nbP-xkJyb)q zaQi4WP%NlVf3#fIW#xMwXuygdOe8dZ%jgrxMciPSzco%CWLxD)ZB!sb3D5Xejk%~^ z$#T}|8d`fdep}|%V{l9?+l*~)cR2_d+~Yi0+R#Y5@i2v{s?ce zU*SP17Nq&^G0X7nxMV^8XKyrVk)1ROgg9LFl0&HYLubn&4wGsm^JjD^GuVRMh(TFo zS$x!hs-edbLjsM0-U!1^_UmR$UB@jjQSb;P8guI6Gh@_klI&TAOqrVgmnddz7H$zq zm2fdv!?Z>7PjoT{i~8(rD#NkwM)Icyzf)&uw^Ihv5B$Wt*6vt3dr+TxP+4v)xc$L* z4fkGm^8=)X5~j`LEYi%F_cM9kMik4qE)p&gbnrJh*<90t+Twt)gBh;wl0(g1yd-J) z#*RvW&rcwHh$5d7cQ`Z$+mhbo^pcTT2sLB399eS4Eok z1R`~RY?_~IQ7Zl2HBHdxHG@om(K9GoNm50#vinT#+}6zcfrrb=oMn) z&x#Jt1`&=Fz)j^K=PdQfqR&;WUhIryQTlhn=MFnoa&8U!4jZv6OIB1n_@fV=&!y9_ z(W$lR7MtOFA$iDYuxAmRiM9;heFyl577|J*$db!0JvE$ zp9}9v=*KL%7_gcLrSt`gvV`0%4?k6-idWt0GV>=oqb%5W1CizDr!hj-QX<|4!VL>K zJ5ghTW#6gR<`yqrFVoKi_)6O`9=u9jdYo}91Dn;=?k|J0cvvW}8v*h9S{^B( z`E%p;Y|Y6^zN;MC+KPG^MntHHBIVm{Xu_-m?k3F4QDQsYPEz&OWK%-A3+4f$S=k+P z2?<$PCb|m`uV(D5y#V3P%h~;88JDT`S`g9f*~_*p#Jd~o?<8uz(9fGYp-AH9t}(uE zT^GijV}hR9H~4rN%Fr^49fWe3teHP+iuWc$9r7mU1+n)={cLR#-=+ItV?sX;_tlRn z@FTpryvxL_frSnb6)rVC+h5ko!gPFR**P_I=;ACRYUajp{+#UbNqjYk@E&Uq>>ZNk_lRB4hWDP_6%g}S+!H=Gw2A-;3Um$|C9Sn1;Hb>(Qh z;RZx~Ew-eMNl}!^XkoZefs%oFChCsA_mgQDsbi$LOa)?|r<5yQ7GEjK!C0z4hbD$I4n9GJ6y8mSEc2+Bv z8!=3k-GEUt6lyQ{)Sl3tl^>SMzq#qU5pf2bV$OGpOVR$ zS3m3JU%uxe+G~Snz_5V(A8_N5!f^5h~gq}lUHAUUcrQj{UaGLjKcwgX8 z8hV{pMOZIMJFw~j9>7_7PIcCjv%|Vgh=6#JRCdg-bGzp>-@|{DiMZqv{C7W6!09u@ zM3sQ-Jq2DGS-2=mqT-a6^njt0o3;35aNa;7>qjc4Os;U?lBMR;@|9JprO3n!`2tEV z{Y>2J8FrTU!r?of!>;F_M23E*TZ6G(3Zvv$6s{55_M}@EK)#wxz*Dv3>gW+66D`kX zgW!C_?xAQQ$flv|l8CZYV6qMfQe2GV{*-*fvwGx?R%YpNBMalf^2MQyV0Yz=A=*?8fZ_!?~p)=oqIyLYLdv`n zuK%$-+LuNhjx=Rdtuv=1pZ5q-;B7wpq2Csa+J5&t2nDU$;!^lq2g|^ zcS`K2%vr+;Jh6a4kgUp?;jgySdq2}+c2O9L+!W0k!9@4meEtC)w>ou`cS7#GBfjYm z?CL()zaRKWgCOsBCn)b9IqL!(@jj^_fL#5TAccApA$rKWppEsnzxU0C1VY27-`pRr z3Tj}Paz(~8h$fOAyKeHTzqC0DPy{537F1ALUXe5{iP~n-fo%L{%G~VxtC*xCf1}ph zyG##E?(>Q*VRg2rLoS7!OEEO3{>nMaXv(S=(E^zG#jH~!L+7N8dTlXIs%kOxE1b9aA#Vuk>iJx>Ub~@cRyqm>f`v;qtjsl(0uDKxG&oj$vkvL|_dQkkNd4~(UAtwy$t@iP!^ z&u_66l{=yOlR+nzy{+Tms44h|Y-m;4v$t+2RhTfV*wN?BBIq>M_8_LJ3>_unXUrT! zwKfZ9v2;^spNj#U?Lbri7^TFrAF0#bMXl>tV;4Ha2(a&zJgx*-Z2054_k4=mCzS*# znX=XR&R>N6c<%?*`*lx`0?C`_`{MPqe7s)p@yYobciI@~Z@BmKkH-Y^nvdm2ipRbl zpJ+yRCCI{jCkj*fye(8Ry4iI-3=lNO_afC5y!(F~(Y&kkFc1_sLnx?Mc{)cGrz+iJoRj5u4f=7MKH|@ zS}E)PRUG-wyUPBTN?n2n-QG9oc4yJsIvZ~5s@T`+P=1(gWM<_i5|3kCx_k()+S>as z7dc|f#RB9H2A@`KTR*u=mxNoH*jPfL*{ARi(Q*GxH1By0!=j?eYxHgANY2HRX<-eXGS-5^$cYPokDRCV2S!!P0Vn39q zIeOCvwbpyVy*GH>C*3)VA3yR@^R-mB;3FG%q$oNhPdMD0ygZcnqIXomhb3)jjI`el zMwCjuDRM@?NbVW16FGZ*5~;2369QnSaK~u7b+~u^ZnT!CXXvpF0UbK>HT7Nfdl$y&nO3yGOq(=DBE$mk{w^fWM2!xOjft z(3s1BfZG!r0r_BQ6^F~?d66jI&J>6o(e3`rq4&S~mp?0HW_L$sf0yDhsU%L&94RG( z$<>3e(oS8ZsZW+`mhSHEdN!chOo5%y=ZSYg_#e%Jn!9_EL!s$y&CnT#Y(nqnH!0A` z=hwwvzix5p%k_V*gM;9^2JkDbhakczlqW1m`gl5E2mj7?&jk*;j(GBj1Cw?Bdo1>q}6M_ZnixqO;424LnN7v2WLGFVfwgXdlwD5NUwR3mL ze*LYh7md$p*bh-MpybXog|X`r0u5E2!-tMt7p?}3ocBJ~-X%icuui64 z=9BXpX{3U^(VxqRg;r2Q@>n;Qn0{2jOeTkp3`*g{84-LTUWVkJvcqq)-_68Z1Yed7gRt_ zpOLZgU+dFb?dR8sd(ivQ%F%Ni1@Prq;K}PtLx4Lg9lp3&FZc;mDCV?6q|#!63glPF3kFDBs|VG z{3F?UXEhOK7TGt#orxcito2%j>=3qPnV6c47b#4`7IL?i{5jq zK$+z<5s9cU1n{ybl>;x8tnkvRRJ?005Xd=B-%efU zti-M%$W40FeaXb0>&YT~)=*~^l5@R_leUrAk=gnlo@GazP~VW`OYGf6 z{PS7nJCmPmUtlgQ+XkqJU>+bKayU1M5UT#ZV(d@o)g8kg;G;_JKfJqgpbxI%M`gE`#7xYlpc5^VAr?3dH~HlX~ydeAcMuaA&!(d&_exD0`VYGROy{agX= z@P_;A^=bI{$d`G#E~rVbRc*6S@cBA(mhc~11(PKqVWVv(v)8&`?p@bUM9WAFR0=l3 z52N5`uT_4Gv+iRy=FAW2MV&Zv9mD6)*~Sy~mswGybLa%aI0DWIpFGEPE+!7B&kVoM zwWw*&3y#I9H+g&1`4i2(7p$?^~k}7 zqh~X+996tG#m7WZJX&KWJ3SoCb$AAd_>iD`4BCi-h`tWa?&n*ilZw+`y^o{jG&|zh z{Lna%+jvlU_lbghi~Pj^5I(?}7_h5f4iYr%MEaZR0Lx*X;z|F@M) zV_nU!tRC~atMyZLOtNTbMjyY`;36!meGhYX&|iI!Jg&=1wCEM^s2X6;w^{wnp@jaT zuDz+dPm|1ArVI5h&WOxlu5nLO3 z-v~$yudZ(l0(wYm_HZS|w+kiT96;o`MT$Xn#5-jaM?wWAQdiH;(5XB8PBvwKS;GDMDbB%}nUiZNt1`crk*tU6?9+$g zAClaNlb?<=?u;|H+Tr1x=`f5Ri-9#16xuje#Z~J}v@%!t+!X={%ch7Z| zK}@+7e>Fk*4w_>$d?70JlfOLtPUVmTYiU8p@DaI+&ji$!bZ&?&*XOPeO@8E0Ga(-C z9E2a(vxF07T=*6YdZ7d!*&m(z3n8G7WqtjyMU8!uI+JhEJ@htq*kPQDN7M&ngp<6?pEtvWa+k3A$oz2?#cNa77z}vy?i|Dttc%b`rAF4^u?PSycV*2{; zvHy0IZb%WFFEw(AS9B;Qyp-GPADZO}cwhIgTVSa4@+uHDffUEEkxBCLcLA2ygjWkf zpG&W>B2*k3^uH{pfC0u$1ACWjH9@5289X7dlz+!pc>CRUtKdA4=`K}1(CzeG8MGNi z=A!>tQulY*Z`tGJ?Y@`F)pvjl1Ui5GdYa+;xwdnKlj;2^H z^37cRo=GW;IZ2ZcA&D{w-t>015)Neg&`-4eUwd-pIZseL>+%9{K!*4{QS3JtJ)WkY zl=gN$Y{$R8MBhPGlAs1t{)_fFfEfQttLwVp{H0@IP$u^=9~H!V(*g5NHJo1+aAzir zN2spuH}Sb8qv<;5f^-hN>UHe58D98oJpRo<(O$N5w0|oIx{HF>A|GixD2e~_pP@6k z@h-sr?T>FJR1dWL$jhRH3$*?QzF7Zsb!ztq@30{(H4ka`?AX6`PJ!R9eWwC8!s(T` zb5sH+J8g#k`StAF)4+)RV^ROR^isks^6wE&XlDm%C`IfM2LTVzfn01%mc)On*{kib z#r5-A*UswsL$6+j z7gn7%Hb_i7vx23%`U*R5d;~CF2KZuBpU#lym4cQO>h2g?qo0~J(~e%_KthDL#~n91 z-9`Oli53xJQ<}ONP-nmfTME^}LGedjA$ZqFw(;a00?F}XXT$ElzE|h?!^`D?3xLD* z7?@OHe=(6P?ojW4QVPP`+EZVT%agn%DTP$pACbhZ_)A`QZeKzyxjK(#ejv7;f&hfsh5 z1F$Nscn#WntBsNV{;x3u@4j|RXw}*Huc046DIIHy{tn-|y@K|FPtx4|WeOFRNIqRO zop&H+8Gptx=NNxrmbm;4mNL*=UK2SFuw5O2=6mc04)|eCxL%L?K{}T=-aOI?dL9qe zhcd8&W5@=O+g@Fvl!Cn3ku0~NBVMkC_T$x?(b zbq+a7frx`gG$y6Ad-J1%Qa#592df>D0u2aGeMS_Tla*$@)W-DW5>LuORGrwAMXg+> z^=QL)AJ)VOB}Fl-(!F*^(taCyd}B>3BX~T&H1mVtA}^-XKfUKvk_*9Oy2*pFr;$O& z;3qt7T`3a+7tV@7U$G&{?z<5u5fQ4Q$9c$3DOJbJw<(zdKbh-*KUi-e-P=Y~(Wj?r z5B0A8jV#BgekKF`w28P0t%4U1RFCiDHRHH~UZ~tgo?Up4_v+!NE=AMoPKu?1p?^O1 z;DRpVdmrN80(iTgTqp13RC|)PfWl}NfW4PDvs$uryhcJoVT7o;DkM_kF*2-a%S~$uOCQJ_ z7GhebB^?3nBw6^(-Dxluv_+*7i=b-HN&ZDDxa`N2NRjpiWs72|JhU7hW ztYG$mh&`pg9`}~~q`5jNMY*Y2BJ8(~XJ33NX_0~`YXcm*w0MIhueLfe4!cKocUZ;B zxlyYGyTJ7PZ90WSgcLL!)v+phDclX;6{YPPZFO0Z)i@o0c(BK*DE!R$sJwdl)kBR> zm)T8I;@9#a*|cU5+$UGuPC-dU`e0o~a&QmcRB);9z+q+af}+K;^42WYO93`%=!BRX z@_{{CrRn{WrQC?+jaBYXnz@LrAUI2>In30X7p356b3rRcOW9Nli0@9~jKn)gAm3uG z(YqlMzcNK=yC6-HY+87=mg$OHi}S#B7iw7bo{64wfUs7zhFkxofmrU|wovf)j}Pt3 zWfN3bEWaV;>uj+GUh=;K^qg%MNGb{?51;ap=qCP2soLLvaF(Lrs-3LWCJJKBh|8`7 zaf`T=8k2{fKij!}DDAeM-90>Hw>0=Tt!wM+3!mKk8GSh3D$cch<=P$jgeA#huyMU2WkFzD-gN_pEu$3H+NM0YU%W8$>ly|4bO!J0v<#Co5Vz(C2B#dpj&B7>5U zESj>y)l4W{q`oD|oHgb~&eSoiJ=G=4yfE0l-$g^Ldd8bhju#L&GVqm>@Sk9~7R)dT zIiz0}5>C8+3yx`;OS3#Vx^@n{L4i$-Swx$Ro(RMjC;Fs@(iwH%H;uvWY6M@P<(pr; zD?ELt0ty-^TfDBhug?WZ$DsC~9~{IarGUZPctw33UdLZIdKb+PFN-7oZyIH?;!Q9P zN3&dWZ6fhACm1mXVn|h$1tc{VSY}x$S_Z;$0;333(K83>7^?icMAr4HA5w8fA-ZA7 z(P%rE14^;ZDk#osn9zB)q%3r{7(^AdKZ((T|G1SFqU{az@Lf93j(Q0XJxO(1rBB0u zd3%aAutc761!IKqb)7Y}Zk;T=H~YDlkjTI`CI9ih2-fJ< zJ#@(pJ>^m`;UiSB)~&2}AjM$nb%-q%_X4a#-rOq-s|$P!iIgZ8Trws@t=^IoW%RJyjn_tMuDUx8A|(+ z)o<&vjJAkIDER0WIHX_)zvnz+32jf@_U3(d6yX*(8$9tl8h98YdF1jgyY}fhH=~G(?FGL*?t=qX(5aPJ zmAzKn$@Mb{s{T4Od~twP95J}qwr{f&R%YPJU2q|WNonW&Fb=OX5ahnltA{VO$E=v# zt}?H=`sw4&+0}#85nOvdfjpe7U4sgRE9Jh)tS1jT95|3893#ltZp_niVf*8zKkR8c z&v*azy!R-ZkLY8`z3`_w5)a0346u@cH_QpiB5q?r*u^`|hLn9&Z*3$~KQZi_okv*4 z^omb9_48dv`nA>j>X=MJj-L;VyV23|Ra~3j?oy z@0@qvZ$PhtB=`L`w%O{tK6}WZZ(fd2jr0UPQ#;F$NW?RFEA}Udrceg&(wwZd^ED-6 z*mYnoxtHwRpY9MK2wd*yCU@uF;4xjb(W&>RGJL2oNhs~-86gk9o)qUwS!M{oCNV#F z@1Az7%0LOZ|3y3i=M$8up?vwI{ia2};Dt|&^_gnp$7l2pgr+cz=$=;Ip=hYdIn2)- zZqbzC5HMFU$anNd^*duYA-B43kMMwz9H)y3?*ji0%w#vq2rjGMeKE>)PiJIypjk5A!3FBb7Ffmh*Dp?c*ujkwRY@-l`>y1`!VTi09 z*qFI|oijZzs@Q8pL*mfNVzH1yZFT&0CaP#czHrS}__QN#0g4Ys9ls(&itXL9kzhjW zRQM>5PeVoqx!3s?1q;MN2-x(@Pgk1TZWoOzAK=UWKvq{p<;X-*8$ikQ%RejzR-6Q% zHx?K5(6O+%mK$xS^dR?qEzTckmQJ7F7Rx_m*#!9e1Ai8E9}JW&D}DnQ@4nX@!)4pH z@ge0PQKQW7Bd*K^ajW13AQ73b2BURYY~K`SQN#Z#m?}V~HO}|@9$s-$bKu0_YaJ#- zpZ(4OUOxETgKGUzuuK4sE9qpQrNHPt2E{%F7_kleVGGVD3?#JE)HwaO8Q-~}!1uQN z<4UfB@BYH`$BDAS!a~#{skOzdSiLKWv@@twfAOLqCSzOOhx@a2HW2oR`}F#HL3z47 z<9W4iP0Wsv!HE0CQBD1}Pw#WV59hqa1(1!AIe!_zWNpKTe;vA1c zGZitcO)Tg&GE16EXvG|lpkd$go_bmu=L?g?0cZzyhYpW;^{QUs^b9(BXL;#+5euO^ zeaXE*yawHg-Sa*sekAmsPLY!ok5&^n9Qo`E=NUZr*Zx)BJhV6|ez= z0TsR7R4R3oU(pfFi-AZKAea5gF_}-djca*A8OT_$_zVi+r?wWN@M~nN7QI(2C62Yy zcyO{SuS)JWWn$5@AL_BoJhQEl(&0_--CGk%90z_nTM1A9oMQ09EVK7VrL(8UlIo#4 z#QTEAW*^Y}+`AP;HVQZba@Y4x;r_Q(><2>5uf(|6O5O1A@O-a+GZirt#zQR)2&1B- zCB2TSDtl6}!|Lid?Q*?e_a*Mz9fKecFkoI*sKtlMo#%h$YhRx*RBzHLxPr|K3#&6l zBboX>u~bxzdswASrZN?~ch&TTK=5sf<-!;9Ukp$zIrY${cH!NCJl)9v&`hlN7YaS5)z?0_Hk6~$r))PHs79=dOpM}>YN z##Qp+x06S^@zAE8K`$Li!*K`jRGBlBza7JW*HwpJ^dS9sIYMXrV~zf%qvJJ*Eq!sB z3>Kq(DeJmSN=k}B8T1%Uwqp89s*qLPq5M73DT{``-DF*lYsx~<4?A%K;&}#^z%q9! zuCI3;h{7Q2Ff=l1WGe8~a%?vq-X4nQ;pe}pGIH(Kz4L#V?~g>Ii+XuI2ZPHrnDND@ zR?X62zPay>L>mnf|gEM`jN%oBdOlLM~^anxnvs%vkMv+5~9i0@M8Mr2_jrPz;S zPWBGilmMP}@tU;n0yo{V%4k-X+s*c8G%KRTiXa^L!%C)TrG=-amV z{Tf|a+5;f*$CG@!OpXT@XSlV2oueZi92}g0ctZ-Ouj&1e@53b0^s@_EZn?!)XP|FS z2;=NBbc~i$-`75pltuSf5%gsrJ|tUh;{mXdRHncFZ&GB1UT^01yG_70ZUA5gyw@&5 z2ji!}UTW%dJ@JmK6KE(vTlCq_fLu2~MxqG3(eNFi=e!j7q|x~q<3Gps>sCl`0B}?n zr2V|-c@YSRyiGp;8;k;$`L7IEe^!LbgHM}hO50hOWxnKozf&2kfG|~((sk)|yeKzF z_20`*G${7+_&)%Yh>yZm2T`}Qaay_T%Ul<9#$0ZZgzn1pC5{z1^T`yMb$anV2{g@_~gLpr?)kLlUZQ(mk6fiJ;0gusr3(7qU|BKst@arn5M|^I_i&}UxaI0jDG>NXp4+Q*& zEF;YA&CQpd9*OTJoh`+{{;d026mNVF3`GXU-)>;4x=^A}rpIoEmNyOfCC;A5`u>(; zR68-21l3Vaw4aa`Ngoj4WK;bmm#i}#R=EgrjSO+?MH`Qq%2__X(aaZthDV0Ks8!<3 z>vnE6+aKV~NMYXym0A2u0OSo0vPTcRIk;rE7at{fSGAH3l#fcm)0b3xsZ$tlHD;|V zK?%vp3J+O^UlY))oVS|bBA|fY$FBv;Up6|F?X&cPus;&)JQ0D}P1=AcGjhs3PnG$g ztNmw_*f>ZUNl3^htXNl%#!Atci>T5)+!w`e%~C2{g`=;y0?}qc63se>cRJ~ivA+n> zL~qS;0d@QLO0-uF@Komq##GP@n}g6kaJa1Tb>y1+2!#Mvp?!7B$sA8XFhyd81DA0d zw%OZN7TaoA&8NBrB5M4X7*>56FE=JO%zqfwI0%oaR>D;l2RN-vRzOi{6c=Nt6I_iW zxlf+Y^APM7RK#=PHlJ~$^sO6f;TlJ}BwDYMX~BP{nTh#l+(rP#7ML)@>u5S-_|ld6 zfl0dwHY3Dw2mJY@GtdQc&&H}s_N&*w5H1o*Py1g)CUX(EpO(RTzjPaC$?la|u_GkV z%GAw=l6Z5hvHGN5SrlEzDKW>NqFioyeJ!hc$BZl`E50av_}c0$s&zXr_w86js|uet zhadRPK9^82i>qA09b%rMQ|*(XWv_KLrmT>|gfSAy1P{Nji5W32-^A{yJa%D-YtUV1 zJh(vkbuctgNsDx$A8MSwP(73N^e{!8q5Mndf{KbLlis~@yEpZL?E*_yNQnHR9=FRr z7r+TFf+VXw>=iRGNm`G_^>TE(PcNT!irQy_DfkZei)+>-Gn8raCRn-NGefK0bZEb# zXz9XHTPU|}(vl)oa1vMDkwt~7h(uOYh~-}SmCe~_%TKH2YoIDCS|P=J@umBXTYU>l zo4y!oKrMYpHUATdKnv#G?hMb>KSj0G#l=khWJ&G3cbvs>L$t^=Ge0H_A6#`NTy`nT z@s)>r5eK+|6+1IOAJH|~Yp>@FqKj1pBI2{@8Qn9o;>+01Zg4a%^zzd}lKh{b82>+Y zCzUh-Y_MtJ_Pf`MD|L)3zk?Q@tC#9!c>g%8{@Yw{i`7X%rdJ3qu*usizf<++rv%c%I-%-p)MLLE^jAkchb|ZfJxMn z#!-fmLqI<9L!2yw*K!)W=yl_caudTU|D1!3E2!sY;@d-{BODcPR2`v(QI7D6Ji@bzs&eS=#S0v>o4aJzDZzfO7) z7Dl+e5Fxm46)+Lc$V*FNu3mBmaEaj>Tv1I)CD+Cq)?6i{~{_*v?K0m+z4c~+n{m}O< zIf~FC)q^z&>M4>4oUz68MXsQ4EaOnZJ=t%zBrAd!_#%LA39yvo-~m9Tv;&A1gzNgu zNTRW3lZ=!0rSM+qg@`SXoNuVtKKJ102zH+w(6j31RV@yH*M4X7zw8x911Ae%etS?n zN+bdAU!FR+jtgDPn>>^;syO8 z7NhwJqo|2tQ2h%vM~d7DXU+K6eOf_n1c=@WHeGrS4#iw6?mXyVVAMSnpV||?dCX!P zHiho1-vbUvf0ULOL=}Sc6@GIC{0sHfO2SpPcL+K*BYX=BOsUeTrk!VK@5&Wm5kO+GP9+9OPt>G5Ya*p=0O;tIDBvtj z17B5=5!03&!V~o$hh{T>py9jXLIK7b$tU1R^pn`;!$9sYZ|2lL0i}R;e&*b-UJ-I8 ziI<8L`w=B{jZ+BmJK^osofK+W{xBYW>IbjnaFijF-2zH5xPyf&y4zRI)X;6$Gr~C9BkR&4MtE@U3fJK1r6$v!QKwJY6Cj2K#$C30sUX~!SzT;c&INm#O*l89k&6p%d3pIT*(761d*zfxX7uT!Eh#My zoo_3rmRAGBJRl3$FH{^`lshUR(X(a}f^c6$v4MkB6$aHaUSMaxv>KSK#dqe;bP8c{ z6d?Tr5Qt`r8DAJnMU^Q>u8J%vI+Bn$Fo|iZpk1@AT?DhvZJLJ~G7T-ILVcDwJ{DTk zy)3}T zh8_f@e@&h1q{T=}wwrZWb-&#x;S*3SM3 z=|4Es0MIowI*NSe?$o8dlrra4CV;U*Zr$*k2DVIDK9fGM7+X?%8(#L3WHi6Wd`q{- zSJf>tt}HEb_MDq zy6uyblffAUszf4F-(s6jTCq?=K6G1NwriSCoGR^0q7Q$kpw}v_wP+t;- zDEFQp^Mi!baNiLE!p8|Y1nL?e>N0j!deD=I1u?g1>NBPGNaQy)wu*(;oFuP zC5uaV1_3M}qmZ+ot~-_=FWc~L*6rH&OUsoKkIwIcF+�FC8a|ODM&z{sdGT4?_>c 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 XbHS!YB`b-QAmE`Sr!HG7Z5H-F5(f~d diff --git a/src/main/java/crazypants/enderio/conduit/gui/BaseSettingsPanel.java b/src/main/java/crazypants/enderio/conduit/gui/BaseSettingsPanel.java index 49aa7089..8fa2c9dd 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/BaseSettingsPanel.java +++ b/src/main/java/crazypants/enderio/conduit/gui/BaseSettingsPanel.java @@ -140,7 +140,7 @@ public class BaseSettingsPanel implements ITabPanel { x += gap + leftArrow.getWidth() + fr.getStringWidth(modeLabel) + gap; GL11.glColor3f(1, 1, 1); - IconEIO icon = new IconEIO(10, 60, 64, 20); + IconEIO icon = new IconEIO(10, 48, 64, 16); icon.renderIcon(x - gap, y - (fr.FONT_HEIGHT / 2) - 1, getLongestModeStringWidth() + gap * 2, leftArrow.getHeight(), 0, true); int move = (getLongestModeStringWidth() - fr.getStringWidth(modeString)) / 2; diff --git a/src/main/java/crazypants/enderio/conduit/gui/GuiExternalConnection.java b/src/main/java/crazypants/enderio/conduit/gui/GuiExternalConnection.java index adc85141..717666a6 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/GuiExternalConnection.java +++ b/src/main/java/crazypants/enderio/conduit/gui/GuiExternalConnection.java @@ -177,7 +177,7 @@ public class GuiExternalConnection extends GuiContainerBase { RenderUtil.bindTexture(IconEIO.TEXTURE); IconEIO.INACTIVE_TAB.renderIcon(tabX, sy + tabYOffset + (i * 24)); IconEIO icon = tabs.get(i).getIcon(); - icon.renderIcon(tabX + 4, sy + tabYOffset + (i * TAB_HEIGHT) + 7, 10, 10, 0, false); + icon.renderIcon(tabX + 4, sy + tabYOffset + (i * TAB_HEIGHT) + 6, 11, 11, 0, false); } } @@ -192,7 +192,7 @@ public class GuiExternalConnection extends GuiContainerBase { if(tabs.size() > 0) { IconEIO icon = tabs.get(activeTab).getIcon(); - icon.renderIcon(tabX + 4, sy + tabYOffset + (activeTab * TAB_HEIGHT) + 7, 10, 10, 0, false); + icon.renderIcon(tabX - 1, sy + tabYOffset + (activeTab * TAB_HEIGHT) + 4); tes.draw(); tabs.get(activeTab).render(par1, par2, par3); } else { diff --git a/src/main/java/crazypants/enderio/gui/IconEIO.java b/src/main/java/crazypants/enderio/gui/IconEIO.java index 027f0bc6..b70ed74b 100644 --- a/src/main/java/crazypants/enderio/gui/IconEIO.java +++ b/src/main/java/crazypants/enderio/gui/IconEIO.java @@ -9,122 +9,117 @@ import crazypants.render.RenderUtil; public final class IconEIO { - public static final IconEIO TICK = new IconEIO(0, 100); - public static final IconEIO MINUS = new IconEIO(16, 100); - public static final IconEIO PUBLIC = new IconEIO(32, 100); - public static final IconEIO PRIVATE = new IconEIO(48, 100); - public static final IconEIO CROSS = new IconEIO(64, 100); - public static final IconEIO PLUS = new IconEIO(80, 100); - public static final IconEIO ARROWS = new IconEIO(178, 100); + public static final IconEIO TICK = new IconEIO(0, 192); + public static final IconEIO MINUS = new IconEIO(16, 192); + public static final IconEIO PUBLIC = new IconEIO(32, 192); + public static final IconEIO PRIVATE = new IconEIO(48, 192); + public static final IconEIO CROSS = new IconEIO(64, 192); + public static final IconEIO PLUS = new IconEIO(80, 192); + public static final IconEIO ARROWS = new IconEIO(176, 192); - public static final IconEIO BUTTON = new IconEIO(0, 116); - public static final IconEIO CHECKED_BUTTON = new IconEIO(0, 132); - public static final IconEIO BUTTON_HIGHLIGHT = new IconEIO(16, 116); - public static final IconEIO BUTTON_DISABLED = new IconEIO(32, 116); - public static final IconEIO BUTTON_DOWN = new IconEIO(48, 116); - public static final IconEIO BUTTON_DOWN_HIGHLIGHT = new IconEIO(64, 116); + public static final IconEIO BUTTON = new IconEIO(0, 208); + public static final IconEIO BUTTON_HIGHLIGHT = new IconEIO(16, 208); + public static final IconEIO BUTTON_DISABLED = new IconEIO(32, 208); + public static final IconEIO BUTTON_DOWN = new IconEIO(48, 208); + public static final IconEIO BUTTON_DOWN_HIGHLIGHT = new IconEIO(64, 208); + public static final IconEIO CHECKED_BUTTON = new IconEIO(112, 208); - public static final IconEIO WRENCH_OVERLAY_POWER = new IconEIO(0, 148, 32, 32); - public static final IconEIO WRENCH_OVERLAY_POWER_OFF = new IconEIO(0 + 96, 148, 32, 32); + public static final IconEIO WRENCH_OVERLAY_POWER = new IconEIO(0, 112); + public static final IconEIO WRENCH_OVERLAY_POWER_OFF = new IconEIO(0 + 48, 112); - public static final IconEIO WRENCH_OVERLAY_REDSTONE = new IconEIO(32, 148, 32, 32); - public static final IconEIO WRENCH_OVERLAY_REDSTONE_OFF = new IconEIO(32 + 96, 148, 32, 32); + public static final IconEIO WRENCH_OVERLAY_REDSTONE = new IconEIO(16, 112); + public static final IconEIO WRENCH_OVERLAY_REDSTONE_OFF = new IconEIO(16 + 48, 112); - public static final IconEIO WRENCH_OVERLAY_FLUID = new IconEIO(0, 180, 32, 32); - public static final IconEIO WRENCH_OVERLAY_FLUID_OFF = new IconEIO(96, 180, 32, 32); + public static final IconEIO WRENCH_OVERLAY_FLUID = new IconEIO(0, 128); + public static final IconEIO WRENCH_OVERLAY_FLUID_OFF = new IconEIO(0 + 48, 128); - public static final IconEIO WRENCH_OVERLAY_ITEM = new IconEIO(32, 180, 32, 32); - public static final IconEIO WRENCH_OVERLAY_ITEM_OFF = new IconEIO(32 + 96, 180, 32, 32); + public static final IconEIO WRENCH_OVERLAY_ITEM = new IconEIO(16, 128); + public static final IconEIO WRENCH_OVERLAY_ITEM_OFF = new IconEIO(16 + 48, 128); - public static final IconEIO WRENCH_OVERLAY_GAS = new IconEIO(64, 148, 32, 32); - public static final IconEIO WRENCH_OVERLAY_GAS_OFF = new IconEIO(64 + 96, 148, 32, 32); + public static final IconEIO WRENCH_OVERLAY_GAS = new IconEIO(32, 112); + public static final IconEIO WRENCH_OVERLAY_GAS_OFF = new IconEIO(32 + 48, 112); - public static final IconEIO WRENCH_OVERLAY_ME = new IconEIO(64, 180, 32, 32); - public static final IconEIO WRENCH_OVERLAY_ME_OFF = new IconEIO(64 + 96, 180, 32, 32); + public static final IconEIO WRENCH_OVERLAY_ME = new IconEIO(32, 128); + public static final IconEIO WRENCH_OVERLAY_ME_OFF = new IconEIO(32 + 48, 128); - public static final IconEIO PROBE_OVERLAY_PROBE = new IconEIO(112, 100, 32, 16); - public static final IconEIO PROBE_OVERLAY_COPY = new IconEIO(144, 100, 32, 16); + public static final IconEIO PROBE_OVERLAY_PROBE = new IconEIO(112, 192, 32, 16); + public static final IconEIO PROBE_OVERLAY_COPY = new IconEIO(144, 192, 32, 16); - public static final IconEIO ACTIVE_TAB = new IconEIO(237, 0, 19, 24); - public static final IconEIO INACTIVE_TAB = new IconEIO(237, 25, 19, 24); + public static final IconEIO ACTIVE_TAB = new IconEIO(205, 0, 19, 24); + public static final IconEIO INACTIVE_TAB = new IconEIO(237, 0, 19, 24); - public static final IconEIO LEFT_ARROW = new IconEIO(217, 0, 16, 32); - public static final IconEIO RIGHT_ARROW = new IconEIO(201, 0, 16, 32); + public static final IconEIO RIGHT_ARROW = new IconEIO(192, 48, 16, 32); + public static final IconEIO LEFT_ARROW = new IconEIO(208, 48, 16, 32); - public static final IconEIO REDSTONE_MODE_ALWAYS = new IconEIO(200, 60, 20, 20); - public static final IconEIO REDSTONE_MODE_WITH_SIGNAL = new IconEIO(220, 60, 20, 20); - public static final IconEIO REDSTONE_MODE_WITHOUT_SIGNAL = new IconEIO(200, 80, 20, 20); - public static final IconEIO REDSTONE_MODE_NEVER = new IconEIO(220, 80, 20, 20); + public static final IconEIO REDSTONE_MODE_WITHOUT_SIGNAL = new IconEIO(64, 224); + public static final IconEIO REDSTONE_MODE_WITH_SIGNAL = new IconEIO(80, 224); + public static final IconEIO REDSTONE_MODE_ALWAYS = new IconEIO(96, 224); + public static final IconEIO REDSTONE_MODE_NEVER = new IconEIO(112, 224); - public static final IconEIO FILTER_META = new IconEIO(0, 212, 22, 22); - public static final IconEIO FILTER_NBT = new IconEIO(22, 212, 22, 22); - public static final IconEIO FILTER_ORE_DICT = new IconEIO(44, 212, 22, 22); - public static final IconEIO FILTER_WHITELIST = new IconEIO(0, 234, 22, 22); - public static final IconEIO FILTER_BLACKLIST = new IconEIO(22, 234, 22, 22); - public static final IconEIO FILTER_STICKY = new IconEIO(44, 234, 22, 22); - public static final IconEIO FILTER_STICKY_OFF = new IconEIO(64, 234, 22, 22); + public static final IconEIO FILTER_META = new IconEIO(160, 224); + public static final IconEIO FILTER_NBT = new IconEIO(176, 224); + public static final IconEIO FILTER_ORE_DICT = new IconEIO(192, 224); + public static final IconEIO FILTER_WHITELIST = new IconEIO(0, 224); + public static final IconEIO FILTER_BLACKLIST = new IconEIO(0, 240); + public static final IconEIO FILTER_STICKY = new IconEIO(16, 240); + public static final IconEIO FILTER_STICKY_OFF = new IconEIO(32, 240); - public static final IconEIO FILTER_META_OFF = new IconEIO(64, 212, 22, 22); - public static final IconEIO FILTER_NBT_OFF = new IconEIO(64 + 22, 212, 22, 22); - public static final IconEIO FILTER_ORE_DICT_OFF = new IconEIO(64 + 44, 212, 22, 22); + public static final IconEIO FILTER_META_OFF = new IconEIO(208, 224); + public static final IconEIO FILTER_NBT_OFF = new IconEIO(224, 224); + public static final IconEIO FILTER_ORE_DICT_OFF = new IconEIO(240, 224); - public static final IconEIO INPUT = new IconEIO(128, 197 + 32, 30, 14); - public static final IconEIO INPUT_SMALL = new IconEIO(159, 220, 16, 8); - public static final IconEIO INPUT_SMALL_INV = new IconEIO(159, 228, 16, 8); - public static final IconEIO DISABLED = new IconEIO(159, 236, 16, 8); + @Deprecated + public static final IconEIO INPUT_OLD = new IconEIO(128, 197 + 32, 30, 14); + @Deprecated + public static final IconEIO OUTPUT_OLD = new IconEIO(128, 180 + 32, 30, 14); - public static final IconEIO OUTPUT = new IconEIO(128, 180 + 32, 30, 14); - public static final IconEIO OUTPUT_SMALL = new IconEIO(177, 220, 16, 8); - public static final IconEIO OUTPUT_SMALL_INV = new IconEIO(177, 228, 16, 8); + public static final IconEIO INPUT = new IconEIO(224, 64, 16, 8); + public static final IconEIO OUTPUT = new IconEIO(240, 64, 16, 8); + public static final IconEIO INPUT_OUTPUT = new IconEIO(224, 48, 32, 16); + public static final IconEIO DISABLED = new IconEIO(48, 240); - public static final IconEIO INPUT_OUTPUT = new IconEIO(159, 212, 30, 8); + public static final IconEIO LOOP = new IconEIO(224, 96); + public static final IconEIO LOOP_OFF = new IconEIO(240, 96); - public static final IconEIO INPUT_OFF = new IconEIO(188, 180 + 32, 30, 14); - public static final IconEIO OUTPUT_OFF = new IconEIO(188, 197 + 32, 30, 14); - public static final IconEIO INPUT_OUTPUT_OFF = new IconEIO(218 + 32, 180, 30, 8); + public static final IconEIO ROUND_ROBIN = new IconEIO(64, 240); + public static final IconEIO ROUND_ROBIN_OFF = new IconEIO(80, 240); - public static final IconEIO LOOP = new IconEIO(217, 236, 20, 20); - public static final IconEIO LOOP_OFF = new IconEIO(236, 236, 20, 20); + public static final IconEIO IO_CONFIG_UP = new IconEIO(16, 224); + public static final IconEIO IO_CONFIG_DOWN = new IconEIO(32, 224); + public static final IconEIO IO_WHATSIT = new IconEIO(128, 208); - public static final IconEIO ROUND_ROBIN = new IconEIO(86, 236, 20, 20); - public static final IconEIO ROUND_ROBIN_OFF = new IconEIO(106, 236, 20, 20); + public static final IconEIO RECIPE = new IconEIO(0, 224); + public static final IconEIO RECIPE_BUTTON = new IconEIO(80, 208); - public static final IconEIO IO_CONFIG_UP = new IconEIO(80, 116, 24, 24); - public static final IconEIO IO_CONFIG_DOWN = new IconEIO(104, 116, 24, 24); + public static final IconEIO ADD_BUT = new IconEIO(208, 32, 8, 8); + public static final IconEIO MINUS_BUT = new IconEIO(208, 40, 8, 8); - public static final IconEIO IO_WHATSIT = new IconEIO(192, 148, 13, 13); + public static final IconEIO SOUND = new IconEIO(176, 208); - public static final IconEIO RECIPE = new IconEIO(16, 132, 16, 16); - public static final IconEIO RECIPE_BUTTON = new IconEIO(128, 116, 24, 24); + public static final IconEIO XP = new IconEIO(128, 224); + public static final IconEIO XP_PLUS = new IconEIO(144, 224); - public static final IconEIO ADD_BUT = new IconEIO(139, 246, 10, 10); - public static final IconEIO MINUS_BUT = new IconEIO(129, 246, 10, 10); + public static final IconEIO SINGLE_PLUS = new IconEIO(240, 192); + public static final IconEIO DOUBLE_PLUS = new IconEIO(224, 192); + public static final IconEIO TRIPLE_PLUS = new IconEIO(208, 192); + public static final IconEIO SINGLE_MINUS = new IconEIO(240, 208); + public static final IconEIO DOUBLE_MINUS = new IconEIO(224, 208); + public static final IconEIO TRIPLE_MINUS = new IconEIO(208, 208); - public static final IconEIO SOUND = new IconEIO(209, 172, 22, 22); + public static final IconEIO ENDER_RAIL = new IconEIO(192, 208); - public static final IconEIO XP = new IconEIO(235, 60, 22, 22); - public static final IconEIO XP_PLUS = new IconEIO(235, 82, 22, 22); - - public static final IconEIO SINGLE_PLUS = new IconEIO(234, 100); - public static final IconEIO DOUBLE_PLUS = new IconEIO(218, 100); - public static final IconEIO TRIPLE_PLUS = new IconEIO(202, 100); - public static final IconEIO SINGLE_MINUS = new IconEIO(206, 116); - public static final IconEIO DOUBLE_MINUS = new IconEIO(190, 116); - public static final IconEIO TRIPLE_MINUS = new IconEIO(174, 116); - - public static final IconEIO ENDER_RAIL = new IconEIO(235, 175); - - public static final IconEIO FILTER = new IconEIO(203, 31); - - public static final IconEIO ITEM_SINGLE = new IconEIO(220, 32); - public static final IconEIO ITEM_STACK = new IconEIO(220, 48); + public static final IconEIO FILTER = new IconEIO(192, 192); + public static final IconEIO ITEM_STACK = new IconEIO(144, 208); + public static final IconEIO ITEM_SINGLE = new IconEIO(160, 208); + + public static final IconEIO FARM_UNLOCK = new IconEIO(128, 240); + public static final IconEIO FARM_LOCK = new IconEIO(144, 240); + + // Texture size is actually 512 but everything is aligned to a 256 grid private static final int TEX_SIZE = 256; private static final double PIX_SIZE = 1d / TEX_SIZE; - public static final IconEIO UNLOCKED = new IconEIO(150, 245, 10, 10); - public static final IconEIO LOCKED = new IconEIO(162, 245, 10, 10); - public final double minU; public final double maxU; public final double minV; diff --git a/src/main/java/crazypants/enderio/gui/IoConfigRenderer.java b/src/main/java/crazypants/enderio/gui/IoConfigRenderer.java index d408e3bc..3e946620 100644 --- a/src/main/java/crazypants/enderio/gui/IoConfigRenderer.java +++ b/src/main/java/crazypants/enderio/gui/IoConfigRenderer.java @@ -306,9 +306,9 @@ public class IoConfigRenderer { // INPUT IoMode mode = selection.config.getIoMode(selection.face); if(mode == IoMode.PULL) { - ioIcon = IconEIO.INPUT_SMALL_INV; + ioIcon = IconEIO.INPUT; } else if(mode == IoMode.PUSH) { - ioIcon = IconEIO.OUTPUT_SMALL_INV; + ioIcon = IconEIO.OUTPUT; } else if(mode == IoMode.PUSH_PULL) { ioIcon = IconEIO.INPUT_OUTPUT; } else if(mode == IoMode.DISABLED) { diff --git a/src/main/java/crazypants/enderio/machine/farm/GuiFarmStation.java b/src/main/java/crazypants/enderio/machine/farm/GuiFarmStation.java index 25f58863..03d84bf0 100644 --- a/src/main/java/crazypants/enderio/machine/farm/GuiFarmStation.java +++ b/src/main/java/crazypants/enderio/machine/farm/GuiFarmStation.java @@ -39,7 +39,7 @@ public class GuiFarmStation extends GuiPoweredMachineBase { private int id = 0; private IconButtonEIO createButton(int x, int y) { - return new ToggleButtonEIO(this, id, x, y, IconEIO.UNLOCKED, IconEIO.LOCKED).setSelected(getTileEntity().lockedSlots.contains(id++ + getTileEntity().minSupSlot)).setIconMargin(3, 3); + return new ToggleButtonEIO(this, id, x, y, IconEIO.FARM_UNLOCK, IconEIO.FARM_LOCK).setSelected(getTileEntity().lockedSlots.contains(id++ + getTileEntity().minSupSlot)); } @Override @@ -68,7 +68,7 @@ public class GuiFarmStation extends GuiPoweredMachineBase { FontRenderer fr = Minecraft.getMinecraft().fontRenderer; - GL11.glEnable(GL11.GL_BLEND); + GL11.glEnable(GL11.GL_BLEND); fr.drawString("SW", sx + 55, sy + 41, ColorUtil.getARGB(1f,1f,0.35f,1f), true); fr.drawString("NW", sx + 55, sy + 59, ColorUtil.getARGB(1f,1f,0.35f,1f), true); fr.drawString("SE", sx + 73, sy + 41, ColorUtil.getARGB(1f,1f,0.35f,1f), true); diff --git a/src/main/java/crazypants/enderio/machine/hypercube/GuiHyperCube.java b/src/main/java/crazypants/enderio/machine/hypercube/GuiHyperCube.java index ae1d0db6..9630276d 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/GuiHyperCube.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/GuiHyperCube.java @@ -389,28 +389,28 @@ public class GuiHyperCube extends GuiContainerBase { x = 163; if(itemMode.isRecieveEnabled()) { - IconEIO.INPUT.renderIcon(guiLeft + x + 15, guiTop + 4 + 7, -15, -7, 0, true); + IconEIO.INPUT_OLD.renderIcon(guiLeft + x + 15, guiTop + 4 + 7, -15, -7, 0, true); } x += 18; if(powerMode.isRecieveEnabled()) { - IconEIO.INPUT.renderIcon(guiLeft + x + 15, guiTop + 4 + 7, -15, -7, 0, true); + IconEIO.INPUT_OLD.renderIcon(guiLeft + x + 15, guiTop + 4 + 7, -15, -7, 0, true); } x += 18; if(fluidMode.isRecieveEnabled()) { - IconEIO.INPUT.renderIcon(guiLeft + x + 15, guiTop + 4 + 7, -15, -7, 0, true); + IconEIO.INPUT_OLD.renderIcon(guiLeft + x + 15, guiTop + 4 + 7, -15, -7, 0, true); } x = 163; if(itemMode.isSendEnabled()) { - IconEIO.OUTPUT.renderIcon(guiLeft + x, guiTop + 29, 15, 7, 0, true); + IconEIO.OUTPUT_OLD.renderIcon(guiLeft + x, guiTop + 29, 15, 7, 0, true); } x += 18; if(powerMode.isSendEnabled()) { - IconEIO.OUTPUT.renderIcon(guiLeft + x, guiTop + 29, 15, 7, 0, true); + IconEIO.OUTPUT_OLD.renderIcon(guiLeft + x, guiTop + 29, 15, 7, 0, true); } x += 18; if(fluidMode.isSendEnabled()) { - IconEIO.OUTPUT.renderIcon(guiLeft + x, guiTop + 29, 15, 7, 0, true); + IconEIO.OUTPUT_OLD.renderIcon(guiLeft + x, guiTop + 29, 15, 7, 0, true); } } diff --git a/src/main/java/crazypants/enderio/machine/transceiver/gui/GuiTransceiver.java b/src/main/java/crazypants/enderio/machine/transceiver/gui/GuiTransceiver.java index 36bbae23..367699a9 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/gui/GuiTransceiver.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/gui/GuiTransceiver.java @@ -204,7 +204,7 @@ public class GuiTransceiver extends GuiPoweredMachineBase { RenderUtil.bindTexture(IconEIO.TEXTURE); IconEIO.INACTIVE_TAB.renderIcon(tabX, sy + tabYOffset + (i * 24)); IconEIO icon = tabs.get(i).getIcon(); - icon.renderIcon(tabX + 4, sy + tabYOffset + (i * TAB_HEIGHT) + 7, 10, 10, 0, false); + icon.renderIcon(tabX + 4, sy + tabYOffset + (i * TAB_HEIGHT) + 6, 11, 11, 0, false); } } @@ -221,7 +221,7 @@ public class GuiTransceiver extends GuiPoweredMachineBase { if(tabs.size() > 0) { IconEIO icon = tabs.get(activeTab).getIcon(); - icon.renderIcon(tabX + 4, sy + tabYOffset + (activeTab * TAB_HEIGHT) + 7, 10, 10, 0, false); + icon.renderIcon(tabX - 1, sy + tabYOffset + (activeTab * TAB_HEIGHT) + 4); tes.draw(); tabs.get(activeTab).render(par1, par2, par3); } else { diff --git a/src/main/java/crazypants/enderio/xp/ExperienceBarRenderer.java b/src/main/java/crazypants/enderio/xp/ExperienceBarRenderer.java index 010ab5eb..878e7aa3 100644 --- a/src/main/java/crazypants/enderio/xp/ExperienceBarRenderer.java +++ b/src/main/java/crazypants/enderio/xp/ExperienceBarRenderer.java @@ -14,37 +14,35 @@ public class ExperienceBarRenderer { public static void render(Gui gui, int x, int y, int length, ExperienceContainer xpCont) { render(gui, x, y, length, xpCont, -1); } - + public static void render(Gui gui, int x, int y, int length, ExperienceContainer xpCont, int required) { - + String text = xpCont.getExperienceLevel() + ""; int color = 8453920; boolean shadow = true; if(required > 0) { text += "/" + required; if(required > xpCont.getExperienceLevel()) { - color = ColorUtil.getRGB(1f,0,0.1f); + color = ColorUtil.getRGB(1f, 0, 0.1f); shadow = false; } } FontRenderer fr = Minecraft.getMinecraft().fontRenderer; - int strX = x + length/2 - fr.getStringWidth(text) / 2; - fr.drawString(text, strX, y-11, color, shadow); - + int strX = x + length / 2 - fr.getStringWidth(text) / 2; + fr.drawString(text, strX, y - 11, color, shadow); + RenderUtil.bindTexture("enderio:textures/gui/widgets.png"); GL11.glColor3f(1, 1, 1); - int xpScaled = xpCont.getXpBarScaled(length -2); - + int xpScaled = xpCont.getXpBarScaled(length - 2); + // x, y, u, v, width, height //start of 'slot' - gui.drawTexturedModalRect(x,y,80,141,1,5); - gui.drawTexturedModalRect(x + 1,y,81,141,length-2,5); - gui.drawTexturedModalRect(x + length - 1,y,205,141,1,5); - + gui.drawTexturedModalRect(x, y, 0, 91, 1, 5); + gui.drawTexturedModalRect(x + 1, y, 1, 91, length - 2, 5); + gui.drawTexturedModalRect(x + length - 1, y, 125, 91, 1, 5); + RenderUtil.renderQuad2D(x + 1, y + 1, 0, xpScaled, 3, ColorUtil.getRGB(0, 127, 14)); - - - + } - + } From 483a6b1c20d99b48dacd90c2fd9cd9aa8f8c9958 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Thu, 5 Feb 2015 21:07:03 -0500 Subject: [PATCH 72/79] Retexture conduits --- .../enderio/textures/blocks/gasConduit.png | Bin 689 -> 1211 bytes .../textures/blocks/gasConduitCore.png | Bin 1670 -> 2051 bytes .../textures/blocks/gasConduitEdge.png | Bin 957 -> 1679 bytes .../textures/blocks/gasConduitInput.png | Bin 833 -> 1077 bytes .../textures/blocks/gasConduitOutput.png | Bin 864 -> 1078 bytes .../enderio/textures/blocks/itemConduit.png | Bin 761 -> 1311 bytes .../textures/blocks/itemConduitCore.png | Bin 5659 -> 16638 bytes .../blocks/itemConduitCoreAdvanced.png | Bin 5916 -> 10160 bytes .../textures/blocks/itemConduitCore_alt.png | Bin 0 -> 7954 bytes .../textures/blocks/itemConduitInOut.png | Bin 593 -> 1091 bytes .../textures/blocks/itemConduitInOut_In.png | Bin 439 -> 1073 bytes .../textures/blocks/itemConduitInOut_Out.png | Bin 373 -> 1068 bytes .../textures/blocks/itemConduitInput.png | Bin 473 -> 1073 bytes .../textures/blocks/itemConduitOutput.png | Bin 555 -> 1068 bytes .../textures/blocks/liquidConduitAdvanced.png | Bin 734 -> 1242 bytes .../blocks/liquidConduitAdvancedInOut.png | Bin 510 -> 1093 bytes .../blocks/liquidConduitAdvancedInput.png | Bin 833 -> 1077 bytes .../blocks/liquidConduitAdvancedLocked.png | Bin 761 -> 1254 bytes .../blocks/liquidConduitAdvancedOutput.png | Bin 864 -> 1078 bytes .../textures/blocks/liquidConduitCore.png | Bin 1527 -> 1918 bytes .../blocks/liquidConduitCoreAdvanced.png | Bin 1159 -> 2149 bytes .../blocks/liquidConduitCoreEnder.png | Bin 1202 -> 2062 bytes .../enderio/textures/blocks/meConduit.png | Bin 762 -> 1308 bytes .../enderio/textures/blocks/meConduitCore.png | Bin 290 -> 2339 bytes .../textures/blocks/meConduitCoreDense.png | Bin 4254 -> 2007 bytes .../textures/blocks/meConduitDense.png | Bin 4254 -> 1272 bytes .../textures/blocks/old/gasConduit.png | Bin 0 -> 689 bytes .../textures/blocks/old/gasConduitCore.png | Bin 0 -> 1670 bytes .../textures/blocks/old/gasConduitEdge.png | Bin 0 -> 957 bytes .../textures/blocks/old/gasConduitInput.png | Bin 0 -> 833 bytes .../textures/blocks/old/gasConduitOutput.png | Bin 0 -> 864 bytes .../textures/blocks/old/itemConduit.png | Bin 0 -> 761 bytes .../textures/blocks/old/itemConduitCore.png | Bin 0 -> 5659 bytes .../blocks/old/itemConduitCoreAdvanced.png | Bin 0 -> 5916 bytes .../textures/blocks/old/itemConduitInOut.png | Bin 0 -> 593 bytes .../blocks/old/itemConduitInOut_In.png | Bin 0 -> 439 bytes .../blocks/old/itemConduitInOut_Out.png | Bin 0 -> 373 bytes .../textures/blocks/old/itemConduitInput.png | Bin 0 -> 473 bytes .../{ => old}/itemConduitIoConnector.png | Bin .../textures/blocks/old/itemConduitOutput.png | Bin 0 -> 555 bytes .../blocks/old/liquidConduitAdvanced.png | Bin 0 -> 734 bytes .../blocks/old/liquidConduitAdvancedInOut.png | Bin 0 -> 510 bytes .../blocks/old/liquidConduitAdvancedInput.png | Bin 0 -> 833 bytes .../old/liquidConduitAdvancedLocked.png | Bin 0 -> 761 bytes .../old/liquidConduitAdvancedOutput.png | Bin 0 -> 864 bytes .../textures/blocks/old/liquidConduitCore.png | Bin 0 -> 1527 bytes .../blocks/old/liquidConduitCoreAdvanced.png | Bin 0 -> 1159 bytes .../blocks/old/liquidConduitCoreEnder.png | Bin 0 -> 1202 bytes .../blocks/old/liquidConduitEnder.png | Bin 0 -> 2410 bytes .../blocks/{ => old}/liquidConduitExtract.png | Bin .../blocks/{ => old}/liquidConduitInsert.png | Bin .../blocks/{ => old}/liquidConduitLocked.png | Bin .../enderio/textures/blocks/old/meConduit.png | Bin 0 -> 762 bytes .../textures/blocks/old/meConduitCore.png | Bin 0 -> 290 bytes .../blocks/old/meConduitCoreDense.png | Bin 0 -> 4254 bytes .../textures/blocks/old/meConduitDense.png | Bin 0 -> 4254 bytes .../textures/blocks/old/powerConduit.png | Bin 0 -> 971 bytes .../blocks/{ => old}/powerConduitCore.pdn | Bin .../textures/blocks/old/powerConduitCore.png | Bin 0 -> 1305 bytes .../blocks/old/powerConduitCoreEnder.png | Bin 0 -> 1436 bytes .../blocks/old/powerConduitCoreEnhanced.png | Bin 0 -> 1446 bytes .../textures/blocks/old/powerConduitEnder.png | Bin 0 -> 980 bytes .../blocks/old/powerConduitEnhanced.png | Bin 0 -> 1028 bytes .../textures/blocks/old/powerConduitInput.png | Bin 0 -> 833 bytes .../blocks/old/powerConduitInputEnder.png | Bin 0 -> 833 bytes .../blocks/old/powerConduitInputEnhanced.png | Bin 0 -> 833 bytes .../blocks/old/powerConduitOutput.png | Bin 0 -> 864 bytes .../blocks/old/powerConduitOutputEnder.png | Bin 0 -> 864 bytes .../blocks/old/powerConduitOutputEnhanced.png | Bin 0 -> 864 bytes .../{ => old}/powerConduitTransmission.png | Bin .../textures/blocks/old/redstoneConduit.png | Bin 0 -> 709 bytes .../blocks/old/redstoneConduitCoreOff.png | Bin 0 -> 726 bytes .../{ => old}/redstoneConduitCoreOn.pdn | Bin .../blocks/old/redstoneConduitCoreOn.png | Bin 0 -> 887 bytes .../{ => old}/redstoneConduitSwitch.pdn | Bin .../blocks/old/redstoneConduitSwitchOff.png | Bin 0 -> 1350 bytes .../blocks/old/redstoneConduitSwitchOn.png | Bin 0 -> 1374 bytes .../old/redstoneConduitTransmission.png | Bin 0 -> 919 bytes .../blocks/old/redstoneInsulatedConduit.png | Bin 0 -> 761 bytes .../old/redstoneInsulatedConduitCoreOff.png | Bin 0 -> 1832 bytes .../old/redstoneInsulatedConduitCoreOn.png | Bin 0 -> 2178 bytes .../enderio/textures/blocks/powerConduit.png | Bin 971 -> 1246 bytes .../textures/blocks/powerConduitCore.png | Bin 1305 -> 1911 bytes .../textures/blocks/powerConduitCoreEnder.png | Bin 1436 -> 1931 bytes .../blocks/powerConduitCoreEnhanced.png | Bin 1446 -> 1957 bytes .../textures/blocks/powerConduitEnder.png | Bin 980 -> 1255 bytes .../textures/blocks/powerConduitEnhanced.png | Bin 1028 -> 1248 bytes .../textures/blocks/powerConduitInput.png | Bin 833 -> 1077 bytes .../blocks/powerConduitInputEnder.png | Bin 833 -> 1077 bytes .../blocks/powerConduitInputEnhanced.png | Bin 833 -> 1077 bytes .../textures/blocks/powerConduitOutput.png | Bin 864 -> 1078 bytes .../blocks/powerConduitOutputEnder.png | Bin 864 -> 1095 bytes .../blocks/powerConduitOutputEnhanced.png | Bin 864 -> 1078 bytes .../blocks/redstoneConduitCoreOff.png | Bin 726 -> 1962 bytes .../textures/blocks/redstoneConduitCoreOn.png | Bin 887 -> 2215 bytes .../blocks/redstoneConduitSwitchOff.png | Bin 1350 -> 2086 bytes .../blocks/redstoneConduitSwitchOn.png | Bin 1374 -> 2106 bytes .../blocks/redstoneConduitTransmission.png | Bin 919 -> 2156 bytes .../blocks/redstoneInsulatedConduit.png | Bin 761 -> 1199 bytes .../redstoneInsulatedConduitCoreOff.png | Bin 1832 -> 1916 bytes .../blocks/redstoneInsulatedConduitCoreOn.png | Bin 2178 -> 2084 bytes .../textures/items/extractSpeedUpgrade.png | Bin 240 -> 1483 bytes .../textures/items/filterUpgradeAdvanced.png | Bin 330 -> 1963 bytes .../textures/items/filterUpgradeBasic.png | Bin 326 -> 1526 bytes .../enderio/textures/items/itemGasConduit.png | Bin 1670 -> 2048 bytes .../textures/items/itemItemConduit.png | Bin 5659 -> 16665 bytes .../items/itemItemConduitAdvanced.png | Bin 5916 -> 10160 bytes .../textures/items/itemLiquidConduit.png | Bin 1527 -> 1918 bytes .../items/itemLiquidConduitAdvanced.png | Bin 1159 -> 2149 bytes .../textures/items/itemLiquidConduitEnder.png | Bin 1202 -> 2059 bytes .../enderio/textures/items/itemMeConduit.png | Bin 290 -> 2339 bytes .../textures/items/itemMeConduitDense.png | Bin 4254 -> 2007 bytes .../textures/items/itemPowerConduit.png | Bin 1305 -> 1911 bytes .../textures/items/itemPowerConduitEnder.png | Bin 1436 -> 1931 bytes .../items/itemPowerConduitEnhanced.png | Bin 1446 -> 1957 bytes .../textures/items/itemRedstoneConduit.png | Bin 709 -> 2213 bytes .../items/itemRedstoneInsulatedConduit.png | Bin 1832 -> 2084 bytes .../textures/items/itemRedstoneSwitch.png | Bin 1442 -> 2134 bytes .../enderio/textures/items/modItemFilter.png | Bin 329 -> 1840 bytes .../items/old/extractSpeedUpgrade.png | Bin 0 -> 240 bytes .../items/old/filterUpgradeAdvanced.png | Bin 0 -> 330 bytes .../textures/items/old/filterUpgradeBasic.png | Bin 0 -> 326 bytes .../textures/items/old/itemGasConduit.png | Bin 0 -> 1670 bytes .../textures/items/old/itemItemConduit.png | Bin 0 -> 5659 bytes .../items/old/itemItemConduit.png.mcmeta | 45 ++++++++++++++++++ .../items/old/itemItemConduitAdvanced.png | Bin 0 -> 5916 bytes .../old/itemItemConduitAdvanced.png.mcmeta | 45 ++++++++++++++++++ .../textures/items/old/itemLiquidConduit.png | Bin 0 -> 1527 bytes .../items/old/itemLiquidConduitAdvanced.png | Bin 0 -> 1159 bytes .../items/old/itemLiquidConduitEnder.png | Bin 0 -> 1202 bytes .../textures/items/old/itemMeConduit.png | Bin 0 -> 290 bytes .../textures/items/old/itemMeConduitDense.png | Bin 0 -> 4254 bytes .../textures/items/old/itemPowerConduit.png | Bin 0 -> 1305 bytes .../items/old/itemPowerConduitEnder.png | Bin 0 -> 1436 bytes .../items/old/itemPowerConduitEnhanced.png | Bin 0 -> 1446 bytes .../items/old/itemRedstoneConduit.png | Bin 0 -> 709 bytes .../old/itemRedstoneInsulatedConduit.png | Bin 0 -> 1832 bytes .../textures/items/old/itemRedstoneSwitch.png | Bin 0 -> 1442 bytes .../textures/items/old/modItemFilter.png | Bin 0 -> 329 bytes src/main/java/crazypants/.gitignore | 1 + 140 files changed, 91 insertions(+) create mode 100644 resources/assets/enderio/textures/blocks/itemConduitCore_alt.png create mode 100644 resources/assets/enderio/textures/blocks/old/gasConduit.png create mode 100644 resources/assets/enderio/textures/blocks/old/gasConduitCore.png create mode 100644 resources/assets/enderio/textures/blocks/old/gasConduitEdge.png create mode 100644 resources/assets/enderio/textures/blocks/old/gasConduitInput.png create mode 100644 resources/assets/enderio/textures/blocks/old/gasConduitOutput.png create mode 100644 resources/assets/enderio/textures/blocks/old/itemConduit.png create mode 100644 resources/assets/enderio/textures/blocks/old/itemConduitCore.png create mode 100644 resources/assets/enderio/textures/blocks/old/itemConduitCoreAdvanced.png create mode 100644 resources/assets/enderio/textures/blocks/old/itemConduitInOut.png create mode 100644 resources/assets/enderio/textures/blocks/old/itemConduitInOut_In.png create mode 100644 resources/assets/enderio/textures/blocks/old/itemConduitInOut_Out.png create mode 100644 resources/assets/enderio/textures/blocks/old/itemConduitInput.png rename resources/assets/enderio/textures/blocks/{ => old}/itemConduitIoConnector.png (100%) create mode 100644 resources/assets/enderio/textures/blocks/old/itemConduitOutput.png create mode 100644 resources/assets/enderio/textures/blocks/old/liquidConduitAdvanced.png create mode 100644 resources/assets/enderio/textures/blocks/old/liquidConduitAdvancedInOut.png create mode 100644 resources/assets/enderio/textures/blocks/old/liquidConduitAdvancedInput.png create mode 100644 resources/assets/enderio/textures/blocks/old/liquidConduitAdvancedLocked.png create mode 100644 resources/assets/enderio/textures/blocks/old/liquidConduitAdvancedOutput.png create mode 100644 resources/assets/enderio/textures/blocks/old/liquidConduitCore.png create mode 100644 resources/assets/enderio/textures/blocks/old/liquidConduitCoreAdvanced.png create mode 100644 resources/assets/enderio/textures/blocks/old/liquidConduitCoreEnder.png create mode 100644 resources/assets/enderio/textures/blocks/old/liquidConduitEnder.png rename resources/assets/enderio/textures/blocks/{ => old}/liquidConduitExtract.png (100%) rename resources/assets/enderio/textures/blocks/{ => old}/liquidConduitInsert.png (100%) rename resources/assets/enderio/textures/blocks/{ => old}/liquidConduitLocked.png (100%) create mode 100644 resources/assets/enderio/textures/blocks/old/meConduit.png create mode 100644 resources/assets/enderio/textures/blocks/old/meConduitCore.png create mode 100644 resources/assets/enderio/textures/blocks/old/meConduitCoreDense.png create mode 100644 resources/assets/enderio/textures/blocks/old/meConduitDense.png create mode 100644 resources/assets/enderio/textures/blocks/old/powerConduit.png rename resources/assets/enderio/textures/blocks/{ => old}/powerConduitCore.pdn (100%) create mode 100644 resources/assets/enderio/textures/blocks/old/powerConduitCore.png create mode 100644 resources/assets/enderio/textures/blocks/old/powerConduitCoreEnder.png create mode 100644 resources/assets/enderio/textures/blocks/old/powerConduitCoreEnhanced.png create mode 100644 resources/assets/enderio/textures/blocks/old/powerConduitEnder.png create mode 100644 resources/assets/enderio/textures/blocks/old/powerConduitEnhanced.png create mode 100644 resources/assets/enderio/textures/blocks/old/powerConduitInput.png create mode 100644 resources/assets/enderio/textures/blocks/old/powerConduitInputEnder.png create mode 100644 resources/assets/enderio/textures/blocks/old/powerConduitInputEnhanced.png create mode 100644 resources/assets/enderio/textures/blocks/old/powerConduitOutput.png create mode 100644 resources/assets/enderio/textures/blocks/old/powerConduitOutputEnder.png create mode 100644 resources/assets/enderio/textures/blocks/old/powerConduitOutputEnhanced.png rename resources/assets/enderio/textures/blocks/{ => old}/powerConduitTransmission.png (100%) create mode 100644 resources/assets/enderio/textures/blocks/old/redstoneConduit.png create mode 100644 resources/assets/enderio/textures/blocks/old/redstoneConduitCoreOff.png rename resources/assets/enderio/textures/blocks/{ => old}/redstoneConduitCoreOn.pdn (100%) create mode 100644 resources/assets/enderio/textures/blocks/old/redstoneConduitCoreOn.png rename resources/assets/enderio/textures/blocks/{ => old}/redstoneConduitSwitch.pdn (100%) create mode 100644 resources/assets/enderio/textures/blocks/old/redstoneConduitSwitchOff.png create mode 100644 resources/assets/enderio/textures/blocks/old/redstoneConduitSwitchOn.png create mode 100644 resources/assets/enderio/textures/blocks/old/redstoneConduitTransmission.png create mode 100644 resources/assets/enderio/textures/blocks/old/redstoneInsulatedConduit.png create mode 100644 resources/assets/enderio/textures/blocks/old/redstoneInsulatedConduitCoreOff.png create mode 100644 resources/assets/enderio/textures/blocks/old/redstoneInsulatedConduitCoreOn.png create mode 100644 resources/assets/enderio/textures/items/old/extractSpeedUpgrade.png create mode 100644 resources/assets/enderio/textures/items/old/filterUpgradeAdvanced.png create mode 100644 resources/assets/enderio/textures/items/old/filterUpgradeBasic.png create mode 100644 resources/assets/enderio/textures/items/old/itemGasConduit.png create mode 100644 resources/assets/enderio/textures/items/old/itemItemConduit.png create mode 100644 resources/assets/enderio/textures/items/old/itemItemConduit.png.mcmeta create mode 100644 resources/assets/enderio/textures/items/old/itemItemConduitAdvanced.png create mode 100644 resources/assets/enderio/textures/items/old/itemItemConduitAdvanced.png.mcmeta create mode 100644 resources/assets/enderio/textures/items/old/itemLiquidConduit.png create mode 100644 resources/assets/enderio/textures/items/old/itemLiquidConduitAdvanced.png create mode 100644 resources/assets/enderio/textures/items/old/itemLiquidConduitEnder.png create mode 100644 resources/assets/enderio/textures/items/old/itemMeConduit.png create mode 100644 resources/assets/enderio/textures/items/old/itemMeConduitDense.png create mode 100644 resources/assets/enderio/textures/items/old/itemPowerConduit.png create mode 100644 resources/assets/enderio/textures/items/old/itemPowerConduitEnder.png create mode 100644 resources/assets/enderio/textures/items/old/itemPowerConduitEnhanced.png create mode 100644 resources/assets/enderio/textures/items/old/itemRedstoneConduit.png create mode 100644 resources/assets/enderio/textures/items/old/itemRedstoneInsulatedConduit.png create mode 100644 resources/assets/enderio/textures/items/old/itemRedstoneSwitch.png create mode 100644 resources/assets/enderio/textures/items/old/modItemFilter.png create mode 100644 src/main/java/crazypants/.gitignore diff --git a/resources/assets/enderio/textures/blocks/gasConduit.png b/resources/assets/enderio/textures/blocks/gasConduit.png index a19312c7451b20d61f601943b97a43365e125e7b..fc3b3b22463433f067dd88d5634693d821ae7326 100644 GIT binary patch literal 1211 zcmbVMZD`zN9M8B_+~Mf#Hf^;VF_W#LdA(e6$u6yJa@QX0+H$?w4p-Te?Z7eUk^PEgpCO$2o)>W6`4{V)V!>;>Iqh#yoY(^2pReA3=kKa_nikUVd{ z-~ac2{x3N`Iy|^J`A8DOu+4=bt%OEAe(%2zeS=2hcQkZ`xruPht%P;pL#*F)b%+;i zFa=8xnDet2VHU#@vsQT`oG9*-4cDeXjG-diLu?Go_C+2rW?+cxaLRHN;`V1>61Zh5 z#CW>M6g?GATSE;Wjx~nMMq|d1OrozB&qgvbV8amLkzI8HIZ}ufyE2-`+cbf%K*AY? zSaoWmIEt&T5AigWCJlyTaZ#e!G%vC2Q#i-4DVk+yP9j-W=0%wm@a97xHQ%hrB`x37 zLMw%s4nt3->3Y3R)l-z~PtmL-Ni@UJ97iGq8O%E&h)5^c)v}<$!0;_Ev|I;|Edt%0 z3l#!+x_SlMD;C!bJ3%v0C}ea5Jes8#+P33+t)PRj1pjqoU35^M_aI$@fjj3LC?Azw zEi#JTy@g^R@2M3v1Aw73N)2!Uh3mbQhoo7~Jj zxw7g*5W0TZb*rr^7@c-QH<)%kTvhR&amz8?dhkS?q16j((6?&P%=@m5uY_2(){)mm zBMo>#BBcs1k{sX-5@gZ>X{1acQ<2iV$gxC|Z~ouV(a0$}u9N@NO=}AkV?15!0<>7` zBj}*!@llt&4v22lVK)m}e>uAL^Z4G57w`w#wm*6Lm-C6`UpMajdTX?Sy0EF*xxM!A z?zRJDwf5R$=Pq{k=I=ar?BL9fE030zUIt%vURpSI^zW`6wSC`gJ0ovM-aL`Gz-Z6E z`Qr~qwshn&Bf526c%ywG+uk>p>^bc3_ZAlpeqZtLL2$mq(LJw=irx zgPk=;X1fRfxbyC*ZLd6tEh^tgpiWbNq>ZcOgk|J|nQ_59=SA8h;S)5~}3e{~$fPCWEX=iQGJN8{f~ MAvdg@9XNF4AJCeRrT_o{ delta 665 zcmV;K0%rZY39$u`B!2{FK}|sb0I`n?{9y$E000SaNLh0L01mhS01mhTYC-i|0000O zbVXQnQ*UN;cVTj60B~VxZgehgWpp4kE-)@JV(9jK0006nNklHZgi-B7g%VYxO*jlHVs4{0d8Mh|9Gib|!DK<##0Hh-Iq{C-9MQ&FW-5$MMZ z_yiu0M-bibce&kea=l*Va=FO)d{&)KCpjLEayT4hzu(K31d@tn5x_}sf-QWv+euU| zmxCFw;3PP~gm1Uorva$hZ0ZL|h0`c)WsRI*upmtUL)dDy zGAEEHa>7@um4E6jfh;qSH*&(4%cV+>Axt2FG+Xd#YQHMC2Ae zo6TYae>(-CBDe7AbQ;eruk#wP@WEgp z{eC~*0t_J%uu#emT3!Pl-s|<=4IlvuGj0TF9t01yRJWpobXz$ zCe>;+o&hWXV4+mV$SoY~*D=I{C{CbN$jB`m+z4+9g@Qf|hy_}Oirm7H{Ocyf!vNcE zsgRL_M>x`d{T$=VIDY=m;A@nl_B>DyF2ohH$aoeW600000NkvXXu0mjfuz)63 diff --git a/resources/assets/enderio/textures/blocks/gasConduitCore.png b/resources/assets/enderio/textures/blocks/gasConduitCore.png index cb770b715103350b2217b5cf24a196607e63b949..9953d6656234b7152145594d3e0dd845057ebfa3 100644 GIT binary patch literal 2051 zcmbVNX;c&E8XlEJdbJWM6vQQGzyQTCnIvQx2?z;G4vUgdK-@Y>28fVMNCpzn;!>2w z1rRDN2#AVpMZ9{ipokLjqTq&L5iN_@Y75q_;6g5f_f8bN{o(14JLk-N-#7C<&-1Ql za#utI&;DrMM*slK7Kex== z0x-rqoDr@OVu{L-3@s+jh=`JBB+2;-(9f6ZV?am(6-J;`gDP3ALkt4&EiXdu&95Pl z`qqR<5`gcViVa^u72;Zq>h0xCmou0!mCN^nz1e&iUP5IuU={>3ASRyv)6SyuB*HDE* zs(Xx5t-$p<4|9dy1uVj}$}~(7q{UU#w<$)HACULva^o3t4jC(7&Y?5;YzCbt=VEk> z%i^$LZx$v;QE(Ek_>1?1uV9ARp5c(mk{tWw@x1OOK9 zVv&E8p(i=|IxY>i9r*I@V9O=WzcslFJo2^{-?Xr)TfYU2jIiGq_xZk>=|4Qtp~8G^NWj+-rU&fR2}S5#PK;y6_0-m$Ay4vc4ogO?maKlv1CVKiM=v#2pM-T* zRHfZf`fj5@vKFSQd4H@=>TydZFzrr%fA!dkE#0Da%2OHWx0n-UdBWA&bS1aC&|#-f ze=TMUwfI!mX88la$JYOdtEGYKcI0k#x>yk0!;jnfz_K>Qbx$C2#AEx_xdQiPSND2S znoa^?b!%l!7JJ#o0fw>vHOWMc<1yHs|>+E2ZsmJL5S7UWiMn>aAA}-VfFHmOO3$ zZb#)Y`nS=MWrdp_Aj1vWE}uR;S~79>)T=uqxyjFm4eSfhi?v-Pzt1uLZ3&l_b26ac zHgsCt_N5T2C3fZO&xn4#P`9J$ zMBl5jP0p2ir-4O|eG{X~q=uA7dAp|H+wnQgeND@p`j6vgd;^5w6{FWJR}W=Vnsmj@ ze&bIztg7{n$VytYvcFKI7q^MQMP32LziqQ$^{jh50*V;?6HeX&D@BCAjb!M%+Hyg?3^#v|JcBrHLYQ65Wom_4B#C{+2 z*ZfmwhwSPDMhO$vJN`$olTB{$NhxK0wGL_53JsmR_pLwJ0RR5F&?>9!I<2*H2+VcK`qY delta 1653 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 delta 935 zcmV;Y16cfz4ZR1DB!2{FK}|sb0I`n?{9y$E000SaNLh0L01mhS01mhTYC-i|0000O zbVXQnQ*UN;cVTj60B~VxZgehgWpp4kE-)@JV(9jK0009!NklC zPk>+oI0*zuAb}3k_kW&#(s7NOv^%?+62M|JLyF@o_jD-rnBWdBv>P>*aEZ1l3}(SglqD zS65fai_t>^H}sVoR;%TTfK2(D%?8oS%L~TcZs%#t!k%1VNTntH>FLR#)^D9)0H(K;>B%`5y!{-IlOtY#xlL;r;!c7)f^C zEX=8Z0ZZYqV)0o8);|egL=7pQ<+lPb3NV&z3Cn=j`hRnXn+oI*=mtiGV^8_%PmaPU zfCRn-`ehm2G?H1lWxUu;ZFCM1ZAIInrj3IdTJbZgEoq6cNZ$kL>Bsk$~br zOR~Z|W&Ke10Fx*7R{pWTzxh;*0xi9_M|I=jaZ_{`fe3L;{!73F3A1Msqej?MzC;jq zDqt+Qynh|`Qp3{t|0pnOggxa82u=n1`+m3G6}v)$Dt;B{2?Sh-&_Oi9p7MvF#tvh; zHR$j9?PgoHhlBE_0u41tl1$ZQ644lu@{ib)$wGkFsVw{V_oEpE$pLZk9wFrqK|k5S zI0DxG`}fbU7O7|mX-FD~j`s+Jd57o;k`jT>&wp>l!O>IE&`!yKA-p9_1&jkMyhHQ^ zj1lleUhHcPO)W!6L*;JxYXOPKi*2W&tPWmIa!|P&{;L3JhED}A@{;}F1$(|lfw)Tl zJAw3*fS4irR|rGJi+uRlomW6hJbA?z2@nB|YXKF1EuhK>fZ(GaoO25JT6Bx92om~# z2!FU$%&+IgyHG4lXB6Nv@LGQ|^YJo}&o>1NJB=WcBVs&Fv^$ds_1YrT(~P1y1&e9r z3UvyuV2J(+s*D1Ri#u>$-1HEI3va~CG*E<|q$ohq=1>pXZSB*d$~DER+;y&wfc)$F z9(EAq6`gjQuTP;LCO^f~i`VpGA;yX<5#OnuYIICOQBB002ov JPDHLkV1kk#zWo3I diff --git a/resources/assets/enderio/textures/blocks/gasConduitInput.png b/resources/assets/enderio/textures/blocks/gasConduitInput.png index 3202f5ece95e05b07fadb5ff83c8f1d425e7c6cc..fcba49a226a9e5935183befca98803654be0e399 100644 GIT binary patch literal 1077 zcmbVL&rj1(952WLNif6{dU}><(Ac%F>$bLGgRyS1=x`ZJSUl~uePa!@ue1+0;9}q+ zM-Lhg9!Q8+6Azv|C>Ik?CW06L0%Ih4C3x_4KhOi=V3YR!==byae1Gng=kJV;Tpi&! zZnQXORM-llcX*I}e~%ySvE>TQ*XROi&=v|Xm$iwBLD5A^xPpv9{|oG{;R%w|!(SV+u^Xc2H|ZWOE4}%Nt87KLS0GeFbR4O&(s3Dp;wGTPm7(>e3MdN7sXbq6>G&~Bv=xm zrfH%ii?S>*3n5(hC~6B{IMHV?aA*aNPaWcch!L4&ji!0#X*UGdFO^P-y|9-kmNK!8 zd=bVZ(RHJ^I@Ter;JD2!{*P$>bU?TN`fjOEB!7gHwh(SllUN) z1Cxu6XOmWVGpbNGU;_uvLu?lU;(|_!b>|FuOF<@9Whh99b&RShvS6xlRY;f!rL0CW zj#JG2F5dp%)QQX~G3t|l`lf%ynlaj*P60cd&Jp(5@C0m1^e^RoHenBnMz-4iY91aO zSi9Hj<}Mt6Q$O57Zg&6W-5KRqrhe_y(e~t}@#3u?k6R~0&tLBy*N1BF=L%1EUOc-o v_Bk`TJ^bzaMdM_%{9(VDiO_?W2WB1(aA13EQ`$Lx5)E=OKX1I6t#ADScRN@} delta 810 zcmV+_1J(Ss2*C!BB!2{FK}|sb0I`n?{9y$E000SaNLh0L01m$Z01m$aI0aKA0000Q zbVXQnQ*UN;cVTj608n9RZgehAMN}YmGcGkQF)>H;LN@>a0=-E@K~zXfwU%2?6G0S! z`^?_D+uP2}&dy9{wjhm(qCdjK7mY>}@kP)WA&P(mt3<9+L4Uv^AP9j70R#!Lpdv~L z>MwI>3nEX@Zof3m>`7<8&Y81kCs0!!E*x-bL1EsB30y22mn+Z8?{W#Q$CFn@QVs%z zmH5gnw@Q9)&@*!E|0dVL#9iRkL9f=Sl$SmW9suzu${&S!LzLeEo{adJqQ^kAhvUyI z_S9l6q4<5ZC5&X?W zTL%29g7pfxpr8pI_gkd36hS5~<_KFwWYfkwVYF+)9UW{dAgh2S1x@NWZILH=L9WJ5 z$Dr`uGrsJyEOLLuoL?dI$Ao)2_^E;o1uUy*O2@A(+Gcb4<6;D_4+I-I!S5r2O$B_E z0;2>$K7U1{xfFeJ$d_D-_Dr~I{I`OCDaubMf(+xcn5{sv5yjsvv~9pG6?|6U;;}s_ zRNU#2lZPmua@e9x)z8fS$p8QV07*qoM6N<$f=e5100000 diff --git a/resources/assets/enderio/textures/blocks/gasConduitOutput.png b/resources/assets/enderio/textures/blocks/gasConduitOutput.png index a718dfa1b5e82a599c9a0bae01008a267c7d993c..12ad42a6d2ae30a5a6445965519e1d0153a880af 100644 GIT binary patch literal 1078 zcmbVLO=#0l9M8Igb9ILugeeLkLs2jvFG)WVS7+O_u4w1%iYw@0FUji~y5wcao9%`N z-9QlL#hZE=hyy2h^W?#KQb7+gPhJIY>P7J4!I!R`9>xv^lJ}9{@BjU~J2iP>Xz=JD z!!Sdo38O++HhKqQ^!t0{+he*MA%z;5#&yzy0b;T?HW6EL;T)=ufa zOl(761cD^GZj@IC9g+(A8^)gKu)5?Uv4TRp7+AC)_0b-g)^2}C5s*fsUk)7F6gY2S zYtcm>DH$1#{t;}))-4m7rkzUiP?OTU22`6j>(J(ta@v+GRZ6B5rDta^zEV&VIY|TA zl%fJqP;(%sXoXZFE#-=aluPuuB`+k))#fqEN z2XCJ?W1F|tUw!ezA0FP~r8^VH*1oP@i5K~;I1@X>yqAVIZpLS>MoKOfCXMI0*_A)3 CB~#!4 delta 841 zcmV-P1GfCO2;c^gB!2{FK}|sb0I`n?{9y$E000SaNLh0L01m$Z01m$aI0aKA0000Q zbVXQnQ*UN;cVTj608n9RZgehAMN}YmGcGkQF)>H;LN@>a0^CVNK~zXfwU+Ns(?A%< z_nQ7%yRGZp^?JQtrx;?Q=s#h6Wnz3Gz7c;!At=98AOt~yDSrYE5t)z~A%Gwu4pc-5 zLH)}t-GNKol%D!YllHFd^X+|~yQdec|394CC$a#4@6g0fN9XL(&|<1 zyzwVud?Zo0;2vvmYJ-Efe~U8S9L@Lg6Pd@)|z6iCTj*h@2!G} zMK`QWN7CytXn${l_N2Ua;PV@m5SgaUX}>!`AH+#kBg48okfQfcRSgk~Zkeo4cOR=x zPQjBZ&KXYDq`mf@S3GJNv6ImWtRK+HxPtStT~O?ThNlzGm_-Mi3i*hgh)$d7J=DoF z1s5c=D8Xd~E$DV3OaYZ_WH@O+xQKy)OG z&c`dfl7m8&lksc~nwQ|Bg64EQn{p-~9sFf6i+@;j+hqN5cT~Ysl075aGb(;=I3pIl zAC{vM{QJdOxj~tE~p{`O{U*v(0+{!X=E@?`jWI0Rw#2N zL~?LF?YAYoF5T_c-Mb0eYViVB4i7ITa2aHpOxBY0T2kz$<@4Suh*;DR{`9YcOe5U; z=|Xd}t01^-x#-je2X9w`?~4A_#*0U-gos6FGIji_Iy?i1%mIH^2$2y)puYYGcny9{ TLQD?WR}y}i(x5hGfI<`lb}d~W^sz*7!OCe(b9uKYr2%+ zqI_-17CiZ|Hq+ENf=H*+jPdoPS(YGaf~IkZz>Tb83K?86)|WN#zz}s=Gi6ml ziyDQv+GYAM=;>kzDJ>FNQmh!IM8T9189^f`2T7z-#kdyGh8YF_y0I+Uh-EcEM1i4p z=_0I0Vtttmb9a41MIiKsyI+@KQG^a&6}wVEF~htMgEtOImN+pk#N(33jSDR4#aW7x z@OVOya5wFhNRc7k9;dUcXF0y#=?(BMI^cJDNQw$Ef!ZL$@=zG?dTIjGscGZhVucn1=7BCh45V6J zO`!`Z=Hz9}$33D;VB9RuCKwM+3yg>hUY8peos!#|U|o!drmzxU`oF0opi@M#PyW+4 zWf5$~;&y2Y;9+TwfC7g{hf~u1=YtZ0tl-1EKbHCS*9Ug>JV92zS&SyvzQJ9JL*It5IRge#T9hznu zl@sn)KivFm{@7Q$4<*02v*4e2H~&Mv>EpBGWBSal+dJO7W(~ivdTrsIa|iZ*LT>OC zEC}zUqa5Gyx{9~?zi;cGH;LN@>a0(D75K~z{rt(M1b<3JEZ z`ALd^;!Qc+lylBG$8R6INc6Hf*4h*`2I@peulh}MWXWvngw7$WdRN+ zuna#O4nl)|Isz310Dc80Fo*B=dtupuPYc*l4lu!YyPZ)02?m27EumfI1V*;ot#Je> z00Y@<_T`uVmVbAZ6L_=P=+O;e2}7aK+XkE{C-{23)?+d7&JH+LPVm)grAL1aQ33|+ z9Kol`3BFt|#bU8Aj==49+u8vY$~k;KpPL2#dJ9x3=kVEVX6}G|6_aX;D&-tLolecG z7&|}(2uP8Yqwx2i_D=8_0uy{PnHUA|FdB`DOeSNQR(}T58#Wf(xPgsD{O z$HaVU70L;WG@DJc01Ti2hrXKnQ{@D1G#Yw-6yVVRP5p^-g4gSHQLEL=9S8&h`VMd? zMWu2MuU4z(YX}3eSj?iDqEb1BS1J{u`Tc(3a$33c0`Yj<0_0JpoWslIvUwBY9>5Xs zX(=j|15EHzsbmzOf5~8gPb-5}C?_ydEEdhT00poETs1{j?z8~G0WK5@-zkVMx#bRn T#VG0+00000NkvXXu0mjf-oHg3 diff --git a/resources/assets/enderio/textures/blocks/itemConduitCore.png b/resources/assets/enderio/textures/blocks/itemConduitCore.png index 58f042cc6c2c376d8ebe3291e6e412dc015ec7a0..2011146b250e72609df962703420ede2d1517dcb 100644 GIT binary patch literal 16638 zcmaL9c|26_|36GqjuOWbia0{ZzHjANvS-VdWZ#$Ugp93;WY3n}*p&!LWr@kYuSE)D zUqZu3GuC_F@89S1{oQ}u-`gKEXU^lgu5&G~>w3Lj&*$@aZlI?@eSzfy85tS1mZqv9 z>6?R$>`VmZ8Pb(+&Xxn|>x#dcnZJ>jlYgMCuOpeVgO{Bnhn9z}v!kJ-twXR+uj4H; zGQ>4kV>5pe-PFp-;p(8k zc~44LRM-2qql>HNV_!$3$9l&0kKOI%95@wWj$1+Uqy{`3{cSmdJRW-b$pH44BBAgum7Vπ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 z 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 X3ghCzx0JvCp)=GwuUmTBF5>?Hbt)^n literal 5916 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 diff --git a/resources/assets/enderio/textures/blocks/itemConduitCore_alt.png b/resources/assets/enderio/textures/blocks/itemConduitCore_alt.png new file mode 100644 index 0000000000000000000000000000000000000000..1d49cedad18784160f01352d65c03d4052f90c34 GIT binary patch literal 7954 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 DW@=kf literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/itemConduitInOut.png b/resources/assets/enderio/textures/blocks/itemConduitInOut.png index 945f403acc5dd36d41d9a89e70588c7fceb6bce6..b5edd837fabd70aea562dadcdd6668efa665c79e 100644 GIT binary patch literal 1091 zcmbVL%WKp?98RefTeRXuQF<8D9#qUGlWdYEb}j9u+Ldmt+m#j{;A}G64Q(=MGIi4h z5mZDkK2D-u6nhj8dMXO72Sxt@4|*(upr}akS|{yp^-y{+kjx|B_xpa&nQ6(sMrt?V1sYRhcdO9#g3C@Iq_3NhE`kP-$t4^7|#M$YW?d)&iu&C_mi zoQ~&*Oq+NqlweY^7ce%*_4LL8vL`VGB|PE!8UDx11s=Fgh96V&Qa;GyiaS^f@n~(h zXxAof!{K|6f}Yr920Tm=h`lL4GUE)tYS(1@Oj3}gu^B9uhg5Fj+ux(PK?}Xv!k? zjE8-ivobvUlX6_gv`eT|a&%2VhSV(>FzpDXGI9h>?sg^>(*3fM?UPhlgR&+mn%>~%{D>mo#tm(kY1g^(rd%@{Vnj(;BxI`51tS$gNmL;L z$Y#NTG1qrUH9DA7Xf0q1hweq}91DpDR#R-c8_27=UY2Z)#cJ4^ARB2(=(cq%U|rD^ zs4Cb-h_CaV|4p69oD!2h`KNChSF9P6?fMk3!}=UypAApQrsQ)|Z!%$(oYhy1KYlw6 z+qwPQ54~NveE;mZhY!BIxpAj^o)cQSmb%V#T<>VQRlVJO>B+An)kiCHufi?29=E=m zXixFQ#BcFa3;cR*=iSzK^!3z<}Ns2+;(PB!2{FK}|sb0I`n?{9y$E000SaNLh0L01mH;LN@>a0nJH7K~z{r#g%V|LO~RV z@7LK~yZaq>_cKQ%A|eryh=@c)Zz6hicAw#wX*!i@@7!KI>VKa3bAEGX&N-EtJr&p3 zB(AYEKX0E^x7+>u+pvI6r(^AQ`vf+3V%>0B5sP5VT~HT;!N5kNkqw7K>-YPCSO|06 zh5rSIv)Rn%^LhB4PNy~=k558+y*?)e&x5MFZ26jX&7K@8Wu-4r$msG&_uG`oju%tg*|N`I=6a!NnG)A=#3F&CUuT$J|| z9d$#XC}B_6!G+-wI60@L%u;S~NcmM~RB7g$@p$doMvubjC4iIDc+?Zp=0wB7PLx>d zZkS6ffQ^X&Em#6#iU`mf;GPMwqJRipgF0i8D^Lcck%%8+(MPBPq)31=qLDOgwOXf2 zsG5A)%xRc~`jcanUsnFhTtQ!a%ndLEK5#P9Me|3?%20-|v6_J+9YoPEJfsFbp$UnYSBs z1=%}(ntqdhf0r&7NvTB^aGUgCjF^Il9Rw-?Tt*E9z4g_PXog` zq!u+0AOb-ebi>3-^X$N`MfcgYz=8pUtmN5)pjy>BDB>6ajn_C=lqF!8yrik7BwYit zC@F#@3bM&blBF7!q=VtZQg5->wi56Y=@A@5`t^%S%eN=BYBoadXPd8RjY@F!(><}S~4Mpks$G+5CmCX z19U%C=e5 zv_g5Vl*^Sz+)9`b7`kZW+o!&VT;*7NHo=)j8QzMK0$Wh(m^=E0U%l7eaQ(_x`tZ z0u4&Y=H#Eb8C}s~%(jOrpoc>pp^%CvrYcE3mA_Jj-L2S#X1e|T>4ym_-QvC7KU>{r zR{3P9gTMU_tS6hFZ=HMemM~u~*T(kV{CsZI1@rzT_QCj#m*+e2-mmb~_Ufx27rHyI fr^W`7W!~4%E-}rGGo`J9^CG*dlxp_7xuuPLZ_86I delta 413 zcmdnUv7LE>N#H|5YILda9Japj;>hNMc~cj2_FQb(d}5PN*P;nF=T&`!k6+|?cHzMPrWW7J z9=Er>i@d&dN@}I~B$ZC%#+@aN`-?w78*A^&W-&~?pjBbGV8IcOwj~bzi4tt#j6Kz+ z3m(jwC@}p)h2X-)#(w*m`!ASX2|KdAtYNxdMT;8Ci~7Hki9KvT9u+a4I(|C3U}d9n z$d;C_X#p37w4$6`y;o##it2*Ahc5Vbg4hGLrUa#@^S8cR01RgaPgg&ebxsLQ0Q%jt AqyPW_ diff --git a/resources/assets/enderio/textures/blocks/itemConduitInOut_Out.png b/resources/assets/enderio/textures/blocks/itemConduitInOut_Out.png index ab68c07ca10dc303b09e6b0814c8208398215467..a6023e41a2561f85e8a82b206b12fae68b578fc6 100644 GIT binary patch literal 1068 zcmbVLJ!sTW9FHy3^04*J=ya`PbIEJNMwp)yWJMrih$!q5g3Lc zO0p=+JVo%ydPrc(hskK)f{hY4_9Noskj*T@23{p4jz+qlLJ&F5f#ERe6^fQjOkpGf zK@x)?%d3k{NEQ7J<4|-`TaS=fMG0PwUD}W4XrD}LceJAnNTV@t#XfBcT(+^h8laF= z>=H-+2%hhmZUZ(Np04rGkczwk3Lf8RLXX$vq9?fpNz)ajZ|5++UbcWmVP!>E0GKG0 zwIV3X1x=NWqHfE@KDQDk1col^`}V2t9#=h*Yg#da1jjXum-|yN)4~KNEgZ3y#a^2C zLl3u;%UOr^6Sh(8uOV+T#sS+cvFRV;Ue)!c#C7q?%dsabzFfy?4e&E6j jdu`~6^Wpqy^%KfTOy_Lgn!fRUE2C5H;LN@>a0P#sgK~z{r?UY*wg-{TM z`~N>EA`uZ=L?j|2n}}W_dYWU6ndH2lc5%$dqJ3-4%)Ug1VSgBgVHkIiWf{rmJ0wX$ zs#k(Z)07~XLwTOFWH>x(4%4zM$vH<=Rk6^PY2ko*Q50+j)3$A?>pJTDo;3^u_sjJA zLFUN1u4`(Vh7G4_qIsTaSr%H?m4!COW!Zfodkp}YkK@Q@Fx~f^j^kkAd)qedN0nsx z?_2}Gk5K{d{ZkphRY3yKGk|?YiM0v{Lbm}5wgq|vzAJG(h(QmbK0sOtNN>a=*D#Lb s^Ci?r36kOPsJR9p-Ourg>7NiqA7e0klYKFNMF0Q*07*qoM6N<$g1tMB%K!iX diff --git a/resources/assets/enderio/textures/blocks/itemConduitInput.png b/resources/assets/enderio/textures/blocks/itemConduitInput.png index 89d25ca744978760550e9d9ce2dbea6edc711ba8..77828dc0a94df5318fffac2734add0baf7900b56 100644 GIT binary patch literal 1073 zcmbVLPiWIn91iM42Rn&~1L2WfRF)<$Nt-3Kn{Cp$GCNCG+`tKYOlnae|i!-E{h z4V9*>DqBJFo;c3FQKz%Zmb0`tPiIMkwo!<=yhG|3lsvSAs~9=!EAMfZ*x6ITiZNvog6=xE=%RW#7%dq6XMyO5e^we9bbU46R~b(G&=a zYM~&j`GTqHI_pXvntg7`k0|nO-1qG=-#xB%DAzDUj3^0fgtYooP-zlMq9zG|X@c`} zuJ4d`bRp@`Ucwd*-8Jk?hQtHi5*zLT?$esqkn9Z0Rkt&OtgDhRW@}i$nvzjqTER9# ze2?$^Z|Ou9l$gxPKXcQ+V#Anh_f^0S`#Qot6Hmxg^8Dh+Q>L(MB`aTxKYe@jZjedW zys`UxyY<+ZJXUOy&%Zq5;nvRd>6@br2+rO5vGL$i?rZkT(8uWya~t=DkKBJY@MPij po9nmN7B+tl>}+k`Wx%(UQ;Xag>tyj&@x?ehbEV>p^|G*d=MVFWQ=9+* delta 447 zcmV;w0YLt-2-yRWB!2{FK}|sb0I`n?{9y$E000SaNLh0L01mwX01mwYNBfYi0000Q zbVXQnQ*UN;cVTj608n9RZgehAMN}YmGcGkQF)>H;LN@>a0aZyvK~z{r#g<)%#V`wojN9IoZ9~%}01dawg|}Gk=q|d5K6?ypt*MPNtx) z>!-_PpsFg#W&m-8u{S6dWm$?1bKbxhkaBjd;zdzB(}@hUZ7WUFn7XTxWF>gN-vXEb z+XTOR7lmRN27$isrR%y66U2BIhG3c|nde#P$8j`9G!t45;=GIh%d#x8uIo1#!GvZa zs)2pqf~?r32yQ?{-G%`&K^8a<_E~sZ z7z2p>*2v7ZZKe!rfV1$lv<9>c!41GqC7}5-5VQmenQ)CHIRiHO2qH`m`V=HF0PGe~ z(yq04#iP6jY!C(N?!F0=7yv{SS3LU1NFn9miYL92AvmhSO7bfiJJy|Nxf257N)`iP pn_%n>icNL{kgWtR-pO>x>kBrwa+KL8WLE$H002ovPDHLkV1hpIzSjT% diff --git a/resources/assets/enderio/textures/blocks/itemConduitOutput.png b/resources/assets/enderio/textures/blocks/itemConduitOutput.png index ee69f206f292d0da85736177034fcaefbde3992e..53af81c7124ce4011f5189b07d02ff6a66197ef2 100644 GIT binary patch literal 1068 zcmbVLziZS`98WFiand3Vf=-WgsbKQ*lDp&*de-aZY7b0puLr$B!FS2KUTl+>Ca=Bp zCUFx42Sup=fs2C#eNP}Q+YyBgc5`@upzu96f z=a%KtK*kwHPJ@WE1z~DBjj+2)7-*9fKP-#CcHWD?_sZgO(NUbJO1l1BKPF54`KH@n zbxlv4z7D2RiyH_C!ypaT!o*6;;-OuO@3U(tfp*a!-#!2qMQhHXJ5{MDdit6h{!r z3JiiQu0wRf8sx7VC!&+)RzzTfBy=Noc|AH4Lo(0Z=|UNhdt=>>eO?s2W>a?~AR(*U zWs(1pJ>Rq3Hg2~)Lzl3rlq3@sJgMEmo}{ZKPjL&1ZfM%j&Pn_ds?-eI&?}muAyg~O zRBAkfYNep4rcy-akXsKEhC`POwSBHV;1*BiTGg0fM&l->Yr`&B=u$?LE{#C73MQBR z(4)QNYF446fNc`{o5Y)qX#fsWZ22e17Y(DMxH^y3bahEJ3yM^74I&Xk(=}Aoh>Ni} z;Cug@I>?=ZS)csVH^VF5jM?^h3i#o8j!4LdC+1VK_vGa#K4FV>yV6X*??2ti3rcR( z`FU{g`tG~uU(V(B&V=JX>d&?pw=aDd;mG}wcpSD~Od6l3?`*z-_j3=N^KAFxx67$c g=#8%zIAoXP6ya?zU)_IfTl_54YxDN2nR^fa0LCOwAOHXW delta 530 zcmV+t0`2{*2&)8;B!2{FK}|sb0I`n?{9y$E000SaNLh0L01mwX01mwYNBfYi0000Q zbVXQnQ*UN;cVTj608n9RZgehAMN}YmGcGkQF)>H;LN@>a0jEhsK~z{r#g^^I0znkT z`~Ux^SfURRu|&jvSYnBY=tIo2XLQ!x+v(+w+GqILI`eYR+<$r5ou!oi6)8@M6r(Jc z%l@J3-XX;(FtAuG`k%V~6;h0X;KbLxLyA$Vs!E{5gcPIL;8>2xo{(Y`8+f%^rS*E9 z@$D2+i~<7)%;1~NCe?MFw%cuAt@{uuMxg-)N8tT_Kj7P2q!22bPuq6eF<<1Xn@OrQvd_^VEGB|nHl~nI@0V9G;wlj UKAWU001E&B07*qoM6N<$f^3EKdH?_b diff --git a/resources/assets/enderio/textures/blocks/liquidConduitAdvanced.png b/resources/assets/enderio/textures/blocks/liquidConduitAdvanced.png index 42118471b85eb610e2d6c40a3cfffabe6501c857..5f5dbbe16e74a38c991762c6a38e89b4cd8daff2 100644 GIT binary patch literal 1242 zcmbVMTWB0r7#_@}5)zGXNw9RBJlLvp-MQ=x+19;e?ZR#nw@bTV9y~L1HajFUXEQT# zH*3Mr7{Ns>zDSz~p(>%Z#a9tyyQv@uVyguaA2ij6Jk%iCrdBOk&un(151|hZ%$(c* zecyln%e+1@_FP}jP!B;6eW{~~EFQ_=eYhKcy=wIi9tQocnjl7wR7${@hCZpoDa(mazkYIsA}upQ zoscqIrWA)o>uA-5$EssFqdIMS zP&-cLGZSPSxsa3?i8eTaCl!_9B~j)1XGnqLLoCm+f=cteCMp^)ldXrsYOYz(vWa9% z3$G$n(f3Ol%a+S!rW|6BJH_&CP4GQYN!Y?0Bs};gGQvP-1z8V{JRQSJT?_v+!Rx_O$kL^Cie;p@-&N1LvbK z+y>*=Jy<9(#NKG*u7#5VW)jGlv!Uas5)lfYFs5Z{h7NSyRAd^cT$omQ(WLbPFlku` zo17tXvJwildG^9f2~Lz_vK$S`NuD1SW6>y=OeUjZoQtcx6mDZvj^_i%fNgCHYqzk{ z1F>4%g}_H{4xyQL6-*S7kGvu(k?}Zr@Py@Hd$lmwp?3BDHk(>>#!M2YaUQYVEyS@r_59`v>Og=R1=77oLCQ z{-3w^QEOLENsS+_yu2^XE(>qHuMIO#9+tB7|z0znjPJiRv+xlCn9X>OX zJ}LHeqoIXV{ik=jzP-EnJAmq?%)OsC#xL2i!lWHLf4RxGeq-a>@Y9_Gvs-U&Zf@SJ gE$E*qoy0@E#JF6%v2}6nLh!dqjgBQgjJH;LN@>a0$NE#K~z{r#h1s9<3J2V z^+_HF!13lBuFg5!0oI^Z>Og0I(WA#n}S1Sa6*2tJLR;H%XN zmdmAi1YciYjyj+tat>cC7Sh1qZh@}IIeb2!%MQfjaZ3j%YLc$VIea#onH`{8Kn4g% zQX@yhhRYBB4S@+holZ>y_+=uIfP6l0nN|hUk47UH4u|pxu!NWZhmzEyc{QNI2ZMpt04BhrCaEp=YCwhe z`+f5W=yjaQWGp}~r;9~xxjHq6_j)}ra0#IaTtvBC&N3~@&0GZCcoY@fV3*-ZCnD-;B6tzOvj<>3Avr=gZeTaO@O+K9QI5eg;>Z;rRfM z&yN;wzN;x+qqw)mSwi zBf+EyHBA#GS(IggSqR~rM^R1i!Xr%v1BX`N_|zdDh!~McW@(CNo^FQV`uY48u@^QH z#Zo5LkT1fRB)V=CSKT_K1^m~IZLP!NoR7r<4#{j_v3it`G{G!)I}1gI%p3ho;IN{g z8G~4}F7{~7Nb&4X%yw+uGLdQ8YEnR&)F)_Au?4e?Y#}N4*^;G5Ni`mC@@$7!vYMhP z*}-&Nl_AV3T8166nZd+RMpM#KUlW`2LW(>KH?;7N$R|{_ELlkwt7atySyLpT&r-2~ z)p#-v6LD-I#5eHv|E5l4PKi;U{L?qhE7pwBc54dQVQY@C$A%|hQ?hh!BAT(OoRKcp zKAG>=*RA_UC(Qe>YqhiE!izmd%g>h1Utb0mH!k0NWS@TZ`S|kn!)t4FwX{4ugck1I zIkx}ZK=;+Q?^DXc*Pgqr_|T1x6A$s*%2_z_=E2JCeWfRr&JVX{7gtxFjXvgfwQ?KJ VLGRO%kKdxf&Sgi9rNN0Se*n3?VBi1% delta 484 zcmVt_*B!2{FK}|sb0I`n?{9y$E000SaNLh0L01m+b01m+cxRGn^0000Q zbVXQnQ*UN;cVTj608n9RZgehAMN}YmGcGkQF)%Rna-jeK0eVS9K~zXf)s$UlLqQOR zU!sJNn-cmr&hHDQN-3dADHTE}RZ8hiDE(`Fy6>KqNW7;B+l*((jY>&|_{Ag9~v0zTPx_ z*9_(GsWc}&rm!LojO}3@T&@Lt%`Z>`h{HkD0xYBgkN8EM zr58cpW1*?4YH%!WQ+Fz7w@_^t9gCf!On_$%V@rT#bU=|fz{wpb z5r7vNI)oGfIK{3f4dZq^B|(5)(~o-y#vfpJZe} a*L?%ptX*zKzRKVL0000)+QzfMHemN3P$$Y$|pR*aTivcYK_)P z_jHT6F%)59ZP#aPj+>Zl`^Z|t6qtC?@zVUyckg-N*lB(tQIbl24mX{d^#ISW&sDAU zB}=pU$qbli>&$?QDFSVG*$ee{n(x@v**>}!dC-B-r8IvMRIOA7ITB!yh$RF|k|9vF z7)-=92=4${f{F+wQPuJSe^7LiF-X_{w|o}}RVrP8TkFYFeIl}v0S zUxYD9bloVg4mzY2{5Om<(P4GX$6^JCWHqo@KN@2_GOOMBjv^q7M!z38tSM;OAl9mj zJz6xIjg8L zgn8BoLo-xW&gBb6%E%f$ZqW-V@+{o*?J(b6E60sA@y9k}OxvN(!|*7&8-;_V-gTgL;>-|QaM2WlT?3QxCRJi9sa uB{RM?`0e{e<9MU|aj%()*!`FLrXKZiU~6PU+CF*`3Avb`GhR>EH~#>4&{xU; delta 810 zcmV+_1J(Ss2*C!BB!2{FK}|sb0I`n?{9y$E000SaNLh0L01m$Z01m$aI0aKA0000Q zbVXQnQ*UN;cVTj608n9RZgehAMN}YmGcGkQF)>H;LN@>a0=-E@K~zXfwU%2?6G0S! z`^?_D+uP2}&dy9{wjhm(qCdjK7mY>}@kP)WA&P(mt3<9+L4Uv^AP9j70R#!Lpdv~L z>MwI>3nEX@Zof3m>`7<8&Y81kCs0!!E*x-bL1EsB30y22mn+Z8?{W#Q$CFn@QVs%z zmH5gnw@Q9)&@*!E|0dVL#9iRkL9f=Sl$SmW9suzu${&S!LzLeEo{adJqQ^kAhvUyI z_S9l6q4<5ZC5&X?W zTL%29g7pfxpr8pI_gkd36hS5~<_KFwWYfkwVYF+)9UW{dAgh2S1x@NWZILH=L9WJ5 z$Dr`uGrsJyEOLLuoL?dI$Ao)2_^E;o1uUy*O2@A(+Gcb4<6;D_4+I-I!S5r2O$B_E z0;2>$K7U1{xfFeJ$d_D-_Dr~I{I`OCDaubMf(+xcn5{sv5yjsvv~9pG6?|6U;;}s_ zRNU#2lZPmua@e9x)z8fS$p8QV07*qoM6N<$f=e5100000 diff --git a/resources/assets/enderio/textures/blocks/liquidConduitAdvancedLocked.png b/resources/assets/enderio/textures/blocks/liquidConduitAdvancedLocked.png index 59c6773749a20bdb86e9991ff5742745418ad57d..fd9d5fcfbdc396177d6a6094aee14be99cb6bfcc 100644 GIT binary patch literal 1254 zcmbVMTWB0r7@m+uYR$!>qE;~DL{gQ`{kAh?6SKE=X*OLpD_yYQ&gIPRn9QX!lkQ|i zQcP=YsR%wQQlYdDDg_@@#FVBI1Ru18YC#c`dZ~&+`(SM`x1LFMQy)Sf9GE$`|NFlG z{FgbJAKuxqW!n}6K{~R#QUy4o(YyH``1R}czv1v`kS+xyjuF%p4YHs)CAX$FXalox@O5k7IlJ z9F=pEpla@_dtjtKT-55Lnxta`{b*k(Ljnr~3L08twl9ZqY?W7r^JtsI&{dOQG>)w~ zRm$bjq~igUCwN?=7#bBNg627irgxwWMYAMLk&J}Xw9JVzEuf7DgKC~`$c0p))ji|AN<5fsnk|dI1NQS|o1@2GSffC}j-_vAB0blb>H!vL=jTjZx84uzZ z^mOeCmYd716We|xP%va;0r<|ir@?#}Jxwr- z-Q9&EL+FjX$1`D4l(Cefja$GDvZ*)*PYB)AWldF7RTl+Zk*F9h(VUK}hN9yF6VoY; zqXdy-ugxr~^m1c@JHg$zxnxj{A|#yCof36jVQe5Q%b+J2ze8fa>pP`iPJn7d%* zqz9D1@rsT!)~tej)d?KG>bPh!i9WU0v~{QEKOJRg?ZPSGnFoNL@f-_X4Y6!)Ag_uV zuW*8dO9m(6jKXQS65|D2V|5{BNIWMpG}gfD|2K3bbc&4X zvTt7GzAl6Kr-;$Xa=F(t=jV5~{(gh6FA?v*yZQ9ny}5-qe&{S$wAM>2D=Rxqaq-`! z$I{(HkN5U(YnvMAnEB~=+vR_zzQ8}&apa?WCl?ow@?TLuzxY7n#v0X${>jXh$%W;Y u!y`z~nIAtqdp5prYkut3tH`qlTab@0zwqat@A7K&=gFprQ)d$8S8f9{@T<%K delta 737 zcmV<70v`S53Hb$(B!2{FK}|sb0I`n?{9y$E000SaNLh0L01mkT01mkUxCR%$0000Q zbVXQnQ*UN;cVTj608n9RZgehAMN}YmGcGkQF)>H;LN@>a0(D75K~z{r#go5#P z{gX0*%(v|En!Weld;E4?e0F(FD=y-=LK}c6ETTTt5yeFF`G0%@5sgMgp->RoZ+`-T zfI$3N0kVPT^Z7rp&YwSt$KxUH_q({=ZsK~qip%Aq$N78~r_)Isk4JGh9K?$O{t~S7 zXD0!$9h|@%zTfYK=J)%*EdV+G{4O}y4o+Z#?{+(*07N((7R6%G^1@FFaH^cZi0yW3 z905Qukk98WFMoA%1fMD=@Mg2oLpOkCi$o$H8*rnX;Oq5T4~v0Mn$WFsg0EI9J@jh` z5DdsiV0R6Fs+{1<vqaf@Yf`F{K5YanBbGi#D6FN$#^_2a=Dykx5(KkcUu4l zBgW&gX@Cmgs7geObPHtF98PELwg3(v4u@he7??+ZCWHa58aWw` zMsr($4Da{*)&gLFt42wc!V3E6A-Zh7JyIrAS z2mypalz+`;ExSdIz)lB?+~sz=CU~dQF~1E_0D3@H&B0Cvi`?Zh9AJXC+ihbKq5uq{ zR4Qdrjht%b0292`YMIv%O_<4KEIY=!YUKn*G@DJc02n|4Ts78JD<^QH(a__i0InMA zs+AMGUayNC=}9rfU8DMwQ>%xR;%VUgj#__B4JUDoNDD9Ua3@s77PZ3$K%lp zNG6jOAabgeb9lL2HYXwG0FHp~7CF_*0Va5EMAc8~a*0yOO(NzozC TZrzco00000NkvXXu0mjf9=1re diff --git a/resources/assets/enderio/textures/blocks/liquidConduitAdvancedOutput.png b/resources/assets/enderio/textures/blocks/liquidConduitAdvancedOutput.png index a718dfa1b5e82a599c9a0bae01008a267c7d993c..340b20fd4ab90e2ee877a1aee58d83471704241e 100644 GIT binary patch literal 1078 zcmbVL&ui0A9M3w0xw*p*!W4y&p(vOpFHM^!uFkG$x1yc1t5{HQFE6ia=#rNuZ?@Y> zHxPt*@#ap0q2dH@o;)~jdJu%|J&YX;B=1K)pYQL_!|ADs!Tyu| z9LEh7C(SZj`RMJ7vG4EUZ<}m6LGx8QLu#}M1I%S@Vqw1M!Z}>V&|X^jfJZs5cfqMt zX|;6KK*Wv12orC)K4Wv-=vd2#sDUYO;W@|42tVGu6?n(a2se`@x#Z_?-I-ht@XYd5 z1uZv_ZVO|V_|cZZ47iv=zU9t)q0!0+ZMz2BN7s_Tw;{BV5%z+rmZtd}2{50GCq*PH zfY)JD2wR=dL;ML-sfaV>CIQ{cQw z(4vbyS~N2P`xCbv+dvkyEL%&7P?yu94pdvTYS0!_O4^o@DyOtWqHE_MzM2M#V&=_k zLQ??9tLdDsXUA1p19>H@sktt<=!Fz|2zPxu%y);IJCtkW0t_h$Dum2;r(n8HC<*Jt z=W{v!+)c-`Ni#ejb!abP69>*+Y!?FJ^6e5E&H?U|npTrhish=Kl&I*cET)l$MXV)K z36M-+1fkI3+y7fSi3KG^bMnvJbg$SjM%#TAu*1HNu*bv`FqPcMe!asKcB^P+E3MDg z?#>R{I5TT)fZ^A(yDLK|`|jzL%j(b7zL#V5@4bb`{TFZdJUV)Id+l`T*~oURuvK~T z{zW6Ubzl9}GjROl`aMy8FnMb2%j)%kg19}v#g1{$KMifJA8{ulB^UEk=Bx49l|NvM BQ|bT! delta 841 zcmV-P1GfCO2;c^gB!2{FK}|sb0I`n?{9y$E000SaNLh0L01m$Z01m$aI0aKA0000Q zbVXQnQ*UN;cVTj608n9RZgehAMN}YmGcGkQF)>H;LN@>a0^CVNK~zXfwU+Ns(?A%< z_nQ7%yRGZp^?JQtrx;?Q=s#h6Wnz3Gz7c;!At=98AOt~yDSrYE5t)z~A%Gwu4pc-5 zLH)}t-GNKol%D!YllHFd^X+|~yQdec|394CC$a#4@6g0fN9XL(&|<1 zyzwVud?Zo0;2vvmYJ-Efe~U8S9L@Lg6Pd@)|z6iCTj*h@2!G} zMK`QWN7CytXn${l_N2Ua;PV@m5SgaUX}>!`AH+#kBg48okfQfcRSgk~Zkeo4cOR=x zPQjBZ&KXYDq`mf@S3GJNv6ImWtRK+HxPtStT~O?ThNlzGm_-Mi3i*hgh)$d7J=DoF z1s5c=D8Xd~E$DV3OaYZ_WH@O+xQKy)OG z&c`dfl7m8&lksc~nwQ|Bg64EQn{p-~9sFf6i+@;j+hqN5cT~Ysl075aGb(;=I3pIl zAC{vM{QJdOxj~tE~p{`O{U*v(0+{!X=E@?`jWI0Rw#2N zL~?LF?YAYoF5T_c-Mb0eYViVB4i7ITa2aHpOxBY0T2kz$<@4Suh*;DR{`9YcOe5U; z=|Xd}t01^-x#-je2X9w`?~4A_#*0U-gos6FGIji_Iy?i1%mIH^2$2y)puYYGcny9{ TLvTq;Sp>ebD%?2;R_)iF#Ld|ngP)W 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 LNkvXXu0mjfMBcn) diff --git a/resources/assets/enderio/textures/blocks/liquidConduitCoreAdvanced.png b/resources/assets/enderio/textures/blocks/liquidConduitCoreAdvanced.png index 137593a766197fda2729c264f99e21b642cae5e2..127ba6595ccd35267e886ff743c50a31f6ae4ba9 100644 GIT binary patch literal 2149 zcmbVNYgiL!77h@opg=%G6lljN8n)yzxeyYG7?PlYjTdAA@lqz42?WT6WFjFemQt!* zw<@*@h!R;)E@kxj;RF*0MSi~|$HRso>~E@nW9pb%hCrm1vX1CRK|E*G2I zwy8wm4FpZ)5#Kr$FWCSH)LH~!QCMUdjSd2A4h3W}IUpDW&}krp3eu=_4jBZwOg0w` z24)^2rly7E+-PCMj25=y5tC6=!=+L)GBPL`42oKtL6Xq~5F$F6R-r)^Y87C!2uam?lt;uoeH(&OBayr_tkTUS3QHN)0BNWog+^5>ZE?Lp z>(FTAzizx2t&7RjAk=6?r`Bs_*m=m8&XTd*{l1V5h>@C+6qj2hRgX~E?1yMAXKf5QLEEtt6)R2 z8dd9()fzw`07!8P6|BzC1=>#NZNNfAtJs0S5n8npc#~qT;yv2kpEU}BNXa0Q0`n>+zFq2v_@cn!|-^=t; zzN4Zoq;%i#`J<{~R2B+WZQr`}Kt+ZBm9eR*pcN}toK2|7bvOI^`aXFzJw158&wOZT z*jis-zk95qp`kulQZiaj64& z_lN7<-Q9QKJ~cUg^V!R%PgS>amYWVPZ(%>(w6`s-VnHHw$!iyv%iV7_uPINQ8mhEf z3(i!%Y$=J_N54F_-v2?+$CV3LBuo|ch_@ZCIn(?tgRC#R{OR=M=;UNd&+Vb1gI*_F z<44Ue6R$irwH*!FG@n9fsfL->k0`@Ny75r2KHlxNL$-x23fo8^bYym4P&|GG9LcKG z#Wke*pNnglGY}rPJY}6F(7COx4j5cB{T0P~* zowcZVoGrg%j}|vZomn|*KG50^QSzKyg9tx6)o2qBy{`6(tZshBa6G-bwUp-8#b0vj zq*!>Zo#kHo`Pf63l&y|A0TN58&hsvRH{twF&k`4JUrX6-zyEBg4v*PWWwCZMd!54P zOPpJo+5S_W*K(Qzg}m+Vyuv)k7t3%#oUspGxkoEiSEAw^#yjmtH+L2-+I33N{)wmL zpBG}Tar??hS8j^DkA+;0D zp|AvI^W3&v@4S&s@jC1GMVAZjMb9(Bv#1Q3T}yXbQPb)3LR0q~yVz;_4>+(Ou0|B@ z@^HnkOJ4SAi}A;zRp~jqjx!D98}=_!gvktaw6E8aQv84qSbzgX1@Kv8Q21M1|EHvf*#LG@Ty{O6O*Q>FP$wmIT z1s9iiPfSewB1a7dQb%mo=Che%DC6R#qMd=G|4zVeucV_x{r%@&@5BM>bg+-i5#Y+_)<%Yhc3aOv9}*oV_UgQ|b}h#V;1E K6V`?&=KKcH6>JCq delta 1138 zcmV-&1daRU5QhnnB!2{FK}|sb0I`n?{9y$E000SaNLh0L01mqV01mqW$N1DX0000Q zbVXQnQ*UN;cVTj608n9RZgehAMN}YmGcGkQF)>H;LN@>a1OrJ#K~z{rt(Vz$+CUIQ z{e_8>U@-e?ya4{byq!-c2MNz?rjy4%v*~!Vm`%1(O=HDp z#}D@caY723FP-Pj%6VQdU!I)RuAF!|PmAx)(_HlGJUfY6s$QJ8m9xfiGY8-ZnGgUH z(Y$!sG^Oh+Q-8U+Hr3XRFP@h%Uc9BE(`o4FfQ80?^0?Q1cSZ3%I@u5Q4BwIYwjKoX=9sL za+rW3gi0ZHO@pXud?9lbn$2W@^0giLji2@cjA?EID1U^Xi5+8J)2R8pEHCDw-jV>s zyxj@|TpkAyM1BB3t=%^DPTSM~K>!vc0pg59=AP78O~n`~=NvSyAj1>^eks7P*L4A~ zt?HeQY20=I(2fO&7<*C2nKNRETFkE`n^nw7{TD!Bo(y28n<@iVIE{Pxx~ zp#WeO1)yPQyjm4bCs^b8385E+9^F)ADsbo?xOO=Y| z8-Gfaz3c#0qPE2`J2?Ue^#6Ex^dN%_q?S=vaaV!zwG#40u6o5cj zD&f9(0DLrl&SuSNE-XU44?t_c1&I}|7k|(%!T|U*R)A0E8FNYq3nUCc^L<5ViRTc< zeZf2j=mdb5e*y&2zYjo7^Axr#l||-40Q_^X58x{S7`>X)7*R<2IVk`NHb9Iqqo!z{ zK|k3Kppo0rbM29OS$Azdo@hdVAmuo>A{KK#M4aW~7f#4v;clCbF z0wIz^MUTnj$OYiPV`hOTdxftTR|8)xqGQE5hyCvMFRIh6M#-z9eEZ2x;cSta$5I~^vD20-(51huSSHDQ|oz%)r7DIp{wTZ9O%pu2!q80`2sqV%Mmb{8$lL>$%dE=h$WygnL-X<$mD?w z50z9?qcUNHU%-MExe`(12tp-ZR8RTIXZZ8jo(zuvA~#5>Az&qfEo#e2?FBCDFS$ao8iNU39f{+Ki&YRFhZDFa z4p)I*RmxW^s!wM&tBN7m$lLeS|5==24SflGr*x z0{}C2ke^Sawr@|g*FhJ)ElutDy<0E;(NbBoN@n`g-ctK@XYnD!w8=7;4WFL4Re9Ly zfU8w=)s?b|7)9`zOS z=DMo>Rf8iBC<>be!METNZg;!^S=1Dfrr zxmyCgY#wg)n%&;oSW&U|Kaxqf>7l6Rxz%COJWT*aZWmQZGN?Je3v zdyD3B+dRA2`KftBhxPforj8=s%PjYJ;NL9Z*2ONH+5$T_N~!Yfu@1Zy?~mHvN3RJ| zoN={TE@w$rC*9{%RfQ%XcYGRz_wpSM+(y$a0>F=gzigdAfvfxt<2MjSDJQ0Aeak%K zV0uG3U@A5Ymsd3Y7UaQ&cIG_&!I264xV`$h13i|hPtgy+CD$yLouh!4+=*ecO5ilH zJE78|)T?%~Y%0&&B~z(9c`Wwt+m!s8Q<;r9~Y2WGOyjg3D|NpZDplr@R@(+8WOgh zx;tE&9<;^voOMQF=#3ebZ}8@uBfp*~gVyPbCQFa1CNoZa-H@p+m>9}Jer!uz*(2+A z?&JtYG?n5thji3$&xN;5c3wLoN~+}c89GIVrRHt3bpc(vm7WNTCA$;g<2<|Rq=?(K z@vD!&qimb%Z8Plp;@MA;EtWphVP@my#f8;LsaX#?KTM@ecJ`G$q0eY&9Z>`EE6#WH zIQfQMY*rA53;uN4dHRe&InWao2}cY)ififX?Ktu73TYXbd$DPi(~9a)`+epmQ-3rK zuTFKov~@|y{?mwi>4UtSUv`XOWfuxPqy(_f_Fe|)Y!~2Ruv$KPKcl!S_9JdNqUyuV%D=Xzr=ZbnHhf<`gQt1%XMgxT&b=+QG_oWI2oJYp zjitG#dwN>Z$g}15{THhr`=e`%_tdBUOIz!Y(8gyu(s$(f%7^}&&E@{Y&U$|`x$z+3 zp5EJ?wLcTd_1@I(Mn9}XqoAqCB6)5+dkI@z85x^p)-sC2Yu_P2k}>~D$Y z)5*J79jJEi7Jm*?T^xIp0DOf^2mpy_Ub<+R^3|oOUSFA7``Q!FD;O_bUYJ7j+~m$1 z=B!Z{W$QJQsZ~v;S_ukcSyyMcCWmYDxQ`;lR4Ne!VB`d#kqw~cWtbQ7{~$mB!ZPI; zjcs$@OED860H&HIG_2Biz?^V}R@3A$0YwOvLJXSvQGe68DRUHCt$2XSl^yxDm-Zrz zX>J23gqMi{WB#X6^M0B$5NaU~K+HSsAi%}r0Q|@w08sCAOyj0w>VO~s3z7g)#sPCz zYOJPWjFfW@8ds5FiU89JFuJMK z0`Se_0e{5UO*d5m03)wsX{m+77yw-Y)&X|_$rZph*NXS5UIE^v{>7mdtR$w0i5XF$Zu~=3-SRr!vHi4tT#+(o~c?78yAHC(cE5t2f(d* z7eG>vouvRgSAf?x03VwY9VX;apKzxYs_YzH2pb^Zuv;#oR{*JgEk1t6xga3`HD>{a0JQmFdkYAjGk}T( zprINcQ^kV(R*+LD1Bfg#b%xr=p+JM{&jQpY*1x_~bki%F6Ktce17V=`sqe>v4 z6F>|D@S}G!pwezAFc8OL0gm#%@lyc^gny+nu8Ri1OXH7R&K%`~BEu;Ny7yAk`xT-`4`d z+l!;rlZfW?hpC?TR?KZUwzVP<9HjWH9G{*rJvEH=_t#uh;f^y-T}MdhOQC7FMcY9Ll{sEf=`E_U@pi zi==D978l}>sfmUWKbR0-hGc$l0~fX|#t??t#3hPM%%)kgEb4TV#EAM7TJ!_i2QRsM z-u}Pe@BjQ??v>`q?k$$>76d`Ig!XVzIHHBOaufU-+3amNJZc8o%oZ(frgt^TbvbFu znu-<}c|q$jy%_X#?FvdV99}0@jbfl+$cPM|BuJ}`P?W;GR;>*)3jTFtLu(_}mjpx< z7+Q}m!hFPcl)x}{cNZ!cLT}h6U4}{FyE#qlQGjZOI4=fItdcCTqQDD+M7waFvAJ=E zbV|4o=Ox@_cS|-vIM~P=6e1LJg0>L2Vqn#v42AqsPK>O%MhVn6-pQh;&Hl!LR zuZp0gEko@h)_GSf>(>EqYI;o5x=U5i+^LzG(Wxa-zaOn>l~qYg8&4N9w02<*=yETR zg1V-lt089P4dmlO+${l-$K4X?zuyBeFRk4JUZ+WgBqwqkTPG0^Tjd?H=mocOjfY3^iNw~)-W!3N+x|T9&~(R}C#yfc_xS7&5$n>0<+;Jd<&`7t7g8f1h`-Go zTKUrXd!nkW@=nKr!A&n7{86YqBfp(~sb)6%$NR%`=gsz~Zq?7eOB~6MR2}ktk!t$8 zcIY}YGh{@r9<}cd+CCkVx4(D)sMbGHer6sy)pGi**%*jc)?4U#df@@5wD(?*C~dPuG9=a_p1u_r^RGxxMd{&7Q1G;K*=aj`=n9@cx7S z!?)%wIpcAzt`>=e?voZr9ldWY7nhrvzaAXFv~+PWOI$s1y&*~mzkLDYwiO~VE>Vf;tKA$T?#-|1vY7R_r Ph5uD35aGrfJM#YkOH$3G delta 738 zcmV<80v-LF3i<_*B!2{FK}|sb0I`n?{9y$E000SaNLh0L01mhS01mhTYC-i|0000Q zbVXQnQ*UN;cVTj608n9RZgehAMN}YmGcGkQF)>H;LN@>a0(MD6K~z{ry_Z+6+dvFO zwU2ye1FnGUpL_WW+%YL`1Tpu&5-p1uTh9H-N11CYz=U{SkVt(wET-7aW2gwO;I zqHH#6sDGAZXRxSUZdNtHJDrX^4bcGh0IyaBTNx~Bm#c6D6TIDS>yr=-;2=t+QiiBW zZbpt^g11^Nxec)iGnvdw#k^`aA}27a*=$M!m;f5!P_wGvjhw)ZMnmYu0Ehmo>USb1 zc)ebSTCFB~AQTFT9^g=tn~`&PwOWi_@%07*qoM6N<$f_Y#_qW}N^ diff --git a/resources/assets/enderio/textures/blocks/meConduitCore.png b/resources/assets/enderio/textures/blocks/meConduitCore.png index c74e1f1d081b933a3860a503260395da23fcf119..96c77ce36dabc1abc10df9bb038f8fdedcfbe3eb 100644 GIT binary patch literal 2339 zcmbVOYg7|w8cw+jQi6B^bRh&3R6;U=K#~SyNVo*K2`E{PRVK*s zDyY$d7F`vH2SKWfKo##m1axhMEfrR0ul%YF=~les-&s|vF~-M$b5DikHx%) zz@k9x2d6lZF&L&y0bxi!Bpi=G1TX;;6qYLI0)>POuLk9Kz=wdBNM_IV9<799 zp+DXDBw87tE{E{3kW#i?!9(&PaGxh5vHNR7vp~cfYP3R#Bn1?+WW4PXND8xAfmq~? z4`0Zq^0*+E%Mb9!ffNE6M*;l!IIaNX)@DK3yo!9vkpG*!3^7khLi~v6X z0D}D(L?#gAM%_xa>zWFEmgvxln2e*79zIixP-stQke<}gk_3&nM^!i1u-cy zSf)&o$uUeO#w$T6<;zsc)w3D;a9|ds5Pk*mLliOz=6#5%!cUkNa0O&O!~=0;KH!T3 zNqzv1OC$j}5?=sPd`SWUK;dHN`27Djba=!m{A`{4Pu&@0D`!k9z9xh}Fyk%3p z&Yhio#d|yRt`!fQ9jY^)^Rm7XU2|9XE%(Juuh>f3s~OI%fCH1t8vm<*Jj$r*CvQ%x z$Sb>QcR017FT;SBpd6M4-6~mMbe}#rV2ZsGV!S|UAE>PA)|!XLy9>{4t__`zx}~Zj z7*LsVul5oct#mv>vB^rml61Q*aE(Fxw8A7i=S|MT;F@v2$kbCVWn~>#4=p*_^XRoD z$0i5;ye6=sb)&BKh@(d6KZWXhl+nL8;KktgiHUAwkBygqSZ0z(fAf;JKT7AkwEkr7 zgD;03jGJ2*{B(X-#G zdbj2-9encqP;HpwI#$6lQS{et#qRcT(ovnIG2fPcI4Z<$?Gmf$-#cq>aMPn~+AFFv z%OZrki!NzK;|xhBd<;3P6oR7}`e)EJKV)Jju_-t*KIoe zUBP4fbw73gQ=TWvMDM8PUr%z$YNeEy2QMlXTuT`$tP{tcRJU&-K2uqEM67*QlyqFM z&51_~7rV6eMKl1XW~9ESC@ed(``5}U&=v)r4!Ly>U)T;Fw$I&duSL1#klNUBW3&^G z-7%{|ODAjxhKP1aC(4eaqq-kjF8?8wyrOGls}cJmeYB<2)nAsb^8~M%yNMVc_EFXnK=EOGxaxXw#WK?%rwdQ^~ai4dTeUaoBX3V zs+MBl-IaEUd$RLa(~d9bo2aQ0H)V&sJo>OFHw!>_tW1@2hBqAKCtnD1Goi=r-4Jql zYH%Cfd`oZol;+Ut7sj!73GTv@GFh*cq1pJ>ld(7ueir^jk8M4jdOpD0t7XlE9fXsw zd^FtlylL2aQ0t{;?9B7Pc&S#QebB-aQ%{$qJL1 z&~HhWRcE+9iQ~t;#N(xBCVZtyx&En)qk8tauSC(mCdNDeC;g8uQi5khX&v(Q;^4iY z3%gBSTwNP(@+hmQ+oq>T`Nx{b+y%S579n9h_vmwb3g*ZZBL; ziimMqZO_<|dcd3ZOfhscf*)q2QycPcZak}7+2kF+qr?onQ!g0oSRqQj-z+?KPoK4O zqpG>CS$8a^^vij*_uU)&vphs7bU$tVMEqimr`CDs7>>?t7YH51na{^Xj7yC( zEup#;kH3}nG}|hToqYpm*7W5$pY=)Ol#piHJ-6D1PnI_C9JFyg;qnXao=FO23Js@? zT-2%PXIz0(yq>2=))+2Z-$j>X4n$&>AB?k+WJ|NUbLmqk?}eEitwlf+_)f1 zTL|SaH|ZZ%^wlrC{el9-7Rgc`jSM^JYbq@ciK4R`+*U2RU#_+1##z^$wR-ukuu{9_ zx4Lb;%RBA5aIM(-h-G?9gYk6-b|m%RHq)$ delta 262 zcmV+h0r~!;5~2c-B!2{FK}|sb0I`n?{9y$E000SaNLh0L01mqV01mqW$N1DX0000Q zbVXQnQ*UN;cVTj608n9RZgehAMN}YmGcGkQF)>H;LN@>a0G>%iK~z{r?UbO#NMM=v z1PnOm3JaKfZu{ohmw*I<0AuXeh{J(^b diff --git a/resources/assets/enderio/textures/blocks/meConduitCoreDense.png b/resources/assets/enderio/textures/blocks/meConduitCoreDense.png index e4f8db396791bd3bbf0047370166a2d5c15b1a75..8965c6af8de0c2769ae6c74705ba96d957b79b26 100644 GIT binary patch literal 2007 zcmbVNYg7|w8qRW45s|AEM3{}WqLRzxLM|kPghZec2p9nivP?1)63JvjGLS&Q(}=C0 zL^*{NE3~jwc3rhrTYD<9A{EnJ7VEO5&=rabwUr(gSzMNj#&#zP?*8!f$Idx3-|czc z=l$NxnHoh}(i-1zUlNJ5CM8*#NsNH|UFku5UF)YlAcinpmV@uYG`IyaAtW)3sSqFq zg$j{O1cJ+odl3PN~sd+G26b}fje8K>V;1FO%^#(KFDkML(%O~dU zZ5kPP3c-tnYMSu~02cDrPFAfjl0MMrY6%3<`mun9B?}WThC) zo0cs|5wqH)GvYeT0JtqeDy#$-k_k_rT>&-9<X3>1q}|mcwK&+j$XR%;rfrAe}4bus{%$ zu_T;WsZ15w*VZu=0X^8o{7szW=8ZL~eAqp1;nG}f40x2p6 z8>Fyd4a8%zH5!noA}{gb|2K3r!YP`&PX4EEmbZvvbWfjm0kL@AM~H!F9uv_esK9SG z(R{8HsaR%1dBuVP9JS4KI^65dM&6e;nfDlI#x(B;JdG`Iy%#~K-y0VkN2=e zCrDToq#&TR)fTVQUhB!I78eIyMQ=XXbClNUpIiIj#z!E8#g2}x;=zH&)=$4d ztL_gC+w-VNRr#pM7Tg-R{SKcxDXHJ0Zf_W0Z=wAg+&ufXsW)suH6GaJ6Tc%>f`*^f zejl;e(^I>s%#L3S>Q&C7*9LqiF05`YIXWk|=j7&2&Ohc#ysokUeu;)gz8 zjp_TMD{yT@C2QUIdb0J)bIMk$q(HGM541-oe&71Gc%xDf78odUO27=;X1%vFgs|k>TN>zh1F7p1$mGgua_e zZT$UUDhFM0OEG+@eXng##qsyUe!3HR*j%^&h9GzJXE9%v$DbW)A9H3M;BT@857k`n z{#!)ts)E2De&q#4>Zd9Dyz+%+?{CUDD>`=W+*uO@U^j{V9*zCudW7?yc51pi9J|>xyTzF{q)B(3 z-+1V8lITKd+~dp0*!k+p_lMsJv%gg%X$!m__gh6kBfXiwYJAL8yCzLM*s z_LoQI7xsuwjLz?BhORJIzWyG6X#X^6WW-(qEsXrYoZ)VG)mv$*ss0=8wO=raF*R{HFxX+5R<9#de1=b6oWHfapnf(*kz!-Q@17iN(b-|M-^3 z3*R|dh|F}XNmR;O)$W)JIAUBg()%*}nOO1D_X>$U=98<_t~<`TVTuy9DC@NscizWzXwf+aW%UN}NBid4UA5B{*XAAsK12*3*>d`)Lq1Y)bz zU~5pn>+no-DN#IW(14R!#w96*f0)KDYnZWDB5 RI)4+$EKgTImvv4FO#rX}Tb=*_ diff --git a/resources/assets/enderio/textures/blocks/meConduitDense.png b/resources/assets/enderio/textures/blocks/meConduitDense.png index da8ef2c131b6e9ebfa172ebb16637480a17c95fd..15fa4eda0b5597672ba51d3f10d045ac3ee7f976 100644 GIT binary patch literal 1272 zcmbVMZEVzJ94|1&oNg{;L?jAL7m%6t+UKs~H|Fi)E-@zSwa<2S>&x2C z>n<_!GM2euBoaQL9~>{?!-ORY5y>(j!9)l~2ofQ_Kp>KUfj}}Muo?8}b~pX7@WCeS z^Y;J!e*fqH(hpl(nyM;SRALxb6>pBF(1?3)MLGJ~g~EL_JnzIZPMgu`q-n!Xv>yrI;x@L z9;1{s`W%r!p3YuDGn2_VV%;tV3WbbvC6fX^n$k4yUNhFVlY;-cF|W0q?l&Qog0|6T z$tWM4btN#0-IIkpL*$LH(Na-Tq@JiD_i0df;!%-6Cq6}01UV~Zvr331C7$L;9xw`- z?UWRf^>Yd>Gc+3t1WG*f;kg(GVstPX4l#ZJVhk6ixflc1v#~JC202i|#&z3~bQzYk zRis_SMxKZjA{LY!!%7=QPpJx8bB1HsIm5&w5qxdCsw+m`uJ<1f{51vkBN56mhN640aRJLi) znHxKIjWq3F5lCJbt(_3@f!Bt&<3qKJzuG!J^7!PA?XN7u1`oW`@%Hdo{881j_gA|| zrdAE@t*FPEkG}Amen49?dFmq6YtI?ao&WTLEl{~bw;qT7{QELb?_PN6mv^tNN`%p5FDq`xnJyEzz;{9b5hZul>7i literal 4254 zcmc(izityj5XSeci;aT3VxAt$D+w8%eBEm*@-^@4P%~60t_m-V=E2Ev^UV$4r zF0_mD;nC6e0@??+wuf$}zt({Z#@lOHHpZ0()ie9Ku6^r?lHoS=9<|O+L zixXUoabe;yPc7oY(o+x%QofSL+&E3V});-w`|ani_@&2C6G7mO#R+kYR$DiQj@BIY$EtX%3lk8jVUy;} zZ_dWBW28nEPaF(;KneOTU{E0TEst#xn+6uGjV|Y7geQOijZ;ZhgDu2vl9OxWaphI- zfjR|g4%W$$#y27l@kwkAKhK W?LB$$^~%J*0Y_WA!}m8IJ^uyZT#z*Y diff --git a/resources/assets/enderio/textures/blocks/old/gasConduit.png b/resources/assets/enderio/textures/blocks/old/gasConduit.png new file mode 100644 index 0000000000000000000000000000000000000000..a19312c7451b20d61f601943b97a43365e125e7b GIT binary patch literal 689 zcmV;i0#5yjP)N2bZe?^J zG%heMF=FWUd;kCfFG)l}R9HvFmsgV8Knz5AB;}lQ&guRaf!$EG2w}N4NsYa#>JMos zyhaaZREkQal0fZtTQ-}G{C-9MQ&FW-5$MMZ_yiu0M-bibce&kea=l*Va=FO)d{&)K zCpjLEayT4hzu(K31d@tn5x_}sf-QWv+euU|mxCFw;3PP~gm1Uorva$hZ0ZL|h0`c) zWsRI*upmtUL)dDyGAEEHa>7@umFg{lEHjWda>AF(rAm(> zOdx?YTkvV*gfA8gna}6XEhrX?sb(NVQ|T0UI^t zBhPDqaDa!yp-LAZo&w*og>$d-8nE!eU?BZ|Ki&ciAri1q$`4vz10LS%_1+C20UI^t zr#!C#568Ca0)LKiL@dxM?Zx7!+;?r^Xgb0r1QWQ3P|S8qWw}`VlqYpfIGWZ3unjPP z!nRuvw(##R7C+@44lv=kd-NuR0lYyW8#NU&a)1d()0zN;MHKcO+pa@IPB7GHG-3l- zKyeFA>iW~j39i@csxJmC^t-M#KQpFZmE!wgGV^hfBhWe%Q$}i&*Q(A4k7e21|<3g X>IhdPaoeW600000NkvXXu0mjfW(+4G literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/old/gasConduitCore.png b/resources/assets/enderio/textures/blocks/old/gasConduitCore.png new file mode 100644 index 0000000000000000000000000000000000000000..cb770b715103350b2217b5cf24a196607e63b949 GIT binary patch literal 1670 zcmV;126_33P)N2bZe?^J zG%heMF=FWUd;kCj1W80eR7gvuR%>h&RTQ3I+h78T27?fjs>H=?+wJW8y`9-d_tA%- z^g-!kVWlmh6bq#-QeKNtn-&n7MpKc8LMREE7TQ25s6@)ksMJV|ppmp_d>{+7yKJZY z@SDBsFx{<{=(m&2opaCmzI)F-_s*qcGMP%H(r7d^osLJLP^i^vtyZVg>I{0l$z-xx ztqjB1Y&M6(;f})Paygw&yWI{udf{U*7<4)vNI<1jD)o9j8fj^1Ag9nWMuBcX%X0&I zy-p7SL?Yg7HiIZ5BLj>q%idyy=1;}8@n8+C8fE0lzH8nLQB?Zj90Q>-0 zk=9HRkn5=t^P31P6$SyB^mHsLO@Wup6yoUi{xi^v)B{tyK^V&hHn4-7Ut~=7Uj@)r z;AQIbjCHRX@;y^&2m&PG{31^+;PH4+njV{FYmsrdDdXl=%a#Izn>F)Bk0<6Nf*^n_ zftCV0R%{9Z5TP8mzM{BPXBg>t`QE!Z12yU`xoI$>E9NAESODY{DG4kC)_GC^60on5 z`DJ%b_`~AR!9_zYneX|HFrq8wB*Fv%t&Sp<2PtSI2EgKWu;pIuCmY-&hkTI}Ya-p% zclQ_e*V~r4ROp&C1e{=p0&1DUuERS7fJAQ;t~W#1Q>nPM!~LLZC3j^Hcd_-svGSp} z*e;*UYt`}&69E#Wgsd0R~t2MrbeqDueb z^9Sl8-7A7E#=+`&uV*RX77K_%5YTG0EW=VbcyTUb24aC&?X%{l0_C0U%20=w`>gTG z$AS9l(sirKzW6A>on1HDZo3_jZ_iV>8IyQV5CQ&xP-_`8LorUL$zq8UAhrKy&P$go zUKnXoM7sRkg}`9frk3?fcW&^1)4hos*c>@la(`RefIoSQXP$UZfCTjd0jw+9lp`}U zaRzAMb$_As=eoJ0yNzRKYPidR>pklax0WB>Rry12BX=n<*0*xBnI5W|y?4QLaj`@I zC6t}*eUu_$k@4@gGZpsKvrCfi24vxb+1$C>@rxUNJ6-?f;T2bpRQ++fcKmz;ccv=b zZVuMY>Cb<986!i85H1KH7ZhrMe1OP|-~mgPS#@&Z%%SBoM_Uw;-ZJjf>hW`{gQr&B zIO@M~#24&&ZM=UOcd9JXnKQES`JalXb!W}+nv|rR1OfcRLg5pL3}RVORf0gSRW(@h z%fH7}Lpx!UgLP87g0c04cqzWM&f z|KnMYxo*<7Mc4C2gr}X9`$*-l7 z-^(8Nf%A`rk~&9B04V_*1VB!KJx*Y`Rod^840t6M9{V}(k@RIsDlHQP05HdYaDe%& zzQQ71VSTacu^%{>o23XuxFCSjf>zQLCISsX0A+xG4CFt6gbM<=Rmjuj6#1~Bq+r6P zL-+p#WFUZX^WPkN^pPKIG%Pn7SQGS#0SoMqC%{C-AjZT%%!UL4{IvzHWJW|&3|O#b z$Q3FP=pu-D{|%_Z2nVz&+=0mpZh9ahT;L^Qm?;4ULCS#u6wx_o(52$mzT zG_H;S$RAzb2|EBMyn+rzhWX+sOuW9M4U2Gn$4ynK;D>}C9h0E>>$^<$7isXLVTAIz Qwg3PC07*qoM6N<$g4^E-YXATM literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/old/gasConduitEdge.png b/resources/assets/enderio/textures/blocks/old/gasConduitEdge.png new file mode 100644 index 0000000000000000000000000000000000000000..d46d17ea60918399f15f00c62bf3a1bcbd116123 GIT binary patch literal 957 zcmV;u148_XP)N2bZe?^J zG%heMF=FWUd;kCgJ4r-AR7gv;){RozI1~k7Jx_pO0yqf-NFad@)AxU#e$sJ`o3uN- zo$P_}$oJ=*t1HP-nayUmx3~BA_g#1G|K{fA?(VMdm&<;+UacM+62M z|JLyF@o_jD-rnBWdBv>P>*aEZ1l3}(SglqDS65fai_t>^H}sVoR;%TTfK2(D%?8oS z%L~TcZs%#t!k%1VNTntH>FLRU zum<#7d`*}Nq}bGy8jqkwcrGt5FD@=HR{?RrdagC_>Un)_QM-aMGvzy%083-*u+>E# zediTGCcgX;y_EX!aQaDQ1<|nC-zqUvB1CiREz>Gy|+ho zdOuNJ9j2x&+fh>rINgn5VP36c_l z&(Ckg!O>IE&`!yKA-p9_1&jkMyhHQ^j1lleUhHcPO)W!6L*;JxYXOPKi*2W&tPWmI za!|P&{;L3JhED}A@{;}F1$(|lfw)TlJAw3*fS4irR|rGJi+uRlomW6hJbA?z2@nB| zYXKF1EuhK>fZ(GaoO25JT6Bx92om~#2)I?uujj?PP%KPm6yP%OT7NS0@iLIlHw6nj zjUbXEVmwW>JCg|Y+9K4`jG{ROi)rNwbqcOvi2ezxi~@{{J8)jy^bmy$Z^XR%YDxaO fL87bI_u1?RlaQK)?^h-|00000NkvXXu0mjfJz>8a literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/old/gasConduitInput.png b/resources/assets/enderio/textures/blocks/old/gasConduitInput.png new file mode 100644 index 0000000000000000000000000000000000000000..3202f5ece95e05b07fadb5ff83c8f1d425e7c6cc GIT binary patch literal 833 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 literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/old/itemConduitCore.png b/resources/assets/enderio/textures/blocks/old/itemConduitCore.png new file mode 100644 index 0000000000000000000000000000000000000000..58f042cc6c2c376d8ebe3291e6e412dc015ec7a0 GIT binary patch literal 5659 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 literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/old/itemConduitInOut.png b/resources/assets/enderio/textures/blocks/old/itemConduitInOut.png new file mode 100644 index 0000000000000000000000000000000000000000..945f403acc5dd36d41d9a89e70588c7fceb6bce6 GIT binary patch literal 593 zcmV-X0N2bPDNB8 zb~7$DE-^7j^FlWO00GTOL_t(oN5z$IheAOVhwsu+pvI6r(^AQ`vf+3 zV%>0B5sP5VT~HT;!N5kNkqw7K>-YPCSO|06h5rSIv)Rn%^LhB4PNy~=k558+y*?zyb!{KlSc0?=|i;GCG z*4;3dRKW3g3`hWxP!x&?5QG?KI0aq9YPAXxV7#aR!9C-UM;Jdu>|{pmZ{QkAL!~0$ z%77wSa1A*G@?XV>F?T^Jo-ROqy}Vbo3gBdPIB)D8t}z!i7eGupehb%_i|$nqjhC)8 zyN7GcMb2?bs*!R^KfcrXF|IKeoKsws_Y@s4wOZgEKYRcBOb z=9}?&?b$|;!s#V|lhb(A6Vm2H!@^FKSnF<>ODuqmi2yBF0%D2?&>P^M39+Jp2wj6Z zW05OR2BeXQA7ar*r~;%&fHIi literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/old/itemConduitInOut_In.png b/resources/assets/enderio/textures/blocks/old/itemConduitInOut_In.png new file mode 100644 index 0000000000000000000000000000000000000000..e87240a7ec8305b18be36d8d84496ab0532b527f GIT binary patch literal 439 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmUKs7M+SzC{oH>NS%G}c0*}aI z1_r)EAj~ML;ne^XlqzwJC<)F_D=AMbN@WO0%*-p%^K%VRC^ObG)iX47|LkPWz`$ti z>Eaj?;eK>VV0&wTNb7IwrMUCY} z{a?w%9=0EkikMFwKOJ4LvQar?OH0?ZfQv#}QBJPjD>67mbwR#E7koS60b5go($o1{ S-z@+JGJ~h9pUXO@geCyIt+j9f literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/old/itemConduitInOut_Out.png b/resources/assets/enderio/textures/blocks/old/itemConduitInOut_Out.png new file mode 100644 index 0000000000000000000000000000000000000000..ab68c07ca10dc303b09e6b0814c8208398215467 GIT binary patch literal 373 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmUKs7M+SzC{oH>NS%G}c0*}aI z1_r)EAj~ML;ne^XlqzwJC<)F_D=AMbN@WO0%*-p%^K%VRC^ObG)iX47|LkNARQ1u* z#W5tp{q2-!_SOJ_*5Ci_HIxJeqg_;#lxBCtDOJr%?w$E$&%Cn2GshRzW}iK?&!sI< z0*J~dq)MKAZmr_!v?{#G^YRph8P1jSHm6wFWbs|zq;t~JJv4OVg=v`&8!7`ua@a0! z%U$`}>ecUgraa8wPk;IC`0T{4b=g_7+IW{|E~=cD87UTZeQK-OvDBNj3e~&}Gy5N( zNHe(meQw|5goo9)&EC0BP5JpghWS8$AmjVLk_SQ^nJySN)Vg(U<>GMK&d9ZmwTgM4 zcA;&DBmY7>hbT^u{3FWO4f-B`R=wiRIqBht6+77!?wV&|t9-IS_2gQ^dRL(5 O89ZJ6T-G@yGywo~8N2bPDNB8 zb~7$DE-^7j^FlWO00C7=L_t(oN5z(1hs7`uhR^^1Po!-_PpsFg#W&m-8u{S6dWm$?1bKbxh zkaBjd;zdzB(}@hUZ7WUFn7XTxWF>gN-vXEb+XTOR7lmRN27$isrR%y66U2BIhG3c| znde#P$8j`9G!t45;=GIh%d#x8uIo1#!GvZas)2pq=seduC;f?qr3-f5C!V)z6p~U07Mm6Jo?8- zA?4tTC%uv(s=`Y0D;Yc1ooBfd0^&**17MqA>N2bPDNB8 zb~7$DE-^7j^FlWO00E~-L_t(oN5z)y#{xkV#ryyNr&yv75wS$Xepq6Oi0DJivuAYH z-P`Hqj@oDV**f!b&)j+0ou!oi6)8@M6r(Jc%l@J3-XX;(FtAuG`k%V~6;h0X;KbLx zLyA$Vs!E{5gcPIL;8>2xo{(Y`8+f%^rS*E9@$D2+i~<7)%;1~NCe?MFw%cuAt@{uu zMxg-)N8tT_Kj7P2q!A+i7ylUzjhEohel`vKX&)Au1#jKbG33;<=_?a%w)Cq$~gc002ovPDHLkV1n28_2K{k literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/old/liquidConduitAdvanced.png b/resources/assets/enderio/textures/blocks/old/liquidConduitAdvanced.png new file mode 100644 index 0000000000000000000000000000000000000000..42118471b85eb610e2d6c40a3cfffabe6501c857 GIT binary patch literal 734 zcmV<40wMj0P)N2bPDNB8 zb~7$DE-^7j^FlWO00LS`L_t(oN5z-Nj^jWKMD>9Inne=bXd0bCxX-O|`YV zlH5CMpiai<6|1YMvEldo0TqkIpja%zuaEJQGJ?S%p#GZyHG$XbrA5!@6CRHT-0yd| z-EMHbUWG1~3!KkqIGs*#JRadK0lSB}5rXaD1m^I=;Q&S;5YT3TgYDo1Cis58Hw~a7 zkqDGZCEEu(k<-WtjN0vX<`JL)OrTIG*gpJEavM2;x7)3dNB~P1jYeH3;3aZ`Z#Ekt zO9E~>;5BlBuh(lKaShP~Cg9`8xm?aNEy>MdQCn^|HNm^xu6!G!0qg*uRs}m*ENaVDID!e@>2%CZhz4*GrPFCk z)FhpeBbearc3WOUEMYdAeVdq1ts`;*qgt(&G=K@90S>jB`qRh>+-x?5-VAW)@237F za)LJ+4XD@avIF68Sag6xNjf9v@LH`VuOTLoOeQT+lXOPT;nivtj8G^9KA%q*NTpI1 zAeXMlIlNM-$W4fQ0FQuAOVSxRf(c$Om*wl2{wr30JpOBm64JZi=M8}I4bVb{x0{dK Q{r~^~07*qoM6N<$g4ugG00000 literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/old/liquidConduitAdvancedInOut.png b/resources/assets/enderio/textures/blocks/old/liquidConduitAdvancedInOut.png new file mode 100644 index 0000000000000000000000000000000000000000..5924befe624679a8ac2dfa444215dc0d79906c61 GIT binary patch literal 510 zcmVN2bPDNB8 zb~7$DE-^4L^m3s900DYQL_t(YOVyNJXG1{{hF_wDked?vH_q=1rAjHGN+}gWC{;@7 zO(^|qeY)?Sl}N+s?4FB`5t}({o}Ev1Bg=mVT7;B+l*((jY>&|_{Ag9~v0zTPx_*9_(GsWc}&rm!LojO}3@T&@Lt%`Z>`h{HkD0xYBgkN8EMr58>VTB9}U2p{c5Ba4c?9 zcPeMMP;D0-i=CoOfM*S3OMqo`K#@4W$sH&WfEO7$gcJcd#jYm}<90kHL4aM;k@Te- zlym-kC=meOnIrc;ljUuSGI3b)rCuTc-p<3>2W$nLvLU=yy*4;w&sSpro^JqeXS;bL z?Jqv|AQpn-auomN2bPDNB8 zb~7$DE-^7j^FlWO00O;9L_t(YOSP6;PZL2Dfcwney4%~%%+AhCXSN`XiK0Kk#21Z5 z6Y)jR7$J&)1gk`@QbE8XAP9j70R#!Lpdv~L>MwI>3nEX@Zof3m>`7<8&Y81kCs0!! zE*x-bL1EsB30y22mn+Z8?{W#Q$CFn@QVs%zmH5gnw@Q9)&@*!E|0dVL#9iRkL9f=S zl$SmW9suzu${&S!LzLeEo{adJqQ^kAhvUyI_S9l6q4<5dmj>xF zh;%f>gpB)>q7)K+Q8sM484Zu9IIX)KCViL}oG+P9M-19*+;XRNJgqttiZi6)t{`oS za_J77D~(>vM**7&yYr^Aq@o1{&Qzd`ihF{zIWH*ujiMMJ{2gNRF?ZE+)(y0-!qp1+ zK|y00?loykEGO7cVNtxHd%42_5%aq_q@5CNAa(TSa8k z#yerOYr-8JY%3tEfF%V@>NstYCwW1x#!kne@ZK}N?6NF!f5e<$A@s+Ddph{3f(->M zt7uBcuPoYTbNS<91g{SS8#%%6BZ5r@e3SyC1VKJUqq!7)a>$oliuO#nYy7u@e<{jO zD1r>*vzVrtf;ck;Q`_=5^ zT{;|*jN2bPDNB8 zb~7$DE-^7j^FlWO00MPML_t(oN5z&`Z|g7&M*WjAfy}q;@tVE&-h2FZU3_+VO)DRoZ+`-TfI$3N0kVPT^Z7rp&YwSt$KxUH_q({= zZsK~qip%Aq$N78~r_)Isk4JGh9K?$O{t~S7XD0!$9h|@%zTfYK=J)%*EdV+G{4O}y z4o+Z#?{+(*07N((7R6%G^1@FFaH^cZi0yW3905Qukk98WFLiPRpDHKtX0y>lH-Kh~ zL?Ry>aHE{y>-Aa>i-Av?(5-TUuU0EP^lJzZ49G`dcMX54oZ!plQY;n=;|RQ7uWb*= zN1#GEhtKD8vw(NEK$UV1pUq}w55!_IOAi2uoNDD9KAldD9-v!51rQMHcFIxk*CcoR z!T%7L;FHP3C;-WLJT7v%oMpGj*(rBh00$$+#CI#yk4)1TCHaGKqwT_dw{D(PPK9luU4z( zHH3jgB4JUDoNDD9Ua3@s77PZ3$K%lpNG6jOAabgeb9lL2HYXwG0FHp~7CF_*0Va5< rR5HJg=~waB=>EMAc8~a*0yOO(NzozCZrzco00000NkvXXu0mjfoJ~l@ literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/old/liquidConduitAdvancedOutput.png b/resources/assets/enderio/textures/blocks/old/liquidConduitAdvancedOutput.png new file mode 100644 index 0000000000000000000000000000000000000000..a718dfa1b5e82a599c9a0bae01008a267c7d993c GIT binary patch literal 864 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 literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/old/liquidConduitCoreAdvanced.png b/resources/assets/enderio/textures/blocks/old/liquidConduitCoreAdvanced.png new file mode 100644 index 0000000000000000000000000000000000000000..137593a766197fda2729c264f99e21b642cae5e2 GIT binary patch literal 1159 zcmV;21bF+2P)N2bPDNB8 zb~7$DE-^7j^FlWO00aX`L_t(oN3ECHcG^G?ME!+{lVC9WYPyq!-c2MNz?rjy4%v*~!Vm`%1(O=HDp#}D@caY723FP-Pj%6VQdU!I)RuAF!| zPmAx)(_HlGJUfY6s$QJ8m9xfiGY8-ZnGgUH(Y$!sG^Oh+Q@Ob|)z*zKo|iFRyt*{` zi-yTI>gK#&6J=^ulde`wx>61cV;N89xF?Hyb9jy-#9}@T12A#|(8vZ*^AgMpxV{Sz zg0M_EMq}HY&r-}p1c0fg2@NYW-Z3X!zIkDCn1CXLN+EVlgQ#hIA#)U(&18V`wH^75 zpY{TbX>J23grA8WV_ws!`MfMI=Azz`0K~lA3Ikjo2M|Pl06?wXHuX;1)Br&M79;`U zj6>$0)L2c$7%Ar*G_D}S6ajuIz_8bK0kEy=osMbTb^y?h1&A1XQOB7xVu@PJuOypQ z%t`$hKwzE>V5gfZ1Avj&u(Z_MDgi*3fOWtfKyn4J&9&nFs#gFndNBojMTEk}Tr{q8 ze#{*PKz~<&YOCe0KW+{Ruo;Pd7a$tF*Goih)HH4|!+<~|asloY0Bw-~+=ijX19MIq zyY4EC1pr#@3PAIgXWlj!0H6{8o*nLat~<>+k*vLKek1^+X7o{jfeXMl7XfIVIE{Pxx~p#WeO1)yPQy zjm4bCs^b8385E+9^F)ADsbo?xOO=Y|8&xdGZ;=NQ0Z?-mU<5#$54N{};5`GVL;xD9 z@mH#lm){C<2BiU!L8i`88(9=+c>P&`+JxM`uf4#{23~R)ivgGlz?XbZOnFoZ1e5~A zK7b&4Hv=l|h5`d|ED_)|7Z`sOfIwI(;l6kPd^CQ}X3c3XEJC~wKx@DSi50FF&@aLO z_%v34Pv;qPN(c)i3_$aJMQDlV5XXJNJO}6mfR}#)1kt|_Kuz-$wkwrI=0X7cbFdHK zD*+h2n$s9jNcuS`017rhj4`98Xr4ho*$<$R+tG9Fk$PEoZ9bl8LVzIUIJY7eb3R8Q zfHam-0pxo?0Wi2$0I7aI^p5kLq(6tBCwqmj7gqycETUt@Ifwo3 Z_Ajc_twzbKqJ01W002ovPDHLkV1g;``aS>v literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/old/liquidConduitCoreEnder.png b/resources/assets/enderio/textures/blocks/old/liquidConduitCoreEnder.png new file mode 100644 index 0000000000000000000000000000000000000000..a86f42fbb990a9f37742c8bc8240ebc77086884a GIT binary patch literal 1202 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 literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/old/meConduitCore.png b/resources/assets/enderio/textures/blocks/old/meConduitCore.png new file mode 100644 index 0000000000000000000000000000000000000000..c74e1f1d081b933a3860a503260395da23fcf119 GIT binary patch literal 290 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmUKs7M+SzC{oH>NS%G}c0*}aI z1_r*}Ak29D#}zZ6pj3%#L`iUdT1k0gQ7S_~VrE{6o}X)oLYc9ish**s`)4O}psIPE zE{-7)?r*1TKzSCPh5@vp5;jwtm#XX}s@AtEt(;HZt7?R&y@2I@tlh9XMt@1&i@!O0I zGkR5zpYw2F>SU1izF2D_xCvb h2%K;fIN@GBr}4(JqIKUBdVwxw@O1TaS?83{1OPV=YoGuC literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/old/meConduitCoreDense.png b/resources/assets/enderio/textures/blocks/old/meConduitCoreDense.png new file mode 100644 index 0000000000000000000000000000000000000000..e4f8db396791bd3bbf0047370166a2d5c15b1a75 GIT binary patch literal 4254 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzwj^(N7l!{JxM1({$v_d#0*}aI z1_r*}Ak29D#}zZ6AbW|YuPggKZhkIK8D{n=84L^p+MX_sArYL63Ig}vGx7;*{0Ax< zFu($`nO8t&KpgP-!xILu13Tuy9DC@NscizWzXwf+aW%UN}NBid4UA5B{*XAAsK12*3*>d`)Lq1Y)bz zU~5pn>+no-DN#IW(14R!#w96*f0)KDYnZWDB5 RI)4+$EKgTImvv4FO#rX}Tb=*_ literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/old/meConduitDense.png b/resources/assets/enderio/textures/blocks/old/meConduitDense.png new file mode 100644 index 0000000000000000000000000000000000000000..da8ef2c131b6e9ebfa172ebb16637480a17c95fd GIT binary patch literal 4254 zcmc(izityj5XSeci;aT3VxAt$D+w8%eBEm*@-^@4P%~60t_m-V=E2Ev^UV$4r zF0_mD;nC6e0@??+wuf$}zt({Z#@lOHHpZ0()ie9Ku6^r?lHoS=9<|O+L zixXUoabe;yPc7oY(o+x%QofSL+&E3V});-w`|ani_@&2C6G7mO#R+kYR$DiQj@BIY$EtX%3lk8jVUy;} zZ_dWBW28nEPaF(;KneOTU{E0TEst#xn+6uGjV|Y7geQOijZ;ZhgDu2vl9OxWaphI- zfjR|g4%W$$#y27l@kwkAKhK W?LB$$^~%J*0Y_WA!}m8IJ^uyZT#z*Y literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/old/powerConduit.png b/resources/assets/enderio/textures/blocks/old/powerConduit.png new file mode 100644 index 0000000000000000000000000000000000000000..a1f27cdaaf962958954e4ef7c7a0e5c3a1d654c8 GIT binary patch literal 971 zcmV;+12p`JP)N2bPDNB8 zb~7$DE-^7j^FlWO00T!!L_t(YOQn@bZxcZfh5eV}EXsPzzFxA2c#9|FnO??rb{zf# zQY21rKtV_#Bp@4{fC~@;gn$r22>uIix|;T+6DKzFWLcKn{$ACq>T#l}si~!o(aZEbCCZfYRa9xJ4&4R4SE112YChG&(w}88xI*xh57u7nQ0VK-i+I z4Gh|%Td@#5P|{n3cZz6yd|bmW$ST~TM`IznRMJDHh-%#fl}ZD#5M2ntIoB5rLKB$5 zMFWGj=vTyI=!~)Inv%i9#DoSbS%q8lTCo_q@B3i~GypO%7fq$|pRpLa=XrXIR1e_{ z$iSct9pCPF-a{_;isk)c=^!W`%Hoj>UWnkOka#^Qcz5y+juD#Zg+k%n7LkEfIMt4C z@8z8%&wnS2$1?aJf{#Le=JJ%wGcLYz@n+e5kjdhhK|`+Vo|^#-@Tj;n796;r&AoEH zGZB0f!FMiyaQTyoUrhXF;tvxij{7*3!7-u(y{r_@K=H$%FasD^bV?it>NGHP$8qxc zd>E19YXd~2Qn9xM2kz$bhXwzw2;Pg}n9CC`J~461#1|&c7=P`!yXnv%N?%%93Ju5u z1~h|9w*?1oJIlL1dn$rwLO$nWkBNQ84}5;;vm>89a@?J4ID;rXm&@rjr9Vz|FgQ49 z(1u>?5=FNqTDYNSv)SsJk^yEAEj&tBcjz2Fx-C}WM9*Y0x&ypJc-RdM4OxX7`o&9R z&=wtNqNmg8>Y76B?d<~t1My=4n&_!iN=Jkl-~)9KKNdnmi;IiefEKBvqXQkNRAR+K z=o?C*0c}xhYby-;`}O zq0i3FY6FO7(A(Q<&=$S^SPXq;X2u?JUteGRSb!$_^z^iT7Eu$J0Sv6dExJnOnpg-8 tO-)UO9T?FTT^b8irvcG{o`fbR{{jFe!TpfAcc=gW002ovPDHLkV1lB%t{wmY literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/powerConduitCore.pdn b/resources/assets/enderio/textures/blocks/old/powerConduitCore.pdn similarity index 100% rename from resources/assets/enderio/textures/blocks/powerConduitCore.pdn rename to resources/assets/enderio/textures/blocks/old/powerConduitCore.pdn diff --git a/resources/assets/enderio/textures/blocks/old/powerConduitCore.png b/resources/assets/enderio/textures/blocks/old/powerConduitCore.png new file mode 100644 index 0000000000000000000000000000000000000000..1a34f41e84c1b7fc7afc36f92823ce5580872c11 GIT binary patch literal 1305 zcmV+!1?KvRP)N2bPDNB8 zb~7$DE-^7j^FlWO00fmuL_t(YOQn|UPuo@)#{2KE!H^KCkhrE3Ft#QRBMrfc?{^>D z;agSp!#?fPR;CKAsKB}v+K$n#EnT2fK?KGaw{RPymv#GJ_SjC08xS4g)f4OFoa5)0 z_ltuPan)E> z(BlqP%DW{JfeEYvh70iB8yg#2T3Vvf=%rGib%HuRuI%xJ`QANIn7}GvTtLZ?6tEcR z?(UAq;|Vt?DuGrkc1)l4Ud9ze6~cTfLE(0ozzT-2g}Dm=4XFW+;p=_LAv!b4uyx%Z$Apa2i-;lugO;PVN?0W!X96zTS>z1=`=fKz}_L^qo zd9k&%6$J%jDw8dU(!OrIJrTgNiT?vwvz$F=5R5&`S<}r~LAoYHr6)k7gAbC+9 zAE3YN{Tu*1-6L00NMg%P;^?0^3qUUcw(Z~d`dXZ7Z*KLc)eHZ?V&(bd)U zD3e{2)mH{NFJOun@yEgxGd)Tvrs?eOl7bhadH_naY?7Zv>6`vEN(9rMo*sV*LzNz9 z*;QFREWdHp0E*7wDzWp5Hkx6ugu%D1tq0(OWv6QMJMMb;XO!rIsw3%aWmDA2X|RBc8HDj z>XqgEP3%8S05mM!X9IXiI19Qlg;$|JjmcmP_opB6;<9e;U^VpC#MfB6Ol!#naAyV- zy|>|+q#z0Zd7b73sGu8LYTaU(4IEyMUi`!>ssa;0h52hnqbrmrWDZTk2eJGM}+ zs91u!OobGuJ_~=XP$Ch-^AnH9DvvFv9K6cv2o$~4(SDMG$nKhTAwFm}#>N#Kq+0w7Q_1cs{)-=SoOsHyo6W04DoYOCS5 P00000NkvXXu0mjf?0;EG literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/old/powerConduitCoreEnder.png b/resources/assets/enderio/textures/blocks/old/powerConduitCoreEnder.png new file mode 100644 index 0000000000000000000000000000000000000000..5b86a7e4f8a6e5bf65cdb48a489f92e22bc4bf0c GIT binary patch literal 1436 zcmV;N1!MY&P)N2bPDNB8 zb~7$DE-^4L^m3s900kIHL_t(YOQn|UQxjJh#{G9}waz%;FzmVR1|3^T!iRq7bf#0= znN|rR5)y*B5R#CP`xO+&A_N2!!2~bd0w{=={#AW88zM#q8-3@=&SuZq=XcJ#=XUD! zk@&6}-+x0G4mG=Kd<3BQ?AfzFd~?7ARyET)0FO|1{`~pY*47J$(Ru-YbhR9+{zNZq zRP~kCR+zx5&d>pddrM0TAw){4)&h6ONN9~u455DY9SIXy)fuOdGIR=96kNJ=$!s=T z^{`m1xa;ivOh0yA!4*XfLVb(Xg4baJD;UBS<~jg0bPaG6|8kT6;p2Zt*!2YKPU^BH zxh(++s3$3U)1ogcZ{=lwLE6XFfeF=dM|0lM?0M6TsOe9a1`}Ap5VktN$Pdzo4x;5( zy}T#G`tMUmkvM0mvq+uOY~UYezsK#9+;LyHW`t*63_q45%QCQ{2A`^-k~Uh_0!t?M zR7Y>rgnqyZhDMee0e?kw_n}9`TT*;w#aAMpCE}W+RR(iTanAw|ltpAi#I|K(M<#dG z)GIapT1#x2f=@aI3ILc-0$h(%#|-h56#rU#V7-0hrQ&-^28+aEu_%gyt80b@%RIg# z(r-let<1fX`S)t!gPPgXBC96X3smy zeARvYUoHDT0k$MV#)qE~xQ}iTDDa#P&5@ooTCX#ZCHn*otcc{U4nXta-UOg0#a$2C z$aCE~Tp{62sskR98)@Ztw+_JQw#BGtjz>3S_Mq1M<^V(U45qq!g^sRM|5NImqSqqI zul?=P_h66sfJ;eC^U8)<%fo(Esh$Tp2sC~n+~^k$AA`(0gK2H?z@Gu>mv zH_zi+GXJhg04Az?frnnQu^l>AVS!cVnxRJa5tyHCZEd)@c=6)U12(oMa|g`=GQzXS zN7q<%mqoW(@EIGNrueWhMa?Ru7Op88c_FiJn*7K&v%>pGgx7iO6^rfi@JsHVW8G0b zMKHa5`LeNuAxrLA7G2Z7b8~>ctnfX?O28AZbzwsJmwEp<#S#Wz#@Nr-+B!Nq?Bg`J zA`;tb{%w;f>dVRDB{{Y!l6yS0FOsiCWKFndc~6`go%qesZi^9jk)!#Uz2-*|)?xpW zM8n~pKG4?#tY~QLz+HyX2>{lN-W2gIU75m~r@41dgjQs1Lrw4MzJ`)prqGiPN8w8VTUZ;qZyI@|jh3`qmzK;*yt!h%g;;&;| z8^~jG*RQy*RY2*a2}0Z9e$1wi-)F}bi!Mv2)pEshL}trRNB=g+YVE}MF`GLZk1Z!0 zybdMmlB(dxsa{!10h3P-Uij4+z@lqN-(eg*8S1JZ9gpg;wEDuaM@J*@2%SRNHwH}V q?ud^71X6}T@mGi8P_sjvKK&nNbmg0ZW=jMB0000) literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/old/powerConduitCoreEnhanced.png b/resources/assets/enderio/textures/blocks/old/powerConduitCoreEnhanced.png new file mode 100644 index 0000000000000000000000000000000000000000..4e3224685acf62a3d9d6727d7dd532046f93e76a GIT binary patch literal 1446 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 literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/old/redstoneConduitCoreOff.png b/resources/assets/enderio/textures/blocks/old/redstoneConduitCoreOff.png new file mode 100644 index 0000000000000000000000000000000000000000..c87b56bf1e3764ed398dc67a5b31fc375dd0e50f GIT binary patch literal 726 zcmV;{0xA88P)N2bPDNB8 zb~7$DE-^7j^FlWO00L4;L_t(YOSP6+j@vL01^YU3V&ubs=1kf5ecuygIdjS?yVFBb z^D$0{H-aoazG}8SFk?E7&1Q3D8COpjCJ=Q9ou&i8^zC+g?c_m7W$Xcb0M6WQx0~nr z>^SB#K8&@WY_%+zXF`Y~P{tkrkVo$$K16(s_!RLu;!DK0k$BE59-R1D^)}*7#H)xG zi=Ib3jUdo{1b=J_ELPJ|rhh-LWN5=L0KJZQc?3L*Akbcg<+C-)K`f)duO*m{8#}lNkDxE1Hixi7L5UvlU+(iBc9j(2Mj* z$rrE+z=zvS$PgpR8y{-O?puEC&yzL4kkP0~M}7H^hX8!Z$oG-3yyu#o$@J{L<&OdQ z8itrEANIAIp5>1L_+-#i*GsC(=Xi$cmj7r7aGR{@F;y9jTw;1QhxCU-04Cg2{_ISqj{*27B$pAP%r#V{2mdhr-VlHTYlB%+6K&s3zkdNh ziILRHsf9;E&e=@a-X-JJUq`#)$S<-Ly0Dhw}S&L%j znyRf9p6TfCkA5Co^s%6lYFxe7)<=82QI9Qo@WO=EHOiDm)nIfj{N|E=y&k+SI69s` z8Sd2_AXCfivS4_0lmU=UF?ZsyGo~{R0EP?(@JkO9GJTq+Kc?admk^<&;Q#;t07*qo IM6N<$g1f^)!~g&Q literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/redstoneConduitCoreOn.pdn b/resources/assets/enderio/textures/blocks/old/redstoneConduitCoreOn.pdn similarity index 100% rename from resources/assets/enderio/textures/blocks/redstoneConduitCoreOn.pdn rename to resources/assets/enderio/textures/blocks/old/redstoneConduitCoreOn.pdn diff --git a/resources/assets/enderio/textures/blocks/old/redstoneConduitCoreOn.png b/resources/assets/enderio/textures/blocks/old/redstoneConduitCoreOn.png new file mode 100644 index 0000000000000000000000000000000000000000..90fdbf2bd1609066597628abed48b2cfe2efa58f GIT binary patch literal 887 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 literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/old/redstoneInsulatedConduit.png b/resources/assets/enderio/textures/blocks/old/redstoneInsulatedConduit.png new file mode 100644 index 0000000000000000000000000000000000000000..44b48a863cfcdd69b55f98e6731a145d77d78172 GIT binary patch literal 761 zcmVN2bPDNB8 zb~7$DE-^7j^FlWO00MPML_t(oN3E8}ZsR}@MEOaIfZ|O#+>~?9Imd4wyGZo1Io8?~ zH3sTLNU!=$b7aly^$MTQC&J;d$mjFo`FtwNWvngw7$WdRN+una#O4nl)|Isz310Dc80Fo*B=dtupu zPYc*l4lu!YyPZ)02?m27EumfI1V*;ot#Je>00Y@<_T`uVmUopCc(d8)(G6e;L!r>y z2An7-_tHAUWXrv+qquh%mk(9dx)nX~|T>|QMLmdjIf zc(>aX8ZIG}z(tf!r!CV`-nm%hEq^sN!8@IfVF1T~0@wjQtqitvvB+C4!vQ9EyWKW! zLKMJ7lt?5jswpa!15EH%t7RBKu!N~p>c_-0{RYcC`F}m4zE_L=4%K8u~^KanxaxUhgT{Uq51uO z;c~h30`Yj<0_0JpoWslIvUwBY9>5XsX(=j|15EHzsbmzOf5~8gPb-5}C?_ydEEdhT r00poETs1{j?z8~G0WK5@-zkVMx#bRn#VG0+00000NkvXXu0mjfFQY|u literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/old/redstoneInsulatedConduitCoreOff.png b/resources/assets/enderio/textures/blocks/old/redstoneInsulatedConduitCoreOff.png new file mode 100644 index 0000000000000000000000000000000000000000..e272fe23a0e0a55e1d6b2a7342f093728fa4aa23 GIT binary patch literal 1832 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 Ef|5ol$N&HU literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/powerConduit.png b/resources/assets/enderio/textures/blocks/powerConduit.png index a1f27cdaaf962958954e4ef7c7a0e5c3a1d654c8..c0b840f1af802a80fc9a9be912136b9d26017f43 100644 GIT binary patch literal 1246 zcmbVMZD`zN98Xu;x!SJc2Y1SSh#8x!ESHx{a+i2#S1+kOx4YKc$!;G6pG%%=Lodl) z^4u<06-En6$DE`3L5D+_`emSFL$GeB9ipA68|s)a$52F2=O)8K#ZBgu_OAM&?1O>i zdHenTzyI@p$@EC}(VnjRx(I^kNe`(xJd(kC#~S>-8M^ug9_~e20qt~3s19663>Z!k zl4%Q!!W;xfqxu<45JY>`%ok80vqRAxD*^&c#J4J#O%REGzXJ4eh{z%wHSHwz`>Bs8 z(lnCPE-}MqDk(T-4o$dl=R`KIPmJrbLG?dOCVT}Oupk1YZEEjv}njF2hEg`^k}X`SUcGA2hjQII)qE6KB5l;K#0muZeugqXrfWb>i0nroDl zoI2Rl!mA`ThEPRen0mb)sYfG@JIZjfEHf<6@H~wXwAZi^@M+uI*s`EPPj}4+4R_<$CZqms&|Bvy-RE8Mj0Az<=$d<=G3YuLxfEi> zTt&VZ(?uXiGA);c7|jDgr$JnlXgz93@scbGF`lEEeB=Lyj=@ebL7n`kZdzNo7=!6b z7vRN8A3+;8kBhrx`0OjVL)+TZ>OkJV_}dewdZyUBJ~@44YI5I!eQkxkRX(%%4C>yd z&G(;M4By%D*7VStnc)lH{8FC1b@;*0c|RAPpF4VV^6#JTe&*G)$F@0IdWM*FYyOnlch`D$sZ&2Phb47*T`P~4ume9 zSMuvmd~r{2SLgHH*0+BRJv(P+jfFoFYcIcQ647c&Tskp~mascdaX_h3y@^ZJor{7o3wjt_*Jv{y1qZtG@HdQCU delta 949 zcmV;m14{hf3CjnNB!2{FK}|sb0I`n?{9y$E000SaNLh0L01mtW01mtXmArCE0000Q zbVXQnQ*UN;cVTj608n9RZgehAMN}YmGcGkQF)>H;LN@>a14l_jK~zXfrIkr<6G0G# z{g>h_%6iMbUb2UHiznlmUdDEI9R34RBu;QZK}aAZARC;33x5y-gn$r22>uIix|;T+ z6DKzFWLcKn{$ACq>T#l}si~!o(aZEbCCZfLJy6nHgm;Q)e0*HPF32j}qDNyP zx>V9brig0Y1C>exu@GGd!8z9#4MG!`!9@duw&+*HVt?q2vFe(V!NkOb1}j;GTl8A7 z7`pHKVFxq-GB6iSrShM#7`o?qdW%#K;S9*YpbZ`0?s(oqF87M%{bK1LC?3kn&^c>;oKIHfmJxwj&JYfog>eGCyU22_#lFhLVo7*l*=h)X5quNDcP@W$`ICuXO#Eiz4-+Sj`#6=s zF`@&#tQ5{b@x!1n0~lCzN*o93G%$3>aq{_m7?I*@14N`!v9|>W?&k7`1^=xG-izRv z%M&g>F>%Vo7beaaf9<%t>ChlbUs_rU4afrqG=GCjw*?1oJIlL1dn$rwLO$nWkBNQ8 z4}5;;vm>89a@?J4ID;rXm&@rjr9Vz|FgQ49(1u>?5=FNqTDYNSv)SsJk^yEAEj&tB zcjz2Fx-C}WM9*Y0x&ypJc-RdM4OxX7`o&9R&=wtNqNmg8>Y76B?d<~t1My=4n&_!i zN`FU$8Q=qT5I+_|LyL=x+JF|RqoV^Is8nLbLg*Vxp#g1CYilbE`uqD;DzRcA`ohA( z{QSH&fN03*K&28Z7DJz#o6~NCL diff --git a/resources/assets/enderio/textures/blocks/powerConduitCore.png b/resources/assets/enderio/textures/blocks/powerConduitCore.png index 1a34f41e84c1b7fc7afc36f92823ce5580872c11..35537d2e55bc4a852736f644734ddf1d8004b714 100644 GIT binary patch literal 1911 zcmbVNYg7|w8jc|ctHw$ZQB-hS?r7VjcZS5{ysZ?97C`h9Mt1b2jV#NyrR#{59tfh)0Infwt#(`KX zl7<^`1k258!Xr2wk1WEJ!lWd`D^b!aLfjaU!%DGi4kseYK_TdRoB_;u8evlj`fKV0 z0D-9l$JTXx@5MfeE4_fe43^HDJXV1aMe0ZFZ$YC3tOD$r3s25NE_g`h?vQ2MkQc9eRBmXm5}h(u+2UeC^lqb2SSM<5h%7=-S>KpwlhZj zzizw}Z8zmoxY&r>$!r>B^I@4kPG)2G`$BFY>y2_LO|VHpGPNX{ZN+U&tX3spPed4j zDN!?GHe+&`5K(~PLIo6t3C$J+6UyLl3`D~~nOq_nxAQK(G+ZK)f>KGeTmnImE=-|Q zNYqlDUJoj?dJPDVb7O6G2C<>|xHiFRk8$DOPTWm49r*FG}UA*lh+{QK!&34JmjL|x_`O0Ip z(I&^8%oXif?Vwk;$1!bljObF;rFk}>XTHi})W2Ng+_HLGM6q^oYbaUY`azgp4H?_Am-%#se`B44hGyWI?*a~X?B2^i={odll3&|r`ik6XRkCw)I;JpAZdT+GA~OD{JeB%zjfk$id&8%@ z#M|o&V5#H}hjVwf_ja5={B7L2*liPd+~O-Ih=QkaQ;P+|i{_q^v==nNQH5tK^NKd& z6oroSHOmcGnLD=>5?jUL^p-Lr9feiHh^v%fgw%p_!X z+WP#>o0yv|WSP@&RDH)QKPsvVJFu!Wd>iTa{;f$f);0`A@GqXe7JMP_;(c!(1yL2P zdLo?5&F%f=b5phNPtFCyzB6{oR!+PzQx_m0BXc*mPU-iypXw@_nCc(gQnILE|K(+E zPYS+Esg4QVKYN9L``2gA52$ZX2x(e5wBXam%7x6@gt(sl%S}ENsmsbVmz(%^19ucX zD_)a)xV7}Kjy@o3YvoNk(!KpEx4Z`UBFpb9;Uk{+4_LEiYery@JnG!q z(2(WQ)AvEO=dqtY(oNIX6qy>}Eww2h6JKY*59cr6c`{KS#7W~<&el$ufk#~MESZ?S z`7aAOW~BV@)X#a1clM&-YS+ua>%M11Hv(=?==r`g+DO*^qccvC7#P&X-@4>!TI$Q( zyoD*j1D8aRm6H=()Q6>4s$AS?gRz4=kh*Tq;qXdOn~6e0Yt!2Me}~KY8BhYx*-6o<;k6YJ29zYl}jkZ1?)W zqhz{oHIEO@%b=!x`LN^t4FQG0tJFl$C@5%J>3yP*KNuHs&sY88o8;EQfGwMzXYKfL z;8|s7f6C>@g7ekA=NlRt`o4cO=Z35E;F7Gz?LHpxgw6(SW?)9})@3p8U!kx*a%W1uB2)ghT4ly2|Yv~yj`@Gupc;n2Q cuef|pQbm8?Z#&92yMKkTI)k=K{c*v60NtJUumAu6 delta 1285 zcmV+g1^W8;4w(v&B!2{FK}|sb0I`n?{9y$E000SaNLh0L01mH;LN@>a1eHldK~zXfrIzbY+g2FH z`|q&9kPxYmxTX^@wk8fE4Z(@;cOTo~TUGVLKJC+1rV6d7z<;_G+K$n#EnT2fK?KGa zw{RPymv#GJ_SjC08xS4g)f4OFoa5)0_ltuPan)E>(BlqP%DW{JfeEYvh70iB8yg#2T3Vvf=%rGi zb%HuRuI%xJ`G4L$QJBCgU|c}SkQA^O=0$Kwe%C@O(gEOtzv_Fl#nLlwe&Dna3P zn7|5#u!Xq`01c@Dj^XQl$ssy3%CL7?Zh~be8FqqUe_)vJv&@}r7FV>*5{HCJ4Hmz_HX9N6UIlImv7`p%%WLA{F8_3}2 zgMlhNpfgLNe4v|eO{;pqjxz`qEoaprc~Kr8pnt#Y{Tu*1-6L00NMg%P;^?0^3qUUc zw(Z~d`dXZ7Z*KLc)eHZ?V&(bd)UD3e{2)mH{NFJOun@yEgxGd)Tvrs?eO zl7E61qIv*Iv}}@}Md_RVG)e^1o}M0m2}6}0XW3O*JuJU*)c}gl;3~26iZ+^Iu!O<4 zt*y=M{-m?Bb39G|DoPug@zS*L#(_}{AY7%PR4Iw8vDl3(sVSB#DB89`4vGDS*kBwO z1WVqT0YxY0CgD9ucsc>VnsGDLj|X>IGkz0lE1A7$q!7&E^!Kr|+=*(SF0t0yj z%4_;lMV*%9`+_*h3%H_&r2|!KJ3O4;~$s`!JSPr!ciM!2l zBP{zZ!}vn`Hp`82rD@m)(Q|{QuYMnKhTAw vFm}#>N#Kq+0w7Q_1cs{)-=SoOsHyo6W04DoYOCS500000NkvXXu0mjfdwE*W diff --git a/resources/assets/enderio/textures/blocks/powerConduitCoreEnder.png b/resources/assets/enderio/textures/blocks/powerConduitCoreEnder.png index 5b86a7e4f8a6e5bf65cdb48a489f92e22bc4bf0c..774507c9bf388298ce968c9426bf8d98f30813bc 100644 GIT binary patch literal 1931 zcmbVNX;2eq7>*ISECC&*ponW=ELd`EP7;Fwk|42M4XAj4Y_c0jW3nMxOd@I#7y-fC zdR47dr7D7G6+xIpjaaBwQR794&>{#r5w+FQsO@G6Dt@URNnM(hrdX<0@L;lV1|Tr;aRLp3L4ZlKSZm;$qR6j#`S{$mO(O%ZO)zy7 z`HfTQi79{x)gu6#%BCpj3=rV*s34og1HlM@K?j*MkWORpC?LpZarqzzc>9oXH9f54 z%fxYSweVFGIS0dZd>YMYG*XRBDyq+>fjl0MMrY6%3<_>RF_^U&WTI#dA;Sz}#Guft zbeIa&0xm{Kj^<%eWZcs?SJ3DZ6W8_HilfN*2^Chse1#m6 z%V92u0`cgP6duTeDRLzQQ#g!Bn66;aIb0@lnCE?XE}PEgahT#5E)xVn2`iSzh!wHf z3{ec55yuqMhp|$v0fV#(WLR5;Yrn;cK8WRu^azBZ`ZN?>JX{4SIVgr2a!?&05&>az zRazJ|8p2%}dUIhhqE{_J;5a?10bYlguX>L>#DJL$rb0pCFy)aH7Q*6EAQ0qHV5L$H zD>x973*qj+!NdPIbTr&4nyXI!Q#Zp~crm)B@45hAyz3)Gi#LxR?~?Ky(o?+o>ZIbB zG*idoIa2LJ(C;oMq^-dDa&fT$9g6~n@W#9@N1D=tP87Z56to;E{m;r z>~#9%rx%8IFzuv8JCdP=AA|Dk_1(>+hwitCfqSBxEf(4G1JP>td!9ycLu#4N?3jqQ z5f*Rxz@AYd$wqbH!mYN>{Wbe?32s4aTg-OdASfxsSE>vQLVrfuugK>&4kU;FdHAZIVvN1C#3A zh^K0I`Ziw4I>#D4YnoSW#_HnLjjcp+?en5_;Utn>3Z9Cuwyv_>KfIOI!yQ_(Yr~{^ zj(x1bE$&ok`Fx$9C?#}DX@GLlg**cJU_mfE?`oL68RDGme=a+I*HVifJ~7rIar6)# zwmT%tw>BRaFDyCF4$mLYsm}9=?+1)5|I@cwH4@naTiVo`*%souuOQzignn#mXR}0E z>D5ioh@E!(;xe1($Wqd}ag=!8K(@?&&sMmwJ;-fxIHQx%`=hp_=76RXUjA5M%P#OY z_1G>owf(f@#+cv)U(uhrKuScRS;!VwAf`?EQ$`i6HdYC}{CuM~Z&X&f=k8o32Xq(5 z5HnW@{+Q47mpIne6bMSH*t?3Jo#8 z>DNYsSp~g)grS;kbL73=Bu-t^St#h()C`%eXh$!CE~xcLn6O z4DGF6_v!DeZp>w@u#xM_51hZy`($Xy^jtqcwAY#P<6d04Gj60{!AHTt!H*=98zU~1 zWH{ToD{fg!-S-U+4&GkN4=n;LYl}IC{_fh$R}<~`SDFWXM%GtO_pQ7(v7t1e>=(aa kM`i!BT`#FsuSNwBUjF^)^0}2qzHt2>rII9ZZERNIKjJC=g#Z8m delta 1418 zcmV;51$Fw151b2-B!2{FK}|sb0I`n?{9y$E000SaNLh0L01m+b01m+cxRGn^0000Q zbVXQnQ*UN;cVTj608n9RZgehAMN}YmGcGkQF)%Rna-jeK1sF+0K~zXfrIzbc6IU3< z{da7&&N$#O?78j+9a~AlhkodErc>LQRtX{!5`wu9l8})56@L`RA_N2!!2~bd0w{== z{#AW88zM#q8-3@=&SuZq=XcJ#=XUD!k@&6}-+x0G4mG=Kd<3BQ?AfzFd~?7ARyET) z0FO|1{`~pY*47J$(Ru-YbhR9+{zNZqRP~kCR+zx5&d>pddrM0TAw){4)&h6ONN9~u z455DY9SIXy)qfeMkTP@%SQK2kbjfTsTlKJ5thnp!{7gS~UBMMa4MKg3)q>Yy0xKB8 z7UnttG;|Gc6#sIQ|Ka0*N7(fQ>rU#jCAlpD38*J2defpWD{tjxe?i*E)qx4saYu9B z(d>ECji~8Qmj)A9!4S4Oz{n5MhYq6USG~L^!}{-2M}LtxXQ{JDozraKA7;PD?UUSb zU$|z3XI>0HmLtnDu%ZT^s-coLTGj$fCihfFZ`6c-zzT*&mKp(nMRfO}N5orFd}YN~ zBAzAUnxj<)b53#30uPi$WJAQZWnxDrch%G@HT_ykY?^{kItB^=m`?&+k5k7C@st$* zT63S_Mq1M<^V(U45qq!g^sRM|5NImqSqqIul?=P_h66sfJ;eC^U8)<%f zo__~l(8xB8R48uTi}YrWAp2ciT?XLHnKRvE#5d35TQdKyNdP9Qdx3{uvauaHR$+lv z=9-~K_7Rw$ZEbD1xp?v7&;vHMCUXbP0y4t0$Vb;$beBc9S@0PfoTm7&Fh$KOr53I! z8hIhJZ<_qbH?zX~NQBpU>=ldc^6*RUo_}NAQ9VU4y?ptyv4kN@?pYRH)4y|bfWEBo zJ;qAF6R&k)Liv|@|2V}G24BY5&)3>IIy&s*G`J!X+iL!8lPT)U$>AkAwkeW(Jhd;9 zuSH}{xMz7!oEn|@&Cza)5qFWJ`I)`uM-kRx|B^(*;hsLw*8{9*XzajUhS3QC)_;uN z6!9%!2&wuPZgw8@=jF%~8LLRFWtq1U%UNb$jjl_~tlktwWia}(WO$J$Dr$XRVt?d{gEQKftGe6ZZpbQrJe2mg-Wh)|TRZ z6+<2~3joyjFL5Yd`6|GzjOJg|qJQg}v5jP)JuS7X#n#aY>75m~r@41dgjQs1Lrw4M zzJ`)prqGiPN8w8VTUZ;qZyI@|jh3`qmzK;*yt!h%g;;&;|8^~jG*RQy*RY2*a34cP{;eO1f zkKbp<7K<)Rr`2-Baztj!Pe=bY$ZGAx_%WM18;>m~9J~%C>XNG9$EjXfN&%Bk4qo`x z8Ni}zNZ(-`JsIk%A03bCu(bNZu}4QE@Ccnk**6AE>h6e-00dHoK=D_H;ZU@ YW_0D7f@Vtu00000NkvXXt^-0~f(WOp82|tP diff --git a/resources/assets/enderio/textures/blocks/powerConduitCoreEnhanced.png b/resources/assets/enderio/textures/blocks/powerConduitCoreEnhanced.png index 4e3224685acf62a3d9d6727d7dd532046f93e76a..52cefdec03669ee092fa80429adaf0d17e7619b9 100644 GIT binary patch literal 1957 zcmbVNYg7|w8jeaL1Vr0az)~=b!a_00Ozx8=+!EA41Bh8J3WdqcU{XjXmw{ZMTLdi^ zX^~plir7=YQWcM`+GBMQU0E!LVnskjz(r)m+tw^#4!q!%Qghcf z7ht_GA#>%xOQ+J*Nh}3n!C69%kd1;oh$V(OkWc_a&}tSBg!o(tYSEiWJz-?I7!fUzPs#zx)0bB;nAGZ5#766Eps0{>?TCpBaX_xY;JVifYb%+I z|JRMzT3a;^6V6S>twg>BrSg%pat=(z?ze?phLktbM2ntE3X-QJ(0l`KBvnc|K%HN+!j@guIZ~Tpcb$C2scvAW1+g_6XLt;RP+6y zQbud+LwPBxPnSYVCR5rPc01;+_`-AZDsS2R3UT}1aNnP0^CoDV3%cgkmLEh&S$O#H zwkrpx>f$B*zNv|c-a?|P0t&3|tUrF>lYm_I*|6X#sM`Ci^BZfzR0hY_tGDbz@yI>0 zeY7Y7-BRXY4TO~Juh^M!r83|Dpr*aWgYz&nIp2BSEUl}o>OsIgPjbLCJC{%W-fWw$XILswN!Yxeqy*dJ?CoI zt)Dd6i5HLj`=0tMxX(TYZtWknf#MbpbWVNM}^@$V0;l8pB3xgOthYDI0ERB)GtsTb zJN6IL6AL3hn)$FoAJ-gTatscNf1r2Iia2v#_1)2mcS{qNi@x^|etGAK&Fy4M=D*r) zQT-RrSLcU$(oHHC|?nO4Rdsm!b=SXkN+Q!V9#)U_(0u?B9*2iZ@WB;4`uC2$f zF@t%xA2lcKdUo6vGM(~k8l!IENI>a=pgQCTkrtI(5pub1Aca%;&(4N4lb7rt!iHMs z*iV7Xyl{`$XKx1&FFz1nyg`%Ucdg1d^a=CJbl~q*1HvND>N-Y(TWdH3k zt+WPR^g90D=K}H+-DBzY=n$U0aZSwppr_*0;Kjn3yQjy!dM{1IbsWj)xC4~mb+$#w zWO?C#N{CW#AC{NAd!t#mBmL*m=g$MPPOt1VKYiG8qEKuc;fj6!{E^Mpc_%cG_rBju z^JKWV)%Ut#q9^nIo9{dP8LR(RU~G>+vJ?2=i`rj49|oGH8A~SGw%?4L$Dr*WyLEG7 SW6hxJ$Ek`H;LN@>a1tLjAK~zXfrIy`O6IU3< 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 GJO2S>y|t16 delta 958 zcmV;v13~=f3DgIWB!2{FK}|sb0I`n?{9y$E000SaNLh0L01mtW01mtXmArCE0000Q zbVXQnQ*UN;cVTj608n9RZgehAMN}YmGcGkQF)>H;LN@>a15imsK~zXfrIqVX6G0Tk z_fG;5Qc8;y`l3%E%pIo7 zP@rW`Hk&51{hfQyo!QlHa#dAT;a*o)7Yqg;l&|^u`D`{jcdAS#lTN2+XJ>U?*MNp@ zaM^6OKp-IgRE~@WMtUlhVjV~WbZ`v=Nhh?Co=hfL2RtOEat(l1=!BN^L?WS~@XE?c zvMI|zq7^!!iGMybGs6tn5V&eNmi&j-rys?&wA-Sux8gBE z6McMqoEea?X1CjYKA%!J)sEHJbEm$0Yw^&r@})6<D51WJ^SXE+i~JCq62-G zOPm8NK(vb#Iwg+P5)CAMbaZrNWQ6S^7{CT=7&1EGsi?b!8LTy>-qt@nY*_y6$bW5G zJ$9}CaBu$d(3LxMrMEqJ%t#*|9@c7VYK#WxpnvFY!D@6Rl-%-V-}o1H1510s<^9m( z_u4SrV;#EPP1RS*H z=4NBzMmj%3XXwV=q7+W_fq?;y&=C570cM~SF6rkFkwhzWpo!k!-_Ldt=oAzVn%nI* zAAbwbMDOeC69yy<+3WS1kA=`sZ*Q-LuZ>Iz9l(I6Vk#Cw-{BIUOcELJR7}M}^q!uc z?(XiwHyK%3EEddwr(!A=N$=|F60ZtM2^~0{PV=!ydS_>+IB1vz-Wf1(xm*&h&`Xa+ z(mOgj#0Q5`!Z|=h=3@bx=6#xJL07*qoM6N<$g6J`@RR910 diff --git a/resources/assets/enderio/textures/blocks/powerConduitEnhanced.png b/resources/assets/enderio/textures/blocks/powerConduitEnhanced.png index be4daac1a5533c46c4ef2f05e9e4be2d54dc5f5c..b9d3794f668742e3a2aac322348600fa4c053b07 100644 GIT binary patch literal 1248 zcmbVMZD`zN9FKKlQk-_1({8koWumJrub13ivOCx7r7s7&dS0(vorrxdd9D|FdATIl zOUq=oV@Qjjuwp;h`oYbK`ye`DSSn1I%E|;~9SC#IZ7>vFJDqii8|stxuKJ?J{$28Q2husb&`9 z2_5voGz98kaTZ1}?Ea#b>2Z6KdnCowDd5{so^ByDhDCOJ7Et=3i)UedYuZ{fej(yPw7*o`eW==mOl+3x*?kQDTW#LUVtcCh#Q_ zw?9fOJJpj+;c?T3xIhV{!f-4e5-C>TMV8%(a||1xS%&6Bl4T`6B(Xuf@(@VPR&!EX zZmVdaRg}oPt|ifQxm>2o0m`)dXjT+On&D`UBasE^3>q%*NWiANK zC2bY?Y)BCR9~4P3$A?G`@CpgSLXcDfYA~D=1wO>FLDcY}-|I|%&3l*b3 zUFia}Sm`5ZpyshrmyG>!>u(IZZ*4-3WxR_wx_50HVd}nXK6YsAt*6#qsTsfg#hkY_ z`s$grg%4_O6^{s8#y>2kz!T4ZGJ7L;lD-2=FC3bPe6``t<$ZO!>=Wl%a)4P|kqr>m? zj<=ut-J>=fuDd#Q@a~nVv)^7H-8Dt#I|lyRJ3Z16d2sTT@cA!)y*jYiw6J$F@!CSi z_anuIGZ*%EJ>+dWP_wc9Qup|_g#*c#n&&28fBVJm&DY-B3^u9HJ$if1{L7&JQgYMc zvC)ry{H-Ci=7+%8iJ6;sCZ_iM`SFp7+1NKFRzB@okM&}w)cpLD+Qk|FpOa|ql;3aZ G9r*_$eX;cb delta 1006 zcmVH;LN@>a1As|HK~zXfrIkxhQ&AL! z`-^A`^tPqN2=onf#2a~oyo!`pp|lV%2sBt8qNp(rOmyH}6Mu~fMu%V#M;aX)2ekMD zc*J$iz8o*d(t>vlP8ghiYwxx9Js1iL3yX`3ahlC$r_)(kSvhlc#pCf zYD7RwbV3XI*nilV0dx`!91cfyb+!8Id=hAhPH3W!j*c<|J_ROpP*qi>0&+?!T%r>i z8W|Z;w}@s?Qc{xFfTxlt7D9))3?`Ea2B2e2u|>HJ1X`j?u@HTjOC2&!2p#0uBB^kR zu8oE0x46_HlMRNPwF92Y6=EU!(9lpQ6jDDl>LBZy3V*aj&k>8D4-O8p4yb$xGmzF) zDqNyp6pNq_3=F7S1UgRbn(|csGZsPb@9#HYdB^~pT3T941_CYUxbSi|_;K0yW!<;G z=G#wtKd*T95}v(9cWS|%ns;qSUC+aQTq88m`}+FS4-F@rutkADKq{PS$A!0Z*MF?q ze?PJxK7X_wKCoprt(kReI;o@+N_t887FS+}owz2@P;YPVxwnX(imb8V&WCyXuMP9* zQ}gK)^T}h=$(HGO(|EjYJi1$OlqmQ)YupYixJGoKZ*sASfJQ#>pbjKDCC&`yY_h>U z-QC?RBGBPM9r*ozo{GFJxPSI$_S*NP4f$lYteN}P%!ZO)RnjY# zgJsLX9n064<<+nQ*R=Gmt}X+;Lgaxh^7(vOw*_}zOb6aCdiIj;)QT&WaD7^;*j=dD zyH8yndS;6Wk-{b#WVdP744>j0uHve|4f5NL^h`B((KzP|o% zL}cK0yYePrp#|Z;`2U6h@ou`r~7D7X{wYBWIW*PB5FasE5jRm@-0nvf3 cfof|00DPXsOBU2hw*UYD07*qoM6N<$g6$5=XaE2J diff --git a/resources/assets/enderio/textures/blocks/powerConduitInput.png b/resources/assets/enderio/textures/blocks/powerConduitInput.png index 3202f5ece95e05b07fadb5ff83c8f1d425e7c6cc..af74d1b9f399f9f475a22c3fc8572a433277340d 100644 GIT binary patch literal 1077 zcmbVLzfaUq952X#BpBj^PR|kz8hh<)d;JxTA6_}R=pi{S;o@|!?K`f4_LcVG9k3W! zWOUFtIFJxm6HS~Pl*Po!M40>wjFIR{Fws}ILkGfOllJ}S=kxvj*_@fa-QRb)kK?%h z;*?!xD@fnoZub2(xWCPoOLVeIXGxtlQH;3>k2n|<12m7z7RX4f{3v>Ze*+#A$I{&;NW>b%<(_ozT<)K<@mX5Nh(Eo-0-JXV?4V$U2#_z zT+`#nM!`tSVg>?C5oiUAVPds%{E=OY?bBOjDx7e#&WxLS!#ZEcCL1|=(Vzb%IG?fgA=S66m zrYOmxEDH=FBr73BEg?*XIu>l4xUnBmpM)T_h#ay^b3BXmIE5f8l}-$YNxM+2WMT_N zBFso)5Ttn>p%Yrhf5SKxom5sLES7OXmSdOoqdwFjv)Y~QC;w}d` zq(wW&vp*Tn_bk^zj^pW?fK15{OsIN-Q%9bl$%ZGns-)?P(y?*N|%@lUOXirpHU!1+&U3cqh z&Dny3Z)$t%D45uJac5lpIa<5&X@6t*!eH^n_eagco@cMN4{ANt_fv%@o6nzK8~8jr sywUsh+j;wNZRW#HV>D%VU+fxx*u{a3fi-FK;BhMC;^egb@>XsA4H;LN@>a0=-E@K~zXfwU%2?6G0S! z`^?_D+uP2}&dy9{wjhm(qCdjK7mY>}@kP)WA&P(mt3<9+L4Uv^AP9j70R#!Lpdv~L z>MwI>3nEX@Zof3m>`7<8&Y81kCs0!!E*x-bL1EsB30y22mn+Z8?{W#Q$CFn@QVs%z zmH5gnw@Q9)&@*!E|0dVL#9iRkL9f=Sl$SmW9suzu${&S!LzLeEo{adJqQ^kAhvUyI z_S9l6q4<5ZC5&X?W zTL%29g7pfxpr8pI_gkd36hS5~<_KFwWYfkwVYF+)9UW{dAgh2S1x@NWZILH=L9WJ5 z$Dr`uGrsJyEOLLuoL?dI$Ao)2_^E;o1uUy*O2@A(+Gcb4<6;D_4+I-I!S5r2O$B_E z0;2>$K7U1{xfFeJ$d_D-_Dr~I{I`OCDaubMf(+xcn5{sv5yjsvv~9pG6?|6U;;}s_ zRNU#2lZPmua@e9x)z8fS$p8QV07*qoM6N<$f=e5100000 diff --git a/resources/assets/enderio/textures/blocks/powerConduitInputEnder.png b/resources/assets/enderio/textures/blocks/powerConduitInputEnder.png index 3202f5ece95e05b07fadb5ff83c8f1d425e7c6cc..0757e2f8a9995d6f229686161606ba7a324471d3 100644 GIT binary patch literal 1077 zcmbVL&rj1(952WLNif6{dU}><(Af3owzgq|t=(kNAsI_pJngl8V-2*gv=2AnV&Ebd z6Au~>9!Q8+6Azv|C>Ik?Cc??TfEbBhJPJ!-J{AjFa!9 ziidnsGBYgwlW<%|w=HN{PCCUwO;9;aR2H;LN@>a0=-E@K~zXfwU%2?6G0S! z`^?_D+uP2}&dy9{wjhm(qCdjK7mY>}@kP)WA&P(mt3<9+L4Uv^AP9j70R#!Lpdv~L z>MwI>3nEX@Zof3m>`7<8&Y81kCs0!!E*x-bL1EsB30y22mn+Z8?{W#Q$CFn@QVs%z zmH5gnw@Q9)&@*!E|0dVL#9iRkL9f=Sl$SmW9suzu${&S!LzLeEo{adJqQ^kAhvUyI z_S9l6q4<5ZC5&X?W zTL%29g7pfxpr8pI_gkd36hS5~<_KFwWYfkwVYF+)9UW{dAgh2S1x@NWZILH=L9WJ5 z$Dr`uGrsJyEOLLuoL?dI$Ao)2_^E;o1uUy*O2@A(+Gcb4<6;D_4+I-I!S5r2O$B_E z0;2>$K7U1{xfFeJ$d_D-_Dr~I{I`OCDaubMf(+xcn5{sv5yjsvv~9pG6?|6U;;}s_ zRNU#2lZPmua@e9x)z8fS$p8QV07*qoM6N<$f=e5100000 diff --git a/resources/assets/enderio/textures/blocks/powerConduitInputEnhanced.png b/resources/assets/enderio/textures/blocks/powerConduitInputEnhanced.png index 3202f5ece95e05b07fadb5ff83c8f1d425e7c6cc..31f4a8658267a8a489f8d9fec2a54beee84fe08b 100644 GIT binary patch literal 1077 zcmbVLPfXKL94^QKNif6{da5NFGx?CXn8kxrp(t;skvJSQoTlC-}svzjBt-M1M40C41t=34b zbknf0mw+)Q(e?t$W|)b|b^z@qL|6+gx_+Ab@#;0lx=xx~NS4G>kV8#(W<5mn>vL6m zeaY4xZZgA8v<+&&Lj2*kmHf+oA+m zO;3QNq62W9l|KolgM2f$D?1E_5G;i$LJX&4o=(Dg-6X|72~U8}_4ap=im3 zHVg!i5CzYR^Xi}@QbB*iI1wFH*8(I|P=r@QoA#qI)+5u}o$e?G(rAoZp-YyQC&PjY(&C8}<(6XAW z0FYOvWx0^kaw$z!fozIWk6ZL30(~3xe7n?lm#d!2HF6<>1cz0OmwQuCZeoI?CJxwK zjvZfceFwLqt8s^p5;jrj-a$?w#2(uzvEiQJ-d3Q6QWD@rNGB$xD-v&|9pW~Y>&nfj#<-#5q4jTWzcd(b)@c=BTBSAC%NW~T6H>*?bw vBcC$kn}c5u&YFjJ%Wrp^nV8*wzHjP&A7k#1+H5YW5{g(P delta 810 zcmV+_1J(Ss2*C!BB!2{FK}|sb0I`n?{9y$E000SaNLh0L01m$Z01m$aI0aKA0000Q zbVXQnQ*UN;cVTj608n9RZgehAMN}YmGcGkQF)>H;LN@>a0=-E@K~zXfwU%2?6G0S! z`^?_D+uP2}&dy9{wjhm(qCdjK7mY>}@kP)WA&P(mt3<9+L4Uv^AP9j70R#!Lpdv~L z>MwI>3nEX@Zof3m>`7<8&Y81kCs0!!E*x-bL1EsB30y22mn+Z8?{W#Q$CFn@QVs%z zmH5gnw@Q9)&@*!E|0dVL#9iRkL9f=Sl$SmW9suzu${&S!LzLeEo{adJqQ^kAhvUyI z_S9l6q4<5ZC5&X?W zTL%29g7pfxpr8pI_gkd36hS5~<_KFwWYfkwVYF+)9UW{dAgh2S1x@NWZILH=L9WJ5 z$Dr`uGrsJyEOLLuoL?dI$Ao)2_^E;o1uUy*O2@A(+Gcb4<6;D_4+I-I!S5r2O$B_E z0;2>$K7U1{xfFeJ$d_D-_Dr~I{I`OCDaubMf(+xcn5{sv5yjsvv~9pG6?|6U;;}s_ zRNU#2lZPmua@e9x)z8fS$p8QV07*qoM6N<$f=e5100000 diff --git a/resources/assets/enderio/textures/blocks/powerConduitOutput.png b/resources/assets/enderio/textures/blocks/powerConduitOutput.png index a718dfa1b5e82a599c9a0bae01008a267c7d993c..2ae14000c9a2fd18637bf4b969466f7b4bcab2c3 100644 GIT binary patch literal 1078 zcmbVL&ui0A9M3wGxw*p*!W4y&p(vOpFF)EQu5Ptyx1yc1E3BZ0y(F(|=#rNuZ#LUO zbOS+{7jNz~7%EQi=E;NerUyaTPW}Pj)QjN7gD+h>J&YX;B=1K)pYQL_qv@%M!TvM- z48shTCXEVR+4${C(C_czZ(DRZO$s$KgX^RP1H|NPY$CSg!g*9d&|Y5rh(;NvchRZV zNUeNBx3HUpF(w(gK4mk^=vd@KtBD9}qIt*5azEa_<5>u~_So1WH1QJ2ax~KY6kNYtJ}~TsokG!) z2@&)KkQ4>ijq_@wLsCJ1!#ETjR+oJwR8WYQ0*m&eKGG%A+8ymE2GVHsn}I`{0v8Ny zExE`eB_qqxKS|rMb<2dNX{S>>)Wi(00mbIcI<)zel(9ui5mRYd?%FwwuZTHCQB^sY zmK6XBv=K%wmrF^qs2V^i7+r433kmcr)b;I9-yN=WBv;P|2ofArF<$6S!E^%?95%4e z=JV{uS;w<+E4&nUXg^^C1&Tt*R{lBFXXi!2tC;!Y%_lgcJsju=c~m?BRmr{Mt#PWb+a)7cjlP(B zySvur`8jhF48NJ%TOG1;@1I>CSAMSby&7wL?=3#*zjCMN@resN>*vbPM|Kj$?dsDH zFPn+&2gH;LN@>a0^CVNK~zXfwU+Ns(?A%< z_nQ7%yRGZp^?JQtrx;?Q=s#h6Wnz3Gz7c;!At=98AOt~yDSrYE5t)z~A%Gwu4pc-5 zLH)}t-GNKol%D!YllHFd^X+|~yQdec|394CC$a#4@6g0fN9XL(&|<1 zyzwVud?Zo0;2vvmYJ-Efe~U8S9L@Lg6Pd@)|z6iCTj*h@2!G} zMK`QWN7CytXn${l_N2Ua;PV@m5SgaUX}>!`AH+#kBg48okfQfcRSgk~Zkeo4cOR=x zPQjBZ&KXYDq`mf@S3GJNv6ImWtRK+HxPtStT~O?ThNlzGm_-Mi3i*hgh)$d7J=DoF z1s5c=D8Xd~E$DV3OaYZ_WH@O+xQKy)OG z&c`dfl7m8&lksc~nwQ|Bg64EQn{p-~9sFf6i+@;j+hqN5cT~Ysl075aGb(;=I3pIl zAC{vM{QJdOxj~tE~p{`O{U*v(0+{!X=E@?`jWI0Rw#2N zL~?LF?YAYoF5T_c-Mb0eYViVB4i7ITa2aHpOxBY0T2kz$<@4Suh*;DR{`9YcOe5U; z=|Xd}t01^-x#-je2X9w`?~4A_#*0U-gos6FGIji_Iy?i1%mIH^2$2y)puYYGcny9{ TLIWK!;2nwdjOVS?+>qghCu4rqm6^o$uC3$Vbn!K32*=#82 z@FMEJAc6{>Jn2CcoZ>~n(}oAZi#HFV2QPvLU$(Y-7#<8H??=9$&-dr&W~F>=Wcc7P z$8jUYd85i!5Wl;&v+u71U+=SJoX*whY0{)!6kslA6BC1?i(0sfk-c>3EuP}Ip-WD! zPV1!;x<%Xsifs~+>oYXRP0d6;vKBA}CT=-imjCwrB@Y}s%b!h_q>`VhFn-orC*f!)-rMxp16ow9tJQePLvZnvB0DhU#_ zM5t++D9NHM3(P_YmpqCh!3!t*3=8I>Yzy_WzbnWI>7XocuL6{VO(%@phmBb{OagdrUk5Q^}VL2Yxbzb&5u=7JW3= z*Ve3ihZ>_}V-rss>no>rKSH@z508(E7w@h%_wO6Jvu*JTN2hPR`LXl;)z$eb+PP+gpFs{;;ES9U7k-PhO8R!tF0Ou*!Y9b+Cn_ QR63S+ajtAUo^7oB27bz0UjP6A delta 841 zcmV-P1GfCf2;c^gB!2{FK}|sb0I`n?{9y$E000SaNLh0L01m$Z01m$aI0aKA0000Q zbVXQnQ*UN;cVTj608n9RZgehAMN}YmGcGkQF)>H;LN@>a0^CVNK~zXfwU+Ns(?A%< z_nQ7%yRGZp^?JQtrx;?Q=s#h6Wnz3Gz7c;!At=98AOt~yDSrYE5t)z~A%Gwu4pc-5 zLH)}t-GNKol%D!YllHFd^X+|~yQdec|394CC$a#4@6g0fN9XL(&|<1 zyzwVud?Zo0;2vvmYJ-Efe~U8S9L@Lg6Pd@)|z6iCTj*h@2!G} zMK`QWN7CytXn${l_N2Ua;PV@m5SgaUX}>!`AH+#kBg48okfQfcRSgk~Zkeo4cOR=x zPQjBZ&KXYDq`mf@S3GJNv6ImWtRK+HxPtStT~O?ThNlzGm_-Mi3i*hgh)$d7J=DoF z1s5c=D8Xd~E$DV3OaYZ_WH@O+xQKy)OG z&c`dfl7m8&lksc~nwQ|Bg64EQn{p-~9sFf6i+@;j+hqN5cT~Ysl075aGb(;=I3pIl zAC{vM{QJdOxj~tE~p{`O{U*v(0+{!X=E@?`jWI0Rw#2N zL~?LF?YAYoF5T_c-Mb0eYViVB4i7ITa2aHpOxBY0T2kz$<@4Suh*;DR{`9YcOe5U; z=|Xd}t01^-x#-je2X9w`?~4A_#*0U-gos6FGIji_Iy?i1%mIH^2$2y)puYYGcny9{ TL5C)7$A&42 z8mW}c8d>S&9ZHe!@3C)>$#N7I8+aBqaR-Eu$~(w{bj1S;um*v%vh)s4P}Ja(TW{b- z^|E0jj{^yYi@kubDQaRe4uIW;n6}`8>*tssuU<2>>*ScZOjW1`1=w=St0A0Sovz!f zZCiJk$@BC?Y!Cw;#DI>yML#m)9MiRHkbQE^Gjtb%+c{=8s77^$E}#(787{-xf+W(a z&WRaC7sa!*B#1IE3cRGVqG%|pA!g~`!w_$w(==*ksppHFa!d>3z~K2#r^9t*4uuQ6 zsOvf}NW3Jm1i?ltJ_a%CN8^19CXDRR4X}%RIqWJ7@_6RCjDrR_sOJo2RllDBpTyN=#r*@MHAV} z9`td=%rWE-=eUkxTfnj$HOm5B&{$nm9M)g6Lelc3tfI)8tQGQVpIh-G4162*eY?bWkDEP^YZO8VFbeAkE%v8iriCzyS}33k z1^V=y>pQ3uok=>ho3IH(_a<~oA@b;Mi4Auj_qGBos7WF#05UO}u1Ks!f@U)o0IJ>0 z%23sq9^d)j((xoHKADq$=B9r|hB4Xhsel~zbOe1Oo{*@7ohm;e3cFr0^Y!?P_3_gu zd-LSHwJDChod3KwYUkfPy>vnOxjyuKvh{ti^kDehje+}zPVH=*sBVq#q)OZMhi{*? yQ`>ixUjykQA0FLig}deB8(-J2rc3Njno1p}-V38!x6*Uh5+zrP)8>n*`L#bVNK)qj delta 841 zcmV-P1GfCO2;c^gB!2{FK}|sb0I`n?{9y$E000SaNLh0L01m$Z01m$aI0aKA0000Q zbVXQnQ*UN;cVTj608n9RZgehAMN}YmGcGkQF)>H;LN@>a0^CVNK~zXfwU+Ns(?A%< z_nQ7%yRGZp^?JQtrx;?Q=s#h6Wnz3Gz7c;!At=98AOt~yDSrYE5t)z~A%Gwu4pc-5 zLH)}t-GNKol%D!YllHFd^X+|~yQdec|394CC$a#4@6g0fN9XL(&|<1 zyzwVud?Zo0;2vvmYJ-Efe~U8S9L@Lg6Pd@)|z6iCTj*h@2!G} zMK`QWN7CytXn${l_N2Ua;PV@m5SgaUX}>!`AH+#kBg48okfQfcRSgk~Zkeo4cOR=x zPQjBZ&KXYDq`mf@S3GJNv6ImWtRK+HxPtStT~O?ThNlzGm_-Mi3i*hgh)$d7J=DoF z1s5c=D8Xd~E$DV3OaYZ_WH@O+xQKy)OG z&c`dfl7m8&lksc~nwQ|Bg64EQn{p-~9sFf6i+@;j+hqN5cT~Ysl075aGb(;=I3pIl zAC{vM{QJdOxj~tE~p{`O{U*v(0+{!X=E@?`jWI0Rw#2N zL~?LF?YAYoF5T_c-Mb0eYViVB4i7ITa2aHpOxBY0T2kz$<@4Suh*;DR{`9YcOe5U; z=|Xd}t01^-x#-je2X9w`?~4A_#*0U-gos6FGIji_Iy?i1%mIH^2$2y)puYYGcny9{ TLg43ijfcv5(y+=a%5d6nTd&zOqdKLWI5|9 zvbCjxKq-f^c&WRr0s<8kDy<7Gf(oK`4^XWFT~{Pfz=9M6Y8bXB`2s@0U6bXXqP(W^m z_n`48jAW!-Yc z-P;Tr@C-sEi)qiD(kPTbB!;5^m(B(COcn(2g>;C^5kk=00E-E+84#1f5`qvU;_yWf z514;wq#BMGMDbGDycW3<(~JaR6)_lgyPa-l(=mJx0}={_3?_@gVu2(Av}ITb*a2E> zAqy6ys7;TXtb_@(0B(!04of4%G}6=OS1?-@iWi10w)sGjA!9gTD+8i48D_KlUeC}r zA|Cz4jhCWr>I^H&h(~Q$8m=evVF+0uld=1CAvcipMih&i$fUq2QcRy_MlFO~DyESq zbi{;+^g39lL-;%p7BU5(5aJ-9&Hy7Ik0n5udJdDvXR{aVyo@j9M?x|olP%%1Aqa}% z2n1}2M8IM5_)G~;z~?M*^hFntix+)_TFBf1v(duDFSJZ|li4)`K86@Yr~M(UXx8 z^S2j1j87hMxlAAAPaBWex*Mmep#kV-c=Si{Ndx$2{mb-&RRQ9Ni2L`4hnFtBQ{|JD z7gi9e*vk#dz2PF9nVBtfZEaifH(VK+&E5YFwXpPR=G|1jjqf_)>Ak*%;v5=DpPid) z2`cxCmdbj+JM##QnXt5m`*8CO zS!F#0-2C~cD8E{-s){Y5{0)Eqa&1b$|H*S=r;bw$WF z!&ziheXFFYx&C3|c=nOyIVlI4tK zsQY;TP$h~#RM%ge0GHXjixV%8A;BqWpzk`ZGx)AHu>b5Ei!Gl0AaODJ3roVAwFRFW zUQ_G4Vq$zgExXLs^j`PsElJcY&f2;5sdm}*n}6_gMV|TUbh)Hs=$tgJrVMVekKXrn z${dNor?#!D93QnFvE9BG$3p#SNx_CqU4P3Bulh1?<<@moeV)U$xT;`Ys=|NC4$rCRhN7<2@x`s}V>8Djn{RonE(lF*Es%t9`!#i6 zJv=qgG<$Ldxct-e!NIOJZNs5WeNT^EJ>e`X>)n)NnEdXoux^#O7y0q5_FB0|#}n7P ztH0;&q88-ilW&hwUcc&JTJ_uX^z6%lLre0C_O3gyyXJ@L<1<4BgRQVzSts9ioLYHb z>b=8bs-b+hb=9C|pu~G#lzX6B>Egp@jDkv+uie>a0fBIaL@v z$k*4`-cx_YxPSOzTWnz4)7ja^N6m+m2l^)`-^A{Q)btG3)Zc0RqkjGA$Zy0qryo3s z>bd1{p`ui@H^05QhrgwG(zUJ9zw2Dr(OWsS-hH75OM7cVL&i294`+{RKfg45Dd)yM a4{yp$5*6>$tCqU|p7N;e((28-5BwJ@OCak2 delta 702 zcmV;v0zv(%57q^cB!2{FK}|sb0I`n?{9y$E000SaNLh0L01m$Z01m$aI0aKA0000Q zbVXQnQ*UN;cVTj608n9RZgehAMN}YmGcGkQF)>H;LN@>a0#ZptK~zXfwU$|q+b|FX z`#N%B^SB#K8&@WY_%+zXF`Y~P{tkrkVo$$K16(s z_!RLu;!DK0k$BE59-R1D^)}*7#H)xGi=Ib3jUdo{1b=J_ELPJ|rhh-LWN5=L0KJZQ zc?3L*Akbcg<$tp^%0Vonz^^6!$5F{()=jwN-3UOSn>YYyAJ*(o0?7Rt@oTxtr~tc^ z0J;Q20D;8vCc@WS0kuDblKy+SCIH!`O9KAm4p0M-q5N0@E=fRr2Lr&r{T7V@l#^Xb zMkAir{s`#*4+a2s>Lx0KZrCnwYC6K7{mB=w3c!ckO@GJ`Bgq>dYRK+ee(lebHNcS3 zs7XhC`HzPHe96f7k+8hynw`n??7roX0r(n*m?|IkwVR&hj{*2(&{Nk-s>FDo|ejZ!&v7nM_T)o%UM|-_d zk1cud!i3c|%9KXcV010~=8}HB9=t9%I-Wln?l;vOAXCfivS4_0lmU=UF?ZsyGo~{R k0EP?(@JkO9GJTq+Kc?admk^<&;Q#;t07*qoM6N<$f{6G*^8f$< diff --git a/resources/assets/enderio/textures/blocks/redstoneConduitCoreOn.png b/resources/assets/enderio/textures/blocks/redstoneConduitCoreOn.png index 90fdbf2bd1609066597628abed48b2cfe2efa58f..106d48a3ffa6b893eb903001eeaa90ebe72b8e12 100644 GIT binary patch literal 2215 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 delta 1331 zcmV-31H;LN@>a1j0!~K~zXfrIu|=TW1)@ z{RYOwJZYYcdDMP@#zb?BCUH@tv88N`QH^;}qlvYYvQk#|Zh!1e8H}<~%0?N3y%~GE zQZ`1}=!=cAGRFFC_PfuOoSbuvZK3i#$Kq&%wGR$k?Sp2k-DtM< z_Z#*4{@z}FcX#hPf`KjOV@#jOFn4k9_BvvHdINO_GJi03M*E=EYB!s$MxzO1ufE?0 zunuCyA{2nQS1J_&4BWdn&QR~{W{>}T=7}&aT7(W5E`q@3wLIoy>@NF61oi1F_g&Wn zs-sC~U-}btUDrp*Iq{*>fj)3L-q&@_>9{)KFaYZt>x5kgwre%&#s;vgfN4Gq2Y!x6pQq!`Q}I7i@qgb_@n@;nvt;bIWb9Xzi2ag?{WLps zKRA8rnY68-wo_YKwE}E=Kunl8)~_z5UtLQ5r|VxdpZaG$^>RM>axVGzToT6D;lM4g z+XmRVvNHl;&Z2vMFJWQg=iM&?n6tYCBc{ z$A6Ad$&%~<*iVA4tWEAVz|%zRt8jpf&;jE{C9?;{Cg;c}vdTD%NOJ(>h5{sGW^0@K zi@C(p#H;|A{#D1gOdoMpngJ_(r}TwE5y2qS$wd;zVr_MQk-iXMt^);NMI0=`pgv&$ zc%%dRzPh!^J&C&j9)tsw8}3&e z%GYX*{!Aw*^)Ew#(>DUx11=4Ybue-|@|*j?sUK$}B%-caLr+jVig5oS8u>gh)qinM zz7C*gQH>jen-7ctIKS@ry)Z};n+Q5#LChWZTRuO5Qn#MZl{miW(ouSbs(lOFE(mkpsQg0>+EMqu!I4j9R zGKH_q9e33_X0r;=Z+`W45G%S@dRRt~1BeeI{i|ww$!Y3ll+;_|PGqnW_bh&Qtr!Cg pFGSRcRkq%JwB)x~iTmYD=6}MSg_hv0?MMIs002ovPDHLkV1jLOf1m&W diff --git a/resources/assets/enderio/textures/blocks/redstoneConduitSwitchOn.png b/resources/assets/enderio/textures/blocks/redstoneConduitSwitchOn.png index 61ddc4bd0c3da6f9962a32f623c84ae029450fcf..a91432d46d07865a9db0f539d294225378ed4efe 100644 GIT binary patch literal 2106 zcmbVNX;f2Z8jc{i0S*YV$Z`z@5y*10kfnsMge4$h6*#Q9NiGs0xiN_(U=ggSMS)J? zpcM<&L1eH3MF%1nup)y?t;LlQP_$5$g9;2w0TJd#!I>YP{+N5t{kHo&&-;Gwa&AF5 zFVJ|c%~}iwW6TZWM4~gGdspkBO&pXhhoiE2(ZcL>Awz^^djXzmCMqC-l@OqoWJncEH4FP*mx-=*#{?|! z9->TVVLvz(7a9)uA#xa?;;A?xkpu!X1|FnR7$E2lkcc3e01^o#1`Y(76dDus0G1vs zYE3RmWkzxWmTaLr7B)?(lraeel}d$Ik@1Lp2LWU-7z84TKqBE#1Wu79RYGc}{;c7JY22SmMLhRMZfQlJbDBHS&3rAjV`g+;&M zMPdf>cO^^B~bhL?MOfK_iowbw0%>(S7Jte=6uhBa=YT zpW;KL_;P4e1{EEs9J22+mn&5$A*m2vwk<|&FL8-~%4Pb=VMvL{qY)%yxeCJ55GA5W zLu7!TAK(%zmWmLSVyiAgA1=&+<>E|O6d*?=!21w0#h)-w6c8Z>8G>+(R2l_GqEHxU z5MTz5C=!7r4+;o@L^^hfFZzE&M?jq-=<4Ku>Sp-}Ek@n)V;7*Ck9`D7(dLn(U6K&@ z*_Rm1$`mfgCtBT`5%Y6NzlYI~eo1Cm)1}$`@BY|Oa>R}H;@DtF@$8BFyrMv}6zPw! zdsWcn|*x=g?AXS!7YjSI%dgYcTE0XXywI#WBc2k=X2kU{P4iwf@w!%AUkb#?q?^jL$Wo=wtL&m#*Q={?RCwV z&+QC}bl5J9w4XZNyp!MUUI5rXS)83hjyna(+Bf``^b55!eEM%A8wAvRw}chN+M$6F z2T9%Yo|)CnWnLb9n*{d&Fmg)a~`%% zn){hk-PG7>lEJyHwcb{)2rduQyVg~1k#fVJ;Hq%{%RL7}1J85JH9Pl*1*?YaW;~&q z5y$=CV1Hoa&i6;G`o-{eurH+yQ{-*@w7}~Yl>2Je!MQ6z9x=rj$IScm1HKh`iT@g| zOlSzMj!Un-@{^JI3Y*i_eghdHeI|TYL6p!^FgIi7Ups7Rc@z`xZR#A6B{jJt){NcB zGJVN@!x3^ftyq;|cPq7z1_aFI)h22NFKAQgs`ye~%J7rHH4!bNMtk0l+rH($N_XZi z9IYjGi{q;`c43RWGvAWKEleKe2H+U;-TX;>gtQT-?fL%4-sCt>8$=kJLMnYTd;hft*}pHkc*aCnX`0qp#DTnZiCGSRgjV+wVEj)2ud}UGfw)K6jj&(T$&+Kq~ z&-lM*ejixcUh_1(qQ5$xT0K6ANyc9V1>BbbTy6#bYK>>+-pXuJvT1SYs(RY%T9;FX zz8eo)+^x*6_io$AzNnx1SlVj&*CR1D6}{r@aAm98P~GX=31mv4T{)STb#grO^6Lr8 zrprL*!B!0|MG9=+SK{sG9#fG?(VLlW|5Y69HS(sS7~5X8qbX1%Sm%k6h(9%UmR?@RM}#YY`M9o zS<=wZu!Y-o*yGh;&PaZS_JnIu-x(XNR_pRl&8C~PHJaXgZR7X<2wR=TX0s=lXJ6Qs zvXU-$QNm~!8=DHXkF0Mf4m3|w`7f~jle}d2Lb1AJhxSxqkLrmEoX7u!IS~`(KN{<_ Qp!=J1{dt^vU;dZ>0h5?e#Q*>R delta 1355 zcmV-R1+@CQ5Z(%qB!2{FK}|sb0I`n?{9y$E000SaNLh0L01m+b01m+cxRGn^0000Q zbVXQnQ*UN;cVTj608n9RZgehAMN}YmGcGkQF)>H;LN@>a1lmbNK~zXfrIy)l+eQ?I z{YKSFij=rWBB_0$9Iq|Vc$0T23s5^v()I-k;lEq})J2YsXlw_7}RT^B>e5CA~j&o53dF3&D!=V&&+m_I?63tjL;UNMG| zXXhuUXU8X})8mt)>G9#w^x)udfB#@_Z~yV*y{{1rY%yPB`b37gi~DSTF4j+;qS-<* zCd)WJnNE+7j;4o)M=bXK4QH`JBIe=7}&qwTK9? zTm*r2TnFGHWPvEb&|sthWdKD16cPY3g=E8g35cSvf};Rt zrP?s9zJKj(y3TIH*{$01*^!@Kq&-<>|eBDKjSDnVIcKv1B{kCP#J#*JCd%6JFX90}Ekh;kL zQY)}GT<@Ds=ch^k_bt@>ZL|9;+UWd(9<_g7Z-2c-6YtHynm6^KnOQ+N37cLTkl6!b z!o;y2{qq$X{{1By{I!evA9s3xqV4X7?cnXic@b3BtC>BRtWQ<|l38T$xP*m?C)^dF z|1k}?3u8bsi;@5~xd9-q1M&n0`$^CNB;7O9?|#@?0tzWWI7tIIcH&A_$zIW{ZHN6N z=zp=bxMu+VU1+}u^oam+aV4_{@g~>EC$cI&i%4^-iF5?OmM*MUxOd(Qz}F`x)6eH~ zGJV8ZnFKWXPU#DSB7#Atla3^e_%5td?h0@l+Se-p$vRK~R>Z*~3`!IR05Y9)T=**M zjC<$(rhhxOu6->uanI#*;*N;i_J4$9OBfsgFsM=hB)j-7tW)mocblF9cv@&= z0Ax)HKvr?^3WMVX1^^0`Qd;;b>x_H*-G+BFwyqQa_gwCaG@womECC$r9K2vSAd&H? z1|YZtko1kMm3!-tjpog$cIB1F2JR05*aI#Nj&(5V_$?JGBh#9B%{K$`WT{&;CVwnU z+`Ad!?*7;{FWgd3e+Up|QOJ$K%?F0F7nOb8*s-ixlQfUyD_twGtAqtHcigotv(P9# z3{Z8zeT2YJGSq$1EOJKbLxUnB3uBQmkqks+m^<$I3OkSjaQ;VtXp`lrpvn>Ft;%Q^ zX~{!sm28oOkzLJb1%O+PyRFynQGX+dS{I9ZEgWNg%32fyxP!TgxsT=2cetbDcS2gJ zc+7u_E`nY{-N|$o^cQp)nGv5U`XIU?1-Ng#TsJe~Gey|3RgIUlrmA&xUDiSGmuv;; z4C5}5j*-5R?ol<7Q8P(k8N;!|SxFv}DSTz_xU1H&T2+Ai<~Ldgv7&pWheTxrIe_>e zioUA0mz<_tqYK-EI;t~uHDv$_Fgdu2r zbO+{6q3A`+#i2xKfIm-)E9l4^h90L-k!%XZ-78LoNTVdE|URYEm1A+iwT#W&)bXS@bWI_NJrbDi57=l~?CJ3<@5XfM{Gzj9cxjcvi%s*68 zO^wQUBEH|e7P<1EMiPXI$6&<9#?oV1bX*<5fM6JAfJ_FHNh1+7O}vso;%G{Z!-54q zrje@UDngDcfjNta1dky+sHCTFub@x`1iUk>)XWEp3>hO1Q86Go$WSQe?)3((Aw<}J z-FPorBaT;L3=yWmW7JYIA2NppG8wx+7n%c--tazE%gLl5+xfUOMu8~_A>V^ap3qS_ z%9BbEi3H_xXb23t(O`&;(j+njrE!>UC@5uv94?EsVCQ{&0pHJ?!v?wDTowdD0ygZ; z@fG;MAQu#XOctBJz!fSr1frB;3)*s0d!EbrQ!dX}jUfcC7UTH#g(?V�gvziK_r# zU%)9uu0-)zjq_ZF-d>oGspUH`)K85ofHxuL$=@RnN_3sp{3t!;sAAuCNUq zt0rJyV^_b1C(u(*(KgMAV}O;^edoblK#HsWH5<1`%c9(p- zRb#e$cDU3OulZ!NWy!bf_U66D2Vqv5&w91fKmGG^PgjR0XstOh!{_$>gzoaPOHZ7x za~fQ_dcwwKN$pM}Pnl+|rssy9T~V?^Ner<-OQ&B+q zM6UX=nN>le9jDX$WWJH*w7!nm(LVndt5Dw!UH!9~&ALYGr+>Yqb(4*KFu>JcYaCwI z61(oM*2OG7tl&lZ0S7t7+OhY`1A9}J_!LzwdGU>Rj@Ron!-DaEMC-tV47<_s8Tz%q zoNX^|U2lBfvg5Zxu|w}y{`bGX(s(7SvUAwQE5luj@w_Xcpnc)06UQj4?&THh9{Rd5 zg15h?_w%z<&`ev8jk;}9G+y1$e;vJ~x-ZYxkOEj^X;eQGymHFZL}uM5t8) z%b|6Uo^BeJVq}nh<7&5azi@HMNafJ9OVUVY$ib|n?#Z^xL}y=)v)5>5^`R|JoAq_o z`Bk@@W(+&p*X(H?sc#K+Ph9rd^N$Te3@_^Wee$o9XqxV&qxdkZ*~7SPnZ9x6fH?S( zt_j%b&z7&t%85F2G4f5?{>^u zR%@OVvb*J*hz)-?)s(h1^fXsjhW@s{XR0)R{MODwk=BUmrx!ER_#|rp&9E7|Z$<8MukY4)8_wcA;2 zw4S7mr`zVLok8BxJ32i_WI5u7s@}m4-|?0*%d4NSEbOk8(E0}?*89d*m!xicAh%w%tF_GYx}>WZp|`F@Z+ubGeR9m* zX8gzN&e7+RLyFpRMN91ujr^=_T|AP~UtRRkh?#GZ-s`+r+ult%QKyX#PaQh%`Plh{ z!OGsrnHLFRcfS2KzSNoboks3Zk@#ZCo}`Cg)|XFaNBn$KU~gCVS-0ljQRWv`8q{BQ zgC4ZGT7B@huzTGeQD$ZEfwZfl(=jy%Jd?pkfrf>rx*6s9v7(Rb);x2=KV<4OTr_pI z5G4Fn>(_C-y?}n?L{VwVa{nW+SEhri?4`)>yfCz{9?whtAt+z)!ai!(l z=k^}Gxp$&1TS%LTm6)(?qq_Ug-0t$M@J!pnxK(}X;C;i5`&yIlyzUGrhO~VtC!;@v zpWBxC$OlxypVX(*QT5qtVtMr%<|ltRoDLe^V|294t<~2{Nwehaz4*YR>&+To6$Ha;&ArwNR9M9qXJ>QH2>9y~2r SZZDnt{|g0y{EI$Yll}lzXLQ#9 delta 896 zcmV-`1AqMN5SIs#B!2{FK}|sb0I`n?{9y$E000SaNLh0L01m(a01m(bYSxJf0000Q zbVXQnQ*UN;cVTj608n9RZgehAMN}YmGcGkQF)>H;LN@>a0~1L^K~zXfwUmi+Qb7Z0!XsP9ocxLX*FwBFp%6}@Vx?VlHd+zDJ17yeR z>nGjr%RGPG>%Hmq-fnEX>-XRH`yVzpKN5q%Cm+0%Ay1VaI_c*WXHh`sS*P=~(|O!( zKU`aT&}!XlHt#kX*^6%XB+p;vd8%$jKW}XjU+j|*CSh)dU;dbXQ?PiKFxXufz9%Ruc$c)CnNpt~Kloz+WT_dW5{AdbL56&y9?VI` zKWa1%0e_H97wPNtk(|! zkey=qRfH*qr0JovsP4>ZHZh0sZ`W!WS!!%2M!+x~Dh_5tAIS%4smqyIUFICrYPSH8 z4UDjgFbV^+5i&uV{<-S)I_fu9S2MD>R>UZz6@Mb+6KVM_by<%&sP6+H8#4k%q++Nf z>7u%359&9n)r{Mq5MyFeF@kO)ty@jhudl3RWLe5EB1|C73^hoaQ?e!8YOH=006?$? zV_UV2Nb^DsYK{jls$Z#8GEx*Kn22Oxo@XM;)8nR|mfo*cQNQNZFE1}=WDO(2h~!|F z=Xt_@R7q`;=Imr}saGmezX*U71!1&}NCxJ4lkg?A=}3^q7SxS&rE_N*O5%lnu!qPzW|7q8|En&`C#w@0H8vOQmy5OMd~r Wl8tr*cO+T>00009vFmo>R zegF4gkB1cnpoua6Y{9dz2R*<}#Tgf+SG#-%U89Y?R2mLCp!w^wf+pi#yci|W+ zB4|%fUPgTs_2i^eD&ultzi#<13lj_*y8&TSRNp`xKx-UfP(fpkm!a>?U!s9yXXrzz z0$&IWRCD$=LUgb(T(TPDmS)of{h%+_i2)a32x51_i}W}{uh`YeKDp*-umZv38G6;J za$y7*euzMdO)(ZP3P9CZAth^q&8L0c#IU)Iz(e7tP$77CB|; z8peUnarJtgtxK#Qj&XvfX&f(dqR0>g6HR*<#*7#3Y+5i;WQ9(E9p3|qMOg8taE2zH zu7=4rbKNAa6?BA)=#d*6qNCDufVd)x{Hf3)^{DP_l1c6! zFO&d@H~N9lAw_``rf*HT$isOvLz6$O?by0ift8A_Dh$;4G@}W!%~Yz;W)v}P^Onpj zsw6e-Y{XZMK}9lTIV&kSK^T&?T*^$#YIacOwJa$}lbiP<3_S}qwH>0p#+4q+)r}BA z?1v@apJ;Z$NX^H7RPzI17+}{S$Fu!<)RR?@>4B zI?hI0yR09tp1)zYw1Jj~i*H|8K6Uo9wzzB0KUa*a+Ai?ct+9I_ZhCloLAo~g-MNJ~ zmf4Tc<;LdMM~-YAy_D;pnfMMzZ1T64w%q-x<-zamMPez{H;LN@>a0(D75K~z{rt(M1b<3JEZ z`ALd^;!Qc+lylBG$8R6INc6Hf*4h*`2I@peulh}MWXWvngw7$WdRN+ zuna#O4nl)|Isz310Dc80Fo*B=dtupuPYc*l4lu!YyPZ)02?m27EumfI1V*;ot#Je> z00Y@<_T`uVmVbAZ6L_=P=+O;e2}7aK+XkE{C-{23)?+d7&JH+LPVm)grAL1aQ33|+ z9Kol`3BFt|#bU8Aj==49+u8vY$~k;KpPL2#dJ9x3=kVEVX6}G|6_aX;D&-tLolecG z7&|}(2uP8Yqwx2i_D=8_0uy{PnHUA|FdB`DOeSNQR(}T58#Wf(xPgsD{O z$HaVU70L;WG@DJc01Ti2hrXKnQ{@D1G#Yw-6yVVRP5p^-g4gSHQLEL=9S8&h`VMd? zMWu2MuU4z(YX}3eSj?iDqEb1BS1J{u`Tc(3a$33c0`Yj<0_0JpoWslIvUwBY9>5Xs zX(=j|15EHzsbmzOf5~8gPb-5}C?_ydEEdhT00poETs1{j?z8~G0WK5@-zkVMx#bRn T#VG0+00000NkvXXu0mjf3I0Vc diff --git a/resources/assets/enderio/textures/blocks/redstoneInsulatedConduitCoreOff.png b/resources/assets/enderio/textures/blocks/redstoneInsulatedConduitCoreOff.png index e272fe23a0e0a55e1d6b2a7342f093728fa4aa23..ecd8c3c1fe0ac45cf796aafd2a77e838d3da7cf6 100644 GIT binary patch literal 1916 zcmbVNYg80v7+yrp01;25SjZWN^guGZGkck3R+a^K7hL5gq9A56J2MLl%+9hqw2OtA zT38}!UMNGw(7ce`Ov6Pkc|jBd3~>=9Q-na0jJzdk%_>+wJpE|Snfbo&{hsH&zh^#< zi3%U@@|p{e#~ZJiql)EL!10b7#eE-n-74aiDXcnyUBKvA3vQx#p(LZF01b^NQ?V3I zW@VhAf_OaV41HVzn-CcxBN&>GJ1~4JZRFTIUXa3S#ECSD1+-MM-XI5mtEvS7Jt+s{ zC6REXQAwrf=PWl-3zkR45zEsEj06?IK#*0&DWEA92ds3u!7Q`N!KZp<+}nOG`AP+<50Icp|T zCyP~u4cp>QaxjHujWU72VzKZoB0ghE79bdg31Fc>D1|MxD_&(eMdB?C^KQw z8(BSL02~@|EtAR0LC(`>A<)Li$mfa;=HWzfDHB+6qX6N<0-AQj^%QMpW2t}Kcp=&x zmt~{`v6Pv~G!a}qbiN~GE_eTJ$N}WMkwu&ITv70J6+>jwl!4W#CWZ!{rdXzbfq6`Xh$$ja1fg0Ig|t$!779cWF(iSdC@REZAu82@ z!+i4prcS^)C2;h~zxrlG#5JR1`+N$x!}B?!4BYUTxGCvNDw1-;w@af6jk9*7Z@oOf zE5t*6*NZ50X;@v_36EPnVHG&JqCKL}FPGN5+ZJx_JU6g8HC3E?_m6u;LBYX!UG15j z;z+4f+E~Gs2j0nU4sI4DclOuq@Xx{FAFdf&ikq%4W^L8gZH;z&e(-IPBB1=-IL%vw z64$1*?=CN0wygh2R~Heoxwq+;L+;1U&REw+EY4V`=hH4t9?GdF_ZCF$ZElXvZru`b zW=H6(Tc3Xl4?y)>DOdOM2Z`i5vUm51p`lqf=Z*PBUqB3?8{&kY@$Y^V{Gm|Iw0y+JIH*X$Ds5uoRm-m_dKQvzRZfJ?`m{#v&FIo0&ZFTjO$q5T$ zPP_j2cmewB{)7@XW^Sye=pY+b}zTY_S zUfJXM1#@)}e)a0r>5ssJ8<5c(SIo-U?SBue?A7JA|6H6~zAywm-9FhZ>0q*_SE~EY z**CnaVnFnzEG#hduK;p$fiPfHS)t_Eoh@J1DEb0^S+m%-@z>VqvZJGcqT7bjrEA}u zlpptg&(Hhv_tY1}J{hv(Tv3oIXM-f;@9Km^4-R7ol-&8^?dbfWx-dyey74KX51NrW{+v}&MB{G{30Xce9wBn zsR_QhC4at}=acGnarA}e0jFKooo7QXX74YaaQNX{_J{*+i3eJxd561_Jko8cmXh4O z?nz`(s_Q&|6<9GD!6#G4r+r6Yn+D`x}GdJ(X!vRW!1K8?0$8WBJspMK=}BIt9C{(i&C zyDmqv7TJ#v1Y>lgGug8yVF?Q@yf9XMuvk$VGYz{wu{+M}mmg(&`;71G63gh2&+hNK zd*g^2y|A(wfF3%nZ)jOr^Jv!0wNay1$Q8aHckI2<;=~^H|8tAM+2ZT5e%;}wgY(_@ zEVfz4Ri$n6`%pJ?ZnZ%^GYJ~7eGu48p1L`-C|eT#({}mfDHDWabBptxmiMJ(9oG-G zD41?pn|Hyb-hNNf<>QrWU-I$s*|vdHEx8}WNVauf@|2b!m9@3@5^T^K^u%(2?y3KJ zK>C`ormBkYUYav8m#!~O*NMKDv?@2*D(#2x^T~bg8#lBX%e_vQy&SzGX7EANv0{7e aC^uf|q{req;`{^0|4^fjQkBe3TJ<;Xum{%w delta 1828 zcmV+<2iy4k4yX>08Gi-<0047(dh`GQ00d`2O+f$vv5yPgNHHrJ737#LOy5nx%+nSe%7-0=4>uI zdyd&TFk>?_(>A5`Zr!?RV5r=e-$LRZ~YILT6e^oAUrr>8sCHr1Jv~Q&Y zJ3ZXDQxW-^gueY*I*5*i^8RkLRa}prKVP)z>3=C38XoeL#{`rMs&!OFL*7?cm+ep! zzJ97ioj?B+4Y#yJzX`t!lfqQ|zugh^&29<$-EIiu`fW^L&VbM(q=b{BQgpEQK4NWZ zg#x8(h+R)WKQgHFVaHA@e95lT?#X;Pr7_Tpku)qn>K zAaKL+`#6eIb>Q>p5~aY~7VSX5;uJI?fSx0%s2ajTZ$m(pO>ub;f+Z0Ghn*9gv43<1 z^Hc+-mUPWPxKK|doEk_JVVk!Et%0s1t*9FUqb@LYf$xYQ1WST%&4Md!c2__nh6Dr) z)kM0vKe)si2=w?zeq<1XnFIl~lP}8RAz%oa3=GMj3G5!RLZH-!z8N;f=GbI|4#WgF z7LJEw;?m2$usf(;%pr9#i3cRTlLx9$xMQ9aThSotu5EImpb|g>| z1Py^haCXm~q5MbO4SfPFO>5KQw0caSO9X0{Q5^w^1)>1~6_78)f{+M-l7Ap*2+YoF z7nRE}QhrVNAp+EZr$BOvY$Bi6H5oNTP|$V-2=HKlA_XBZVOQBV&j72qT|AALLlhCykD7Iom`=o5K+uH&hehYBa4FSqv@47K4k?#qeT$F~AsM_k>tuEHYLZ%Zzo#LSv<|)L3gQHdfm$ zw+abCLDi5}q#N}_z=CbZ!eiyJ^jLc=K31O&!20t9;3?n)&L1XX#G?TcJR*2Z@TlN% z!6Spo0n`eTimr2iAb;VsFggPGo5u`~8Xh;~oyQJZ!{djP6Vo3iJdZd9f0~H|C&4p{ z=M=db*7J%2Z3KEw=WvOkALf&SX@T4r}@7ltQ|*;5d2CiWq$**vv~97 S|0N;-00008uX-IBJZb(>Kk*ci- z0#nB$$N`7NgA0pOmdY|{K`JuBSi~cBp@@noRv4@zi)U^W?ELWb$J}%7{kG?M-uHW# za}Vy2Y+L5!=7hmumWjdyQgkF(Uq>7CJGc62IXbLCgwaR@tVGP90mASVunZ!Iv|u76 zg+N7WayP`oU~H4skgq6r|rbt+oCgAf86AOeHTAjzpTfWYFA0S27|09yz&D&S86s1zE91OQw*iwiIb z3l9;sW>6@(QbFi~Ep!z?R3V6-OQD#}X0q9z3>y+D0Efe&P-zqzjf5gd##9{wT1Yyh z*P?;|GRh5VJ)(wn1gjz_gH1>P5%u)#6|{P>_?@uMxDY5bWE2airvPLsMXR;m>kZn7 zNTEO6crV%*nW~23k{x1oJr@wvfT#@adt8T#?R*fI2y}Xj_fiUf>G;l*Comepk1@FOk1B<+el?Cy!TJ1}|k_;`&Wcm4{a%vV}dG~{dUwl52tea^E~Jo-<4 z`p$d^Ydc@H$!)Hqql1d;JzqREhMaETs>dzQUd4X`dQ3f<7^=Z}J}OEr0R$dQuQV2m zwYs=3G2>UIuIlIO_<-cU##hU4btUuG=N;Sg)mO`r{U$$ege{Of?%LjeVL;3}bqbGL zEpSM=*Ql+nt(`vLS0O6^k?F)4q$|}_UO0$Ts^{DaoHI^*)7#(wVaGPdf1R}5R;|fi zyNQLfkNerCF1tv*%D!;p?HdlGCZL@b_2L|69p-R%$1r}Nz4_J5gYDw66<%A!BVqa< zawdt~X7Cm@<+ozj*Lz;iR5m9t3x-viUg->7{IZuH>$PjUfYb{5a=zXiDE^FhZRqiQ zY;|78L}N>&&dtHC$Oqs$JSp8XcT8rNwf6&pbl-Yd41vbb;aHp z(Y&A}&jiTk>D^B|GFv-lM?yWWtzXmFL1#Sfbb2u&_-DlmJACJhCG!UxCtTdUGLG0h z&lpkFd1r35`6;_7+vOHDwzEI`yRo&!*crKF`G$RW3hVhrp2)fW=iau?1&>`y!RE`H zoA-<1bVA`;jCY0mk1>uKY42cH8n*R}s%$JYvLEN8`LbK4c*u(Xsov{hhXYgGO@W``6KA zPOBlI+6DON@0;86dJZLB81-fFe)Dl_tz@(X2kf%l#kB7q{Q8&i@%>+?5725^EhO4Z{?3c}>u1^J zSF400?V}T$;$kAguY!BW?hQ1R6y;`+gTLtc$L*mZ^O0zwX8c9lfKWMfQdKv|{-LF% zBk*oP{?wlMhC3}g0|zg;VP~6~nlcVIrXTK3>7yK1zRWT{i+8zm&AWAmnKPYp^SmRa ttv9=Q=kkx!#+@&19eQ>5(nKl77ISGhF8I4MjvK81ZIMtSs0mKU`Y&iGLf`-Z delta 2176 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 BHfaC= literal 240 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3 zQ$0figD*u3fvVy?T^vI!{NMH*kVde4>k3h f$+IuUHJklwi|(3Zc{?Wptzz(W^>bP0l+XkKlZ8^N diff --git a/resources/assets/enderio/textures/items/filterUpgradeAdvanced.png b/resources/assets/enderio/textures/items/filterUpgradeAdvanced.png index 3e66086e7570291602f2c2d87d84eccf20a5405b..74d1499877820de7451d079a2d022c02ef934c0d 100644 GIT binary patch literal 1963 zcmaJ?c~ld39v@CAS1V}bh%yaIp${^dBoGn_k_(J97*53l4atxUl1xk{7lMiu3mz*1 zcDIGK917J6_-fheirN+*7O5!9KFguY5k+cU!DB@pvF^kQyMHV@@6G&<_xXIj*XO+{ zlO`p2xd*rd0N^EFD@-9)(Ehr)5?_6O{&QmS$3+|QR4fNK$#e+7Q()N$C|1jqND3lT zSax-zfQrBgfQKnH@tltF;6h0AkjdwKDk*1P8MbC92_4CNEy0fT)5? z*$^qANwfk)g|5xlA*uOEY4ZFXa<+o9CKik_a|i)7g3Ca&I!~kLn7NcUx*TF}zlJE_ z8wkFGOZh#ijS?v+z;p;0NsWw<)95hBVpHKrCL4ysK{^d)KrjuWvm;=b!(?&bDDdq= zA)@INIh+(>{M%T>iAz!8xRwJ!CXr zJO%krzW-BLpJve_Pzs{Q3_3Y6xSU{nC@n{zLu5FnOT)0dxh_go7>?;xm=+WWz|ak- zMuD01VQ=6P2}i8a<1&pL5evB#LV${*3Qjze87~kr;(2tK1;ZjHJ5t0K(HWv>kpLFK zLe?Bth{+9VM1#+974uvsZ9%Tx32H47S%~ORBch1cVQTPA#T<0uT!ahiz2zzv%!MIZ zkP8vXK=!%**PQ3B2=myt^R6Wh^S(zkgxPh3s|WbTTmWze#X?@1dGOJO#PzAk?;W3= z@K{$+=W#bKU1eeVRjHiciS757-1()`Z>cXo`w;w)-;f-etcdDQ6oHDWY=`pxhp%MY^oJMwCe#04D(c}qsW_y_6k7ca6C#bdwa{kiQ(7;v@J zyE2@FSBz#&27kS|H+k#2ec!gYGTRHI$sx10Z`r<`t4*wH1CdEfuN<_ziU5lGSWVkD-@ z9JJ-2_+*lK*9)J4nDvk2LP##dLo#Wq_)Fu(uGpwfMsjARm@^dy)Zg%KJAC*%Tj7J2 z@=Jf64pG!EcH4Ss+jXB;*{>cN0JuEVsXKYhw7;PUjkW1#yV*AxNNq!dz*ilmLWkC~ zERj*2*!XnOQ@KNZUtcZd*(#Fffk5{6E0=gy{2?Nqhga=2ymCDY7Oeiwl()ovZqP~i)lA{yLhDDH|fEuAUsoZgmojzkG~aJ}qy&h`0-*tnnc-@h9@2i&!>Nw!9f7)O{v8KFSky!Cc+ntsF zTG<%Vb)~fxJ67g4+qNR&#Ga`letcly+NV8^``37%%UdLRw|se$f7d8fU6>y5Sz}Y9 z>IBC)F{0b_*;XHR_AX=O(c?8WKe2r^Uuly!lPn&ts}A?It>n8qWg1pmKS6CIj&Y!` zXSftL`cDP;myq=*!+;v=JJr3t$$ga>Vo{Q?g};5@zX4DY3TOZT literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3 zQ$0figD*u3fvR?Tx;Tbd_@C`JdrT8|96!JSBMQQ1=Fs7J3~-(8^-2+XYr(chrN*L`rgWPqNAG|JdUxC%wA2@x zF!9Aue7|tM6{a#XM}#3!91LQ zqb0L#NiLR5aV49qt{kg^fD+?DtaPJ1rJp-vSvq>BoB&ovBzLl8bk1-(zo zVpsrbX_f?IBr#&EREB`D3JDS;S0KntP$os9VMGec6k-HH<*_I-3mkqRAsS0$qDD+N z97{NJIlr#b~82%q>w~wMZ-bntF?|%w&rb32< zjU-3svsPhnnc<#L460>GoTph6P3MkuaX~iC(_A*qfLbj$Bh^L`w1fM62yQT-dWz$5 z%1Y`n6(k5qY&HVbU`Wg?nN+8iA+ZROD36PdP1MNMm`1A8VNz}E2p6NR`F4`xN4Uf& z7m<$1^*F)K2$3<8wH1(rj-~D3P{pWi>|C%h^@h2`n7K$3$K=97GO%Z^|C;m2m0%vv zcGR`PVbu2|C77KRT;23zLoon&=jbuD$$6`1ds|NE!ii1p0iR!%+G}g|<@pQs+OId1 zw7>SNbM_tc3w|A5*Oi7fo{g^$^}!W2cJG8&b;(cSh?-rN-;YH1ZY_21TV7n> zvZlXa>)zgFSq0`>xwFouomAZ}z0o?Y0ngvj(h0&Xogpu}pNG-~asDqAOTxbMtFg>1 zs=T)D&xDG$!xdFGx>t+Ju4GQ{OZrR$@wINEtvTFnPG4#`nv!1YzF)e%(bN$?XTY>{ zU{SGV)eL5t%e$w4u;ElieEHOhZ})k9xi^sM%NsxMuyNbIV2xMviQp$9|8d@@=|wAm z#nqQfmaEr)ahvkCI=H3j1QP@l7ZD6%+J0aB@KLj=?s4(>JYj zb^ngNERA_48#kbFIb9br54^}!a%#QeI zk}5Am`Kv>J5Vw|JO}OjT?l+)p=vF=+7k;i@m)chEF6(w(oxf#QX;cFSsUr{mRjIC8 zTQYyu0+<{VBm-Cg+ROpZvbH)k~Ab`uT~d)5okg2{3KF_D=D! zMUmrwu1&eOB?>qvDxSJ*V%uvpk716J$^=%433H4q-|x)nu{?8>Ct})CX$FDhl!hr^ z6<-|SX*j3AG$DWI%Y`exa#=FROmmHxFxiCXXKv(@{7->_uU|jnH{szwS*$LhVzYf7 P&;tyfu6{1-oD!M<6kc{l diff --git a/resources/assets/enderio/textures/items/itemGasConduit.png b/resources/assets/enderio/textures/items/itemGasConduit.png index cb770b715103350b2217b5cf24a196607e63b949..7cd181f66d1f4c350276fd39bad0074cdab1e474 100644 GIT binary patch literal 2048 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 IE&Mb72c+s=xBvhE diff --git a/resources/assets/enderio/textures/items/itemItemConduitAdvanced.png b/resources/assets/enderio/textures/items/itemItemConduitAdvanced.png index 68109c64f8c81aeef6028e6c48eab0a27c279a26..7bca782819ce7cd6558ad3a739c35454ca250e73 100644 GIT binary patch literal 10160 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 LNkvXXu0mjfMBcn) diff --git a/resources/assets/enderio/textures/items/itemLiquidConduitAdvanced.png b/resources/assets/enderio/textures/items/itemLiquidConduitAdvanced.png index 137593a766197fda2729c264f99e21b642cae5e2..50b010df8b2eda1482d04ece0e9ba386411560f4 100644 GIT binary patch literal 2149 zcmbVNYgiL!77o`H6bKmc2JH|<;+9+{34{b927(&cc!4Y+DrJ(HKm?MQOdw>zQc97F zY*p+kAcBf6j|g3?LY0e)1_B~>tt_(2C96d(mYYyk5J?9GcYpZw$IkQ2e3yCO^PY3Q zbDl3}=k~33wrgy0IGmke8$T2qf%$idHTG5Obd%Vy8V!m>!xU098B!rQ9;^@}fFKcy zMM4n>PC3wy_~CFC2V|m1G*b8njzp12f#xw3ZK4um<8XfdS|ucjM^HeF#LDDc;%NO1 zA|Qjg#0W1TO{fe+;$+)&DkMy|T_n-POV}{ce-q%RGX8B~x)rL)N($YHWL zpf|Aa5HU3sEaimqw=8I3D=sk(MU@;XH90w%lFXneRIyZ$&1O?+bSj-r#t>w6iX4Ts zWVw3Xq6I#pmZ)S(RHl#v^A;hoLW6RNn5XYTNK^`i?+we<3yH!~M%6+}DoCMG6BFm- zdW%-0p~!#T_#j#>N>L)zP(-cJs3h2VNY^crvE2Q(&^!?HhOB?ZgvBb@ z8K*!M>NtfG2n+;B5i&WfNLFv0KcRO4^AVLS34yn$6p6sw6mw)BkjLWlV$kSPG6b^` zG6FKO_}OAHnN1Um5igh}rL&mC1wQ=$rjCj^MV+sc|EZhBEvy*lr|-J}TfFZhM2RMO^Ccy#b;nS2nH_<`lod-onMDRFI{n4R_X@bI`CRh8*rSi5%Z@aws`{--^L zlLLdM+S=NziMqPFT5n;&crlI5<$itqSZ{A{kC~JH+r~z6X=&-FtBhujBjYaJ{r&w- zrv}wZC15ZZT1SV5f}Q5F+YN?8eq8RqKCa24dRm+%Sn9_!+zRji9{#gJ1VmYU-_en` z+tT6r4hIK^B;03u>r0dhONahvje3j zQ|`s`>6U_!qx2gSJ6xZ6ep0&9BWm_=w_x9?s*6qEFvyys8=uY1jL*#M?|wKiaDs5Y zHFDfA9n<_m-&W=mww!`*sf3xPk12yXy6)ryO{D!pi*zF^$bT0e-;vUFUH0NNa5}A2 z9Z?tWdL^Q6Nnb$3hW*=(8*SR!YApR*Yi1fUuhnXXpY;_vuFEpB$8&lz3-5GQR%<9f zq*kMXNtU$P9L>KLa?y9(aJ;n_qGa2&dg6bwu2RLEd{apXu521(SXFFpEu`7sX9$U}EIc+HUxzK*SPd7fJCGDe$fZ{_x2Kl;MKW(tiV?55{ z^9x`W*M86K&O7N8!ey5)@7Z!+b&ui4LXv4_EnNwR8!N8z^<7KM!spC?$A$wVs)7P+ zpL_h`Hr=Djw>%RnKag?oEK^IqWBzJCKaPQp_dGDhx{Aa1kxo_mY&@;^gO)W0TDYA9 zE(B+6cZVC1BKw$GiiYt0lcAqnY%MJCH#z5!&bu{TcO5sE?;%~ogQIoam1ix@DwTgL zkG)fFmrAzni8^pjyDFUJGn8g$Zqv%(F%D38`1Bw02>}-dk7b`*vLz~gSIpn{obON^!Gnr(HuW(1QA3Y8tC+)Jc7!!14#=jwbF`Bou0A5xl)%O)tIX!Ld*aR z^={5nQ&T@nQLUEL5uUdDa*6;-u5UP;x^ev9QP}MjTQ<;aQ=&BoHsqkQsSCpem~$SNHD&^ zqr*)$;_uEMBUOjIpnOfpc>2|YQO%o!mJeU*4yL8`O_^+HxJ}y2_544^pPs+?1wq^S J)d4XXzXIo3Y%Kr) delta 1138 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 delta 262 zcmV+h0r~!;5~2c-B!2{FK}|sb0I`n?{9y$E000SaNLh0L01mqV01mqW$N1DX0000Q zbVXQnQ*UN;cVTj608n9RZgehAMN}YmGcGkQF)>H;LN@>a0G>%iK~z{r?UbO#NMM=v z1PnOm3JaKfZu{ohmw*I<0AuXeh{J(^b diff --git a/resources/assets/enderio/textures/items/itemMeConduitDense.png b/resources/assets/enderio/textures/items/itemMeConduitDense.png index e4f8db396791bd3bbf0047370166a2d5c15b1a75..5f142125fe8561f2bf643f32955dfdb4a6fc8e96 100644 GIT binary patch literal 2007 zcmbVNdsI{R9nW~FsL0a_BHYDVQOV;bH{?M=$cslM5HN)}ka3fHLn29TNG=d4cp9-4 z6qHj)u|f-_(m8cbS9>Zlks8yDVI3=lPADSOR(cpR9OI$b?nc4w4^RKtJ?Gxv>+|`3 zzQ6C|+-gN?;(FgOUlNJ5J~>I6L5zU=UF|`9mo`m(NDQI4Ooi{kw0H?@K}jM6Q=>q# z5za?5P#7sK>_Pb?l4qe_slrwA6rKh%QeiiSYBQP%Hi^U++RU(~0L1|{ny)tr$kUzI z$bcRZkh55Fy4);5b^4?-3%aK)RjDZ}&~Op5Fb?3`c!U8Xio<}-XfRoMHUasmT^=!a zZ_~)YQwUxlAU|_TC076v%z^?eDvP3_GeCgNrGhMo3xd%AgAOujAf3kGQb3Rgv3Xz& zu>6n-H4CEUWk?g2wTP8~tiy3Lk47sgDWR4yshB0726DMv8l6F7Fen6qVl6e{u#IA} zZe6h;MXef(-i+%p6X3Q8tFakcrs+ypS76c*9Gx=!vAj1}UZ~GNL9tSt=kC zCsag_@HA>ztwz`}6qrlrP`Dt3P}Eu&p~Nsa2welwW7tgQik%nn#ULv|B7!&~HUxs8 z4C2ZlP67jr;fk4THirYPaFb0|95!jt6>UACz076*ESD#-pfHYElo)1MsRD%#!!fH4 zGXoL{5S67jAy|oZhdV>hE-XbY`eGDGuwX{uX^46H7szYXS`LD0UffO}^ z1yWdu7UnWpS}n*`lb89({~J0Q;S|kXC;wA7D_cY{x~I>(fLJ{5Bh*ARkA>)xgF~bK zMDr~rOGQfCPjInu#ls! z9%Nh=S)KBVvxpy2|2cQ{`FHx~D`xP{eFl-_BhS}%IxhTx^Df`j#GR0~c%=tzC@lyX zrZs)B(bv2A(_v%FnQnHtpUAwn<oS zmG=jSYICTGmAOWtJ*YKc*C>xVDX!nHX>S8x2)X2mTA_9$nK*ZX}ZF0O4ZIyNV-Rb^*S&Ohdey{;|&`JxXntA66adFd~# z)xXO;>-%PH%Gm*rnX^|tA35ibSM99jWJk`G3Hyt{{QI4IlKhb!!Mjwq{T&%0Cw*^QR9%Zltf}4+aaKQr>zjayjwMp|SDTeSg%5qc z95eJrmE*eb3TWf_CbI2|^U7A6I8U)A`4%Kpr3H5}q^$*?g!%QlywA6u}ZjVlDE7nVM zwlF&(dqMR)f8Cxi?;u;93ESp$$$ah>-x|L;GI@Mptg5qlcxWi_uUBgu&s=dhLf*}w zHvVQHg>77QTQPLGeV=`A`HA;Ke;kcCVy!!Hlb=2ElZYqF;mr=VkGV1r^0wN82CHv$ z|1G>`OAsL+q1c$n%aaYT%`Lj^^Rw zAA>HPnVUMX?c}dEc*z-|OVKZvMyrl)uC<8PJsSJRjd0gJ-PCk<7S^x0Wb@jo-!av1p&-JZ`%Xc}<8RNpY`-M-knijB2?RDnp)$+yCSftOrrj~;f7HBwxaVc$Q<37w?-b(N=#Q^WFO9n9j*~n|OU3h#w7P(G P?q6-PELD15oOkd)V5%01 literal 4254 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzwj^(N7l!{JxM1({$v_d#0*}aI z1_r*}Ak29D#}zZ6AbW|YuPggKZhkIK8D{n=84L^p+MX_sArYL63Ig}vGx7;*{0Ax< zFu($`nO8t&KpgP-!xILu13Tuy9DC@NscizWzXwf+aW%UN}NBid4UA5B{*XAAsK12*3*>d`)Lq1Y)bz zU~5pn>+no-DN#IW(14R!#w96*f0)KDYnZWDB5 RI)4+$EKgTImvv4FO#rX}Tb=*_ diff --git a/resources/assets/enderio/textures/items/itemPowerConduit.png b/resources/assets/enderio/textures/items/itemPowerConduit.png index 1a34f41e84c1b7fc7afc36f92823ce5580872c11..5aa5ec4491b6fb4e6a94063a66ff727e62caa5e2 100644 GIT binary patch literal 1911 zcmbVNX;2eq7!Gm_FdX&}f)!l@j6mJ&Zb%5blc10Vp#o|Q7ON;@tv8TrK(VpH!T#9m@(FXmSPCNtWDDyF|(BS+AhZKt*;>-@EXFT zN_lUbN{F2e$Y=uvi1;E<1q%>BjPenY5JixwfB;5dnLz{tg8)eNK> zljD&iTI@;6OJNv2203l81_e#0jdsE86q=!pDYPDt$pHUPH9C?u z83U{pdJ`~C88k~NGSWb6f!8U=XI26jr^@U(Px__jvlVG8rFY4h6C z+u^Z&w%hT`QT)29x=A|VwvSXTk9?W9V)??Al6Cl_+^O{0w)cdQGVc}VYU$j^H*bDd zb!WSOV|rS9aAU&Hz?`rA&Ri32Xv7?Iq{;E|J;xVSm*%a$#2M)Bw%K&?W}fTBTe&H+ zygh3Qe;Zu;;^%uyE$3|RY}>YNTzoFgbr`#~eo94vwn<;n>~Yh1rA;mXOnJKO)!<;h zbn4l0le|8&K)>%6RLv}sJejyqs~6XK_H*oevO}+Bmrkc^x}r`j>{A^7HlWGR511GB zjd~vZ#O3IXvl)o78`8a8-3l&Ke61YS@rZxb@lv54Mgb~4@*&;)9#@#*EQT{jxTmKK6LHyZcF)~Uf6Pd`1w%( zu8K~fP1*GPLz9PdavGZhkNT%ObP6Wy`ylYty53A~R&vQKvn;FD&#_C{C8;cG)!W%U zzW&Rs3ME)$GiLw{d|!LWtsGh_!8@`aKi})w;dd+Pyr+8&7PrUGWaqPHN7YsP`~%7j z2|Uq0>`1C6qdR}Ut$gF*zBy4F;^X^IZT_m&r*e05&`5VeH7lMzGWQuj z4A_@HR9V@1{Oj7T>m|$Aedbc#vD&76e_4$AHYMK~iC${$UF`qz&z5KWU9ar994Pd` U!0r0H;LN@>a1eHldK~zXfrIzbY+g2FH z`|q&9kPxYmxTX^@wk8fE4Z(@;cOTo~TUGVLKJC+1rV6d7z<;_G+K$n#EnT2fK?KGa zw{RPymv#GJ_SjC08xS4g)f4OFoa5)0_ltuPan)E>(BlqP%DW{JfeEYvh70iB8yg#2T3Vvf=%rGi zb%HuRuI%xJ`G4L$QJBCgU|c}SkQA^O=0$Kwe%C@O(gEOtzv_Fl#nLlwe&Dna3P zn7|5#u!Xq`01c@Dj^XQl$ssy3%CL7?Zh~be8FqqUe_)vJv&@}r7FV>*5{HCJ4Hmz_HX9N6UIlImv7`p%%WLA{F8_3}2 zgMlhNpfgLNe4v|eO{;pqjxz`qEoaprc~Kr8pnt#Y{Tu*1-6L00NMg%P;^?0^3qUUc zw(Z~d`dXZ7Z*KLc)eHZ?V&(bd)UD3e{2)mH{NFJOun@yEgxGd)Tvrs?eO zl7E61qIv*Iv}}@}Md_RVG)e^1o}M0m2}6}0XW3O*JuJU*)c}gl;3~26iZ+^Iu!O<4 zt*y=M{-m?Bb39G|DoPug@zS*L#(_}{AY7%PR4Iw8vDl3(sVSB#DB89`4vGDS*kBwO z1WVqT0YxY0CgD9ucsc>VnsGDLj|X>IGkz0lE1A7$q!7&E^!Kr|+=*(SF0t0yj z%4_;lMV*%9`+_*h3%H_&r2|!KJ3O4;~$s`!JSPr!ciM!2l zBP{zZ!}vn`Hp`82rD@m)(Q|{QuYMnKhTAw vFm}#>N#Kq+0w7Q_1cs{)-=SoOsHyo6W04DoYOCS500000NkvXXu0mjfdwE*W diff --git a/resources/assets/enderio/textures/items/itemPowerConduitEnder.png b/resources/assets/enderio/textures/items/itemPowerConduitEnder.png index b9e9bc3ac52c83d5c43a24466d486399528b6202..c7ed6097d7aafb62e4ed93f69ffe448e348ee1e6 100644 GIT binary patch literal 1931 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 YW_0D7f@Vtu00000NkvXXt^-0~g2Py-{r~^~ diff --git a/resources/assets/enderio/textures/items/itemPowerConduitEnhanced.png b/resources/assets/enderio/textures/items/itemPowerConduitEnhanced.png index 4e3224685acf62a3d9d6727d7dd532046f93e76a..1557249d308d75f9fcb01fabe0b655fb63e2e2ba 100644 GIT binary patch literal 1957 zcmbVNYg7|w8jeaL1Vq~^U?~_zp-@aRll!Cz5E9ft1BfXXg~B8=m=u!9Wgr*mmW!5) zY>`^oir6h+sftId_E;^VmBn%>Rs>W8x`?cJ+ghbkj_j)JM8Vx3p8nW5XXg99ndf<* z_j;xxF@EhL`s;KGg|bMwPLV{e4A<>GpL{;{yVpc6%ZZp&VgsH{*boawk)gN-V<-*C zW-JLqP=~n-lTauN%zAYyk*az}ti=s1#D!tm4JMLJp-3X_CPbTq5eyBsS#OjA_gl{Z z3_U6ZQur!RWs+k${W_-w+u)2>Yn?e-7zH9D7!tdfG+@98gkd-28m(fx6nJJ=OzvH; z*#P4igvgNs&z(wDB{Jl=1!M48e5MxUKnx+wg7`cbf>tv)AjD-uAe#d-AxO*EZ;q2~cBFpEAPL)Tbv1LIkW#rl`XlkxGnASauNpfJY7ARZY%tkE!G zP@}>4s4$x&pM^#4sAn{XZNJo4HqHGrG1frhq)Wm?O+c4v&SL61e!UuaU#| zqf#ML+lO+Kl^-vKmP{tMHSBWCTk)Ca=2hO3`4z(UJ>kB;O6E;aSm$-ktt~$akh1Xb z;jNbsOx4ASxP4O-6TJm^RRt7S-C2KZ|DOYLm}kO*r=V)@GtRH9@l)w6U$5S>^F*P; z1@n80>p@k2cem#ikeb5deB+(@T>@6`%OBe{HJap~vY@cod-9^g>1><^i${pja>86A zKj~jr(z@3zYgtGC1^S5O`W3N=z58Tr=3pm{pol_jtr<(6G}6|Ze=p@9s-GAxO3S{| zb>kOxR>FnD|GuO80`9Yqfm`}VZQwby?XCRsX3Lj@RZv^JITk+PIDT`Ux(mSFvT%BNC(J6KE`D?WD$!`q?w{j&POhlU+$eUeI5phicUsnZ ztYhCWHK8E#!8e)_$~S#d z+sAFv>4(Z`uPoepLSEW3w_84}L?f zbL^KudTzK!%#$~QhnMe{6>U(b`(3T_4ShuaJPr7J)d0WHv$~EJ@0OExapw<-^n!~C zTYUWB(!p&R$H%&dG`2lRiMx##Zg1V&Y^i|x5lv=M!)nhr&Qm%i}6)^|2GzpiY< zo=R)b1+Qc8e99wEQazS#lZ9~XjccOk2R#<11TW^#+&(q#)q8O&w&QSm$1R}zwzDll zBFPQ^OMH}S+px6c?Q6}t?P^+==5_${ delta 1428 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 SHWF#_$00xv%s=Q8o%SbWe~_O5 delta 685 zcmV;e0#f~@5yb_NB!2{FK}|sb0I`n?{9y$E000SaNLh0L01m(a01m(bYSxJf0000Q zbVXQnQ*UN;cVTj608n9RZgehAMN}YmGcGkQF)>H;LN@>a0zpYcK~zXfwUdW#8$k>O z`LXG}_v&<{d~@b@q9=M+vVi~s9u8-gHzd!h*Hv$--d4RI`hQS$R`qG<^C6j{hDuxL z#Q~p}L(i+84n3}VR3kz9-4XXMLtl3<2O0DVcr^eos-6wN69E~Y>W|G`-)}?TcQ2B{ zpkBtoCH4Tvr`qx3j_<0@pq{QQ!3HkTue86uAuIgJ@$w z&!Xwiox&jN5`VVjN|yt2p8)XvRrPy3Wpsd73Lu~15W*2PASOm*@C*xrxh^%;Ky5bX>mauqSFOj)+Ndz`r6 z2SA7%+gTdS1nZ_gQ=iMk-Q%Ep0>a2D2n(gJrYbemU+jJt08y@X40BAAb?%OG9Ng~! zAk-PbNPk*oD%PmGJA2$W06=pS2H~=*7p#L%?zaIDl3}Tsi8RTA)OUC99`~C70Gi7x ziq2!|Wqt6~eFG38(J`IW?fScAtF_NtJNFv^j8f4tN|#B!KT!K1YX`^r3aa`GmIUXD TMvk?c00000NkvXXu0mjfX*omT diff --git a/resources/assets/enderio/textures/items/itemRedstoneInsulatedConduit.png b/resources/assets/enderio/textures/items/itemRedstoneInsulatedConduit.png index e272fe23a0e0a55e1d6b2a7342f093728fa4aa23..319b4348de8df7105cf97b40480faa509e5ea70a 100644 GIT binary patch literal 2084 zcmbVNX;c&E8ctXQAxcWMDyW1Y2x^kaMwSNILL`->7^uJn3zK9*Qb;Bw6B3qIq-raI zz^&IK$N|gZ!G*<^rLtVqAQid7wTMURLJ<{FtZ=c4ES@`2u=j_jKkl3}^L^jU^SsZy zo;eUM-nPua#Q}rCEE9(ECFn}9-1b)Jb8hw13Upb6ghV3|umUlHItUXehoulfs0I@u z2?Wa1Qo11?24kI~ii}30MPXbStR{mN4B4dCqHGL?=Wo)2vLpy0NTEcP#*g@{wS!1d z$^D2?Oc5Z`2180!Xu1xHNEb)S(vxHyInjSBfoI~P2GkG&5=`o3jh<`rBfhcAMfaB1 z6e8gb1WEEEzI7^E6ix_+br69`W|Cw8jY?o~$W$hSL#1vZ&;Tl(LIo%^4v9+TGFV)y zFJa*#qG~$1f-B(*7PQclA5n=QS}uiRG#bf9IvLg_Qm7mbhXT+jG#Uv-ko0L91T>K} zdXGg5d`K_TskDd+)(|WfK`CrN{D`QhZ$nUPMWT0xHTs1_p(&%7KrMwz1}JK^C9XGU zJtBerbmP5fePo&zqDUY;Y|zQjdMG>=$!PBWTF3%Kz2SbUQ=vrxllidBpoTPvkncxC zzmVlBIaekHrBXS|mjrSEHi<)J$VpNKC@1;S*m6L|0DM_=`l6lp@%aFo%@>3)0$Fsl z1|bYKox|n>08_xE3jhG1Epmk#JpyWE(4w{q)n4Gz|B}lM)mp$|d9e$^l`sP9 zm9Ul&98Be0kdEzbQ>aat*r@8;`~&SJ4v zm-HoO{-)4W|8gDgm-6@c8riL`6yEy$qr1QQYB{pc;Nyv~`Qpc2+xyQCh*&32;&H3_ zcB%K8)OB@r)BAlYrG+3eoj8MZr5P%U25}12oJ*l&=J9WO`};pMZ?pf`3F~b&NjYmb zv2eC=zgX4h6suO*7HzzJ!*0|-?Vv@yIEz__In-?)#t(F~yqbBiT{O1BV~c1cRQprz zB$3+!-U3p8FL8do`}Is!OM-9VurjGvGQ$wP>s^msnD zCf_{K)EcRAv2!W*qH^t?lbb(Z-4x`58`-}w?zptg~QwSH1tR76Z%2tn^VI`xqfecUzlxuiDzas zFCf`H0kV2}_fvCLn|XFb;C5~OnkF-Y`MA^J#R&hOl`CxUoiCQmA849za`nhOZ1p^I zL|N~dwbkn9oZ=j(TR?1Qf6jMfYfG>*GW&`Rd+!uA1Qxp^XZxRfT00g#b}9o~E^}_) zFM%@%MQbshm97_K?2{zDgI(#^w$sY;F+pTM&MWE5ZnfKy2q$5^ASgs^?YvAHmfui{ zIpJ)$veSKIR>G*&e1O<{!}060c@Hz$Ss8=bnI50?Xm;IE9>A@wM}T977BL?Bo`+5DH)>>VX_{NW~qsg2$ zT|$i$^`q}McjWgROg=yA&E);=<!Tb8mp4>j|M;3|^O4S|(1%aYcKds! zb5_uVp=|5Vvo;Rk>`aq7L+4Cwb|2c$9bc+S(j-_`|7K@IPZ<^ zA`0FB+a8|oD7e}TyHz@GIrC)?O&l?J0ehRvAFqFHf6$qRjg(ZJil`F+e|+2U^Q2R$ zh@BL)PTDhtvrWXFswttY!Zi%oFZ{y?pzRnn+)v;Phw3&h(7Yf$TvMa7u zhm3TLPHc*ci3qz2?isr`&|F%amq`x#qUVR(Lqo>H(IH9WFWLt}6hkMJ^@Hr6T3gNj zcMA)qcE>l~Y2D#Jc*zAj+uYood8jGlPlwqtfmxkklzB_Hd!Sdf0hKTvKK?&La1#PTC(*OVf delta 1828 zcmV+<2iy3h5U3828Gi-<0047(dh`GQ00d`2O+f$vv5yPgNHHrJ737#LOy5nx%+nSe%7-0=4>uI zdyd&TFk>?_(>A5`Zr!?RV5r=e-$LRZ~YILT6e^oAUrr>8sCHr1Jv~Q&Y zJ3ZXDQxW-^gueY*I*5*i^8RkLRa}prKVP)z>3=C38XoeL#{`rMs&!OFL*7?cm+ep! zzJ97ioj?B+4Y#yJzX`t!lfqQ|zugh^&29<$-EIiu`fW^L&VbM(q=b{BQgpEQK4NWZ zg#x8(h+R)WKQgHFVaHA@e95lT?#X;Pr7_Tpku)qn>K zAaKL+`#6eIb>Q>p5~aY~7VSX5;uJI?fSx0%s2ajTZ$m(pO>ub;f+Z0Ghn*9gv43<1 z^Hc+-mUPWPxKK|doEk_JVVk!Et%0s1t*9FUqb@LYf$xYQ1WST%&4Md!c2__nh6Dr) z)kM0vKe)si2=w?zeq<1XnFIl~lP}8RAz%oa3=GMj3G5!RLZH-!z8N;f=GbI|4#WgF z7LJEw;?m2$usf(;%pr9#i3cRTlLx9$xMQ9aThSotu5EImpb|g>| z1Py^haCXm~q5MbO4SfPFO>5KQw0caSO9X0{Q5^w^1)>1~6_78)f{+M-l7Ap*2+YoF z7nRE}QhrVNAp+EZr$BOvY$Bi6H5oNTP|$V-2=HKlA_XBZVOQBV&j72qT|AALLlhCykD7Iom`=o5K+uH&hehYBa4FSqv@47K4k?#qeT$F~AsM_k>tuEHYLZ%Zzo#LSv<|)L3gQHdfm$ zw+abCLDi5}q#N}_z=CbZ!eiyJ^jLc=K31O&!20t9;3?n)&L1XX#G?TcJR*2Z@TlN% z!6Spo0n`eTimr2iAb;VsFggPGo5u`~8Xh;~oyQJZ!{djP6Vo3iJdZd9f0~H|C&4p{ z=M=db*7J%2Z3KEw=WvOkALf&SX@T4r}@7ltQ|*;5d2CiWq$**vv~97 S|0N;-0000+DVJPILS9Qz zmRf4NdiAn4mE2NoPi;h`M76GqvTM~wy+_ge{?W64yytn&`Tc(9d_LdL_xhauem-0D z*O;wAp-}ps9^3$A#V*}CtB~iy7gHyY#T4d+!hy0FI0=A2l&eT40I{ADAQlV&0a5af zo1ha4rMW{K6bgs(y;(w;ga9mI2r7vjVWUt^E-E=7OaNi50E`t&*|?deW*k;5V&g*S zd=g*I0pr9TY6uKe`veKq2|}g_=i-cYQn3&N5)cNkDoLVL!BVkt@9naX{nBe94*MPg zC$MoJoC@XpVL37g#L@|LypTj8V;M{WnNDMp$(yhg5}8UQlZX^1o=j%Z7%cK;?DB;} z)F4p|D}d|1tc9G|xHuS=vxvl`q$ENTl^}y+iDV{|NhDE-6bc?e;1$VI7*OG*3hNaM zTu>o|#Bx|HlVX=F0s@&5X5$b~KZGEW^Z6eQOBKtBLQ+Ol0dgXlKq5*cOL4tNE8qa| zzixaItq4k%gTw$(AyYy^q#iNWD`X^he=W2GM7&}7LSm#SKq6NrR7yZ8?8#;0kS_$0 zSi}+v0D(Zn*o+65BnLc`OcUV+F@Olanc^TK32CIw3@UZS&Zqb!2PWB#=RkL5P+iGn z9#ROBn>&r_N~Liecn(y?3fEJrfB~rxT+tRI+RI$pUvgO-2n1jm6eN=+u5^K4oD7yJ z;$(6xhl8~Z5lcm~B!%5lg+2t#1tIZHP~;BDB-r;UW{E!`kHkl(k|;5FK*R*`Aen~5 z&lCvoOp-tV(nX9I3WJ7Q=8OK{)DaPC5cNIWp+y6%(xN@9f+%bA?<}3^{)ro=}7FIa|MQt{%$Y?fuGe5WX{h4BTGZ zZb8wEDg9~nfyudC%{{jDDT^3eliD#1woKxmcS(F4{g zXFIMw3ye-U4ZNiPy?>p-tDG|vS`FC6?)e${Djil>w0A|~g7EE|0p9eRWlQ=#jh-8DbcqG8(Yee{HK#84=h9y1sn z8iSkzt(;qWbt_Pdz3bNE)I;vf_RE_(w9QAN+1u849b~m0rdV|Az2L`7>V_^_Sw|^$ z7TH?P_x_-tap|}v?_N)Ymwj5Rqe}^DLLRX(z6okK4NY&3?9RTeg+7e6k0}`1S=AXl zo^e(~A3b2Fo{!GF@#HC{^ZT|sUq7$1G`*_h=l2_@b?~K4(mk`gY%vYf!CsH=RhF24 z1K^(37uVNM;z1t9LZWS?HIR;3Ro!1>ch0nuEdIQa%+t_`j?{2!)pc^LoH||k)uGr8 zL-?LnwUBeFI=->Mc0W3z7XGZWEEne)r1l+Cz11INnBR zy=2)IJR5c~&qUAKBKOo62Tpw(`{=Q{WOY@Lo~w%Q`t`M=|0o;|v`NF(&7!kixc3hC zZY_3*tFFk(|M!nsM7{d_3l$M<9NdCc;h!f_lIKT?_Lgh|wHYOo_3-7i-&P-QGA_)$ z*p;(2v{b)PI#A*_d{UeecBA10w|Wo`Exeu;p)7i>{;oLTvnwk1`?_}acFHC*jz2o; z3aLTIhJQ;lG%G^Yn_%R&F0?vm);BXaywt=_dqcG2zPX~cw!2=)Qn$|0A6v10Uz1>W z;m+clxyeV&=qV1={+n*Wt^x17T+_LfP!I#x8 zn#M*LtEyvVIGRb|@VgD3UB1yu9*{I+(+iX2brq7c~(E(c-nW= zKj!D-F9)3N7bI`t6gs~9A!HZZ#JrD?ab6j@-qO;bIM3)@L&0KiOWnU19ckXfLvP<& zHjh~w-D#eR$LxMqHNAe*(8Ba|{*Nio>cQAZ)n0S2pZ1ksJ(LpSfN{v4x}51V rgXQ(u=AhNr4Zy@F{WF5sUTGRAr%1q7S2g*!r9ZtV&xd>7Ejr^rA820P delta 1424 zcmV;B1#kM+5TXl^B!2{FK}|sb0I`n?{9y$E000SaNLh0L01m(a01m(bYSxJf0000Q zbVXQnQ*UN;cVTj608n9RZgehAMN}YmGcGkQF)>H;LN@>a1s+L6K~zXfrIuN58&wp5 z`wz0!?xLiLlGK6rg?Pz$pRwb8OYH0k70qU6wbN8kC6wiv7k_v_5fVZWT9A0*g{~0- z@eV>Deh}ZCV~-u+^xn?+1S%0D)le|G|?@>v||0CX{HDK%xgjA)bgQ5}9l!U&v2Q zPfZu63sVIyQ-A4HGL=*$lZj*^o`}cd5L5r+u|zV-Gr4>Y)WfMHUmJ!&K;;ktLZa{P zZSU>x>{oZ8THC7~z+7Yudc4$y}SAj z;2JTeQ*z|4J=K&qq0>lS2j1x8-E*{I9Auz>jK8XTrmhGVBRyC zj0hUhtM?9}c6h(WUq17VI4&B5DQFIYiPa6A;FriQd1405*H_VJySrw4y61bk7kd>; zCMza)dV3}`kLH~KuUGT>6h8B>!mC+=Y%a^Rn}T4F8YmR<^7_n1U0_BRfffBuUyr6W zqZ8UkrGE&f!xB&_6dS>t0(17&op&a>C;~>u>m@XDsH*JE(2zr#DYQIeMAAd)NesPS#ua42*#uVvCbD76;+3)5d z_x(cpq!fRU(dP{jSR*Kwij%SPg4P@$xPQg=#bE!>j?uqvjlth=d+eXvZ{(jZ=bx_> zUaU;Ld>e2iKF;aO(KbP8rqn@TRne;i%Lv4QfQizVBW*co6_Dg80&5*e6*UASf8KJm z3V(9Xlt2anOcco=+ig`;ES(py?N}?hqrh_Ho-N5B#F2SCPr@mx#yU{ZB?nfLgVYmM zW$i_#psOi(vt7{QSSH~Vl@ge%PhKC`D_aGVT(k7WF@vDH>##-8I*9C3B`{F}iV6XX zLoIKuDQH~>O2CNNSj1roP6qqW93y`qXn%2JpDyCCH0ejP(TC~aLYOTCBswtX&6P|x z$O+q)I1s?0-F9-L|Lo>)U7#FFka>bYP@2@YGtq~sz#eCBN zx5wpnyE+TZDk^efaPpxM!CGJMyI1Wv7zcAj!hyO9AH~B*3B5t6HtAmuPsBBs+vRdQ zFA}JAzusT1!7)Dm*0>YKo2CYQV+lBe zIf*%s<l>WKBsE1`>^mr!Riodx{`T}ImzuL*q+-H;O08!y9Xdw=3JVcH3+ z8ZT*0RqJRNjDy~Mrxn%n(YVtLB&g%F)npLtu@Zr>%GIjQo~R e65Z?b{Rik-a&)7D{ZYCzyWcU-^Ssade(yKCMHu8i zek^G$0086p0Xz{tg64O$4gS@|#eKjBC(JhlTY^SldZ`uxyya*(0`gVTNJNB4<*{pS zAszrga8`;#un@r_whUE~rDhD-pwi%M0PyfMXr!_z1Ovm7NTr$sbzZ1|K&6}mNf-jE zK*L28%78d6vLr4@EQ^bhvE-2F0?@<2#syReCIt> zE#moojfJl`kOIRrYzjrM*OT?GWKJN<%<_;Qyg2)i7FziI8u8 z|5I2ej@2L(5u!t*wKDwRB4(IFY1mvXBE?Xx7)4hPRZ*xwF;u5OH6WJ@&XFk9a#XLI z`x!0}u=#2oCRNK2K92+80%WC9&UWK6UAeAIrZ)|Chhbm3JB#b)=fm@6`1rD@FqJ;U z<)N}@6{5z5xbkmY_Yt|~PEcv^$UH==j6vjnT2uvo&X}zn*$ZPty{}yP$X?t=zs$S@a8d3hr1SE4EH^v#+zM>clFKm!8`b6ImG9Aiw%vhB~=T>iyb^WtIB(Y zwS2!xMJcvO=Hft0cunnsW%T)rnXNusi$*_4ezMZX-rl}cuz@SQpeWqYdUnTtCt1!i zf-4(s@$bp|l-}!iEGP7!_o%$hYhSGIyVu!wugw1zUEt2o`YWm9nuU8t%VDLD@h)t#M zN)R_SH}gC_JvXFmsXdfn@E{9sSxSO~?c#RdNp9(gX?mIUdhVgUS;4ci+NMsOno)PR z6q@<>%Po2D-UTPj5V~AC7N1|zl-#OGi6rkz>o4PPYPJfS_v=L)(NU0S`}F);x$U&e zBrAwQIS2$S19PB(%m)Y|yea(2d^n&ZoN{30nSFdY*UvmKv3I=jLnKdjtRl*u?*)^V5N)t_Hb zU}4HwdC}s2y^Uo+2++nlVkL67pazn?A_YLtZ-s?5c6N4=rZLZ-`&MU?R?5k~m(z~! z3rmfDC%WGLKCnA?JJi|HkzB&+T}2yT$tr`acbVQXufOX2P|km09XvS_{DHtX?Xii; zFDvT}nKf|OqVu-xhWXFpk{Ty1DXF88$Vf? z@!jUD#HA9+lsEd8irqg?KDB9I{=VE?&QgN1E1~V!gu`J;qhBf>y4)5poOwidjj_~W zX6k+9xWy~u>C>mry=iYx42WeAi)}e`fo{wF3vVx7bT6lf3mBXnDdmaT*^YfGm1^6m zT^DV31|MCNL{l);;j^0;raB*@o?KmfDF}I3LP$~GV6ZGQ3nFiL{WvK)I@*VD_5P(3 zfWqoY)A{d>gMH3G2KVe5bltjX{S6HvF{A*8$%$yJ&650CNw<57B`?VqVCPMJjkCRR z%yMh%M^VO)UV1%~_tQBWhqq2+rUE2uhjBoz<0n8qrLveaC4O&{=Qst8L?Q)-5qgVD z-zFrTT|uf!|2>hwpG)xOsv6fDKgQ0S=>52^PG0foh|w~wrK_v!@x3H^sQrlpK<@D( z_h@p1r=d7!JH$t}&T~vF==s!trYI+GI+3`2V7$%1pzb5HqYxkf-+7(%eO7J!2M6)n#sB~S literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3 zQ$0figD*u3fvR?Rx;Tbd_@A9%%Xi2?q`A0d6O(jPZ?l1c%UuE24r_<XTpwMEu#N*$So(G>b zpHM84;=RF8p5KbOrBuwRLiZuVY>UDz8fSeEzT9_DUU%^}ruVhx0R=&C&oCsuF=S`k z#?+z8b?Nd~v$J8++6R5*9j4x6dA7M^ZmTBCm-!cF)VFBv_0$jeYWjoOvYb_gN8qV& SS_Bi&4-B5JelF{r5}E+~Aa@@C diff --git a/resources/assets/enderio/textures/items/old/extractSpeedUpgrade.png b/resources/assets/enderio/textures/items/old/extractSpeedUpgrade.png new file mode 100644 index 0000000000000000000000000000000000000000..af53a3a7b8135818c82b34fdd010a9c4fcb831f0 GIT binary patch literal 240 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3 zQ$0figD*u3fvVy?T^vI!{NMH*kVde4>k3h f$+IuUHJklwi|(3Zc{?Wptzz(W^>bP0l+XkKlZ8^N literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/old/filterUpgradeAdvanced.png b/resources/assets/enderio/textures/items/old/filterUpgradeAdvanced.png new file mode 100644 index 0000000000000000000000000000000000000000..3e66086e7570291602f2c2d87d84eccf20a5405b GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3 zQ$0figD*u3fvR?Tx;Tbd_@C`Ju0+<{VBm-Cg+ROpZvbH)k~Ab`uT~d)5okg2{3KF_D=D! zMUmrwu1&eOB?>qvDxSJ*V%uvpk716J$^=%433H4q-|x)nu{?8>Ct})CX$FDhl!hr^ z6<-|SX*j3AG$DWI%Y`exa#=FROmmHxFxiCXXKv(@{7->_uU|jnH{szwS*$LhVzYf7 P&;tyfu6{1-oD!M<6kc{l literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/old/itemGasConduit.png b/resources/assets/enderio/textures/items/old/itemGasConduit.png new file mode 100644 index 0000000000000000000000000000000000000000..cb770b715103350b2217b5cf24a196607e63b949 GIT binary patch literal 1670 zcmV;126_33P)N2bZe?^J zG%heMF=FWUd;kCj1W80eR7gvuR%>h&RTQ3I+h78T27?fjs>H=?+wJW8y`9-d_tA%- z^g-!kVWlmh6bq#-QeKNtn-&n7MpKc8LMREE7TQ25s6@)ksMJV|ppmp_d>{+7yKJZY z@SDBsFx{<{=(m&2opaCmzI)F-_s*qcGMP%H(r7d^osLJLP^i^vtyZVg>I{0l$z-xx ztqjB1Y&M6(;f})Paygw&yWI{udf{U*7<4)vNI<1jD)o9j8fj^1Ag9nWMuBcX%X0&I zy-p7SL?Yg7HiIZ5BLj>q%idyy=1;}8@n8+C8fE0lzH8nLQB?Zj90Q>-0 zk=9HRkn5=t^P31P6$SyB^mHsLO@Wup6yoUi{xi^v)B{tyK^V&hHn4-7Ut~=7Uj@)r z;AQIbjCHRX@;y^&2m&PG{31^+;PH4+njV{FYmsrdDdXl=%a#Izn>F)Bk0<6Nf*^n_ zftCV0R%{9Z5TP8mzM{BPXBg>t`QE!Z12yU`xoI$>E9NAESODY{DG4kC)_GC^60on5 z`DJ%b_`~AR!9_zYneX|HFrq8wB*Fv%t&Sp<2PtSI2EgKWu;pIuCmY-&hkTI}Ya-p% zclQ_e*V~r4ROp&C1e{=p0&1DUuERS7fJAQ;t~W#1Q>nPM!~LLZC3j^Hcd_-svGSp} z*e;*UYt`}&69E#Wgsd0R~t2MrbeqDueb z^9Sl8-7A7E#=+`&uV*RX77K_%5YTG0EW=VbcyTUb24aC&?X%{l0_C0U%20=w`>gTG z$AS9l(sirKzW6A>on1HDZo3_jZ_iV>8IyQV5CQ&xP-_`8LorUL$zq8UAhrKy&P$go zUKnXoM7sRkg}`9frk3?fcW&^1)4hos*c>@la(`RefIoSQXP$UZfCTjd0jw+9lp`}U zaRzAMb$_As=eoJ0yNzRKYPidR>pklax0WB>Rry12BX=n<*0*xBnI5W|y?4QLaj`@I zC6t}*eUu_$k@4@gGZpsKvrCfi24vxb+1$C>@rxUNJ6-?f;T2bpRQ++fcKmz;ccv=b zZVuMY>Cb<986!i85H1KH7ZhrMe1OP|-~mgPS#@&Z%%SBoM_Uw;-ZJjf>hW`{gQr&B zIO@M~#24&&ZM=UOcd9JXnKQES`JalXb!W}+nv|rR1OfcRLg5pL3}RVORf0gSRW(@h z%fH7}Lpx!UgLP87g0c04cqzWM&f z|KnMYxo*<7Mc4C2gr}X9`$*-l7 z-^(8Nf%A`rk~&9B04V_*1VB!KJx*Y`Rod^840t6M9{V}(k@RIsDlHQP05HdYaDe%& zzQQ71VSTacu^%{>o23XuxFCSjf>zQLCISsX0A+xG4CFt6gbM<=Rmjuj6#1~Bq+r6P zL-+p#WFUZX^WPkN^pPKIG%Pn7SQGS#0SoMqC%{C-AjZT%%!UL4{IvzHWJW|&3|O#b z$Q3FP=pu-D{|%_Z2nVz&+=0mpZh9ahT;L^Qm?;4ULCS#u6wx_o(52$mzT zG_H;S$RAzb2|EBMyn+rzhWX+sOuW9M4U2Gn$4ynK;D>}C9h0E>>$^<$7isXLVTAIz Qwg3PC07*qoM6N<$g4^E-YXATM literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/old/itemItemConduit.png b/resources/assets/enderio/textures/items/old/itemItemConduit.png new file mode 100644 index 0000000000000000000000000000000000000000..d43b90a632cd98e9d13963b672b71de4749956a5 GIT binary patch literal 5659 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 IE&Mb72c+s=xBvhE literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/old/itemItemConduit.png.mcmeta b/resources/assets/enderio/textures/items/old/itemItemConduit.png.mcmeta new file mode 100644 index 00000000..7ceb3639 --- /dev/null +++ b/resources/assets/enderio/textures/items/old/itemItemConduit.png.mcmeta @@ -0,0 +1,45 @@ +{ + "animation": { + "frametime": 2, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 18, + 17, + 16, + 15, + 14, + 13, + 12, + 11, + 10, + 9, + 8, + 7, + 6, + 5, + 4, + 3, + 2, + 1 + ] + } +} \ No newline at end of file diff --git a/resources/assets/enderio/textures/items/old/itemItemConduitAdvanced.png b/resources/assets/enderio/textures/items/old/itemItemConduitAdvanced.png new file mode 100644 index 0000000000000000000000000000000000000000..68109c64f8c81aeef6028e6c48eab0a27c279a26 GIT binary patch literal 5916 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 literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/old/itemLiquidConduitAdvanced.png b/resources/assets/enderio/textures/items/old/itemLiquidConduitAdvanced.png new file mode 100644 index 0000000000000000000000000000000000000000..137593a766197fda2729c264f99e21b642cae5e2 GIT binary patch literal 1159 zcmV;21bF+2P)N2bPDNB8 zb~7$DE-^7j^FlWO00aX`L_t(oN3ECHcG^G?ME!+{lVC9WYPyq!-c2MNz?rjy4%v*~!Vm`%1(O=HDp#}D@caY723FP-Pj%6VQdU!I)RuAF!| zPmAx)(_HlGJUfY6s$QJ8m9xfiGY8-ZnGgUH(Y$!sG^Oh+Q@Ob|)z*zKo|iFRyt*{` zi-yTI>gK#&6J=^ulde`wx>61cV;N89xF?Hyb9jy-#9}@T12A#|(8vZ*^AgMpxV{Sz zg0M_EMq}HY&r-}p1c0fg2@NYW-Z3X!zIkDCn1CXLN+EVlgQ#hIA#)U(&18V`wH^75 zpY{TbX>J23grA8WV_ws!`MfMI=Azz`0K~lA3Ikjo2M|Pl06?wXHuX;1)Br&M79;`U zj6>$0)L2c$7%Ar*G_D}S6ajuIz_8bK0kEy=osMbTb^y?h1&A1XQOB7xVu@PJuOypQ z%t`$hKwzE>V5gfZ1Avj&u(Z_MDgi*3fOWtfKyn4J&9&nFs#gFndNBojMTEk}Tr{q8 ze#{*PKz~<&YOCe0KW+{Ruo;Pd7a$tF*Goih)HH4|!+<~|asloY0Bw-~+=ijX19MIq zyY4EC1pr#@3PAIgXWlj!0H6{8o*nLat~<>+k*vLKek1^+X7o{jfeXMl7XfIVIE{Pxx~p#WeO1)yPQy zjm4bCs^b8385E+9^F)ADsbo?xOO=Y|8&xdGZ;=NQ0Z?-mU<5#$54N{};5`GVL;xD9 z@mH#lm){C<2BiU!L8i`88(9=+c>P&`+JxM`uf4#{23~R)ivgGlz?XbZOnFoZ1e5~A zK7b&4Hv=l|h5`d|ED_)|7Z`sOfIwI(;l6kPd^CQ}X3c3XEJC~wKx@DSi50FF&@aLO z_%v34Pv;qPN(c)i3_$aJMQDlV5XXJNJO}6mfR}#)1kt|_Kuz-$wkwrI=0X7cbFdHK zD*+h2n$s9jNcuS`017rhj4`98Xr4ho*$<$R+tG9Fk$PEoZ9bl8LVzIUIJY7eb3R8Q zfHam-0pxo?0Wi2$0I7aI^p5kLq(6tBCwqmj7gqycETUt@Ifwo3 Z_Ajc_twzbKqJ01W002ovPDHLkV1g;``aS>v literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/old/itemLiquidConduitEnder.png b/resources/assets/enderio/textures/items/old/itemLiquidConduitEnder.png new file mode 100644 index 0000000000000000000000000000000000000000..a86f42fbb990a9f37742c8bc8240ebc77086884a GIT binary patch literal 1202 zcmV;j1Wo&iP)N2bPDNB8 zb~7$DE-^4L^m3s900b^cL_t(oN3ECHQrkcfMX5?c76{7&TfQNckU-cB6vh-4Ln!K7*%u@n`rw&b=+QG_oWI2oJYpjitG#dwN>Z$g}15{THhr`=e`%_tdBU zOIz!Y(8gyu(s$(f%7^}&&E@{Y&U$|`x$z+3p5EJ?wLcTd_1@I(Mn9}Xqo zAqCB6)5+dkI@z85x^p)-sC2Yu_P2k}>~D$Y)5*J79jJEi77kNg9D9=he1%L10EuW` zx@ej5)upLkUzu9_+7r(!7%yF3m_qa1ot?9RZXT^2?}FbS7*2;himh= zk0QiWDiH)=2Q?AV2`ZGUXVJZFAmBF%uyGrkW-+tkQVEoN$F!)8sJ$ zMF^Eb44V2;)3_;f6kDx$fXbB}`L&n!B8+Kn11N--i2-B&r&05Mnllh;Ar3&yJMAFA z#p3|{$R7Yu?{rM#reo@WAOH)J08z#Pb60Atrechga}F9;kztAe(+V)Uy66C4TQzQO z%=zsN06LKXA!9e{D04wL4a`dZZ8oz zQPcRG83qIzkpqxW0JKE{a2p0156n4f^v{>7mdtR$w0i5XF$Zu~=3-SRr z!vHi4tT#+(o~c?78yAHC(cE5t2f(d*7eG>vouvRgSAf?x03VwY9VX;apKzxYs_YzH z2pb^Zuv;#oR{*JgEk1tk6g|i<%1%`{Q$HE9FR!i|04QD5CE^n3h@0bYmNwEfdm0)KCB2W@f_l~Cz$5} z9RslYPXIsq`vItFfx>pBa>!f&fFB3L0FDX3=+&IYh(glONdZu_0V0eUHAV9*`pIwr zjogl&Ymd~+x@+@sMH2$}DaW}Lv6%Bd3ISxWj0zy{0}6n_t^!E)d#QH|4{7&`4ia;S zW)B5;_ie8m0N~?z{vg#O1mD*J!rP0Z)RTzj^M|RP_g2hpIJUJS5FDiVtRAjSUx?(P zqR065iUYu}V`hOTLxr~&M@ybqM7E}P)G{*rNS%G}c0*}aI z1_r*}Ak29D#}zZ6pj3%#L`iUdT1k0gQ7S_~VrE{6o}X)oLYc9ish**s`)4O}psIPE zE{-7)?r*1TKzSCPh5@vp5;jwtm#XX}s@AtEt(;HZt7?R&y@2I@tlh9XMt@1&i@!O0I zGkR5zpYw2F>SU1izF2D_xCvb h2%K;fIN@GBr}4(JqIKUBdVwxw@O1TaS?83{1OPV=YoGuC literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/old/itemMeConduitDense.png b/resources/assets/enderio/textures/items/old/itemMeConduitDense.png new file mode 100644 index 0000000000000000000000000000000000000000..e4f8db396791bd3bbf0047370166a2d5c15b1a75 GIT binary patch literal 4254 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzwj^(N7l!{JxM1({$v_d#0*}aI z1_r*}Ak29D#}zZ6AbW|YuPggKZhkIK8D{n=84L^p+MX_sArYL63Ig}vGx7;*{0Ax< zFu($`nO8t&KpgP-!xILu13Tuy9DC@NscizWzXwf+aW%UN}NBid4UA5B{*XAAsK12*3*>d`)Lq1Y)bz zU~5pn>+no-DN#IW(14R!#w96*f0)KDYnZWDB5 RI)4+$EKgTImvv4FO#rX}Tb=*_ literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/old/itemPowerConduit.png b/resources/assets/enderio/textures/items/old/itemPowerConduit.png new file mode 100644 index 0000000000000000000000000000000000000000..1a34f41e84c1b7fc7afc36f92823ce5580872c11 GIT binary patch literal 1305 zcmV+!1?KvRP)N2bPDNB8 zb~7$DE-^7j^FlWO00fmuL_t(YOQn|UPuo@)#{2KE!H^KCkhrE3Ft#QRBMrfc?{^>D z;agSp!#?fPR;CKAsKB}v+K$n#EnT2fK?KGaw{RPymv#GJ_SjC08xS4g)f4OFoa5)0 z_ltuPan)E> z(BlqP%DW{JfeEYvh70iB8yg#2T3Vvf=%rGib%HuRuI%xJ`QANIn7}GvTtLZ?6tEcR z?(UAq;|Vt?DuGrkc1)l4Ud9ze6~cTfLE(0ozzT-2g}Dm=4XFW+;p=_LAv!b4uyx%Z$Apa2i-;lugO;PVN?0W!X96zTS>z1=`=fKz}_L^qo zd9k&%6$J%jDw8dU(!OrIJrTgNiT?vwvz$F=5R5&`S<}r~LAoYHr6)k7gAbC+9 zAE3YN{Tu*1-6L00NMg%P;^?0^3qUUcw(Z~d`dXZ7Z*KLc)eHZ?V&(bd)U zD3e{2)mH{NFJOun@yEgxGd)Tvrs?eOl7bhadH_naY?7Zv>6`vEN(9rMo*sV*LzNz9 z*;QFREWdHp0E*7wDzWp5Hkx6ugu%D1tq0(OWv6QMJMMb;XO!rIsw3%aWmDA2X|RBc8HDj z>XqgEP3%8S05mM!X9IXiI19Qlg;$|JjmcmP_opB6;<9e;U^VpC#MfB6Ol!#naAyV- zy|>|+q#z0Zd7b73sGu8LYTaU(4IEyMUi`!>ssa;0h52hnqbrmrWDZTk2eJGM}+ zs91u!OobGuJ_~=XP$Ch-^AnH9DvvFv9K6cv2o$~4(SDMG$nKhTAwFm}#>N#Kq+0w7Q_1cs{)-=SoOsHyo6W04DoYOCS5 P00000NkvXXu0mjf?0;EG literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/old/itemPowerConduitEnder.png b/resources/assets/enderio/textures/items/old/itemPowerConduitEnder.png new file mode 100644 index 0000000000000000000000000000000000000000..b9e9bc3ac52c83d5c43a24466d486399528b6202 GIT binary patch literal 1436 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 literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/old/itemRedstoneInsulatedConduit.png b/resources/assets/enderio/textures/items/old/itemRedstoneInsulatedConduit.png new file mode 100644 index 0000000000000000000000000000000000000000..e272fe23a0e0a55e1d6b2a7342f093728fa4aa23 GIT binary patch literal 1832 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 literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/old/modItemFilter.png b/resources/assets/enderio/textures/items/old/modItemFilter.png new file mode 100644 index 0000000000000000000000000000000000000000..6568d2621a95f6faba52bbc90d27e7a2eae7018c GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3 zQ$0figD*u3fvR?Rx;Tbd_@A9%%Xi2?q`A0d6O(jPZ?l1c%UuE24r_<XTpwMEu#N*$So(G>b zpHM84;=RF8p5KbOrBuwRLiZuVY>UDz8fSeEzT9_DUU%^}ruVhx0R=&C&oCsuF=S`k z#?+z8b?Nd~v$J8++6R5*9j4x6dA7M^ZmTBCm-!cF)VFBv_0$jeYWjoOvYb_gN8qV& SS_Bi&4-B5JelF{r5}E+~Aa@@C literal 0 HcmV?d00001 diff --git a/src/main/java/crazypants/.gitignore b/src/main/java/crazypants/.gitignore new file mode 100644 index 00000000..d6306fb6 --- /dev/null +++ b/src/main/java/crazypants/.gitignore @@ -0,0 +1 @@ +/Crap.java From 9f2692153794401c675cfdb05fcda8fef2cceabd Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Thu, 5 Feb 2015 21:23:33 -0500 Subject: [PATCH 73/79] Fix painted glowstone and lights dropping the wrong items --- .../enderio/machine/light/BlockElectricLight.java | 5 +++++ .../enderio/machine/painter/BlockPaintedGlowstone.java | 7 +++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/java/crazypants/enderio/machine/light/BlockElectricLight.java b/src/main/java/crazypants/enderio/machine/light/BlockElectricLight.java index 37ad51ea..e878b6b3 100644 --- a/src/main/java/crazypants/enderio/machine/light/BlockElectricLight.java +++ b/src/main/java/crazypants/enderio/machine/light/BlockElectricLight.java @@ -199,6 +199,11 @@ public class BlockElectricLight extends BlockEio implements IRedstoneConnectable drop.setItemDamage(meta); } + @Override + public boolean doNormalDrops(World world, int x, int y, int z) { + return false; + } + @Override public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) { TileEntity te = world.getTileEntity(x, y, z); diff --git a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedGlowstone.java b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedGlowstone.java index b741730c..dbcff41d 100644 --- a/src/main/java/crazypants/enderio/machine/painter/BlockPaintedGlowstone.java +++ b/src/main/java/crazypants/enderio/machine/painter/BlockPaintedGlowstone.java @@ -11,7 +11,6 @@ import net.minecraft.client.particle.EntityDiggingFX; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.item.EntityItem; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -217,10 +216,10 @@ public class BlockPaintedGlowstone extends BlockEio implements ITileEntityProvid drop.stackTagCompound = (NBTTagCompound) itemStack.stackTagCompound.copy(); } } - + @Override - public int quantityDropped(Random par1Random) { - return 0; // need to do custom dropping to maintain source metadata + public boolean doNormalDrops(World world, int x, int y, int z) { + return false; } @Override From 1fe8acc000519f8d3f0b491e8bd4498971e66716 Mon Sep 17 00:00:00 2001 From: HenryLoenwind Date: Fri, 6 Feb 2015 17:13:56 +0100 Subject: [PATCH 74/79] * Fixed tooltip position * Tooltip for "Priority" field in item conduit GUI was off --- .../crazypants/enderio/conduit/gui/item/ItemSettings.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/crazypants/enderio/conduit/gui/item/ItemSettings.java b/src/main/java/crazypants/enderio/conduit/gui/item/ItemSettings.java index ffb90568..67b016b4 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/item/ItemSettings.java +++ b/src/main/java/crazypants/enderio/conduit/gui/item/ItemSettings.java @@ -134,6 +134,8 @@ public class ItemSettings extends BaseSettingsPanel { loopB.setUnselectedToolTip(Lang.localize("gui.conduit.item.selfFeedDisabled")); loopB.setPaintSelectedBorder(false); + priorityTooltip = new GuiToolTip(new Rectangle(priLeft + 9, y, priWidth, 16), Lang.localize("gui.conduit.item.priority")); + x = priLeft + priWidth + 9; priUpB = new IconButtonEIO(gui, ID_PRIORITY_UP, x, y, IconEIO.ADD_BUT); priUpB.setSize(8, 8); @@ -142,8 +144,6 @@ public class ItemSettings extends BaseSettingsPanel { priDownB = new IconButtonEIO(gui, ID_PRIORITY_DOWN, x, y, IconEIO.MINUS_BUT); priDownB.setSize(8, 8); - priorityTooltip = new GuiToolTip(new Rectangle(priLeft + 9, y, priWidth, 20), Lang.localize("gui.conduit.item.priority")); - gui.getContainer().addFilterListener(new FilterChangeListener() { @Override From 28c919ee09ec4e6f88773df1b5043d8f649bd00e Mon Sep 17 00:00:00 2001 From: Matthias Mann Date: Fri, 6 Feb 2015 23:18:30 +0100 Subject: [PATCH 75/79] allow shift click on side config button to reset all sides to default --- resources/assets/enderio/lang/en_US.lang | 2 + .../enderio/gui/ToggleButtonEIO.java | 15 +++--- .../crazypants/enderio/gui/TooltipAddera.java | 17 +++---- .../machine/AbstractMachineEntity.java | 10 ++++ .../enderio/machine/IIoConfigurable.java | 2 + .../enderio/machine/PacketIoMode.java | 23 +++++++-- .../enderio/machine/buffer/TileBuffer.java | 8 +++ .../enderio/machine/capbank/GuiCapBank.java | 37 +++----------- .../enderio/machine/capbank/TileCapBank.java | 17 +++++++ .../machine/gui/GuiButtonIoConfig.java | 51 +++++++++++++++++++ .../enderio/machine/gui/GuiMachineBase.java | 32 +++--------- .../machine/gui/GuiOverlayIoConfig.java | 10 +++- .../machine/power/TileCapacitorBank.java | 12 +++++ 13 files changed, 160 insertions(+), 76 deletions(-) create mode 100644 src/main/java/crazypants/enderio/machine/gui/GuiButtonIoConfig.java diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index 1906d381..df40096c 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -722,6 +722,8 @@ enderio.gui.machine.button.retrievelevels=Retrieve 10 enderio.gui.machine.tooltip.retrievelevels=player XP levels enderio.gui.machine.button.retrieveall=Retrieve all enderio.gui.machine.ioMode.overlay.tooltip=Configure IO +enderio.gui.machine.ioMode.overlay.tooltip.visible.line1=Shift click to reset all sides +enderio.gui.machine.ioMode.overlay.tooltip.visible.line2=to their default setting enderio.gui.machine.ioMode.none=None enderio.gui.machine.ioMode.pull=Pull enderio.gui.machine.ioMode.push=Push diff --git a/src/main/java/crazypants/enderio/gui/ToggleButtonEIO.java b/src/main/java/crazypants/enderio/gui/ToggleButtonEIO.java index 097f2fbd..9b37fca7 100644 --- a/src/main/java/crazypants/enderio/gui/ToggleButtonEIO.java +++ b/src/main/java/crazypants/enderio/gui/ToggleButtonEIO.java @@ -6,8 +6,8 @@ import crazypants.gui.IGuiScreen; public class ToggleButtonEIO extends IconButtonEIO { private boolean selected; - private IconEIO unselectedIcon; - private IconEIO selectedIcon; + private final IconEIO unselectedIcon; + private final IconEIO selectedIcon; private String[] selectedTooltip; private String[] unselectedTooltip; @@ -52,12 +52,15 @@ public class ToggleButtonEIO extends IconButtonEIO { @Override public boolean mousePressed(Minecraft par1Minecraft, int par2, int par3) { - boolean result = super.mousePressed(par1Minecraft, par2, par3); - if(result) { - setSelected(!selected); + if(super.mousePressed(par1Minecraft, par2, par3)) { + return toggleSelected(); } - return result; + return false; + } + protected boolean toggleSelected() { + setSelected(!selected); + return true; } public void setSelectedToolTip(String... tt) { diff --git a/src/main/java/crazypants/enderio/gui/TooltipAddera.java b/src/main/java/crazypants/enderio/gui/TooltipAddera.java index cc8820b2..ede5a5a7 100644 --- a/src/main/java/crazypants/enderio/gui/TooltipAddera.java +++ b/src/main/java/crazypants/enderio/gui/TooltipAddera.java @@ -44,10 +44,10 @@ import crazypants.util.Lang; public class TooltipAddera { - public static TooltipAddera instance = new TooltipAddera(); + public static final TooltipAddera instance = new TooltipAddera(); //TODO: Need to decouple this stuff with a callback - private BallTipProvider btp = new BallTipProvider(); + private final BallTipProvider btp = new BallTipProvider(); static { MinecraftForge.EVENT_BUS.register(instance); @@ -96,11 +96,11 @@ public class TooltipAddera { IGrindingMultiplier gb = CrusherRecipeManager.getInstance().getGrindballFromStack(evt.itemStack); if(gb != null) { btp.ball = gb; - TooltipAddera.instance.addInformation(btp, evt.itemStack, evt.entityPlayer, evt.toolTip, false); + addInformation(btp, evt.itemStack, evt.entityPlayer, evt.toolTip, false); } if(Config.addRegisterdNameTooltip) { - UniqueIdentifier uid = null; + UniqueIdentifier uid; Block block = Block.getBlockFromItem(evt.itemStack.getItem()); if(block != null && block != Blocks.air) { uid = GameRegistry.findUniqueIdentifierFor(block); @@ -259,19 +259,18 @@ public class TooltipAddera { } public static void addDetailedTooltipFromResources(List list, String unlocalizedName) { - addTooltipFromResources(list, unlocalizedName, ".tooltip.detailed.line"); + addTooltipFromResources(list, unlocalizedName.concat(".tooltip.detailed.line")); } public static void addBasicTooltipFromResources(List list, String unlocalizedName) { - addTooltipFromResources(list, unlocalizedName, ".tooltip.basic.line"); + addTooltipFromResources(list, unlocalizedName.concat(".tooltip.basic.line")); } public static void addCommonTooltipFromResources(List list, String unlocalizedName) { - addTooltipFromResources(list, unlocalizedName, ".tooltip.common.line"); + addTooltipFromResources(list, unlocalizedName.concat(".tooltip.common.line")); } - public static void addTooltipFromResources(List list, String unlocalizedName, String tooltipTag) { - String keyBase = unlocalizedName + tooltipTag; + public static void addTooltipFromResources(List list, String keyBase) { boolean done = false; int line = 1; while (!done) { diff --git a/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java b/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java index 51fa28d7..42f14752 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java +++ b/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java @@ -108,6 +108,16 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi updateBlock(); } + @Override + public void clearAllIoModes() { + if(faceModes != null) { + faceModes = null; + forceClientUpdate = true; + notifyNeighbours = true; + updateBlock(); + } + } + @Override public IoMode getIoMode(ForgeDirection face) { if(faceModes == null) { diff --git a/src/main/java/crazypants/enderio/machine/IIoConfigurable.java b/src/main/java/crazypants/enderio/machine/IIoConfigurable.java index f520c9bf..f18e8ad9 100644 --- a/src/main/java/crazypants/enderio/machine/IIoConfigurable.java +++ b/src/main/java/crazypants/enderio/machine/IIoConfigurable.java @@ -13,6 +13,8 @@ public interface IIoConfigurable { public IoMode getIoMode(ForgeDirection face) ; + public void clearAllIoModes(); + BlockCoord getLocation(); } diff --git a/src/main/java/crazypants/enderio/machine/PacketIoMode.java b/src/main/java/crazypants/enderio/machine/PacketIoMode.java index 0744018f..57cb0c2c 100644 --- a/src/main/java/crazypants/enderio/machine/PacketIoMode.java +++ b/src/main/java/crazypants/enderio/machine/PacketIoMode.java @@ -7,6 +7,7 @@ import net.minecraftforge.common.util.ForgeDirection; 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.util.BlockCoord; public class PacketIoMode implements IMessage, IMessageHandler { @@ -19,10 +20,20 @@ public class PacketIoMode implements IMessage, IMessageHandler coords = new ArrayList(); if(network != null && network.getMembers().size() < 200) { for (TileCapBank cb : network.getMembers()) { @@ -160,13 +155,6 @@ public class GuiCapBank extends GuiContainerBase { 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) { @@ -176,19 +164,11 @@ public class GuiCapBank extends GuiContainerBase { } 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); - } + y += 20; + configB = new GuiButtonIoConfig(this, CONFIG_ID, x, y, te, configOverlay); } @Override @@ -197,16 +177,13 @@ public class GuiCapBank extends GuiContainerBase { 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; + int x = guiLeft + inputX; + int y = guiTop + inputY; maxInputTF = new GuiTextField(fontRenderer, x, y, 68, 16); maxInputTF.setCanLoseFocus(true); maxInputTF.setMaxStringLength(10); diff --git a/src/main/java/crazypants/enderio/machine/capbank/TileCapBank.java b/src/main/java/crazypants/enderio/machine/capbank/TileCapBank.java index a05c5dbd..25a19265 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/TileCapBank.java +++ b/src/main/java/crazypants/enderio/machine/capbank/TileCapBank.java @@ -300,6 +300,23 @@ public class TileCapBank extends TileEntityEio implements IInternalPowerHandler, } } + @Override + public void clearAllIoModes() { + if(network != null) { + for(TileCapBank cb : network.getMembers()) { + cb.doClearAllIoModes(); + } + } else { + doClearAllIoModes(); + } + } + + private void doClearAllIoModes() { + for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + setDefaultIoMode(dir); + } + } + @Override public IoMode getIoMode(ForgeDirection face) { if(faceModes == null) { diff --git a/src/main/java/crazypants/enderio/machine/gui/GuiButtonIoConfig.java b/src/main/java/crazypants/enderio/machine/gui/GuiButtonIoConfig.java new file mode 100644 index 00000000..2c2d1242 --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/gui/GuiButtonIoConfig.java @@ -0,0 +1,51 @@ +package crazypants.enderio.machine.gui; + +import crazypants.enderio.gui.IconEIO; +import crazypants.enderio.gui.ToggleButtonEIO; +import crazypants.enderio.gui.TooltipAddera; +import crazypants.enderio.machine.IIoConfigurable; +import crazypants.enderio.machine.PacketIoMode; +import crazypants.enderio.network.PacketHandler; +import crazypants.gui.IGuiScreen; +import crazypants.util.Lang; +import java.util.ArrayList; +import org.lwjgl.input.Keyboard; + +public class GuiButtonIoConfig extends ToggleButtonEIO { + + private final IIoConfigurable config; + private final GuiOverlayIoConfig configOverlay; + + @SuppressWarnings("LeakingThisInConstructor") + public GuiButtonIoConfig(IGuiScreen gui, int id, int x, int y, IIoConfigurable config, GuiOverlayIoConfig configOverlay) { + super(gui, id, x, y, IconEIO.IO_CONFIG_UP, IconEIO.IO_CONFIG_DOWN); + this.config = config; + this.configOverlay = configOverlay; + this.configOverlay.setConfigB(this); + + String configTooltip = Lang.localize("gui.machine.ioMode.overlay.tooltip"); + setUnselectedToolTip(configTooltip); + + ArrayList list = new ArrayList(); + list.add(configTooltip); + TooltipAddera.addTooltipFromResources(list, "enderio.gui.machine.ioMode.overlay.tooltip.visible.line"); + if(list.size() > 1) { + setSelectedToolTip(list.toArray(new String[list.size()])); + } + } + + @Override + protected boolean toggleSelected() { + if(Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT)) { + if(!configOverlay.isVisible()) { + return false; + } + config.clearAllIoModes(); + PacketHandler.INSTANCE.sendToServer(new PacketIoMode(config)); + } else { + boolean vis = !configOverlay.isVisible(); + configOverlay.setVisible(vis); + } + return true; + } +} diff --git a/src/main/java/crazypants/enderio/machine/gui/GuiMachineBase.java b/src/main/java/crazypants/enderio/machine/gui/GuiMachineBase.java index d957be46..0dd43b59 100644 --- a/src/main/java/crazypants/enderio/machine/gui/GuiMachineBase.java +++ b/src/main/java/crazypants/enderio/machine/gui/GuiMachineBase.java @@ -16,7 +16,6 @@ import crazypants.enderio.gui.IconButtonEIO; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.gui.IoConfigRenderer.SelectedFace; import crazypants.enderio.gui.RedstoneModeButton; -import crazypants.enderio.gui.ToggleButtonEIO; import crazypants.enderio.machine.AbstractMachineEntity; import crazypants.enderio.machine.IoMode; import crazypants.enderio.machine.SlotDefinition; @@ -42,7 +41,7 @@ public abstract class GuiMachineBase extends Gu private final GuiOverlayIoConfig configOverlay; - protected ToggleButtonEIO configB; + protected final GuiButtonIoConfig configB; protected IconButtonEIO recipeButton; @@ -59,37 +58,18 @@ public abstract class GuiMachineBase extends Gu int y = 5; redstoneButton = new RedstoneModeButton(this, -1, x, y, tileEntity, new BlockCoord(tileEntity)); - y += 19; - configB = new ToggleButtonEIO(this, CONFIG_ID, x, y, IconEIO.IO_CONFIG_UP, IconEIO.IO_CONFIG_DOWN); - configB.setToolTip(Lang.localize("gui.machine.ioMode.overlay.tooltip")); - - configOverlay = new GuiOverlayIoConfig(machine) { - - @Override - public void setVisible(boolean visible) { - super.setVisible(visible); - configB.setSelected(visible); - } - - }; + configOverlay = new GuiOverlayIoConfig(machine); addOverlay(configOverlay); - + + y += 19; + configB = new GuiButtonIoConfig(this, CONFIG_ID, x, y, machine, configOverlay); + y += 19; - recipeButton = new IconButtonEIO(this, RECIPE_ID, x, y, IconEIO.RECIPE); recipeButton.visible = false; recipeButton.setIconMargin(3, 3); } - @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(); diff --git a/src/main/java/crazypants/enderio/machine/gui/GuiOverlayIoConfig.java b/src/main/java/crazypants/enderio/machine/gui/GuiOverlayIoConfig.java index 7d26b3c2..a53c8e2e 100644 --- a/src/main/java/crazypants/enderio/machine/gui/GuiOverlayIoConfig.java +++ b/src/main/java/crazypants/enderio/machine/gui/GuiOverlayIoConfig.java @@ -11,6 +11,7 @@ import net.minecraft.client.gui.ScaledResolution; import crazypants.enderio.gui.IGuiOverlay; import crazypants.enderio.gui.IoConfigRenderer; import crazypants.enderio.gui.IoConfigRenderer.SelectedFace; +import crazypants.enderio.gui.ToggleButtonEIO; import crazypants.enderio.machine.IIoConfigurable; import crazypants.enderio.machine.IoMode; import crazypants.gui.IGuiScreen; @@ -21,6 +22,7 @@ import crazypants.util.BlockCoord; public class GuiOverlayIoConfig implements IGuiOverlay { private boolean visible = false; + private ToggleButtonEIO configB; private IGuiScreen screen; @@ -39,6 +41,10 @@ public class GuiOverlayIoConfig implements IGuiOverlay { coords.addAll(bc); } + public void setConfigB(ToggleButtonEIO configB) { + this.configB = configB; + } + @Override public void init(IGuiScreen screen) { this.screen = screen; @@ -98,7 +104,9 @@ public class GuiOverlayIoConfig implements IGuiOverlay { @Override public void setVisible(boolean visible) { this.visible = visible; - + if(configB != null) { + configB.setSelected(visible); + } } @Override diff --git a/src/main/java/crazypants/enderio/machine/power/TileCapacitorBank.java b/src/main/java/crazypants/enderio/machine/power/TileCapacitorBank.java index d661d7f1..84e9fdbd 100644 --- a/src/main/java/crazypants/enderio/machine/power/TileCapacitorBank.java +++ b/src/main/java/crazypants/enderio/machine/power/TileCapacitorBank.java @@ -143,6 +143,18 @@ public class TileCapacitorBank extends TileEntityEio implements IInternalPowerHa 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; From c819c0db416ea8a58299f89f2d7979e712baf31a Mon Sep 17 00:00:00 2001 From: HenryLoenwind Date: Sat, 7 Feb 2015 17:02:52 +0100 Subject: [PATCH 76/79] Fixed WAILA tooltip of photo cell * Energy storage is no longer added twice to the tooltip --- .../java/crazypants/enderio/machine/solar/BlockSolarPanel.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/main/java/crazypants/enderio/machine/solar/BlockSolarPanel.java b/src/main/java/crazypants/enderio/machine/solar/BlockSolarPanel.java index d33ef44b..f2321179 100644 --- a/src/main/java/crazypants/enderio/machine/solar/BlockSolarPanel.java +++ b/src/main/java/crazypants/enderio/machine/solar/BlockSolarPanel.java @@ -140,9 +140,6 @@ public class BlockSolarPanel extends BlockEio implements IResourceTooltipProvide if(te instanceof TileEntitySolarPanel) { TileEntitySolarPanel solar = (TileEntitySolarPanel) te; float efficiency = solar.calculateLightRatio(); - EnergyStorage storage = new EnergyStorage(Integer.MAX_VALUE); - storage.readFromNBT(WailaCompat.getNBTData()); - tooltip.add(storage.getEnergyStored() + " / " + WailaCompat.getNBTData().getInteger("rfCap") + " RF"); tooltip.add(String.format("%s : %s%.0f%%", EnumChatFormatting.WHITE + Lang.localize("tooltip.efficiency") + EnumChatFormatting.RESET, EnumChatFormatting.WHITE, efficiency * 100)); } From d3edb1dbf22755728553165c604b65a21a0510f2 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Sat, 7 Feb 2015 13:14:44 -0500 Subject: [PATCH 77/79] Actually fix WAILA issues. Use serverside NBT hook instead of synced key --- .../crazypants/enderio/waila/WailaCompat.java | 96 ++++++++++--------- 1 file changed, 50 insertions(+), 46 deletions(-) diff --git a/src/main/java/crazypants/enderio/waila/WailaCompat.java b/src/main/java/crazypants/enderio/waila/WailaCompat.java index c8054270..0f06083c 100644 --- a/src/main/java/crazypants/enderio/waila/WailaCompat.java +++ b/src/main/java/crazypants/enderio/waila/WailaCompat.java @@ -23,6 +23,7 @@ import net.minecraft.world.World; import net.minecraft.world.WorldSettings; import net.minecraft.world.chunk.IChunkProvider; import net.minecraftforge.common.util.ForgeDirection; +import crazypants.enderio.BlockEio; import crazypants.enderio.EnderIO; import crazypants.enderio.TileEntityEio; import crazypants.enderio.block.BlockDarkSteelAnvil; @@ -41,15 +42,16 @@ import crazypants.enderio.machine.IoMode; import crazypants.enderio.machine.capbank.TileCapBank; import crazypants.enderio.machine.power.TileCapacitorBank; import crazypants.enderio.power.IInternalPoweredTile; +import crazypants.enderio.power.IPowerContainer; import crazypants.util.IFacade; import crazypants.util.Lang; import static crazypants.enderio.waila.IWailaInfoProvider.*; public class WailaCompat implements IWailaDataProvider { - + private class WailaWorldWrapper extends World { private World wrapped; - + private WailaWorldWrapper(World wrapped) { super(wrapped.getSaveHandler(), wrapped.getWorldInfo().getWorldName(), wrapped.provider, new WorldSettings(wrapped.getWorldInfo()), wrapped.theProfiler); this.wrapped = wrapped; @@ -59,21 +61,21 @@ public class WailaCompat implements IWailaDataProvider { @Override public Block getBlock(int x, int y, int z) { Block block = wrapped.getBlock(x, y, z); - if (block instanceof IFacade) { - return ((IFacade)block).getFacade(wrapped, x, y, z, -1); + if(block instanceof IFacade) { + return ((IFacade) block).getFacade(wrapped, x, y, z, -1); } return block; } - + @Override public int getBlockMetadata(int x, int y, int z) { Block block = wrapped.getBlock(x, y, z); - if (block instanceof IFacade) { - return ((IFacade)block).getFacadeMetadata(wrapped, x, y, z, -1); + if(block instanceof IFacade) { + return ((IFacade) block).getFacadeMetadata(wrapped, x, y, z, -1); } return wrapped.getBlockMetadata(x, y, z); } - + @Override public TileEntity getTileEntity(int p_147438_1_, int p_147438_2_, int p_147438_3_) { return wrapped.getTileEntity(p_147438_1_, p_147438_2_, p_147438_3_); @@ -96,24 +98,17 @@ public class WailaCompat implements IWailaDataProvider { } public static final WailaCompat INSTANCE = new WailaCompat(); - + private static IWailaDataAccessor _accessor = null; - + public static void load(IWailaRegistrar registrar) { registrar.registerStackProvider(INSTANCE, IFacade.class); registrar.registerStackProvider(INSTANCE, BlockDarkSteelAnvil.class); - registrar.registerHeadProvider(INSTANCE, Block.class); - registrar.registerBodyProvider(INSTANCE, Block.class); - registrar.registerTailProvider(INSTANCE, Block.class); - + registrar.registerBodyProvider(INSTANCE, BlockEio.class); + registrar.registerNBTProvider(INSTANCE, TileEntityEio.class); - registrar.registerSyncedNBTKey("controllerStoredEnergyRF", TileCapacitorBank.class); - - // registrar.registerHeadProvider(INSTANCE, IInternalPowerReceptor.class); - // registrar.registerSyncedNBTKey("*", IInternalPowerReceptor.class); - ConfigHandler.instance().addConfig(EnderIO.MOD_NAME, "facades.hidden", Lang.localize("waila.config.hiddenfacades")); IWailaInfoProvider.fmt.setMaximumFractionDigits(1); } @@ -148,7 +143,7 @@ public class WailaCompat implements IWailaDataProvider { @SuppressWarnings("unchecked") @Override public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - + _accessor = accessor; EntityPlayer player = accessor.getPlayer(); @@ -158,7 +153,7 @@ public class WailaCompat implements IWailaDataProvider { Block block = world.getBlock(x, y, z); TileEntity te = world.getTileEntity(x, y, z); Item item = Item.getItemFromBlock(block); - + // let's get rid of WAILA's default RF stuff, once that works ((ITaggedList) currenttip).removeEntries("RFEnergyStorage"); @@ -216,23 +211,7 @@ public class WailaCompat implements IWailaDataProvider { } } - if(te instanceof IInternalPoweredTile && block == accessor.getBlock() && accessor.getNBTData().hasKey("storedEnergyRF") && !(te instanceof TileCapBank)) { - IInternalPoweredTile power = (IInternalPoweredTile) te; - - if(power.displayPower()) { - - if(currenttip.size() > 4) { - currenttip.add(""); - } - - int stored = accessor.getTileEntity() instanceof TileCapacitorBank ? power.getEnergyStored() : accessor.getNBTData().getInteger("storedEnergyRF"); - int max = power.getMaxEnergyStored(); - - currenttip.add(String.format("%s%s%s / %s%s%s RF", EnumChatFormatting.WHITE, fmt.format(stored), EnumChatFormatting.RESET, EnumChatFormatting.WHITE, - fmt.format(max), - EnumChatFormatting.RESET)); - } - } else if(te instanceof IConduitBundle && itemStack != null && itemStack.getItem() == EnderIO.itemPowerConduit) { + if(te instanceof IConduitBundle && itemStack != null && itemStack.getItem() == EnderIO.itemPowerConduit) { NBTTagCompound nbtRoot = accessor.getNBTData(); short nbtVersion = nbtRoot.getShort("nbtVersion"); NBTTagList conduitTags = (NBTTagList) nbtRoot.getTag("conduits"); @@ -242,7 +221,8 @@ public class WailaCompat implements IWailaDataProvider { NBTTagCompound conduitTag = conduitTags.getCompoundTagAt(i); IConduit conduit = ConduitUtil.readConduitFromNBT(conduitTag, nbtVersion); if(conduit instanceof IPowerConduit) { - currenttip.add(String.format("%s%s%s / %s%s%s RF", EnumChatFormatting.WHITE, fmt.format(((IPowerConduit) conduit).getEnergyStored()), EnumChatFormatting.RESET, + currenttip.add(String.format("%s%s%s / %s%s%s RF", EnumChatFormatting.WHITE, fmt.format(((IPowerConduit) conduit).getEnergyStored()), + EnumChatFormatting.RESET, EnumChatFormatting.WHITE, fmt.format(((IConduitBundle) te).getMaxEnergyStored()), EnumChatFormatting.RESET)); } } @@ -265,18 +245,34 @@ public class WailaCompat implements IWailaDataProvider { int fluidAmount = tank.getFluidAmount(); if(fluidAmount > 0) { currenttip.add(String.format("%s%s%s%s %s%s%s %s", lockedStr, - EnumChatFormatting.WHITE, fluidName, EnumChatFormatting.RESET, - EnumChatFormatting.WHITE, fmt.format(fluidAmount), EnumChatFormatting.RESET, - Fluids.MB())); + EnumChatFormatting.WHITE, fluidName, EnumChatFormatting.RESET, + EnumChatFormatting.WHITE, fmt.format(fluidAmount), EnumChatFormatting.RESET, + Fluids.MB())); } else if(tankConduit.isFluidTypeLocked()) { currenttip.add(String.format("%s%s%s%s", lockedStr, - EnumChatFormatting.WHITE, fluidName, EnumChatFormatting.RESET)); + EnumChatFormatting.WHITE, fluidName, EnumChatFormatting.RESET)); } } break; } } } + } else if(te instanceof IInternalPoweredTile && block == accessor.getBlock() && !(te instanceof TileCapBank)) { + IInternalPoweredTile power = (IInternalPoweredTile) te; + + if(power.displayPower()) { + + if(currenttip.size() > 4) { + currenttip.add(""); + } + + int stored = accessor.getNBTData().getInteger("storedEnergyRF"); + int max = accessor.getNBTData().getInteger("maxStoredRF"); + + currenttip.add(String.format("%s%s%s / %s%s%s RF", EnumChatFormatting.WHITE, fmt.format(stored), EnumChatFormatting.RESET, EnumChatFormatting.WHITE, + fmt.format(max), + EnumChatFormatting.RESET)); + } } return currenttip; @@ -289,16 +285,24 @@ public class WailaCompat implements IWailaDataProvider { @Override public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { - if (te instanceof IWailaNBTProvider) { + if(te instanceof IWailaNBTProvider) { ((IWailaNBTProvider) te).getData(tag); } + if(te instanceof IInternalPoweredTile) { + tag.setInteger("storedEnergyRF", ((IPowerContainer) te).getEnergyStored()); + tag.setInteger("maxStoredRF", ((IInternalPoweredTile) te).getMaxEnergyStored()); + } + if(te instanceof IConduitBundle) { + te.writeToNBT(tag); + } + tag.setInteger("x", x); tag.setInteger("y", y); tag.setInteger("z", z); return tag; } - + public static NBTTagCompound getNBTData() { - return _accessor.getNBTData(); + return _accessor.getNBTData(); } } From 47ee2a70998cbf78e9477eb27f1b44217dc6c067 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Sat, 7 Feb 2015 13:30:19 -0500 Subject: [PATCH 78/79] Add WAILA min version --- src/main/java/crazypants/enderio/EnderIO.java | 14 ++++++++------ .../java/crazypants/enderio/waila/WailaCompat.java | 7 +++++-- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/main/java/crazypants/enderio/EnderIO.java b/src/main/java/crazypants/enderio/EnderIO.java index a9fa0ab9..7f744fa6 100644 --- a/src/main/java/crazypants/enderio/EnderIO.java +++ b/src/main/java/crazypants/enderio/EnderIO.java @@ -1,12 +1,15 @@ package crazypants.enderio; +import static crazypants.enderio.EnderIO.MODID; +import static crazypants.enderio.EnderIO.MOD_NAME; +import static crazypants.enderio.EnderIO.VERSION; + import java.io.BufferedWriter; import java.io.File; import java.io.FileWriter; import java.lang.reflect.Field; import java.util.List; -import crazypants.enderio.entity.SkeletonHandler; import net.minecraft.block.material.Material; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -23,11 +26,11 @@ import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod.EventHandler; import cpw.mods.fml.common.Mod.Instance; import cpw.mods.fml.common.SidedProxy; -import cpw.mods.fml.common.event.FMLLoadCompleteEvent; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLInterModComms; import cpw.mods.fml.common.event.FMLInterModComms.IMCEvent; import cpw.mods.fml.common.event.FMLInterModComms.IMCMessage; +import cpw.mods.fml.common.event.FMLLoadCompleteEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.event.FMLServerStartedEvent; @@ -63,6 +66,7 @@ import crazypants.enderio.enchantment.Enchantments; import crazypants.enderio.enderface.BlockEnderIO; import crazypants.enderio.enderface.EnderfaceRecipes; import crazypants.enderio.enderface.ItemEnderface; +import crazypants.enderio.entity.SkeletonHandler; import crazypants.enderio.fluid.BlockFluidEio; import crazypants.enderio.fluid.FluidFuelRegister; import crazypants.enderio.fluid.Fluids; @@ -149,11 +153,8 @@ import crazypants.enderio.teleport.ItemTravelStaff; import crazypants.enderio.teleport.TeleportRecipes; import crazypants.enderio.teleport.TravelController; import crazypants.util.EntityUtil; -import static crazypants.enderio.EnderIO.MODID; -import static crazypants.enderio.EnderIO.MOD_NAME; -import static crazypants.enderio.EnderIO.VERSION; -@Mod(modid = MODID, name = MOD_NAME, version = VERSION, dependencies = "required-after:Forge@10.13.0.1150,);after:MineFactoryReloaded", guiFactory = "crazypants.enderio.config.ConfigFactoryEIO") +@Mod(modid = MODID, name = MOD_NAME, version = VERSION, dependencies = "required-after:Forge@10.13.0.1150,);after:MineFactoryReloaded;after:Waila@[1.5.8,)", guiFactory = "crazypants.enderio.config.ConfigFactoryEIO") public class EnderIO { public static final String MODID = "EnderIO"; @@ -626,6 +627,7 @@ public class EnderIO { return Config.xpJuiceName; } + @SuppressWarnings("unchecked") private void addModIntegration() { if(Loader.isModLoaded("TConstruct")) { diff --git a/src/main/java/crazypants/enderio/waila/WailaCompat.java b/src/main/java/crazypants/enderio/waila/WailaCompat.java index 0f06083c..7ce25435 100644 --- a/src/main/java/crazypants/enderio/waila/WailaCompat.java +++ b/src/main/java/crazypants/enderio/waila/WailaCompat.java @@ -1,5 +1,10 @@ package crazypants.enderio.waila; +import static crazypants.enderio.waila.IWailaInfoProvider.BIT_BASIC; +import static crazypants.enderio.waila.IWailaInfoProvider.BIT_COMMON; +import static crazypants.enderio.waila.IWailaInfoProvider.BIT_DETAILED; +import static crazypants.enderio.waila.IWailaInfoProvider.fmt; + import java.util.List; import mcp.mobius.waila.api.ITaggedList; @@ -40,12 +45,10 @@ import crazypants.enderio.gui.TooltipAddera; import crazypants.enderio.machine.IIoConfigurable; import crazypants.enderio.machine.IoMode; import crazypants.enderio.machine.capbank.TileCapBank; -import crazypants.enderio.machine.power.TileCapacitorBank; import crazypants.enderio.power.IInternalPoweredTile; import crazypants.enderio.power.IPowerContainer; import crazypants.util.IFacade; import crazypants.util.Lang; -import static crazypants.enderio.waila.IWailaInfoProvider.*; public class WailaCompat implements IWailaDataProvider { From a88c7e8ea12109cb861420b4d46f85784214e687 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Sat, 7 Feb 2015 13:30:38 -0500 Subject: [PATCH 79/79] Rename widgets to widgetsv2, add new item textures --- .../blocks/itemConduitIoConnector.png | Bin 0 -> 169 bytes .../gui/{widgets.png => widgetsv2.png} | Bin .../textures/items/activatedCapacitor.png | Bin 315 -> 1144 bytes .../textures/items/attractorCrystal.png | Bin 434 -> 1169 bytes .../enderio/textures/items/basicCapacitor.png | Bin 319 -> 1116 bytes .../enderio/textures/items/basicGear.png | Bin 431 -> 1510 bytes .../textures/items/binderComposite.png | Bin 518 -> 1108 bytes .../textures/items/bucketFire_water.png | Bin 349 -> 1299 bytes .../enderio/textures/items/bucketHootch.png | Bin 326 -> 1282 bytes .../items/bucketNutrient_distillation.png | Bin 294 -> 1267 bytes .../textures/items/bucketRocket_fuel.png | Bin 339 -> 1283 bytes .../enderio/textures/items/bucketXpjuice.png | Bin 1249 -> 1294 bytes .../enderio/textures/items/conductiveIron.png | Bin 507 -> 1495 bytes .../enderio/textures/items/conduitFacade.png | Bin 457 -> 1457 bytes .../textures/items/conduitFacadeOverlay.png | Bin 297 -> 1200 bytes .../textures/items/darkGrindingBall.png | Bin 366 -> 1240 bytes .../enderio/textures/items/darkSteel.png | Bin 429 -> 1329 bytes .../enderio/textures/items/darkSteel_axe.png | Bin 260 -> 1309 bytes .../textures/items/darkSteel_boots.png | Bin 240 -> 1243 bytes .../textures/items/darkSteel_chestplate.png | Bin 262 -> 1348 bytes .../textures/items/darkSteel_helmet.png | Bin 214 -> 1184 bytes .../enderio/textures/items/darkSteel_hoe.png | Bin 247 -> 1308 bytes .../textures/items/darkSteel_leggings.png | Bin 223 -> 1200 bytes .../textures/items/darkSteel_pickaxe.png | Bin 318 -> 1227 bytes .../textures/items/darkSteel_shovel.png | Bin 246 -> 1169 bytes .../textures/items/darkSteel_sword.png | Bin 288 -> 1687 bytes .../textures/items/darkSteel_swordAlt.png | Bin 0 -> 1674 bytes .../textures/items/darkSteel_swordAlt2.png | Bin 0 -> 1637 bytes .../textures/items/electricalSteel.png | Bin 445 -> 1320 bytes .../enderio/textures/items/enderCapacitor.png | Bin 329 -> 1200 bytes .../enderio/textures/items/enderCrystal.png | Bin 345 -> 1138 bytes .../enderio/textures/items/enderface.png | Bin 290 -> 1264 bytes .../enderio/textures/items/endermanSkull.png | Bin 252 -> 1118 bytes .../enderio/textures/items/energeticAlloy.png | Bin 1368 -> 1504 bytes .../textures/items/existingItemFilter.png | Bin 307 -> 1441 bytes .../textures/items/itemTravelStaff.png | Bin 629 -> 1352 bytes .../textures/items/itemTravelStaff_long.png | Bin 0 -> 1354 bytes .../enderio/textures/items/mJReader.png | Bin 439 -> 1252 bytes .../enderio/textures/items/mJReader_alt1.png | Bin 0 -> 1230 bytes .../enderio/textures/items/mJReader_alt2.png | Bin 0 -> 1262 bytes .../enderio/textures/items/machineChassi.png | Bin 687 -> 1681 bytes .../assets/enderio/textures/items/magnet.png | Bin 454 -> 1569 bytes .../textures/items/old/activatedCapacitor.png | Bin 0 -> 315 bytes .../textures/items/old/attractorCrystal.png | Bin 0 -> 434 bytes .../textures/items/old/basicCapacitor.png | Bin 0 -> 319 bytes .../enderio/textures/items/old/basicGear.png | Bin 0 -> 431 bytes .../textures/items/old/binderComposite.png | Bin 0 -> 518 bytes .../textures/items/old/bucketFire_water.png | Bin 0 -> 349 bytes .../textures/items/old/bucketHootch.png | Bin 0 -> 326 bytes .../items/old/bucketNutrient_distillation.png | Bin 0 -> 294 bytes .../textures/items/old/bucketRocket_fuel.png | Bin 0 -> 339 bytes .../textures/items/old/bucketXpjuice.png | Bin 0 -> 1249 bytes .../textures/items/old/conductiveIron.png | Bin 0 -> 507 bytes .../textures/items/old/conduitBinder.png | Bin 0 -> 528 bytes .../textures/items/old/conduitFacade.png | Bin 0 -> 457 bytes .../items/old/conduitFacadeOverlay.png | Bin 0 -> 297 bytes .../textures/items/old/darkGrindingBall.png | Bin 0 -> 366 bytes .../enderio/textures/items/old/darkSteel.png | Bin 0 -> 429 bytes .../textures/items/old/darkSteel_axe.png | Bin 0 -> 260 bytes .../textures/items/old/darkSteel_boots.png | Bin 0 -> 240 bytes .../items/old/darkSteel_chestplate.png | Bin 0 -> 262 bytes .../textures/items/old/darkSteel_helmet.png | Bin 0 -> 214 bytes .../textures/items/old/darkSteel_hoe.png | Bin 0 -> 247 bytes .../textures/items/old/darkSteel_leggings.png | Bin 0 -> 223 bytes .../textures/items/old/darkSteel_pickaxe.png | Bin 0 -> 318 bytes .../textures/items/old/darkSteel_shovel.png | Bin 0 -> 246 bytes .../textures/items/old/darkSteel_sword.png | Bin 0 -> 288 bytes .../textures/items/old/electricalSteel.png | Bin 0 -> 445 bytes .../textures/items/old/enderCapacitor.png | Bin 0 -> 329 bytes .../textures/items/old/enderCrystal.png | Bin 0 -> 345 bytes .../enderio/textures/items/old/enderface.png | Bin 0 -> 290 bytes .../textures/items/old/endermanSkull.png | Bin 0 -> 252 bytes .../textures/items/old/energeticAlloy.png | Bin 0 -> 1368 bytes .../textures/items/old/existingItemFilter.png | Bin 0 -> 307 bytes .../textures/items/old/itemTravelStaff.png | Bin 0 -> 629 bytes .../enderio/textures/items/old/mJReader.png | Bin 0 -> 439 bytes .../textures/items/old/machineChassi.png | Bin 0 -> 687 bytes .../enderio/textures/items/old/magnet.png | Bin 0 -> 454 bytes .../enderio/textures/items/old/phasedGold.png | Bin 0 -> 505 bytes .../enderio/textures/items/old/phasedIron.png | Bin 0 -> 503 bytes .../textures/items/old/phasedIronNugget.png | Bin 0 -> 307 bytes .../enderio/textures/items/old/powderCoal.png | Bin 0 -> 290 bytes .../textures/items/old/powderCopper.png | Bin 0 -> 407 bytes .../textures/items/old/powderEnder.png | Bin 0 -> 428 bytes .../enderio/textures/items/old/powderGold.png | Bin 0 -> 456 bytes .../enderio/textures/items/old/powderIron.png | Bin 0 -> 415 bytes .../enderio/textures/items/old/powderTin.png | Bin 0 -> 412 bytes .../textures/items/old/pulsatingCrystal.png | Bin 0 -> 431 bytes .../textures/items/old/redstoneAlloy.png | Bin 0 -> 527 bytes .../enderio/textures/items/old/silicon.png | Bin 0 -> 427 bytes .../items/old/skullEnderResonator.png | Bin 0 -> 266 bytes .../items/old/skullZombieController.png | Bin 0 -> 461 bytes .../items/old/skullZombieElectrode.png | Bin 0 -> 416 bytes .../enderio/textures/items/old/soulVessel.png | Bin 0 -> 245 bytes .../textures/items/old/soulVesselFilled.png | Bin 0 -> 300 bytes .../enderio/textures/items/old/soularium.png | Bin 0 -> 586 bytes .../textures/items/old/vibrantCrystal.png | Bin 0 -> 435 bytes .../textures/items/old/vibrantNugget.png | Bin 0 -> 309 bytes .../enderio/textures/items/old/xpTransfer.png | Bin 0 -> 309 bytes .../enderio/textures/items/old/yetaWrench.png | Bin 0 -> 447 bytes .../enderio/textures/items/phasedGold.png | Bin 505 -> 1440 bytes .../enderio/textures/items/phasedIron.png | Bin 503 -> 1438 bytes .../textures/items/phasedIronNugget.png | Bin 307 -> 1200 bytes .../enderio/textures/items/powderCoal.png | Bin 290 -> 1212 bytes .../enderio/textures/items/powderCopper.png | Bin 407 -> 1438 bytes .../enderio/textures/items/powderEnder.png | Bin 428 -> 1365 bytes .../enderio/textures/items/powderGold.png | Bin 456 -> 1247 bytes .../enderio/textures/items/powderIron.png | Bin 415 -> 1288 bytes .../enderio/textures/items/powderTin.png | Bin 412 -> 1256 bytes .../textures/items/pulsatingCrystal.png | Bin 431 -> 1305 bytes .../enderio/textures/items/redstoneAlloy.png | Bin 527 -> 1399 bytes .../assets/enderio/textures/items/silicon.png | Bin 427 -> 1334 bytes .../textures/items/skullZombieController.png | Bin 461 -> 1502 bytes .../textures/items/skullZombieElectrode.png | Bin 416 -> 1342 bytes .../enderio/textures/items/soulVessel.png | Bin 245 -> 1297 bytes .../textures/items/soulVesselFilled.png | Bin 300 -> 1348 bytes .../enderio/textures/items/soularium.png | Bin 586 -> 1430 bytes .../enderio/textures/items/upgradeBlank.png | Bin 0 -> 1422 bytes .../textures/items/upgradeBlank_alt.png | Bin 0 -> 1319 bytes .../enderio/textures/items/vibrantCrystal.png | Bin 435 -> 1310 bytes .../enderio/textures/items/vibrantNugget.png | Bin 309 -> 1260 bytes .../enderio/textures/items/xpTransfer.png | Bin 309 -> 1343 bytes .../enderio/textures/items/xpTransfer_alt.png | Bin 0 -> 1329 bytes .../enderio/textures/items/yetaWrench.png | Bin 447 -> 1462 bytes .../enderio/textures/items/yetaWrench_alt.png | Bin 0 -> 1484 bytes .../java/crazypants/enderio/gui/IconEIO.java | 2 +- .../enderio/xp/ExperienceBarRenderer.java | 3 ++- 127 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 resources/assets/enderio/textures/blocks/itemConduitIoConnector.png rename resources/assets/enderio/textures/gui/{widgets.png => widgetsv2.png} (100%) create mode 100644 resources/assets/enderio/textures/items/darkSteel_swordAlt.png create mode 100644 resources/assets/enderio/textures/items/darkSteel_swordAlt2.png create mode 100644 resources/assets/enderio/textures/items/itemTravelStaff_long.png create mode 100644 resources/assets/enderio/textures/items/mJReader_alt1.png create mode 100644 resources/assets/enderio/textures/items/mJReader_alt2.png create mode 100644 resources/assets/enderio/textures/items/old/activatedCapacitor.png create mode 100644 resources/assets/enderio/textures/items/old/attractorCrystal.png create mode 100644 resources/assets/enderio/textures/items/old/basicCapacitor.png create mode 100644 resources/assets/enderio/textures/items/old/basicGear.png create mode 100644 resources/assets/enderio/textures/items/old/binderComposite.png create mode 100644 resources/assets/enderio/textures/items/old/bucketFire_water.png create mode 100644 resources/assets/enderio/textures/items/old/bucketHootch.png create mode 100644 resources/assets/enderio/textures/items/old/bucketNutrient_distillation.png create mode 100644 resources/assets/enderio/textures/items/old/bucketRocket_fuel.png create mode 100644 resources/assets/enderio/textures/items/old/bucketXpjuice.png create mode 100644 resources/assets/enderio/textures/items/old/conductiveIron.png create mode 100644 resources/assets/enderio/textures/items/old/conduitBinder.png create mode 100644 resources/assets/enderio/textures/items/old/conduitFacade.png create mode 100644 resources/assets/enderio/textures/items/old/conduitFacadeOverlay.png create mode 100644 resources/assets/enderio/textures/items/old/darkGrindingBall.png create mode 100644 resources/assets/enderio/textures/items/old/darkSteel.png create mode 100644 resources/assets/enderio/textures/items/old/darkSteel_axe.png create mode 100644 resources/assets/enderio/textures/items/old/darkSteel_boots.png create mode 100644 resources/assets/enderio/textures/items/old/darkSteel_chestplate.png create mode 100644 resources/assets/enderio/textures/items/old/darkSteel_helmet.png create mode 100644 resources/assets/enderio/textures/items/old/darkSteel_hoe.png create mode 100644 resources/assets/enderio/textures/items/old/darkSteel_leggings.png create mode 100644 resources/assets/enderio/textures/items/old/darkSteel_pickaxe.png create mode 100644 resources/assets/enderio/textures/items/old/darkSteel_shovel.png create mode 100644 resources/assets/enderio/textures/items/old/darkSteel_sword.png create mode 100644 resources/assets/enderio/textures/items/old/electricalSteel.png create mode 100644 resources/assets/enderio/textures/items/old/enderCapacitor.png create mode 100644 resources/assets/enderio/textures/items/old/enderCrystal.png create mode 100644 resources/assets/enderio/textures/items/old/enderface.png create mode 100644 resources/assets/enderio/textures/items/old/endermanSkull.png create mode 100644 resources/assets/enderio/textures/items/old/energeticAlloy.png create mode 100644 resources/assets/enderio/textures/items/old/existingItemFilter.png create mode 100644 resources/assets/enderio/textures/items/old/itemTravelStaff.png create mode 100644 resources/assets/enderio/textures/items/old/mJReader.png create mode 100644 resources/assets/enderio/textures/items/old/machineChassi.png create mode 100644 resources/assets/enderio/textures/items/old/magnet.png create mode 100644 resources/assets/enderio/textures/items/old/phasedGold.png create mode 100644 resources/assets/enderio/textures/items/old/phasedIron.png create mode 100644 resources/assets/enderio/textures/items/old/phasedIronNugget.png create mode 100644 resources/assets/enderio/textures/items/old/powderCoal.png create mode 100644 resources/assets/enderio/textures/items/old/powderCopper.png create mode 100644 resources/assets/enderio/textures/items/old/powderEnder.png create mode 100644 resources/assets/enderio/textures/items/old/powderGold.png create mode 100644 resources/assets/enderio/textures/items/old/powderIron.png create mode 100644 resources/assets/enderio/textures/items/old/powderTin.png create mode 100644 resources/assets/enderio/textures/items/old/pulsatingCrystal.png create mode 100644 resources/assets/enderio/textures/items/old/redstoneAlloy.png create mode 100644 resources/assets/enderio/textures/items/old/silicon.png create mode 100644 resources/assets/enderio/textures/items/old/skullEnderResonator.png create mode 100644 resources/assets/enderio/textures/items/old/skullZombieController.png create mode 100644 resources/assets/enderio/textures/items/old/skullZombieElectrode.png create mode 100644 resources/assets/enderio/textures/items/old/soulVessel.png create mode 100644 resources/assets/enderio/textures/items/old/soulVesselFilled.png create mode 100644 resources/assets/enderio/textures/items/old/soularium.png create mode 100644 resources/assets/enderio/textures/items/old/vibrantCrystal.png create mode 100644 resources/assets/enderio/textures/items/old/vibrantNugget.png create mode 100644 resources/assets/enderio/textures/items/old/xpTransfer.png create mode 100644 resources/assets/enderio/textures/items/old/yetaWrench.png create mode 100644 resources/assets/enderio/textures/items/upgradeBlank.png create mode 100644 resources/assets/enderio/textures/items/upgradeBlank_alt.png create mode 100644 resources/assets/enderio/textures/items/xpTransfer_alt.png create mode 100644 resources/assets/enderio/textures/items/yetaWrench_alt.png diff --git a/resources/assets/enderio/textures/blocks/itemConduitIoConnector.png b/resources/assets/enderio/textures/blocks/itemConduitIoConnector.png new file mode 100644 index 0000000000000000000000000000000000000000..e9380465d0eb4f91a5118232197fecea82a796d8 GIT binary patch literal 169 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$0gN_s>q|Kvfc+E{-7<{>cVvf<0LZY#_{I#e3`+L&UL}jD=47-GOQtJYD@<);T3K F0RWHvDqjEq literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/gui/widgets.png b/resources/assets/enderio/textures/gui/widgetsv2.png similarity index 100% rename from resources/assets/enderio/textures/gui/widgets.png rename to resources/assets/enderio/textures/gui/widgetsv2.png diff --git a/resources/assets/enderio/textures/items/activatedCapacitor.png b/resources/assets/enderio/textures/items/activatedCapacitor.png index 113f5b4aa40c86b6bc62899a585a68235124e81a..2b86c6a5ce22ba6745ffb3f3819b7c36b6b162f1 100644 GIT binary patch literal 1144 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+m=!ZaB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc$WX!DQqR!T z#M01EN5ROz&{*HlK;Otx*U-?)#N5izOaTg%fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;NpiyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr7KMf<|~|UP^v> zu_jo#udkJ7UU5lcUUI6Zi>(sS0KLr26e|N$b8{0{Q&UGn16M;sR}%|kQv+8615+nw zCr2j(3pbcvm;B_?+|;}hnBEkGUNf9}K`9}(0BEyIYEfocYKmJ?ey#%8$5xrR-C~T> zJgD9j+-@UI2$*<4On9mVa^UGcH4m8Bi-4)Rdcvl8z#Q?`)5S5Q z;#Sh1|NrfoRU24mK7RJB?ToA0Ou@*c>+51~@H$+JiHP8M{^k4k|L*22^BMp9`uI4^ zdcdS`xInV$Dr^0}KZy?>2`2=Egr@)a_LBLYLBb)miid|-*$guy+njfv<(aeRkH$L1 zQw*xAs%`4);|))gh#B9h`Z9sh(x&6nq3QbZ5_Wcb&L8;uOf~Z&2lIUU`m_z(x2Gp0 zHCcRkadGhyNd~SX#_8t{{7g$rQ)y*<{Qmy_#7_1e|G8GI{yv(Vi92E&^eod4YVjB@ zN@DD8?D6pYZGVw%K{fBHnS${O|Bg=srZ%k&3`=iHDjZbP0 Hl+XkKtNnwa delta 288 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 delta 405 zcmV;G0c!r{3$Fu^B!2{FK}|sb0I`mI`%#ks001CkNK#Dz0D2_=0Dyx40Qvs_0D$QL z0Cg|`0P0`>06Lfe02gnPU&TfM000SaNLh0L01FQQ01FQRlKBIr0000QbVXQnQ*UN; zcVTj608n9RZgehAMN}YmGcGkQF)>H;LN@>a0RKruK~y+TjenCd5`r)gMY$6QQiuw+ zUcl0d1JFZZkENZLu=H+mUYyS)Kr%41lS%UT?fwOlB=V$bYKWL-x|@sHcU@=0g{(q3 z{J!qy{kU4Og5+@=y)#!gRnK?11rVR-&9rT6`o6cxtOPLbRsoR8eQ7V=;1{uo{i zfK6#xi(>yTMiK!%2EZm7Yy$H-6(9t0J6$cpAs-R|{HZIgniHA@fCGI*9b+eGlec>#~9ilWV>ZMHS8u3fU)f*GS0H^Ix&4GK!*V(d>ugpP6$q)jysGf>q_N5^0j zMb&IFvYoh7*(++uWKB=viHnto>t_2D1>{8>4@l>Qvf+gd7M2 zMhI$LhzAW(h8H4Hp5F;V93N(RjtxbFJTFEXM7|!(eKd*Y=-pyQPR_+5yBOVru`RM} zu~=k^VFo#QmXAiGEEi%!p&&s7-I9e>FKD@eih>MX%`t3jAPe}4Y7X_`7)_l1PQkS2 zWi5BEOr&6}r`jyfaDGY^prZUAYMS$C7iZufzyB0=vn3m{8R()uMchqU1mo zBPWYcp;E>69)ywGgKQv4U|WY_>8R*#pM@)mn6_N3S{h8tF`5W4hM|i|NoZ)~Z!{BdyPb7OrshKU|?I*Y5<=CXr?67{{QVbdU*VGZu~N zUP4v%=D2!wFX5_OmY8Avd;RO4D@UYx{N;StlFfYILyI)KL%RAy`GQGa#8_HRWW6`J znR2f&`{;O3JrPXT-8{p+db z6_3sx>>AHrdS)zH&0M>8eb>Ut_@RN9tF{)dCh7;d^*ffI-CQqS9v23w)Q6K7J4On@ zz`4BdD@P3HC6M;c4ifxu7Bo1Uy09DKNPVt?V?NS+FeUIEfE>n*kB_{>c0 z#B}Pg`aG3N4RxK4j83P9xSTRPIutj*pI0_WUk5%W2dElK+1PO_{%PrB|DC5>+vK|~ HU8jBliV<(4 delta 492 zcmVH;LN@>a0fI?HK~y+T-H_QzLQxon zeV{I?8;7HwE<6r-GCK{P!cs})6lrGIMA~3MWfF8#G(ZGJQGY}QL3GtKbXzabQ+%B* zMFTWJS1tH2_GYhduYXzox%^HW0jHhkUDv{PhZDn=$5Vldu9tIvwp)j*5ve1(YJdfJ*8PHPl~I+!W+vQ+A4 zb>3h)-_2k`B^~t>k0|INnI>D^dw`IDwE68MB3@GF<7Kf-go$CDftYGW_Ymv!(9ta6 zbAR~#t%3p)aF}~K=rauoU8yD0%)5}sisGvO-25WZvKTEO5%$^f%Z-E-E2=DgZ+5ES4wuLfd{B1zTbO0000ZEO>D9KPA45GW2m7^#r#c7tUQ+Us4{w_CfW+;z}|&e1i}4=TO({#}plUUqlg zwF@H_T%8UBOEB5SFe4^p34y2~WHNNaY218?eppD97Zu|NG+`wDfTpwcI@aL_>m_&p zmpsq&dwX(kb+qr_vgyT55Cm-r9H2tly0!dn)N9|me2LZ;qvDS!okBuUX$e3+Mu-78 zz|mbG1ZXDHy9nG6q^oDc5hW5lNW=xsOqVg{G$(3o2y%PVA|3Ar3LFDnEbl>k;}R<> ztiZ!%MLH&=6c3_h`lJL-T$knLwKi!DL({Z~VrEOZqzW(?{C_CNt)pcn1fJ&mpTcrD zBLXx8WFaNRwZSDC%ArJplmM*=QdkgrDqZYI3W^{n1ra7mxalyL93P@}pVA>>sgI6mi*y_1htLm+Bnd-STSLLEwGH7|O|C)2xig=Mzc20n0NOmBEoH}z_QAKY8w15N+2JE+fARkDlD_YFy}mCqkh_}sve>Zw z4SufF`P>eJ>OB_!^Y4Q71K-T;-1GIL{IYk_Rx&z&7&ErEe!O|UiJ9IveeDN_d=GDT>4)E0i57Y|&iHIy>#4iYXg&OBAh?HIbS0*myz{r5 ze*Lx6kB#H^u%G*C3{#gbS$AAz6HPB?YF;Q5nAUmx0;SKXYR3{@zyA;byC&XGU8wcf zTj%R?E$YL$iSLHKg`CrweB;Svu}!bj=`5wYGpeC``oxEgI~!x2uY5l|NExBW`i18g zqUR}hF5i1S`qQTaqJ7~n>bJqkNq8EzT>kYdTD(nXviI+7+!}>GfleFyuWtyHe^UW} KJ9TAW^u#|aZOTIc delta 322 zcmV-I0lof{3f%&bB!2{FK}|sb0I`n?{9y$E000SaNLh0L01m+b01m+cxRGn^0000Q zbVXQnQ*UN;cVTj608n9RZgehAMN}YmGcGkQF)>H;LN@>a0NF`IK~y+T&5*GU!B7~5 z`$l5u;2AJfFxf2TK84T)aVMMQK1N>x9R!n2L`TczYx-Z(=zrD0;3Owa?*E_fo?h=i z<@>%72SH$+kIO~iIoKEUlhycM|)XqR+X299a zV=qBwu%C6ZFg~fiZGeHWQwm6u#4ec-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc$WX!DQqR!T z#M01EN5ROz&{*HlK;Otx*U-?)#N5izOaTg%fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;NpiyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr7KMf<|~|UP^v> zu_jo#udkJ7UU5lcUUI6Zi>(sS0KLr26e|~J7ZX!c6GKNs0~bR>R}&{EV^=p5S2tHD z3nyc9M-!M{m;B_?+|;}hnBEkGUL%}(K`9}(0BEyIYEfocYKmJ?ey#%8$5xp*-D2#9 z(>$o&6x?nxz^PXs=oo!ayduRjObD2GKumb51#;l&J~a=R*o%OvIv_UUI|Bn_xu=U` zNX4zBKmY&RGpjaqHaZ<(N}e%uX5-5%S3=ruZcaZuS5;ZLdCfdQ7n{mYEf24(3|_(J zaIk(sTH8tP=Z1UgzV|gw1uCCBcWz^E>r_XVfC&qA)<3Y{aW6q9}&cv*0@tB%(pO*5}H|j+j<*Mb0 zA86RM%jz)D9Eq;(?uSYB|Nf?0>`b@6S8^aCGLrK-#|e)_jeW(>`Of_8sSv(&cDA|X zm#LwWJUl!H{*)ikIGSedsd@3n$$1*g5AHGSWRje7w_M=xPm9H;LN@>a0K!Q`K~y+T&5+FrgfI|= zZOTH@ioL|26d-{>ARSnPCvTQA%O_5D32XGQhkfu+ocF#=Y=8b!ZQF|47?XXDuSLN* zC(E+PFbra?l@Nl&7-e18I*2l1N)&jXrs)8U<9L`EaI$CZEyxV!c|OWGrIa_oz{p$z zwr$ISec$sHfa>?I>*@ft7S#L$ppO8EyL#`l0rY);4L}M(JWD{ejLIz(!pXO%qZ;7R x2B`d*pBvnk5hMV@3efUn03!I!=lGXunin@2Pg$?I;CKK4002ovPDHLkV1j}jeU1PC diff --git a/resources/assets/enderio/textures/items/bucketNutrient_distillation.png b/resources/assets/enderio/textures/items/bucketNutrient_distillation.png index 5727d70639572226d16008506da57f67d9028850..15b71e963c107a9b489ce7da6e2f6f91631231da 100644 GIT binary patch literal 1267 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+m=!ZaB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc$WX!DQqR!T z#M01EN5ROz&{*HlK;Otx*U-?)#N5izOaTg%fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;NpiyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr7KMf<|~|UP^v> zu_jo#udkJ7UU5lcUUI6Zi>(sS0KLr26e|}eBR4Y>XJR})7UQzvIP7jq{Q zGgEVO15=n@m;B_?+|;}hnBEkGUKgBtK`9}(0BEyIYEfocYKmJ?ey#%8$5xrR-QtMT zJgD9j+-`BgsaGH97=2K@BE>UI2$*<4On9mVa^UGcH4m8Bi-4(mhtH>D3=E7Jo-U3d z6}OfI+j=t_O4Lotw&50YjA>zBC~Gx!-s#-$>@wCr*hSJ0uACfOQdm;@dVj%-gzbDz zg&PC3UUfQseZ}td-uM}pc+lI<0)CY}l^*kK@;~isDekjbaH7*mDq`BwPnV`8N@)2{ zI$0?5rD|^_AMQByWKCjIjK3mU8ooh(F}%xB;1zmc~+ zP-g1F{na!4lzisxb4ccGlyBZ?*Co%Gb35)&$10DexyjN?f1lDxOZu^uUEtW}dPmo- zQLQicCjI{4Q?y*1{l;4PL<^a;We&5>E{nMnX7*hRZ(Y4J{A@}Be gV>)^J+mdKI;Vst08YZYK>z>% delta 267 zcmV+m0rdX!38n&&B!2{FK}|sb0I`n?{9y$E000SaNLh0L01mH;LN@>a0HR4mK~y+T&5*GT!yps| zkvGUN$P2iSXi}ue5Ddc%jKns!F5+Q?ZA_6OCp{s|e+RPpPk*entKyt1$;a2I^m$E( zEN{~nQDjKNT9sPHY_9EKmZUAzd%ZH(b`YeLzK8SkaVYYQc<=iHMK>uD4heuljIo4$ z2;o`)k^pNf=$4^c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc$WX!DQqR!T z#M01EN5ROz&{*HlK;Otx*U-?)#N5izOaTg%fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;NpiyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr7KMf<|~|UP^v> zu_jo#udkJ7UU5lcUUI6Zi>(sS0KLr26e|}?Gh;VPb7MzC0~bR>R}&{!BO^y612-o_ z6IVkcLsytym;B_?+|;}hnBEkGUK5;pK`9}(0BEyIYEfocYKmJ?ey#%8$5xrR-C~H- zJgD9j+-@<#saGH97=2K@BE>UI2$*<4On9mVa^UGcH4m8Bi-4)RK6<^V z2zl4K#zpC&z5ktsH**$6t>qK`)9^82&H8hP7V<5cY$WkeDb`x)ameyB{$FM{tlTNN z@9~1`ubT}y&#?$}YHg@Cv)d)2?ak8Vw4s{g*+h@JmG0vGFKU8rggEJF9p1)xxWfJQ z)yCAXiBa)3KNNomdM_0^_f=dboF^i;>sqwe{hPhHOV zkPv&ly)H3D@#^c+oSf+sy_T|NUp6tc4d)2&lzsdro<)f_yj6Z<#l!wT4y?15ao(P4 x&v)dtTWDzO{$!$EE-P delta 312 zcmV-80muG>3ey6RB!2{FK}|sb0I`n?{9y$E000SaNLh0L01m+b01m+cxRGn^0000Q zbVXQnQ*UN;cVTj608n9RZgehAMN}YmGcGkQF)>H;LN@>a0MAK8K~y+T&5$t)gFp~P zy_5&Bu}GgHNfkpv1XCyk1;tJ~dynBUyv>BSIGZ4GwMdZMC9Lbb}}-$;@PRnMJ@jjy90zd;1GO^*o9qH$bfgHE#fP695gvAbsCk18CcJ8Gsam_|5^& zGMaCp5N=+*9Wl88n>Il6$Nb!2wTu7|R)Cf_0}#P)p2okF=e+<{20d34(ixxt0000< KMNUMnLSTYc0eWQs diff --git a/resources/assets/enderio/textures/items/bucketXpjuice.png b/resources/assets/enderio/textures/items/bucketXpjuice.png index 877f6d5aa94f4d9e1818de9bd64a632054bc0053..4b79e90a7138e82a02573e8a004733261bd0c9f7 100644 GIT binary patch delta 672 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 MboFyt=akR{04Gf+Bme*a delta 481 zcmV<70UrL>3;P3*B!2{FK}|sb0I`n?{9y$E000SaNLh0L01mH;LN@>a0e4A6K~y+T)soFhLQxcj zeU+Nzy*+^8zgBwvN&6vckeHg+G_@?vOjFB3M~!-epg|3zpnqwD2pR@K(5P9U_6V!H zcigm$!clZ!u@8s6zP--jXf*$3Ikf^veFb)lB3yz9Nzqv-f|FqAcZehiY;udkxJ|90 zUERl1Hjn#E7T1XsLmWfe&q?Tj;*t4$Nk(g@ir0e%*H&c@%~A!=`2qv4B12B9GUkqeRwH_6p^h%%9l ziZWy4NZRa>O=grmUhdmclyf*c05VdvqRWGa^&B_HEmo{pZ8(~n$KlK@YCb0%gZ`zUt3KGgkFXiQFXC3DPVL0Z&kLd0O~1yDp1y>LpYG>PI? zy%TIy&FZ~rGEY|*y#oO#TEb%EDcv#;Dh5)w>FbXo2;GYS1X8E`X!;J)6R)qo`xnh` X@iq}&o<#CX00000NkvXXu0mjfmKx6; diff --git a/resources/assets/enderio/textures/items/conduitFacade.png b/resources/assets/enderio/textures/items/conduitFacade.png index 568a98bf2d789f80843030d397846254ca25e3b7..f9449edf964add313d00230b12baa2e121aac101 100644 GIT binary patch literal 1457 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+mc-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc$WX!DQqR!T z#M01EN5ROz&{*HlK;Otx*U-?)#N5izOaTg%fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD#PU%0_}#n6BP2AO_EVu8M)o`HUDF34YC)x{-2sR(CaRb3oXS&*t9 zlvEvc?q6c+JzrF{I+wlHlFz90LVn+aLR?G&$8UPIXdQ6ed`| z;6hjaM`od==NC-r2&0J|NXhlHFTc$B{derUzT=B8=9t}QxSDnK)YBrNH)Xq@p3mQZ z|M1I_EQZw8SGf*9oN$Ggv0~xDw9O0S)^{sAW;`v5yw>Z+oO1ll^wX?IlLCca2>q$E z-*$T~%j8X`pH4dSw=RATQzOH<=f-*4Z(F|zWnwgCFy~2|aQLBs!|uC%Pm46G=l$nR zDKlDj^9t+SiWPHqstNz&eD?Y0mK`Ze7+M_HU!Ux|G{|xLZPAG@7Ko_7cv#?IBj;{3 zQ)K?fia&`Czt&9jo5P(J@-{?PQCiBi_h`~CZKercO9M1SE@W*rnCn-%d&(sfE{oY` zFT5-f=yaLjp<<_MBgcQ&>rz-&u*1EHg6B_8QkukT`g4{Go3=n&nzi%733q(ege@QQ zXvAK7{dGCZRn9au4q5Zryo)Ys9C~O_wtMcG&Rx+uVpTVMLSNU|xvvbllyERXVDUwd zXZDj%*0}uE{hU1^j{R7I!G!da(=Ik1^Hgy#n?03pBJcMvC!c?2tL^!3_gtQljiLS| V*Ey|;g-bw%sHdx+%Q~loCICJE6e<7! delta 442 zcmV;r0Y(0?3&{hJ8Gix*005AYXf^-<00d`2O+f$vv5yPqYiPz^E+ z`EVf+Leh{Q5L%n#;G&xX;X*aQrO}X?NYU=eMty|_27<*95ds>DeSK$^YDHUnz(tTW z0G)y45+E|646&UK^;-FwfXaMWc z;H+_0Z9cFp?SDX@=8_6Ed%09}4aiP%F-VK{OP<)?bzswsL(7ZSbh)Scy1-Qf5lA&u z14F%uOh$~Kd%B-PM{)X!c{2{}SiNp;rH@__Ts07(Xi#OZbWo2@@USWjb8XCsoYYiV zTi5|t3P}ej8X!oWt-?byI@R4O#>>G1DUN{%s0WJ%2s2V;sni#ZMH2)fkZNcs;YIMY k1JwYcPytX7yZHbA0Jo32b<<5)ga7~l07*qoM6N<$f_dz-s{jB1 diff --git a/resources/assets/enderio/textures/items/conduitFacadeOverlay.png b/resources/assets/enderio/textures/items/conduitFacadeOverlay.png index 15e679b91e8ea3fe6a390b21b5f3d68b43a7a236..609095a1e1aeefe0cd9cc64774ad6cd8c0915bd6 100644 GIT binary patch literal 1200 zcmbVMTWAzl7#^(GB^oI$r7Aj%(rR(8JF`18W{vAkE-P+~>z1raA!laJCSx*lCNn4Q zCZLEHXc}xotd|E%1)&tN7b#*dl)luUV!?+*tbOpcU~LqAi1opqNp_0R7Z#Jf-lmq7rjw2e$iXI;<* z^AOkreb-?FMZMAI6pFZ*+pb&4Wl@v40tCMwf%ro?~3GPWT zGfowA?Q{kOkXAT_wFF6|lNu)~vL=cfX-N>{yeROJ#)_gYCv`DFS09F`1$If#8_iWM zvP&`D82dWUm&;|Y9OqEb#fzGz@q)xl5=$)DaKOW$!g}G_8iN5tD{y@5Adik1fr0#uu?)%Sq;i@7C_ZzExBZx zP!WJ7N;RIj@ELiltV!{vwAdtzWT@%pv?>T{A}%Miq>-s%vtEdSXTh4bL$s?{KV%Z>0FxJG+ZA$ z>a2Xi#ahqbbN(AYvgo+BWqjU=eZ%D|tMSEmwtPM`<;9*%j($A!(`BP>Y~j3hqdNQL z_D`lxFH*hHYZopZTyUl@)_cp*ciZEaZ$G3?ezbS@zQpp8ug(phY&npnuitoYLNTv> x%`dt8_Eqrjckf@B_@U=P-P33HrrzwN8vp$M*@vIqJRAK(vQ2Hqw_7_8{|~Udm#+W- delta 270 zcmV+p0rCE@38?~*B!2{FK}|sb0I`n?{9y$E000SaNLh0L01m$Z01m$aI0aKA0000Q zbVXQnQ*UN;cVTj608n9RZgehAMN}YmGcGkQF)%Rna-jeK0HsMpK~y+ToswG;!ypJn zO@I8fOX&Vr}ElPD=A8V0K&daX^2cYn|SvI!b0erX)oV2oO8 z|H5&>2Lq#&f(4s^z&juuJ+E8>?2vQD@Rp&QNr0Ar?c`wbB+$tyXm0~>xGvDV3GO=Z zg9Vz;wSDsJ7yL07La2aTk_fx8mte&@3Oa*?3)aOJgjS%HfbrV9fQG?p2oaGlFdgP0 U_QC*r00000Ne4wvM6N<$g3uXh@c;k- diff --git a/resources/assets/enderio/textures/items/darkGrindingBall.png b/resources/assets/enderio/textures/items/darkGrindingBall.png index 549c827bf7e889befafc31c99072bc7b0db04d25..54f5d3de589f564f99dd5faad1443298dabf76f1 100644 GIT binary patch literal 1240 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+m=!ZaB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc$WX!DQqR!T z#M01EN5ROz&{*HlK;Otx*U-?)#N5izOaTg%fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;NpiyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr7KMf<|~|UP^v> zu_jo#udkJ7UU5lcUUI6Zi>(sS0KLr26e|})15+16H*-fr0~bR>R})J!QzsWoXG0@P zBO@0VBS)BCm;B_?+|;}hnBEkGUJIOhK`9}(0BEyIYEfocYKmJ?ey#%8$5xrR-C~N< zJgD9j+-@<$saGH97=2K@BE>UI2$*<4On9mVa^UGcH4m8Bi-4)xP+?LZ0|TS4r;B4q z#jPX3zU!MDc-D9@@IGXc;}GmS^8bIbO`+05HWdN8kdpg;^Ib2LfBvABx$Vt1}%cr;MnUWd*eiF4!SX4ebu^OzW?|vh8u6orlii?q|@!UT=?cT z-^Ug~x3^7sZu$MyZ#!cdzIJ~mmF1aU>s|+mxOyZp9X8P5asGCCQ;5?hC5^781wBt5 zf8;RQ6{8p9djGr6rn`BZxe5Q*E3Q)U)Zk#UntxuVC1J&DnH!ey%5wJ3IRyZrimC5e?n`fy!HcR-xTI5{Jdb;Q!pV1edR7HWH z1+RDAkErZC|2uSt9LwSm%Vr~|+vd$@? F2>^CEu=M}{ delta 339 zcmV-Z0j&Pm3GM=rB!2{FK}|sb0I`n?{9y$E000SaNLh0L01mH;LN@>a0P0CZK~y+T-B8Dhgg_MZ zwr0c(#=(G!7|{R!v!X=fuKp6 zriX}gU&(TTa7-Krnx_4~ND{d$imu~%-ceoG_1E;D^Ztb-3MNs+%KSD>^Qf+>>TCL6 lg9}n1WZfh6jqrP*C{M*zYB+H`RM`Lk002ovPDHLkV1i;Cl)eA} diff --git a/resources/assets/enderio/textures/items/darkSteel.png b/resources/assets/enderio/textures/items/darkSteel.png index 2934c638cced017233b27bbe404940f018af82ec..72108b9c2008828ebdc9aaf1b93b7b8a121c159b 100644 GIT binary patch literal 1329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+m=!ZaB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc$WX!DQqR!T z#M01EN5ROz&{*HlK;Otx*U-?)#N5izOaTg%fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;NpiyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr7KMf<|~|UP^v> zu_jo#udkJ7UU5lcUUI6Zi>(sS0KLr26f0L}S4%TDXH!Q*0~bR>R})KfV`mE&M zJgD9j+-@UI2$*<4On9mVa^UGcH4m8Bi-4*6Eakt zaqCF%>8wKzBDR%3Jbb2dE$UFv>vDbRq$_gQbD{P0*1DvH-v1rnx)nSO+OD^#$<0Hl zvgF+oS?MKtF(ro%oIPXveBN&fO&;f%%_%WEuf*t;muYwgy_p{()pl^H93OjOrH$Oe zxTNzbMm$RdRHN3i^UXN_{NeNCyN~hR-Ti#}hn@old6F6l)B5Z7_a|-acv{pMw6f)F zT65X%-sRWLXHR@_=H#?ZH`h#XUwygqNbTOf3AL-Qa;3E7+P3G8}#=us5#XeNo4* zb;TD_j2s0ta(1r>(TWKaV3`vkFky+?;>M2^J!zXeUzSLHogsKN%kUg_Spapkp-)?{2PN7SqD9~;1h9ucqDN3-;RWh5e4jB-zF=+HlOY> z+d*aaJDB!2{FK}|sb0I`n?{9y$E000SaNLh0L01m+b01m+cxRGn^0000Q zbVXQnQ*UN;cVTj608n9RZgehAMN}YmGcGkQF)>H;LN@>a0VzpDK~y+T)sQiZgFq04 zEv?KS2xv@*3PEBL#8_x$5oIx9*b(;?%X6;=?nk>002ovPDHLkV1lz~uOt8f diff --git a/resources/assets/enderio/textures/items/darkSteel_axe.png b/resources/assets/enderio/textures/items/darkSteel_axe.png index 6f0014cc0b36916122c819138fb701ea3658395a..6da640565abb1d4c1f218bbaa399d3c1cb73831b 100644 GIT binary patch literal 1309 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+m=!ZaB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc$WX!DQqR!T z#M01EN5ROz&{*HlK;Otx*U-?)#N5izOaTg%fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;NpiyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr7KMf<|~|UP^v> zu_jo#udkJ7UU5lcUUI6Zi>(sS0KLr26f0+EQ%h$R}&`_69WrZ7iUXD z7iU99Lo=9Om;B_?+|;}hnBEkGUJIOhK`9}(0BEyIYEfocYKmJ?ey#%8$5xrR-C~N< zJgD9j+-@<$saGH97=2K@BE>UI2$*<4On9mVa^UGcH4m8Bi-4(m<|g?o3=E8uJY5_^ zDsC;Ad^YQlgGlT7j8(@pOq&9Z%-E$d%}X%5P*LQS)2?rvyFZI^*)?i+pI*mxDMNIl zptIr1L@VQ?2Y&?rDn8tjQnbJL{GFKsUYh@ePyK2XC^FETeYQ*M@WTMLwcOhG9p1=2 zyR;=}XUp@-rrRP91-YEmq}v*#d)a1x%v@W>de~rs*HW{V?>de3E5c4&=!-etyqdQ? zb8noxhRC55BS#e>N6YVuF&lC=Jzj7%Yopfj4Q*m>izm+TRuQ^j!n<&wKt0>M@3F#5TThEQHmdvHH}f+3Ex&wMj)#p|aYKa8gzIWTb;ZIgdhC4$a{c`C zUG}BP-QFNqn)0dQeB5jgR3=A9lx&I`x0{NT;9+AZi419+{nDKc2 ziWH!rREcXuNpOBzNqJ&XDnmeGW?qS&pKFLhnX#U!o}r=pXD4%@s$x$U#}EtuZPE{y*L?&z>wGt>j|EkbUOFi68gx-u2zYSde(ufJdk~X%WK>h6!gC&Sqt0ooEx_ zJs@Rs*5#x*%bJ`1@AkLJm`50UvNf2LFI(Mg>fGvanP;=4mW$1T2;*6sJK34jjX5Ud e8mBfiGBRuoNDK8)h|B}p&*16m=d#Wzp$P!%BTzK} diff --git a/resources/assets/enderio/textures/items/darkSteel_boots.png b/resources/assets/enderio/textures/items/darkSteel_boots.png index d314d206aa10047e7b611e687d705fbfab693ae4..7178353470be9727aa6933dc0d8f011aadfa0164 100644 GIT binary patch literal 1243 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+m=!ZaB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc$WX!DQqR!T z#M01EN5ROz&{*HlK;Otx*U-?)#N5izOaTg%fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;NpiyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr7KMf<|~|UP^v> zu_jo#udkJ7UU5lcUUI6Zi>(sS0KLr26f0*(b5~bqHw#BY0~bR>R})JM7dJ~IBXd(1 zV^=3PO9Pl*m;B_?+|;}hnBEkGUQ3*MK`9}(0BEyIYEfocYKmJ?ey#%8$5xrR-C~B* zJgD9j+-@<)saGH97=2K@BE>UI2$*<4On9mVa^UGcH4m8Bi-4)Ru)4~Ffq^l=)5S5Q z;?|Ymvss561m@)id7p6-WZI}bqk4fj|K5s^FSt1#c~^auE&6ato#V=)2j?AmRqaE! zTW6OoTDpDCuY+onfBsKX_wnK^{lH)vXx-S$e@sHNg~QA5{;P;JYaDIDSMwLS{VJDD z_>gd+{bb6LeR7F5aue6yuWycf|8>~`URK2xyN{J8fUuCT9)u--RrE%-FKa2j;9(``YZA{ zzwNP*;kzX%$ileg_PlAIZQ4~l^KL|kHeG(n^84@fCx1B0cFWFqY9-gdDr#LS&oRr2 zd&QO7&$HM*|J?niEPfr=?Xb0VK}GZx^prw85kH?(j9#r85lP9bN@+X1@buyJR*x382Ao@Fyrz3 z6)8YLsS?+SlHmNblJdl&REB`W%)AmkKi3e2GGjecJwrqH&raq*Rq>uKjv*HQcl#ar z4k&Q2RPw%mJl&?dP3hW{t0o^WY?)k8AZG6M|A=p!=Y-}N9TLXVn>zJptU3fF-|T;I zwdwQx)lD+??fYIVjCW&wcTBcikoB(;m-OkmBC0z+mb|wXkj;8s&2sj$-6f!144$rj JF6*2UngD*uP{;rP diff --git a/resources/assets/enderio/textures/items/darkSteel_chestplate.png b/resources/assets/enderio/textures/items/darkSteel_chestplate.png index 2a5e26827c5224dd776b15175444baae52adf648..3fd823b31978b7aa2a28ef3dee110c3314a94ae7 100644 GIT binary patch literal 1348 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+m=!ZaB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc$WX!DQqR!T z#M01EN5ROz&{*HlK;Otx*U-?)#N5izOaTg%fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;NpiyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr7KMf<|~|UP^v> zu_jo#udkJ7UU5lcUUI6Zi>(sS0KLr26f0*lCrfiv12;!Q0~bR>R})7A149=}6B8o? zH%nJ%Gb5N@m;B_?+|;}hnBEk)UPA+%dO;~6w*Y9fOKMSOS!#+~QGTuh*vD3xxZUD{ z(>$o&6r64`aK))tALtl;P`o0=GfW7WctA{ess(c3={_|NnAnSesoF05kUj$g<4#W( z$B>F!OD0=q9|{mT{(rmLBE3Z-EUv#8a~5)4TH1YKX|g!?qvyg4OUgBOSaMuCx^%^b zg@RKfgciFc`@FX_wYzear+n&CbGx*~e`CHz zsokmxR&fG*i{3=&*dFO)(OD|1IV%_!1o5NPCe$|TA5V;=_8q%}>_>A+@RIOoOtZdrF}nQ<>cib?9yA$dpH58*=hat$&E+WaXtOCdBxRx z3AfF{R*PD@C<(?{_Z>c`viKs$TtD|qHOgY$Z|@yAzx!f_f!tlMl@n$x>pYsIc|J_$ z!uGjm({_ve`fK;;XY|FKebrCaWJ-y+CdQoJv?Hd)zopIa@YB?g33tsLw%<-|zW*!R zX0meN1r8Rbi1pV$>@G8qkTDaQsxH@mdg|Hj1+gjbOkUV_9LtxvJZC=JkG-LH<$~6Q z=*`cvn)~nesisA8+c&+w)#0{S{n)gv78!-#?(%Z8^nR0JW SUveH)u6erpxvXpF8gxZibW?9;ba!ELWdKlNX>N2bPDNB8b~7$DE-^7j^FlWO004DK zL_t(IPtA_e3BVu>1)awE+|scu7md)6G*bG}gM*U17h8VGSYukE`9=b*wNY!eVVNV} z%Nsk89SHXKfXdw4xd#}s?7fS&q>}RvfCS!_VgE&Bb^zR>nw7yV;>qhEp{RU(;7Kww k8sip`-HhaD*!nf4Tu-awuD}s=cmMzZ07*qoM6N<$f&)`v5dZ)H diff --git a/resources/assets/enderio/textures/items/darkSteel_helmet.png b/resources/assets/enderio/textures/items/darkSteel_helmet.png index def672f53bfd57baeb2ff8527d5d95c7ca9cb1e8..ad0a38bf208230639b65a97463fab17027f1a930 100644 GIT binary patch literal 1184 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+m=!ZaB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc$WX!DQqR!T z#M01EN5ROz&{*HlK;Otx*U-?)#N5izOaTg%fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;NpiyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr7KMf<|~|UP^v> zu_jo#udkJ7UU5lcUUI6Zi>(sS0KLr26f0*FXJc~{17k-+0~bR>R}&{=H#bWQM+-Mg zQzLV8Gc%Z8m;B_?+|;}hnBEkGUK5;pK`9}(0BEyIYEfocYKmJ?ey#%8$5xrR-C~H- zJgD9j+-@<#saGH97=2K@BE>UI2$*<4On9mVa^UGcH4m8Bi-4(m-itHN3=E8-o-U3d z6}PSg@69@FAYmife(TWL35Jc!Cb+*4x}{htv47ruMQ=s#>pZOvLLFYyn(DQzx5|dz zXU~o4n%%Vg-lEItch&EDiXD?EX>9I$apyp;-ys8+dCwzscmY|cB!UO)5L;#kqoBeVY2UCugqChfbB5DBH=Yr@3YL z*1!1v_q4i3SJUy!E8DJh&fRaQ9u(P%`ko3o7NknQn*aUQ9yhOg y3z>ScmMOMsQPbmJYH$6!?&tsiPS4ronRpoPXtk#|UkKF(l^LF{elF{r5}E)yJDfxS delta 186 zcmZ3$d5v*`NGZx^prw85kH?(j9#r85lP9bN@+X1@buyJR*x382Ao@Fyrz3 z6)8YLsS?+SlHmNblJdl&REB`W%)AmkKi3e2GGjecJwrqH&raq*Rj!^cjv*HQ$rAe> z*z@^_{D=<-XlT58gTe~DWM4f?2te| diff --git a/resources/assets/enderio/textures/items/darkSteel_hoe.png b/resources/assets/enderio/textures/items/darkSteel_hoe.png index 2c54c64682bafb97f72504dcb1d8ddee7525a2a9..9a97d090428ed30e5edfed182d5f92fb97ac5a38 100644 GIT binary patch literal 1308 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+m=!ZaB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc$WX!DQqR!T z#M01EN5ROz&{*HlK;Otx*U-?)#N5izOaTg%fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;NpiyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr7KMf<|~|UP^v> zu_jo#udkJ7UU5lcUUI6Zi>(sS0KLr26e}|WS4$@Y7c)mg0~bR>R}&|5CpQ;EOEWi9 za|1_1S67%`m;B_?+|;}hnBEkGUUQs!K`9}(0BEyIYEfocYKmJ?ey#%8$5xrR-C}~% zJgD9j+-@<&saGH97=2K@BE>UI2$*<4On9mVa^UGcH4m8Bi-4)x=UcHB0|VnkPZ!6K zid##9Z2b>8NYt%!Wx3+$%baQ8!DR2irp_iAJEQk+V&A$oeq|*}Ju4kj>MHVIsR zedfB?PL6BCoVP~BYR@{l=%`5Qg3MVPCZ0?YU}?PZdtZOqZr*)%F1|d64}9F$Jbm6_ zGouqviLpB{L z+R4(WX>oVLq5pPm&f3S0a*4P)YE2aqQ=80rQY?$By0)&gu<7@4JHEbilB~Z{J4|Gb z3w8#d+|-lwE!IHz$6@P~4{nOT4K6x#nO%M<(tVU^-RmwJ4xcmr=acu$GIl!{`1i+z zoN6z@g<(-g&s;3ct?k^FD;#jA^hu?(MWQ0p`%`-^DkQ0$-`yn4TX%ZT#|i(e>{ulj Y4yYZr{TXHS8&qC-y85}Sb4q9e05V+AQUCw| delta 219 zcmbQk^__8oNGZx^prw85kH?(j9#r85lP9bN@+X1@buyJR*x382Ao@Fyrz3 z6)8YLsS?+SlHmNblJdl&REB`W%)AmkKi3e2GGjecJwrqH&raq*RcW3sjv*HQ$qP(> z^tX7j{qL8z|F?hlZs{J!nht|ZhBb!D%FKBk%R^?q_|Ic+If<89n(5Hom#_YtKH1?} z&U+$lg0@2&!_Fm=48>+w(k__>Kgr2xn7Djq((IGhY*=#H7&qlE<1sK`V8~Yqo}3(c RBnxOIgQu&X%Q~loCID;pO_Trt diff --git a/resources/assets/enderio/textures/items/darkSteel_leggings.png b/resources/assets/enderio/textures/items/darkSteel_leggings.png index e11c0236bd827f64bf6c1f15b0d48eaa069dfe64..03097b91ae8fddece217637e3ff8d2b4675f0795 100644 GIT binary patch literal 1200 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+m=!ZaB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc$WX!DQqR!T z#M01EN5ROz&{*HlK;Otx*U-?)#N5izOaTg%fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;NpiyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr7KMf<|~|UP^v> zu_jo#udkJ7UU5lcUUI6Zi>(sS0KLr26f0*76Gt~AXE#Sf0~bR>R}&|5S3_3|14}m} zLo-7|XJeRNm;B_?+|;}hnBEk)UKazLdO;~6w*Y9fOKMSOS!#+~QGTuh*vD3xxZUD{ z(>$o&6r65xcEzbzALtl;P`o0=GfW7WctA{ess(c3={_|NnAnSesrrMDy(nIYpb98>}{APsBoU`k^K0&Q9z@sDdxJW z@8u_~A)!k*mx}#vU{2UvxmtjK>(h z{Z_W@Q@*z?H+WiV5qoH8?BY#%Hhqt8=UpSy85}Sb4q9e0Bh2k00000 delta 195 zcmdnMd7p8DNGZx^prw85kH?(j9#r85lP9bN@+X1@buyJR*x382Ao@Fyrz3 z6)8YLsS?+SlHmNblJdl&REB`W%)AmkKi3e2GGjecJwrqH&raq*Reqi>jv*HQ$r4i@ z*faKs|IydbIM8|Z$`uYNrm%`XKMD<&onV-dlw#vEiP6AU!H#2cDnkdaAX9T7^NTD7 r4?#2Lf{tW{8B8UuJC10w^6)UoU0NPyS|xH2Xf%VTtDnm{r-UW|5THFF diff --git a/resources/assets/enderio/textures/items/darkSteel_pickaxe.png b/resources/assets/enderio/textures/items/darkSteel_pickaxe.png index a00fdac17ccd9d7e507ba4ccbfaa62ba793828b5..39fd6b9d5b801ec30d0e9c4d7357b9abaaf4c746 100644 GIT binary patch literal 1227 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+m=!ZaB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc$WX!DQqR!T z#M01EN5ROz&{*HlK;Otx*U-?)#N5izOaTg%fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;NpiyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr7KMf<|~|UP^v> zu_jo#udkJ7UU5lcUUI6Zi>(sS0KLr26f09_3v&ZgOH)Tf0~bR>R})JUH&Yi=6IV9_ zLo*X&0|S^|m;B_?+|;}hnBEkGUNf9}K`9}(0BEyIYEfocYKmJ?ey#%8$5xrR-C~T> zJgD9j+-@UI2$*<4On9mVa^UGcH4m8Bi-4*6Jd?vg1_nk4PZ!6K zid##9_j@095UG1FFq`{QQ^>`j7jIM+O>vTa^WxF|=P&L*P)P|ac$wgsE-pMtBlnHK zD^=%9#^n#sExE?>GFtD$-S3b0PIo?MnG?ifwnq1BV~6U3%P-eR+P}&H z3SG_oY|9fQ+C;?CXDv&J{QhUhX`>lgh9SlpY5_{F4==uuS)|eQ_X(%mJbOi-TQ4f} z_Y1F(;`^-;6M8mYcVC9gLHAo{PejYTXDdi1GLz9-Mtum=UV zC!b47U^Jd6z%=F5ivtp?#WbwCS-1MKIU1b3Ra7LTIF;#E0F0Bl2>QzSg!Ye t{=1A*`G3K>I-k;W^`d#d=Im#cU{GG!T~>Vd!6Q)d;_2$=vd$@?2>@?>u;u^& delta 291 zcmV+;0o?w}3BCf5B!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000id z000id0mpBsWB>pF8gxZibW?9;ba!ELWdKlNX>N2bPDNB8b~7$DE-^7j^FlWO006B? zL_t(IPh%L=;6D~jH28n~`0@YU-QE8)GBUsz#1<43{O@Td`hP#ePmUrSZH5Yg0N4OVMn?PwV6hnnz+PZtV!~|z4x3>B9K|3S!bJmkY(@sS pHRG`vKOoX(+#G;xn<)bf3;<0{Zq2t)C3XM+002ovPDHLkV1mQkZq5Jz diff --git a/resources/assets/enderio/textures/items/darkSteel_shovel.png b/resources/assets/enderio/textures/items/darkSteel_shovel.png index ab07642a1841b33aa410c3eb7ab51f7d6abf6af4..e2774bfdcd6264dea5bebc2866384626541f63f4 100644 GIT binary patch literal 1169 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+m=!ZaB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc$WX!DQqR!T z#M01EN5ROz&{*HlK;Otx*U-?)#N5izOaTg%fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;NpiyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr7KMf<|~|UP^v> zu_jo#udkJ7UU5lcUUI6Zi>(sS0KLr26f09lCr5J^H%CW90~bR>R}%|M15-CgCre8M zLrX&oXA78Km;B_?+|;}hnBEkGUMHM-K`9}(0BEyIYEfocYKmJ?ey#%8$5xrR-C}{$ zJgD9j+-|YNsaGH97=2K@BE>UI2$*<4On9mVa^UGcH4m8Bi-4(m_n}|O3=E8Ho-U3d z6}Og5-rLvYAkuo?RP0}Z^HMQ^-MO{Q($?EQc-E-MAD)&bEWP=)^p4q~$%?@`Tq-Kz zX(eGQJ(CKwx%L&?z2iA@W`&Vy$edku3X2Yj|Ed+g{F23qqvD=>*z|3;&)Oa^*?rf1 zkw(ym3LB?MDjbIePCxAmU4O6feV3b4BRQHF3S}M_e3&S8!JC=)^u+m!w>PK$ zXUzALZq8e+@W|)&eB0Y)?3cn0Ik9-{dZYQ_&0fa)|93~mB<`He&Ma&rb!&!x-R0DI zm)xdr{-DiVw%eCA`>xF&9S76u_~SY~HaT1xS$d^YZ(fPfa*$gX7ZGWZ?{IHrxj=d#Wzp$Pz13yj(T delta 218 zcmbQp`HgXcNGZx^prw85kH?(j9#r85lP9bN@+X1@buyJR*x382Ao@Fyrz3 z6)8YLsS?+SlHmNblJdl&REB`W%)AmkKi3e2GGjecJwrqH&raq*RjHmXjv*HQ$r42m z?1j`M|Jc|4v5-hlNtuwt5s_S8ZXRLW!7J445iH22G0V|pC0hf-&snx-UH+FZTit9r zac!h?pY*a$le3a_MJHx;vPa~o$xX;L_Fz70HhHZin?qYb3d75WMn;A$TN9bP0l+XkKaLhlnrr!aAOWX;HI9#+r%kjcbhsU=#;S(!R-&vKbE`X_w_!{^ZwqC zOF?Y(`Z?}P-B~Qw994u;!;Bo~>*m6IeMcrRW>`XpCDL)Ep0;BY!II;omH<>{%s^-e z49`sKAwpQJnQ6xOL^@Hu0o9RaKIXLHJIq!F&0>YDbyzW-iJ$>3VK7=`+y`G>-~vWm z#!V2ZA+=ROBpV~LC?YN^I$oD$(n)dd+BHCk17!%z1dRa>bE?ILI%M2QUX+fthK z6s|`#%J3;IW+me$)3g-@LA%|~w+s0sWdLERR0=`@P$1wj7Cc*~g~l8_i_LGEK}pzj zl+j8XNekd)#I$5OE#oqtzPN(fs#d=ww%Dcu#e@uWU{(<3L!jC0yw{|)jn)wVy75YD zTYRRK05yb-Os8~AKJp*kx2@csw8#kX2L?Nlrk=J!pDs`Dh`qo zq9Cn^ClHGyJSl+)c^DzVc{)U|)e<5I)4_sio>$?+Md2c`Fi0qem0}nULqdfLgB8;J%ts#7K;^7Da@h}`mcsg7n5sRb< zB0z-PDLnpvLkBWWfzCSlPu)y!F~#VdzU%^K@v@Hy3)4Il($2)Ev zF53|ix6!-%Xj8CG(A(9q|7c(`Cv<+F=jMo6F4(L{<<1qA0qjc<2yqH1eB zhdk!c#?o5V#{A7uAD$^~=-so+x84?QAImsDGV{%6$Hyp1Md!2Umq)5beCobWX@t?> z;Dm{TC@1e=(4*W#%7#^LX?B5X>*DU`9dFe>S%12-JzL3M(DwHdkHSlZ^?#(y5B;gA zN$66%zbyw}1>5m?`EFsuH?FxZ+d#w&%cE!PHu!U%4KB)X^vGLH9@(f{>!rNPVy;y) zcdRI?9v9hNO^!)<#v+fBF$!@QaYXZEQk)rFfe{j9rRnRb!SJ6|xr4YX1 z=~J0fU0jkKde37^`l=k#ADW*uPIMjaFL-#>y7H5{Bc+k&t;ZxqeW&mu3;+Cf_S43I zhYS0?1B@4cZ!P<7@7TcIb;qwkO)ZAc+0>)tz@XCMLD|hAecHf*dH34Z6?=|%pDnD2 zU16G4mQy|?W5q>z^z3+k^>Jg=>ULD58g6;-ny-KpxzjAS#w$;w@TJCuinmzEqm2<%NinsqRwSRWRz@>iI zf`S6>riq4j;Q5@v&p%-6TL|nZ|>c_G%I8<#?O?!?@8P3m_+R6<2qlu zmp8hs<>?80rPRCl&Ij(ws_RMDQfG8@T%YNlVhU8A40ptbY%^4}-@fHha<{ay^4rsP zX`nW9jo0Zfhd28@Dsrm`8yp%EC;d7PrGCm~B!{IR^$L#c87ktgX*UJDoImW<9#25ZlxKaig@o$Sgf z|Jm!^ZQG(PXSa{!#?{9k`?R?k**%eef$hm^*zeP_6LV>H{wh>q(aO(4lXCt6X&rza delta 260 zcmbQvyMSqeNGZx^prw85kH?(j9#r85lP9bN@+X1@buyJR*x382Ao@Fyrz3 z6)8YLsS?+SlHmNblJdl&REB`W%)AmkKi3e2GGjecJwrqH&raq*RsEhWjv*HQbNdeR zHYo78?ySDLSmq*QkG2H=F1B?^5x!HwHdS1-gyF)78&q Iol`;+006sS761SM diff --git a/resources/assets/enderio/textures/items/darkSteel_swordAlt.png b/resources/assets/enderio/textures/items/darkSteel_swordAlt.png new file mode 100644 index 0000000000000000000000000000000000000000..c5120061302250eb47704ea74a0edd1c7bea2f20 GIT binary patch literal 1674 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 Bat8na literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/electricalSteel.png b/resources/assets/enderio/textures/items/electricalSteel.png index fab794d1fae7a121fd81f54c7bdf3b5333b5ad98..487276c65cf567e5b37e5bf7f38a0fe7a359f379 100644 GIT binary patch literal 1320 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+m=!ZaB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc$WX!DQqR!T z#M01EN5ROz&{*HlK;Otx*U-?)#N5izOaTg%fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;NpiyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr7KMf<|~|UP^v> zu_jo#udkJ7UU5lcUUI6Zi>(sS0KLr26f0L(7Z)>E6B9>60~bR>R})JYX9GtwV;5I5 zR|`WkCpVa0m;B_?+|;}hnBEkGUQ?WUK`9}(0BEyIYEfocYKmJ?ey#%8$5xrR-C~5( zJgD9j+-@<(saGH97=2K@BE>UI2$*<4On9mVa^UGcH4m8Bi-4(Gs`tzj1_s8to-U3d z6}OHA@6KX!6tUgBPADitvCOVYT5!unw+$Drxox=ZWc^=ZLXx7qLPW%pEgLUiI(N*g z{-BqO;C+SFD{{WwOJO@aX~~8Yt-FiUXB0oXbDZn;wvQc|6&JoFZCqjI#Ig0%43WB> zQ?#D^z5Mdaa;E62wPDVSFFx4({rYtE<1;<}GagBsrDh|?Kkc+?(ng7})uKFy9j?}F zmT5|V-lfXb+Qc;RP1WAM0F4$0g@(U%{de<@Ke(B5EdBOdvF@WxZ_8!}2`o9_ry{f> zL~F+R=O2Fm)iXF6w_f~gn(+14Q?FiBzWnmaGm%qIjjZPKc`cn(^|Zi3L4s$|)vSj_ zJ0H~8DGPNL_~(&*?(n!j8;nksO<7|^>bP0l+XkKlWpO; delta 419 zcmV;U0bKs53cUl6B!2{FK}|sb0I`n?{9y$E000SaNLh0L01mH;LN@>a0Xa!TK~y+T)sjJrf>0EN z{bwyRe?tomQPKhzQlf~_LRanl2Q6CEG6WGf5kwHQ68tx3IDZ#3n1q>D!w8r6c--@y z^R7=({>?WYkHPvVu%>C4OeRoO6{ph)hr{7#2%9OQ`0;q)`Fx@*OSEl^>-9Pe>Ecm* zKA&;F-$lTcklXEsx~^qkRTcL8{VNH@tJO-JilPvg%jF{CrfEdPJ4lz(3OKa9*ZD`bH98c$Zb2?dtV!JspO*vc9OY+=HYeLh~yWH78uaxsx3uCmo;+F$HmJDnOY!4ChMo0=!fqAy!x&?;b99Qb6BR|My*;VDx(~YrlIMlr z@ArTEk&kIMwMHVIvP0-_fDN{?paoxj2o%kf(`y=y!BSKc6I265 z=Ao&)4ds}rtN2RAtWqhL)>y2f-YQqFoC{r%OQB>acdq}MbNLFH$K9^E79G}n4>e?V z6S-RX=H77(tMUqbXVUp4wNxr~tn-dnAHA`-n7ck<%>0L)E)Ie!_dQ#BUw{J2aJ!y(`|`E&wvpTismv39Is8hqctMgTKD< Pp8F3GqCNa{c<{hKGPt0f delta 302 zcmV+}0nz@j3CRMGB!2{FK}|sb0I`n?{9y$E000SaNLh0L01mwi7p{2={Y0KVEuLA6D2 zC=u*8n3Orj#TtIPgcr^21PLo=4;q-mZh*R!0M%E}?gA>#prk=~SCC}k08qykKyw>F zxaO;?=(f+|J9hvcWuBf;J*V*E&<@}SlaSiE2Si61N2{3~Ag`UpeYi8%+yHqZ%_chm zSlno`{%lvc-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc$WX!DQqR!T z#M01EN5ROz&{*HlK;Otx*U-?)#N5izOaTg%fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;NpiyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr7KMf<|~|UP^v> zu_jo#udkJ7UU5lcUUI6Zi>(sS0KLr26e|-KXLCnWR})7=0~bR>R}&{g7ZYbAOIJ%% zCvzhcGXt1jm;B_?+|;}hnBEkGUQ?WUK`9}(0BEyIYEfocYKmJ?ey#%8$5xrR-C~5( zJgD9j+-@<(saGH97=2K@BE>UI2$*<4On9mVa^UGcH4m8Bi-4*6XI~cwFh@N1ba4!+ zxRvzh|9^XC)rQVSCx?xUIxm=d9B-Y7neboY;G^~XjsIBJ^s9*fc|XTaFpcA697A^B z&(%j4ToLWNE|A0a=RHGK->}jJvi1IF;@MMwL*k$9Z;x4wtLlGBRLr!LaOiv^FJM>uccuyRCA)R( z>@kwLIQ4)*G(5wP&7VRQRlif!B=KBB~V3q$IVSE=kOo zBPu!1G@n(?T+OX$lF{S8OIj^*+q9)V+~E*NV0g#u+ZEea>jWwVJYD@<);T3K0RRxp Be&+xH delta 318 zcmV-E0m1(A2-yOVB!2{FK}|sb0I`n?{9y$E000SaNLh0L01m{NFz4|%`Xv#p7au`XM&*~M`c?1MzJTM@e%WBkDI%F~6Y>oGThRnkz z!JF0ddB#b&zBh^5Fck}^pcidaNY&TxWp^3B{V|L<2k}+;mRsqo^4~<$E(wx(O1x}B QdjJ3c07*qoM6N<$g4lk9kN^Mx diff --git a/resources/assets/enderio/textures/items/enderface.png b/resources/assets/enderio/textures/items/enderface.png index d372f4088f16515b8647a9b7d0124e12a7e8f240..d1c900578d3d064fe65284eaf8842a8f3c67eb13 100644 GIT binary patch literal 1264 zcmbVMZEVzJ94{LfGMtkHCIce1hzzCImuq|1x&v?5ot$#xJTC4aQTMccZfmx-x3;(5 zPBP@eG$xWPlNe19^pj}Nz@oU!m=TR6h#wY>njv3w63`eJ89_hH;M47H`eEUNP1@(} z|NH&^&;O;brrMvZuUlV-VOV`)mz+l9{rQP0F*tr95DN2aIfG)s`Mz85e#RxIaE1|i+O%eFK ziQ5w)7M#i^Q+Uj>A+lW@|Yq zEypWbXcZy4T{kaLl;?Q?FBq`wE{YLFk)m0OWl3Z~Is>K)ilpgmt}@8bQEff%>XwQ7 zj6kspZiGOdE?mLLCzFfBrc((N3K>-dd5Q_plwtVynzwe`H2l|%C9R#zKps+Q=vW0? zMfu2Wu7XkQ?k?mTB5$NUwvLhldSy#37|?VRa)dx90ZrE=AtXXRr0^sw@L^JfT#y7X ztdT00QxwS4KxNn}&rkqbwoaj}&Z87@x8qg8CebX;Jnu&S*i z?Fu${SF9AXA#g1_V_Ch`DoAx(uH|%Fc{~=wn>%z;pP_{d%h1;Qp%%9-1D_AE zq%R>41qe6=hRL7?0ja7SO)7%GkwF27A;74ds%S(7ul?W9QOGIEuap1OO?3+uqd#5j z0<>7{BWR-Lu~C;CnjCDvuw`o#ax_!C^y}*vpQ>fnynII+>66lrAN`GIIm)Xl*{G*^=yDgU@3_5J$4rpZV9?w#tL-ulPM z@r?Pz+1uwHw6hZzKE8eP3VG_&cmCe+=8>HEQsbYKi7mH|&C+j`R?a@spPH)~{>?l6 z`SYGWiaoS^$BXYR8##U=x^2b#^~YbCo@(0NUK+M)>GPc*4jrvITi94SGyd%0;jv;_ z43{VCre^qcuk~O0S@>mcd?Wrw$M9NjaI`!#`a^BwR&`y&+(~$)Y3|F38S)%GZx^prw85kH?(j9#r85lP9bN@+X1@buyJR*x382Ao@Fyrz3 z6)8YLsS?+SlHmNblJdl&REB`W%)AmkKi3e2GGjecJwrqH&raq*RTDj3978PplLG<+ z6Bn=qFOf|7s9@r7%KXQEhsxLW0=+$nNiQC@KCEY*!FZyr;f9MeLomnXmNk(J);zTj z)N?3fy}_`+ZALkV)B-l57m?*nh%L2wF&$=CFO!556#Bi$j*w0mWs||pzWAJqK Kb6Mw<&;$U+(qD4` diff --git a/resources/assets/enderio/textures/items/endermanSkull.png b/resources/assets/enderio/textures/items/endermanSkull.png index 7c95a77b37a96391372b34eb1d6ab5da381d60e8..4201e1e5e48488c4b17d4a8792a2377572befccc 100644 GIT binary patch literal 1118 zcmbVLNodqi7!C-fRt1Y9ScHa%pkS7lNit37DAUP|4m!0?2OKJbFUgxWw8@LftCJQf zZWr;Sco4yhdQb!rdT~Llh?b&)yCB{?2%>nCExe``-#5ZZ7bS3 z+8BmeQQU5p>AEs`TU+S2^Xo52m$f8cCH=TY>M%r1*1;BHiyj+yno%|j4O{e-;f4qa3{kAt>q0#x z;BZg`x~_|oEXp!Z5qvb}6BzS;w7#ieqR0;2fVkLa6Gdp@QIg@Pr}H6rL8-JL>_?46 z(UgfX3`8JEqUR-X&7mVwMt|H`6dhH@0wk7EghxZ0)}yw*Nv65`x1j_`y)kx$E-eZi zF|j@BA)ge@3`hS6j_Vj&T1RTyQh8ZZyLcTbDITIOhqslQWg%69HjtY-i}7`}M^*|_ zPgVvR0C}ZHHVXw^>q=3%LLNv>Zqbhj^lj9%?NZwfZuXyCBNrk_a9F{3q}c_1Lzv)b z2nTE~$8Ox?`VOu~o01C62W+CyJ&2q_h&^^L#fH0xd88qzSg4CnISBH$tw_A3X$qgx zpq_@nR&2}R8hqz}QzufV#H3ID>YL^jZN_A~Fa`9mFh|Iz!xPdeX@9sO8PsD%Gh2z@ zzU<%KHpRBSdbalC&*`f>Zk#zDUTc~7e56{NE$6tStwJlej`_ZH^7^I^k5A@b)_&Yy zep>yu^Xb5<%>Bum>i+3;JUDap#Dz25t=F@6mK|E!o?m_I&EdT*pE}Pk>3DD{yKmq! uKjBPXe0SwJ^n*uJ#@RLRPu=^q*z;nIZ26XXBGV#THuX(L!|Iyz(w{Hmm delta 224 zcmcb|@rQAONwXOgEYfg6a zJ>7Az_sO#zB3owO)DNn3*2?#I%A0Q(^8RjpoQ{5EWuAhDgr;tUqP_Cz;c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc$WX!DQqR!T z#M01EN5ROz&{*HlK;Otx*U-?)#N5izOaTg%fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;NpiyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr7KMf<|~|UP^v> zu_jo#udkJ7UU5lcUUI6Zi>(sS0KLr26e~AFb5mC%Crd{|0~bR>R}%{ZH**U&Lnk*A z14}1EXH%G7m;B_?+|;}hnBEkGUPqjIK`9}(0BEyIYEfocYKmJ?ey#%8$5xrR-C~Z@ zJgD9j+-|YJsaGH97=2K@BE>UI2$*<4On9mVa^UGcH4m8Bi-4*6cV;Ui0|Qg2r;B4q z#jPWgeLX@FMcU@Szi0jU{GSz*tya#S;KV5)&s!zW064^AB}i z*=Ni84x05}t##P=k@t+y2M!)~uF9W*Y<)G#Y`(0icKgF_C1vJDigqsJU3tb{hNamt zw&ncu%NOU#TwK`A!o+A>kiX{3vkNztP57$5G9u^4o{ZCJAFg>8%udK-nq~DwE`34u z)YIX9Pk!a?*O~rl&Z}Geji0jKN%upUv8#<>DEBkehrf1rhb@BVlUAR=%@i6_pfsNYJa~8R0E9cDd)zV)gnjyk6-ASS<`~S3;Vh>)s zuej}g`r!8-yL#^>jy)OD)uj_-ZY?@^+u`gfze^weZ?L4c=x{H!i{VmQAj++*93szu zaGl&4C;PA4T4x9T*y?%pm)yxF6VA5_7F_z~C{@4nrv93hn(Jm>o#Dq8t||0!hmp_6cR5cZ=63$c5a4fR%fo%XEPdha()@lm_V8@v2+>#wsvjy*E`y84HHW$6FErgh>8 Z483x1UWC3q8VV|NJzf1=);T3K0RX?oJ*)r# literal 1368 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl4m>B|mLR^7dcX0+6Nd_-*1|M+- zF9`-u83r$T1|KPgI5~zmMTRI%hG;#8I6a0~1BO^*hGZ><1U-fnJ%%I$hD2kAL=%Q2 zbA}WXh7@y#SuPB-+!^NjFwF5|m>`%> z+ao`=7ar`-L)ah3GCzrAdKSt2B8>S_8so!kriXb9&oUUFXE8p>V|-M=@T{2ONjbxl zO2()43@>UKz8A9mua$V+!1TYL^-q(`|C!A1XBhl$)%)LP@O_Hz*O@9mr>Os$s{eDE z{+~%Y|L3Xyovr21s-{p|zVzM~2Kk*1qNUFp&q9iy!t)x7$ zD3u`~F*C13&(AePq0Cs%RL{`B;7id$psJmoE{-7@!O1`R**;hfAKWyeM0t<#fz4o zI--!0_%!!XO7ik$>sFpQbC79^>w!x#j`61hntNvoK4Dp4y@RJ`s>Do72b+!q^?qS# m9PBI;{xC6SF#Z3}%<$;mw4MX^qh0|$!QkoY=d#Wzp$PzfE(V+c diff --git a/resources/assets/enderio/textures/items/existingItemFilter.png b/resources/assets/enderio/textures/items/existingItemFilter.png index 6b446ee3f9563c07f9a46aa3201703652cf2c9b8..15e2288fe6245b83fdcc41875d8d1ebe189de922 100644 GIT binary patch literal 1441 zcmbVMdrZ`J96tt#o?>oB5VpCMvWR=My_WW9n>)>M2i!Rhc}0k9&OUwz1+J}a87HXO z46uhG3)}o>j=_8p$z0;5Q)V`FIyRznGfZS=OqgTL=zK&8VJ5mBa&CVR|5%gu_xgT5 zpYQMc=$nNFd5PA?tQLzU(eLvXo1-oA&Yfd^pSpFAGlx_or`#w}f<`^30gGEycmVlB zTqP(5oVamAKX6(su^Xh)a-%$u&k9Nip_5HL6>9IBOdHtd3@d0BHF*~VaK z+Qg`F!S|gi4-`TkMFS9pQixzDa43sGaf)Pc{CSA5z^0le z2H9e7?u?eXa=}%Gp|TiOUtf>bXQGN$iQx>xV0Ho{2*k8N^o_E?g%Md#k1}|HE@+Z! zNQw+a7&%_4GhDFg>HRB&)Ii_?v8>Mo$_yD6=2Q$v?N}%jx!1I{ZWM!m-I&!{FWsmD ztQhD@ohF$12&PBDX6zm=6frctVOMLCnG~+ps|a-=ARB(K3pP(sQ4(2476Yg(oxp9h zvTks)0HWHGsXc?G9*Si>8sH2?D^--*XcZJzDTbm~DJtagK+DS{SybxvXCfK8e_=1s zq*s8Lt0^I9I>f9ri#*^-f_4x=1TYMbFf_>{G*4$Cf*=GLn&)T|i0}+v{J){YOsB9& zo&2Y6qFZJ$My3zCz+61&BOsg2qnTY2=-69fvBdQGz3$TRg@Yx%FJu=jzWd?dHXdgU`;*zMVmm)Oa%OE7|6W3n0biTMzDob`I@sVVYJ!Z;jlzJ#|THXq;?< zwo|?YbW%Ozx;XV!HDDP=2+tOQ}N!SlVRtwIk~&qu5}kK zx1Y;kPC{+I&S80A^yk_Z`S5({<6}^DntxH!j{Id8kmUI>jvax|QTKPj&k7eeCnvD2 zed^{rKL3~N-rmx?`s$ISZ8`7%@eB`I;&nfVJlD&TGKdsjY-T(jq delta 280 zcmZ3;y_so(NGZx^prw85kH?(j9#r85lP9bN@+X1@buyJR*x37=%hdnDJhk zd<9TYs>C&-Bsf2swRwUb$)_kTV^q5aIZ2Hqd`vh^MRn|XJXy_Nddc0i=bWLf*cqY`-|&(U76VkjL>l$Khb_yZ@|bY9&r>PTauQ*w`o`q~QDcHS<4f3GD?P z2X83YD)5*wuoOr(onucF={>=4S0IP&!4)261y+OE6HJ?raAvhJrc9r(L{M_V+Cl~f cW@d(#Z|;IOcsW|VfbM1RboFyt=akR{0FOUo761SM diff --git a/resources/assets/enderio/textures/items/itemTravelStaff.png b/resources/assets/enderio/textures/items/itemTravelStaff.png index fca985bb9645e384718041f4811074d8afa31fce..fe4730e97624420169e2c60e97d9929e3066bb4d 100644 GIT binary patch literal 1352 zcmbVMeQXnD96p?@W*M?!)PX^c>jqP}-bb%rN4vT9I@isP*-h33oV(t=TaWENdUsp9 zCAv8=%cf#dgGzMj7^oo#F_?^i#xVkjG9lAYAuPrOSr!FjKp_D$uiHBPW8n`kxqH8U z&-47=-^caWR6n&eXJrlqK}!P_Ovo7X((nByfU zh-?c80haHKod#|Q%8ChfVLcptn&xED!lrF32~jc75acdRC@j|sbT|T91j&Q^e)KB@ z7I+U*Zwul<#RsB7MVAU{yQ=HBu2#;)Bc&yk2DqSjhnrvk7L z(ByWNGxE`F&VY^B-CZbcXm~?!QUxO^Y#SqU?IMu$0OLW76ALf!wB6wXHb=yUl6IRD zbpgtXvcSos9Mv3&02|J71exJk49{3`C&O6DGLoPO!cTe2eO@2qB^_lxFXOON8Ein( zbXMX(Mq4nn=dr|Hv9wPGtS+l{vfP%bf|{tT%UV=cV4n{zt`{U;j%$ynGcBXuRs4Sl$bzr5&#q9j{$= z#NW_2&>?K88QZbD@yHE-chAgAH znrT;iD))<h|(DfZB zkC~O*J^kCVCie;jYgqiw$4hF5^2kSQX9h2=Q6{}|((14tJvObJ=95qC%<&`n%Tq-w z&wsgV`_A*R!O?yDlDms9-x`cH1;4LI7AC=k183XTZ+`JA_-XK+%Du%8zd97&&^y(6 zGWK%(v!2y&KRbD$f35SeH_RWL_2u3B=+=X&QyaCfKU}s)appdk%Fi`5l>Rn;yx_#> z1iNj#`B32i@=#7TGyKf@$?&CQQ-SH5U&x8+&;NdY-9>ZJ9a~9u0krCnx#ay0YBc?C N3;3&<1Ky_Ie*j9>-tYhb literal 629 zcmV-*0*d{KP)N2bPDNB8 zb~7$DE-^4L^m3s900HqyL_t(oN9~heZwdvuP+Yqe(?&Qetdu(YFU^rG14%1+0x>X zyA33>0lxe^$Gh7j^tLVd+XPh2$PEd zB&6o^O+@=TS{<>Z9gswX!w#It!Q^raFRpe#A{FFG8y4+84QF~%+P%w4iiP8OXru`{ zAeo^>ucH;TvcoqzvgwUbA+}2R|C+8N6~}Qf>@GC30heC6-2)5#Jssgwx+|fQeW%^u zVP(bfcYst6*ViF5Hz27zc!|SKAIPZAr0V+5Cx8tP;VAJKXG~=A52gnU8H_lmlfE6pMqgML^Ll7dO9ldej P00000NkvXXu0mjft$`XW diff --git a/resources/assets/enderio/textures/items/itemTravelStaff_long.png b/resources/assets/enderio/textures/items/itemTravelStaff_long.png new file mode 100644 index 0000000000000000000000000000000000000000..699439f0c6ddc01295954a7bc4b613df55b57aa8 GIT binary patch literal 1354 zcmbVMZEO=|96uQ>IJ#^Y6Wd|3^Uwfc*XzCX&GxpJYHJ#5APA}rw{lT)tS`S?tIcoYoWYxeO%HbHF{NA2@*03xNf7`X zPVqe;3V3O-?*{NfP*tBC@6bCUFEgT&vh!sddoHD#XbAH9b1E+;fes6xM^5{Yhgb3l zEK5G*pflo#r~#0WTZc3d8)}P-LrIaA5Pvi5%`qlH3g|qXOZBEROwNa_@G|DSyp197 ziiw`|A*)VxMB3qiq5;@xccP+$z+pFS$DI_7<4rK(z)1{uU<8fgI77J^+y$>ah^eMY z-At4Vt!bGnACk~@mBFxVHfzt4c17#KaGItu2Z0d;YFeO~!L-ij&~#>Jg@FSZQIl0& zR?={pkr$MH-G`W-u3jOfMk4FP>C9T7%#dL@Ud3>`152gK_gb;e=uz;m8yi|@;)5!{ zq9CL6YoeKt?wu8|8N0^|l?_dAnEje;CWY_i6tO=A(t4QlA?Ar)k|oCFrh(HfI8nmo z^q@4LNR$U22^FbsK>$t%FXBXnXCpip2s$a&MX>}<;dqepxLG&H5+RnRSvDA?D%fy3 zqw{GIRJ3JNdksrI7Rv-Q!0U<@SCrmL6|^T5UCAUA6%GX8-3R5gq+~OD${AX{Fb6bw z07xNCNx>^2X5H%3M<#i zf9j^PWfo(3y50rmV!e+*+H4-p?2=k&-$@91LJ4zhJolrpWElRc7hXFWuYEiAap|&m zd1|uw$Bx3qv#;80FWTX1a_acP`#!B}dG53N&-(_t#s(%9{l?d~jhpAr88)q{ zL~c$92j04~Wzz>*G8hjdGoxGe)UY zvTS?CzWLT=b(~yUp08`lCgz)`tSxsfmuw?8ZmH^($?Ml!J$nkhv$M0q$>F2hzr5O& zOfKdpCY}z=Jt!P|au;E(`oxyl8h&rQ8aWHWlhC8OuWtEku6o+=Z5|BmV$c Cq3o^z literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/mJReader.png b/resources/assets/enderio/textures/items/mJReader.png index 59365b8e74d2012837db80e0821364b515b63951..6b23b881975060a95c8baf8308f230bb01718d6a 100644 GIT binary patch literal 1252 zcmbVMO>Em_81^WPwri)BsnW=X>bgT@0>?jfer)2kY3wx_OIOlBJ5Af_pD&GRY-hGJ zJ4HgYgGy`?Ljy4(4%O&(;ILda4Y8uFAfbVT;8vg~#3rcJ!x$Ap9N75WCWS+_1D5RX z?|q)<{oWtHH8eQT+8k&`5TrGo60&e?^WVm;@Y}iiK!U@QjyUQJn|a5TEPy0bQwC^S zm&QRBNNVN8*C37{4JWkRs56>5$SI~Cl6;$xr`cOM$}I7pxaM?yWlXxN;`V{5z|ocr4ZhOU`7 z6Fj!=)M#c1O_~-!!=W&)kTiux*$@?GSc-ZMrAexXph$vdaf;%YC`U!m+JiwgOU-jx zVSh~vu6V5AI336dsg8iy9RT`?TV!wtK;&L99=v9yw-nFi`J zO0rpYcno^Feg(ah$!riCb}djaWP~S`2r5Jpy6)d=&DwUd;9oa3wYGDW5+Jg`Hp`X* z^O5hagJJ9*F60|RZ@5F229qKc1yd>Oz;Mz6kHM3Ws;OKg%7SoI4&!tr9K%__^xzVR zskp-AWf_D?NulUE&t`bBUr6>O#AJdJX^Ik=1d~W4$w(|AFl<;5H?V2Lb|gaqb!`o5 z*RcH$#d1jtNRDacOtV<8f}w)xn0CP|p~)l~9MKHbbnU%q-^h{vh3=huw%yzM zb9+2-?SrX1^05WcnkpV`?5dt?e?ypFnwvhA8VEe{*M;SeI**T(%k97J{%*PT(1FI^ z;%7$|XP>>a<(huxmsIoE;g?r~($3$P%**qO9V?xS%;kIMXQr|*272GVoo6yTu2)xs zr|-{QFgjl8o3EsfA}hr8>hsCGM_Y1j%%cb0SKo8L;6Lr- z@5{%;q2=QXC-KM0*KS<8N&oTT$JHyvrZ-i_@% delta 413 zcmV;O0b>5-3AY1~B!2{FK}|sb0I`n?{9y$E000SaNLh0L01mH;LN@>a0W(QNK~y+Tt&_`6!cY)~ zS-LZk))vHC8$^mVDlXir&)@|_=%G;C%4_&CjWH(dTziR^jeo{>@HKvCP7Di^)3eYf zlW98V|K^{QPO0>t4*)H$@C+Aq5G~*)&y_Z~rUiTkffC@gg1-X@QhZN32Zd^<(S*OV zD`VB)z}n^(_?t)X{&ss7O32E(k3pKCcM+pI9^ot=%X~T%=tM(wN0Edn0dBJ;Mbo!e z+nvN(QVIc!!RtG+anjy_+BF+W@K_u3V|rnnFr&}|js zIa3*h1*qtg2QR@ChIJh@iY3349}+d&q?8at1*U`87?$b_97P+0KCZ%1!;*-hC7 zAC=u5GK$@!g+d_mMts9HP*Rj}+14gZX!$u=BG3t?8@iZC3Xn^x9LXj)o)lobmsB9H zlUlr@s*qz84X_;E@&G;)d#>*POm)7e7B7*5x_ z04>)02wJFlT+}76EH(O3hb`yifnxBJ`k>Y7>w2Nym`T@vs4pxmwEB-x_uj8|&Cbq# z-T*sb{m7Bc{K(y(zq#LY{-~l0dh^hkHw%Rw^NDNMM^`S)M=E{O51$>{6^nt3SFW_C zR~DbY$sM~mhq2hF-97z@`sM@Q-?*{sv)@m@_0{crk3~{{{8{+HG2 zcXzIyh;_$ev6Ljm7LRVa*?4+iWV-bbmLY^Ie=omSikyEumi}7*=aKN=RVq_An=5Ruu{xn=Bn!vLzA6^)0EPPBYiEF723gIgUl5OC@D? zvO=9~2@Nfbu!k}Rc^qS8ZTHkb32W9s8(J7$7=d+b*FB6pwT400u~P3Sv9mpdK1?8; z+y8yvfBuVRhXw~a+B(}X4C}}oO6Ab_viI(N34H^9G$b_m-E_e{YL?uJWJ4^jnli*Q zx-<-PP*TTFufkpo^PSf61-FnrEGniRlsubYRksit!+K*?OHxLli_36WGor-fYu^&M zrbdb5T$avSNm$knP1x}0#9&^T7*Pb3i1p#URS^;B(3SA2K595(HA-yqifHa_Qv|+g z;*La#EvE|EAv|f?5a)s%sn86-BSH{xtN_3}I75RF1!#&9NB~4OB7!j9dThbHRg@^Zt|d}brBVr2LP66Wrhp&_6wOc!Lm~^(88=+1N*Yd2iy;La#nvoWGY#Bh zlw@ZnlhC!9U5*X6(!I~P}Nj191$QFkvWnHb37?PHbhF0 zS4o8}$ui_gR9x2EL?jtbg?3vi#k}z*NU_*Eza=^Lp*!K&kJ> z#mDdaKmKLO-}hi?wSFu;Kl#e}Kd*Gwxwp^9tB<;8kU#X9`d+!X7Ltq9WvRGm&-1=h z)Tv^T4$oNkW3XtsD_{A0I^)=D->>xVKjzz*@7lGy9XsMHy?eI}4tRf{OnNYNDN&sI E2U7a9=l}o! literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/machineChassi.png b/resources/assets/enderio/textures/items/machineChassi.png index 21a81bf95d8b1648a2f3bd4f1886a3265fa22c00..7daee9cd519febdd80ab28c7e938bf79e0b93754 100644 GIT binary patch literal 1681 zcmbVNeNfYO7>;%dxPges#DRq96qsq6w522igf=p`QADVU$^mJcme@8aZIBkmRD?Nk zI1~iM&mlPVHvBkHrYC-j!+D#q;Q+tpc2mv?b8b2hk);Z5e|Y|}+$F!S_j#W8_kLW~ zBqzP+Ic~~0002A_;>i?Y^me`OV})vsWf#msN!riC>P6NodiQc1ujPAG8{!`ftUo9BB%txa2Q1inSwyW!QlrI)NFbK zkwV4|YYD3;D4XZ41cKz{<%#p8V$NnnP#nh*35H-8ELgyHC(Ba~n6*zEVIXO{&c;}I zhGRh&Bc4@H8@VpF>zOs0sF zN=VfRHi5PC6sx00v>8Er7#sUaETOW|6wlc-9A_S>g5+$D=j_>>6;!FfkcAAZ=kn~K zt_(fDFiG2(Wwbud##z8;AtsoY$kV76HDI!E7)RxDSgMf8;0TEUg%t`pCe`B-Eh^VS z!+8Dw4ILslg}CbEKXo&*B^0A;`l1Vj#fv_oS)qAsLYFu-6IcKkeK>)P)i}B%QwQfx zjP))&cH~}@5pVmvETnjR@Y9{Ayw~j9;7y8_OM*u!$s&@RxXTw(PRL%Fc>pdk^|Mzt z*B`3B$o3hoe^bCMNNm|AXTv;Bf~B%LKdU$ZRwb>}ffb*0a|fN5sgP9Ju3#tc!t zZ{^Q1sT+Qs+36m7p*VPY;mqbGS&NGvZo0K^9_cI=m&8~L%PLM!_|VMRXKi0swz;KM zC3!8Kh(2|t%yVGy@!4Xgzb~#WcYXYf(CY4l={^y&VXgUt0K{l8`=8h)Dq7+HWP5*4 z+mrsTJ0W4!)m0yLl6ZLc*utKxzHX~mPxhaB{+Hj(6$e&WE63E-Y>|ov2QT#ZX-yWj zbsZejy(rdEn4az%@Lk6PAUNmKUeCLuiolrVnL(xXKGFLd7Kf!@qssR_c6Qt{S~uNL zRW+mAOzmg52bY^Y+%usBLbJc2FJRA=rFVMoox5T44>Ny%+1+=lr&syI0N_yE`aPqL z9wojM-L985Zt(J2^iG|qtE$Nlo6GPW#-)j2t$%dZt^KT3ee~wg`E{!fdMs}JcuH_r zz!FbQV$jyQ)4lzpv92#HQfT>Lr{C5|Yb&SUbcR-5oZqYuOx-g-EZf8#0aJ+f1p_Tj zZ--Y^72kGFo;pQY;?us@7wc_Qf2iy`U=8x~J6ru%?x{c~jAWC0j?B1uX&`TRMfvz~ zVH;LN@>a0xL;GK~y+TbyL}H;y@6b zAId5b0TV8RjSc2LLd$+GR z_6XN26zlbW?)X31Y~Zw-FtuI}@3xKTa6r0TX0kb-&xVYnWsLD=t>6SDfdcRMcqawTNR;*GGijryIlN;IbFbH{3Hp5j7!LK4hlxxeBLN2UIl|Ra zTS#P6C37#Ai;@ebo?^r_wx1vHUtWM^a&ff5h` zv6zwIY=e3He$D4$_!Ps%Lfxj^-gJUtw0O3av`3Iw+JB4oJFLIIvHST!r75pKq=6VU z61m;USOG@=0T>GbL3mcjqj=@QyykK$iHGJTPd3|bpDLo=PQTe^DG2n?RBhqKvb5(! zsw;2HV$K31i*L7^VI)cN0*tIRzp|FPOpt=_AzUt11CrtoU?)>)_VH|5QCzN+{8DS0*YhJ7j%zLSbqAX0fS}E)4bkcUnx)h_P zQjoB6R@i$OMXFLg;LMNLYn93AN@ku$@#$s)kc@J&Y%HD%VM=yLr24Y9fv#?)(S+M- x>6Q__ROfL0WunrQEKsT_r&Q9l&Up_00I5kM`4C-@u`>Vw002ovPDHLkV1gcvFgO4J diff --git a/resources/assets/enderio/textures/items/magnet.png b/resources/assets/enderio/textures/items/magnet.png index 0c95ca71927d829672629daaa652c64ace6db64e..5fb0014d03f1098458ddc5659fd4c8903f5b2f4d 100644 GIT binary patch literal 1569 zcmbVMeM}Q)81EDjt7JGBb8PD6G^m@`yKAo>cWY&Z7U*K3mPXlhhU?vn9OZiDde9=7 zZWR^qE2!DrbWy>nK|(d^{Mh`6OdL^zPP0s%Eb5$_7z7p_u72!_)a?)BAG_r4ect!| z{hsgV>Ku7FiOMvkLZL{s%XI*iaNGdqd@moLm&T%px!qJn%|3iwTx*R4m6*Iz0)rdbbu) z>$C=h1cU~mfq_LBqS);QT8w6JbxhCm_T=En1K0 zvQucZPyW+4u_L(|qvEqEkT=if2zce;5#=e_x*k8NPz=kqS_jSOWa$buCH?Pxv{P!)Kt4KzQf#`u5{ja zte8A^Wy06Lr>s5C8G^sc4 z%^v-BcXvxpuU-c4jpk5`y<{oefxMVa4u)~z#|Oo>gd z(2B+?v2|tL>81qh39SCrfqc(SW7ny&z7%6~ee#Tn_0`n}g>f@Wlg6cm0<2~JQJp=d zXTzQA{Zqqv*u{(u*e?^PNLOjOeHJ7+3Er_ZJaXjj#NjG<_tenYL!|L=WNlyN8+TgX z`b3|a>hN4K^i-Z+yryvsF<@>h(_P!1_43$(!_fBTNAtp+oozimAGNjl0+F0o4%SRD zXEt0!Mk~8#cbsP%q_p|e0ct#U!a*%bNxPV|ahtj6{PD0Op<~sm#Z+GHBT%ZW#A?T% zsAzAGkGtj@H?29`+P!o3t|$DJ5~7|}Pb=U5!P$n;>7|9!m!3Jv494u%F&Zj--zItn*f+EAnM9C4wAR Yz*p~nyW5jHFZ$EAS@SHdnMI+001OLFEdT%j delta 428 zcmV;d0aN~=48{YHB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000id z000id0mpBsWB>pF8gxZibW?9;ba!ELWdKlNX>N2bPDNB8b~7$DE-^4L^m3s900A{g zL_t(IPh+4M{Qv)-A`BsbVAiZz|EEox_J88UiT`KCM*dtY%76P|nF!y91tR<)`acMR z6(Rw+0rTd~`~T(3m;ZO~-u-{>+`0eV-QE8mrkee~8ENqUf{*(D6OKy%w;9R*pCuuJ zVhCOX9%oqmza63d|B|QD|8vfA|4-RS{Xb|V_J6(%!VqKwuzBGp$k~g;h5oP9QT-p9 zgNjiMAOup|6@UI$t``4aeuMvi`BUEi6&uC>`^KpQwUS`K{{Kt=ANs%M|J46kU_(Hz zAjtrb#_Io`|D*p){}20*#Q>Brhz|b`3N1W5mJ{ zQ}O=`WrX2QCdz<|9!mdD+ROdlVI=o|o~$@rGYG&903`ujUI3=VKLk@EC3v6#0|Nl; W9;5sbIWM;W0000!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{^MbQ4*Y=R#Ki=l*$m0n3-3i=jR%tP-d)Ws%L0m@TF)WP}O!% z7sn6_|FaYBavd_@X=S#0%UtpNy;=KWjjvAX8cF&h^RGPb@r_}>eD0Z-O+kid@xEoP z<%*BO|GQ=FcPuqnQI;(;ONhOy)6?*HomFT5fyC$Sa$9{8B^MaUG`wotuvh5?w^L!A zgBaEN%nP3k;sFelF{r G5}E-0v3JV= literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/old/attractorCrystal.png b/resources/assets/enderio/textures/items/old/attractorCrystal.png new file mode 100644 index 0000000000000000000000000000000000000000..5c8dc4d0554fc56ebc7fe4368951abe71e830cdc GIT binary patch literal 434 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85o30K$!7fntTONP^!c=q9iy!t)x7$D3u`~F*C13&(AePq0Cs% zRL{`B;7id$ps|XcE{-7<{>cZ}MU(_*q%d4s^6vZx`8H1@mSvUSn{EG#+sxoR<|55> zndef-H-*Rhe^j~|m_;xYcD5LYD4I2_tNiyjGvVwfX^DT?;s$@N&ph@a{uEEYqQco~ z`8TcE-*)G)n>o~K9tM9v6>we<6~K6=Y&H9<|H*Pc{>6Vu(7Ul<1^c}JrfEih z!e?`tteD-vXe{r;B+YP0f!Sdl=MgIjqDZzTfI40lysy@8@GARO=!Jg#V^FHaQ4ZHyC=Ca4LBT~rD*=4mi#+|Z#K!oX}`z`$^O X$r~$v6%kEfkTQ6>`njxgN@xNA&%l^o literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/old/basicCapacitor.png b/resources/assets/enderio/textures/items/old/basicCapacitor.png new file mode 100644 index 0000000000000000000000000000000000000000..446858a35a111b59cb6c5a95d96fe66ccd37ffee GIT binary patch literal 319 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%L0m@TF)WP}Ocv z7sn6_|FaWLa~(1eaAnWg`v1Y^wMT=d?6|sih14|5r>-^I*#IN>i?QI4RNS z`xD0bPDfVMug}?iC}+9BZJojeS#QjXeO7C#{nV(lY44riKl}UL8HbD^`L`y5wHpSAqP#=MKOWgEiQ-R12nlyQ(hrdYg*{YiCP_2xvG z1N--C)ZCa^W#kb1so;bXLnoW_w%di7YxlP~@AdnudmxPIWIJPAe9OceLW>ga1HHlE M>FVdQ&MBb@02so1ng9R* literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/old/basicGear.png b/resources/assets/enderio/textures/items/old/basicGear.png new file mode 100644 index 0000000000000000000000000000000000000000..16e22c0693118faeb552de59009c49f18698258d GIT binary patch literal 431 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`)Ym%P6qN7l0AZa z85pWm85kOx85n;42huMY7)lKo7+xhXFj&oCU=Yur6o1qWsFt(9BeIx*ftw$M87KW@ zUJ4YHDshb{3C>R|DNig)We7;j%q!9Ja}7}_GuAWJGc|_p9_21LQF~q{Zce0^S zlYxNiPGOFq4z6u+2QGCnUvN(BUpjaChA(-AadXbAI2ajhp6vPQ``dr4lT<{98gxZibW?9;ba!ELWdKlNX>N2bPDNB8 zb~7$DE-^7j^FlWO00DwYL_t(IPu-B&Ng?*qdsvC!+o-RBNc``c-5mkEa7v1`2DSd0upeTdphVd4GCSTCDY8ikjIMR zs{h>lBGIxKEg%v0+40MbgcK{PEPZc&E75dqYQ_((|D7zBC-_3!ei;Q@VgLXD07*qo IM6N<$f@756NdN!< literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/old/bucketFire_water.png b/resources/assets/enderio/textures/items/old/bucketFire_water.png new file mode 100644 index 0000000000000000000000000000000000000000..85cffc6a9631bf5df2afd0ab765d4a7ffbc4a30a GIT binary patch literal 349 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=Dh+L6~vJ#O${~L8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3Q$0gN_s>q|Kvg$A zT^vI!{LfC<$agS6qV>01(u)U@1|bGFb)MO^USKU$pZ(O%EuKl1WwNh}`{}3Izv3^w zxO(t`in{N+|MTC^i+gYX^!GkNcE^Od{ij_YSgo7+IV)jX;OU%YzQqwGXA5r{Pyc#> zS80yltH=(9gRxi6IV7bWxOp~N-!W~&{L)PZb}RSgHZ*Ps=JJ?yL~lt|O8vucIcm=n zC3Z0;aduQT|K1bG+wjQ3EGj#j!E0p^gAm7~XcmjZD{eR`-1+mh>!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{^MbQ4*Y=R#Ki=l*$m0n3-3i=jR%tP-d)Ws%L2E{@KYKsOpfX zi(`m||Jey=Ia>?_T60f1UFzCSM%<55~-NK>?K3*Ym_vR%v(2V(Ap~0|!pTFm1~{-B^47vuMMs@9SQ_V%REnMQe@pjnSb4pj_(8=w~7fU_3$hP9o%=yxHrU^0};=1rDnL+8t+2=o|XU!5fm-LTZ Tzw!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{^MbQ4*Y=R#Ki=l*$m0n3-3i=jR%tP-d)Ws%L2E{@KYKsA`d? zi(`m||Jex}c@Hayuue2TVQ_+bM}J1pk`n?vhk1IAm~GR0l-QE%Gf_$1R`EaBSHo5|H&Q;3hV!Kr6sOD)I4D27Q4+1f9rEv#)-xl>bZ{e{I@zu{Z@HT@mB%uH>n k0hJL9Jo8lL{|hCX1$oOWh0XI>4|FYqr>mdKI;Vst0MK}7MF0Q* literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/old/bucketRocket_fuel.png b/resources/assets/enderio/textures/items/old/bucketRocket_fuel.png new file mode 100644 index 0000000000000000000000000000000000000000..48de69701a86afc23988c6bb797a054ad434b6a3 GIT binary patch literal 339 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=Dh+L6~vJ#O${~L8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3Q$0gN_s>q|Kvm~G zT^vI!{LfA>IUe_Zun^Zs{NS(e7HCUIh|7JN%HFVdQ&MBb@04&6Ood5s; literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/old/bucketXpjuice.png b/resources/assets/enderio/textures/items/old/bucketXpjuice.png new file mode 100644 index 0000000000000000000000000000000000000000..877f6d5aa94f4d9e1818de9bd64a632054bc0053 GIT binary patch literal 1249 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+n3Xa^B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxSU1_g&``n5OwZ87 z)XdCKN5ROz&`93^h|F{iO{`4Ktc=VRpg;*|TTx1yRgjAt)Gi>;Rw<*Tq`*pFzr4I$ zuiRKKzbIYb(9+TpWQLKEE>MMTab;dfVufyAu`f(~1RD^r68eAMwS&*t9 zlvv ztM~P_^2{qPNz6-5^>ndS0-B(gnVDi`>SSPM;AUW8Vqj@vXy|I}Xkch;;c8}P;AG}# zW@+LI)9aF-T$-DjR|3MZaDSo10ACeiddwGh6w>v4~Pj*wm=R%;iu*SQ+p9GSxbG;n8U!p80zWb z7*cU7>CgZF_ROjcosCWhn34^Qj1IB-`uaXRH)-O;#_sj;`{mYgJS!4Qxtt&szTT7d zbAC-d%k;|+rZB&DHt%4KH1<&Tn7r zGHEjK*|TH`OSMANf#d!12iqDN=I@kmW;^WE#E!hi+y3gOT0~X}ZD%xazH;@d zWZs;P^c&UJc=XPlopCO~zPa-u-@1&Jwm1L3eJeBg|0P$vjr+Tv!lDaLWShUtwdQH( zmrt{({bizjuchSkGv5u`JUl!H{*=GJ$C#_XTt{`<^8bgm`1;)Kr MPgg&ebxsLQ05BS@+W-In literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/old/conductiveIron.png b/resources/assets/enderio/textures/items/old/conductiveIron.png new file mode 100644 index 0000000000000000000000000000000000000000..24e77d5aff665054be3e3c15dafcdc18d254ea1a GIT binary patch literal 507 zcmVN2bPDNB8 zb~7$DE-^7j^FlWO00DPNL_t(IPt}smNFYLJ+k*EF>( z%}i6vLPw2ygP=hTqo8Sn2pR@K(5P9U_6V!Hcigm$!clZ!u@8s6zP--jXf*$3Ikf^v zeFb)lB3yz9Nzqv-f|FqAcZehiY;udkxJ|90UERl1Hjn#E7T1XsLmWfe&q?Tj;*t4$ zNk(g@ir0e%*H&c@%~A!=`2qv4fcA72 z(i;%ajbK5iW0?mAp&r$<=p=GLemnGGpUN+U$@`W|Tc%?%Pt7b2vKyGE%gn z%Y%pY95=@;R;*ZUIGUTs;mj;*K0ius4+Fw_Bd7UDa1o8+QeMXCVi;-rD0aO*)csRv zOiptpbIfEx)M!G)VC)4@L=wGlN~tu7;#R#AY*fway=gK}R~Nkl0VrC+V&f^@G7l;S xQn%^rk0J=&ivR>tr~GL84$>2^ufO{j&2RBG5ni4|@=E{!002ovPDHLkV1nTk&@TW0 literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/old/conduitBinder.png b/resources/assets/enderio/textures/items/old/conduitBinder.png new file mode 100644 index 0000000000000000000000000000000000000000..b92bc13ca5f897076d3468ef0968948d58faa1d7 GIT binary patch literal 528 zcmV+r0`L8aP)N2bPDNB8 zb~7$DE-^7j^FlWO00E3iL_t(IPpy&dFG5iO#`Dqt!n{o{flAgWegut5 z4nwyN0sb|@s|*4@7g&!2vy(KY$H$=L!%AscL2X$N2bPDNB8 zb~7$DE-^4L^m3s900BiwL_t(IPhL10}l4G^Tn z)S$?S;A-=hTgm0Zxlj!<4Eb;&5JJ+B9}rrb;NqZQMQ8x)(cr9cR&748EbTy_=8_6Ed%09}4aiP%F-VK{OP<)?bzsws zL(7ZSbh)Scy1-Qf5lA&u14F%uOh$~Kd%B-PM{)X!c{2{}SiNp;rH@__Ts07(Xi#OZ zbWo2@@USWjb8XCsoYYiVTi5|t3P}ej8X!oWt-?byI@R4O#>>G1DUN{%s0WJ%2vTLK z)EA9K69giVYG^3oMewu()c~SU0Z!lvI6;>1s;*b z3=DkxL735kHCP2GC{^MbQ4*Y=R#Ki=l*$m0n3-3i=jR%tP-d)Ws%L0m@TF)WP}NdT z7sn6_|GAT*g$^rlxcb)r+2Z};U-(l$jq4mA3%#u@jahgqO$)VDm=)}ym(3z>+FUD)(SGV>tmSSOej9~VcNpko(!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{^MbQ4*Y=R#Ki=l*$m0n3-3i=jR%tP-d)Ws%L2E{@KYKsOpuc zi(`m||J{J&T`dkGU$&(k;W>7&p-bYz|NonpE%Tnzdb9Ak9jkA4@JrjL-4{)IGj5BO z#wwpLF0`v}6X{Hp*sxCfS*6?k?<-buc}_a;{qK3V=@s|Ob8fd4$|&AmpuyFW*fIH= zT>o+BlGyglS$vaIBM~Ubez3n|nBz>9S>eFE- zHt`h794?KOXe-PYU};?7Icr&aM{)egqQ(Ll_F2pR?)MPdsnfOYapk?h*y~@ff0_UJ zU#kk2THujWf6RP8uUNP0Rras=X6_(`l)K7bdp}e!(C|MRnq^UF6LJ&iYX(nOKbLh* G2~7aY#FlIT literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/old/darkSteel.png b/resources/assets/enderio/textures/items/old/darkSteel.png new file mode 100644 index 0000000000000000000000000000000000000000..2934c638cced017233b27bbe404940f018af82ec GIT binary patch literal 429 zcmV;e0aE^nP)N2bPDNB8 zb~7$DE-^7j^FlWO00AjUL_t(IPt}kyi-SNAg)Obj9|&knhzdbs62w?&W#vDxuraNq z2!wPYjab-Nrtz=7@P^w6xxnSB;|3nHJIwoLceMW#hGBsEx_%au$pjRQhrOvPJ->a#2-P!Sg)q_j@Esf;3Gf(>$Ng z1x)id0G~*4!_1t-=SEQ^MrBt2R+1$$6olmEa`~L1^w#tmgmB9W@R8{?2>G??k3-WQ Xi)!BP+$31(00000NkvXXu0mjfV$iVp literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/old/darkSteel_axe.png b/resources/assets/enderio/textures/items/old/darkSteel_axe.png new file mode 100644 index 0000000000000000000000000000000000000000..6f0014cc0b36916122c819138fb701ea3658395a GIT binary patch literal 260 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3 zQ$0gN_s>q|Kvl(_E{-7<{>cl(fAAkoY5ae@U!FZ#Kw8Pgh9UdRi4#BW-@WU*iLv0U z0gq5~(jtZ%3=_^OoXyJ0I?*P;dqB$OtjkGrmNhs1-|cUcF^@3zWNR=fU$(m0)VbB; yGS6m7Ef<>w5yrDNcd|358*@y^HBN14WMtSFkQVBp5Sa(Gp25@A&t;ucLK6V3F;ejW literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/old/darkSteel_boots.png b/resources/assets/enderio/textures/items/old/darkSteel_boots.png new file mode 100644 index 0000000000000000000000000000000000000000..d314d206aa10047e7b611e687d705fbfab693ae4 GIT binary patch literal 240 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3 zQ$0gN_s>q|KvnUcE{-7<{&)Kw`3@*>uvGHCe>~l$yG`lZl&dBmFKn4yP#|XR_5Vnl z=Y-}N9TLXVn>zJptU3fF-|T;IwdwQx)lD+??fYIVjCW&wcTBcikoB(;m-OkmBC0z+ dmb|wXkj;8s&2sj$-6fz^44$rjF6*2UngE4-Qt$u( literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/old/darkSteel_chestplate.png b/resources/assets/enderio/textures/items/old/darkSteel_chestplate.png new file mode 100644 index 0000000000000000000000000000000000000000..2a5e26827c5224dd776b15175444baae52adf648 GIT binary patch literal 262 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3 zQ$0gN_s>q|KvkulE{-7<{%89xavo6NVV!&I=bcL%b;NrwOfU)hb+Ng5(jM{Xx|0!6 zi+;K>t=$@!y)|*B^8M4&))QnozI|^vb?5d@c8N`I_I7VuGU+p41IxW>iT_nJ$g-U;Sv^0l|_ApaU2@UHx3vIVCg! E0HXn7q5uE@ literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/old/darkSteel_helmet.png b/resources/assets/enderio/textures/items/old/darkSteel_helmet.png new file mode 100644 index 0000000000000000000000000000000000000000..def672f53bfd57baeb2ff8527d5d95c7ca9cb1e8 GIT binary patch literal 214 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3 zQ$0gN_s>q|Kvk}uE{-7<{>c*i9@z8wi2R5T2xw@$dgV%o5zCq%KR!NA=*eR+Y&*bv zVA;$JW(SEQZpTz485V7PxG<4{<3W(ilxGv!B_tSXGYc)EB9?yy8pz=3>gTe~DWM4f D{i8zG literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/old/darkSteel_hoe.png b/resources/assets/enderio/textures/items/old/darkSteel_hoe.png new file mode 100644 index 0000000000000000000000000000000000000000..2c54c64682bafb97f72504dcb1d8ddee7525a2a9 GIT binary patch literal 247 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3 zQ$0gN_s>q|Kvij;E{-7<{>ckWfAqI_vi+w(k__>Kgr2xn7Djq((IGh lY*=#H7&qlE<1sK`V8~Yqo}3(cBnxOGgQu&X%Q~loCIGNRPwW5y literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/old/darkSteel_leggings.png b/resources/assets/enderio/textures/items/old/darkSteel_leggings.png new file mode 100644 index 0000000000000000000000000000000000000000..e11c0236bd827f64bf6c1f15b0d48eaa069dfe64 GIT binary patch literal 223 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3 zQ$0gN_s>q|KvjO8E{-7<{>c(k9@sPXi2u>o&^XX}^~x0vDWq|Kvio!T^vI!{F5cFJg^t@G5Jyd=f}tYckkZ)Z){|AK;np)h{&J!nQFi6 z5Bv9N96qqk%fqAL<()fs{D;p8V$1{ zZrZtHheVEmwzhU*TZ2jYvenAg(lTlaQiqN*PsnZKYGk;<;O6G`hb>{FB-??wgruZH zxeR=>6B%TV0@b)OSLC>{?J#}3QPN)FQrew{oY|VpJUk4(zIkW22dI_-9nRqC>gTe~ HDWM4fF@JFB literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/old/darkSteel_shovel.png b/resources/assets/enderio/textures/items/old/darkSteel_shovel.png new file mode 100644 index 0000000000000000000000000000000000000000..ab07642a1841b33aa410c3eb7ab51f7d6abf6af4 GIT binary patch literal 246 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3 zQ$0gN_s>q|Kvk)pE{-7<{>c(W5A221B>&jg{jrcpPf3}O!x52OUTz*?+`%i<>>bP0l+XkKz^zKe literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/old/darkSteel_sword.png b/resources/assets/enderio/textures/items/old/darkSteel_sword.png new file mode 100644 index 0000000000000000000000000000000000000000..e86ce9015c3b7d99b0e054b8a6d1bfda7936bffc GIT binary patch literal 288 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3 zQ$0gN_s>q|Kvn&oE{-7<{&V{d@-`^&xbCdJx>)8SV~@53|1P$5NfJF9vmCtZM0h?- zYIFEqCpc9g#4u&8YO+tL!-Tsp-+ljVZ!<%6xzJ|wx!HwHdS1v-tv)78&qol`;+0PA65od5s; literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/old/electricalSteel.png b/resources/assets/enderio/textures/items/old/electricalSteel.png new file mode 100644 index 0000000000000000000000000000000000000000..fab794d1fae7a121fd81f54c7bdf3b5333b5ad98 GIT binary patch literal 445 zcmV;u0Yd(XP)N2bPDNB8 zb~7$DE-^7j^FlWO00B8kL_t(IPt}q^i-J%Th5ctOGk-%14N=kp7gC~#(Lz`4{0A*s z)G`DSHxWb-v=aO`XE+x$n1q>D!w8r6c--@y^R7=({>?WYkHPvVu%>C4OeRoO6{ph) zhr{7#2%9OQ`0;q)`Fx@*OSEl^>-9Pe>Ecm*KA&;F-$lTcklXEsx~^qkRTcL8{VNH@ ztJO-JilPvg%jF{CrfEdPJm4iASk6133*ladP z(-c{j$x5+hSpuf`4Zw&j{-(uZAx?~&B#8(+G4IdVUG;B*b0C1^`F!5HbZ ?=OlF nPPqg8N;Cv{i}%sn{fp)=PwYZ_Dh#%J00000NkvXXu0mjf%%-=` literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/old/enderCapacitor.png b/resources/assets/enderio/textures/items/old/enderCapacitor.png new file mode 100644 index 0000000000000000000000000000000000000000..ba24c67db6101909ff653cf029fff94328b2b098 GIT binary patch literal 329 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%L0m@TF)WP}NaS z7sn6_|Fe_May2=KwCXQ;x=LI_+ca>=23IMSiQS9JGw%w2d9-}z^uP(r(!_MF3TDiF zZF~QZ!rvH%eYZRvx4IT+2);3&F~#!OQK`CJE#hb2vT$mr^GnS*oY$~x3d7a#3-6e; z&MjEtSP?!U!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{^MbQ4*Y=R#Ki=l*$m0n3-3i=jR%tP-d)Ws%L0m@TF)WP}NmW z7sn6_|EuRcxepl#us(1Kwc%PR8n_`Z!S%weU5YybqmS;8fBye}U%K(44vtX&UkM8B zd-8?eE^l7`QzPOck8Y$>;Hww&kGONRT{<}9R!_u2zVgIFwu+xE4}gE zF^Akq4dQ9Zf_h>pQgT-}E@Ra)V*1APlp|omuHwDFtT-}GIZQ5+@SJ}BmFU$<7M3&{ z1BKbAv#x|&r5HZQ>HXf&cIL3!!P!?oS03}+v9I%%fhhNi1>(6O9#^lwPc4_+|JSg` ng8gIY&uP&wSAV+ia#@daQl;0P9H(la2N^tF{an^LB{Ts5B&LQ> literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/old/enderface.png b/resources/assets/enderio/textures/items/old/enderface.png new file mode 100644 index 0000000000000000000000000000000000000000..d372f4088f16515b8647a9b7d0124e12a7e8f240 GIT binary patch literal 290 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3 zQ$0gN_s>q|KvfexT^vI!{F4I$0}~gp1TT?H`KVyxaLWA0euv7}^#Z*;iAgUWwmxK? z!FZyr;f9MeLomnXmNk(J);zTj)N?3fy}_`+ZALkV)B-l57m?*nh%L2wF&$=CF eO!556#Bi$j*w0mWs||pTWAJqKb6Mw<&;$TkT4A98 literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/old/endermanSkull.png b/resources/assets/enderio/textures/items/old/endermanSkull.png new file mode 100644 index 0000000000000000000000000000000000000000..7c95a77b37a96391372b34eb1d6ab5da381d60e8 GIT binary patch literal 252 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%L0m@TF)WP*sJe zi(`m||I$82z5@yz%(bom|7%Wm^F7^hu=mNc9U@z1-qa7Obk@rEc*>h^81nvZeVmSd zWuAhDgr;tUqP_Cz;B|mLR^7dcX0+6Nd_-*1|M+- zF9`-u83r$T1|KPgI5~zmMTRI%hG;#8I6a0~1BO^*hGZ><1U-fnJ%%I$hD2kAL=%Q2 zbA}WXh7@y#SuPB-+!^NjFwF5|m>`%> z+ao`=7ar`-L)ah3GCzrAdKSt2B8>S_8so!kriXb9&oUUFXE8p>V|-M=@T{2ONjbxl zO2()43@>UKz8A9mua$V+!1TYL^-q(`|C!A1XBhl$)%)LP@O_Hz*O@9mr>Os$s{eDE z{+~%Y|L3Xyovr21s-{p|zVzM~2Kk*1qNUFp&q9iy!t)x7$ zD3u`~F*C13&(AePq0Cs%RL{`B;7id$psJmoE{-7@!O1`R**;hfAKWyeM0t<#fz4o zI--!0_%!!XO7ik$>sFpQbC79^>w!x#j`61hntNvoK4Dp4y@RJ`s>Do72b+!q^?qS# m9PBI;{xC6SF#Z3}%<$;mw4MX^qh0|$!QkoY=d#Wzp$PzfE(V+c literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/old/existingItemFilter.png b/resources/assets/enderio/textures/items/old/existingItemFilter.png new file mode 100644 index 0000000000000000000000000000000000000000..6b446ee3f9563c07f9a46aa3201703652cf2c9b8 GIT binary patch literal 307 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85o30K$!7fntTONP^!c=q9iy!t)x7$D3u`~F*C13&(AePq0Cs% zRL{`B;7id$psGclE{-7<{>c)19_TY4t{15L`bt#7xwVs7q4$42L!tf5wg%oG_Oc!S zn|XJXy_Nddc0i=bWLf*cqY`-|&(U76VkjL>l$Khb_yZ@|bY9&r> zPTauQ*w`o`q~QDcHS<4f3GD?P2X83YD)5*wuoOr(onucF={>=4S0IP&!4)261y+OE v6HJ?raAvhJrc9r(L{M_V+Cl~fW@d(#Z|*mEIabP0l+XkKD?(*& literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/old/itemTravelStaff.png b/resources/assets/enderio/textures/items/old/itemTravelStaff.png new file mode 100644 index 0000000000000000000000000000000000000000..fca985bb9645e384718041f4811074d8afa31fce GIT binary patch literal 629 zcmV-*0*d{KP)N2bPDNB8 zb~7$DE-^4L^m3s900HqyL_t(oN9~heZwdvuP+Yqe(?&Qetdu(YFU^rG14%1+0x>X zyA33>0lxe^$Gh7j^tLVd+XPh2$PEd zB&6o^O+@=TS{<>Z9gswX!w#It!Q^raFRpe#A{FFG8y4+84QF~%+P%w4iiP8OXru`{ zAeo^>ucH;TvcoqzvgwUbA+}2R|C+8N6~}Qf>@GC30heC6-2)5#Jssgwx+|fQeW%^u zVP(bfcYst6*ViF5Hz27zc!|SKAIPZAr0V+5Cx8tP;VAJKXG~=A52gnU8H_lmlfE6pMqgML^Ll7dO9ldej P00000NkvXXu0mjft$`XW literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/old/mJReader.png b/resources/assets/enderio/textures/items/old/mJReader.png new file mode 100644 index 0000000000000000000000000000000000000000..59365b8e74d2012837db80e0821364b515b63951 GIT binary patch literal 439 zcmV;o0Z9IdP)N2bPDNB8 zb~7$DE-^7j^FlWO00A>eL_t(IPpy;7PQp+ShFQ8Zk=7Q(S{p=)H7YLLs?XpBMChSV z+sbSBGL11N>|A?^myO1E@HKvCP7Di^)3eYflW98V|K^{QPO0>t4*)H$@C+Aq5G~*) z&y_Z~rUiTkffC@gg1-X@QhZN32Zd^<(S*OVD`VB)z}n^(_?t)X{&ss7O32E(k3pKC zcM+pI9^ot=%X~T%=tM(wN0Edn0dBJ;Mbo!e+3PK3ahJtybJ)!`2y z2LA)>pln)dK-KkdH0a}4gais_;&ZyxFijz7Jj<>YFN{-fV40lQH3w#82?hyF4y%H) hv8dlR?K=KC@C|M<$5IVfhb903002ovPDHLkV1hZlv0eZG literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/old/machineChassi.png b/resources/assets/enderio/textures/items/old/machineChassi.png new file mode 100644 index 0000000000000000000000000000000000000000..21a81bf95d8b1648a2f3bd4f1886a3265fa22c00 GIT binary patch literal 687 zcmV;g0#N;lP)N2bPDNB8 zb~7$DE-^7j^FlWO00JvXL_t(IPjyq-ZsI@?oFB?65djk}gN+U5K0?fCb1jGRkiSRb ztnKQRk@jI9Mr~`ltEy|djU6=LG+Xf6ZFt=-d^ujH1Gn8mxzRwO<|A8mkf~IVw#%?2 zW~(mpz7IR7!+4!G;^P4y)hh1yy8)ml>$+GR_6XN26zlbW?)X31Y~Zw-FtuI}@3xKT za6r0TX0kb-&xVYnWsLD=t>6SDfdcRMcqRk_*Z}86S^_Au1C-<4BVj zC(;7%Bav;3slxvBsooO>G?8p%XJitA5)cBhn33RYgL(XZ&F5kG6vM?r-KN~$bb?{D zc(#?aN03z}w<-)w?aw>_3 z<|R)y+issKqTNov*=8vS^w3mo;l;AF=R~S2Z_8rN0warWx0_)kN%8`WtTn%~mby%k zg6|<*E>#81+(@sn^vpt<_a$B>&!_;IG+X#k1{Qxx0w+xXRPOxu7GWG~F(;IFa~WX{ z5^G+p49t6}h@vb^xLPUe>2%U|$hs7xrc#iwa#q-T7)7d5J>blb*K3u@=}KmvM)B!p z0+5VyvTQ7#3SmliNTm9*wt=p0rO|}jYU!2{y;SFL{bi!klq^uHD5q4?wa$4C{s5^- VBl%sBu`>Vw002ovPDHLkV1f*(F(d#0 literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/old/magnet.png b/resources/assets/enderio/textures/items/old/magnet.png new file mode 100644 index 0000000000000000000000000000000000000000..0c95ca71927d829672629daaa652c64ace6db64e GIT binary patch literal 454 zcmV;%0XhDOP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02*{fSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+qQF!XYv0003sNkl+`0eV z-QE8mrkee~8ENqUf{*(D6OKy%w;9R*pCuuJVhCOX9%oqmza63d|B|QD|8vfA|4-RS z{Xb|V_J6(%!VqKwuzBGp$k~g;h5oP9QT-p9gNjiMAOup|75-PQ7XM#98|4aWL`oHG?)c;vvLqM(|$pDbX>i?eqqyJ0)5BrbB0F*F@4*w4f z18~$W6cYr80mu+!+%G6-05)w wtTh0bE`Hro=x4Qz9jJpaBB|0PG&4{1G`Xw*UYD07*qoM6N<$f~JngRsaA1 literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/old/phasedGold.png b/resources/assets/enderio/textures/items/old/phasedGold.png new file mode 100644 index 0000000000000000000000000000000000000000..79d8fd0350cc9514a555e6f0ba843fb307cf3def GIT binary patch literal 505 zcmVN2bPDNB8 zb~7$DE-^7j^FlWO00DJLL_t(IPt}s$E5lJ7#`k~Nm2Llk+KerEe_L)C+sM27?ZQjM z%;v(4P^2g|ZoCzd5^_TgGfEQEFxh7O5s%+<*3S&luH@9ysdLWr`99xoN1^yPtJbLk zl~!P@TLa6G8Wxutfm<_t!J6M8b%QElvUxOkd~85G-iAn|2~SUrczCc0hG}g$Rf11w^jQ>LZ7FaPJz>x30&uzgWB*mkN&h@{<4>8Ex{UNc76b z&aE5_?HI6eS%u{b6Xwp!FeTj+(7mEV*OC?$_KZY=>pKgAlKj%7hxd(`4V1!rUXBGx z+-dIL)T4JT8$GMKuK-4*IAPD8QB-2wnbQ(sl+AMA>|OLPFQy=X(OlcPqRK~^97<3r vrq4f$5Kfr@g5)Ycn!ba4iI>*j{fozMK9EbdZMQ1h00000NkvXXu0mjfpa0xq literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/old/phasedIron.png b/resources/assets/enderio/textures/items/old/phasedIron.png new file mode 100644 index 0000000000000000000000000000000000000000..0eb910989d3d7494097211bfe43eca2bbc42aeab GIT binary patch literal 503 zcmVN2bPDNB8 zb~7$DE-^7j^FlWO00DDJL_t(IPt}soO9DX{hW#G|qhQ@!a#wfL{I!~u1^&$4Rg$z! zt;h(8f;t94bSk1_hX}d_5p?R*A?Ofv=-8pZ=WV~)7Q>?O6b*dLFwFCO?+oK`{F~uY zIZ*W#*cEr1kX7-+0%H5Q-z8QjHwH|2`l5>R%NBCCEu^pNm^!Oil2}g?+OQ*zA89b2 zI;gzuvbprU3H@;cg}YTIoH#8Zx|i)r2o`H$%v{!xy=g*wSV!@`&EUD$9VVbP?eRGY zTt)V tA4L*+Wm{l(`4Rd~@+DqhfA=pAzXQ8X=5h15Bgg;%002ovPDHLkV1h|z&e8w? literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/old/phasedIronNugget.png b/resources/assets/enderio/textures/items/old/phasedIronNugget.png new file mode 100644 index 0000000000000000000000000000000000000000..8fc23da82f59fbec606c32053d5f729314921dfd GIT binary patch literal 307 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3 zQ$0gN_s>q|Kvj!8T^vI!{F4(TSS_3zoP(d)w=dI?m@MO?;OjJz@4xD*!~eRM?Eaq~ zETVo^fX~-*L)yih_5c4civ6#Q<^8w$WT#L*M|<0u`inB}|1%|C`(JsN=U?&dtpDi~ z#nkRGOqhSOv5kY}=D+8gt}4YE-(WCZ`Tq`I)ql&gSN<7yb52OJKEV)hpm4_Ozt0VV yex6r3px@8i7RJ5*&)A6isAhf10Cx-9#KHoGI+ZBxvX!lvI6;>1s;*b z3=Dh+L6~vJ#O${~L8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3Q$0gN_s>q|KvnZR zT^vI!{NDzh<~pLl^X8;h)N5wlEC2rIpL@p=Rdq8@yZX)n1-5jfPRX|Vn%NBZ_&e4) zoRc&>rYE@Ob=S374_0zyt#!Jy&G%etWWw6LPgy?O$UoW4@cFStT$e+3Z_ug4xmRy; z73U<+Qqx#!*VW_HPv0SNz;rSg~@q5*Z0$a|VIyU3N2bPDNB8 zb~7$DE-^7j^FlWO009$8L_t(IPh(&h1$aZCPEYth2$K~|4f-PgF9fRnKjp9bzn)Y> zK$@S&X#anmXY~JNiZ0j?kQh-e0Xg|*sQUlcg+~A1Hdy|Dm2L3LYS2)Q1uhGR3CKcL(|5rK6{l6BZ{{Ll? z&i~h0`e4n^qcs0t4^jVr(og08E_cQMOYLQ`8v--ntiQ_tXOWu!UqoyDzaFgi|18k| zr-5QefiBw#G+-Gn13&=;GGrytnR`8z{vY!NY63d@5Ktq?=5@~U{}=4B literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/old/powderEnder.png b/resources/assets/enderio/textures/items/old/powderEnder.png new file mode 100644 index 0000000000000000000000000000000000000000..6571483e7e29efe3544cb2a4b6951e2bfb0159e8 GIT binary patch literal 428 zcmV;d0aN~oP)N2bPDNB8 zb~7$DE-^7j^FlWO00AgTL_t(IPwkIgOTthX$M<2Jg*xXn+nJkgYp*U>DxxfO3PyF) z3m8RRL|4pgk~2+1aE9*^R<3i;B7K5fIE^L8ndBB}Cl4W%X_5}{ z!~{7r;~6CvM+y~-NEr#~i$qPLbNGHGZd9O#d_a(Pxu3<0uvQMN&Cy3^(#?MahWP}~ W(2q27d@zjw0000N2bPDNB8 zb~7$DE-^7j^FlWO00BfvL_t(IPwkLjOTthXhj-E3oSPf#pG8Jp=%e|5d^Y`iXtMCQp+-eppm3b2~t6$Vi!Rl;@4RibfKm1>a9;R5?|WYApXR93 zHUxb()Sm6Js4&Q1Nyx;Vutc?TYlK5Aszx8Gxgiwq`tcBRVt%GYNmym^`q+c_XAjJh z7nRH)jFgPH#$j%XZZ28yGbrg2%%U3~Z(btsppqRx;kpz0F^|197J>1O`Vwnd=es-+ zbmOJqhWRx7b(i&C7?(2iBLPXx4sDr%f259Nc9KS7+d;a?MB+j@?IQp0LOvxSeJbMi zfX79I2$mWMECN0nu`LJLyntL%L^dJfJ}Tg5pTo%p39m3vMjM2`u_m!ZhwB{9A{?Td ycI>ROP)S`G`z8DnOQaG}h@9X=8^J$@qCNpF&aX{8FKZS60000N2bPDNB8 zb~7$DE-^7j^FlWO00A3GL_t(IPwkRHO9DX{hW%HGg;?0CnTLq5QZcn{TX)@DU0K)E zU0YmD!>p+2W>B{d{lebn8wdi^%0s6HhG7oRGcWIaKHvYE+kg;Q0_}xrBCsWkI6W>P z@>>bP!`cZRJqP!;1zR~nBDC_eBm|#nGM)!6UT-eAgk+X@fbDQ-zJ%bqn8R($#LH!$ z3npC~<9Zc6UEz}5X!vUh!D=cAPgn8aH1Na{5Pa7*aosR5GIb1%66|8(Ewd?1OGuz) z_TaMkSC+v+4%IZ4pu#0%c6U_?*+g`93X)L!URgoETEc+6dd^O-ETf|w&W1n!I=1Xb zJQzSFyN{-nhr^(zltX$$_#XZ|Fk5Ru?5wZy(ozgwXqf&4dIuYl$NfZD8002ov JPDHLkV1nufr0oCz literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/old/powderTin.png b/resources/assets/enderio/textures/items/old/powderTin.png new file mode 100644 index 0000000000000000000000000000000000000000..1508387fe010ed18394e07b06e626900a64eb346 GIT binary patch literal 412 zcmV;N0b~A&P)N2bPDNB8 zb~7$DE-^7j^FlWO009_DL_t(IPwkRhPr^VHg!xbQ0^+~0<)RcV1rgeEF;eh?5QQe# zg782!kXXeZI__CxVj_}ad~}md_Tgk^&Nmy2{hy5lWJ!V~iue_#xEx2b-ayT=AqrcH z>?RTz+} zF%iBep?D;4*|~r_bm0z${7oS1c8zo30{aStoizdkh(PJbIv@UQz^qhJGK$a+bIe^` z@BWo8^-lL7ljY#@ISpww#dqJTP7!Eky{-NJ1vbm1{0000q|Kx5@RT^vI!{F4pduUyDsykga=M@Nj-7AExg^0j=FQivA*A}^U7+VNhBixm;#0cJ>Uex^0XvW`+Ox|1JK-$$9@LabNn^E%*Na z`Uwx3k~rEJ70zD&_qRQ}?AQN?`#-FG`v2&+vL@aMHzN4VSk^Nt+z$P}|EK(q|BwIk z{;&V{o$ZoR`m+Dxwr0E;0qlv))BgNtG-GISWNXNnpzWe}=BNI~bxj)>3mwuA^DtB% z6@0}zfxE-Z;lqF74U7uUtN;FI;bT6TTG?`#L5y2z`?LSzzy9;cH7J~&q|JR`*2iN^ z9Lmy4MTvHPXBB#`GDxsxG9(^Nh&DL3j1A}#o=t&@N4Zzaa5VEW2u?{@({$vq6dQv| XdCZEO9G_3X@MQ3G^>bP0l+XkKst>B# literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/old/redstoneAlloy.png b/resources/assets/enderio/textures/items/old/redstoneAlloy.png new file mode 100644 index 0000000000000000000000000000000000000000..5c33ae2faab51911f091c4341bb4b2065ec88b16 GIT binary patch literal 527 zcmV+q0`UEbP)N2bPDNB8 zb~7$DE-^7j^FlWO00E0hL_t(IPt}miNKR$!zy zY1S2@B4|*fCOtqDM3a!BNkY-U2+EL}^)#!sk7hThhP7c0{&Uv)_WFO#|Cxxv08#7s zyGa_2NKo<4P8|359 zQKvLMWioiqX3vo3sHZG*$S@N4(!G zgPSyO`+V4;w!L08Jk17^HXHK1#s`2r#teUyxb={ra(6dY*<_vC@OV&=Hm&d&LkdF@ zRKu?$kP=O0YKF?wJV8llic)mCrrw7>k3a-a6aZ_sLsZN1^9bZiy+1x0%?mGB*JRRQ Ra})po002ovPDHLkV1m8lg literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/old/silicon.png b/resources/assets/enderio/textures/items/old/silicon.png new file mode 100644 index 0000000000000000000000000000000000000000..c47990cff64ca1af0e87127695899a4f6dd7ec6b GIT binary patch literal 427 zcmV;c0aX5pP)N2bPDNB8 zb~7$DE-^7j^FlWO00AdSL_t(IPu)=2PQpMG?VJDN0mg0R=20nhz`ecF?AyrJx=5MHz5qw0$~-dm_Vg;zCA@>AsA^U#>NDW?ZIVZ z4sEDC4IQbAi&_)Ke0jS-t0_?~LV7CHz6O0@fONl|#YP*oN*%eQ)Bit`FG`{exviu` zKFzv_YPp6&uC(rcke$C^9VvI>Bp#XH%Y{lB{p2ve?*3Qc2aG`T$A#2&195*K2w&l8 VmvGd%+ED-i002ovPDHLkV1hKutP=nL literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/old/skullEnderResonator.png b/resources/assets/enderio/textures/items/old/skullEnderResonator.png new file mode 100644 index 0000000000000000000000000000000000000000..50ec3066dd8510e4e0a6e68d2c2e40b8ddafdf32 GIT binary patch literal 266 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3 zQ$0figD*u3fvPG!T^vI!{F5c-J=i~E#*KP`-kym^HZ;F^HQ|3}t6hTYiJTHUA!*ST z73;s-3$C%9Px#1ZP1_K>z@;j|==^1poj532;bRa{vGmbN~PnbOGLGA9w%&02*{fSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+qQF!XYv0003zNklX6&KnhRG-ipGE|O@JTSpzxU+5ZbdA8uLFn6cev+pzx#c$e}<}@K%*+6 zsU*2-6%qB4u;w9GwJbm>BoMSmL59{$g68IMG0UUkWFVUR literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/old/skullZombieElectrode.png b/resources/assets/enderio/textures/items/old/skullZombieElectrode.png new file mode 100644 index 0000000000000000000000000000000000000000..943224e3dd36a11d685449a8ec669033895f80a1 GIT binary patch literal 416 zcmV;R0bl-!P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGmbN~PnbOGLGA9w%&02*{fSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+qQF!XYv0003GNkl zQBM2mP%$H18n}lUd#Jf#GE`zumk0*o)4-tpy+`i1d)271Ctv!&;of^V=fG9|A?-jz z)34wzsN%{iqGliA;;BGhb9{=udZ4;AevzbEIke^_@=^y*%zcyw zSt@by5!lvI6;>1s;*b z3=DjGL736~_k^`TL8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3Q$0figD*u3fvO5U zT^vI!{F5d2I5;=Gw>N6z5@uVPH;d=wwNw8$CQguX6v$9uKJ>pZVTBeG!;2Jw);Bc* zyh6&H3cqLnFmPZJkz}~`;mJwiO}sz*mr1g8m@&+LYv3?NF+%k1t*zWDe)7x?46ceR kXC*Q$>(n{x!o@vJfP(ap00i_>zopr0L1xAwg3PC literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/old/soulVesselFilled.png b/resources/assets/enderio/textures/items/old/soulVesselFilled.png new file mode 100644 index 0000000000000000000000000000000000000000..64b4c8f7e0f4ba53b27af7dc129c172668db7198 GIT binary patch literal 300 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=DkxK$!8B)5ZfpL8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3Q$0figD*u3fvQ$` zx;Tbd_%H3-&C6sc;1bJdcraCE!o+w#KVFr*hGQ{}*3mYrqqod5>^SeWc=Ejay~}3Y zjGuYfTwRa3{c+##xlb)*)b*NwKMl!yeK75y^lzqh&sjH$3&t}Tsr|lXA|G#1$m;T7 z+qE^M*e3Wo`@Gpj8{r7)5CsZF970lqOXx+iIZNBmzry9n|O&~HvKviDcVu_GQ o!%ybjJW99uE$bc`{?H4P+pL~#ou?r61n6c4Pgg&ebxsLQ0C4weEC2ui literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/old/soularium.png b/resources/assets/enderio/textures/items/old/soularium.png new file mode 100644 index 0000000000000000000000000000000000000000..0a955d3eb8fb5a7a3191ada7446afd4e613bb3c7 GIT binary patch literal 586 zcmV-Q0=4~#P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!2kdb!2!6DYwZ9400(qQO+^RY2pb9l zIKsbS!~g&Q8gxZibW?9;ba!ELWdKlNX>N2bPDNB8b~7$DE-^4L^m3s900E{+L_t(I zPt}m^PugG<#rX$V0#dUj*jBLxOJ{+a7$Ip$BXkv;DepWWx7 z_{Bu`aXZP$O`H2W=jMt0Kgwp#H?=#mxCZX(duWxj=-N8OL==$>z3h)x72|dlJzALc91bzthKOq~kD!*r zjaNYM#Xz^L!#7pS!D1^+Qu5%2O641 z4abEoG+0|sL4$lr0qj%;Cdnc4TI#158hdG+?kjLrkuR^>!j<=>e2nqa7#RNg=M{q|Kx36WT^vI!{F6OqqaZX4r^S>ON1|FVB?`~Lr_tB?M#*5~}g ze>Tw7kmWGLglE!1AH4wNloyvXLl!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{^MbQ4*Y=R#Ki=l*$m0n3-3i=jR%tP-d)Ws%L2E{@KYKsA{99 zi(`m||I!Qlxf}~6j(s$axUXFhS~fGnH|(j_9oCm3vo~#!croP&>xl&c|3sdC+;jAa z<<{*dDZ{` literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/old/xpTransfer.png b/resources/assets/enderio/textures/items/old/xpTransfer.png new file mode 100644 index 0000000000000000000000000000000000000000..afa10e5a5310a25bac5c03b2cb3318f5bee28013 GIT binary patch literal 309 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3 zQ$0figD*u3fvT2xx;Tbd_$MofxBQ>Xp1g_iCY#EQ%>V3(n|K&9ZR)gV*f2ZH@(Q2T zWZL{gMUvr?$=@y9F~%GMxePa+g>uYJY|sG8-zvY|U@ER-*3{+1;K+Qy%=vH3){8P) zT?`ex44Jdauko(gnYNiVL`3v~3BwXju~1{b-43pXjA1~n2@83b++27lg0YQJ!S}>R uAC3gmhKREY4T%gZ8S)r<9Ob5^GcZIn_AL|-oMZuXFN3G6pUXO@geCx!VPNP0 literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/old/yetaWrench.png b/resources/assets/enderio/textures/items/old/yetaWrench.png new file mode 100644 index 0000000000000000000000000000000000000000..c4eccccf2054394255b17e602eece5aa2c51f9d9 GIT binary patch literal 447 zcmV;w0YLtVP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01mg>0iNCEgCA5&16<&2gCLH@}%-;J+ea?aIVPPL2i7 zXR^}V*&h>5Thh$s`@+6q0&}s&o_TZYKn@k~M-vi7rJ0<>+&k>LFt_uP;2QwSAOS69 zNqsFtGv)yhczB0~My=JNdUB)ysC~PO6{!nBGv*N}N1#&1DPQ9cFXI)CyN!D~i0G>_ zzMjSYXki5XP$}WKE{(ghU-fD)+i@YfaP6W%_2yI==?Wd&wl>p-i^YNPj}f$#)rO~M zF<$DF?r-s&OJ&%ZeVv(gA+Y5qMks{ix+B2=in@@NOW92TUOkWc)%nOUfI2Z1#(s1$ p6d(1c=Rd*Un~x@?ma@irmM_Smay;b=JhuP<002ovPDHLkV1lw;zBvE@ literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/phasedGold.png b/resources/assets/enderio/textures/items/phasedGold.png index 79d8fd0350cc9514a555e6f0ba843fb307cf3def..9c258173e4c72f3820a7ed66cca68ba080d4c2c8 100644 GIT binary patch literal 1440 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+m=!ZaB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc$WX!DQqR!T z#M01EN5ROz&{*HlK;Otx*U-?)#N5izOaTg%fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;NpiyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr7KMf<|~|UP^v> zu_jo#udkJ7UU5lcUUI6Zi>(sS0KLr26f1K}Q%e&gBU49116M;sR}%|k7ehx=CpQCE z7fVA^XG54?m;B_?+|;}hnBEkGUNf9}K`9}(0BEyIYEfocYKmJ?ey#%8$5xrR-C~T> zJgD9j+-@UI2$*<4On9mVa^UGcH4m8Bi-4(Gbb@Uj0|S$&r;B4q z#jPWgPiG4UiX7W-eQwD{k7pBSF4GIy&~&7$WVy5`@6p&hU-%0YHFTSH|8Nq&)#|Z3 zi#4{Z>A|s9?d-snNedN}rbHYR%WXcXa(Rp4=VyT<- zfg2AzOIF4PY>Rh$``TcRjPQH;R^#bSi4q2@*z$N}k52tK-9)BKU}iVJ?B;@pKO$4? z_P1{fy)9tfC-AvYL*&p-_U{4fS@($SDlbb?j9t>CP+GyTJ?_rYpUs|%apz;)H%7SV zh#lVAUK_EVZABQB|UHj9{`@`CcPIFoPkM<|zJmX|5OELWP%rfPhdzgw! zRdv8O8;f<^)A#PIyl1x2xaG!KQw`CCnPQVH8mx_jJKpy#nyeUpDm7)MyUDd{Vxmj+ zCE4yb-Yj5H=$qP-Km#U`SZ)id9@fB?(zdcg0@sa!c7K zyMDf&!2-?+E<#t9N5oB?VbS$vd8JvdWO06YOT(sLyVgza{k6sMf|t{ubfrBzcC_&O z3T|JK$PxIVJ^Qkqht0{=CnI+~`{lbwUiwHOEco$)GaR)78&q Iol`;+03gj1GXMYp delta 479 zcmV<50U-XM3;6?(B!2{FK}|sb0I`n?{9y$E000SaNLh0L01mH;LN@>a0d+}4K~y+T)so#S!%-Z@ z_kY-xZU2DUj4gS8TW%QJ$h-UP!b`-==E99oq$o9RycLlWa(_b&GfEQEFxh7O5s%+< z*3S&luH@9ysdLWr`99xoN1^yPtJbLkl~!P@TLa6G8Wxutfm<_t!J6M8b%QElvUxOk zd~85G-iAn|2~SUrczCc0hI)5}ZyJAh}Mi&{A5vtaioRB2a2K>*DY$At)o>jgxv%<3bDd2sI< z(6_F~w7*!q8`tp+i8X0Z!q)7D2$Ih)B4DA@Oaao1s3lrwf$}lC}6VSb)L)VfP z750oog6lgAf|C5wq=)y7m<^P|dtQzON!)4f-_)abEm#{ptGcfMMx;1l&z@0KV%(Y2 z5@D3ha^LJ-^e-=_Ab`c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc$WX!DQqR!T z#M01EN5ROz&{*HlK;Otx*U-?)#N5izOaTg%fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;NpiyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr7KMf<|~|UP^v> zu_jo#udkJ7UU5lcUUI6Zi>(sS0KLr26e|k@V>3e&3v)+916M;sR}%{tb2mprAU3dc zvvhWGhUs<5PcF?(%`1WFO+o0jz^NCM5^@WGHoK%2WtOF;xE1B+Du8`#m5JLerZ~-m z>P^Az7BifB^?{Dj2gNH=Ji~;5i3h}lr&=Hfp6*lgfQh{bn5wm({Cmm3z$EPH;uunK z>&Rr^3}Hu!w)r>Ts4Yv1%ALKW<&Q+S7`N!rAcHTD9KR^A_BUOa&2C$z_vqwm@xXqi zijN8%9jphN7btKo-5avSWcRc5i6(izoA0KWzkYYDf_21N*DEM| zaQqi|$oZ^p%n`Y857)_4&S;fB)}DOw@Cwo16q9q;ru)8%>J{HUf5W#z-xGEfHC0VF zwbKJjd%tx&X?)BWk$=Tvo{iVdD-#bX&Wo$>$hH1ASHkO!dg`(}4|utzpa1acTyfen zf8k!x1q}h@W7mDTE9LlrYvQ}*IPec9u$7L~Ae(be-Z`HaSPqsBPKYaVQzUN%~ zL#Os$_fYIi(r|fpMDbP{_v_i7*|%SP+sCSy|3jCHV_Qixv-065{=OSNJ+NK8lcmVz zpvi2L*Su}tcsH2~E!!06`X^~m!-K<{Q@L81Zu(41{Vpr0+H>=c+e8tzHwM?-CP(B5 ztYr4ipZ4oP&`On*{j#>Z&+KBg+U9$E!wqHajMq}T!vF7C_3e#lLtXF%<%xISMJ)|l zxMkH>^QotwzB?qp&-Z?(tH;LN@>a0dq-2K~y+T)soLk0znvt z{T~FQVBK7DS9jC=wVIU${>>DxzbD2!FZ-5p?R*A?Ofv=-8pZ z=WV~)7Q>?O6b*dLFwFCO?+oK`{F~uYIZ*W#*cEr1kX7-+0%H5Q-z8QjHwH|2`l5>R z%NBCCEu^pNm^!Oil2}g?+OQ*zA89b2I;gzuvbprU3H@;cg}YTIoH#8Zx|i)r2o`H$ z%v{!xy=g*wSbsVWiIInS?qLNHtOk zLMR0=T$CX-qU@Zw5QeuJ>Iw*?Xi`0b%yoku_UH-(V-&&d6at+|$SZM3OA#jE3qJ69 zpD7r$5+sjxBu@;e2YCqP0Q}1; z*uFR2o!#Fal!63g77V4^<)fQ3WCB#5q23=w5_)A@V0ZZu`cCpCUSEIrFAl#0yG`bC T^SC3(00000NkvXXu0mjfkC@GW diff --git a/resources/assets/enderio/textures/items/phasedIronNugget.png b/resources/assets/enderio/textures/items/phasedIronNugget.png index 8fc23da82f59fbec606c32053d5f729314921dfd..c161172a3fa439ff7c7d0cbe9a98cc9e5bec0503 100644 GIT binary patch literal 1200 zcmbVM-D}iX6puSFTdQ5VFRLwrF-6^V&E%uWOcR>c>14VN?97&Nq=Sl>N$zw)o7|Y( zcBb{CYZnWBQUo7#-F5!}Q9&PMWu`?%RKyo8h!1te#V0{Q1RvCR({`#4MZ`dIzka{- zJLlYUGS!#)rKz#Cksyes)OIzC$L8Q|2;=YiSH6aa7L?4R9k7VXnhS`y0SkakS=s=| z0?ioRe;afXL}40NZb1c}?wSrVp-l!BwE`SQ z3WYsg2*GmF=_SLqx0ooLGNz(A3>RS;%L?L}M|&s>KDx0i+RKePfXM<64!b(Ok78S$ zjC1#Sp#X@zk$-bdd@0(H3iV+N*eInc6h4U;af2Q2}ioz_5yLF+=X zPyiyU=^S6Tvm9SlrD!~w6yqGna$Hh~N8>^VpKRy(Xm3(g6LoIN_K;@lpssCV?M1He zS+1OLfrg-)gK(%`1$`xmpjUzpnMja7_M5f=%id4H4J`z$0@oY?Mz0Gkaz4efxs3dm zg}%TyzBY9Xc8Uq==ieNEcH&LrP)SdGPM(>a)`ai~n6}Hk!l#PLx91GSj0^TCX1)?_Qff z%O-C8U2W@XPF%j;a^bJq-I8Ku=U3KhySNPkx+0Fee_FV1e z%!X^}UBVAXPqGtds_!3enY@2B!|pkCVCB}{tW20!YOli&{VT#B#M9E=eMAFGbP~H; SV|RQb_=lvD8TEY6zKIV83X`1x delta 280 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 delta 402 zcmV;D0d4-(3akT=B!2{FK}|sb0I`n?{9y$E000SaNLh0L01m+b01m+cxRGn^0000Q zbVXQnQ*UN;cVTj608n9RZgehAMN}YmGcGkQF)>H;LN@>a0VqjCK~y+T?T=kc!cZ8; z_hFocI_EUonVW8FuP#?AqAYX@Ms?E*7)4z~1Z7=x;Z5C1^nVTdg#XS)7ed4Gu8V$f zcz6!{UmoV4|4pgk~2+1aE9*^R< z3i;B7K5fIE^?zW|Gq#@EsNVRHCN|1P8u&m0Yi7Tjuyzi@Pyso$pj>-UZ+$9kK)$L& zI(Hx*8z_xy;JTYgX_@2}X(taMlxdO<@x%l>5D{7qI39uC2mxp whI~MfcDbL$i?CJ>tj*C!XVT4o1cvzp&(M!Fa(pn201E&B07*qoM6N<$f_}rScmMzZ diff --git a/resources/assets/enderio/textures/items/powderGold.png b/resources/assets/enderio/textures/items/powderGold.png index e30d0078ca6ca498897790315a06e0ce2cdaaa6a..6b4843e453d48fa361be54abd5216b2653ace3d8 100644 GIT binary patch literal 1247 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+m=!ZaB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc$WX!DQqR!T z#M01EN5ROz&{*HlK;Otx*U-?)#N5izOaTg%fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;NpiyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr7KMf<|~|UP^v> zu_jo#udkJ7UU5lcUUI6Zi>(sS0KLr26e}|~S2tHvM`uSv12;oMR}%{ZBO@0Ba~DfX zGcyxsQv;Y@m;B_?+|;}hnBEkGUKgBtK`9}(0BEyIYEfocYKmJ?ey#%8$5xrR-QtMT zJgD9j+-`BgsaGH97=2K@BE>UI2$*<4On9mVa^UGcH4m8Bi-4*6%j{>#3=E7Ro-U3d z6}OHA+xj0i5U_RkF;IBAm_ukqmljh;XQw@bbW)0|&YzQ9im8ojxpbFuuX@ogIWW`DYbe?Z7t_gmZ)7|bu8lE%EN7Yy(_~TKicKGOk(*lUB%KO zW^(o8^Qyi%wlgAh^3VC{RPOwFh2?szy6MIpEK_eQ&WUT=zvHN;iH&UQy1lj8W}PWg z^TZFObQQQg_^GMEvhwQt5|LU-ZdSuXCo4~Eic|XiegDVk21W*>%bT?)?B})x6*-=+ KelF{r5}E*~Lao*S delta 430 zcmV;f0a5H;LN@>a0YpheK~y+T?T}wf!cZ88 zchTIOn;Yw&MMhodr-_IPt1DSLivqtxbyt@W1hR;VA|jGf%YQP0ppm3b2~t6$Vi!Rl z;@4RibfKm1>a9;R5?|WYApXR93HUxb()Sm6Js4&Q1Nyx;Vutc?TYlK5Aszx8G zxgiwq`tcBRVt%GYNmym^`q+c_XAjJh7nRH)jFgPH#$j%XZZ28yGbrg2%%U3~Z(bts zppqRx;kpz0F@KM}H5P&Kj`|X7S?9Yv5p?6F;D-4${B@W0UKp1$^dkXD%?@pufq$fq zWOkB9V%tHw$wcBpIqf3bep;6xk2KZc?{ Y0WHq2O*}7a761SM07*qoM6N<$f}IbzVE_OC diff --git a/resources/assets/enderio/textures/items/powderIron.png b/resources/assets/enderio/textures/items/powderIron.png index bbc13dd692d6a50868e05ebc363986bc01f628f8..2cf64bbdd59a506207f7753ea13dbc8f365c7d43 100644 GIT binary patch literal 1288 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 diff --git a/resources/assets/enderio/textures/items/pulsatingCrystal.png b/resources/assets/enderio/textures/items/pulsatingCrystal.png index 19d3174aa0378972b86e924b6731c4746da8e76f..6fb0bf65f922c943c3eb53c591d6f1c1040fe995 100644 GIT binary patch literal 1305 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 TkrH4b$-v<0>gTe~DWM4f+2;pg delta 501 zcmVH;LN@>a0gFjQK~y+T)sV|dLSYnz zohWIFnwn-F6*COV`vrW63ZjWtV5Bx_))k^6Xi%djJwOyhlYfw+NkY-U2+EL}^)#!s zk7hThhP7c0{&Uv)_WFO#|Cxxv08#7syGa_2NKo<4P8|359QKvLMWioiqX3om(Z`NTt;CJ)7JTFy7ULQHuq`W-~@8k5&s6P$hZE z?M9W58n>wsZhoNV_`T?KV#036T5m6wT`ny0JnwM40WNsAGirr~Yi`Q%XMv_7&3k;f zT~^*w6s!^^fV|a;9GkQOCp1;~%16B4EQ6agZ~J`Mp>DRlUNt<;29q`$^1Q|efIP+w zf0VfOkf3sRH&)qXo!antP>?pQ@EAi1LlRWOuOpBWO=W6^%F{eSNoa~vbh@VAhdz%$ r1W*(JYqmpF%kuLGc-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc$WX!DQqR!T z#M01EN5ROz&{*HlK;Otx*U-?)#N5izOaTg%fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD#PU%0_}#n6BP2AO_EVu8M)o`HUDF34YC)x{-2sR(CaRb3oXS&*t9 zlvG z&L-wgrp}fwrp8X@1|}9Ty`Fi+C5d^-sW7`Ufp$ann&8!ItLH#=V}vG{MKK#R`19ETLmuH^p=M+$pp=bb;77Azw#b2y_pWQoV+ zavK}lTPiahPE1*AF7>qG;cbD*nN5rTIycN}v1z#`WyG;@@7B)e*Tv_X&pv3L0IY~HgTg?O$AMf<3r4Pv1Na{U)`%s&3)<5?L{7y9DN&%}?%tveQV%rW2RJV|B0 rJ!kRzL!$ie-iyuK{Qv(H;LN@>a0VhdBK~y+T-B8(1!ax-5 zoB!ehvIr6c3$+w*XenKUu23s#MO2Lb{p2`PYfKR2os-mg0R=20nhz`ecF?AyrJx=5MHz5qw z0$~-dm_Vg;zJEPMUm+N2CdS4Dj_tu^V-9VoJq;bHi;G$l#e8|YK&vTHE<$=L)V>CN zV1RVLoyA5QwMreiqtpLCk}pc447shOL_W>Bh-$fpLawy#evqBNU>zxU;v^oK-^+zc v8vW!jzwZ85;0KIA^T&nMbpvsKAP8UKX_s)+x!O?x015yANkvXXu0mjfhD)kH diff --git a/resources/assets/enderio/textures/items/skullZombieController.png b/resources/assets/enderio/textures/items/skullZombieController.png index d36fb1c73d0821e17832322620bbee028d04dcbe..d7eb2e331d4dff41d485db2b94933c37af60038c 100644 GIT binary patch literal 1502 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+mc-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxR5#hc$WX!DQqR!T z#M01EN5ROz&{*HlK;Otx*U-?)#N5izOaTg%fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5 zFD#PU%0_}#n6BP2AO_EVu8M)o`HUDF34YC)x{-2sR(CaRb3oXS&*t9 zlvVBqxL|hKQrczqInQ@^59+CqL=vVskm- z#45Pef}=z8O;E<-sS%t-I%aIr8wFIB_AcP4+S}1IjjO2jsOAwDPA37T4~J_|b5v@K=SJbpAXys5t+;kKFBbi3q-r<7kF7d-ywj_sWt z1=5}Z-Q6tVtMxKYIs`uBU_ZJ{^;z2HPG@&Mr|TM3d*{h?9_kdsn_G&`SHv!`~ z_WR+xXV|VfylKrxtALKCE8H9JMLT}cKAKWFBlG7|_8ZlbE9N(@TJ@v^e1xHI`5nRSijZEPxW#=wbP>d+YgJ%U+R5-zTf{5-N4B3N#N@HhA*bC PK_#xItDnm{r-UW|bJHjY delta 435 zcmV;k0Zjhh3(W(NB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000tn z000tn0p4aGcmMzZ8gxZibW?9;ba!ELWdKlNX>N2bPDNB8b~7$DE-^4L^m3s900BHn zL_t(IPu)`AOTu6j6{7zmw9OJit(^1cbn_>XW#ArW?4jm{$$uybpGE|O@JTSpzxU+5 zZbdA8uLFn6cev+pzx#c$e}<}@K%*+6sU*2-6%qB4u;w9GwJbm>BoMSmL59{$g68IM zG0UUkWFVUEh9fsGz(}#h+S7vs#)b<_Fg4n#j$DAy# z*&LoJlolMcN1@1Z^gIdnqKD_D0r^H`PF4e4zUEOJ9rNo1?NQJK-DwV;*(sFK33_gZ zDH#G9(=2ORMc5utD<*KJ$B`Wzu!%?}s;ZMl!A$NBpe&C>cciy&*Eghdb3HbVPOR8 z8)C?ux=EreE})SFiDVxp$`&?af;!k+BvTiHW@2C;j06!K4q{wlboRF0^uxjjo3zi{ z|M&a-pZ`lcYpZvz%iWv{LC`vXB_Fg#d-}DlvA$2;pBJp*akC<9)@e~QDd+&=BrO79 zzalh%AP}UMrpurdg0h?BP}mFycCn(SU_#mkODPEp4MC;bQwc$A1ST8-4YKM*?p_!| zU|I4ad*}cWNcccZu58soU2AnnY;6=73E5r-m!?>YKmn!zrg2nMw^f=RN(y4(z)-4Pn4T(k#e zfYX5rz$2leGa88inh->i%J8g&ub?QJ;dq9lI0s2qI61;imAg5zoFXZQhw^2xe$_Aq zRRkGr+0tIZdLD>neL4_KO%G{WJW~a=G0oJBn3jNjKDcO)tV&waC{AZ+@xnaNL#;g6=Qn3+y&NRxsQNqHIHs}$$lGg41!jPex3`Zz8|ggR%LVcL+|}^b3=f)y?Cl^ z?A@P7zpjptR>$$%=)lIY>63PQRaO7Jy!@imov~A!xQ&CqwIA-hER@ZRJmGE-e|U0z z&_ncA3YIK#|IxS`S9R(;cKs69a!CUX|}9u@>cOTTz|N|u=mTNx(h-{x&oqDSA@+Vt{s_xf*s#B2iDk4?Vy*F)F0Uh12OO+9kD zP%JyJ`xBpzU|(GMJ8Snydrnr~2j@1=6`Zuy*h-H5d2l^@=#QQrx%;c=g}!=hCs$uE zu&=jw`24Tfu4lW4&gw{)t?hYu?(WcR)!|jpk-cZyZq(TI^dHS%QO$o`zQ64sP-NDM delta 389 zcmV;00eb$v3ZMg!B!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000tn z000tn0p4aGcmMzZ8gxZibW?9;ba!ELWdKlNX>N2bPDNB8b~7$DE-^4L^m3s9009q4 zL_t(IPu-8-OTthb#rHq>HhPf2!XW%nPW$OlF(X_WxQ7{gsDHU(GE`zumk0*o)4-tp zy+`i1d)271Ctv!&;of^V=fG9|A?-jz)34wzsN%{iqGliA;;BGhb9{=udWzu<zcp3M0PT;BNSx?8w{=Hn`Sx500000NkvXXu0mjfCPS%L diff --git a/resources/assets/enderio/textures/items/soulVessel.png b/resources/assets/enderio/textures/items/soulVessel.png index 745a262535ea2f68ad44b5ca616825cbc33bc042..6b55bad0344714b9ea49d11fa40bd3a8530053a6 100644 GIT binary patch literal 1297 zcmbVMZA{!`9Pc!2KmsBfvav1eiXw*f`f_dW+R?FFkAw3#M&R6tVa#6p95m4OXp7e) z@nw#%km!UAjoSw$nrWPw3sD(vX2h_VEo3osEHgMqwwS1i$+oa1#!T@!xI;gXeXvRU zy#0T_-~ai)bf~$hzNoOg5J8Zla6_;KjwP8le=YoOSy+_eu)(Qob6U-Wlaeif1XME) z(6BCdf)*gF>E4T=20glGh*sdbaG(hVFm4mveM#BQIR z!ca{WvAt}Rj3y<}r8V?hptZj#ru26!yo%NCKxn=i&HC#9th`Dp;TgAw9^ONFtdrCH4-ReI(>GxMn zc3v9${9xqHI+Z&rz4F@d)h)x}uCh%LJ-&^-cO@IA^k+{9NVdsUX0^gT<-OZK1ss-DHD|bsn z?$3`GHxVNrCr(OL6L%Iy6UQp^0_6Ro>9MaKaBHsh4cQ&%WAWn+N9NCbyKQEy>bc$n zf2H4i@0XE}w8m@qPyF6->X13U;quYKfs*6fpZ@dQ{x7FyBaK(SDEsupnaM*FTZO}| zGw+<k%yKdEqCQ}DB0 HFTVZ{coD#% delta 217 zcmbQp^_6jgN(n{x!o@v QJfQ6ip00i_>zopr0DEakPXGV_ diff --git a/resources/assets/enderio/textures/items/soulVesselFilled.png b/resources/assets/enderio/textures/items/soulVesselFilled.png index 64b4c8f7e0f4ba53b27af7dc129c172668db7198..04a8401f4d162f225baa4326c277a439c388cd4b 100644 GIT binary patch literal 1348 zcmbVMZA=qq9Iv>!4kW8ABk^V7JmZ`T_u5{|9TZl2II0$~bb^K@yO*bMws%+W4qF&Y zkSL4BC8&WoUt)&a$TTj)#eIk`KYrk$&w<;J4uJLjexUt%`c9R*zT-!2mX&tcw5% zs6rzM0YPrr`8g=D*%t3q!u3{ta5E?ADlVjL@T3}tXq&C1EEyN1D6kL_G%A`Gof`NQ zMHJbK)-gdc825uFrLxrkwXIcQsWmFGGFn!Olq5MwpaM%kl4?vdxuh4J;pN~wy-lFV zjENQXqO(rb2Wt?&ZUBVA8B8K+3h}Tw#kg3CDnw|KauO6t&@4t#oXf*eZe;F3p_(B_ zxDdZ#P7AKQXp?2dIf6(e5_rOi>qa9%u`ElFG(poCw7|?3%@UHBX0FLF@W7M|C2lFY zhNKwLhc3#ARAH(a%$z@!Kb;&bo*$ZlcFkItjot26_IY9b<;m!z zLsyZR5Oc}`@X?CthT`zwlb zD#G@>!RuEGzIGsf$z^W5vPc1oe z^!U|_!tgI&XPwT?>B>8``GB{>Jc!gXa%+`TCCJkM&ox-5dLlg>v`zmcPvG zxn(~<^wt;ljytwZIh)T!KH7Fpy?O!%=0000Q zbVXQnQ*UN;cVTj608n9RZgehAMN}YmGcGkQF)%Rna-jeK0H{esK~y+TrH;D|0x=Lo zT>&w{Wh9W1UrtU9ByNDlT!A}VJgZx@nlXsaN~4pW-;Ji2*?(V|!#5``1Bc^|`<>-D z949V=`{h(_>%nHh8~XyT=LNAB5nli@Ci~hnA73zW1w`Ps)~wd*1pqkl7)0RyTmY~4 z{w&BP;xcfU3V4OM0=Azcyh3~dlY+cLd;wGtB_9_!q!JW>`2)KQBHIr+e&R9sE><41 XCu=)yAR6QV015yANkvXXu0mjf3_xe+ diff --git a/resources/assets/enderio/textures/items/soularium.png b/resources/assets/enderio/textures/items/soularium.png index 0a955d3eb8fb5a7a3191ada7446afd4e613bb3c7..c458d880f4eedd8c18b544962fee613c6fcc7ece 100644 GIT binary patch literal 1430 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 literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/upgradeBlank_alt.png b/resources/assets/enderio/textures/items/upgradeBlank_alt.png new file mode 100644 index 0000000000000000000000000000000000000000..9f5086a2255ab370e2e978ef51acff1667474bd5 GIT binary patch literal 1319 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWuD@%!-*I5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8K--E^(yW49+@N*=dA3R!B_#z``ugSN z<$C4Ddih1^`i7R4mih)p`bI{&Koz>hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83 zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0;1ij}FEv7@QEk*TARp}C=VL91WY_2COp*wIq-C!ng>kmMZi>jFHK`B0|Vn6PZ!6K zid%1{`}Q?C2(-F}9GSo2qs5w=l6+1!-R>Vkj&aY(aEjRx;Na+f`ls4UFYB4Ixkg(n z8@J@{4c}k!{rBF>%Sx?vqhIrV$-+kqIVk_3RFdhVOur2l*D<@%zw8{wg<7W2=qwR}8}Y4S;z4;402XWSQ0Ob}pcYCd?NDl&3f)AiR^ z|4e?b<)BzDdcb+c;Vt*yOLP6)r+>qw_ixbA88=?fDfDNwX}6SnJ>&Kan_L???sLysk~ye?R&==XVi> zw%vFA419xE8wHAR=54}8d@!2?2?2*+(xc&PTk zk?eEv_kI6={)Nz_vnh=Z1 zdKTg-RqTQpD9ZiEzl0$Sa~)SYI_=K%0YTDLujpXB1=T=o3=2gHhA8zw8_&WnMGF(l zA5RmwB8Q2?T$)ZBaoDZ244ClXKx>CI&?E6O5oy9h1px`D&=&E6+N)VYAxy033TW*d zQv|*Ov3tVAs#Bfmc08_|5a+xcDbWnT1H2b-EDyjwoS}h_0yM?&Bme>%5P%ct5;Bsbb4J_v(^HILPixtg92WfQdQ?(D`?Bkz<=G?5N&nz8<5IC zOYbu!l#iUJLPoK>w;>0Jyb;<=1tmr7P3Tge3N<^G2ovawS5{=fAK)Pu$Z{m(=Yk{; zSsy9FpiD|^E}MlMElPl?=xoFf24aA3PR66a8O>}AH2Z@w-p8^rJ{o1$xhc)EMNNVg z+X}M1#*N*RE5uDG+Pc}H>%EmKXz$i--Rjm2JRZj%Kdfl7p0}QGGPHW(1T>Wwp`0{z z6<-Olplo0sf-J}}te@lo$C17O%aTDl2gpExV|+4CX91Tb*7)-O4IPD?qMSPUPu*0G zP%%2o^)5i0^*(|cY914H$p>Nl7KUw#rxMYQ!uQ#`<#NQ;SUi0)R{RcI*m1RtkF?c! z{1nEWe5ZUOH&wgz>R|l~@BRJRi-~U&H4vE*OW-z8UrZ9xAo*6>P!oGS=t=fN?t#bZYspi(i J)!5OO{{d_BzNG*F delta 409 zcmV;K0cQT53bO-{B!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000id z000id0mpBsWB>pF8gxZibW?9;ba!ELWdKlNX>N2bPDNB8b~7$DE-^7j^FlWO00AON zL_t(IPh&`!W=RodFfcH{iIXPCf-yEZ5XNgjYP-UJWQR(}IPHi9(l|G(`2)c;xk z+DT%GKikt1k)s56w|UF$BW^kmh^;FT*t# z{I~pH{*?EB=?NjQ0X2I>!G_>90Azdgf9e0#|2_X7`oHFX>3^sH*a2UX1q5cUk&={bzp#cceT(w0UtQl`CfH1NlMYs8IY6fAf2EZ^#0|@)Z zse>^#HFymGVUUf%1*%x(Kp1QQh@b>x6(k;8G5`R42ohSYa`hqP00000NkvXXu0mjf D0-xD8mPR0~ZU2NN;r>|Azcw=;IZo!M=>+AYnp+7%1!?9ADAZ0FLM zQ}*&wA>ks%L~Ub zlfz; zT-U-xJD;EvwhVgo=Ar|37F$zlu~!u|V*56{Aul2U13(4O8-1oL=EKCIu87v&F-72u z5ZD_gmYhl_+Hl!&0M7e)Ql(i24+(yT=LCkS!&#aMPz+760?9BU7ZRBuUK#|l=4e?l z8Eq`tLc1{01EDQaR4$kE=K_Aq>82P#5Gb0ZSe8Tx(k+-!$&;qLrK}JIuIlJE)GZVD z6qSrM0K)|Gbm2~j713_0U;`=%Tx-Bl zQ9iO;%48I~`y29r$QyBoqobrKeNjstFn|f;(J+C&_%&SttYeWoKQWc^T|78iar@?z^1-jJ?E2)~tMBFJ7cTe$Upu4X zwc>$0*_U27o+B!Lx%AjjOaEo^BkjsIIQ^~uz(gJQ^B&>!@SDSvKh0IQHqNIL(>snv zeyhDyfT!MXIdt+u&7rD^FOOZ{&CQ)}?yR`cbhvY{>E`&4>c)`=Q{NDG8YfwsE8iR3XRTU;ow)q+0{{R3 delta 282 zcmaFExs_>xNBqnoH5>V4&z(qu?Z?|>&$HE`pq_Ew|CP688Rb*dpl zJQN45Fam+v-FXVuV3?y*i#FTM;Rhteh*O||p;GY#Vq;j1Ka~JVJG5~bwraYMnE5PA z;F{_qVnUb+Cjzid+tOpgtv!uVrKepHRl;A3*Q6w5AP#MSr{W#DC8d1CoLvdc3)?h- z&q3^VA2IJ#bGQi)7$(F8N+1=6V{wm2v4UG<+52&hVR@QmXig+qR&skJwi;i!2&87J zEm9=du%LxjKBCRG6B11)lSwMcQ-;|}v!W={3`cVui4dgKt=k|)>Q-gZLJ(StsU>X9 z(D8yrARAq_k3gQzhY(MM!;6M>Yavl6WpoN8XqIB=c)SqT9NMxY@LxBUL|f7B1f(O- zGP+C!okvS$k&JS8eW3ync_Te&YUofvN6=8Z;!w9kK_7v>P^zX%)gBQF9$6r{YQam2 z(9M$odR0v=_MCb-7Z&guph;s9|&ztDvdPunnutNZ^40z9FXRs*$wrE1b}Lz(HtgyP(=& z8gYCs#gev!yee}HR6QP&bIURb85Fu#P*hUjs%4SkRN(dU!~$Razp0~0%e4#bO^p9W{@My5vISXeEZ-poW5V(bQS_uYBI`xVvv)&!&-O$~)Tz%iaaq z3w!dJiY&9^)hAv$sNVMLz7w&wOBF?=P;Li!RSUG63=O%N$BN z-}`;9D^u}0GvxD~zG%OP> za`?yYvcUs-DtB#XCN_3py7T4@6XVQ>=O`sM(|&TrisiL1cQq?~wQp27I`rln8~0b8 z4E%J}@!XDMnF`0)%_sSZ4o&R{VHlorthhxhtK~0GHA^O u`q#X0`{-|(hdxOkK6A?Z!>6n95$xe@$!|6jB`Dt*7OHOyez57$C;tISP27Y4 delta 282 zcmdnbwUudtNGZx^prw85kH?(j9#r85lP9bN@+X1@buyJR*x382Ao@Fyrz3 z6)8YLsS?+SlHmNblJdl&REB`W%)AmkKi3e2GGjecJwpS7FGUN1s+M@VIEGmGCo71z z{GZI8yovE9o63#M|LlpIco;Hm>a=IrFgwih3a_8lWZL{gMUvr?$=@y9F~%GMxePa+ zg>uYJY|sEIxK)0;!Bkwwtf|Y1!IAlZne*S6trumqx)>^W88T;;U*lb~Gi@_#h=}L| z6NV+6Vxh)S3j3^P61|W zecw6fKW9don-1+RDK9|~WOuMpYJp=}?k(B{zx)5l%5ZQw_3cip8FAvW1&~_JQ~(x? z%AKGE$Xb8z*Pt3f3VZc%yVD+eT2#%bTh7_I6VVt%BS>{kA||Wdz`+#IsT+QL`QkK= z>6#yJ<3dy@764s(*s1#gGg`Knud|Hyk-Z7Qg?ONW;t_eiGN7X^kBl>9h6acjCJdVK=md*tm&$APr4+s?JsikUJ)$7xP2gZLz@9hz|xNb zt-&&**hY#)eFu3>VJM*ad<5fB6ar8%be>Z+f@8djKrx!k^DMrF*ZyznNaz%qtCRoK zO@0d&V{W?L1#q$5N5Fv1W5F&taCXd(AO+6_rP^>}PFc-nYYHm|M~>B{?ouC_`?>6_ z{K2Wr%fs;_u9t|KnZ{2_?>~NHEqi$B+tlxC$)R}^{c>Mf)7`5>LukX&)ZXz2{K|Fy*7y%3`QTRzqf+IW z%jZk7S4vL0_FXv2tdy?MFHTOqd2{K<3l58$B`TK7Uah$y|aSc=?kDCuTmr?|UiyllIWc cd{J2ka{7hd*IbLwlewQ*u)az9sIFt^ADT_s#Q*>R literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/yetaWrench.png b/resources/assets/enderio/textures/items/yetaWrench.png index c4eccccf2054394255b17e602eece5aa2c51f9d9..56988b58161a823561072a295ff7f323c0652121 100644 GIT binary patch literal 1462 zcmbVMeM}Q)96sYB4s~;z3^Yr;9d1G8dLO-`y`zPdmP#{Q8|Y$n&Uw9iffMeo++As5 ziCe(0#rOek*=E$CnG)k>NOS`!#1N;8Ks3f>6Va*Y#xQdZi2)W8c17y;hw+bHa`%2c z&-43uf4}?K?^`i1bx|q=LGwICu3}@HpLl1_GQNvPCOKnRs22wH5~Wm+aw>ovf)WC- zN8-vrG2n!nstdpdK{KnwKu`~QSF*e!nYaYT6qCXR8-i^4u`tJ1038m2GEuf858`JK zSQPBYYTAo?!%k2x7S*btq}CVUYb$t0K=SioTZ}aXB%pI}OsbSMHfBerbXjAb*v1fe z3Zhrok;hI2y?)rKr~sx-G|J;70b3XoK~oGtWWyv*m@xv!NCqVcma?!!4m|xJhBZ|v zWs6jn7bpbb-S~ILv06APOl5LputcZnv2-n<*D|;85{Q=T}pX--Z+GdJTtZRyA@E~mMmZ6-5J}rcdtG0 zlGxI1I#bbjVt25o|8PBYIb!eM@y_PO*$*=>3{Z5@uj?hb<+b`@@y;YSz z^^JG0p10|wXJLI+_u=^VFU~Jp9$079Mv4Y9>d%_H(stcxIu&fb*o;kXau1Jpk>*b1 z;Ex;IY;4zq9eM5dXYQk{DNXH{a%PsUO5bp)wvA!jFTZ!Fqobhv#dH4Hr#1dH?>20^ z_xCc))b)PtuCX8JS=?f|#n*Ym-nZfRvws~+^KbnlCE|;JG*FP%dYc(o|9$SyL+a$7 zT=~}EV71#mdUtg0=eMt|8+m(TX#K7BD`&6ATlGkIN$$394($JPc)S7Hn!6=@+U)cLxQ3~;DUPqZ{!J&soUl*5m?)}YsagM!u|70o-b@;D+ Ucp~pedE!s%DfGEc6l|#b2NPExmjD0& delta 421 zcmV;W0b2gH3%>)9B!2;OQb$4nuFf3k00006VoOIv0RI600RN!9r;`8x010qNS#tmY z4#EHc4#EKyC`y0;000McNliru-3S>BE)JToE6M->0Y6DZK~y-)y^~K%0$~t`pS4xn zH0w}E+AGUq<&frsrTL39c`bdnCyr|7fv3Hk;d>tcr}B7X{sWnt9>g>0iNCEgCA z5&16<&2gCLH@}%-;J+ea?aIVPPL2i7XR^}V*&h>5Thh$s`@+6q0&}s&o_TZYKn@k~ zM-vi7rJ0<>+&k>LFt_uP;2QwSAOS69NqsFtGv)yhczB0~My=JNdUB)ysC~PO6{!nB zGv*N}N1#&1DSuz%4=>{tj=PO}I*912GQOV0{%BzY{ZJ|4xGs&mvtRXUFWYe;x^V5H zK=tNS8R-fg+qO2-hKt34@Q)F+l+}i(XE9#tlWugAMlf*j>GY z1_v=l#4^LtNWd8!6UOYrrYxoWz^2A?)EXnx(o%*Rtzdwn97)?l&icdgk9KDF{d%6~ z_woLIyQ#2X@wBOrO@$z6n#b+*8RN|OJ0->VrjOj_jp0$I zmjNH(#p1-R_fZ6v zL>p2}doA9u1C&ed8Wj}P6!-%*6#-U6a&zG9C}#-BK_kn-ixF=fkSBC-S z1Ddi%4H)+koR=UQxx2riIMDEhTc%3JrSO$bC9p;YA>HG&A;yVWlteDe$^zOd&?u2b zGbjrv66FCSq5&!>2!OWm0h~za+>6h$q{~I+Q+AT1aok0*jGeLDEv$=XNWyMq6I@S7 z)A>*UBy3BD?FlYkH0ixB45|kjIz+!~X&;b#pi7bJ&5F*boBr?Gl|8MFr!znCY zC;zFN#FkNv@#)j1SJi5oOXZo;+`U}a_;GwwS8v`j}^3a zb#45q(7E$qRjYr>jfW3VkFs;><{o)Ha}}>aTGv1)J*IBc!P#uda`| zwb8kMIM}|4Dsg3=rakA&_JM<4uv=escJwN`fgvoNn7Tbo|P!sSTzjzvMKe z=fs}!)!m5gI{NwE?mElB`gD22>RIWoAGxOQmSt;I=cTV8o<;rXg{>dx4}m5Xn;QcU)a z?Hfi{pZRla%xyYx=;hK*$BBXBHdpSmL#?TwD5pN#cBb?8^lcgL{D&4@>OMUbZX8}) p6nk#na=QP{{g@(C#(Pf literal 0 HcmV?d00001 diff --git a/src/main/java/crazypants/enderio/gui/IconEIO.java b/src/main/java/crazypants/enderio/gui/IconEIO.java index b70ed74b..85b2daf0 100644 --- a/src/main/java/crazypants/enderio/gui/IconEIO.java +++ b/src/main/java/crazypants/enderio/gui/IconEIO.java @@ -127,7 +127,7 @@ public final class IconEIO { public final double width; public final double height; - public static final ResourceLocation TEXTURE = new ResourceLocation("enderio:textures/gui/widgets.png"); + public static final ResourceLocation TEXTURE = new ResourceLocation("enderio:textures/gui/widgetsv2.png"); public IconEIO(int x, int y) { this(x, y, 16, 16); diff --git a/src/main/java/crazypants/enderio/xp/ExperienceBarRenderer.java b/src/main/java/crazypants/enderio/xp/ExperienceBarRenderer.java index 878e7aa3..bbdf64f9 100644 --- a/src/main/java/crazypants/enderio/xp/ExperienceBarRenderer.java +++ b/src/main/java/crazypants/enderio/xp/ExperienceBarRenderer.java @@ -6,6 +6,7 @@ import net.minecraft.client.gui.Gui; import org.lwjgl.opengl.GL11; +import crazypants.enderio.gui.IconEIO; import crazypants.render.ColorUtil; import crazypants.render.RenderUtil; @@ -31,7 +32,7 @@ public class ExperienceBarRenderer { int strX = x + length / 2 - fr.getStringWidth(text) / 2; fr.drawString(text, strX, y - 11, color, shadow); - RenderUtil.bindTexture("enderio:textures/gui/widgets.png"); + RenderUtil.bindTexture(IconEIO.TEXTURE); GL11.glColor3f(1, 1, 1); int xpScaled = xpCont.getXpBarScaled(length - 2);