From 99ca8f6624424bc8da362f4f636fdb72faa3f612 Mon Sep 17 00:00:00 2001 From: Aidan Brady Date: Thu, 2 Jan 2014 22:30:23 -0500 Subject: [PATCH] Cleanups and fixes from the electrolytic separator update --- common/mekanism/client/ClientProxy.java | 1 - .../RenderElectrolyticSeparator.java | 4 +- .../mekanism/common/block/BlockMachine.java | 9 +-- .../TileEntityElectrolyticSeparator.java | 60 ++++++++++++------ ...atorNone.png => ElectrolyticSeparator.png} | Bin .../render/ElectrolyticSeparatorHydrogen.png | Bin 2738 -> 0 bytes .../render/ElectrolyticSeparatorOxygen.png | Bin 4735 -> 0 bytes .../render/ElectromagneticContractor.png | Bin 1365 -> 0 bytes .../render/ElectromagneticContractorOn.png | Bin 2727 -> 0 bytes 9 files changed, 45 insertions(+), 29 deletions(-) rename common/mekanism/client/render/{ => tileentity}/RenderElectrolyticSeparator.java (95%) rename resources/assets/mekanism/render/{ElectrolyticSeparatorNone.png => ElectrolyticSeparator.png} (100%) delete mode 100644 resources/assets/mekanism/render/ElectrolyticSeparatorHydrogen.png delete mode 100644 resources/assets/mekanism/render/ElectrolyticSeparatorOxygen.png delete mode 100644 resources/assets/mekanism/render/ElectromagneticContractor.png delete mode 100644 resources/assets/mekanism/render/ElectromagneticContractorOn.png diff --git a/common/mekanism/client/ClientProxy.java b/common/mekanism/client/ClientProxy.java index aec5f6f83..a31c5f5d8 100644 --- a/common/mekanism/client/ClientProxy.java +++ b/common/mekanism/client/ClientProxy.java @@ -11,7 +11,6 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import mekanism.client.gui.*; import mekanism.client.render.MekanismRenderer; -import mekanism.client.render.RenderElectrolyticSeparator; import mekanism.client.render.RenderPartTransmitter; import mekanism.client.render.RenderTickHandler; import mekanism.client.render.block.BasicRenderingHandler; diff --git a/common/mekanism/client/render/RenderElectrolyticSeparator.java b/common/mekanism/client/render/tileentity/RenderElectrolyticSeparator.java similarity index 95% rename from common/mekanism/client/render/RenderElectrolyticSeparator.java rename to common/mekanism/client/render/tileentity/RenderElectrolyticSeparator.java index bb455f9ca..67eb53a92 100644 --- a/common/mekanism/client/render/RenderElectrolyticSeparator.java +++ b/common/mekanism/client/render/tileentity/RenderElectrolyticSeparator.java @@ -1,4 +1,4 @@ -package mekanism.client.render; +package mekanism.client.render.tileentity; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -25,7 +25,7 @@ public class RenderElectrolyticSeparator extends TileEntitySpecialRenderer { GL11.glPushMatrix(); GL11.glTranslatef((float)x + 0.5F, (float)y + 1.5F, (float)z + 0.5F); - bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ElectrolyticSeparatorNone.png")); + bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ElectrolyticSeparator.png")); switch(tileEntity.facing) { diff --git a/common/mekanism/common/block/BlockMachine.java b/common/mekanism/common/block/BlockMachine.java index 6528949d9..f508301d5 100644 --- a/common/mekanism/common/block/BlockMachine.java +++ b/common/mekanism/common/block/BlockMachine.java @@ -536,7 +536,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds } else if(blockID == Mekanism.machineBlock2ID) { - if(metadata == 2 || metadata == 3 || metadata == 4) + if(metadata == 2 || metadata == 3) { if(side == tileEntity.facing) { @@ -563,11 +563,6 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds { for(MachineType type : MachineType.values()) { - if(type == MachineType.CHEMICAL_OXIDIZER || type == MachineType.CHEMICAL_INFUSER /*TODO*/) - { - //continue; - } - if(type.typeId == blockID) { if(type == MachineType.BASIC_FACTORY || type == MachineType.ADVANCED_FACTORY || type == MachineType.ELITE_FACTORY) @@ -1079,7 +1074,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds CHEMICAL_OXIDIZER(Mekanism.machineBlock2ID, 1, "ChemicalOxidizer", 29, 20000, TileEntityChemicalOxidizer.class, true, false), CHEMICAL_INFUSER(Mekanism.machineBlock2ID, 2, "ChemicalInfuser", 30, 20000, TileEntityChemicalInfuser.class, true, false), CHEMICAL_INJECTION_CHAMBER(Mekanism.machineBlock2ID, 3, "ChemicalInjectionChamber", 31, Mekanism.chemicalInjectionChamberUsage*400, TileEntityChemicalInjectionChamber.class, false, true), - ELECTROLYTIC_SEPARATOR(Mekanism.machineBlock2ID, 5, "ElectrolyticSeparator", 32, 20000, TileEntityElectrolyticSeparator.class, true, false); + ELECTROLYTIC_SEPARATOR(Mekanism.machineBlock2ID, 4, "ElectrolyticSeparator", 32, 20000, TileEntityElectrolyticSeparator.class, true, true); public int typeId; diff --git a/common/mekanism/common/tileentity/TileEntityElectrolyticSeparator.java b/common/mekanism/common/tileentity/TileEntityElectrolyticSeparator.java index 4709bf7ad..09bebe618 100644 --- a/common/mekanism/common/tileentity/TileEntityElectrolyticSeparator.java +++ b/common/mekanism/common/tileentity/TileEntityElectrolyticSeparator.java @@ -1,17 +1,23 @@ package mekanism.common.tileentity; -import com.google.common.io.ByteArrayDataInput; -import dan200.computer.api.IComputerAccess; -import dan200.computer.api.ILuaContext; -import dan200.computer.api.IPeripheral; +import java.util.ArrayList; + import mekanism.api.ChemicalInput; import mekanism.api.Coord4D; -import mekanism.api.gas.*; +import mekanism.api.gas.Gas; +import mekanism.api.gas.GasRegistry; +import mekanism.api.gas.GasStack; +import mekanism.api.gas.GasTank; +import mekanism.api.gas.GasTransmission; +import mekanism.api.gas.IGasHandler; +import mekanism.api.gas.IGasItem; +import mekanism.api.gas.ITubeConnection; import mekanism.common.ISustainedTank; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.PacketHandler.Transmission; import mekanism.common.RecipeHandler; +import mekanism.common.RecipeHandler.Recipe; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.network.PacketTileEntity; import mekanism.common.util.ChargeUtils; @@ -20,9 +26,19 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; -import net.minecraftforge.fluids.*; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTank; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; -import java.util.ArrayList; +import com.google.common.io.ByteArrayDataInput; + +import dan200.computer.api.IComputerAccess; +import dan200.computer.api.ILuaContext; +import dan200.computer.api.IPeripheral; public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock implements IFluidHandler, IPeripheral, ITubeConnection, ISustainedTank, IGasHandler { @@ -67,6 +83,7 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp if(RecipeHandler.Recipe.ELECTROLYTIC_SEPARATOR.containsRecipe(inventory[0])) { FluidStack fluid = FluidContainerRegistry.getFluidForFilledItem(inventory[0]); + if(fluidTank.getFluid() == null || fluid.isFluidEqual(fluidTank.getFluid()) && fluidTank.getFluid().amount+fluid.amount <= fluidTank.getCapacity()) { fluidTank.fill(fluid, true); @@ -125,8 +142,7 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp } } } - else - { + else { leftTank.draw(8, true); if(worldObj.rand.nextInt(3) == 2) @@ -153,8 +169,7 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp } } } - else - { + else { rightTank.draw(8, true); if(worldObj.rand.nextInt(3) == 2) @@ -175,7 +190,10 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp public boolean canFillWithSwap(ChemicalInput gases) { if(gases == null) + { return false; + } + return canFill(gases) || canFill(gases.swap()); } @@ -245,7 +263,7 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp { if(slotID == 0) { - return RecipeHandler.Recipe.ELECTROLYTIC_SEPARATOR.containsRecipe(itemstack); + return Recipe.ELECTROLYTIC_SEPARATOR.containsRecipe(itemstack); } else if(slotID == 1) { @@ -266,7 +284,7 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp @Override public int[] getAccessibleSlotsFromSide(int side) { - if(ForgeDirection.getOrientation(side) == MekanismUtils.getLeft(facing)) + if(ForgeDirection.getOrientation(side) == MekanismUtils.getRight(facing)) { return new int[] {3}; } @@ -581,12 +599,14 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp } @Override - public int receiveGas(ForgeDirection side, GasStack stack) { + public int receiveGas(ForgeDirection side, GasStack stack) + { return 0; } @Override - public GasStack drawGas(ForgeDirection side, int amount) { + public GasStack drawGas(ForgeDirection side, int amount) + { if(side == MekanismUtils.getLeft(facing)) { return leftTank.draw(amount, true); @@ -595,22 +615,24 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp { return rightTank.draw(amount, true); } + return null; } @Override - public boolean canReceiveGas(ForgeDirection side, Gas type) { + public boolean canReceiveGas(ForgeDirection side, Gas type) + { return false; } @Override - public boolean canDrawGas(ForgeDirection side, Gas type) { + public boolean canDrawGas(ForgeDirection side, Gas type) + { if(side == MekanismUtils.getLeft(facing)) { return leftTank.getGas() != null && leftTank.getGas().getGas() == type; } - - if(side == MekanismUtils.getRight(facing)) + else if(side == MekanismUtils.getRight(facing)) { return rightTank.getGas() != null && rightTank.getGas().getGas() == type; } diff --git a/resources/assets/mekanism/render/ElectrolyticSeparatorNone.png b/resources/assets/mekanism/render/ElectrolyticSeparator.png similarity index 100% rename from resources/assets/mekanism/render/ElectrolyticSeparatorNone.png rename to resources/assets/mekanism/render/ElectrolyticSeparator.png diff --git a/resources/assets/mekanism/render/ElectrolyticSeparatorHydrogen.png b/resources/assets/mekanism/render/ElectrolyticSeparatorHydrogen.png deleted file mode 100644 index e62b03736d23ad500d8a9b47ea5fda32a4d62b0c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2738 zcmbuBi#OAc8^=EzTVw9`Bo!fPhKvYv%{4ZPRFg}&784=EMx;=RM7h8UTnIINDmBiW}$RhBNng$>{R0ee~;NJ5!*;DZ7;h-e~Mnm-^m* zkYgoev5eMZ(+jB(a0g`9g@h?IO{ijTv&~(wv^11%Fq#!RI!J2jSXa{i^TEX7lLxMT z1aaqVvl&_tzl@th23XowmwyfxfT}hZ&O9TKIUC-j%b=6cq zSm}IUoSAEu4daDAXO!yG1PY_&MkHm;E{h|SmVcX?&Giv?{v^yS|Jmj+UtSx!c_3l! z_mv-K2n2#OHHc#}*Psubq7vG8Et5A;$?$zhiL{7DNEjlnRFN2NrmAJJ+=&fCxM<4$ zF6oN$hRqV&+)<`1j z-qvz{CGX#zrLR}uA|shGEhXPxDZa2jSt|q=oWCz~B3*-(y^RR5P>g#>x})FxqP?dl z{Ba2&vrvm!DNmdxtEU=5gW?M{8*_yRjv1+`5SBqU!%=xY?`7>ig zsFl==9Y%b<$NZv;y*oRS@<;b7mKfBSmefmj7JIVRwoh%YV07AJh7hP+^lsIt7}qP_ zcT<6qv=MY;BO(8GjWByHeMd`2^QCOZ89>g65oZPs$U6FjzREfqY*bX2RWn~Z_zF(^ zvpCNgB@e?`dcJ#(&TN4I^4p%Z)!hZuf@)OtJmuw?h~9PoC7(*tKb__Y(1olpmVyx8 z55GE`re%IFRTK8!qRrrY;LrX{MdY`a1B@Dl%yUl#BPwO)j{oO`*r$p{qmfxa$3@UO zrgnMWWj-}h#7)LR1D51f+P@13Zu`8_&W#}~ZG7g&BoG@tb*wIHw{oIQqlBxi8Otv- zmYm%Hm#^)-4x<^gwyMMGrs_(*;idETz-VZTzna4wbJhEzvKUnD{^OQ+oM_);DjCzK zZDXD(z)6c=FNYfyMMZ)}U|y<&Ey*kq*2i9EEVkHmLJ5n#62PkJr$3f-?L|npcxgm8erj)cKZ-eB^}; zJH)HESF9JJv`9MhRUxuODR=yrdcx`!dRa~iVDI#rmwe(Q){|rxBaD)kcgrdYj-MUd zp15=TF1`qw#9wHt)9^VW<%hjRZ1qBc9qyw=$-}&=PaDi~LWqLC8@DX4`}7JI*=zVn z?d2y3=GmdsAe@yfdN`5#AV{$UIo;yo+O)Q{)gApWFBn0FMw!Ls8cHRqixQ;!@Y9?R z{`tJ?@honP`VZY;6O@<@FAg<6!H&<7u)d_QXej~f;mwYzTpl#`?`vZ)h5{nKtBm6#6?m;#58aj%;fNHW&jyB!f z5_8=XjFa9rb$@R5RL*Wl*D};2r_i)j1v?f%Y553xUCD3A`S~hW>vm7~CI95{bEK}A za)pyArzvjr4!X*i&Lh?Z4qqC7`r=9um-_1;a&(2`x7H)eb^DIqSXfwyZwE#yPu#av z5`$vLD`i#p+&OXIQ1U)%bpRgF&^};rb}$cSsTj)Z*eO>}&^@@_W;d5r_M0U5 zl)SEr1yOo457Ij4heGmoAJS1Uxda`Y5Jv8Mr|rlFs8GD}xb zfzu{|<wW3=dr%5o;X<5!fVYf8z^Y~V`_SU;9E$rCopr0{vAUKiK7CggG>Yb*2S4D{EUN{%nn5ZFg?~*28)ThvM z<%QTWmam=^<43gV(3t~VQ&A2gZatRPurYYqUTP5>9uH-2?ECLIa7qdLfP#z5`quX$ z2=lI?@=}rTBrGLD(jyFRi6dRC?qGF2^gxDzjPfirDKpyzZf@3P9_KW#El)Fc7)r9TAw(j2g>PU! z(RqRoha^*(s>11@;*ydVS}`#(-wcamfv&q9&$X^dztoIjU;x7>zUq+Z+E?Gfae*{1 z_)4B_$YB5ZWOnuZhwH}`8`VFyYCR#c$j<@o5;5C&SdPfF*&&LM2&NklAhDH+$*n(#|x~>Fo*n!&hr!cFDf|R zdGV9-&MZ*eqqfV6cgmsOK=zv|nQ+etYI(T=Eib?6X{8hP0GM|j@G`9~LVtWNL2IU% z^W`-pz)Tjs?pp*_;ok2GiBRd#MR3A2d6SCXLftcUOFs-!IXgtGu*Z5R(t<$7%>!=D zR^WFiygN`E;`kZ9?_&OUXsQ40pBm2H z000qweD|)g-rc(b#{NETkDojOfZHsQ7PCG?b2g0_AJaSzn1HoTRBS8G!pyFghr6VW zS}!S|be|)CbwWaTQAH`{D-R8EwWi1@^tlrCDF{AE#jLA#oss%s=;VHLm7ZCYM3J6u z=*lnV>!Kv6#e99>Lou^o_LSppU`C@6iNeP?hhWkQIA#uM4V+4(wz1jKDT!#!MJtJN< z`fN=!Cx?&m)W3Im$-{~ea4|R)oqi>Fuw6{u@H&j{-GIb8dkJj=wOYf3n+)C=L3Onw zY2Lz{r%uomNFV zZjYnfuTu?H-Kb!{r>UBu8} zU{xgzh0xw16(#u`jvaj~FYnT?np35pY)t6Syv-H=kI2!3;fL0&2hhN za8)#-#4W^~WoiOipUF8DpEW(S5kP(Q*#xXXMP`Ybm*_BJ`miRqS!YE{OURHz>fz|u z`>J`ynR4%cHQrNH6Orq975THB> zNzf_(!^(|YJnpP{Wl9ri8?^c@DlJUVOa4d|c8OuMIAyoN2xZQpVraZ`3P+1aoAga? zaUb_$&tHEk)0f;6G8&Loup_Yw(6D--l!i14yu4r=Oln=!^@n{Vf|pmoso(C~={RJ& zVwrba&5y$gT)EUK(iE)f6cU^Axr-e5gDzNzPu(6gEW)_%GiNg}Wja-!o4QOG$mtLpiROZAH|S^_P3CXN zZp>Dk(XaMD@?d;s!=dA$XxSGk%6Ss&EftkHO`^kDzNwe6;}-U-uNRfSD5fp@ZE~$%n3m|aGC+R zX{Qx+@k4dp(!;Kh6-~NKY2u!GO*RZ$lFx~wq0}}0S)k`{ zv9`czK~Zx$Y}9u+TAD-Y{RRZYW4$Xmf4kpsP1c6{CTWj(S2D)tWWRZ{t$roCI9|ZR z9Q+C1@uT(bvOJ}UfOvNNz#_uj;vm3cntpmY^J#zMLHaK2V5Vp-Gjp@A&#>Tujg1W* zRZoBa0b^x#^{D0-l}CPlvgRcZLRN4%TrRh`OSC49#N^tVr&ZOO|DO@uaPt!%Z`4vq z)>&HCIw})()Z4Lpz9t4UXx|C+7A-$I+l^r0U7sj-Q6&_vyCr#B{EWF5KO%N zOckM8MB5xDUqEW6OBfF?k|viBGOjt81fVOd&ni&QODneh8kxg7Yig9V+az|MX0ht> zK^yM(OQj10_+TW91n=`%fN-g)!H zp7+CMbx8vs`@8l5B4nUEzFMB4UbJKPb96%@ADor`G6ERIg#|pucfxsGTJ)pp#8G=) zL;R!@2?p7w!=o4P7a15&G>&dxWcXmq7i|@*x{=GrmHc6_DjS}!L|KttS#r6=`gqxS zJ}aDcjyK7s%p9*)XAB09UR}8>au;Fl@90^aW8W06p7HXTHgd8lBEsFpb9 z`A8}sQ(C1sUG{kuv0T()3+8mG?_RbRW#?Tqz7xNr!obU+{hDCJMyZxN&OxMHVrw-2(B8MbGML+Uc5)D8;DYk_k+$V>g;R z7kaP>g#~DeW&cNLUizKNSi>0ViifL5oQH+*bXc#s(4)USK!s_BZ~tixxapddll&WM zz2Hj?uS`$r;n;riv8MMRa-3Jfa{QfDUij`(ZxzpO-iy2!h$>m79bu3ug-6Nzl?w9V ziuV9So^)jhzlh$3oc*}6CHI&O(8LCDnAhdu$iz!8Ob8U-f&GFwKET)337@X z>2l!BV!J%=tVQ-!pOe$gt%$TK4)0|tQ=Bm9gEdeDsJssZ?lLRC4>U<^!9Mq%xmwi^ z{+sJRDHxiifmV4MGnkYBaeVC`Xm{B)Z0yo|4M4W-mXim5!HX9$(l=4lyPs;$`ME>u zk(eq|Lw@*8=1W<5+n>9Ot#A^cw}+EQ?w=ixrJXp^3x{3{>Ac$j2yIe{fN;K%TH^8i z&!}W!3-)lU5Qw?+faBZibN}I+mtCw)7IVXD-jTqL+8Dbc7361U>X}Phz;a&(y&W$7 zz1i(AC5Duu&HlKyj+wab%aZ%&DHK#}&_sg2#^ih?Jm*I?mln8I~XV_Pjp zne3<0ka@@)EpTdsD*J{8J7|y0@G88^vZtI?DuC-5>4TIy8p;gK1!Q||%QfS(1 z^iEA}Eth3@f|fDwH%4-gI(?NncrG4gifa5~p{r=JG5DMCPJLl&Y@PCBA1CBALa;!a zaixjr(Tf4kQ~d}Up4mmdPbMx&t40L^v1f9$6?MZu=mg>`G588SnkZ&Fg#sfLNi&CW z@$=fIYAn4%O-SMBpmei4bc3Oa^O@^|*~Yv`Rv?>Bf$lRr^p@yf0Y!#1W+L_E^=6Cj zQ&Gnn9kq&>gAmmGKRr!$_7yd7$^sx?A`t(ohu#Otl_HFCXnEvfe`r$1D2G=8jK>O1 zPN*b0J5D$5OwhvCz9WYu8>l7(Kp58=Z- ziH;-#+zQVhNiK*tNOE%KYpJY=%#uVxcctoh9LTEVj?cx;r>$w3H#GkVzWWR z+5sVmH9H81a9^(f+(4@_-z`B*&s2;{cAOp z7%!`_^DW$SINg3)5(Lpe>qXmygn6Bb+ikJje9la+>ARnLtys53(=gkW)^B0ie*`sWUrUuXqtR3iJc=7Nf3nLy(BE!Nau;{e_jLB8jHXTZ zu8!BV9=i%%&ZH72gEb@T#3erpVfM2>H24Vv>7-)Cre5NCPrLP-1PU*Z@z_{{-Bp?o z#7m_j`l-h3mCzh%3K2*GI)A1z+10$b-VB(d8X?@xEVl;j@ZQk-b7vG)}vi_byg%+&&B$L!qI(4$i{85H8RkwdC2o6Nls=nn~ z;FV{8zGqT)*5hC&s{DEn~!k2KKKM2y7oWqLrw`I9U(*YK&>d*X1mBNepS$K zAZUFMTcyE5s|q+(QmAg5Z)ThEkLTp)Y6%Df@Jg!Y6VT40qs$H^2EOC~6!Y2g2j%21 z+!JV|b)|$3Bw$s2M{qijAxN`5ayR5i%Q!UUO?bkXJb0DGiGO#^6A?MeOy1_s&J-AR-aS<9A4(w-zB?8d?_E!ROy`P_A)>=~Hs^+~@ zn2`Vb?J?L%Bl~VboLlFU&~M{1;O!HD^7ET%T#!1AQ@{z;gE~VeN;@_(##nx(lnDO~ z_RXZzy@mrt8$R{$23yYw9rl8LhbE>0;uWmXc+`|oNf5-JwONCw3>&jf@~)cE5l{jJ z%y_k~=ZC0WpjSS%1SRoDt(@REzC+0=RvB7lq@s4%ihwC4XI{}4Ny4?PnH7YmJnIWB z(*vU_kQ9G)+hW>(>D!nzis1cpD*o_TY#wtHV==euVI1pI9S5HPSz0B*m=VX0vobHp zX#m(>uen=;ttbOOIOo7Zn+5&$?KI4aN-{%g#x(J{;UAZ;?vNi$WY05y_h(0rYno$g zRzh$|UNx4D3Q4Q zYb>fvt!?W~j@MKy|q$XcVed>Gh?hU`=`WWW@@HAOrV`*GaLB-)gwa)qYxBam%`4X^&C}|J zvxUq_$Dg|Ss)5^>km@Quj8q8kH#ug^LAl8q;B8tm%VREnA1XWQ??FnU7_4sh;Ris9 z>UTX4YqL(?qp$~<6wv1MTe>-+Avq0EcsFpc*#`MPhBf;UCN#(ed>CEz21_>}*W6ey z3kuV+ZEJ^kaLvt3e*iQDr50SkRSdpc-VXr&gp_SrknR5;nez)r1%2co>LT}Fu>|O8 L8)}u_aeDDT2h0m! diff --git a/resources/assets/mekanism/render/ElectromagneticContractor.png b/resources/assets/mekanism/render/ElectromagneticContractor.png deleted file mode 100644 index 5ec275b6bc51c3be4fe698f5623e7c687b908257..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1365 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSEa{HEjtmSN`?>!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{^MbQ4*Y=R#Ki=l*$m0n3-3i=jR%tP-d)Ws%L0m@TF)W(4>o= zE{-7;ac}Q>=3Q}+XiI!=#NTD)zSCPzFf}MG)k>mTEQVntjA874(V7NOZ9KY8Lq zrp(!~`!3(QbKNOhSLcR@+x~yQY4dbri#T$AeC_P0#G`u1bn2WrbEc% zo3}4teDLX$QA~V%`{m1*3u((wYcIsYst6QRyF0%?q}KRmhb($W&J`1^CVuzV*8l% zJ?nn&6ZSv7^Lzid>l`w&vaO##e=aC44(9uxDS1Fp{Kma|dgtrz{*aZCY1v})=a+mG9N=GJg}#Ea=L>$Rgmt(71=?kAqv>+GSgvg+J&wIwR)E)EPa_0)KsA8Moe%M-k**B?>ug4`~ z#BP0l7jriBJj17qisy%}#5J#)$N1#phi`kV!;7yPH~i_1gNa^|FFfX5J>Tyvhe87b z6X}F5cTaCGtM25wk6@#Ci(wa%YCJ2iE` z`1)-5tIv}kFCdnUls3t_{uW{_a`N{92{((UFr6S&EB(ex9RI z`Zl@xG!vJH%oPj9M;9G99|$Vcg(}QdursT>y6bhJ(UHY|r|&NQWyQ$qp8ny@n>Y5( zB{ol%PiLJjTC>)gagK`IqsJ*hmwvqYzH8g{t^IFxxivU;)oE9FwXE`PI-kV<_M_z6 z?A`jza<^)G^o99$onE*2>AS$%xeZOL{xfXKiUTx^?YZ~9tE%k#_WPd0Vvk=_FDSRhy}ot)TN~5=-)ie$sxC|XZYcv!4j|$H z)5kmYe-8UwJ^p^dM}E>w?j`pBzF1$LUim$9U;P2el4bk{&#+$doLiUv%jmt`*?!@K z2{Y|jjD;kgsI8wrzu5NjbU{vEXz~J?_dt@%K=cn!vt0Sil?g%*{%JmNl>1fltmbF= z{FM*>B;Q!U?!#*S==AG^Wlf*E#MdI}gd|b8!>G)auxz}qtFM=5dsp-eun1)EboFyt I=akR{0C<5z^Z)<= diff --git a/resources/assets/mekanism/render/ElectromagneticContractorOn.png b/resources/assets/mekanism/render/ElectromagneticContractorOn.png deleted file mode 100644 index ba10e0e7e312cbdbdc84f9a6cbf8fed01308eec6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2727 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