From 83ee208fb7899f40f7be4af21933cc50d6c9b176 Mon Sep 17 00:00:00 2001 From: "Aidan C. Brady" Date: Mon, 13 Jan 2014 23:53:56 -0500 Subject: [PATCH] Added a few cool textures, neatened up Salination Tank structure code --- common/mekanism/common/block/BlockBasic.java | 8 +- .../tile/TileEntitySalinationController.java | 157 +++++++++--------- .../common/tile/TileEntitySalinationTank.java | 3 + .../tile/TileEntitySalinationValve.java | 5 + .../textures/blocks/SalinationController.png | Bin 2860 -> 1813 bytes .../blocks/SalinationControllerOn.png | Bin 0 -> 1987 bytes .../blocks/SalinationControllerOn.png.mcmeta | 5 + 7 files changed, 93 insertions(+), 85 deletions(-) create mode 100644 resources/assets/mekanism/textures/blocks/SalinationControllerOn.png create mode 100644 resources/assets/mekanism/textures/blocks/SalinationControllerOn.png.mcmeta diff --git a/common/mekanism/common/block/BlockBasic.java b/common/mekanism/common/block/BlockBasic.java index b4f58b37b..9fb10eea4 100644 --- a/common/mekanism/common/block/BlockBasic.java +++ b/common/mekanism/common/block/BlockBasic.java @@ -21,6 +21,7 @@ import mekanism.common.tile.TileEntityBin; import mekanism.common.tile.TileEntityDynamicTank; import mekanism.common.tile.TileEntityDynamicValve; import mekanism.common.tile.TileEntitySalinationController; +import mekanism.common.tile.TileEntitySalinationTank; import mekanism.common.tile.TileEntitySalinationValve; import mekanism.common.util.MekanismUtils; import net.minecraft.block.Block; @@ -35,7 +36,6 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ChatMessageComponent; import net.minecraft.util.Icon; import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; @@ -124,7 +124,7 @@ public class BlockBasic extends Block icons[12][0] = register.registerIcon("mekanism:CopperBlock"); icons[13][0] = register.registerIcon("mekanism:TinBlock"); icons[14][0] = register.registerIcon("mekanism:SalinationController"); - icons[14][1] = register.registerIcon("mekanism:CopperBlock"); + icons[14][1] = register.registerIcon("mekanism:SalinationControllerOn"); icons[15][0] = register.registerIcon("mekanism:SalinationValve"); glassRenderer.registerIcons(register); @@ -564,7 +564,7 @@ public class BlockBasic extends Block @Override public boolean hasTileEntity(int metadata) { - return metadata == 6 || metadata == 9 || metadata == 10 || metadata == 11 || metadata == 14 || metadata == 15; + return metadata == 6 || metadata == 9 || metadata == 10 || metadata == 11 || metadata == 12 || metadata == 14 || metadata == 15; } @Override @@ -580,6 +580,8 @@ public class BlockBasic extends Block return new TileEntityDynamicTank(); case 11: return new TileEntityDynamicValve(); + case 12: + return new TileEntitySalinationTank(); case 14: return new TileEntitySalinationController(); case 15: diff --git a/common/mekanism/common/tile/TileEntitySalinationController.java b/common/mekanism/common/tile/TileEntitySalinationController.java index e2e9b2e47..9c26296e6 100644 --- a/common/mekanism/common/tile/TileEntitySalinationController.java +++ b/common/mekanism/common/tile/TileEntitySalinationController.java @@ -80,8 +80,10 @@ public class TileEntitySalinationController extends TileEntitySalinationTank imp clearStructure(); return false; } + solarsActive &= solarPanel.seesSun; } + return solarsActive; } @@ -99,7 +101,12 @@ public class TileEntitySalinationController extends TileEntitySalinationTank imp ForgeDirection right = MekanismUtils.getRight(facing); height = 0; - if(!findBottomLayer()) { return false; } + + if(!findBottomLayer()) + { + return false; + } + Coord4D startPoint = Coord4D.get(this).getFromSide(right); startPoint = isLeftOnFace ? startPoint : startPoint.getFromSide(right); @@ -113,94 +120,58 @@ public class TileEntitySalinationController extends TileEntitySalinationTank imp height = structured ? height + 1 : 0; return structured; } + + public ForgeDirection[] getMatrix() + { + return new ForgeDirection[] {MekanismUtils.getBack(facing), MekanismUtils.getLeft(facing), + ForgeDirection.getOrientation(facing), MekanismUtils.getRight(facing)}; + } public boolean findTopLayer(Coord4D current) { - ForgeDirection left = MekanismUtils.getLeft(facing); - ForgeDirection right = MekanismUtils.getRight(facing); - ForgeDirection back = MekanismUtils.getBack(facing); - ForgeDirection front = ForgeDirection.getOrientation(facing); - - for(int i = 1; i <= 2; i++) + ForgeDirection[] matrix = getMatrix(); + + for(int side = 0; side < matrix.length; side++) { - current = current.getFromSide(back); - TileEntity tile = current.getTileEntity(worldObj); - if(!addTankPart(tile)) { return false; } + for(int i = 1; i <= 2; i++) + { + current = current.getFromSide(matrix[side]); + TileEntity tile = current.getTileEntity(worldObj); + + if(!addTankPart(tile)) + { + return false; + } + } + + current = current.getFromSide(matrix[side]); + TileEntity solar = current.getTileEntity(worldObj); + + if(!addSolarPanel(solar, side)) + { + return false; + } } - current = current.getFromSide(back); - TileEntity solar = current.getTileEntity(worldObj); - if(!addSolarPanel(solar, 0)) { return false; } - - for(int i = 1; i <= 2; i++) - { - current = current.getFromSide(left); - TileEntity tile = current.getTileEntity(worldObj); - if(!addTankPart(tile)) { return false; } - } - - current = current.getFromSide(left); - solar = current.getTileEntity(worldObj); - if(!addSolarPanel(solar, 1)) { return false; } - - for(int i = 1; i <= 2; i++) - { - current = current.getFromSide(front); - TileEntity tile = current.getTileEntity(worldObj); - if(!addTankPart(tile)) { return false; } - } - - current = current.getFromSide(front); - solar = current.getTileEntity(worldObj); - if(!addSolarPanel(solar, 2)) { return false; } - - for(int i = 1; i <= 2; i++) - { - current = current.getFromSide(right); - TileEntity tile = current.getTileEntity(worldObj); - if(!addTankPart(tile)) { return false; } - } - - current = current.getFromSide(right); - solar = current.getTileEntity(worldObj); - if(!addSolarPanel(solar, 3)) { return false; } - return true; } public boolean findMiddleLayer(Coord4D current) { - ForgeDirection left = MekanismUtils.getLeft(facing); - ForgeDirection right = MekanismUtils.getRight(facing); - ForgeDirection back = MekanismUtils.getBack(facing); - ForgeDirection front = ForgeDirection.getOrientation(facing); + ForgeDirection[] matrix = getMatrix(); - for(int i = 1; i <= 3; i++) + for(ForgeDirection side : matrix) { - current = current.getFromSide(back); - TileEntity tile = current.getTileEntity(worldObj); - if(!addTankPart(tile)) { return false; } - } - - for(int i = 1; i <= 3; i++) - { - current = current.getFromSide(left); - TileEntity tile = current.getTileEntity(worldObj); - if(!addTankPart(tile)) { return false; } - } - - for(int i = 1; i <= 3; i++) - { - current = current.getFromSide(front); - TileEntity tile = current.getTileEntity(worldObj); - if(!addTankPart(tile)) { return false; } - } - - for(int i = 1; i <= 3; i++) - { - current = current.getFromSide(right); - TileEntity tile = current.getTileEntity(worldObj); - if(!addTankPart(tile)) { return false; } + for(int i = 1; i <= 3; i++) + { + current = current.getFromSide(side); + TileEntity tile = current.getTileEntity(worldObj); + + if(!addTankPart(tile)) + { + return false; + } + } } return true; @@ -213,16 +184,31 @@ public class TileEntitySalinationController extends TileEntitySalinationTank imp ForgeDirection left = MekanismUtils.getLeft(facing); ForgeDirection right = MekanismUtils.getRight(facing); - if(!findBottomRow(baseBlock)) { return false; }; - if(!findBottomRow(baseBlock.getFromSide(left))) { return false; }; - if(!findBottomRow(baseBlock.getFromSide(right))) { return false; }; + if(!findBottomRow(baseBlock)) + { + return false; + }; + + if(!findBottomRow(baseBlock.getFromSide(left))) + { + return false; + }; + + if(!findBottomRow(baseBlock.getFromSide(right))) + { + return false; + }; boolean twoLeft = findBottomRow(baseBlock.getFromSide(left).getFromSide(left)); boolean twoRight = findBottomRow(baseBlock.getFromSide(right).getFromSide(right)); - if(twoLeft == twoRight) { return false; } + if(twoLeft == twoRight) + { + return false; + } isLeftOnFace = twoLeft; + return true; } @@ -234,7 +220,12 @@ public class TileEntitySalinationController extends TileEntitySalinationTank imp for(int i = 1; i <= 4; i++) { TileEntity tile = current.getTileEntity(worldObj); - if(!addTankPart(tile)) { return false; } + + if(!addTankPart(tile)) + { + return false; + } + current = current.getFromSide(back); } @@ -247,6 +238,7 @@ public class TileEntitySalinationController extends TileEntitySalinationTank imp { ((TileEntitySalinationTank)tile).addToStructure(this); tankParts.add((TileEntitySalinationTank)tile); + return true; } else { @@ -287,7 +279,8 @@ public class TileEntitySalinationController extends TileEntitySalinationTank imp { tankPart.controllerGone(); } + tankParts.clear(); - solars = new TileEntityAdvancedSolarGenerator[]{null, null, null, null}; + solars = new TileEntityAdvancedSolarGenerator[] {null, null, null, null}; } } diff --git a/common/mekanism/common/tile/TileEntitySalinationTank.java b/common/mekanism/common/tile/TileEntitySalinationTank.java index 04f4af5b7..ca195f69a 100644 --- a/common/mekanism/common/tile/TileEntitySalinationTank.java +++ b/common/mekanism/common/tile/TileEntitySalinationTank.java @@ -10,6 +10,7 @@ public class TileEntitySalinationTank extends TileEntityContainerBlock public TileEntitySalinationTank() { super("SalinationTank"); + inventory = new ItemStack[0]; } @@ -17,9 +18,11 @@ public class TileEntitySalinationTank extends TileEntityContainerBlock public TileEntitySalinationTank(String fullName) { super(fullName); + inventory = new ItemStack[0]; } + @Override public void onUpdate() {}; public void addToStructure(TileEntitySalinationController controller) diff --git a/common/mekanism/common/tile/TileEntitySalinationValve.java b/common/mekanism/common/tile/TileEntitySalinationValve.java index b8155332d..9967178a0 100644 --- a/common/mekanism/common/tile/TileEntitySalinationValve.java +++ b/common/mekanism/common/tile/TileEntitySalinationValve.java @@ -19,7 +19,9 @@ public class TileEntitySalinationValve extends TileEntitySalinationTank implemen public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) { if(master != null && resource.getFluid() == FluidRegistry.getFluid("brine")) + { return master.brineTank.drain(resource.amount, doDrain); + } return null; } @@ -28,7 +30,9 @@ public class TileEntitySalinationValve extends TileEntitySalinationTank implemen public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) { if(master != null) + { return master.brineTank.drain(maxDrain, doDrain); + } return null; } @@ -52,6 +56,7 @@ public class TileEntitySalinationValve extends TileEntitySalinationTank implemen { return new FluidTankInfo[0]; } + return new FluidTankInfo[] {new FluidTankInfo(master.waterTank), new FluidTankInfo(master.brineTank)}; } } diff --git a/resources/assets/mekanism/textures/blocks/SalinationController.png b/resources/assets/mekanism/textures/blocks/SalinationController.png index 559c1dd3cf8cda4a77ef2ca4e52e2251562248f5..f232f97cefcb26785c41ed475660fcabd395b300 100644 GIT binary patch delta 1798 zcmV+h2l@D{7L^W=BYy-WX+uL$Nkc;*P;zf(X>4Tx05}naRo`#hR1`jmZ&IWdKOk5~ zhl<6oRa0BJ8yc;~21%2p?MfD<>DVeH9(p*dx19w`~g7O0}n_%Aq@s% zd)fBDv`JHkDym6Hd+5XuAtvnwRpGmKVkc9?T=n|PIo~$m6N9yl%7qB(zDb{1JtYOPA!qk%@Qub75C2T;T?(y%k7cw{!aEIzj}+@(TO5Y zz-|>CeHr)+QOwk9wo4Sh2mAPGw+7tv9PraN1Olr9mwlWPc+tlvJx(D%369Vz>lLjC zyaqhH*k&)cVSir(7|4_1Rc;%)B4&}Zt&(AK&*3kRaknx54=$T^^z2=OSo@r%xnsBw ziQX&rRKAHn*R}K<@Jp~?uenKKe+BrD`qF#?cpp*psgiwk-seYOU#%402HpjG(Qu~= zP5WwfF?$>svC;J<>zK$RIM;P&60@WifbUlLwAf?lk$1u(mFRYq89Q?S8HyrsX^MVnpsf`{W6(5UXREr zZM&7ilpo6ux^|%%%N9z;(dj0Ct!8>>5!%=VyPg-?ke}Vs>~sbgdDuU^Ixpr19NS&g zQew8Fz<)>RL_{M_7A<1csY*MfP@XcB#Jxr~JS8&7goVS)VKE|4(h_Xlc{z{c$ApZs z7riZ_QKdV_uW-M~u~8PF3UX~a6)MwxDE0Ha zPjyrlI!;jX{6Kvuh*8ej?;85ekN$?5uuCiSBY#iOF*IB46Cei@XmvNzKBsGIKkN=X z$_Bgm&h5TyYjpf^^Nrn$ZO1mSZpOC4_}H(pE&Od#0y|)Oik6|u@OHupcq1J>TmjQ1 z4eM{2+Oeah>iL1tBPPK=$Ue-{x#7^N{-XY=Zm3_V7u4T7YJ?d(rX+nTeJlMa zeSar?Fa1o4bXmG0{UlwLzL72kIlJ$@pC#CPuU}yk-HKgk)oY(MCsR(!d*m18l>EH> zvOF8G6uDm>lc(gp@azfp%?$k=y%=-~vuaJXdoA$<7&H$h2Au}i##F_Gt8^Aw+nR z00084Nkl?MPp5# z%)^$e|6YVUC2(-~pmkzhu`>by{^$2E9j`Ut8G#|-z(x@Wlm2_RMgIm0{Yj|^fG@m{ zxA8k9&t3iqfv$xnprLv0@;iut3CN`D0KBB*XzY0^-lW(+s0fS=Vt?}&Rqq?Ls|d&xxTW6o(!dR4$$TSIt_YyxcQ2NBNo1U^ z$s8wfrH-mz0QD$iOACi~LLgb!y}_oai_+no!5@aL*_erL2!_k+eK4Qz(JVtRi2Weg z6@jZbXVHL8s9CBL*J0vEMp~bN=xq~408e~fg>1;XA(%SigkDJkDu4SXLlL-)By|A( z@MTy>^yX10`p1;*`wpA=G6ma`Py}Ejf-jfmLTox;tyY34V?Y8cx@pJjX1+nE7p0a# z+{W11^HT;O=L;#}dU1MQ>h1`cWm_h@c1^BG1keIt{0A#RiiMD$Bv>RC0PqYKHl%)1 zH0dYKvG=bQ@Z*<C o6!NnS{UJb~wB7}M8^^N$18PqPar4xyEdT%j07*qoM6N<$g6czVYXATM delta 2854 zcmV+>3)%FQ4y+cCBYy+*X+uL$Nkc;*P;zf(X>4Tx0C?Jsl+SMzWf;dlyYtSh2{;E+ z0gJ(jKY)-zwqTG3L3g{$wouDv+hW_8nCoMPiX1$ccrw9X z5iY<%0|`MxY)DKvl=ve=5-x_+!%TMvXvO#R%=3Pq@AvyW?|+kl%;#0#cheTkdZDV6 z^49poq?NfrnrB!;H*2bP;OENaA%LpyyF7C4{Y(nr+V++2|MRS=$-sux6F{>T*t3v2 z2D)qeDg@&eu;*y#hmd&|=u+bolaR>*UG*p~09{j2JPvfJ(MmsLT)?y&)f!~xfu5;E zzMhC94*+zPq<<%sV_TI{-YTo+wByQz-N#)2&ok?`mi0CPYlE4QL%>!@9c!q8N*sS; zSBoRSi;%kPhxrPy8B%|=X2x>BHb_4;tqzPu`1GqM8l!Il>mXfo!okrvf5Mv@J{;Ai z&&)IrRbtF#JLsPTo`>|!h8!G<{Ako=UrMzEGir!f4aN1wWD`Zz3tdnPThH+ zy7`D_x$Gx70Rm>)$nDAgFU^0qp~G=qoO|oq+J8&)9Ddw<^;`O)eqFz%-_RF22>n-m zL0`~ski*5Lj${^zgNGzYI7s$z0hf>}F2CW?OyC|+oc2z4cW&$}r|!u2hVKn?vZs^H z{*wJOdp-MU_H6d|ho-#Zl(dhuue9&AueEQqAF;Ia+6CG5FBd?h$)M+oe%73Pujg*k<$@y~aT!*YRg;F$zYXvBfAp zuyyt-9moVK+2?kqkOa)2aF|2l5+Fl)EPn*(Z~DiTQ*VUU&TRG-E9d*Jv<5wUM~_u? zT}wIjMi^L122#z*+78AiCavffeYZjiNUgil$%SvgzP~`b+R06};EMp(zud`f?S`j6 zhI6~^mYR$I`Ki=T5KQmd8GWtIgMM>q>F#F8dW{6>t+Em}F>N=;+`Tz5fmo6L)Ji^Edzwdf%)uH=F%bssnR$>*O@Gx6H zUOd0BXQMmbYnY$>`xM`ty}n}!x3hop`E%TO?JZ6|e~x!AU**gT7Y?2KnSbMhyXjs9 zw#IWmzV(onfxwr)dV=r1es6othsxAH`o+zH;j%zvGy;~lZ`;`zk@ z@Y01N`@VdAPyq1y#uEoxpttfQ&G+7?xAG+6FV~RIKXvE~@Xn3FqbcwZ7~THZ?T*~X z^8Joo zL@B<0=^57Ubx>%uQfRBNkwGg>kU*9exS}MohSX(rIs;}}E#fG`8jTm2s@L#7V2tp~ zU;LUMywTzN&(7?Tw}*z``Pp3%IC<(gw{PBOG)l=_LC^+K23HCpK!0o#TCD~)sbQiB zts`2^I&l=Sw7kIV{4BNl6mR_YD%bz@0oFu3^_j;(;D^8I9ISv3&~7yt4hHo512#5$ z42MJF*ief#y!z>UH0$_~h*z!`v ziY#NJyT;nRO@a?3wWtzcEd(KmW|)lG<3l*i0??i^Xi<~_lvXHXDSTkF zKPDZd#IZ&x1tN5M{mLTBpp?NokI~i3hy9%9bc1o4qLeT{+oBe0lpKJ8%moO6ei}&g zF?p6@Ba2dkFMs{^LFYYF^@zE4n|zef?+zLChD1ri^z<~tbc`zsL_BGl;meXFiMhYt zAVEHTE?Y}Qc%<53DC6gUc>6G|8jQ<8eZ(()2%F=nb!CwNbur=;l!PoVIQ zEX^pgk~|%g#4*c@N45jhzJW+Yczhwy2_Eku&kK?m)_*%4W@l%(x4O#l$J(^p4UDl^ zrI}w|VQFrjvMlHiMr1{b5AeGyZ-NNP)D%~L|0lk7;c3!rL?Dp6uw6gwjf4W%ZsjO- zkA_?0&NyMV-6W|+y#M!g#-o(A`&~qYS<~arAjU=!LSR<+SWW9FrHHJ-S_2518=K$* zSKs_2y?^ciCHnACETS+*vzjI}rV?~)8I3dYaSlLHI6R&^X$%6+m59KmYLmo}XF1L} zvZ6p61$cbcW0WTtV8$83qxxeTk^bw@Od0 z3?5@O3yX6&so`8nXQNBt5E{OEX&$9CNgSgDlz#|Wnp5n`uu2=ED8gtBJ`jQjfg&$R zv#ioAfD(<%OK#m<1%ZBV2*ArHeo`?}!OOLM&Zt93@Bw7Ps(YJG@8YG>X1Kp;#~ z?}PER$^hScX0PzQ^}wz|;+2c7M=maN7yiGZ6yWDKS|qiY$VO!g85bp@p!6^? z3a8JWW+@&5$^I_?ErugR?ln1dOiY>=Z9cOx`Nj6GZ^`1@=b6TB38AW6xl&MheUEqxO+kb`V zXGIVZHbq#O+?Uj1#-o%h&rwR~^#+H7Fiv6?mKTVVh|p|o18NJ5RZr*eE>z%jjv_Dc zuB0qIAyh%E$TE&iW&CYpQc;WW={e6o?(fi2Pbj?I7o2&l`9IO>L0)f-EufVT>~DRo zP5KREbY+BVw?`jSpqm7zy-6j6av#zKn@5TRpLlotA9pWLSD_#Rp#T5?07*qoM6N<$ Eg0#GZjQ{`u diff --git a/resources/assets/mekanism/textures/blocks/SalinationControllerOn.png b/resources/assets/mekanism/textures/blocks/SalinationControllerOn.png new file mode 100644 index 0000000000000000000000000000000000000000..7314c5c5a63065aac212339092b17de79ad98e09 GIT binary patch literal 1987 zcmV;!2R!(RP)4Tx05}naRo`#hR1`jmZ&IWdKOk5~hl<6oRa0BJ8yc;~21%2p?MfD<>DVeH z9(p*dx19w`~g7O0}n_%Aq@s%d)fBDv`JHkDym6Hd+5XuAtvnwRpGmK zVkc9?T=n|PIo~X-eVh__(Z?q}P9Z-Dj?gOW6|D%o20XmjW-qs4UjrD(li^iv8@eK9k+ZFm zVRFymFOPAzG5-%Pn|1W;U4vNroTa&AxDScmEA~{ri9gr1^c?U@uwSpaNnw8l_>cP1 zd;)kMQS_;jeRSUEM_*s96y65j1$)tOrwdK{YIQMt92l|D^(E_=$Rjw{b!QT@q!)ni zR`|5oW9X5n$Wv+HVc@|^eX5yXnsHX8PF3UX~a6)MwxDE0HaPjyrlI!;jX{6Kvuh*8ej?;85ekN$?5uuCiS zBTvvVG+XTxAO{m@bvM#Jr)z6J><&E22D|vq?Y?Vkbo_DijopiF$2PET#mZ8eu=y$(ArYkv7@Ex`GL?QCc!_*KFrd&;n1r7 zqW-CFs9&fT)ZaU5gc&=gBz-DaCw(vdOp0__x+47~U6sC(E(JNe@4cTT*n6*E zVH4eoU1-&7pEV~_PRe`a7v+@vy!^5}8?Y3)UmlaER000A8NkllaVrrBV7G zUHLqvfjfwnY%~biY@RWX(YYpvAHPm>wIl$&A}TCSGLwx}7bgM`z@g0&N=`Q%^~-dG zX_k`l7kl4Gzv<4MOJ|5n5`n{FB@ds!CX<@#yn6QFh%0LmKDl?B!N2WBBA|l3eDhB2 zZghR+<}LPN|9z#cH3F4Z4udY>;HEVKbt}g;NCLBY{k@Au$C3JzQW5~Ccpt9=0HHok zBLu1(nSfmLT;FY#RJ?C+Tt+~oAjtKmmj)U%C9|bSxg>y&A6=c`C6RHmAbsq_g*qzs z0;oqBTefgGP6*5w<=$YqDvQ$hJO+Pgw#~+n?}nfSUTFvYoh_PW*bCx*5XL2e-*Ltw zhnlO_oqM1nd1zx^_D@^$z8 zjPD;4w%zyHurE^JWT;G%1VD%2lZm+y6+1SaPB~G=fCN^wI*!+BzCouKrItZ7V{Gs8 zZVs|P77_r*yZgEB1ea;LX0l7yHW1+EUWC341W3d=!HxYBpM=(jr`z(}C%&Id3OqzM11^8sYow#0j? z6&(1escWqfuzgYKgjyru`b8xPxaWzyN~tMnuVrinHn z*CI3dRCSU-cRrworOoT^d_a#bc^!A>0}!6>d;kt7y7PhVe4slY&>xp-|GzsQ_ygO_ V6Ye!Kd0zkk002ovPDHLkV1oMnxYqyx literal 0 HcmV?d00001 diff --git a/resources/assets/mekanism/textures/blocks/SalinationControllerOn.png.mcmeta b/resources/assets/mekanism/textures/blocks/SalinationControllerOn.png.mcmeta new file mode 100644 index 000000000..efc331201 --- /dev/null +++ b/resources/assets/mekanism/textures/blocks/SalinationControllerOn.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 10 + } +}