From 411b4dac51b9f6620addbc60a8269d6d22e126b9 Mon Sep 17 00:00:00 2001 From: Kam Date: Wed, 12 Feb 2025 02:48:06 -0500 Subject: [PATCH] Barrel Completion --- .../renderer/blocks/BlockBarrelRenderer.java | 20 +++++++++--------- .../textures/models/barrel/acacia_lid.png | Bin 0 -> 811 bytes .../textures/models/barrel/birch_lid.png | Bin 0 -> 825 bytes .../textures/models/barrel/dark_oak_lid.png | Bin 0 -> 765 bytes .../textures/models/barrel/jungle_lid.png | Bin 0 -> 828 bytes .../textures/models/barrel/oak_lid.png | Bin 511 -> 1138 bytes .../textures/models/barrel/spruce_lid.png | Bin 0 -> 785 bytes 7 files changed, 10 insertions(+), 10 deletions(-) create mode 100644 src/main/resources/assets/customnpcs/textures/models/barrel/acacia_lid.png create mode 100644 src/main/resources/assets/customnpcs/textures/models/barrel/birch_lid.png create mode 100644 src/main/resources/assets/customnpcs/textures/models/barrel/dark_oak_lid.png create mode 100644 src/main/resources/assets/customnpcs/textures/models/barrel/jungle_lid.png create mode 100644 src/main/resources/assets/customnpcs/textures/models/barrel/spruce_lid.png diff --git a/src/main/java/noppes/npcs/client/renderer/blocks/BlockBarrelRenderer.java b/src/main/java/noppes/npcs/client/renderer/blocks/BlockBarrelRenderer.java index 71c66c9c8..cf711b7dc 100644 --- a/src/main/java/noppes/npcs/client/renderer/blocks/BlockBarrelRenderer.java +++ b/src/main/java/noppes/npcs/client/renderer/blocks/BlockBarrelRenderer.java @@ -30,11 +30,11 @@ public class BlockBarrelRenderer extends BlockRendererInterface{ private static final ResourceLocation trimTexture = new ResourceLocation("customnpcs","textures/models/barrel/trim.png"); private static final ResourceLocation oak_lid = new ResourceLocation("customnpcs","textures/models/barrel/oak_lid.png"); - private static final ResourceLocation spruce_lid = new ResourceLocation("customnpcs","textures/models/barrel/oak_lid.png"); - private static final ResourceLocation birch_lid = new ResourceLocation("customnpcs","textures/models/barrel/oak_lid.png"); - private static final ResourceLocation jungle_lid = new ResourceLocation("customnpcs","textures/models/barrel/oak_lid.png"); - private static final ResourceLocation acacia_lid = new ResourceLocation("customnpcs","textures/models/barrel/oak_lid.png"); - private static final ResourceLocation dark_oak_lid = new ResourceLocation("customnpcs","textures/models/barrel/oak_lid.png"); + private static final ResourceLocation spruce_lid = new ResourceLocation("customnpcs","textures/models/barrel/spruce_lid.png"); + private static final ResourceLocation birch_lid = new ResourceLocation("customnpcs","textures/models/barrel/birch_lid.png"); + private static final ResourceLocation jungle_lid = new ResourceLocation("customnpcs","textures/models/barrel/jungle_lid.png"); + private static final ResourceLocation acacia_lid = new ResourceLocation("customnpcs","textures/models/barrel/acacia_lid.png"); + private static final ResourceLocation dark_oak_lid = new ResourceLocation("customnpcs","textures/models/barrel/dark_oak_lid.png"); public BlockBarrelRenderer(){ ((BlockBarrel)CustomItems.barrel).renderId = RenderingRegistry.getNextAvailableRenderId(); @@ -122,15 +122,15 @@ public class BlockBarrelRenderer extends BlockRendererInterface{ public void setLidTexture(int meta){ TextureManager manager = Minecraft.getMinecraft().getTextureManager(); if(meta == 1) - manager.bindTexture(oak_lid); + manager.bindTexture(spruce_lid); else if(meta == 2) - manager.bindTexture(oak_lid); + manager.bindTexture(birch_lid); else if(meta == 3) - manager.bindTexture(oak_lid); + manager.bindTexture(jungle_lid); else if(meta == 4) - manager.bindTexture(oak_lid); + manager.bindTexture(acacia_lid); else if(meta == 5) - manager.bindTexture(oak_lid); + manager.bindTexture(dark_oak_lid); else manager.bindTexture(oak_lid); } diff --git a/src/main/resources/assets/customnpcs/textures/models/barrel/acacia_lid.png b/src/main/resources/assets/customnpcs/textures/models/barrel/acacia_lid.png new file mode 100644 index 0000000000000000000000000000000000000000..c5a19df989208c4094613429217cf0493c237eda GIT binary patch literal 811 zcmV+`1JwM9P)Px%%Sl8*RA_jze=9qkVgK_kuUCBk&E}J}`{SAYU5hpK zB%}}+VYG6g=vJ1(^u=cxdB<^Qu`ph=^VXJe7k-5yFO-; z2tEo5Xf5QFSQ*2%wE*0oCN}L$!i`e+l&{uva|0fR2n1ZC2t`n;iXI+EfJ-k3soJJ-3)`xRVz1JwRt zoFk@cN`J1#?bh~_9`RakZa@qHXB4fiN%g}SpXBnq70<~RR#sg~VB0qMB(z4=y1ydBpkU%0v zYfK}bed{&c+<>FcY@9|RJe?>0{L8XG9QbAXNVn2Z3Sr7Pqj^3DjMj83&1ovQMhHb1 zrh+pHP>2*n1Z6Z&^U1h|n;Y`(o*NI@9Bcwv-rmOYb+yH>{+4C?=texf8A9{Q|@!<%Eb(K>J_;H#? zW!Px%*-1n}RA_8{4uS&z?;~+53#8+n9zsrNUTZ=ev4cMh$9Mg_TJM?H z8Xraqm9KegBdbk-w5KQ}TK~N#&DjlDKUk{EOF+EynKuoe zeEPxh9k9BS)HheW*AGC#%&Wt_KL_RqP0O;W@}Z@|g^@-5Uzh=a>j&;u9i~)#_4!Bi zHgbQrWx2=+iP=c(2do=hk%PCt4$BUwzu>)665&JjERYfiHV7ciHV7ciHV7c ziHV6nPx%ok>JNRA_9NHxPzDKAJt#k~2n}th_REjvOQ>^g(wE@JI5S_U2sT-@=Qemf^&#uD7vb2 zhzPpQ3*OaV=Wx~_xj@c{Djz?6zA7jGPb75>cjw5^*Jb0Jk({d#YXO*|;H?2`nCDdg z^A>Ln##+3!O#1kqP;w!7i}#kV5AkX}n-}1A2z>vhe=&BR5`AasyaRf&6jCmvU55d> zwE)&XZSMVP`6f;-_R~@K;ba#n4<7z*R2yAk_#n6)Y=1jXOUd+7WN?kaGDeQ z@FYLyQhULbY+iul7=h~BC>gVQe~dNR$6gR66THCy$K}b}#>(Y+jEc9G;0@gQgA-wSHH%nm!l5# zYCA7NaPBgG+gCe0AA6j;4~8U#vc|ra%?mImWsU_kb+=UNkskUUQDsVr-h0OQbnK50 z!qE35DZpwGRi_}uw<|nXDsK3$miu9_xqo?J1<0qlncjk0UW1M znPLIs8KWXunPTGZys#uivLPvC&0q}2FaNq~OTfYP9 zcR}bZLuY`(%}vk!Y2k1iE^*FNV(9A4VZ9-W;!XIYCI6J|uR&m*mD9Yi?>pY---us+ zC vQ*?}{X1f3Y01jnXNoGw=04e|g00;m8000000Mb*F00000NkvXXu0mjf9>-$~ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/customnpcs/textures/models/barrel/jungle_lid.png b/src/main/resources/assets/customnpcs/textures/models/barrel/jungle_lid.png new file mode 100644 index 0000000000000000000000000000000000000000..171c442c8cdfee8ea086084d070627b68b8bb3da GIT binary patch literal 828 zcmV-C1H=4@P)Px%+(|@1RA_5e41!RdEaYfYgFv}v$tk;2CFe590v&&!AH8*y5oWidLR$pr|5n1{z5 zbz9>~hqF>>W6-AiZR&<7jKC6H>umvT8nXNqrfw*8MccN#eAr?y1a)Ju7lJ5=M&~oR z07jQX?*pu&ki59?^kzNSsDAfLU18C7!f3iv(4Ugst38qL_a2gkaEF*PgKKuBlpAkQe%I8050fQ74p63COWk*U~4ePFS z$P0xd-Jt~{-=owOu5{kAjiV54+HOv0JvyJs1<21iwC!-Gn|>!l-^bJqh0^_SeBIB7 z>`dtU-K}7CDOb9pC@+wm5yHk^yjv-g3-J5yz}-3oEH;lve*D$2T&?&b+OmvYlE5L| zD}-3EKNJXi!7_F^UMij>F8fo#A**nN1z7z%zyr~;+2y12nOuNpAKsHh0hOrH>gmcSl_7n#wdBvjYI9Jg3wZb=?fUGcz+YGcz+YGcz+Y zGcz+YGc$kBpR|)t{f2B|@c;k-4rN$LW=%~1DgXcg2mk;800000(o>TF0000@M!Oyq&9Fxxad! z>(y7)aErGa-l2c+`)@yU4vR4c-L?QkVF-W}AyFXER^z!4V}C6GVGvNQ6=|H(SWVNq z{(WvU&X^XDfUm#%anPK?|7l*YjbHxwlhF4mMhU7mj7I{1`BDQQlaL~d2}7S}7b^fx z#|Z%c&K5myJ8t%}q8P=f+E8gdIG%$G@ZggVh(ezz5D4M-?N4SUcTbDUWFhcyd+q1t zl1V0s!fw3QEq~f-8q>m~-v-5VZ~;65Oyj_{sCA987Nr~9+VF%D5%_4^A_AY0hyi&1 zVvcSdQbf$FnntZ@j75qFV=bvjvDU*U7#z>R1z71CDMA`+i2{L)6UGvr&n_rrH{ld; zE~K#<4@l#b&}zVOnoCOCGR^b;osHGBv?y%`$8&H28h^Fs@%g-eR`n}EKU**!2_{+0 zd07EFmo73vxzauV@v{Z6^Mb~-6j?kto`VZ;_uVNUhW=iAW4aw-Rn-98D<%lx;{mSi zvOJwamL`|@TR3ipg9~t8E-0ix=>{nxly3SyDI#PX(-?=NGdB;2LXRkj09aMk-k4Hp zQW3owOMk#v%WPgTmI;kqA=Lh0RqB+rx%Ja@R$}U;PG-*F<-9H#vwwF z@hBmSL&}xDR5uL4!3DVg@%t2c%#&Hkoh+r8%zqgd1@}IRdS@5HN1K*xGzJ_+9@ChX z>FET3vRd&@k+ZeP^Kwa%N!~j%@aWe;@f>~^u$rX`5P?tNhkWtrgtA)UfYrK2=>}_C ziZtuTES2G6IVX(;q3@%O8o6jG7DU%qb zDu3kWw3y4J@86yXR!XDlt{NP|KX@H*Gqgw1>N{G%5@)$7gYoc7Pq3A5OI#xjXt$v%VlM=yX(V!C{FtM}|Aztq3W zXlG|WZXo|H$I*WQz_n(!P*)E=yA5p!|9_1T0PJ2%E_XM;3w5>s_4!9HKxcyO&eT+Q zSt@1P8Cl!))x8P2OZ@G=?{D69m4EaeAd`f%X+bW#;^wEny@$Uq?mUFf;JRX`FqhA65rAlh3 z>osT7f<)F|K}`$&Bk3s)GwPYwV801jnXNoGw=04e|g00;m8 X000000Mb*F00000NkvXXu0mjf4{#EM delta 473 zcmV;~0Ve+P2>%0+Fn<69XF*Lt006O%3;baP00009a7bBm000id000id0mpBsWB>pG zlu1NERA@u(mcdTKKoEw9l0s8$NQl^Y_W|_gOQ1*NBY5^fJn{&}qr8L{;$2?AkQhU4 zs0#&gX1l8u8pB)`66Z_)%yj!F?d;BW3&KCAW}-8$FHZYG5PyJD3gUJINj5Wgeo(4B zwgis9_waOX(v9#;bV@7qAq<)@dQD(33c5oTcj-l1VM8l!?_<%8!i-oyzykAnN!5N1 z&L<$m)g+>j3Ia&RV|Y&zofB!Mw5Tv*)lVeZ!er}yE_D-~adOM)T1clP$7_0n)=a)O3Y>4x3z|G}ZKf?C?ixgM* z)4ZC8rE~nZ_m8{(4JaD#x2OoKb-4b`*~$dieM_=LxQELs!}W96QU~k~&L<#KQ^>L@ zX7p$eMsKNBisw7Y=5+3pxPC6qCxFiL_@MROy7Y5HB2w%%#STXL0pj|(Y^4KM_cK97 z5O!q=+W{Ou7v~dD;OVxmDr^r6BTYPx%u}MThRA_SRzG5bJ>iHgMlYcwKxoAc&je724zaV+=9CdFz8i*1z`mVFcdS0v8fm zTPol@jqB`j(*yi9EPAai!*qTA!$&aSn->REwN!4fw9OK*5BZ7i-CYG3{WRDAt)J!q zz;Sm#RDP!WFK%u?OchEp)~r>33OFCPachKr^jNF66xg)}=Ofn0Gi}!xd|V8R>H4mI za|6a{X3T6oJ*Fj~uBizzG0kx+j_)}4(>k81)KUYS3rsEm6QTqWdG@Xk;pPTB^fO)4 z0K)n4kzZdm9PjS<&iqN+Su%njCae}NmkBLG+Zj&7jMjz_9OK}zS^?F14iF4*{uIsu zUmbVsJHdy{zCQ5V+;KP_`SyO^&H<;3(6)xV-IDwJPS(C}0lR7(`))Zrwq;|e2741bh7q)g^QWTe(4JR