From 2d73ebdc0a34bae64b8a496315626b8c0b9a395c Mon Sep 17 00:00:00 2001 From: careeoki <122191047+careeoki@users.noreply.github.com> Date: Fri, 17 May 2024 12:03:07 -0600 Subject: [PATCH] Pine Trees + Updated Taiga (#356) * Pine Tree assets * Pine Tree textures * Update Taiga with Pine Trees Note that I didn't make a "pine log top" block. * Update Taiga with Pine trees Now with a pine log top. I really dont liike the log tops. Not that they dont look good just how they would be for gameplay * Add Pine fence and Pine top * Update pine needles * Pine Trees Taiga * Fix line endings for Pine blocks * Fix Taiga line endings --- assets/cubyz/biomes/taiga.json | 8 ++++---- assets/cubyz/blocks/pine_fence.json | 11 +++++++++++ assets/cubyz/blocks/pine_log.json | 12 ++++++++++++ assets/cubyz/blocks/pine_needles.json | 13 +++++++++++++ assets/cubyz/blocks/pine_planks.json | 10 ++++++++++ assets/cubyz/blocks/pine_top.json | 12 ++++++++++++ assets/cubyz/blocks/textures/pine_log.png | Bin 0 -> 422 bytes assets/cubyz/blocks/textures/pine_log_top.png | Bin 0 -> 435 bytes assets/cubyz/blocks/textures/pine_needles.png | Bin 0 -> 459 bytes assets/cubyz/blocks/textures/pine_planks.png | Bin 0 -> 339 bytes 10 files changed, 62 insertions(+), 4 deletions(-) create mode 100644 assets/cubyz/blocks/pine_fence.json create mode 100644 assets/cubyz/blocks/pine_log.json create mode 100644 assets/cubyz/blocks/pine_needles.json create mode 100644 assets/cubyz/blocks/pine_planks.json create mode 100644 assets/cubyz/blocks/pine_top.json create mode 100644 assets/cubyz/blocks/textures/pine_log.png create mode 100644 assets/cubyz/blocks/textures/pine_log_top.png create mode 100644 assets/cubyz/blocks/textures/pine_needles.png create mode 100644 assets/cubyz/blocks/textures/pine_planks.png diff --git a/assets/cubyz/biomes/taiga.json b/assets/cubyz/biomes/taiga.json index 754ca1d3..4a18a813 100644 --- a/assets/cubyz/biomes/taiga.json +++ b/assets/cubyz/biomes/taiga.json @@ -17,10 +17,10 @@ "structures" : [ { "id" : "cubyz:simple_tree", - "leaves" : "cubyz:oak_leaves", - "log" : "cubyz:oak_log", - "top" : "cubyz:oak_top", - "chance" : 0.05, + "leaves" : "cubyz:pine_needles", + "log" : "cubyz:pine_log", + "top" : "cubyz:pine_top", + "chance" : 0.025, "type" : "pyramid", "height" : 8, "height_variation" : 5 diff --git a/assets/cubyz/blocks/pine_fence.json b/assets/cubyz/blocks/pine_fence.json new file mode 100644 index 00000000..641e06a5 --- /dev/null +++ b/assets/cubyz/blocks/pine_fence.json @@ -0,0 +1,11 @@ +{ + "class" : "wood", + "hardness" : 7, + "drops" : [ + "auto" + ], + "absorbedLight" : 0x202830, + "rotation" : "fence", + "model" : "fence", + "texture" : "cubyz:pine_planks" +} diff --git a/assets/cubyz/blocks/pine_log.json b/assets/cubyz/blocks/pine_log.json new file mode 100644 index 00000000..434abd2b --- /dev/null +++ b/assets/cubyz/blocks/pine_log.json @@ -0,0 +1,12 @@ +{ + "class" : "wood", + "hardness" : 8, + "drops" : [ + "auto" + ], + "rotation" : "log", + "model" : "cube", + "texture" : "cubyz:pine_log", + "texture_top" : "cubyz:pine_log_top", + "texture_bottom" : "cubyz:pine_log_top" +} diff --git a/assets/cubyz/blocks/pine_needles.json b/assets/cubyz/blocks/pine_needles.json new file mode 100644 index 00000000..abed5c89 --- /dev/null +++ b/assets/cubyz/blocks/pine_needles.json @@ -0,0 +1,13 @@ +{ + "class" : "leaf", + "hardness" : 0.4, + "drops" : [ + "auto", + "0.1 cubyz:apple" + ], + "degradable" : true, + "viewThrough" : true, + "absorbedLight" : 0x121012, + "model" : "cube", + "texture" : "cubyz:pine_needles" +} diff --git a/assets/cubyz/blocks/pine_planks.json b/assets/cubyz/blocks/pine_planks.json new file mode 100644 index 00000000..5c18d66f --- /dev/null +++ b/assets/cubyz/blocks/pine_planks.json @@ -0,0 +1,10 @@ +{ + "class" : "wood", + "hardness" : 7, + "drops" : [ + "auto" + ], + "model" : "cube", + "rotation" : "stairs", + "texture" : "cubyz:pine_planks" +} diff --git a/assets/cubyz/blocks/pine_top.json b/assets/cubyz/blocks/pine_top.json new file mode 100644 index 00000000..09ead0f4 --- /dev/null +++ b/assets/cubyz/blocks/pine_top.json @@ -0,0 +1,12 @@ +{ + "class" : "wood", + "hardness" : 8, + "drops" : [ + "auto" + ], + "rotation" : "log", + "model" : "cube", + "texture" : "cubyz:pine_log", + "texture_top" : "cubyz:pine_log", + "texture_bottom" : "cubyz:pine_log_top", +} diff --git a/assets/cubyz/blocks/textures/pine_log.png b/assets/cubyz/blocks/textures/pine_log.png new file mode 100644 index 0000000000000000000000000000000000000000..4ad0e08b122407da4290275ff6001c9ec14b94ff GIT binary patch literal 422 zcmV;X0a^ZuP)JMBWt2~JDh@JzZJwg09#XVbbUt8 zq~KUZ@kH@l-|lE_WDQ^{QgEnB-7A?poqGfCw_-n)NgJv?@r!h=RSJ$gRh|wH-@xLX zfund1kI~rkRE@y39<{nYBi>n1*SEW|rm!?V?gE!v!D(nqh?6x*!I|g(eM`YDQ_zay zO@8ZBNq&ah^?Au)ES1x_=XCBFOXau=e}T1;mJ+$2fR;%|r_#q#`F(x2X{6vVblYgi zGsj(E$n%%2<&Na3+Ce3>n>gf|u~cKy{XI_{9wSk_O-nHVPJw!nG+kYXJaf7Awr|I| zk@cdWmDE~l!R;f`|4}?E^{(tu{6CX#zqRk@TZrmegH+b8&y3}d3VlBSpX=@8v5)5< Q^#A|>07*qoM6N<$f~c#^+5i9m literal 0 HcmV?d00001 diff --git a/assets/cubyz/blocks/textures/pine_log_top.png b/assets/cubyz/blocks/textures/pine_log_top.png new file mode 100644 index 0000000000000000000000000000000000000000..e2cd1fb1b589d7e59c6f97567ebf0f3a33c99a8c GIT binary patch literal 435 zcmV;k0ZjghP)Id}y@2J;S$PzvPUV)v5+5_?8q)F#ugW2)S?DF*S zzW-5ji5TS0`0riVlRF~`o440z?6w;`LO*)ssX#w^Xk$_71C(4MiHrNugUDTOIbIPc zxdM@cQWE=@0)RoK50ipWtc`_|D<~!Zs0rlSSfBvPBExsvB4Ll@pyZ0lKEDj#41h`N zreh@lCJObdv>b z>}5RXK8FuOHn%FYu~>^_Qc&pw0K>x*4^WI?HT+D2KOq_X32Tv{(g%FEEvFk}@FxJk dS|q#=_yyMT0$ht4EG7T|002ovPDHLkV1jqZy{P~I literal 0 HcmV?d00001 diff --git a/assets/cubyz/blocks/textures/pine_needles.png b/assets/cubyz/blocks/textures/pine_needles.png new file mode 100644 index 0000000000000000000000000000000000000000..35b3bbd253b846968da5ff515b5b0c50b6b722df GIT binary patch literal 459 zcmV;+0W|)JP)j&8i{u6hD4^pE^c;W_aHKr}2cYK++pz@{&>(FUCCVa2E+$1Xmf57p zRG!h;?=xcnKvL(N)Hz30$^eix1p|O7W5!P;b?(m62LP1RIol5lbyC>w8+52KwFCLh z_Ff)1YGG*-c z;909*_xA+=0y(VxOiMQs05?)o#=Q13*@uN2;rRf`cT|09SySv#{O0FzlPP02y8mpY zHYaEDE@YHGqHnIxQrJaR$}drs^3siD9~Nsr6YxEI@x^yua^HhMlC_^nUiP<6wo{!C z?vf5Q#89V292dIVeSbiH*JYo@IMy$auSni#arg>FHHxOb*V`6jz8q;Zlm$wyw z(GLLZelBWE9IGj&MN6OM0CKy(X}D_6e(Wu6B*ff|+-p#y)%;}wW8UH$-Oy-Ji)#P! z`uzB^rS)0-p7BMh_TzaHT$`Gtx55L#?<&=%LCp?Q}a%c lr{|BdYvZcF{r-VQmv0uq3?Vulb4UOH002ovPDHLkV1gH)oxlJ9 literal 0 HcmV?d00001