From 9394ae9ac1aa5ec10b0c8e215fe611ca9f294e36 Mon Sep 17 00:00:00 2001 From: jsrobson10 Date: Wed, 16 Sep 2020 17:22:02 +1000 Subject: [PATCH] Added more ores, fixed light based heat sources --- .../display/DisplayLighting.java | 2 +- src/projectzombie/init/Models.java | 3 + src/projectzombie/model/ModelChunkBorder.java | 91 ++++++++++++++++++ src/projectzombie/settings/Environment.java | 2 +- src/projectzombie/world/chunk/Chunk.java | 6 ++ src/resources/texture/item/rock_copper.png | Bin 0 -> 2719 bytes src/resources/texture/item/rock_gold.png | Bin 0 -> 2726 bytes src/resources/texture/item/rock_iron.png | Bin 2722 -> 2722 bytes src/resources/texture/item/rock_tin.png | Bin 0 -> 2750 bytes src/resources/texture/item/rock_uranium.png | Bin 0 -> 2713 bytes src/resources/texture/list.txt | 5 + 11 files changed, 107 insertions(+), 2 deletions(-) create mode 100644 src/projectzombie/model/ModelChunkBorder.java create mode 100644 src/resources/texture/item/rock_copper.png create mode 100644 src/resources/texture/item/rock_gold.png create mode 100644 src/resources/texture/item/rock_tin.png create mode 100644 src/resources/texture/item/rock_uranium.png diff --git a/src/projectzombie/display/DisplayLighting.java b/src/projectzombie/display/DisplayLighting.java index 41c06d9..eef2798 100755 --- a/src/projectzombie/display/DisplayLighting.java +++ b/src/projectzombie/display/DisplayLighting.java @@ -242,7 +242,7 @@ public class DisplayLighting Vec2i tpos = new Vec2i(x + lighting.x * 16, y + lighting.y * 16); // Store light level data from the image - layer.setLightLevel(lighting.p[i3+1], tpos); + layer.setLightLevel(lighting.p[i3+0], tpos); // Store temperature and humidity data lighting.p[i3+1] = (float)layer.getTemperature(new Vec2i(x + lighting.x * 16, y + lighting.y * 16)); diff --git a/src/projectzombie/init/Models.java b/src/projectzombie/init/Models.java index 703b19b..b5316c2 100755 --- a/src/projectzombie/init/Models.java +++ b/src/projectzombie/init/Models.java @@ -4,6 +4,7 @@ import gl_engine.vec.Vec2d; import projectzombie.model.Model; import projectzombie.model.ModelBox; import projectzombie.model.ModelCactus; +import projectzombie.model.ModelChunkBorder; import projectzombie.model.ModelCross; import projectzombie.model.ModelEmpty; import projectzombie.model.ModelGrass; @@ -217,4 +218,6 @@ public class Models public static final Model ENTITY_ZOMBIE_F = new ModelVertical(Resources.ATLAS.get("/entity/zombie_front_moving.png"), 4, 10); public static final Model ENTITY_ZOMBIE_B_ARMORED = new ModelVertical(Resources.ATLAS.get("/entity/armored_zombie_back_moving.png"), 4, 10); public static final Model ENTITY_ZOMBIE_F_ARMORED = new ModelVertical(Resources.ATLAS.get("/entity/armored_zombie_front_moving.png"), 4, 10); + + public static final ModelChunkBorder CHUNK_BORDER = new ModelChunkBorder(); } diff --git a/src/projectzombie/model/ModelChunkBorder.java b/src/projectzombie/model/ModelChunkBorder.java new file mode 100644 index 0000000..4c64bf7 --- /dev/null +++ b/src/projectzombie/model/ModelChunkBorder.java @@ -0,0 +1,91 @@ +package projectzombie.model; + +import gl_engine.texture.TextureRef3D; +import gl_engine.vec.Vec2d; +import projectzombie.init.Resources; + +public class ModelChunkBorder extends Model +{ + private static final TextureRef3D ref = Resources.ATLAS.get("/gui/pixel_white.png"); + + @Override + public int getSize() { + return 16; + } + + @Override + public int getIndexSize() { + return 24; + } + + @Override + public float[] getVerticies() + { + float w = 16; + float h = 0.0625f; + float f = 0b10; + float c = 0b000000111111111111; + float o = 0.5f; + + return new float[] + { + 0-o, 0, 0-o, 1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 1, c, f, + w-o, 0, 0-o, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 1, c, f, + w-o, h, 0-o, 0, 1, 0, 0, 1, 0, 0, 0, 1, 1, 1, c, f, + 0-o, h, 0-o, 1, 1, 0, 0, 1, 0, 0, 0, 1, 1, 1, c, f, + + 0-o, 0, w-o, 1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 1, c, f, + w-o, 0, w-o, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 1, c, f, + w-o, h, w-o, 0, 1, 0, 0, 1, 0, 0, 0, 1, 1, 1, c, f, + 0-o, h, w-o, 1, 1, 0, 0, 1, 0, 0, 0, 1, 1, 1, c, f, + + 0-o, 0, 0-o, 1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 1, c, f, + 0-o, 0, w-o, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 1, c, f, + 0-o, h, w-o, 0, 1, 0, 0, 1, 0, 0, 0, 1, 1, 1, c, f, + 0-o, h, 0-o, 1, 1, 0, 0, 1, 0, 0, 0, 1, 1, 1, c, f, + + w-o, 0, 0-o, 1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 1, c, f, + w-o, 0, w-o, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 1, c, f, + w-o, h, w-o, 0, 1, 0, 0, 1, 0, 0, 0, 1, 1, 1, c, f, + w-o, h, 0-o, 1, 1, 0, 0, 1, 0, 0, 0, 1, 1, 1, c, f, + }; + } + + @Override + public int[] getIndicies() { + return new int[] { + 0, 1, 2, + 2, 3, 0, + + 4, 5, 6, + 6, 7, 4, + + 8, 9, 10, + 10, 11, 8, + + 12, 13, 14, + 14, 15, 12, + }; + } + + @Override + public TextureRef3D[] getTextures() + { + return new TextureRef3D[] { + ref, ref, ref, ref, + ref, ref, ref, ref, + ref, ref, ref, ref, + ref, ref, ref, ref, + }; + } + + @Override + public double getHeight() { + return 1; + } + + @Override + public double getWidth() { + return 16; + } +} diff --git a/src/projectzombie/settings/Environment.java b/src/projectzombie/settings/Environment.java index 8e802c4..06ae9b9 100755 --- a/src/projectzombie/settings/Environment.java +++ b/src/projectzombie/settings/Environment.java @@ -4,7 +4,7 @@ import projectzombie.world.chunk.Chunk; public class Environment { - public static String gdir = "./"; + public static String gdir = "./run/"; public static void init(String args[]) { diff --git a/src/projectzombie/world/chunk/Chunk.java b/src/projectzombie/world/chunk/Chunk.java index 9c7db1c..3a1e991 100755 --- a/src/projectzombie/world/chunk/Chunk.java +++ b/src/projectzombie/world/chunk/Chunk.java @@ -26,10 +26,12 @@ import projectzombie.entity.EntityParticle; import projectzombie.entity.EntityParticlePart; import projectzombie.entity.particle.ParticleBreak; import projectzombie.entity.tileentity.TileEntity; +import projectzombie.init.Models; import projectzombie.init.Tiles; import projectzombie.model.IModel; import projectzombie.model.Model; import projectzombie.model.ModelChunk; +import projectzombie.model.ModelChunkBorder; import projectzombie.tiles.Tile; import projectzombie.util.math.random.RandomHelpers; import projectzombie.world.layer.Layer; @@ -428,6 +430,10 @@ public class Chunk implements ClassBdf model.setModel(Matrix4.translate(c_pos.x * 16 - Camera.camera.x, 0, c_pos.y * 16 - Camera.camera.y)); model.render(); + if(SHOW_CHUNKS) { + Models.CHUNK_BORDER.render(); + } + return renderEntities(entities.toArray(), particle_pool, upto); } diff --git a/src/resources/texture/item/rock_copper.png b/src/resources/texture/item/rock_copper.png new file mode 100644 index 0000000000000000000000000000000000000000..d6ae3dc12af73cf27878db55905142d3616cce28 GIT binary patch literal 2719 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!uT1gk&Hk5D_z(L0}S!XKGG?2pWkKXf?~&wTi~{IulnwfuYEXRlp% zjKyWL=BeGi=l-w>ODpi7Pv;CjrknBnxz>&=;rAWSeYk5LGndOSVyCRDRLIL^uPe)6 zaTtC&Dw+T6+{2fbC+sZX?^cf~DQ2ry*4Xi;W~ab~v+811f2JLeS8sjpIO7yca*Kam z<<5GkKl;;mzqeCVTFCZUYOl`!dMaSw!i)|{}L{?r;U*t54^f< zbg?Dw78n0{#?LJ8r;0xLWWe0Ov5)m&00XmKpn%sC<6J?`l$^DSlV*7u5* zTi>smzFY2E&sF(#{|`t>X8$oTeg5>YR8{P`+bm~`lqMS+9GiHcVjhpf1sluHUWT7i z@`|2uD{Hn0F7e5`v*4tJMvwT$J0&}+4Zlb4vAlTyQSbj=OY@b#?PnA(c;|kv?$E6n zzhmkpq9ZK~zcSt|XJ=T*xBYoT`qQAAJ&OZGt}L{gC+4;OoOzby!bNA;6wYVsyxME$ zGHti%4cjn#>y1bGe)p9ruU)93@@EUz+k0P+>}v2E)Y|%7S_8`BKOw%twM*^<=pxi*%58!854DpEM z6|r^gR6)57o+4ES%A%<%wZD!Y+dIi6qHNlMX31$m*G!JH&(M4+dho)blT(_wzOQUt zk>(d5EAHT=q3j>?;%#`}l)g0G*bPfIOf;Lj(tg7BgtAp}-Z$62(7njg-~43igTqCS zS=%&2vp!n?|9evK`k94!f7_?F@R$7icW#m}Z@uRAj~iH*XGNARHArE$k!Us1J-6uF z+#?AK<{rJSdScbl*?nD}!mX!RnrcrT@Dq@!UHkm+TRFRZ;W-;a-|dyIj+^8;C8gOR z_4y}>b4H8yXx`W%ePh?FbsWyUQ|L1Ak zIv=FZO~32ac`o_Fx!WPB*Z0O+-zxlip>=8Ll*vz3*mvF1-c^<&y7JB2r=l0MpXF+_ z_FrvM^u74O&LctiUgfm!0me>@`aAXaebc*k{NR%JTV7wkSh&sisgKt=u}9yV4q4bl zF&_J9IOD>U-HD<7*Is+YOy7`REBU)_f6L}XOQtH%OSMn$d97<}UL`72W9oNuo!ZvD zvQsx-teW$u*MGwIwOg1Etap+PdlXnc=WVP;bL!;6+d>I4kK!ykznwLEdyG$V!!^|t zO^>(SH}$>#OEL8}LsZKA?R!3pEo&?^^KuvYcEi#oMm18VE8Y2&FL+Uy6bap9sMX`GI^;PH>rl zyr_H1kNwLoC>?8lT(@WU_Z`*j9AAwtuQ_0`;N`ZNUPq4ll!d;jbJah@q0o{zGxFFR z71f89``$f#{5rNLy>kBV;+89Ojxx;musO|hS?!*}yn9=C&;33k7&ayJQSl?g$$B1t zPLv*fYJRR&joZdJX<6{+BZ5gAFC6q@-@It0pueDdsPFO`#mAdYRd#Ov+FuzxORFaJc)2%m3p#F{ttg$ zdG=Fv^*c)vWL{Ji&gmCiP%WNuMdtbM8--Hp4gV!~T)O?wOLoRjmA%)lEpm6LklwK) zFZ+~S!A@o#8_7+Y=BoC-iu2j;oqsWVlf!@A3)`Q4yLRjNOXdm7)=e@$a8S`8YQdY* z{_^i7-@d({8CGwv%v;pHR*a32fq{W7$=lt9;Xep2*t>i(0|NtRfk$L90|U1(2s1Lw znj^u$z`$PO>Fdh=gj0ZpRgmY{u8j-~O!b~Fjv*GOb0^-+6ZRBo+rMhvy*Jx-t1C7b zdIzYe=%od^NvX8B6(3&xiOq)XyN8EIAd8A$&YZm4p|P>2V_G&!9IP)dIk*3X{i82m zL>}8d)^X1Ey=?O1-lb~yMJg*#ZMZf`h4Y-{v7a;6=50K8*=M~P)~ryJn4(5dBxj3UdaO(`+{8E!{5$vkXM-XNCDv+VuPHG-*9FMso%blLRM z%)`Yg_PURn@S3eMAxeI)+7|!j*EnT(|MB!2uGzZBj~`FbTYgH^h|T?a>6$QYKRMYW zfu>7WE!*;z_x3xs=Q5YK-0EJUAvT?R&-V@+S1-+*zfQbAFMoVhUV!JRuaCIzR&^Hl zSyvujA69HWvu1L}Vp$zUmM?h@PgDKoidsCsFq===%;Gsihv6qo!kFWwh(trDJ?N|Tz^ZNZqFKhg!rS7TxJxzf5AbZFQ+sJ7j&v%Q@sjbpTdb2a` z{RF28UY-mtlNR(o{Cm9L#@_N_#lMd3?(=WXh|R1%|2lmAj+a(7964VaCQS x>Nzu2r1IS4n>?DT`u~6Q`rf`IbMJ9H&}*WY``|7S)}QDBj$scL`xnvF%yi+}uGeSUIH&Aeaj+mB7JD`%64WqiNk z{~6!s=3h>~W{z(Db-gaUq@`QR=yaCBnyHe#Ki{eRs{9@t;{5eiZ-{qY`PR>M{BwWo zSX6$Z|7CK@-?#Uyli0k14YUp78=LCqrB(}kyIT-$qp5OcvB3O!Pd+3?+?mHPLI1Wj z!>{s&eGNIf-#hHm@Z;M>pJWncEak9_z0 z*6wUW#*0h3KApP|c|ReE{mH|hIuB3nV14^1Ml}56S^f#ee?Q1xU*N?PmghcE&2-nx zs(a0BF+DYf$7WX+RQ&Qf5mVW6R#lyIPRXBZNqST>6hQ;e;rmO1jxsWeH&yD(_! z(g{hErUdzEpWG@_bY@cUxt&jDMRTf(X|8+{8kME z3%6R|`8dt`?oYk)y|)v6Bmb8DWxwVT`M7>;pxToXkvcq?~ciw+=*7K+Cy&v~y6nF3X-)zbL zYTxH?%-O|PcYZY3wzwd1*QEvfnHx0twm)x3e;if2XK{eYlZ9sU#e(u9^Pd@6|mR^`m+p7;Lgyy&BaQP;P`cKlp!9V4h;Ep~iYxZAt@CBLV?IODc?YLj2GD<9|i zHP^hquka2}5to(D6SqNKT{WBNWaH}5|xKp9FO(;0@)~Oxe{5V1*w|<`7tu|LhFE^j%UCL|=J|`^) zxy)**#rt_y=S9tY$T)k61Ao>M#oi_BUoR?nuOKMaEyOb86Tjx0w>ymdB3gN+zn8d( zCx6}c;TX>iCC#;VA)Z0@6YFB`gcT^vh?~Wxe|()rh^iKwDARA{5V_lYt2j)zyUu$( zRe7rHRmquMS$A`KTH2Y`OTXGs_QRNU*St{k_IE1M=lx!PSY+}!-EV{J@4X7EI^Hc` z|Je7=xAz7MEZ4u<9r!kM{pOye4x{gzKWR9Nzp6`krI%{cDUt8rgjLcn{`>pZ zMCFRARB|>RS`^t4aHi*8-3PC<>Zd<1|G!!9?$s9SKQD_Z(Xlj{J*8A=(*<8&ov)F@1#`Kc6Z(~;a znJp>0@#VRgv0r@k*?(=Ff1?J8%L8FM!AYL@)q|75*9DpA2>qbPH% z+LGpHo@!4+CN8|(zxb!?)6^3yoF*`?F}tXlATs;+k+EBoVjNLAfBxxZJ+MEg;9Lekz6?xrb+x`LNy zwdzG2jw##8`c*Xgrlfw~s*_bqm#+M6b92_I)X<|@5f=mwo}1hond3N3YP;^5$q&5v znD^)0JQ$=tIV|d!WZ}F|>sW0bF3D`4GFc(s^X-zlxh+>7tU8oj#PdofU`q2H&6n;s zr^~S`td?y_;Qe>c;#MfbH*;aHZ&mW$lfoGo7+W%(odZ0bonf^E14G4}+KILvhaF^& z#$WD|-%_%nxx=~TRf=QCk-*gfEnEx3GOiwca!Ehq(u5^DEV$OOvfGQT=F>a3%W4N# z(*yR7$%`j1>Ynmr|FR28$C@A4?b-c(M>RXgSEI{o4p=OBxoxJ`k)u9kp>OJ3^$&3< zv?R`qJT^x~^`YgycMl)Gj_paWod3JH<;t9+4D&r~PV-z=yQeVk-WJ|-zmEupO$mKe z{K#;!p2wdPrAMEdpKDd)wlPjx7X0~$VA9452ff%gFIp++FX$fXySzs6@upLi-J8SK zZMtUrle^inHg)D}llBP*l%^>-wlryZX&iRz37adzt$C}z`Um^$y3QD`on8q~A{Vf5{z}ZvXR=o$*s;@3m`- z+#M>UckIZ^J|$PMlbOdxa+9XHs=cq`eD-_iU(DX*@L%`B_GjO&-8%k~dBU=Flgtks zR5XZM@TRoC{Cml_Z|`S@)!Qrc7PYSxV`F4sU|>t~c6VX;4}uH!E}zW6z`$AH5n0T@ zz%2~Ij105pNH8!ku$OrHy0Smv6kuVKK5oa5!@$5)>*?YcVsSckqIbWvt4QnqRqN_* z-hFq@hpk}F1jo&%*jgQxgt`Qz|7rbKuxIVO>M?=6^Lc9d_Smaeza|(aM4r4Ed$;&q z`4VkCeSO1w#^;T;T-%b{Ew8({T*YhBDxPdz&q)vFB+om4^CjPFo3}}gB2EV3U752^ zbTP>*dNdlcsfwPnT(zo+Bja#f`I5?mSzDPjJ;VH`am*A*c464*;Zf_7qIpZgEqmi* z4@>Qpx2Emwv=EuS+tf=lq(fk?a*IRcv@^43mAUDhmb9}_%QifgaBL#KRN%6Sg)$yl zCok}OxHw%lxl-D@b=qXFBfBy!e?Q}NwR|4YpCrF_>zw)XC-0o26@EfOruKeudHM09 znL<`lnJc)Wx0xeSA$o5QD_%O0vd+w4}c zaKgdLy!`x5!$)(HXQ?Iiv{%|j{Huum@a~>Xjcb3!`-Yt(ESS@trR=h7) zX82zH*R}f`YfHe2vwwBd`~3|UGcGtQdS3oL;|)H}>wDd1x8ME$Ws9Bg3t5INlUeIt zckE<$c+WVU>BIN0e-$|%{B1t&E8Lyc_DyhWjGmy=g5Un_RpIVO9zUoTat&+&-R}cHhraU#z=-EctoihvW0>1n;j6ONl)8KL4ITlERM$uEpx7jp}N@cJ04sFKXC# zC+C}oqQ_Dd1|`o6$38s2DypxiXAy7v`0;W6H)r`~R-eybAHVr+bqxnkm6NBZrmBMpwUH@0@C5O6ciOy&ChKclL3=>rvm?Q2FG~tBq-UCsi>y>}x4!-145GmhtD7 zGwQ##e`T~2e_Jje!FH6RSDxLYj;-GD&$f-bvyy0N%KFJ+4b|6Q}+Em-?FD{C|37LZ8AJGDL(Gme766m zQ|B%B?KrWlTlCMPl`%UEXU_IN!=(5{BYzWv-SkWO_rEZ&Y;ue=P-ltAxvRG7LcMo% z-p4lv{vYl|I;xeKGIVU%en7G);Q(8aQ)5m_pUVNm#sy60Z&t2LXmHta*z+6T%_JrD zdDY3jOH8M?GM~@8q9&lIw}T^ZLcGH1>c+Z7{ucrS)#F^6Ts+-2O?lA7FXYsbD7I55 z_Df(=hvBjr$)0*YRWz5(2s*Vg|e0FsPt<1%7w>f zWvyH4Xm{2;bK%ixQF%*?%Vkp+waZn%+Bw}ZZ9x!^eM*aA_NeMRkL4>53D5uX zWO>ZBDOdBa*C+H&F^%&%TlsNQTb%G?L&wc?PCVi1*{E(Hr_L;3;(snj>3yYx^lZEJ@)3M`U`U9Qj@-2dl}*3SP{M9 zkI(lrHZs3ozEbD1{Fm8c{5bV|(){n|R{U)>sr&fshDN&j^2-quoex@veZC-3`nu=U zqU5t%j#%ktq`X{kCF?5hROU0Cr_(cLZd=_~8`;dJHASX>Blk}Gdot0J^i`&}yiM@F z8-tEE- ztK7Bk>Td89`m(@{>y*cjUHW|Q=BgYj+QcH0;iA!KvC2HVb^XW1t@Di7r`B_M-3b@` zvE&=e)56=rPLh#*3%B>a(2Tj5wNF8EOH8 zR<2O5ZR&sD`cBL$*~$|t+brh3ayfzLN~hwFrP?Y5WX z`SF@}&x#VCZMROX@($6A<#H2w!LapWy}OBg{%6~J0cAN8)&@_SJaqw+s-=X(>Rk)I zuU+i)(|5mA_VI(Eezq2Go?Oe{Xz_kuqEUWqu5j$%Kf5k6l?Oez^jZ7-nP{CG1r^&} z+n3lH-^^V3t#6wOv)B8ZtI~XLJ(%$H)Sc|d9SYk%PC3T=&2{!(&hi(=%LQ>d}Uc z`i-r(p83a<2pi|npI=TbuUxF%b@^cU^e_*F&v!Yi^t+zTWe7Fj_iFa9b|=qS3p`v} zz22MICQ+czGdlSquwpkXH~vavuwXR z?YGh&8TD@+59b{GaozpuUoIQ*Vw2UP>MrqD`%O$3pIf@l4yZ|)*Hp=uQo&-^6}aH- z#@h1>XQzKJKJn@}r%+19ThHy^W=x*1D}T1kGM=Mo#Glb`q7P*s zi?8?l%wG3IY32dXq`r%f#EVXZToBk@|FhCcdfxJXiT;nh_wQtG(d*xSzkb=G&)mO$ zZhi3P;j8O)%2rN`+WJyWUtB-e;#OZS^mohe*Z}9sH*RMp-HTnjrT)IJy4|`LZ!ahR zl8UUK{k?BOLs0sePcDb8^XD(m;s3Lb`(4lS&pnmr+LzDejk_oB&v0V;2fc=GvJ3PT z=1=?S@_(D%f#r+-{$oD9LSo^^#|@9?AFNlXyL}_R|3&hGTVHf#_C9}O^!&!fsRE4| zA+C|d7b3F_HZm3c*XiCNl;>t`TOWQ*b=wWLqFuS$9%boSGihJm@nDyB-mZ^(W@i@| zURcm#9;p2POQ-*ol|Ro4>zQjd?tRA^VBRT?)mVG+Lf8cr0ueY=76haM7@Ska7=w5r< zr9SohrD^pQ-)0=Ic)zAVt<;pEV}to&$>#?fdQUKl&-HaVY571yVa0*sPmNj<1!t~2 zRAGG|*e}GncJD^Do#}dpu2FYa_$oBje&M{Mu-_q!gXixOg$n_R=No4#tBW0;>HWpf zrO$BLj;IX zyz^73>{UUUXz%N~c`)t4qcDhi5i=86J8d=q_dSNkcelc3s;^ z<8vmd&m#4*Prcgy+J3{cDW+93qCQ_r<=v~cH2KilqC?%r25tu%KW>p|SddwmcC^)@ zd*{)aXIqveG}TYuv%~PN?lFf%iN1{{Bwwv;+7!=vItM;caoRd4FF*f1K!b|hTyw@=rO}rGeM7VvwF!}kNuld^L39m zxh%^)cq!)H%u35q|9RJXgi{a|3^OU;be^BYE+hxqJMSUHMqwN1Sy| zzOvSMRd=81<(87DD<_^TxRQ01cPjH4&;IilHr-xV#r0IuBtY?bNl)yF!yljBcvPdf zQzeIec1iT!is~od_ zo!+4IY0>3rk25ayE>`4NXDi&@GGnS)X0rRE060U_D5|h^ zhb`~HzUENdsF(j3Z*O$q&swse=g9isj~?9fJak0e`#_^xi%`ens?A|9r0kh`kbNgjaop>x!b=%|MQSGR+;zyqFU(qtzDE?W`Yx37+c}rFoS1vj0 zdPLpB?#A8?0Sk*xep|ACuVzqhp1S+Ly5|p?=ggh&Sya1_|6$eQgIm&$-&w4CWXkb- zdy`fM-8p;QbMO4p6?=Zy+~?Wa)wzqZBjU}Y9{6#^RMkD5 zS=r4h-S=SoiwRrO)hczb9^9>avg1BY<=eMwixbn#_kKIRFUq*b8BqFo^}dz$ z8dLm)MLJgmY~1^`T;5ZZebvvD&!20%Z!}&vD?M9RIXk>P?5lg&zco@-240D46&JZO ze0yg&;j+*ZE&u)J82)RAyWigt&b8NGVr{YBm(#naIbYc~;k>x(pC9#o8{X}B)AnX* z+T7iTo^QBaRL^05ywf(xBHiHM*TB;KOy`fvoXtAgsTuOsxlQeX)$%)PBJwkrC(L7( zlxyry63M8}xnKO^+0DN)n|>8Gu}DT$Ke;AX{Au&k#W&AA=WgV`oEOLOcWUTOfkUzO t&rNI}C;!gpiTZNRyVf$Bfq}6lbF&58UPcan7GdQJpC$D-|7Bmw1OS4HB|!iH diff --git a/src/resources/texture/item/rock_tin.png b/src/resources/texture/item/rock_tin.png new file mode 100644 index 0000000000000000000000000000000000000000..c4689edc13ba1dc395f4c9ecf24b4dcbaa00c771 GIT binary patch literal 2750 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 literal 0 HcmV?d00001 diff --git a/src/resources/texture/list.txt b/src/resources/texture/list.txt index 16da499..dbd6e72 100644 --- a/src/resources/texture/list.txt +++ b/src/resources/texture/list.txt @@ -55,18 +55,23 @@ ./tile/rock_sandstone.png ./tile/sapling2.png ./list.txt +./item/rock_gold.png ./item/log.png ./item/rock.png ./item/stone_shovel.png ./item/coal.png +./item/rock_copper.png ./item/acorn.png ./item/clay.png ./item/stone_pick.png +./item/rock_tin.png ./item/ammo_box.png ./item/plant_fibre.png ./item/torch_lit.png +./item/rock_iron.png ./item/stone_hatchet.png ./item/flint_hatchet.png +./item/rock_uranium.png ./item/hemp_seed.png ./item/shield_upgrade.png ./item/grappling_hook.png