From 3328a206e2423ed050592877f1c65e0e48e7ffc6 Mon Sep 17 00:00:00 2001 From: Mike Primm Date: Sun, 26 Aug 2018 23:50:10 -0500 Subject: [PATCH] Add new 1.13.1 blocks (dead corals) --- DynmapCore/src/main/resources/models_1.txt | 10 +++++++++ DynmapCore/src/main/resources/texture_1.txt | 20 ++++++++++++++++++ .../blockstates/dead_brain_coral.json | 5 +++++ .../blockstates/dead_bubble_coral.json | 5 +++++ .../blockstates/dead_fire_coral.json | 5 +++++ .../blockstates/dead_horn_coral.json | 5 +++++ .../blockstates/dead_tube_coral.json | 5 +++++ .../models/block/dead_brain_coral.json | 6 ++++++ .../models/block/dead_bubble_coral.json | 6 ++++++ .../models/block/dead_fire_coral.json | 6 ++++++ .../models/block/dead_horn_coral.json | 6 ++++++ .../models/block/dead_tube_coral.json | 6 ++++++ .../minecraft/models/block/slime_block.json | 12 +++++------ .../textures/block/dead_brain_coral.png | Bin 0 -> 248 bytes .../textures/block/dead_bubble_coral.png | Bin 0 -> 219 bytes .../textures/block/dead_fire_coral.png | Bin 0 -> 221 bytes .../textures/block/dead_horn_coral.png | Bin 0 -> 209 bytes .../textures/block/dead_tube_coral.png | Bin 0 -> 248 bytes 18 files changed, 91 insertions(+), 6 deletions(-) create mode 100644 DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/blockstates/dead_brain_coral.json create mode 100644 DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/blockstates/dead_bubble_coral.json create mode 100644 DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/blockstates/dead_fire_coral.json create mode 100644 DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/blockstates/dead_horn_coral.json create mode 100644 DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/blockstates/dead_tube_coral.json create mode 100644 DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/models/block/dead_brain_coral.json create mode 100644 DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/models/block/dead_bubble_coral.json create mode 100644 DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/models/block/dead_fire_coral.json create mode 100644 DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/models/block/dead_horn_coral.json create mode 100644 DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/models/block/dead_tube_coral.json create mode 100644 DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dead_brain_coral.png create mode 100644 DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dead_bubble_coral.png create mode 100644 DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dead_fire_coral.png create mode 100644 DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dead_horn_coral.png create mode 100644 DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dead_tube_coral.png diff --git a/DynmapCore/src/main/resources/models_1.txt b/DynmapCore/src/main/resources/models_1.txt index 8fa3fc74..978ae4dc 100644 --- a/DynmapCore/src/main/resources/models_1.txt +++ b/DynmapCore/src/main/resources/models_1.txt @@ -1366,9 +1366,19 @@ customblock:id=sea_pickle,data=6,data=7,class=org.dynmap.hdmap.renderer.CuboidRe # Horn coral patchblock:id=tube_coral,id=brain_coral,id=bubble_coral,id=fire_coral,id=horn_coral,patch0=VertX1Z0ToX0Z1,patch1=VertX1Z0ToX0Z1@90 + # Conduit boxblock:id=conduit,xmin=0.3125,xmax=0.6875,ymin=0.3125,ymax=0.6875,zmin=0.3125,zmax=0.6875 # Red huge mushroom # Brown huge mushroom customblock:id=red_mushroom_block,id=brown_mushroom_block,class=org.dynmap.hdmap.renderer.MushroomStateRenderer + +# 1.13.1 blocks + +# Dead tube coral +# Dead brain coral +# Dead bubble coral +# Dead fire coral +# Dead horn coral +[1.13.1-]patchblock:id=dead_tube_coral,id=dead_brain_coral,id=dead_bubble_coral,id=dead_fire_coral,id=dead_horn_coral,patch0=VertX1Z0ToX0Z1,patch1=VertX1Z0ToX0Z1@90 diff --git a/DynmapCore/src/main/resources/texture_1.txt b/DynmapCore/src/main/resources/texture_1.txt index f0ec68ab..de26d1e6 100644 --- a/DynmapCore/src/main/resources/texture_1.txt +++ b/DynmapCore/src/main/resources/texture_1.txt @@ -1978,6 +1978,11 @@ texture:id=brain_coral texture:id=bubble_coral texture:id=fire_coral texture:id=horn_coral +texture:id=dead_tube_coral +texture:id=dead_brain_coral +texture:id=dead_bubble_coral +texture:id=dead_fire_coral +texture:id=dead_horn_coral texture:id=dead_tube_coral_fan texture:id=dead_brain_coral_fan texture:id=dead_bubble_coral_fan @@ -2136,3 +2141,18 @@ block:id=fire_coral,patch0-1=0:fire_coral,transparency=TRANSPARENT # Horn coral block:id=horn_coral,patch0-1=0:horn_coral,transparency=TRANSPARENT + +# Dead tube coral +block:id=dead_tube_coral,patch0-1=0:dead_tube_coral,transparency=TRANSPARENT + +# Dead brain coral +block:id=dead_brain_coral,patch0-1=0:dead_brain_coral,transparency=TRANSPARENT + +# Dead bubble coral +block:id=dead_bubble_coral,patch0-1=0:dead_bubble_coral,transparency=TRANSPARENT + +# Dead fire coral +block:id=dead_fire_coral,patch0-1=0:dead_fire_coral,transparency=TRANSPARENT + +# Dead horn coral +block:id=dead_horn_coral,patch0-1=0:dead_horn_coral,transparency=TRANSPARENT diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/blockstates/dead_brain_coral.json b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/blockstates/dead_brain_coral.json new file mode 100644 index 00000000..3dbacd37 --- /dev/null +++ b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/blockstates/dead_brain_coral.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "block/dead_brain_coral" } + } +} diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/blockstates/dead_bubble_coral.json b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/blockstates/dead_bubble_coral.json new file mode 100644 index 00000000..8b7eafc6 --- /dev/null +++ b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/blockstates/dead_bubble_coral.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "block/dead_bubble_coral" } + } +} diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/blockstates/dead_fire_coral.json b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/blockstates/dead_fire_coral.json new file mode 100644 index 00000000..861261d6 --- /dev/null +++ b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/blockstates/dead_fire_coral.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "block/dead_fire_coral" } + } +} diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/blockstates/dead_horn_coral.json b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/blockstates/dead_horn_coral.json new file mode 100644 index 00000000..130973ca --- /dev/null +++ b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/blockstates/dead_horn_coral.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "block/dead_horn_coral" } + } +} diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/blockstates/dead_tube_coral.json b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/blockstates/dead_tube_coral.json new file mode 100644 index 00000000..50b32ce9 --- /dev/null +++ b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/blockstates/dead_tube_coral.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "block/dead_tube_coral" } + } +} diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/models/block/dead_brain_coral.json b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/models/block/dead_brain_coral.json new file mode 100644 index 00000000..10fa3f16 --- /dev/null +++ b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/models/block/dead_brain_coral.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "block/dead_brain_coral" + } +} diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/models/block/dead_bubble_coral.json b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/models/block/dead_bubble_coral.json new file mode 100644 index 00000000..3883a06a --- /dev/null +++ b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/models/block/dead_bubble_coral.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "block/dead_bubble_coral" + } +} diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/models/block/dead_fire_coral.json b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/models/block/dead_fire_coral.json new file mode 100644 index 00000000..5e93967f --- /dev/null +++ b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/models/block/dead_fire_coral.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "block/dead_fire_coral" + } +} diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/models/block/dead_horn_coral.json b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/models/block/dead_horn_coral.json new file mode 100644 index 00000000..1ca098c9 --- /dev/null +++ b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/models/block/dead_horn_coral.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "block/dead_horn_coral" + } +} diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/models/block/dead_tube_coral.json b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/models/block/dead_tube_coral.json new file mode 100644 index 00000000..efb4dd0e --- /dev/null +++ b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/models/block/dead_tube_coral.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "block/dead_tube_coral" + } +} diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/models/block/slime_block.json b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/models/block/slime_block.json index 54b74d6a..95f92bdf 100644 --- a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/models/block/slime_block.json +++ b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/models/block/slime_block.json @@ -18,12 +18,12 @@ { "from": [ 0, 0, 0 ], "to": [ 16, 16, 16 ], "faces": { - "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, - "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, - "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, - "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, - "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture" } + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "cullface": "up" }, + "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "cullface": "north" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "cullface": "south" }, + "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "cullface": "west" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "cullface": "east" } } } ] diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dead_brain_coral.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dead_brain_coral.png new file mode 100644 index 0000000000000000000000000000000000000000..29c082cba085083e39a67e243a377b9f35fbebd9 GIT binary patch literal 248 zcmVT<1b9xHG0uV7IoHn zA|pn#n#nt-^hhcjzXV5PvsI-AqM*ztCaWj0uW=TBC`dGpDk>v&UYw(;^u)5eWW^xk ysi6&sCY6zS-R=8VX3oqebrrkLnfG}B0000$u5jQstsu^?P@-vaa+9`c{wrJaG$!^dz<21= zwk}E5f&4#)bf5N0BG~~|g{ms2tV00F&zZxs-W72C_REs2tuyz#!a@Z~Tspp}>b8H> z03aEK0u+^z7%Mx-+sKB=2LU8Suoob{I!JE;h|k5r#S8SIxvF@EEuL|_<9PqI6nm$2a26cg-JF~R2M6z2i4chKS=2&lsrj@CM!X#RwwCxaNc8o!1J1{xFUvfg z-?@Hr!X89Sh@}E_ai^|rieet$3ZRO(8}<}a(VGZ`{7lIgfh;_V(Dl(#-AOLA zFkYA5gal$QL3?<9T@6#Qd}8X9HRF}v@Y;Ze=x*Lh)EWR8*{E=}k*p!M@|mpvKn-&M XKrRw%{iF)&00000NkvXXu0mjftJYn@ literal 0 HcmV?d00001 diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dead_horn_coral.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dead_horn_coral.png new file mode 100644 index 0000000000000000000000000000000000000000..3c6744f780f5cdb1dba8af2a9a9dafc4a9311ca5 GIT binary patch literal 209 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Gdx`!Lo8084O-3DV8C-nT-l&Q zQlyEcRmoA|hyRIA?_Gs=4_{nz^U}Axw`&#uTey}xS;)8wXSQ>s?9XD&5(;|0# z;amnbh6e9Bldj(_3~5r?(cCikWT8NaC(~53`P0`%*j!{iR#4B#x-)^{wqHQ-A6Bs& zW@}$*#j6G-?TY6TXjTc__(*TV0jp${CmgZeQ@C%XZZ)lATrAJ@GDUWg2GETRp00i_ I>zopr0BM#{SpWb4 literal 0 HcmV?d00001 diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dead_tube_coral.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/dead_tube_coral.png new file mode 100644 index 0000000000000000000000000000000000000000..8ac8ed12d8b7546471e1c0d16f271d35ea107b07 GIT binary patch literal 248 zcmVBxr-t|I zIraNpu}vTpQT(`%r5Fzg=G)gp5#}_!@g{)t@lcBK8MmOTbmTi;FU6!IC`P=h35gVr zyN$jHvY=!UlT)~)l_1ir)R!+HdYjBktJ;7B6Y<$BpuBC)`@Fsl3DWA36df{)C(r!0 y)WZS(ka6_`sfAlfq218h#W$wfIWadhPtONW8)5rLFZS^O0000