From 30349128f3b4e13321a865c7db691efbea88d108 Mon Sep 17 00:00:00 2001 From: Calclavia Date: Sat, 3 Aug 2013 19:43:10 -0400 Subject: [PATCH 1/2] Added GUI for multimeter --- .../languages/en_US.properties | 1 + .../textures/gui/gui_base.png | Bin 0 -> 3682 bytes src/resonantinduction/ClientProxy.java | 9 +++ src/resonantinduction/CommonProxy.java | 9 +++ src/resonantinduction/ResonantInduction.java | 15 +++-- .../multimeter/BlockMultimeter.java | 19 +++++- .../multimeter/ContainerMultimeter.java | 43 ++++++++++++++ .../multimeter/GuiMultimeter.java | 55 ++++++++++++++++++ .../multimeter/TileEntityMultimeter.java | 18 ++++++ 9 files changed, 162 insertions(+), 7 deletions(-) create mode 100644 resources/assets/resonantinduction/textures/gui/gui_base.png create mode 100644 src/resonantinduction/multimeter/ContainerMultimeter.java create mode 100644 src/resonantinduction/multimeter/GuiMultimeter.java create mode 100644 src/resonantinduction/multimeter/TileEntityMultimeter.java diff --git a/resources/assets/resonantinduction/languages/en_US.properties b/resources/assets/resonantinduction/languages/en_US.properties index 30ef50b8..b7706359 100755 --- a/resources/assets/resonantinduction/languages/en_US.properties +++ b/resources/assets/resonantinduction/languages/en_US.properties @@ -4,6 +4,7 @@ itemGroup.resonantinduction=Resonant Induction ## Blocks tile.resonantinduction\:tesla.name=Tesla Coil +tile.resonantinduction\:multimeter.name=Multimeter tile.resonantinduction\:contractor.name=Electromagnetic Contractor ## Items diff --git a/resources/assets/resonantinduction/textures/gui/gui_base.png b/resources/assets/resonantinduction/textures/gui/gui_base.png new file mode 100644 index 0000000000000000000000000000000000000000..5f91f63c4b41ad4a87be9838b9bd7c97a57448f4 GIT binary patch literal 3682 zcmb_eRa6w}7XAm2Zb@M{AdPfN!wj7QgEZ0uB8^gt14xO2h%|$s(jlP(NDYm|P|_tW zAb2GNCFbI}_t~}XUFYFnd+&$;TVL#l9e=|}n~MAjIRJo4S4YDX0LVoP0i?ti#n!*r z?V^zR>R1H;K;8EHLF$t|cK{$a_JG50+;H~^^a*hH@#WNo!#REZecU|mxB?J7gEm7V z%r=>nj}{JK`f;ci`aY(Nq@1R(1QbIupAZ)rtzH~g{xqXW8=a;m5nFFw9ARQ2>ItKX zFy&+NDUwyLSBX)t;~w{&EQP)HoM<{)A3T3Qsj^YNkFFge!IDy@=}4K#peRdV9CV+f zdOEw8Rz=k!$a#DLEorR_SHKxJ1RRGeDP6mYC20YW;4unPfHlm*POL4&9rr#+KrbK|au7#TpsHy{494$o+Af*K2CUMb%fG7+& z^m20tgGZTwL2J)K>HD=x+6|!#r!s4l8hGS2BWy@T{75V;L^%X-y3E%YWE}|{v(!Y} zLo!(XfvDo+h?Tu#svxe#Ewbj)ry-t{oW1q!? zb7cE1ti{=#pW#ZUM~9zVmU$v1?IN^^jz6~#92gX^4?QP){% zmyZD0YxHURBtS}ta*tXX3c`O=J=4zP1t>S&=Y9a#Yw(C7`f62sNCD8uix8?(XFF(P z5yld;w_TcRqd0YteFWp_Y=_ap$X!tE{tklWkuZUn!78YbgV-lEs5I8ZJtoDMTD0A~ zo?6+L=9eRBZks?;1R0TfFX?4Ru9-N9(_>5SL{jF==wq%n9U}S!9?p+(3?^6glVx-y zOdlgS&2^xA%KilMv9?+tk`;S_WaMc~leWZ*h#C{+Pn7TB4aIU-9%;Rz79Q%cZM5^|eW3f< z$>Jm_5o@U<%soM$bXklxEDqi&$3q_vm*j7FMxa~$1~E!Msx|6u%DpLEk}a)sg*)Zr zjEiRtiTn#;&TGBVtLW8^RjF0BRjxf7agKPr zOy`U95p*(1*073vjOkmG*y795ceCUNqnLE{3o2fvj$LtQc0clX`z7!L-FzyCQTnjO zX#b}6m-H`$2SJonF^o|?aYzByY!(t0Bx?}M+YEz3*0BWE9)!4@#CFC;CQYV~xup}h0U6cRwohE>OFe=w*1=2B-|zRhS{{)d=YsOlcBQ0 zVWnuPX8~J&qef7xchPP}Zi_uC*TAP}A*6ZZ7yARTGsKzKucAY3N=xEeN*>}_N*s$) zmyDl}5>%{b_PYt(u0su8;F#)|zVs-$VMOWmxYkoGnkOFJwktdTT~UKkicwka1hS**JLV&%q>i;}ZHjod661w= z;D~f$M%HyzcI>7!r#$%Z;OUt%303Sgbs5we8XoY@pF!cK!a^1*FoB*7}9cx zc4$g!1#`Jyu+sx=mOZA8WJWdwMD52V#Op`)i>9lHX0vtA_cpKU1s?j@ErpIAqO)tW z+joj*-|oupdhEu|y&RB!DVS>|6)@b<3;%4gHlj-LGF9Aju{_)uZXAJpzrii$ES79h zFEcRhl>Bp6_phwxdq7ut6Kwd*t*`je&Y_G+*{F$@Q2)Z7knsw1Qelo zAxOgb2=xdXf|KLW`&_MwstU8NKWe6T)Su)vs57c3MOH+vwN-Gr_kMj=!F9BeflJ1D zP)FYg|1vR5;<)aZ&=F3_9~~QQ5u=*u8)tcCL?T@#Xk-o^u&D7%BTZu=8!2Hd|5ij# zMo6Vp^tRHB+z06os@`AK z`MCCj=pv>PQF>v8G&O@bqw6pJrA{kU%=CnJ?{W}tB6&zVv>ka>Y(#b>ZVGNI#9_3j zBV-u*{A+TPObAbxRDtkX!z2EZXH5oF2J_hpxlCF2IK3p56`CcYo+m%^gOzd_reKg; z$aS}S{pGIFHRoO433Xx|sU#mgYoC>0vJxT3zzV-0tOX{8NNSL-7H+MB@qO}XWx3Y| zcLr+vW}nIBe0z!Cp>L;OdX6cG(YFwRTCO*j-sF=uCfA~mxIsl##2dr`;uk`8cXa-}njC2*s}Q|?#7B>r&B(D7fQL1#T≀Hi* zH0CsBRW{gqHtdErzYlXe+GNX>!_6NwhkR$kPmJfvE6+FYhx#0K9UU$*&4>H*pW*r& zr-S%+E1Ha(ZXKxYs87S^W5-o(&gZ7S%{{!04a(aenbSTZj*c2SPd-edfnQ3>OzMxJ zirLP+t|BkLtm=QZd0GS?av9>wWj=p(-e1YgBo=-=zCDQ>$r#B`-%C$v^}1hhwuRkh zeLLIT-p$eSF<45%{@~`xPFv7i5cJ#YMH=JP`*aj;SF4p}YW~q5$}bzo?r4+!Y64%K-p|3;>vYp5N-y0)X(Tu7)}yc;@Te zh{uW=Eoy1H!+hGSm@ewq4K7otsZ|Pz_G)j$UrnPSgW-#2Fb9I|FWROKdTv@88iH%z zFG-6^C750Bc5OXAqE*{&!P{$o1`lmd?`Pe$o3G|z9P5FO4_SH7t|Q!Mqz&olB!+5x zB4!j(t*w6F;XM#Q1Zcs<(e)2C{~XeP8PNi5KmbSqCqRLJs`;Ogu!^?1Xa5RswZKO@ zvN%~W1q_6Q;CAi>6tr-I6OtRw>^+ugUF-q&xwT%|*T%X3MD(``HJ{vFLY5e=Zol$# z-t`Q4ww{K|MUtnr!EIWc0oED&Vcf(2i7CLv&5!kEAW79jAakclqUc`YQ?&)iA3Q*T z>jbnQ4=ziPId;m9bLM^~KR8rP_r);iH_?u6wt(9kQ>3fVKTm&n z=%;*6&rJuF#0o42P&K!-?ZYkUV-|bB@%k$s5*H^> y@P>Qoa{aL}DHvY*qsRZ>o?O5dhyeibctX&ZF_AUi;~;l20$oibjY^n9 Date: Sat, 3 Aug 2013 19:46:13 -0400 Subject: [PATCH 2/2] Fixed multimeter gui --- src/resonantinduction/multimeter/ContainerMultimeter.java | 2 +- src/resonantinduction/multimeter/GuiMultimeter.java | 2 ++ src/resonantinduction/multimeter/TileEntityMultimeter.java | 5 +++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/resonantinduction/multimeter/ContainerMultimeter.java b/src/resonantinduction/multimeter/ContainerMultimeter.java index 298a956b..df3e66bd 100644 --- a/src/resonantinduction/multimeter/ContainerMultimeter.java +++ b/src/resonantinduction/multimeter/ContainerMultimeter.java @@ -14,7 +14,7 @@ import net.minecraft.inventory.Slot; */ public class ContainerMultimeter extends Container { - private final int yDisplacement = 0; + private final int yDisplacement = 51; public ContainerMultimeter(InventoryPlayer inventoryPlayer, TileEntityMultimeter tileEntity) { diff --git a/src/resonantinduction/multimeter/GuiMultimeter.java b/src/resonantinduction/multimeter/GuiMultimeter.java index e8a2c549..cd6ae138 100644 --- a/src/resonantinduction/multimeter/GuiMultimeter.java +++ b/src/resonantinduction/multimeter/GuiMultimeter.java @@ -32,6 +32,7 @@ public class GuiMultimeter extends GuiContainer { super(new ContainerMultimeter(inventoryPlayer, tileEntity)); this.tileEntity = tileEntity; + this.ySize = 217; } @Override @@ -39,6 +40,7 @@ public class GuiMultimeter extends GuiContainer { String s = this.tileEntity.getBlockType().getLocalizedName(); this.fontRenderer.drawString(s, this.xSize / 2 - this.fontRenderer.getStringWidth(s) / 2, 6, 4210752); + this.fontRenderer.drawString("Energy: " + this.tileEntity.getDetectedEnergy(), 9, 15, 4210752); } @Override diff --git a/src/resonantinduction/multimeter/TileEntityMultimeter.java b/src/resonantinduction/multimeter/TileEntityMultimeter.java index 200c601a..250eccb7 100644 --- a/src/resonantinduction/multimeter/TileEntityMultimeter.java +++ b/src/resonantinduction/multimeter/TileEntityMultimeter.java @@ -11,6 +11,11 @@ import resonantinduction.base.TileEntityBase; */ public class TileEntityMultimeter extends TileEntityBase { + public float getDetectedEnergy() + { + return 0; + } + public boolean canUpdate() { return false;