From 4fee9c3e55ced5ce7bf38cdd68a58c07b9f41c25 Mon Sep 17 00:00:00 2001 From: Mike Primm Date: Fri, 26 Jun 2020 01:13:09 -0500 Subject: [PATCH] Add initial set of 1.16.1 block definitions (about 1/3 of them) --- .../java/org/dynmap/hdmap/TexturePack.java | 4 +- DynmapCore/src/main/resources/models_1.txt | 38 +++++++ DynmapCore/src/main/resources/texture_1.txt | 106 ++++++++++++++++++ .../v116/BukkitVersionHelperSpigot116.java | 10 ++ 4 files changed, 156 insertions(+), 2 deletions(-) diff --git a/DynmapCore/src/main/java/org/dynmap/hdmap/TexturePack.java b/DynmapCore/src/main/java/org/dynmap/hdmap/TexturePack.java index 8ddf4861..8159d2f0 100644 --- a/DynmapCore/src/main/java/org/dynmap/hdmap/TexturePack.java +++ b/DynmapCore/src/main/java/org/dynmap/hdmap/TexturePack.java @@ -1718,11 +1718,11 @@ public class TexturePack { } } if (blank) { - missing += blk.blockName; + missing += blk.blockName + "\n"; } } if (missing.length() > 0) { - Log.warning("Blocks missing texture definition: " + missing); + Log.warning("Blocks missing texture definition:\n" + missing); } } } diff --git a/DynmapCore/src/main/resources/models_1.txt b/DynmapCore/src/main/resources/models_1.txt index 21cb863d..d348db11 100644 --- a/DynmapCore/src/main/resources/models_1.txt +++ b/DynmapCore/src/main/resources/models_1.txt @@ -1623,3 +1623,41 @@ patchblock:id=bubble_column [1.15-]patchrotate:id=bee_nest,data=0,roty=90 # Honey block [1.15-]boxlist:id=honey_block,box=0:1:0:1:0:1:1/1/1/1/1/1,box=0.0625:0.9375:0.0625:0.9375:0.0625:0.9375:0/1/2/2/2/2 + +# 1.16 blocks +# Soul Fire +[1.16-]patchblock:id=soul_fire,patch0=VertX0,patch1=VertX0@90,patch2=VertX0@180,patch3=VertX0@270,patch4=SlopeXUpZTop675,patch5=SlopeXUpZTop675@90,patch6=SlopeXUpZTop675@180,patch4=SlopeXUpZTop675@270 +# Soul Torch +[1.16-]patchblock:id=soul_torch,patch0=VertX04375#0,patch1=VertX04375@90#0,patch2=VertX04375@180#0,patch3=VertX04375@270#0,patch4=TorchTop#0 +# Soul wall torch +[1.16-]patchblock:id=soul_wall_torch,data=3,patch0=TorchSide1#0,patch1=TorchSide2#0,patch2=TorchSide3#0,patch3=TorchSide4#0,patch4=TorchTopSlope@270#0 +[1.16-]patchblock:id=soul_wall_torch,data=2,patch0=TorchSide1@180#0,patch1=TorchSide2@180#0,patch2=TorchSide3@180#0,patch3=TorchSide4@180#0,patch4=TorchTopSlope@90#0 +[1.16-]patchblock:id=soul_wall_torch,data=1,patch0=TorchSide1@90#0,patch1=TorchSide2@90#0,patch2=TorchSide3@90#0,patch3=TorchSide4@90#0,patch4=TorchTopSlope#0 +[1.16-]patchblock:id=soul_wall_torch,data=0,patch0=TorchSide1@270#0,patch1=TorchSide2@270#0,patch2=TorchSide3@270#0,patch3=TorchSide4@270#0,patch4=TorchTopSlope@180#0 +# Chain +[1.16-]patchblock:id=chain,patch0=VertX1Z0ToX0Z1,patch1=VertX1Z0ToX0Z1@90 +# Soul Lantern +[1.16-]boxlist:id=soul_lantern,data=0,box=0.3125:0.6875:0.0625:0.5:0.3125:0.6875,box=0.375:0.625:0.5:0.625:0.375:0.625,box=0.4065:0.5937:0.6875:0.9375:0.5:0.51,box=0.5:0.51:0.625:1:0.4065:0.5937 +[1.16-]boxlist:id=soul_lantern,data=1,box=0.3125:0.6875:0:0.4375:0.3125:0.6875,box=0.375:0.625:0.4375:0.5625:0.375:0.625,box=0.4065:0.5937:0.5625:0.6875:0.5:0.51,box=0.5:0.51:0.5625:0.6875:0.4065:0.5937 +# Soul Campfire +[1.16-]boxlist:id=soul_campfire,data=0,data=1,data=2,data=3,box=0.0625:0.3125:0:0.25:0:1:0/0/1/0/0/0,box=0:1:0.1875:0.4375:0.6875:0.9375:0/1/1/1/0/0,box=0.6875:0.9375:0:0.25:0:1:0/0/0/0/1/0,box=0:1:0.1875:0.4375:0.0625:0.3125:0/1/1/1/0/0,box=0.3125:0.6875:0:0.0625:0:1:0/1/0/0/0/0,box=0.49:0.51:0:1:0:1:-1/-1/2/2/2/2,box=0:1:0:1:0.49:0.51:-1/-1/2/2/2/2 +[1.16-]boxlist:id=soul_campfire,data=4,data=5,data=6,data=7,box=0.0625:0.3125:0:0.25:0:1:0/0/0/0/0/0,box=0:1:0.1875:0.4375:0.6875:0.9375:0/0/0/0/0/0,box=0.6875:0.9375:0:0.25:0:1:0/0/0/0/0/0,box=0:1:0.1875:0.4375:0.0625:0.3125:0/0/0/0/0/0,box=0.3125:0.6875:0:0.0625:0:1:0/0/0/0/0/0 +[1.16-]patchblock:id=soul_campfire,data=8,data=9,data=10,data=11 +[1.16-]patchrotate:id=soul_campfire,data=0,roty=180 +[1.16-]patchblock:id=soul_campfire,data=12,data=13,data=14,data=15 +[1.16-]patchrotate:id=soul_campfire,data=4,roty=180 +[1.16-]patchblock:id=soul_campfire,data=16,data=17,data=18,data=19 +[1.16-]patchrotate:id=soul_campfire,data=0,roty=270 +[1.16-]patchblock:id=soul_campfire,data=20,data=21,data=22,data=23 +[1.16-]patchrotate:id=soul_campfire,data=4,roty=270 +[1.16-]patchblock:id=soul_campfire,data=24,data=25,data=26,data=27 +[1.16-]patchrotate:id=soul_campfire,data=0,roty=90 +[1.16-]patchblock:id=soul_campfire,data=28,data=29,data=30,data=31 +[1.16-]patchrotate:id=soul_campfire,data=4,roty=90 +# Warped Fungus +# Warped Roots +# Nether Sprouts +# Crimson Fungus +# Crimson Roots +[1.16-]patchblock:id=warped_fungus,id=warped_roots,id=nether_sprouts,id=crimson_fungus,id=crimson_roots,patch0=VertX1Z0ToX0Z1,patch1=VertX1Z0ToX0Z1@90 + diff --git a/DynmapCore/src/main/resources/texture_1.txt b/DynmapCore/src/main/resources/texture_1.txt index ad69ba37..bfafa3bf 100644 --- a/DynmapCore/src/main/resources/texture_1.txt +++ b/DynmapCore/src/main/resources/texture_1.txt @@ -2430,3 +2430,109 @@ block:id=horn_coral,patch0-1=0:horn_coral,transparency=TRANSPARENT [1.15-]block:id=honey_block,patch0=0:honey_block_top,patch1=0:honey_block_bottom,patch2=0:honey_block_side,transparency=TRANSPARENT # Honeycomb block [1.15-]block:id=honeycomb_block,allfaces=0:honeycomb_block,stdrot=true + +# 1.16 blocks +[1.16-]texture:id=nether_gold_ore +[1.16-]texture:id=soul_fire_0 +[1.16-]texture:id=soul_fire_1 +[1.16-]texture:id=soul_soil +[1.16-]texture:id=basalt_side +[1.16-]texture:id=basalt_top +[1.16-]texture:id=polished_basalt_side +[1.16-]texture:id=polished_basalt_top +[1.16-]texture:id=soul_torch +[1.16-]texturefile:id=chain,filename=assets/minecraft/textures/block/chain.png,format=CUSTOM,tile0=0:0/3:16/6:0,tile1=3:0/3:16/6:0,xcount=2,ycount=1 +[1.16-]texture:id=soul_campfire_log_lit +[1.16-]texture:id=soul_campfire_fire +[1.16-]texturefile:id=soul_lantern,filename=assets/minecraft/textures/block/soul_lantern.png,format=CUSTOM,tile0=0:0/6:10/5:3,xcount=1,ycount=3 +[1.16-]texture:id=warped_stem_top +[1.16-]texture:id=warped_stem +[1.16-]texture:id=stripped_warped_stem_top +[1.16-]texture:id=stripped_warped_stem +[1.16-]texture:id=warped_nylium +[1.16-]texture:id=warped_nylium_side +[1.16-]texture:id=warped_fungus +[1.16-]texture:id=warped_wart_block +[1.16-]texture:id=warped_roots +[1.16-]texture:id=nether_sprouts +[1.16-]texture:id=crimson_roots +[1.16-]texture:id=crimson_stem_top +[1.16-]texture:id=crimson_stem +[1.16-]texture:id=stripped_crimson_stem +[1.16-]texture:id=stripped_crimson_stem_top +[1.16-]texture:id=crimson_nylium +[1.16-]texture:id=crimson_nylium_side +[1.16-]texture:id=crimson_fungus + +# Nether gold ore +[1.16-]block:id=nether_gold_ore,allfaces=0:nether_gold_ore,stdrot=true +# Soul Fire +[1.16-]block:id=soul_fire,patch0-3=0:soul_fire_0,patch4-7=0:soul_fire_1,transparency=TRANSPARENT +# Soul soil +[1.16-]block:id=soul_soil,allfaces=0:soul_soil,stdrot=true +# Basalt +[1.16-]block:id=basalt,data=1,allsides=0:basalt_side,topbottom=0:basalt_top,stdrot=true +[1.16-]block:id=basalt,data=0,north=0:basalt_top,south=0:basalt_top,east=4000:basalt_side,west=4000:basalt_side,top=0:basalt_side,bottom=0:basalt_side +[1.16-]block:id=basalt,data=2,north=4000:basalt_side,south=4000:basalt_side,east=0:basalt_top,west=0:basalt_top,top=4000:basalt_side,bottom=4000:basalt_side +# Polished Basalt +[1.16-]block:id=polished_basalt,data=1,allsides=0:polished_basalt_side,topbottom=0:polished_basalt_top,stdrot=true +[1.16-]block:id=polished_basalt,data=0,north=0:polished_basalt_top,south=0:polished_basalt_top,east=4000:polished_basalt_side,west=4000:polished_basalt_side,top=0:polished_basalt_side,bottom=0:polished_basalt_side +[1.16-]block:id=polished_basalt,data=2,north=4000:polished_basalt_side,south=4000:polished_basalt_side,east=0:polished_basalt_top,west=0:polished_basalt_top,top=4000:polished_basalt_side,bottom=4000:polished_basalt_side +# Soul Torch +[1.16-]block:id=soul_torch,patch0=0:soul_torch,transparency=TRANSPARENT +# Soul Wall torch +[1.16-]block:id=soul_wall_torch,data=0,data=1,data=2,data=3,patch0=0:soul_torch,transparency=TRANSPARENT +# Chain +[1.16-]block:id=chain,patch0=0:chain,patch1=1:chain,transparency=TRANSPARENT +# Soul Lantern +[1.16-]block:id=soul_lantern,patch0=0:soul_lantern,transparency=TRANSPARENT +# Soul Campfire +[1.16-]block:id=soul_campfire,patch0=0:campfire_log,patch1=0:soul_campfire_log_lit,patch2=0:soul_campfire_fire,transparency=TRANSPARENT +# Warped Stem +[1.16-]block:id=warped_stem,data=1,allsides=0:warped_stem,topbottom=0:warped_stem_top,stdrot=true +[1.16-]block:id=warped_stem,data=0,north=0:warped_stem_top,south=0:warped_stem_top,east=4000:warped_stem,west=4000:warped_stem,top=0:warped_stem,bottom=0:warped_stem +[1.16-]block:id=warped_stem,data=2,north=4000:warped_stem,south=4000:warped_stem,east=0:warped_stem_top,west=0:warped_stem_top,top=4000:warped_stem,bottom=4000:warped_stem +# Stripped Warped Stem +[1.16-]block:id=stripped_warped_stem,data=1,allsides=0:stripped_warped_stem,topbottom=0:stripped_warped_stem_top,stdrot=true +[1.16-]block:id=stripped_warped_stem,data=0,north=0:stripped_warped_stem_top,south=0:stripped_warped_stem_top,east=4000:stripped_warped_stem,west=4000:stripped_warped_stem,top=0:stripped_warped_stem,bottom=0:stripped_warped_stem +[1.16-]block:id=stripped_warped_stem,data=2,north=4000:stripped_warped_stem,south=4000:stripped_warped_stem,east=0:stripped_warped_stem_top,west=0:stripped_warped_stem_top,top=4000:stripped_warped_stem,bottom=4000:stripped_warped_stem +# Warped Hyphae +[1.16-]block:id=warped_hyphae,data=1,allsides=0:warped_stem,topbottom=0:warped_stem,stdrot=true +[1.16-]block:id=warped_hyphae,data=0,north=0:warped_stem,south=0:warped_stem,east=4000:warped_stem,west=4000:warped_stem,top=0:warped_stem,bottom=0:warped_stem +[1.16-]block:id=warped_hyphae,data=2,north=4000:warped_stem,south=4000:warped_stem,east=0:warped_stem,west=0:warped_stem,top=4000:warped_stem,bottom=4000:warped_stem +# Stripped Warped Hyphae +[1.16-]block:id=stripped_warped_hyphae,data=1,allsides=0:stripped_warped_stem,topbottom=0:stripped_warped_stem,stdrot=true +[1.16-]block:id=stripped_warped_hyphae,data=0,north=0:stripped_warped_stem,south=0:stripped_warped_stem,east=4000:stripped_warped_stem,west=4000:stripped_warped_stem,top=0:stripped_warped_stem,bottom=0:stripped_warped_stem +[1.16-]block:id=stripped_warped_hyphae,data=2,north=4000:stripped_warped_stem,south=4000:stripped_warped_stem,east=0:stripped_warped_stem,west=0:stripped_warped_stem,top=4000:stripped_warped_stem,bottom=4000:stripped_warped_stem +# Warped Nylium +[1.16-]block:id=warped_nylium,allsides=0:warped_nylium_side,top=0:warped_nylium,bottom=0:netherrack,stdrot=true +# Warped Fungus +[1.16-]block:id=warped_fungus,patch0-1=0:warped_fungus,transparency=TRANSPARENT +# Warped Wart Block +[1.16-]block:id=warped_wart_block,allfaces=0:warped_wart_block,stdrot=true +# Warped Roots +[1.16-]block:id=warped_roots,patch0-1=0:warped_roots,transparency=TRANSPARENT +# Nether Sprouts +[1.16-]block:id=nether_sprouts,patch0-1=0:nether_sprouts,transparency=TRANSPARENT +# Crimson Stem +[1.16-]block:id=crimson_stem,data=1,allsides=0:crimson_stem,topbottom=0:crimson_stem_top,stdrot=true +[1.16-]block:id=crimson_stem,data=0,north=0:crimson_stem_top,south=0:crimson_stem_top,east=4000:crimson_stem,west=4000:crimson_stem,top=0:crimson_stem,bottom=0:crimson_stem +[1.16-]block:id=crimson_stem,data=2,north=4000:crimson_stem,south=4000:crimson_stem,east=0:crimson_stem_top,west=0:crimson_stem_top,top=4000:crimson_stem,bottom=4000:crimson_stem +# Stripped Crimson Stem +[1.16-]block:id=stripped_crimson_stem,data=1,allsides=0:stripped_crimson_stem,topbottom=0:stripped_crimson_stem_top,stdrot=true +[1.16-]block:id=stripped_crimson_stem,data=0,north=0:stripped_crimson_stem_top,south=0:stripped_crimson_stem_top,east=4000:stripped_crimson_stem,west=4000:stripped_crimson_stem,top=0:stripped_crimson_stem,bottom=0:stripped_crimson_stem +[1.16-]block:id=stripped_crimson_stem,data=2,north=4000:stripped_crimson_stem,south=4000:stripped_crimson_stem,east=0:stripped_crimson_stem_top,west=0:stripped_crimson_stem_top,top=4000:stripped_crimson_stem,bottom=4000:stripped_crimson_stem +# Crimson Roots +[1.16-]block:id=crimson_roots,patch0-1=0:crimson_roots,transparency=TRANSPARENT +# Crimson Hyphae +[1.16-]block:id=crimson_hyphae,data=1,allsides=0:crimson_stem,topbottom=0:crimson_stem,stdrot=true +[1.16-]block:id=crimson_hyphae,data=0,north=0:crimson_stem,south=0:crimson_stem,east=4000:crimson_stem,west=4000:crimson_stem,top=0:crimson_stem,bottom=0:crimson_stem +[1.16-]block:id=crimson_hyphae,data=2,north=4000:crimson_stem,south=4000:crimson_stem,east=0:crimson_stem,west=0:crimson_stem,top=4000:crimson_stem,bottom=4000:crimson_stem +# Stripped Crimson Hyphae +[1.16-]block:id=stripped_crimson_hyphae,data=1,allsides=0:stripped_crimson_stem,topbottom=0:stripped_crimson_stem,stdrot=true +[1.16-]block:id=stripped_crimson_hyphae,data=0,north=0:stripped_crimson_stem,south=0:stripped_crimson_stem,east=4000:stripped_crimson_stem,west=4000:stripped_crimson_stem,top=0:stripped_crimson_stem,bottom=0:stripped_crimson_stem +[1.16-]block:id=stripped_crimson_hyphae,data=2,north=4000:stripped_crimson_stem,south=4000:stripped_crimson_stem,east=0:stripped_crimson_stem,west=0:stripped_crimson_stem,top=4000:stripped_crimson_stem,bottom=4000:stripped_crimson_stem +# Crimson Nylium +[1.16-]block:id=crimson_nylium,allsides=0:crimson_nylium_side,top=0:crimson_nylium,bottom=0:netherrack,stdrot=true +# Crimson Fungus +[1.16-]block:id=crimson_fungus,patch0-1=0:crimson_fungus,transparency=TRANSPARENT diff --git a/bukkit-helper-116/src/main/java/org/dynmap/bukkit/helper/v116/BukkitVersionHelperSpigot116.java b/bukkit-helper-116/src/main/java/org/dynmap/bukkit/helper/v116/BukkitVersionHelperSpigot116.java index 3f439961..45314c39 100644 --- a/bukkit-helper-116/src/main/java/org/dynmap/bukkit/helper/v116/BukkitVersionHelperSpigot116.java +++ b/bukkit-helper-116/src/main/java/org/dynmap/bukkit/helper/v116/BukkitVersionHelperSpigot116.java @@ -247,4 +247,14 @@ public class BukkitVersionHelperSpigot116 extends BukkitVersionHelperGeneric { Log.severe("getStateStringByCombinedId not implemented"); return null; } + @Override + /** Get ID string from biomebase */ + public String getBiomeBaseIDString(Object bb) { + String s = ((BiomeBase)bb).n(); + if (s != null) { + String[] ss = s.split("\\."); + return ss[ss.length-1]; + } + return null; + } }