From a95f231fcc64b42e306a96b69bdf01b6c64402cc Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Mon, 18 Apr 2016 14:06:33 -0400 Subject: [PATCH] Energy Cube fancy render --- .../client/model/ModelEnergyCube.java | 182 +++++------------- .../render/item/ItemRenderingHandler.java | 9 +- .../render/tileentity/RenderEnergyCube.java | 12 +- .../assets/mekanism/render/EnergyCube.png | Bin 0 -> 2954 bytes .../mekanism/render/EnergyCubeAdvanced.png | Bin 2959 -> 2423 bytes .../mekanism/render/EnergyCubeBasic.png | Bin 2961 -> 2428 bytes .../mekanism/render/EnergyCubeCreative.png | Bin 2938 -> 2415 bytes .../mekanism/render/EnergyCubeElite.png | Bin 2960 -> 2427 bytes .../mekanism/render/EnergyCubeUltimate.png | Bin 2960 -> 2424 bytes .../assets/mekanism/render/EnergyCube_Off.png | Bin 3928 -> 1242 bytes .../assets/mekanism/render/EnergyCube_On.png | Bin 3036 -> 1240 bytes 11 files changed, 60 insertions(+), 143 deletions(-) create mode 100644 src/main/resources/assets/mekanism/render/EnergyCube.png diff --git a/src/main/java/mekanism/client/model/ModelEnergyCube.java b/src/main/java/mekanism/client/model/ModelEnergyCube.java index 81816487f..fa38aa4a1 100644 --- a/src/main/java/mekanism/client/model/ModelEnergyCube.java +++ b/src/main/java/mekanism/client/model/ModelEnergyCube.java @@ -1,7 +1,9 @@ package mekanism.client.model; import mekanism.client.render.MekanismRenderer; +import mekanism.client.render.tileentity.RenderEnergyCube; import mekanism.common.SideData.IOState; +import mekanism.common.Tier.EnergyCubeTier; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.model.ModelBase; @@ -9,6 +11,9 @@ import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.util.ForgeDirection; + +import org.lwjgl.opengl.GL11; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -62,6 +67,12 @@ public class ModelEnergyCube extends ModelBase ModelRenderer ledRight1; ModelRenderer ledLeft1; ModelRenderer ledLeft2; + + public ModelRenderer[] leds1; + public ModelRenderer[] leds2; + + public ModelRenderer[] ports; + public ModelRenderer[] connectors; public ModelEnergyCube() { @@ -332,9 +343,15 @@ public class ModelEnergyCube extends ModelBase ledLeft2.setTextureSize(64, 64); ledLeft2.mirror = true; setRotation(ledLeft2, 0F, 0F, 0F); + + leds1 = new ModelRenderer[] {ledBottom1, ledTop1, ledFront1, ledBack1, ledLeft1, ledRight1}; + leds2 = new ModelRenderer[] {ledBottom2, ledTop2, ledFront2, ledBack2, ledLeft2, ledRight2}; + + ports = new ModelRenderer[] {portBottomToggle, portTopToggle, portFrontToggle, portBackToggle, portLeftToggle, portRightToggle}; + connectors = new ModelRenderer[] {connectorBottomToggle, connectorTopToggle, connectorFrontToggle, connectorBackToggle, connectorLeftToggle, connectorRightToggle}; } - public void render(float size) + public void render(float size, EnergyCubeTier tier, TextureManager manager) { frame12.render(size); frame11.render(size); @@ -349,7 +366,6 @@ public class ModelEnergyCube extends ModelBase frame2.render(size); frame1.render(size); - MekanismRenderer.glowOn(); corner8.render(size); corner7.render(size); corner6.render(size); @@ -358,112 +374,41 @@ public class ModelEnergyCube extends ModelBase corner3.render(size); corner2.render(size); corner1.render(size); + + GL11.glPushMatrix(); + GL11.glScalef(1.0001F, 1.0001F, 1.0001F); + GL11.glTranslatef(0, -0.00011F, 0); + manager.bindTexture(RenderEnergyCube.resources.get(tier)); + MekanismRenderer.glowOn(); + + corner8.render(size); + corner7.render(size); + corner6.render(size); + corner5.render(size); + corner4.render(size); + corner3.render(size); + corner2.render(size); + corner1.render(size); + MekanismRenderer.glowOff(); + GL11.glPopMatrix(); } - @SuppressWarnings("incomplete-switch") - public void renderSide(float size, ForgeDirection side, IOState state, TextureManager renderer) + public void renderSide(float size, ForgeDirection side, IOState state, EnergyCubeTier tier, TextureManager renderer) { if(state != IOState.OFF) { - switch(side) + connectors[side.ordinal()].render(size); + ports[side.ordinal()].render(size); + + if(state == IOState.OUTPUT) { - case DOWN: - connectorBottomToggle.render(size); - - if(state == IOState.OUTPUT) - { - MekanismRenderer.glowOn(); - } - - portBottomToggle.render(size); - - if(state == IOState.OUTPUT) - { - MekanismRenderer.glowOff(); - } - - break; - case UP: - connectorTopToggle.render(size); - - if(state == IOState.OUTPUT) - { - MekanismRenderer.glowOn(); - } - - portTopToggle.render(size); - - if(state == IOState.OUTPUT) - { - MekanismRenderer.glowOff(); - } - - break; - case NORTH: - connectorFrontToggle.render(size); - - if(state == IOState.OUTPUT) - { - MekanismRenderer.glowOn(); - } - - portFrontToggle.render(size); - - if(state == IOState.OUTPUT) - { - MekanismRenderer.glowOff(); - } - - break; - case SOUTH: - connectorBackToggle.render(size); - - if(state == IOState.OUTPUT) - { - MekanismRenderer.glowOn(); - } - - portBackToggle.render(size); - - if(state == IOState.OUTPUT) - { - MekanismRenderer.glowOff(); - } - - break; - case WEST: - connectorLeftToggle.render(size); - - if(state == IOState.OUTPUT) - { - MekanismRenderer.glowOn(); - } - - portLeftToggle.render(size); - - if(state == IOState.OUTPUT) - { - MekanismRenderer.glowOff(); - } - - break; - case EAST: - connectorRightToggle.render(size); - - if(state == IOState.OUTPUT) - { - MekanismRenderer.glowOn(); - } - - portRightToggle.render(size); - - if(state == IOState.OUTPUT) - { - MekanismRenderer.glowOff(); - } - - break; + MekanismRenderer.glowOn(); + renderer.bindTexture(RenderEnergyCube.resources.get(tier)); + + ports[side.ordinal()].render(size); + + MekanismRenderer.glowOff(); } } @@ -474,39 +419,8 @@ public class ModelEnergyCube extends ModelBase MekanismRenderer.glowOn(); } - switch(side) - { - case DOWN: - ledBottom1.render(size); - ledBottom2.render(size); - - break; - case UP: - ledTop1.render(size); - ledTop2.render(size); - - break; - case NORTH: - ledFront1.render(size); - ledFront2.render(size); - - break; - case SOUTH: - ledBack1.render(size); - ledBack2.render(size); - - break; - case WEST: - ledLeft1.render(size); - ledLeft2.render(size); - - break; - case EAST: - ledRight1.render(size); - ledRight2.render(size); - - break; - } + leds1[side.ordinal()].render(size); + leds2[side.ordinal()].render(size); if(state == IOState.OUTPUT) { diff --git a/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java b/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java index 95ce0ec47..38d3e7565 100644 --- a/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java +++ b/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java @@ -129,22 +129,23 @@ public class ItemRenderingHandler implements IItemRenderer { EnergyCubeTier tier = ((IEnergyCube)item.getItem()).getEnergyCubeTier(item); IEnergizedItem energized = (IEnergizedItem)item.getItem(); - mc.renderEngine.bindTexture(RenderEnergyCube.resources.get(tier)); + mc.renderEngine.bindTexture(RenderEnergyCube.baseTexture); GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); GL11.glRotatef(270F, 0.0F, -1.0F, 0.0F); GL11.glTranslatef(0.0F, -1.0F, 0.0F); - energyCube.render(0.0625F); + energyCube.render(0.0625F, tier, mc.renderEngine); for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) { - energyCube.renderSide(0.0625F, side, side == ForgeDirection.NORTH ? IOState.OUTPUT : IOState.INPUT, mc.renderEngine); + mc.renderEngine.bindTexture(RenderEnergyCube.baseTexture); + energyCube.renderSide(0.0625F, side, side == ForgeDirection.NORTH ? IOState.OUTPUT : IOState.INPUT, tier, mc.renderEngine); } GL11.glPushMatrix(); GL11.glTranslated(0.0, 1.0, 0.0); - mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "EnergyCore.png")); + mc.renderEngine.bindTexture(RenderEnergyCube.coreTexture); GL11.glShadeModel(GL11.GL_SMOOTH); GL11.glEnable(GL11.GL_BLEND); diff --git a/src/main/java/mekanism/client/render/tileentity/RenderEnergyCube.java b/src/main/java/mekanism/client/render/tileentity/RenderEnergyCube.java index 368a69eaf..c4239399d 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderEnergyCube.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderEnergyCube.java @@ -30,6 +30,8 @@ public class RenderEnergyCube extends TileEntitySpecialRenderer private ModelEnergyCore core = new ModelEnergyCore(); public static Map resources = new HashMap(); + public static ResourceLocation baseTexture = MekanismUtils.getResource(ResourceType.RENDER, "EnergyCube.png"); + public static ResourceLocation coreTexture = MekanismUtils.getResource(ResourceType.RENDER, "EnergyCore.png"); static { if(resources.isEmpty()) @@ -52,7 +54,7 @@ public class RenderEnergyCube extends TileEntitySpecialRenderer GL11.glPushMatrix(); GL11.glTranslatef((float)x + 0.5F, (float)y + 1.5F, (float)z + 0.5F); - bindTexture(resources.get(tileEntity.tier)); + bindTexture(baseTexture); switch(tileEntity.facing) { @@ -75,12 +77,12 @@ public class RenderEnergyCube extends TileEntitySpecialRenderer } GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); - model.render(0.0625F); + model.render(0.0625F, tileEntity.tier, field_147501_a.field_147553_e); for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) { - bindTexture(resources.get(tileEntity.tier)); - model.renderSide(0.0625F, side, tileEntity.configComponent.getOutput(TransmissionType.ENERGY, side.ordinal()).ioState, field_147501_a.field_147553_e); + bindTexture(baseTexture); + model.renderSide(0.0625F, side, tileEntity.configComponent.getOutput(TransmissionType.ENERGY, side.ordinal()).ioState, tileEntity.tier, field_147501_a.field_147553_e); } GL11.glPopMatrix(); @@ -89,7 +91,7 @@ public class RenderEnergyCube extends TileEntitySpecialRenderer { GL11.glPushMatrix(); GL11.glTranslated(x + 0.5, y + 0.5, z + 0.5); - bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "EnergyCore.png")); + bindTexture(coreTexture); MekanismRenderer.blendOn(); MekanismRenderer.glowOn(); diff --git a/src/main/resources/assets/mekanism/render/EnergyCube.png b/src/main/resources/assets/mekanism/render/EnergyCube.png new file mode 100644 index 0000000000000000000000000000000000000000..558ed0bc1e80f16ae42397cfe7e8fb066967e4b6 GIT binary patch literal 2954 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 Jcy82;{{Xi+2ebeH delta 2308 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 ZR&fCRxROkP9qa%{M^D>8i>P5A`5!imJFWl# diff --git a/src/main/resources/assets/mekanism/render/EnergyCubeBasic.png b/src/main/resources/assets/mekanism/render/EnergyCubeBasic.png index cd1a4c924fe5af50acf34ccc3f92a05220c9f1f1..d96c1d6cc296ee6b87108876bf86ec6530162990 100644 GIT binary patch delta 1670 zcmb8vYdF&j7y$79{wx|riK5a-)`eXGkYsb2Rj7H+zg3yKwDbvv~#pHLm_{$Ft>C-Bk9}04gVtB|3&i<6ulTk z(cQoebP1?KPXV>)=5n^wHu)7#0RTGgY;Wrs(?6cGXRn^unm?HNbNV`Xdu408hYu~g z5V+=BkIJ5geN?%F)Y6!I{Q#jaRao2AwoXmfYyvMoq^JZ}emm}6iE;$vJ}y4LMowa| zO2@V9>muB}e4k}UMf8=`vE_s~vDKGB-j$m00q~WBQWK~MzyT@^06^fM>L-eQ7aBNL z7|f^FnYpsru(17jc=*Zr$cP9Ai^=T#{B>rgmN!P|?(gqsgzR;7Wt@2t zN#yYP{45(!e}4gWeq?0iE|ty6`*>Dm@>wLBXck#3ZEtT6Th*MJpRdC#E`Bs77PCLi zHJqeSCa04j(87JA5%FgSk2p1Q?%zM5%pVvKUFsetItsJ%^4J<08lbGXf^)FTc|npG z!s0F#QS9*NRL^x9mwb+sxzidOaUzN2B?gO)((@_w9<1NeZ#qmJ!@V#in?2(5(@Eh( zPFh+T-sTP^Hzo$Rc*6j1{$3o(CfUx{&=|4!D(|TNfdQXloTVk=>b;!YT#UAHm0)7Z zoy?U;?hCCFuxnXOnrf|&)!%ZYK*9p4G-yVDzCAE211KmcaILSeU;o4i-{65jqcui_ z7FiR0yk|yKc-#SNrrb_gWlhb{lnIYXYiVgYGslRFi^IR7{7F#Q^8lu}MBm7&FA^X# zb}Ub3P`6R**bV9F8O|)zpzrC!^*N@-KKCy^gW&0jw0G|UQw>TLn7cxiubcSxym~eI zU{D}PjoLv2X@i=Vh*UHpw-vas4`QLw$;}SY z6=>E?e)aY9i^Y0Ji>CXh&jL`u-G~-@t0O?hWpo@(87A%)P7?OoSX(C_{kB{kkMl@& zTC^s@CJ3ps0)h$}w+Roy1D;$kI3&b;PRaY=K|2Tl>p{R0;teuHv9C9E)(WW9I$?!m zIffD*zQXtx07rvP4woCsZB7qR#B&O#Mr)$SFK)7_j@+@4wW&e!rEYre!s1`WA*|1b z9te74R7r|g#Huju21$=}V#uFZT`MZ*(L>WB=QgBIaViA0pKWBrC9L0~usZNysA}uu zP*TtUGK15`+~W5u(~(b>QJ=g&ueLC(ehTa4v=Z*PYI8|T?-^7+Jw>Z=(0dTQL%Yo$ zNDoCO`LIx|dK@8-{7HISNXeXn>%iP%<{uxypEgDMq!fvV2bsg$hK6jrbKv>)%b?v{hJHuZ~5byxhU= z@W(&N6qyuMNib?NkE@eFAmU6toF+|?|isubG9yBH`yq= zGy01^b&4re!QR=GkdtU6$h2#|UeT01)0;vy6KC!OiX$`){*yicjJhgFqPyS~==MQhzNlCgY09ZqwR%;#fF;51T!r8&q JzT7S#{%`9b^Vk3Y delta 2155 zcmZ{hc|6qp7RP^M7$ajz$WoTd9Z`&Z?O{;Jnl)>qFhwIqwh6yMC07|sG1(&&p-IY^ zYndjQlr0a_7+H!e)8m;bOV^S+p6C8~@Ar@MJ?H&BpL5RZe79us_CJk*6ih%46+}QH z3*v?J;A)AuXcrfA#{!0sQNb2OsXzv*UQj1wB!oIuFezjKK?$s4fdLc^eq*X!1pqk2 z(GKmEIQ}ij!tJ2FY%ovcHsuC@zI8EAvr3_)2=~@CQ>IcKRIAj?&%V0o@$fC^fPSL+ zPuXEl;IW7B5e^*cXpdIzL93M;lY1qwJo|Wi+Jpryc0Fc&^N8U$wgpz#Vm^8P{d;yz zI2PN>XE2!#XU50J{lU28)YN6O=6Cb+^O24$YR5Q-Gs@?(nomsG7wH~9?zbJ> z-{0@EQ$9RAT(y}P6{S4_AcqeK?z|U=x`N+ zWc9l&eF-&fB80d!cNS*(-(Kd6$F_d{Jlo3QaOzWje7*BM{&jMYtCu1aGqVSlc_EP| znD!r|;esi*=oz9X{SH29ZuWf#GBEIj_iM@+#3NKz@*0olz8HnWt(IQ7bcy;snL02$ zoYyWn%V02iP%Jdqu|}z`X0W=ujoYLMKj}%#)i@cdRXT-2sgme0)$zVSzVBxp$hW+b zWJ@<}Fus@F%gm`xyn9wpQ%Ro0!UL&OvD~raq~Hmu1v67qUZOr(Y`x2a z;H31|&w)sf0YLX$=gQoP&_4-25>D5#i+*|oPB^t^5yR>?XUZiO9QPknXl!zO1|}5# z`rIRaxU-y0*4$96O+E2mzqYO}W!25qRqI5)_QjE-gL*dVmV3*^Ma2jo`d&=FW~ip&9GV*&V_D<%(b+%^ogv_Z;af;PZ{J={jAMcdT-Yl%myt{I6=zVhs9%rZ_f42{QGC> zi+GWk%TBuSa`dzJD@3B>-PK`m!lYGGYaE9~KOIbEr~b}Hk0ppS;N>yJf6OPvyC?qI zqV5HANTmHP=VjOSq@P!vL`oZdrT@T!;o(|JQn}F3Fkckqp7o(G+G#Zyi&H&8V*BLo zjdx^U^UXzA!{9Hc&ugEWiH+&840u!+gw_WX)z}}4yfmC=m3=j6>7jtW^)rg@EK;auxkUqD&y`P3J?c5V$^|o^xXdk?-pj;EaSyha;q0LnASm%7vUcG702T0zncm zOXwk8+NngA2(tHPLL5%!Y?UVS(|+(t73SCiRr3z3JEnE}$_74RcT_7<*mDy*N#DN5 z?#BmgXI-}?TH0y-@d;aD)&>4*@E?z3Exx4;y$lpJoZRZScbzE$EeWsIuy6-5Bos4? z4U2J+kWYQxpb_kpjqU;4!Kp97a+`daEY0n#yR(44roMv$Dp6O)-0u;c|NT|*>MuJR z7|>pbju|mNPvgY$*>txJ%lYaRq{k}&>b86hCf$68UOAIswjL2ON&pXqKywvx(D`HA z%@=qXkmW9g%bdR|I}C)5!0ubXyLp+e2>np-g?g~RI9xo(yDbtq$DKd=)z1fVctL` z@?1KomFm37`8D+#0kP{;z(hx*SaRqjth7E53s{&DaikBc`HD=yuDCAk1u)2p1Y9CT zG6sqoL~rPf21nb#rVUYLPrbF7#f;k;X&bLRKKi5A-+0KLKtROkK8+tH1 z?%#6gfyS;bs}IV*RV}wK61Kn#{=6ecUZn%NwVw@46P}$Ef7DIKN)x7egbHtPNYSdnE)v@w*|KWu-u*pk!|A^ z#zLo?lw$?q+%V9_Jq2r92^9F(To+N{F-}kPiEQ@c92oJwn_ORse{~onvP;#E5|4IG%L1YqG(l F{|CW_{u2NI diff --git a/src/main/resources/assets/mekanism/render/EnergyCubeCreative.png b/src/main/resources/assets/mekanism/render/EnergyCubeCreative.png index 4b9eb062d1820789719d4facc49a58f0d30c5b8a..c90b056715e99f0db31c4a5d5d918142e0f5fed6 100644 GIT binary patch delta 1738 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 diff --git a/src/main/resources/assets/mekanism/render/EnergyCubeElite.png b/src/main/resources/assets/mekanism/render/EnergyCubeElite.png index 063f76d1def2f309aff940b1a7eb8bb840bf8fce..7c993a8e6d16284c29acb3cbe366f076d3b2c014 100644 GIT binary patch delta 1749 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 LN+n4`5>NaEM%4eA delta 2309 zcmZ{hc{tSX8pgk4GQt?5Wv0YXvV}2eFo>~*Y@H)Z!W2#RFvt?$$?{_&V~xrd<)pHu zCQE6NZDcvtvJ7JEM)uG&NA)|``Qu!@|Gd}xdG7mp?&o^Hi6$Q?_lKknL8Q|>Azo?0 zJgQpg5FbAa3%sc>Iq;&d>t$0z9qApS?BU^t$DJgo5pVsKNIH@mu0dl!3|Oy9Ldl%%9e4J}U>lxU6EC1Ba;w=i(Bm;U_uBYH)}zvcHQSl+k( znjt17G`hNK^FsY9(`I37tH#sH((*dX9|9ff>3J|fr{jA2dV0Pws0yxtb%c{s&J+@a z<+oCkVU$Bvbb9d8JK?>Dj?x61nwm2AE|L^FUn|R+Y3#j9Xh*$OdxA*io2kf&jh;*wOuk@n5E;*Z=(n8O#l0^LssY<{qZ zwWc`R8%f$Ax=-+CtW5p;wILu^J|KmPP%Uk5x0LDk5>;1McdbUO>PsdTRabv5Jg@-` z3l0v}&V`fSbIQ`0slPvrnttLf_~lE1%A!V#iV*_Y@+1d#0RYZ~yo})J|2j+j|zgmzx_*B9Rig zqb@FB*}&xv*?&>_gVa`gl9ZLqCU z6K-v7bu~ud@Ru=GbD2GUEd~`KW9f3g+ir4osIV(ctOL>&)36|UYa&#y?REIZ^${rL zMUbP{H-gt3y{vn1a1KmQTZqfh4PQ5}&i`=%9I$4G!?5ata#Q$YpCgf>=U4z?5z;(+ zF!Gc4n+uxSk|P~`rRXG|nTAqnq~b~?(2h{}01!I1n_kd;xAFEZit2+jyjJs8De+u8 zk9j3Wy8|Jxva(|Qee>&BeSvA>duM|6eEs&Wf=2C-AKm}50u>JmCqvyX+hHm)^rXiX zZ#*Pw88&ni@k&9chlw|$uV^4dE2ngMEK-2;V-yRm>&QY;sqYG>nUE(;YQ!9`xUdHMO3 zPbaamXmb_d1&{_zgf-ASxcRd8cGP>~ASOmh-^Ibrl$DwBj-2jdT27s0V|H4L?^ItJ zmuB^b?a%(M=D$=;t}gju_+Cm+LONr;FHI$TM3Pf*J9s!KEa3R6Qa|L@OK_X|&u^QO zwA^wIibs?Lppcsmp_^tx`y)R*k#RngKxn7|K`!UizU?JZsvL)!J^^6muqH@Mh>9rQ z;nBOLt~CGOPRMmDW0&x9WeKUFo3(tCx2MgKLz8gfyw zE!mJ2#R1eYigFcOzx!Tr03=Cr1a5ZF^YNX{B;rcKlf+)*ZzHqk284E>G zOjgu7_m6Id3FUi~5IZ*m*77?a4hUK{1KF@5F}f$O139bWsI`l|fTQ9x)Ba{boD^E> z)8l<^Z5JEKfa8m(riOUYm-n}wQYZw68-~@N?r~CgqDhLOZws1x2^G#3uh#%<*rYgbNYs23 z|6#^;2hn5HJ2!E$$71&r?x`rZb2)8SC5-5+^=w(plEksmk=c%@<(|5|E2t+x)2z^qw_94 Td9b1n*g2*~mWHMJ#HjxO5xgwE diff --git a/src/main/resources/assets/mekanism/render/EnergyCube_Off.png b/src/main/resources/assets/mekanism/render/EnergyCube_Off.png index ab0c1a48bfdbb3d6523ad383c1db44d044de0cc3..946c86d09d8f6edc80b515409a0ed73067bbfe18 100644 GIT binary patch literal 1242 zcmc&yO>7KN9Dk(|pFy284$lZBu{-l-ceZA9^#3P|DwnMXoMKnfBRQGn&cv23o$mEQ_TSi=6|VV< zoA@hNNw`>}#LW@XUzuKeFQLTiB@Rp^O4EWHJ5AdlMQ>Bk-m+Tkng_6va)|{?{ZY(0 zG{n@T*pfm>5X$M~?Z*py?vIbv?EF+W`nC4j@sSsgw9ku1&VC=AJU=##rXEPo o#-d%H4}+Kf^gqkIeeU2A0UVvGoBA+*F%8&BC)?CZEnP=`0v>*Cw*UYD literal 3928 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 diff --git a/src/main/resources/assets/mekanism/render/EnergyCube_On.png b/src/main/resources/assets/mekanism/render/EnergyCube_On.png index ee63030a094298543cd606575136458dbf02c6d1..e8b82f291dea9fd393e9b7093e4ca349fb41cccf 100644 GIT binary patch delta 559 zcmca3euHy^7*n*Vg{7gXfw7T+sj;!4p{tpbtA(Yrg_)6|i(q+L@zTl#R{s|5QpB$g-oe2W-hKqPHu*V1_luG9Ssf4olT6~EM1IU z4ULV>loX0ff>P70Qu32ab5rw5VCJU)&4=nW!liez5wlbM>L1e{F)%QCc)B=-RNQ)V z?IPzP0}+RdDre1_ykAOmJrHT~zS?*zJ(y!h(@V>MS>KFz)|$AxJlfHvE5N|yz`()4 zsKCI|z(6jio?;U~25=k@!{HF+Rj+p~3-a1^X8Ve*%Q|kXe;ZpjS5EVJ&U81v1+oSG z3)1fHzHj>Y)b;bWx5W3`=NN7&-TnRR?>{C?eP8$ue1oH=rOs!tFVdQ&MBb@08m_!q5uE@ delta 2369 zcmaizX*kq-8^`}+i+Lv7G$rdC=P*(-ri>ZV3=Pg?l8L5JAv=wI%l02jMY2~Ud&)Wn zDNB)^s7YnXo`%XY&q&!~bo6wd>w4at>$%_E-{1ZDyt(h+JF&4nmAeIO4jE!}4&$|q z&=?$EOUnprh{dCEhj1hVZSCzIPf|t()4fle&?S5N`P+LsIFU*E%G=37H#bM!zgf~h zuxUO5PUj3sS~xsb+X#)u82t3(u~-}leGH8z9X?Dlz!@qd{rpckIqN!lIRwz1JpKRc zcii^>%^Lp`n}!iI1bu}mj{!iGLM9nl29GS9H$5qDBAKJ@aj97p5+&(lv;>J%I-)UL zZzbma8;HznmtM_+8}+b6s|wUkO+S&in&lg-F^m+z>L`Ut7$W5s;fpcuYuyx=tK&Jd z*%f91gFj`NYn)=u!d+5#O?hX5!=HRZx%{Nl9hA zfq{Yhi8@$p*rZ9irlzJ1{{o#(r~Sxz{+v7%`n0k#xjS5_$Bga$<%7|{b{mDVf& zN}O*nt3M}x6E1~#zqn}rC_Fs8H2lklEAA5F;sP^d2z;!+zi?!5kT!7p_H-5w zy2L(>dTri&n4RqDYtP#{ zs}!z8&q>AS3BzZ73!(%vj0Yb0Ds!OQuXlUsoXz#GN8?T8R8i_`3^z-bpewC)7@^`i`HNH0?kNed zG`J)1;XpJdq4dPe<47N;X9hII5ZJxmICTV4lOe#En>nj`gkolC4!kYa<*IG+H&#o> zCnjjzyE25@u^^7cVoSO9=ooOwWycA$ zs$~Z0=*IVD5A8q`lWV-N(9n&Nncjej#?Yb)!FBFv?YP>I0ob@w_2h}3c}p|4PNHF> z<#P9OxO6=ss-$G!P-h*k!qOq*?rGwwt*5R&$A%A=VsFKF{Mku8aJ)ul*Up5l<>hRW ze7sToqw@{^#YzV15Qw~y;t@;n zo+N0!6j{iRd>-ZZa}9TUf&v4x#>dZ_V;tJia%F<1ksQ4Nr3r{BdW=&`W4Iv9zOT zSl-LilYJ*Q7u4B`wzrqQ7tGvGsSw;PI#~vuL_@>s(6`V0yU|RVLo_n|;#t*3_s;gZ+*O29$erUgql*W?xm% zp)Boxd-c?ayFo9{9IAm}h^0-M%;PfKzbV#!iV(dEvHbDvb0B7~V7tb!tfFFIW0U;6 z&v^PgPl|DlwWh^YT5$y71|rB*bD*RLU`dHHOdP_t!7=#`vM%a$pmD-rC~) zg-;_ai>_R~)X}+$PAQhr~U( zCmAEy-QN9b?p~35_2Ta|jV)_yiuwwlHTkq4jBr6&s)&%10?H6oja0?pBJ)N>l$=U|I}q8dDVslYB@>SyH!KR=d7xmP*O2$@9&E z*Y`CxL1Ra9V|RGG66q-{-@fxgxueyt`OEV5dOT^TJ|`x@Q?_!Zy<-<2X9U)q}?nty?cg6+(o0ecttEBVR>Zo3Ox`DMI4 zO&qf}7?jURc=6-eFC3;-lb@e|)@v>HZou0vv5Nw0zL9QB`!S!n#)FLE=BRrx)8qpg zefj0-Dt6MjC9W2(r(C6K))&_{zh@J|1czm>oo*6)0ys{-VK-F0&{NsdTyE2XAWrUc z7-ZUk(B^Wvy~IeX+Nk}&L(dzKjDY~7J47Jd3orj(sZL=GY zZ3$!yYPL@V3GD$cmRwAjJi=$+(hnugn^eC!$tPr4*NC-`*iSKnoEYzuyNNJ{n!>Oy z?+@daxTQ_6H_>B4DG-smuM43%-MU{k#)DgwOsO}Cwf^?9#vAxph+}G{bJF+eO3$eY zjVauMVLt=%;i#gSH-cym5mg5agptL75Q32>AZZCiLH}P!>RCI(fB+GnWnu<3H1&Y( NA{&{JDh%zS{sI