From 0be34ac2ef3dff6241ba702e4483de7d0c26a291 Mon Sep 17 00:00:00 2001 From: brad-c Date: Sun, 18 Aug 2013 16:45:45 +0800 Subject: [PATCH] Machine upgrades via capacitors now done. --- .../enderio/machine/AbstractMachineBlock.java | 2 +- .../machine/AbstractMachineContainer.java | 25 +++- .../machine/AbstractMachineEntity.java | 137 ++++++++++-------- .../machine/AbstractPoweredTaskEntity.java | 12 +- .../enderio/machine/GuiMachineBase.java | 4 +- .../machine/alloy/TileAlloySmelter.java | 2 +- .../TileEntityStirlingGenerator.java | 4 +- .../machine/painter/TileEntityPainter.java | 2 +- .../crazypants/enderio/power/Capacitors.java | 5 + .../enderio/power/PowerHandlerUtil.java | 16 +- .../enderio/textures/gui/alloySmelter.png | Bin 2451 -> 2451 bytes .../assets/enderio/textures/gui/painter.pdn | Bin 15626 -> 13623 bytes .../assets/enderio/textures/gui/painter.png | Bin 2402 -> 2399 bytes .../textures/gui/stirlingGenerator.pdn | Bin 11414 -> 0 bytes .../textures/gui/stirlingGenerator.png | Bin 2168 -> 2167 bytes 15 files changed, 130 insertions(+), 79 deletions(-) delete mode 100644 resources/assets/enderio/textures/gui/stirlingGenerator.pdn diff --git a/common/crazypants/enderio/machine/AbstractMachineBlock.java b/common/crazypants/enderio/machine/AbstractMachineBlock.java index 8fce2c36..c79997a5 100644 --- a/common/crazypants/enderio/machine/AbstractMachineBlock.java +++ b/common/crazypants/enderio/machine/AbstractMachineBlock.java @@ -165,7 +165,7 @@ public abstract class AbstractMachineBlock exte } public void dropContent(int newSize, T inventory, World world, int xCoord, int yCoord, int zCoord) { - for (int i = newSize; i < inventory.getSizeInventory(); i++) { + for (int i = newSize; i < inventory.getSizeInventory() - 1; i++) { // -1 to leave capacitor in place ItemStack itemstack = inventory.getStackInSlot(i); if (itemstack == null) { continue; diff --git a/common/crazypants/enderio/machine/AbstractMachineContainer.java b/common/crazypants/enderio/machine/AbstractMachineContainer.java index e0017a4b..25a79840 100644 --- a/common/crazypants/enderio/machine/AbstractMachineContainer.java +++ b/common/crazypants/enderio/machine/AbstractMachineContainer.java @@ -14,6 +14,13 @@ public abstract class AbstractMachineContainer extends Container { this.tileEntity = te; addMachineSlots(playerInv); + + addSlotToContainer(new Slot(te, te.inventory.length - 1, 12, 60) { + @Override + public boolean isItemValid(ItemStack itemStack) { + return tileEntity.isItemValidForSlot(tileEntity.inventory.length - 1, itemStack); + } + }); // add players inventory for (int i = 0; i < 3; ++i) { @@ -36,9 +43,10 @@ public abstract class AbstractMachineContainer extends Container { @Override public ItemStack transferStackInSlot(EntityPlayer entityPlayer, int slotIndex) { - boolean hasOutput = tileEntity.getSizeInventory() > 1; - int outputSlot = tileEntity.getSizeInventory() - 1; - int startPlayerSlot = outputSlot + 1; + boolean hasOutput = tileEntity.getSizeInventory() > 2; //Assume one input and capacitor + int outputSlot = tileEntity.getSizeInventory() - 2; + int capacitorSlot = outputSlot + 1; + int startPlayerSlot = capacitorSlot + 1; int endPlayerSlot = startPlayerSlot + 26; int startHotBarSlot = endPlayerSlot + 1; int endHotBarSlot = startHotBarSlot + 9; @@ -50,7 +58,7 @@ public abstract class AbstractMachineContainer extends Container { ItemStack origStack = slot.getStack(); copystack = origStack.copy(); - if (hasOutput ? (slotIndex < outputSlot) : (slotIndex <= outputSlot)) { + if ( (hasOutput ? (slotIndex < outputSlot) : (slotIndex <= outputSlot)) || slotIndex == capacitorSlot) { //merge from machine input slots to inventory if (!mergeItemStack(origStack, startPlayerSlot, endHotBarSlot, false)) { return null; @@ -61,8 +69,8 @@ public abstract class AbstractMachineContainer extends Container { if (!mergeItemStack(origStack, startPlayerSlot, endHotBarSlot, true)) { return null; } - - } else /* if (slotIndex > outputSlot) */{ // from inventory into inputs + + } else /* if (slotIndex > capacitorSlot) */{ // from inventory into inputs boolean merged = false; for (int i = 0; (hasOutput ? (i < outputSlot) : (i <= outputSlot)) && !merged; i++) { @@ -70,6 +78,11 @@ public abstract class AbstractMachineContainer extends Container { merged = mergeItemStack(origStack, i, i + 1, false); } } + + //check for capacitor mergers + if(!merged) { + merged = mergeItemStack(origStack, capacitorSlot, capacitorSlot + 1, false); + } // If we cant merge into the machine, see if we can merge stacks within // the inventory diff --git a/common/crazypants/enderio/machine/AbstractMachineEntity.java b/common/crazypants/enderio/machine/AbstractMachineEntity.java index 546142c1..15029396 100644 --- a/common/crazypants/enderio/machine/AbstractMachineEntity.java +++ b/common/crazypants/enderio/machine/AbstractMachineEntity.java @@ -2,6 +2,7 @@ package crazypants.enderio.machine; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import crazypants.enderio.ModObject; import crazypants.enderio.PacketHandler; import crazypants.enderio.power.*; import net.minecraft.client.Minecraft; @@ -23,47 +24,55 @@ public abstract class AbstractMachineEntity extends TileEntity implements IInven // Client sync monitoring protected int ticksSinceSync = -1; - protected boolean firstUpdate = true; + protected boolean forceClientUpdate = true; protected boolean lastActive; protected float lastSyncPowerStored = -1; - // Power - protected ICapacitor capacitor; + // Power + protected Capacitors capacitorType; // Used on the client as the power provided isn't sinked private float storedEnergy; - protected ItemStack[] inventory; protected final int inventorySize; protected PowerHandler powerHandler; - + protected RedstoneControlMode redstoneControlMode; protected boolean redstoneCheckPassed; public AbstractMachineEntity(int inventorySize, Type powerType) { - this.inventorySize = inventorySize; + this.inventorySize = inventorySize + 1; //plus one for capacitor facing = 3; - capacitor = Capacitors.BASIC_CAPACITOR.capacitor; - powerHandler = PowerHandlerUtil.createHandler(capacitor, this, powerType); - - inventory = new ItemStack[inventorySize]; - + capacitorType = Capacitors.BASIC_CAPACITOR; + powerHandler = PowerHandlerUtil.createHandler(capacitorType.capacitor, this, powerType); + + inventory = new ItemStack[inventorySize]; + redstoneControlMode = RedstoneControlMode.IGNORE; } + + public final boolean isItemValidForSlot(int i, ItemStack itemstack) { + if(i == inventorySize - 1) { + return itemstack.itemID == ModObject.itemBasicCapacitor.actualId && itemstack.getItemDamage() > 0; + } + return isMachineItemValidForSlot(i, itemstack); + } + protected abstract boolean isMachineItemValidForSlot(int i, ItemStack itemstack); + public AbstractMachineEntity(int inventorySize) { this(inventorySize, Type.MACHINE); } - + public RedstoneControlMode getRedstoneControlMode() { return redstoneControlMode; } public void setRedstoneControlMode(RedstoneControlMode redstoneControlMode) { - this.redstoneControlMode = redstoneControlMode; + this.redstoneControlMode = redstoneControlMode; } @Override @@ -74,7 +83,7 @@ public abstract class AbstractMachineEntity extends TileEntity implements IInven @Override public void applyPerdition() { // TODO Apply values derived capcitor - + } public short getFacing() { @@ -103,30 +112,30 @@ public abstract class AbstractMachineEntity extends TileEntity implements IInven } public ICapacitor getCapacitor() { - return capacitor; + return capacitorType.capacitor; } public int getEnergyStoredScaled(int scale) { // NB: called on the client so can't use the power provider - return (int) (scale * (storedEnergy / capacitor.getMaxEnergyStored())); + return (int) (scale * (storedEnergy / capacitorType.capacitor.getMaxEnergyStored())); } - + public float getEnergyStored() { return storedEnergy; - } + } - // Needs NBT support for this - // public void setCapacitor(ICapacitor capacitor) { - // this.capacitor = capacitor; - // powerProvider.setCapacitor(capacitor); - // } - - @Override - public void doWork(PowerHandler workProvider) { + public void setCapacitor(Capacitors capacitorType) { + this.capacitorType = capacitorType; + PowerHandlerUtil.configure(powerHandler, capacitorType.capacitor); + forceClientUpdate = true; } @Override - public PowerReceiver getPowerReceiver(ForgeDirection side) { + public void doWork(PowerHandler workProvider) { + } + + @Override + public PowerReceiver getPowerReceiver(ForgeDirection side) { return powerHandler.getPowerReceiver(); } @@ -136,7 +145,7 @@ public abstract class AbstractMachineEntity extends TileEntity implements IInven } protected float getPowerUsePerTick() { - return capacitor.getMaxEnergyExtracted(); + return capacitorType.capacitor.getMaxEnergyExtracted(); } // --- Process Loop @@ -158,37 +167,35 @@ public abstract class AbstractMachineEntity extends TileEntity implements IInven return; } // else is server, do all logic only on the server - - float stored = powerHandler.getEnergyStored(); + + float stored = powerHandler.getEnergyStored(); powerHandler.update(); powerHandler.setEnergy(stored); boolean requiresClientSync = false; - if (firstUpdate) { + if (forceClientUpdate) { // First update, send state to client - firstUpdate = false; + forceClientUpdate = false; requiresClientSync = true; } redstoneCheckPassed = true; - if(redstoneControlMode == RedstoneControlMode.ON) { - int powerLevel = worldObj.getStrongestIndirectPower(xCoord, yCoord, zCoord); - if(powerLevel < 1) { + if (redstoneControlMode == RedstoneControlMode.ON) { + int powerLevel = worldObj.getStrongestIndirectPower(xCoord, yCoord, zCoord); + if (powerLevel < 1) { redstoneCheckPassed = false; - } - } else if(redstoneControlMode == RedstoneControlMode.OFF) { - int powerLevel = worldObj.getStrongestIndirectPower(xCoord, yCoord, zCoord); - if(powerLevel > 0) { + } + } else if (redstoneControlMode == RedstoneControlMode.OFF) { + int powerLevel = worldObj.getStrongestIndirectPower(xCoord, yCoord, zCoord); + if (powerLevel > 0) { redstoneCheckPassed = false; - } + } } - - + requiresClientSync |= processTasks(redstoneCheckPassed); - // Update if our power has changed by more than 1% - requiresClientSync |= Math.abs(lastSyncPowerStored - powerHandler.getEnergyStored()) > powerHandler.getMaxEnergyStored() / 100; + requiresClientSync |= Math.abs(lastSyncPowerStored - powerHandler.getEnergyStored()) > powerHandler.getMaxEnergyStored() / 100; if (requiresClientSync) { lastSyncPowerStored = powerHandler.getEnergyStored(); @@ -204,12 +211,9 @@ public abstract class AbstractMachineEntity extends TileEntity implements IInven protected abstract boolean processTasks(boolean redstoneCheckPassed); - // ---- Tile Entity // ------------------------------------------------------------------------------ - - @Override public Packet getDescriptionPacket() { return PacketHandler.getPacket(this); @@ -220,12 +224,14 @@ public abstract class AbstractMachineEntity extends TileEntity implements IInven super.readFromNBT(nbtRoot); facing = nbtRoot.getShort("facing"); + + setCapacitor(Capacitors.values()[nbtRoot.getShort("capacitorType")]); float storedEnergy = nbtRoot.getFloat("storedEnergy"); powerHandler.setEnergy(storedEnergy); // For the client as provider is not saved to NBT this.storedEnergy = storedEnergy; - + // read in the inventories contents inventory = new ItemStack[inventorySize]; NBTTagList itemList = nbtRoot.getTagList("Items"); @@ -237,13 +243,13 @@ public abstract class AbstractMachineEntity extends TileEntity implements IInven inventory[slot] = ItemStack.loadItemStackFromNBT(itemStack); } } - + int rsContr = nbtRoot.getInteger("redstoneControlMode"); - if(rsContr < 0 || rsContr >= RedstoneControlMode.values().length) { + if (rsContr < 0 || rsContr >= RedstoneControlMode.values().length) { rsContr = 0; } redstoneControlMode = RedstoneControlMode.values()[rsContr]; - + } @Override @@ -251,7 +257,8 @@ public abstract class AbstractMachineEntity extends TileEntity implements IInven super.writeToNBT(nbtRoot); nbtRoot.setShort("facing", facing); nbtRoot.setFloat("storedEnergy", powerHandler.getEnergyStored()); - + nbtRoot.setShort("capacitorType", (short)capacitorType.ordinal()); + // write inventory list NBTTagList itemList = new NBTTagList(); for (int i = 0; i < inventory.length; i++) { @@ -262,19 +269,19 @@ public abstract class AbstractMachineEntity extends TileEntity implements IInven itemList.appendTag(itemStackNBT); } } - nbtRoot.setTag("Items", itemList); - + nbtRoot.setTag("Items", itemList); + nbtRoot.setInteger("redstoneControlMode", redstoneControlMode.ordinal()); } // ---- Inventory // ------------------------------------------------------------------------------ - + @Override public boolean isInvNameLocalized() { return false; } - + @Override public boolean isUseableByPlayer(EntityPlayer player) { if (worldObj == null) { @@ -309,6 +316,7 @@ public abstract class AbstractMachineEntity extends TileEntity implements IInven } if (fromStack.stackSize <= amount) { inventory[fromSlot] = null; + updateCapacitorFromSlot(); return fromStack; } ItemStack result = new ItemStack(fromStack.itemID, amount, fromStack.getItemDamage()); @@ -330,6 +338,19 @@ public abstract class AbstractMachineEntity extends TileEntity implements IInven if (contents != null && contents.stackSize > getInventoryStackLimit()) { contents.stackSize = getInventoryStackLimit(); } + + if(slot == inventory.length - 1) { + updateCapacitorFromSlot(); + } + } + + private void updateCapacitorFromSlot() { + ItemStack contents = inventory[inventory.length - 1]; + if(contents == null) { + setCapacitor(Capacitors.BASIC_CAPACITOR); + } else { + setCapacitor(Capacitors.values()[contents.getItemDamage()]); + } } @Override @@ -345,9 +366,7 @@ public abstract class AbstractMachineEntity extends TileEntity implements IInven public void closeChest() { } - public void onNeighborBlockChange(int blockId) { + public void onNeighborBlockChange(int blockId) { } - - } diff --git a/common/crazypants/enderio/machine/AbstractPoweredTaskEntity.java b/common/crazypants/enderio/machine/AbstractPoweredTaskEntity.java index 4332f2d0..7d8c0a28 100644 --- a/common/crazypants/enderio/machine/AbstractPoweredTaskEntity.java +++ b/common/crazypants/enderio/machine/AbstractPoweredTaskEntity.java @@ -41,8 +41,8 @@ public abstract class AbstractPoweredTaskEntity extends AbstractMachineEntity im @Override public boolean canExtractItem(int i, ItemStack itemstack, int j) { - int outputIndex = inventory.length - 1; - if (outputIndex != 2) { + int outputIndex = inventory.length - 2; + if (outputIndex != i) { return false; } if (inventory[outputIndex] == null || inventory[outputIndex].stackSize < itemstack.stackSize) { @@ -94,7 +94,7 @@ public abstract class AbstractPoweredTaskEntity extends AbstractMachineEntity im } protected void taskComplete() { - int outputIndex = inventory.length - 1; + int outputIndex = inventory.length - 2; if (currentTask != null) { ItemStack result = currentTask.getCompletedResult()[0]; if (inventory[outputIndex] == null) { @@ -109,7 +109,7 @@ public abstract class AbstractPoweredTaskEntity extends AbstractMachineEntity im } protected RecipeInput[] getInputs() { - RecipeInput[] res = new RecipeInput[inventorySize - 1]; + RecipeInput[] res = new RecipeInput[inventorySize - 2]; for(int i=0;i < res.length;i++) { res[i] = new RecipeInput(i, inventory[i]); } @@ -129,7 +129,7 @@ public abstract class AbstractPoweredTaskEntity extends AbstractMachineEntity im return null; // no template } - int outputIndex = inventory.length - 1; + int outputIndex = inventory.length - 2; // make sure we can merge the recipe output with our result if (inventory[outputIndex] == null) { return nextRecipe; @@ -147,7 +147,7 @@ public abstract class AbstractPoweredTaskEntity extends AbstractMachineEntity im } protected boolean canMergeWithCurrentOuput(ItemStack nextResult) { - if (!nextResult.isItemEqual(inventory[inventory.length - 1])) { + if (!nextResult.isItemEqual(inventory[inventory.length - 2])) { // next result is a different item type return false; } diff --git a/common/crazypants/enderio/machine/GuiMachineBase.java b/common/crazypants/enderio/machine/GuiMachineBase.java index f91200fc..25a10c61 100644 --- a/common/crazypants/enderio/machine/GuiMachineBase.java +++ b/common/crazypants/enderio/machine/GuiMachineBase.java @@ -26,7 +26,7 @@ public abstract class GuiMachineBase extends GuiContainerBase { protected static final int POWER_Y = 14; protected final int POWER_X = 15; - protected static final int POWER_WIDTH = 11; + protected static final int POWER_WIDTH = 10; protected static final int POWER_HEIGHT = 42; protected static final int BOTTOM_POWER_Y = POWER_Y + POWER_HEIGHT; @@ -118,7 +118,7 @@ public abstract class GuiMachineBase extends GuiContainerBase { int l = (height - ySize) / 2; int i1 = tileEntity.getEnergyStoredScaled(POWER_HEIGHT); //x, y, u, v, width, height - drawTexturedModalRect(k + POWER_X, l + BOTTOM_POWER_Y - i1, 176, 31, 11, i1); + drawTexturedModalRect(k + POWER_X, l + BOTTOM_POWER_Y - i1, 176, 31, POWER_WIDTH, i1); for (int i = 0; i < buttonList.size(); ++i) { GuiButton guibutton = (GuiButton)this.buttonList.get(i); diff --git a/common/crazypants/enderio/machine/alloy/TileAlloySmelter.java b/common/crazypants/enderio/machine/alloy/TileAlloySmelter.java index e4a7fc70..e02ae27a 100644 --- a/common/crazypants/enderio/machine/alloy/TileAlloySmelter.java +++ b/common/crazypants/enderio/machine/alloy/TileAlloySmelter.java @@ -21,7 +21,7 @@ public class TileAlloySmelter extends AbstractPoweredTaskEntity { } @Override - public boolean isItemValidForSlot(int i, ItemStack itemstack) { + public boolean isMachineItemValidForSlot(int i, ItemStack itemstack) { if(i >= 3) { return false; } diff --git a/common/crazypants/enderio/machine/generator/TileEntityStirlingGenerator.java b/common/crazypants/enderio/machine/generator/TileEntityStirlingGenerator.java index b72a6695..79b81f9a 100644 --- a/common/crazypants/enderio/machine/generator/TileEntityStirlingGenerator.java +++ b/common/crazypants/enderio/machine/generator/TileEntityStirlingGenerator.java @@ -54,7 +54,7 @@ public class TileEntityStirlingGenerator extends AbstractMachineEntity implement } @Override - public boolean isItemValidForSlot(int i, ItemStack itemstack) { + public boolean isMachineItemValidForSlot(int i, ItemStack itemstack) { return TileEntityFurnace.isItemFuel(itemstack); } @@ -139,7 +139,7 @@ public class TileEntityStirlingGenerator extends AbstractMachineEntity implement powerHandler.update(); return false; } - float canTransmit = Math.min(powerHandler.getEnergyStored(), capacitor.getMaxEnergyExtracted()); + float canTransmit = Math.min(powerHandler.getEnergyStored(), capacitorType.capacitor.getMaxEnergyExtracted()); float transmitted = 0; float stored = powerHandler.getEnergyStored(); diff --git a/common/crazypants/enderio/machine/painter/TileEntityPainter.java b/common/crazypants/enderio/machine/painter/TileEntityPainter.java index d775d055..9b6e9217 100644 --- a/common/crazypants/enderio/machine/painter/TileEntityPainter.java +++ b/common/crazypants/enderio/machine/painter/TileEntityPainter.java @@ -25,7 +25,7 @@ public class TileEntityPainter extends AbstractPoweredTaskEntity implements ISid } @Override - public boolean isItemValidForSlot(int i, ItemStack itemStack) { + public boolean isMachineItemValidForSlot(int i, ItemStack itemStack) { if (i > 1) { return false; } diff --git a/common/crazypants/enderio/power/Capacitors.java b/common/crazypants/enderio/power/Capacitors.java index cdeae1fb..b653d448 100644 --- a/common/crazypants/enderio/power/Capacitors.java +++ b/common/crazypants/enderio/power/Capacitors.java @@ -1,5 +1,6 @@ package crazypants.enderio.power; +import crazypants.enderio.ModObject; import net.minecraft.item.ItemStack; public enum Capacitors { @@ -27,5 +28,9 @@ public enum Capacitors { this.iconKey = "enderio:" + iconKey; this.unlocalisedName = name(); } + + public ItemStack getItemStack() { + return new ItemStack(ModObject.itemBasicCapacitor.actualId,1,ordinal()); + } } diff --git a/common/crazypants/enderio/power/PowerHandlerUtil.java b/common/crazypants/enderio/power/PowerHandlerUtil.java index 60c9eac3..366753a5 100644 --- a/common/crazypants/enderio/power/PowerHandlerUtil.java +++ b/common/crazypants/enderio/power/PowerHandlerUtil.java @@ -16,11 +16,22 @@ public class PowerHandlerUtil { public static PowerHandler createHandler(ICapacitor capacitor, IPowerReceptor pr, Type type) { PowerHandler ph = new PowerHandler(pr, type); ph.configure(capacitor.getMinEnergyReceived(),capacitor.getMaxEnergyReceived(),capacitor.getMinActivationEnergy(),capacitor.getMaxEnergyStored()); + //TODO: Setup perdition properly ph.configurePowerPerdition(0, 0); ph.setPerdition(new NullPerditionCalculator()); return ph; } + public static void configure(PowerHandler ph, ICapacitor capacitor) { + ph.configure(capacitor.getMinEnergyReceived(),capacitor.getMaxEnergyReceived(),capacitor.getMinActivationEnergy(),capacitor.getMaxEnergyStored()); + if(ph.getEnergyStored() > ph.getMaxEnergyStored()) { + ph.setEnergy(ph.getMaxEnergyStored()); + } + //TODO: Setup perdition properly + ph.configurePowerPerdition(0, 0); + ph.setPerdition(new NullPerditionCalculator()); + } + public static float transmitInternal(IInternalPowerReceptor receptor, PowerReceiver pp, float quantity, Type type, ForgeDirection from) { float used = quantity; @@ -89,7 +100,10 @@ public class PowerHandlerUtil { } float res = current - 0.001f; if(res >= current) { - System.out.println("PowerHandlerUtil.NullPerditionCalculator.applyPerdition: Fail! current is: " + current + " res is:" + res); + res -= 0.01f; + if(res >= current) { + System.out.println("PowerHandlerUtil.NullPerditionCalculator.applyPerdition: Fail! current is: " + current + " res is:" + res); + } } return res; } diff --git a/resources/assets/enderio/textures/gui/alloySmelter.png b/resources/assets/enderio/textures/gui/alloySmelter.png index 89748693141f5673876b29c80ec19bda81b2dece..9081d9a1cbae8ae9e13ef9a2d1847482882ff7bf 100644 GIT binary patch delta 885 zcmbO%JXv@{2n*L<1_r*pjPAcDtlb>PBE(oPVtKObXRomXo9uMnppXwb4(hU&Mqlp> zY)F-quk3mm=TOD)MDy7UhBcGeFZ3mc8*o*vJ@TyR8`B4l6TxR38DDG`s(#M;;CSnM zxBq?OOpgM9qUszR$%_7l@`?`Z&hwIf2@5FOKa4x@B=*2{PnIP&PyW5JS^UFRMY|K% zBd0mkJFzC1Cut;jpL!qF@a(&e!jp0xg=h7<8ETI3J22FBEx6q@li^AI?gn=iYqQEV zEKC06vFa%J8>X#i?3`koC$yWHkNd~wCXUh>`#JP(K4yEv_aesO*OBiG?@n;skZ<@F zbWTaZ->pGZq~QaX(v`xP164O`iWzOS6)x`=;Bu&7trvW?B7$j_^4+jaOh$jX7c#Vj z3oPvGQWa=Aq4rJ%S?n;=689U+_PY2vtgBZ{7ut|x-uQ`W+S_IIit54&cQ55Vie}XR zC0?{i^}__MiQ*r20mZ8YT^8IBILUe9tNxP`rl3`=|2b}enBEGxVns|vf4MC$)=N%M zR6oE0a*E)q1q@sU!W(K>jcoH+?&Kd@$@<`c?6l{MtO|R89<=^duEo}d`wdJ2agHrk8VyW~7-Bf% zEn~f1{;yi5+0C#gRd>&ia=-VvoIim^8sr-Tl>kx6gEHamSvbTN%xw6pdiQz0=e@f^ zX*WOcRHS`gK9LD%#K)a18VyE7o5Bz$Shei#*15@(pRya&e|Yr&pkr)hvG;UQ2Zr=MB`nI zOhI+qnZzb6m)Ly0!R3^kdFNfmcGf?UjxAPa;#sD@DP%5VFVRz|eN@d*p2G5m-=SJF zU2uZB@&PU`hYD7~R~C8+d$acKteYn~;blArtHPe9dXCZ%9mca0^Ry!wXZ~vqU^t}R z5#WAQh{G{OxLgQH?06#MCB>Y}aZ2h6*Y{5_=8V`j+o6*2blK(o6DD&`h|4tpxVAz3 zFSq4Qp$d$@oCs3- z`~n7w8E#U$S`M4G|XfTK$ z3irD%baDTx%u`AX`H|fE|K?tlBH0~xkF1TtA(o+*Q14m(UG?DX z=tDZv^BB+P{4)u9uvb^nZaM?&WMvMm`UBcd=eO+MR=h^_$a5i}fd}@S1sltCq4Bow zomHw&mSYoZNMnloV{frSJ3o(ei|_?bk%r3Ij*KD#tPgIzKJ_w6=`G8HyJ-s_O5fTz zZNhve4TjHV&7i>0aA40fFIC4So<$0+X+tL5aMHz=f%d zpZ{n%Omj3p;u(D@;l#cLlW%j(n|zOhNAfw-v!C)=EeaODuM{0;00K`}KbLh*2~7aw CvTCvb diff --git a/resources/assets/enderio/textures/gui/painter.pdn b/resources/assets/enderio/textures/gui/painter.pdn index 303a6dc179fe40c443babc00ceb61b31994ce6c9..f51119fdd917241d1791afcafb3bbd5435b7f191 100644 GIT binary patch delta 6749 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 LSah9^DepJ6-6CJy&tNQ({?&=3Z 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 diff --git a/resources/assets/enderio/textures/gui/painter.png b/resources/assets/enderio/textures/gui/painter.png index db7ca661de43985e0a42d325ac4352f11b41a1d7..2a01a0d9adba4c824bbb23bc5d401c13098bc165 100644 GIT binary patch delta 1110 zcmY+84KUkx7{`DAkVJ}l>4Yg|!_`JdXHu^f9p`0NbLXwC2GtTlo0+#XO`89DZJk58 z^D=74(V|8S(%V}|LrN`~WWo+jBP1o#Ap7f1@AlmNp6B^I&-eGeM`kIt>?ty2 zaU(*4V`)hW5w=hqYg3fdN9LKNDJ`}>t)gssrni2SiW6w`=CY(!DzEqV;w!6-uO@W? z%MZHgRu|`!mmY+r#n*WGSEtoISH~^5x|?Lj^AGu>zhhXSJIX@|82I6?wYGCY9XiL@ zJ!wm%c^|d6n^0*#=c&^;XjxIgNfz6Pop37J@LUK?Gj``96UQ5X_c3^;VOcmoDS_$? zYCX6TZbFdp!1!NIKR4HswE;Ibo$esITrlJB$k^a^2L}(^RQSTpMp7L<6fZ%YhB}7F zhD>V~CfOvD-|UD1ISS?WH4ZP{W$9^VNhmYac4mP)*9K0 z!9wWF2h>s{!8K;J=xgPKLFZ>Ny440IAhm4?hjT%6aywGhAe!`OpCNOPIAk3N(|L)5 zSl1B)J3o|9cE4y$NxgMR{}__(1scTa3QeMwQV)1biBIWgB?9_VulT&#r2=S{62uxE zCV;n21%C49Cg7zv#h8m?8^hNGWdvp13GW8&7gNXJn)^{&>MOqJ?s?d){Pef64x8AF zd8>G+QLEyflD7nc3shUCEb0iBCKH<_{aC&Q&6)QcT7O|(c$i~AFziGH=r$C}nJ^vH ziAG>|>Z)=!>;|gSuoSh!+MXjTgOcs@Q39$cj$Dem$W*DRr$^;oua{Pq7e}E?s2(U8 zn=cEKSt?qA_Me3EElfM#2F=;wN%cFrU%5d68ky!e35aIMZ;rMA%}*+E)0mV++m6v) zF$4DXhCbIBzw~b?Ry58O$9Q2q3&2YG91bwYDbP1jU~jp; zWBT|H@pO3dE8%oiq?zXi0FEc%JxW%byt}*7)fc`A+E?do0RS+;L5RPLMmoSwU}2H+ zBo__Wv>gG((9@GJ$=zphP0CC{{)Grr zb`wEvxknUJ-~SNgm*Wqd0CA{o@N$={Gp5G^fNhLVI26s7$?tyx5q*VOi5YKp!{Bv- xXAE=da?Rf^SJ9OaF1*qV=Z8G|5Bbm^svyt43Q9?{OV7SzL}*mV<1;C@{ssG9?$iJP delta 1109 zcmcaF^hjt!J4^jBPZ!6KinzD8IE!zGh_oecUau>{k$PV<@jh3o>F=Z%t|f{|!VCWY zS3a`$Qu@iRlSej{EVr_JZ#`MY)l2rS`liW&R@$d$&ONp1%=4eCHi(w- zo5>zAcj>ju*1s97eAg~7PiI(Q=MSP87gz;?XeNbuD}mD03|}YpKb2eXfp5cmj)eV} zv;OXjXF2>UmifrnYPJ>E-b*Zq+aJ%c_P*|ctiRhBN{**)zWnZB4wFfJrtRL{h77;B zr00H9Wj^4W8+B*{!wohE@fT6AudgcGI=9OBqFlqbEpxx*ukwp-i)_&Lx2X%r|H}R% zMl_6Z-v3{Zx4&L1%V6a%Rr|fq z*cotrIFP;n@6X@Pzkl18_I+i%u+6h!v3tIC`M*Cqqu?vc>^z{(E)L z>ut;LRDE3g`fl=V<_zr=L50(N_iJB1vCA| z^Y7O+r^q<0|G!$TJeL6oqH27+CB#6ihI%UpuR79HCcN`I7f~(5{9>PX^r33&S-H_~J$V;suho2b zbkA)$nAr}`ZKGgp28NgKp7d-5+S3aXn)^LtEknust-25Y#-81__S+J+3;wg0wb)-M zyUh&K@?wuWH;m1oaQCkEosHjA*ft0u^>bP0l+XkKYM1pQ diff --git a/resources/assets/enderio/textures/gui/stirlingGenerator.pdn b/resources/assets/enderio/textures/gui/stirlingGenerator.pdn deleted file mode 100644 index 67de5dad8e13062ee260eb33e8b82b271a2e2ce7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11414 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 diff --git a/resources/assets/enderio/textures/gui/stirlingGenerator.png b/resources/assets/enderio/textures/gui/stirlingGenerator.png index 756ac6eedde9272c29c00e4f4d0dde057539b0a6..7718c5203b1e31b68287d9e2189bf7f6b615a5d1 100644 GIT binary patch delta 892 zcmew%@Lga-2n*L<1_r*pjPAcDteqUkqFI02)5S5QBJS<&*G03v1Y8q^q91+w_ujke z0$a_`WD{f2t>2?Ui&lHMy4JgW(wt+w=JkZ-rLoU%?-4)$$RYKxl};sB$5l<`nEgVtghd(*8ae8{zBPZacK==Q|piI&i!9;$%w&-;mGmh-%9JR zZMw(sEBD&H;^phP6T&m1${XH3{{Ld9xASUi<|DV{MWUwFGbKdFG4wOPJ;ky?+eG(r zbi)5jTV%o=jsso5pc{XQtCSJMdU2KU$G2!+*}Az^%zJ8p0u9sjGh26o7`zVUht8{= z-Tc4Cg~955nk>Vw_4^k;z1j!T1_nSuuo+-Z&3}8_xVIkZ40p>dUsvS2*MENF?q0?G z!pr(qg`s^p3seuog-Ua77@J|i{ke0(+^v{j>^mKKyxMwJy1msUX@~GzfycXl?o@^; zYdE(%62@j=`1|h37OP8=3hqE5kc@T1yS?*D_v~L?`E9ZCUdAt%pRIVzzva0z4tIXp zJ^S`6kMsr^MurCS1JV2qr5fvJFXLl)z2N$}fX{!q9ro~E`eN~NT4}|}n8}75x|1KU f=St3GUh~@i|DAS5PJZe4Ag6e``njxgN@xNA#0P_6 delta 894 zcmew^@Izoj2n*Lf1_r);jIW$F9+(`*qFH~()5S5QBJS<&-2B;50x$_P@p88w zIsIh#Rlkzq%J=^vDqD`WUShoSYg6^lcl=L-c33jqS$^B#-mCKcK^fiLOPM3?F+QCg zzfX)cw{T$z!{rdW-|sF5++&)@aQf>07`ECmoOiMe(}b_uEwAQos9JXGdC5_I0>VYf3dFpdp-FC!wH4}JKJgNZ*M*k z#r$G>WVQd?{dx_)id&vBoL>I_V(|60uyQty?E1j^4jtA5oAxkVV=hc(x*_6p`it0& zeJ#@-b7e>X9kAeOcGSZtkP8{AN*Ne_e9V@Wt)Cgiyr%{z(lBj(W@|Ph!vU@Z(huF6 zpIxlCQ(~A~9%0?^?{<2A)mD%v!Jy%swGNEU&@li1^5d&zGkF&L)^q25U;j2k?(Zv) zY=+p(YF_sCt=?~dvl(vPJ=tk>Ny6cKY@gJ<+ZSzqU7dK1Vb`T^QgLU_%QC{$ zmE22&vl+JRo-ACt#Lxk3BG6gV4e$2KneN%Yy7J3v<+Y4oE~l-3$iKw}w~c3efi^0* zGcY{h{cw>f;oYm(%T_WTxbt$WvB~Cr_a5XdPgg&ebxsLQ0O`Do`v3p{