From 5ba25420a016e4c0c8b761a171e11327b41a716e Mon Sep 17 00:00:00 2001 From: Mike Primm Date: Sun, 26 May 2019 00:07:01 -0500 Subject: [PATCH 1/4] Add 1.14 lantern --- DynmapCore/src/main/resources/models_1.txt | 3 +++ DynmapCore/src/main/resources/texture_1.txt | 3 +++ spigot/src/main/java/org/dynmap/bukkit/DynmapPlugin.java | 5 ++++- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/DynmapCore/src/main/resources/models_1.txt b/DynmapCore/src/main/resources/models_1.txt index 19bb3065..dc563564 100644 --- a/DynmapCore/src/main/resources/models_1.txt +++ b/DynmapCore/src/main/resources/models_1.txt @@ -1560,3 +1560,6 @@ patchblock:id=bubble_column [1.14-]patchrotate:id=lectern,data=0,roty=270 [1.14-]patchblock:id=lectern,data=12,data=13,data=14,data=15 [1.14-]patchrotate:id=lectern,data=0,roty=90 +# Lantern +[1.14-]boxlist:id=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.14-]boxlist:id=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 diff --git a/DynmapCore/src/main/resources/texture_1.txt b/DynmapCore/src/main/resources/texture_1.txt index 368966d3..3ad186fc 100644 --- a/DynmapCore/src/main/resources/texture_1.txt +++ b/DynmapCore/src/main/resources/texture_1.txt @@ -2216,6 +2216,7 @@ block:id=horn_coral,patch0-1=0:horn_coral,transparency=TRANSPARENT [1.14-]texture:id=lectern_front [1.14-]texture:id=lectern_sides [1.14-]texture:id=lectern_top +[1.14-]texturefile:id=lantern,filename=assets/minecraft/textures/block/lantern.png,format=CUSTOM,tile0=0:0/6:10/5:3,xcount=1,ycount=3 # Signpost [1.14-]block:id=oak_sign,patch0=0,patch1=1,patch2=2,patch3=3,patch4=4,patch5=5,patch6=6,patch7=7,patch8=8,patch9=9,transparency=TRANSPARENT,txtid=oak_sign @@ -2379,3 +2380,5 @@ block:id=horn_coral,patch0-1=0:horn_coral,transparency=TRANSPARENT [1.14-]block:id=grindstone,patch0=0:grindstone_pivot,patch1=0:grindstone_round,patch2=0:grindstone_side,patch4=0:dark_oak_log,transparency=TRANSPARENT # Lectern [1.14-]block:id=lectern,patch0=0:oak_planks,patch1=0:lectern_base,patch2=0:lectern_front,patch3=0:lectern_sides,patch4=0:lectern_top,transparency=TRANSPARENT +# Lantern +[1.14-]block:id=lantern,patch0=0:lantern,transparency=TRANSPARENT diff --git a/spigot/src/main/java/org/dynmap/bukkit/DynmapPlugin.java b/spigot/src/main/java/org/dynmap/bukkit/DynmapPlugin.java index 76557765..23267bb3 100644 --- a/spigot/src/main/java/org/dynmap/bukkit/DynmapPlugin.java +++ b/spigot/src/main/java/org/dynmap/bukkit/DynmapPlugin.java @@ -966,7 +966,10 @@ public class DynmapPlugin extends JavaPlugin implements DynmapAPI { else { dsender = new BukkitCommandSender(sender); } - return core.processCommand(dsender, cmd.getName(), commandLabel, args); + if (core != null) + return core.processCommand(dsender, cmd.getName(), commandLabel, args); + else + return false; } From 145a88e63297b3e19b65c8ac3965eb157da43fa8 Mon Sep 17 00:00:00 2001 From: Mike Primm Date: Sun, 26 May 2019 00:18:32 -0500 Subject: [PATCH 2/4] Add 1.14 smithing table --- DynmapCore/src/main/resources/texture_1.txt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/DynmapCore/src/main/resources/texture_1.txt b/DynmapCore/src/main/resources/texture_1.txt index 3ad186fc..b2d86398 100644 --- a/DynmapCore/src/main/resources/texture_1.txt +++ b/DynmapCore/src/main/resources/texture_1.txt @@ -2217,6 +2217,11 @@ block:id=horn_coral,patch0-1=0:horn_coral,transparency=TRANSPARENT [1.14-]texture:id=lectern_sides [1.14-]texture:id=lectern_top [1.14-]texturefile:id=lantern,filename=assets/minecraft/textures/block/lantern.png,format=CUSTOM,tile0=0:0/6:10/5:3,xcount=1,ycount=3 +[1.14-]texture:id=smithing_table_front +[1.14-]texture:id=smithing_table_side +[1.14-]texture:id=smithing_table_top +[1.14-]texture:id=smithing_table_bottom + # Signpost [1.14-]block:id=oak_sign,patch0=0,patch1=1,patch2=2,patch3=3,patch4=4,patch5=5,patch6=6,patch7=7,patch8=8,patch9=9,transparency=TRANSPARENT,txtid=oak_sign @@ -2382,3 +2387,6 @@ block:id=horn_coral,patch0-1=0:horn_coral,transparency=TRANSPARENT [1.14-]block:id=lectern,patch0=0:oak_planks,patch1=0:lectern_base,patch2=0:lectern_front,patch3=0:lectern_sides,patch4=0:lectern_top,transparency=TRANSPARENT # Lantern [1.14-]block:id=lantern,patch0=0:lantern,transparency=TRANSPARENT +# Smithing table +[1.14-]block:id=smithing_table,top=0:smithing_table_top,bottom=0:smithing_table_bottom,north=0:smithing_table_side,south=0:smithing_table_side,east=0:smithing_table_front,west=0:smithing_table_front,stdrot=true + From 15b5b65914c8dfe6837c8b5473449c2d95b72bb4 Mon Sep 17 00:00:00 2001 From: Mike Primm Date: Sun, 26 May 2019 00:37:40 -0500 Subject: [PATCH 3/4] Add 1.14 stonecutter --- DynmapCore/src/main/resources/models_1.txt | 8 ++++++++ DynmapCore/src/main/resources/texture_1.txt | 7 ++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/DynmapCore/src/main/resources/models_1.txt b/DynmapCore/src/main/resources/models_1.txt index dc563564..e87336c4 100644 --- a/DynmapCore/src/main/resources/models_1.txt +++ b/DynmapCore/src/main/resources/models_1.txt @@ -1563,3 +1563,11 @@ patchblock:id=bubble_column # Lantern [1.14-]boxlist:id=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.14-]boxlist:id=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 +# Stonecutter +[1.14-]boxlist:id=stonecutter,data=0,box=0:1:0:0.5625:0:1:0/1/2/2/2/2,box=0.0625:0.9375:0.5625:1:0.49:0.51:3/3/3/3/3/3 +[1.14-]patchblock:id=stonecutter,data=1 +[1.14-]patchrotate:id=stonecutter,data=0,roty=180 +[1.14-]patchblock:id=stonecutter,data=2 +[1.14-]patchrotate:id=stonecutter,data=0,roty=270 +[1.14-]patchblock:id=stonecutter,data=3 +[1.14-]patchrotate:id=stonecutter,data=0,roty=90 diff --git a/DynmapCore/src/main/resources/texture_1.txt b/DynmapCore/src/main/resources/texture_1.txt index b2d86398..176f75a9 100644 --- a/DynmapCore/src/main/resources/texture_1.txt +++ b/DynmapCore/src/main/resources/texture_1.txt @@ -2221,7 +2221,10 @@ block:id=horn_coral,patch0-1=0:horn_coral,transparency=TRANSPARENT [1.14-]texture:id=smithing_table_side [1.14-]texture:id=smithing_table_top [1.14-]texture:id=smithing_table_bottom - +[1.14-]texture:id=stonecutter_bottom +[1.14-]texture:id=stonecutter_top +[1.14-]texture:id=stonecutter_side +[1.14-]texture:id=stonecutter_saw # Signpost [1.14-]block:id=oak_sign,patch0=0,patch1=1,patch2=2,patch3=3,patch4=4,patch5=5,patch6=6,patch7=7,patch8=8,patch9=9,transparency=TRANSPARENT,txtid=oak_sign @@ -2389,4 +2392,6 @@ block:id=horn_coral,patch0-1=0:horn_coral,transparency=TRANSPARENT [1.14-]block:id=lantern,patch0=0:lantern,transparency=TRANSPARENT # Smithing table [1.14-]block:id=smithing_table,top=0:smithing_table_top,bottom=0:smithing_table_bottom,north=0:smithing_table_side,south=0:smithing_table_side,east=0:smithing_table_front,west=0:smithing_table_front,stdrot=true +# Stonecutter +[1.14-]block:id=stonecutter,patch0=0:stonecutter_bottom,patch1=0:stonecutter_top,patch2=0:stonecutter_side,patch3=0:stonecutter_saw,transparency=TRANSPARENT From f69ce760f0abe1a2e1472c022d403b8d399415a1 Mon Sep 17 00:00:00 2001 From: Mike Primm Date: Tue, 28 May 2019 10:47:56 -0500 Subject: [PATCH 4/4] Bump to use 1.14.1 support for 1.14.2 --- spigot/src/main/java/org/dynmap/bukkit/Helper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spigot/src/main/java/org/dynmap/bukkit/Helper.java b/spigot/src/main/java/org/dynmap/bukkit/Helper.java index ce71581f..a6371120 100644 --- a/spigot/src/main/java/org/dynmap/bukkit/Helper.java +++ b/spigot/src/main/java/org/dynmap/bukkit/Helper.java @@ -35,7 +35,7 @@ public class Helper { Log.info("Loading Glowstone support"); BukkitVersionHelper.helper = new BukkitVersionHelperGlowstone(); } - else if (v.contains("(MC: 1.14.1)")) { + else if (v.contains("(MC: 1.14.1)") || v.contains("(MC: 1.14.2)")) { BukkitVersionHelper.helper = new BukkitVersionHelperSpigot114_1(); } else if (v.contains("(MC: 1.14)")) {