From c32713e967498257037f47f2c1439ecd6913a878 Mon Sep 17 00:00:00 2001 From: Ry0taK <49341894+Ry0taK@users.noreply.github.com> Date: Thu, 6 Feb 2020 05:47:03 +0000 Subject: [PATCH 01/12] Fix unintended redirection to welcome file --- DynmapCore/build.gradle | 4 ++-- .../src/main/java/org/dynmap/DynmapCore.java | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/DynmapCore/build.gradle b/DynmapCore/build.gradle index c9876c62..d946d023 100644 --- a/DynmapCore/build.gradle +++ b/DynmapCore/build.gradle @@ -3,8 +3,8 @@ description = "DynmapCore" dependencies { compile project(path: ':DynmapCoreAPI', configuration: 'shadow') compile 'javax.servlet:javax.servlet-api:3.1' - compile 'org.eclipse.jetty:jetty-server:9.4.24.v20191120' - compile 'org.eclipse.jetty:jetty-servlet:9.4.24.v20191120' + compile 'org.eclipse.jetty:jetty-server:9.4.26.v20200117' + compile 'org.eclipse.jetty:jetty-servlet:9.4.26.v20200117' compile 'com.googlecode.json-simple:json-simple:1.1.1' compile 'org.yaml:snakeyaml:1.23' compile 'com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:20180219.1' diff --git a/DynmapCore/src/main/java/org/dynmap/DynmapCore.java b/DynmapCore/src/main/java/org/dynmap/DynmapCore.java index c775f13e..1cd166a3 100644 --- a/DynmapCore/src/main/java/org/dynmap/DynmapCore.java +++ b/DynmapCore/src/main/java/org/dynmap/DynmapCore.java @@ -49,10 +49,7 @@ import org.dynmap.markers.MarkerAPI; import org.dynmap.markers.impl.MarkerAPIImpl; import org.dynmap.modsupport.ModSupportImpl; import org.dynmap.renderer.DynmapBlockState; -import org.dynmap.servlet.FileResourceHandler; -import org.dynmap.servlet.JettyNullLogger; -import org.dynmap.servlet.LoginServlet; -import org.dynmap.servlet.MapStorageResourceHandler; +import org.dynmap.servlet.*; import org.dynmap.storage.MapStorage; import org.dynmap.storage.filetree.FileTreeMapStorage; import org.dynmap.storage.mysql.MySQLMapStorage; @@ -843,12 +840,15 @@ public class DynmapCore implements DynmapCommonAPI { filters.add(new CustomHeaderFilter(configuration.getNode("http-response-headers"))); FilterHandler fh = new FilterHandler(router, filters); + ContextHandler contextHandler = new ContextHandler(); + contextHandler.setContextPath("/"); + contextHandler.setHandler(fh); HandlerList hlist = new HandlerList(); - hlist.setHandlers(new org.eclipse.jetty.server.Handler[] { new SessionHandler(), fh }); + hlist.setHandlers(new org.eclipse.jetty.server.Handler[] { new SessionHandler(), contextHandler }); webServer.setHandler(hlist); - addServlet("/up/configuration", new org.dynmap.servlet.ClientConfigurationServlet(this)); - addServlet("/standalone/config.js", new org.dynmap.servlet.ConfigJSServlet(this)); + addServlet("/up/configuration", new ClientConfigurationServlet(this)); + addServlet("/standalone/config.js", new ConfigJSServlet(this)); if(authmgr != null) { LoginServlet login = new LoginServlet(this); addServlet("/up/login", login); From 9f7e177db42c30301ebfd9f3b52990628dd8c198 Mon Sep 17 00:00:00 2001 From: Mgazul Date: Tue, 31 Mar 2020 23:48:53 +0800 Subject: [PATCH 02/12] Support Mohist --- .../bukkit/helper/BukkitVersionHelperCB.java | 23 +++++++++++++++---- .../helper/BukkitVersionHelperGeneric.java | 6 ++++- 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/bukkit-helper/src/main/java/org/dynmap/bukkit/helper/BukkitVersionHelperCB.java b/bukkit-helper/src/main/java/org/dynmap/bukkit/helper/BukkitVersionHelperCB.java index 1bbce289..c2697cfe 100644 --- a/bukkit-helper/src/main/java/org/dynmap/bukkit/helper/BukkitVersionHelperCB.java +++ b/bukkit-helper/src/main/java/org/dynmap/bukkit/helper/BukkitVersionHelperCB.java @@ -60,9 +60,14 @@ public class BukkitVersionHelperCB extends BukkitVersionHelperGeneric { Server srv = Bukkit.getServer(); /* Get getHandle() method */ try { - Method m = srv.getClass().getMethod("getHandle"); - Object scm = m.invoke(srv); /* And use it to get SCM (nms object) */ - return scm.getClass().getPackage().getName(); + try { + Class.forName("red.mohist.Mohist"); + return "net.minecraft.server.v1_12_R1"; + } catch (Exception x) { + Method m = srv.getClass().getMethod("getHandle"); + Object scm = m.invoke(srv); /* And use it to get SCM (nms object) */ + return scm.getClass().getPackage().getName(); + } } catch (Exception x) { Log.severe("Error finding net.minecraft.server packages"); return null; @@ -72,7 +77,11 @@ public class BukkitVersionHelperCB extends BukkitVersionHelperGeneric { protected void loadNMS() { // Get block fields nmsblock = getNMSClass("net.minecraft.server.Block"); - nmsblockarray = getNMSClass("[Lnet.minecraft.server.Block;"); + try { + nmsblockarray = getNMSClass("[Lnet.minecraft.block.Block;"); + } catch (Exception x) { + nmsblockarray = getNMSClass("[Lnet.minecraft.server.Block;"); + } nmsmaterial = getNMSClass("net.minecraft.server.Material"); if (isBlockIdNeeded()) { // Not needed for 1.13+ blockbyid = getFieldNoFail(nmsblock, new String[] { "byId" }, nmsblockarray); @@ -88,7 +97,11 @@ public class BukkitVersionHelperCB extends BukkitVersionHelperGeneric { /* Set up biomebase fields */ biomebase = getNMSClass("net.minecraft.server.BiomeBase"); - biomebasearray = getNMSClass("[Lnet.minecraft.server.BiomeBase;"); + try { + biomebasearray = getNMSClass("[Lnet.minecraft.world.biome.Biome;"); + } catch (Exception x) { + biomebasearray = getNMSClass("[Lnet.minecraft.server.BiomeBase;"); + } biomebaselist = getPrivateFieldNoFail(biomebase, new String[] { "biomes" }, biomebasearray); if ((biomebaselist == null) && isBiomeBaseListNeeded()) { getbiomefunc = getMethodNoFail(biomebase, new String[] { "getBiome" }, new Class[] { int.class, biomebase }); diff --git a/bukkit-helper/src/main/java/org/dynmap/bukkit/helper/BukkitVersionHelperGeneric.java b/bukkit-helper/src/main/java/org/dynmap/bukkit/helper/BukkitVersionHelperGeneric.java index 6ab74dbe..2949dc73 100644 --- a/bukkit-helper/src/main/java/org/dynmap/bukkit/helper/BukkitVersionHelperGeneric.java +++ b/bukkit-helper/src/main/java/org/dynmap/bukkit/helper/BukkitVersionHelperGeneric.java @@ -132,7 +132,11 @@ public abstract class BukkitVersionHelperGeneric extends BukkitVersionHelper { cw_gethandle = getMethod(craftworld, new String[] { "getHandle" }, new Class[0]); /* CraftChunkSnapshot */ craftchunksnapshot = getOBCClass("org.bukkit.craftbukkit.CraftChunkSnapshot"); - biomebasearray = getNMSClass("[Lnet.minecraft.server.BiomeBase;"); + try { + biomebasearray = getNMSClass("[Lnet.minecraft.world.biome.Biome;"); + } catch (Exception x) { + biomebasearray = getNMSClass("[Lnet.minecraft.server.BiomeBase;"); + } ccss_biome = getPrivateFieldNoFail(craftchunksnapshot, new String[] { "biome" }, biomebasearray); if(ccss_biome == null) { biomestorage = getNMSClass("net.minecraft.server.BiomeStorage"); From 7c5d33970601bbfd8a276ad6627c7b84abdbab27 Mon Sep 17 00:00:00 2001 From: L0laapk3 Date: Wed, 1 Apr 2020 00:14:18 +0200 Subject: [PATCH 03/12] fix centering of markers --- .../main/resources/extracted/web/css/dynmap_style.css | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/DynmapCore/src/main/resources/extracted/web/css/dynmap_style.css b/DynmapCore/src/main/resources/extracted/web/css/dynmap_style.css index 15846f46..3bdc79b3 100644 --- a/DynmapCore/src/main/resources/extracted/web/css/dynmap_style.css +++ b/DynmapCore/src/main/resources/extracted/web/css/dynmap_style.css @@ -887,22 +887,19 @@ } .dynmap .mapMarker .markerIcon16x16 { - margin-top: -8px; - margin-left: -8px; + transform: translate(-50%, -50%); width: 16px; height: 16px; } .dynmap .mapMarker .markerIcon8x8 { - margin-top: -4px; - margin-left: -4px; + transform: translate(-50%, -50%); width: 8px; height: 8px; } .dynmap .mapMarker .markerIcon32x32 { - margin-top: -16px; - margin-left: -16px; + transform: translate(-50%, -50%); width: 32px; height: 32px; } From 3937ece59a68126c44772c607379fd2234298339 Mon Sep 17 00:00:00 2001 From: Paul Straw Date: Thu, 2 Apr 2020 22:01:30 -0700 Subject: [PATCH 04/12] Adds `worldborderlabel` configuration.txt setting --- DynmapCore/src/main/java/org/dynmap/MarkersComponent.java | 6 +++++- forge-1.10.2/src/main/resources/configuration.txt | 1 + forge-1.11.2/src/main/resources/configuration.txt | 1 + forge-1.12.2/src/main/resources/configuration.txt | 1 + forge-1.13.2/src/main/resources/configuration.txt | 1 + forge-1.8.9/src/main/resources/configuration.txt | 1 + forge-1.9.4/src/main/resources/configuration.txt | 1 + spigot/src/main/resources/configuration.txt | 1 + 8 files changed, 12 insertions(+), 1 deletion(-) diff --git a/DynmapCore/src/main/java/org/dynmap/MarkersComponent.java b/DynmapCore/src/main/java/org/dynmap/MarkersComponent.java index c48772c7..8c88ce59 100644 --- a/DynmapCore/src/main/java/org/dynmap/MarkersComponent.java +++ b/DynmapCore/src/main/java/org/dynmap/MarkersComponent.java @@ -25,6 +25,7 @@ public class MarkersComponent extends ClientComponent { private MarkerSignManager signmgr; private MarkerIcon spawnicon; private String spawnlbl; + private String worldborderlbl; private MarkerSet offlineset; private MarkerIcon offlineicon; private MarkerSet spawnbedset; @@ -57,6 +58,9 @@ public class MarkersComponent extends ClientComponent { spawnicon = api.getMarkerIcon(MarkerIcon.WORLD); } } + if (showBorder) { + worldborderlbl = configuration.getString("worldborderlabel", "Border"); + } if (showSpawn || showBorder) { /* Add listener for world loads */ WorldEventListener wel = new WorldEventListener() { @@ -280,7 +284,7 @@ public class MarkersComponent extends ClientComponent { } } if (am == null) { - am = ms.createAreaMarker(borderid, "Border", false, w.getName(), x, z, false); + am = ms.createAreaMarker(borderid, worldborderlbl, false, w.getName(), x, z, false); } else { am.setCornerLocations(x, z); diff --git a/forge-1.10.2/src/main/resources/configuration.txt b/forge-1.10.2/src/main/resources/configuration.txt index d67e9baa..2d33f6db 100644 --- a/forge-1.10.2/src/main/resources/configuration.txt +++ b/forge-1.10.2/src/main/resources/configuration.txt @@ -127,6 +127,7 @@ components: spawnbedformat: "%name%'s bed" # (optional) Show world border (vanilla 1.8+) showworldborder: true + worldborderlabel: "Border" - class: org.dynmap.ClientComponent type: chat diff --git a/forge-1.11.2/src/main/resources/configuration.txt b/forge-1.11.2/src/main/resources/configuration.txt index d67e9baa..2d33f6db 100644 --- a/forge-1.11.2/src/main/resources/configuration.txt +++ b/forge-1.11.2/src/main/resources/configuration.txt @@ -127,6 +127,7 @@ components: spawnbedformat: "%name%'s bed" # (optional) Show world border (vanilla 1.8+) showworldborder: true + worldborderlabel: "Border" - class: org.dynmap.ClientComponent type: chat diff --git a/forge-1.12.2/src/main/resources/configuration.txt b/forge-1.12.2/src/main/resources/configuration.txt index d67e9baa..2d33f6db 100644 --- a/forge-1.12.2/src/main/resources/configuration.txt +++ b/forge-1.12.2/src/main/resources/configuration.txt @@ -127,6 +127,7 @@ components: spawnbedformat: "%name%'s bed" # (optional) Show world border (vanilla 1.8+) showworldborder: true + worldborderlabel: "Border" - class: org.dynmap.ClientComponent type: chat diff --git a/forge-1.13.2/src/main/resources/configuration.txt b/forge-1.13.2/src/main/resources/configuration.txt index d67e9baa..2d33f6db 100644 --- a/forge-1.13.2/src/main/resources/configuration.txt +++ b/forge-1.13.2/src/main/resources/configuration.txt @@ -127,6 +127,7 @@ components: spawnbedformat: "%name%'s bed" # (optional) Show world border (vanilla 1.8+) showworldborder: true + worldborderlabel: "Border" - class: org.dynmap.ClientComponent type: chat diff --git a/forge-1.8.9/src/main/resources/configuration.txt b/forge-1.8.9/src/main/resources/configuration.txt index d67e9baa..2d33f6db 100644 --- a/forge-1.8.9/src/main/resources/configuration.txt +++ b/forge-1.8.9/src/main/resources/configuration.txt @@ -127,6 +127,7 @@ components: spawnbedformat: "%name%'s bed" # (optional) Show world border (vanilla 1.8+) showworldborder: true + worldborderlabel: "Border" - class: org.dynmap.ClientComponent type: chat diff --git a/forge-1.9.4/src/main/resources/configuration.txt b/forge-1.9.4/src/main/resources/configuration.txt index d67e9baa..2d33f6db 100644 --- a/forge-1.9.4/src/main/resources/configuration.txt +++ b/forge-1.9.4/src/main/resources/configuration.txt @@ -127,6 +127,7 @@ components: spawnbedformat: "%name%'s bed" # (optional) Show world border (vanilla 1.8+) showworldborder: true + worldborderlabel: "Border" - class: org.dynmap.ClientComponent type: chat diff --git a/spigot/src/main/resources/configuration.txt b/spigot/src/main/resources/configuration.txt index 10aee57e..9de84ea6 100644 --- a/spigot/src/main/resources/configuration.txt +++ b/spigot/src/main/resources/configuration.txt @@ -128,6 +128,7 @@ components: spawnbedformat: "%name%'s bed" # (optional) show world border (vanilla 1.8+) showworldborder: true + worldborderlabel: "Border" - class: org.dynmap.ClientComponent type: chat From eebc37317d7ea2e9a954fc9134a87b569bb2ad03 Mon Sep 17 00:00:00 2001 From: mikeprimm Date: Sun, 12 Apr 2020 19:24:20 -0500 Subject: [PATCH 05/12] Update README.md --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 1351c748..48785028 100644 --- a/README.md +++ b/README.md @@ -16,3 +16,6 @@ The following target platforms are supported: - Forge v1.10.2 - via Dynmap--forge-1.10.2.jar mod - Forge v1.11.2 - via Dynmap--forge-1.11.2.jar mod - Forge v1.12.2 - via Dynmap--forge-1.12.2.jar mod + +# Where to go for questions and discussions +I've just created a Reddit for the Dynmap family of mods/plugins - please give it a try - https://www.reddit.com/r/Dynmap/ From d3d711b0383927961fbfcec77f5f61a4937980cc Mon Sep 17 00:00:00 2001 From: mikeprimm Date: Sun, 12 Apr 2020 19:26:00 -0500 Subject: [PATCH 06/12] Add Reddit URL --- spigot/src/main/resources/plugin.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spigot/src/main/resources/plugin.yml b/spigot/src/main/resources/plugin.yml index a1ef6a25..794dbdb7 100644 --- a/spigot/src/main/resources/plugin.yml +++ b/spigot/src/main/resources/plugin.yml @@ -2,7 +2,7 @@ name: dynmap main: org.dynmap.bukkit.DynmapPlugin version: "${version}-${buildnumber}" authors: [mikeprimm] -website: "https://forums.dynmap.us" +website: "https://www.reddit.com/r/Dynmap/" softdepend: [ Permissions, PermissionEx, bPermissions, PermissionsBukkit, GroupManager, LuckPerms ] commands: dynmap: From 9f6d7c2bc56d255a2897bd2c43e8b1bf5921d426 Mon Sep 17 00:00:00 2001 From: mikeprimm Date: Sun, 12 Apr 2020 19:26:32 -0500 Subject: [PATCH 07/12] Add reddit URL --- forge-1.8.9/src/main/resources/mcmod.info | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge-1.8.9/src/main/resources/mcmod.info b/forge-1.8.9/src/main/resources/mcmod.info index e188b9ab..e7ce7144 100644 --- a/forge-1.8.9/src/main/resources/mcmod.info +++ b/forge-1.8.9/src/main/resources/mcmod.info @@ -5,7 +5,7 @@ "description": "Dynamic, Google Maps style web maps for Minecraft Servers", "version": "${version}", "mcversion": "${mcversion}", - "url": "https://forums.dynmap.us", + "url": "https://www.reddit.com/r/Dynmap/", "updateUrl": "", "authors": [ "mikeprimm" From 7ad0baf249b8e84776a89a5fcdc28c8413ca4cda Mon Sep 17 00:00:00 2001 From: mikeprimm Date: Sun, 12 Apr 2020 19:26:58 -0500 Subject: [PATCH 08/12] Update mcmod.info --- forge-1.9.4/src/main/resources/mcmod.info | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge-1.9.4/src/main/resources/mcmod.info b/forge-1.9.4/src/main/resources/mcmod.info index e188b9ab..e7ce7144 100644 --- a/forge-1.9.4/src/main/resources/mcmod.info +++ b/forge-1.9.4/src/main/resources/mcmod.info @@ -5,7 +5,7 @@ "description": "Dynamic, Google Maps style web maps for Minecraft Servers", "version": "${version}", "mcversion": "${mcversion}", - "url": "https://forums.dynmap.us", + "url": "https://www.reddit.com/r/Dynmap/", "updateUrl": "", "authors": [ "mikeprimm" From 99529bf1f83cbfef1c2e584e42dda0ec1571b211 Mon Sep 17 00:00:00 2001 From: mikeprimm Date: Sun, 12 Apr 2020 19:27:20 -0500 Subject: [PATCH 09/12] Update mcmod.info --- forge-1.10.2/src/main/resources/mcmod.info | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge-1.10.2/src/main/resources/mcmod.info b/forge-1.10.2/src/main/resources/mcmod.info index e188b9ab..e7ce7144 100644 --- a/forge-1.10.2/src/main/resources/mcmod.info +++ b/forge-1.10.2/src/main/resources/mcmod.info @@ -5,7 +5,7 @@ "description": "Dynamic, Google Maps style web maps for Minecraft Servers", "version": "${version}", "mcversion": "${mcversion}", - "url": "https://forums.dynmap.us", + "url": "https://www.reddit.com/r/Dynmap/", "updateUrl": "", "authors": [ "mikeprimm" From 39a8f4401a19e6808e1b567d5a9f112a9fe343bc Mon Sep 17 00:00:00 2001 From: mikeprimm Date: Sun, 12 Apr 2020 19:27:49 -0500 Subject: [PATCH 10/12] Update mcmod.info --- forge-1.11.2/src/main/resources/mcmod.info | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge-1.11.2/src/main/resources/mcmod.info b/forge-1.11.2/src/main/resources/mcmod.info index e188b9ab..e7ce7144 100644 --- a/forge-1.11.2/src/main/resources/mcmod.info +++ b/forge-1.11.2/src/main/resources/mcmod.info @@ -5,7 +5,7 @@ "description": "Dynamic, Google Maps style web maps for Minecraft Servers", "version": "${version}", "mcversion": "${mcversion}", - "url": "https://forums.dynmap.us", + "url": "https://www.reddit.com/r/Dynmap/", "updateUrl": "", "authors": [ "mikeprimm" From d3cb6442bb22e9f10342af05f89f0d359320c49b Mon Sep 17 00:00:00 2001 From: mikeprimm Date: Sun, 12 Apr 2020 19:28:09 -0500 Subject: [PATCH 11/12] Update mcmod.info --- forge-1.12.2/src/main/resources/mcmod.info | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge-1.12.2/src/main/resources/mcmod.info b/forge-1.12.2/src/main/resources/mcmod.info index e188b9ab..e7ce7144 100644 --- a/forge-1.12.2/src/main/resources/mcmod.info +++ b/forge-1.12.2/src/main/resources/mcmod.info @@ -5,7 +5,7 @@ "description": "Dynamic, Google Maps style web maps for Minecraft Servers", "version": "${version}", "mcversion": "${mcversion}", - "url": "https://forums.dynmap.us", + "url": "https://www.reddit.com/r/Dynmap/", "updateUrl": "", "authors": [ "mikeprimm" From 5c8e3ef758eb9be414dd6c0c934fc39f91923382 Mon Sep 17 00:00:00 2001 From: mikeprimm Date: Sun, 12 Apr 2020 19:28:29 -0500 Subject: [PATCH 12/12] Update mcmod.info --- forge-1.13.2/src/main/resources/mcmod.info | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge-1.13.2/src/main/resources/mcmod.info b/forge-1.13.2/src/main/resources/mcmod.info index e188b9ab..e7ce7144 100644 --- a/forge-1.13.2/src/main/resources/mcmod.info +++ b/forge-1.13.2/src/main/resources/mcmod.info @@ -5,7 +5,7 @@ "description": "Dynamic, Google Maps style web maps for Minecraft Servers", "version": "${version}", "mcversion": "${mcversion}", - "url": "https://forums.dynmap.us", + "url": "https://www.reddit.com/r/Dynmap/", "updateUrl": "", "authors": [ "mikeprimm"