From fcaefe2d2853651f05d83105ee1c7deba104bb9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20G=C3=A4=C3=9Fler?= Date: Fri, 16 Jun 2017 23:48:36 +0200 Subject: [PATCH] Adjusted BBF GUIs to accommodate to the new 3/3 layout. --- misc/vector/bricked_blast_furnace_gui.svg | 175 ++++++++++++++++++ ...GT_GUIContainer_PrimitiveBlastFurnace.java | 11 +- ...GT_MetaTileEntity_BrickedBlastFurnace.java | 5 + .../GT_MetaTileEntity_BronzeBlastFurnace.java | 5 + ..._MetaTileEntity_PrimitiveBlastFurnace.java | 4 +- .../textures/gui/BrickedBlastFurnace.png | Bin 0 -> 2608 bytes .../textures/gui/BronzeBlastFurnace.png | Bin 4387 -> 2345 bytes 7 files changed, 195 insertions(+), 5 deletions(-) create mode 100644 misc/vector/bricked_blast_furnace_gui.svg create mode 100644 src/main/resources/assets/gregtech/textures/gui/BrickedBlastFurnace.png diff --git a/misc/vector/bricked_blast_furnace_gui.svg b/misc/vector/bricked_blast_furnace_gui.svg new file mode 100644 index 00000000..cf9cd5d9 --- /dev/null +++ b/misc/vector/bricked_blast_furnace_gui.svg @@ -0,0 +1,175 @@ + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/src/main/java/gregtech/common/gui/GT_GUIContainer_PrimitiveBlastFurnace.java b/src/main/java/gregtech/common/gui/GT_GUIContainer_PrimitiveBlastFurnace.java index 3dcb56c0..5798d671 100644 --- a/src/main/java/gregtech/common/gui/GT_GUIContainer_PrimitiveBlastFurnace.java +++ b/src/main/java/gregtech/common/gui/GT_GUIContainer_PrimitiveBlastFurnace.java @@ -5,13 +5,16 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import net.minecraft.entity.player.InventoryPlayer; public class GT_GUIContainer_PrimitiveBlastFurnace extends GT_GUIContainerMetaTile_Machine { - - public GT_GUIContainer_PrimitiveBlastFurnace(InventoryPlayer inventoryPlayer, IGregTechTileEntity tileEntity) { - super(new GT_Container_PrimitiveBlastFurnace(inventoryPlayer, tileEntity), "gregtech:textures/gui/BronzeBlastFurnace.png"); + private String name; + + public GT_GUIContainer_PrimitiveBlastFurnace(InventoryPlayer inventoryPlayer, IGregTechTileEntity tileEntity, String name) { + super(new GT_Container_PrimitiveBlastFurnace(inventoryPlayer, tileEntity), + String.format("gregtech:textures/gui/%s.png", name.replace(" ", ""))); + this.name = name; } protected void drawGuiContainerForegroundLayer(int par1, int par2) { - this.fontRendererObj.drawString("Bronze Blast Furnace", 8, 4, 4210752); + this.fontRendererObj.drawString(name, 8, 4, 4210752); } protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) { diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BrickedBlastFurnace.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BrickedBlastFurnace.java index 34c11dad..b7540576 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BrickedBlastFurnace.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BrickedBlastFurnace.java @@ -49,4 +49,9 @@ public class GT_MetaTileEntity_BrickedBlastFurnace extends GT_MetaTileEntity_Pri protected boolean isCorrectCasingMetaID(int metaID) { return true; } + + @Override + public String getName() { + return "Bricked Blast Furnace"; + } } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java index d5fcc018..9efff211 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java @@ -47,5 +47,10 @@ public class GT_MetaTileEntity_BronzeBlastFurnace return metaID == 10; } + @Override + public String getName() { + return "Bronze Blast Furnace"; + } + } \ No newline at end of file diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PrimitiveBlastFurnace.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PrimitiveBlastFurnace.java index 9e3a1e83..81912be0 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PrimitiveBlastFurnace.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PrimitiveBlastFurnace.java @@ -141,7 +141,7 @@ public abstract class GT_MetaTileEntity_PrimitiveBlastFurnace extends MetaTileEn } public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) { - return new GT_GUIContainer_PrimitiveBlastFurnace(aPlayerInventory, aBaseMetaTileEntity); + return new GT_GUIContainer_PrimitiveBlastFurnace(aPlayerInventory, aBaseMetaTileEntity, getName()); } private boolean checkMachine() { @@ -321,4 +321,6 @@ public abstract class GT_MetaTileEntity_PrimitiveBlastFurnace extends MetaTileEn public byte getTileEntityBaseType() { return 0; } + + public abstract String getName(); } \ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/gui/BrickedBlastFurnace.png b/src/main/resources/assets/gregtech/textures/gui/BrickedBlastFurnace.png new file mode 100644 index 0000000000000000000000000000000000000000..558db61062a4983ec41b2de0788f1a56e3f8615d GIT binary patch literal 2608 zcmc&$c~H|y7Vg9VL6Be#Fo?kb>i}{eNE-_pR3Iq}&M-s!8{W)7(vwy5xwY7h2S9QJD-PPas-q)|Y z`ohs8_$`}tHUj{*cpN<73jhpqVF0NJnGkYiG-MDIR}X(A)XpJK`qAbBSj}uBgj#JN~K!Fo{pzPMkGdAkjOE`^G-U@#s?k;_WOT-Q#fi( z8hNoz@$JKi8R`=s=9Iyc5OkU0`J_vEg)&&mHIoN_-qhP@qptTe%O>&gXuY9(j^e>@QOqws&{UG&nf_SF{CV6^9}c>w>!Gb(fnRZP99?^~FhP_*Ydub5sl- zvpQNo{%D7s;k5u}$*Kz}`FtP`o)E>Dxq3VSi{-XcIn;ST4tD;d(^aLaXTwfWZhA6y!s z8SB|6v^ANO%F7|F?NSEcosN6=t;I&6Dhz3sx^QZgF72C2!=P$s^uS31eWFviZi^DMK2x!|iYvxji4Gu>3 z=W%3dcjd&J$5X+zROGT|`b)BTLgU8AhRT%XNBQ1Ku*<$QZ=yNbEFpDG;O--wiPbGN z*hIvLo!g|PoT|NM#9hyBDpZDz2fXOK?X2k6b%X2gE(SbTBL6l`HhW4^5(xpm(%j){ z%(@LlR6tvwpPZl-LYkQAUrvkgYi`EJpzw0qs{ysS!YE`-_mW$o1aEJLmlyQzFvkozwa-CFaBv~d6 zT6Wh4)t(!z)&W}cN{r{OpT%1TaPgdbvlW@|@h}EPmuc3kSH>|#)2wNFL@rLH z=WBQ_X3?08?0HNI9bervS#=!QBWVf)UI7C2vaWhu2NNQ^N=hrjC*kP&&n&cwH}>P` zZWeEZjXE_eB@+xjbZN>Z*YDeb*f9dL@$hS?l;Ilo=#eBCDm z_`6-44Q}D+5|$hS)LCx9JUqfz_ zyB(f*j>noCk~&NsJAmTmyCexr;@oKjcLY5+Ko>i@O4i&8(AB961-MK11FSF;JF|M_Ae9l8nV-nfYuEhm+p) zCgIzv8ndQ^6;%d>}Fci>w9FMe0 zxzfFF8I%zzS~O2M$hCRv38ESA~n7TC8DV%I?Z!h$1^jjO~9uV=uoCl+8f80&d1A5HVB$RBF;AgZ& z0d%~dn3#|x)#8r^U|K}MJ)NYDhf4}t@K(eC+NCzQW%RVDiKQbK&2Dr*M7|iHC+e}= zmc?PMDQw|QZ6}R6Ks+x@8Q%MtWGaZRF6$gImERD~!MKP{zjU#IXuI^aSggaUt~Sd0 zmF1v-1IAvpZ=ZK9i)>5v08t@3o6D)DY5~J1jg5_c1J%@NN{RBxtMPa}3b1N@`O>4Y zsR>>8A|_!0bvAT3Nvv*#pkGW;XzeK*O0Z)Z!K4m@>cH@%8f;b)s66yqB{3Wrk92l+ zR_xjEvrr_HT#P$De29wi2@eVJ;;dL=aiFM7)Ws3s+P??=qG1_}N4;%X^ol{XU+pu6 Qes{pb{m229EAjl_0V}w6egFUf literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/gui/BronzeBlastFurnace.png b/src/main/resources/assets/gregtech/textures/gui/BronzeBlastFurnace.png index bac737bde864ad3b20e0e5acae3c293e3667a13a..9642624d6eef00296418b5113a44041d59f84198 100644 GIT binary patch literal 2345 zcmaJ?dpOitA3wjJ8HS0b&|2i4DeE%jb$R77mfk3gVQCgp_W{z zbkfs%htilLMgw83rbw0(pz1u`UHwlF%nWVyF>cpZ`gq93$i#@RXgs6rp%%YwBr%0`}r|O-(nj`x6gR;Qs2piLa8EUOGO%#k&c3_&n}`A;v2W6D~H!5+*;vC*8MZsihP->g#-tED2BcP z0RfG>1O1-5hj~ji)E|{@^o8(SR4Ne&u(BXcvH*;>cFxK^$^6)(k2WB0><86PFD38a zVL5;#jKIdW)5FoUYR+i86~HZ{?;uIN5p}aS>SpX5K!g>2|E*hrtO@#Ii_Tj3k;8UX zX(Vfqkfd|Y29SD>fy6D;Q`GL|MgPilA#AEfdlM0Yo9rd(AjN(FRx$Q1d z@7RIjN@cEIC@m@onyl%!O~)s6v#GOl`khZ;o)(-!caAK#wIx!;MLqUr77#84)#-mZ z%e$}RYH(I*_j<4#?fA7|mcZ=!p6Zon4*bHAkDj=c2lm_ulJu6jAhrg1k21_?S%&xD zd&;Cqw^qjU{B;Wa(l27x16O+DVBa3Yj|p=EvFDk@q>x6AL~kQpZf9%rJk+B2ocX>N{a9pEjP`fGn4IyiS*Tgd{y z!1~4rdc4auHz2K7>w%4W5?Rr-ElhccimhS2r@qGNC+-c8XN%b*YOZNEQG-d1|uqr<#j}2I2L^)JLv2;yf~T#w;{4_DmJA3(Dy&RtuNxNmG2lTv}YmUp3pZMjeBSW)GA=!!D_T(-hDXl zL`Q7j6KJaV<_azzlsQbrvN{Tm2H3pllAST|kZdK&pT^63=iOo;Q7@)YHE!SREFnzl z23GRM6R+&iSLk(At4J(3g?Vx6J2o~&eE6JU^9Is2Y{$idVZoEwNaq8XIcpVV@Z+nP zU%V(50O_?L5|^;|;E|*5j1$eIzTyNLgzKN!Q9UJI2Q;=VyIJv>DisibK^KhE`RQsL znRBs}^-yq3#}~piWAf%GD6p;e_}EKL1&EtU5P6GNp2Rk5gY-a!yTG2iNNaKnUzC^u zwYY9_edV#*a1;uts46}LGysGHa07?9Q6mUik1u4TFT9 z#ktb>Om)X>_T^*HY9R%9AU6fGibeo~-)igcA_VQCT;j_Zo?iu18}zqdi_df`$}ZA( zap9cpb2$Ap1K-+ypir2B=SV)u-cO9k@_#4|0E;g8HP~S-Y?3Y(4p#Ut(m(6L06iE3 z@TrBUsKV*z2OND6+kAw4`*qO-O}u0+ra8l|HDlxR41DhwX8oDrH{<`X)Bp>AjTOgh z5d<0d9AhkexngC|W)A92=Ph$Z7luay zKwc{G-aMPinUb1;wgx0>XxutY1*m=P(t3)BZ3P~g(SL`QD!Ju6E~CX*@u5k+Fr;R1@w?Om6G?Jxl6 zr!_rS10qdIUWZS=}5p(;Gjm zic;_IeQn1&x0pQi7-z331_sZP8;5y=bi#-6tH;s#h72Svtq%FL$~B%s(Q822k2i$?4<7sv)qZ7O5OQfhXnV`&N50XM z<=H7L$KcyKTUvI!FAFo@@Jb-v?TrNg(d6b(II&88u@dh+(8}6wuGLMX`|h8Cym{{M Kaj*K8bnaKi?#;#k literal 4387 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%0A0Bj{Ciq`9VIms#oVT*2s@L4tcxG17 z0&38BNZr;}nI2cvo{k^JoG*)CMI6o?axaIIc7Z+{4$hM+TDAxMb(G+ZS&C7yc%sj; z%}o7$`r%K1X*f{249Ba9m`En!53kTx(i&*HvP1Sq_^m%(`LQqK$dHDAiR8*;>@U=` z|Kppr-d#rkTb}TS5|?+sDcfJ6^ZF%o{79jUf&`i@LwIEqKCid$+JtWnBloSbuZr`1 zPb}Yi>vRyl13JvlM2+qnUmt%6-W_?&3a_vK$T>9$T6~J675A@lgWS?nE&5~9$?&h7 zzGgBj_^R~(S>a&pah^)rpOZt8w1ZU7uM0 z#nees+%g#H$7=!|_H&tn2K?`9UIY)pyQaLx*Cz`1>iRsH*5Fpw)iQZA-wr)C`j`e{ zf$qjJ#F9HL=$i4IE55Yvtpvfc(l(8qTOAkNVM+!kQC}xO(z)w48A=Z>!&P+S9^h;UlzrfBjnvO= zgpB5{HS)lI)MX$+mpLX*iNmMI2LF6tF}*r^U(4yP(|P>!5+<4bn(z6$zq(DcdPb;V z2>J9QbY|s9)nJS;4=^Hk!&=b3bb zJ|^)FH?5k>`4$6cMpp0Y3CwpehWJczY;Zhb_@O5ys36`LrUo`c-U8wQuH8bhOT7N~ zgnI3aB4P;BQ106^{q=wfFH&gn0vT9qM4T&IP%zV_Lq(rzKAL2e-3{);$I3MlTL}{` zd9EWOUb4VWpTeGTO~(JPhc z6!>V3b<$%B74R;ukrNVXkn0jMxCz;1!GD&Ag(6H3u@Pchw9p;6Xp`3n-&hbdKGWxc z1~&To)q^|O2W0pwcRnd*;@-PViW3eUMgeWhJUs6!-=lKQ1{vpDagPsZQALUS#A*gz T?Z(Eq@4(4^