From 2fb156d6aaca3d445d2252cfa8f5146079e1977e Mon Sep 17 00:00:00 2001 From: TheMasterOfCats Date: Mon, 29 Dec 2025 18:05:41 +0100 Subject: [PATCH 01/11] Updated spigot-api version --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index d84021b..9e871b8 100644 --- a/pom.xml +++ b/pom.xml @@ -30,8 +30,8 @@ org.spigotmc - spigot - 1.20.2-R0.1-SNAPSHOT + spigot-api + 1.20.4-R0.1-SNAPSHOT provided From fdfa7013d80505b9ae1d7f9685026721a02cf251 Mon Sep 17 00:00:00 2001 From: TheMasterOfCats Date: Mon, 29 Dec 2025 18:06:03 +0100 Subject: [PATCH 02/11] Updated placeholderapi version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9e871b8..e53977f 100644 --- a/pom.xml +++ b/pom.xml @@ -39,7 +39,7 @@ me.clip placeholderapi - 2.10.9 + 2.11.7 provided From 18114fac34adfc313ee8f13085a435f3d40eb35b Mon Sep 17 00:00:00 2001 From: TheMasterOfCats Date: Mon, 29 Dec 2025 18:06:23 +0100 Subject: [PATCH 03/11] Addded json-simple dependency so JSONObject package can be used. --- pom.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pom.xml b/pom.xml index e53977f..8d506f8 100644 --- a/pom.xml +++ b/pom.xml @@ -43,6 +43,14 @@ provided + + + com.googlecode.json-simple + json-simple + 1.1.1 + + + org.apache.commons From dcb37ee0579cc11083698f0e76231d957887befd Mon Sep 17 00:00:00 2001 From: TheMasterOfCats Date: Mon, 29 Dec 2025 18:07:03 +0100 Subject: [PATCH 04/11] Updated the api version just like in the pom.xml file --- src/main/resources/plugin.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index d03a067..768280a 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -3,7 +3,7 @@ name: ServerTutorialPlus prefix: Server Tutorial Plus author: MartenM version: ${project.version} -api-version: "1.20" +api-version: "1.20.4" description: "ยง6The plugin to guide players around your server using tutorials." softdepend: [PlaceholderAPI, Multiverse-Core, MultiWorld] commands: From 06e720308ff0e9bed2c79e96b05149551dde0649 Mon Sep 17 00:00:00 2001 From: TheMasterOfCats Date: Mon, 29 Dec 2025 18:07:53 +0100 Subject: [PATCH 05/11] Made the scoreboard turn off if the server is using the TAB by NEZNAMY plugin --- .../martenm/servertutorialplus/objects/TutorialController.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/nl/martenm/servertutorialplus/objects/TutorialController.java b/src/main/java/nl/martenm/servertutorialplus/objects/TutorialController.java index 4b28577..2694e0f 100644 --- a/src/main/java/nl/martenm/servertutorialplus/objects/TutorialController.java +++ b/src/main/java/nl/martenm/servertutorialplus/objects/TutorialController.java @@ -136,6 +136,9 @@ private void finishPoint(){ if(current == serverTutorial.points.size() - 1){ //Tutorial has been finished! finish(); + if (!(plugin.getServer().getPluginManager().getPlugin("TAB") == null)) { + player.performCommand("tab scoreboard"); + } } else{ current++; playedPoint = serverTutorial.points.get(current).createPlay(player, oldValuesPlayer, this::finishPoint); From 299007624130880f78a852fd72759b13843b5c5e Mon Sep 17 00:00:00 2001 From: TheMasterOfCats Date: Mon, 29 Dec 2025 18:08:04 +0100 Subject: [PATCH 06/11] Made the scoreboard turn off if the server is using the TAB by NEZNAMY plugin --- .../servertutorialplus/objects/TutorialController.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/nl/martenm/servertutorialplus/objects/TutorialController.java b/src/main/java/nl/martenm/servertutorialplus/objects/TutorialController.java index 2694e0f..ddc7cca 100644 --- a/src/main/java/nl/martenm/servertutorialplus/objects/TutorialController.java +++ b/src/main/java/nl/martenm/servertutorialplus/objects/TutorialController.java @@ -53,6 +53,10 @@ public void start(){ //FIRE event! TutorialStartEvent event = new TutorialStartEvent(serverTutorial, player); plugin.getServer().getPluginManager().callEvent(event); + if (!(plugin.getServer().getPluginManager().getPlugin("TAB") == null)) { + player.performCommand("tab scoreboard"); + } + if(event.isCancelled()){ plugin.inTutorial.remove(player.getUniqueId()); plugin.lockedPlayers.remove(player.getUniqueId()); From f861c0af71ae94dc8291f23a7f041513a5a9f662 Mon Sep 17 00:00:00 2001 From: TheMasterOfCats Date: Mon, 29 Dec 2025 18:08:07 +0100 Subject: [PATCH 07/11] Made the scoreboard turn off if the server is using the TAB by NEZNAMY plugin --- .../martenm/servertutorialplus/objects/TutorialController.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/nl/martenm/servertutorialplus/objects/TutorialController.java b/src/main/java/nl/martenm/servertutorialplus/objects/TutorialController.java index ddc7cca..43d2df7 100644 --- a/src/main/java/nl/martenm/servertutorialplus/objects/TutorialController.java +++ b/src/main/java/nl/martenm/servertutorialplus/objects/TutorialController.java @@ -61,6 +61,9 @@ public void start(){ plugin.inTutorial.remove(player.getUniqueId()); plugin.lockedPlayers.remove(player.getUniqueId()); plugin.lockedViews.remove(player.getUniqueId()); + if (!(plugin.getServer().getPluginManager().getPlugin("TAB") == null)) { + player.performCommand("tab scoreboard"); + } return; } From 5da615585b1e3259412b56f882466f158e29ca17 Mon Sep 17 00:00:00 2001 From: TheMasterOfCats Date: Mon, 29 Dec 2025 18:09:45 +0100 Subject: [PATCH 08/11] - Fixed dependencies and updated the ProtocolLIB api and the Spigot API - Made the scoreboard turn off when starting and ending the tutorial so the titles dont overlap. (Works only with the TAB plugin installed on the server) --- dependency-reduced-pom.xml | 123 +++++++++++++++++++++++++++++++++++++ 1 file changed, 123 insertions(+) create mode 100644 dependency-reduced-pom.xml diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml new file mode 100644 index 0000000..a4dbb76 --- /dev/null +++ b/dependency-reduced-pom.xml @@ -0,0 +1,123 @@ + + + 4.0.0 + nl.martenm + ServerTutorialPlus + 1.25.2 + + + + true + src/main/resources + + plugin.yml + + + + src/main/resources + + plugin.yml + + + + + + maven-compiler-plugin + 3.7.0 + + 1.8 + 1.8 + + + + maven-shade-plugin + 3.2.1 + + + package + + shade + + + + + + + com.zaxxer.hikari + nl.martenm.libs.hikari + + + org.bstats + nl.martenm.libs.bstats + + + com.cryptomorin.xseries + nl.martenm.libs.xseries + + + true + + + + + + + spigot-repo + https://hub.spigotmc.org/nexus/content/repositories/snapshots/ + + + placeholderapi + https://repo.extendedclip.com/content/repositories/placeholderapi/ + + + jitpack.io + https://jitpack.io + + + + + org.spigotmc + spigot-api + 1.20.4-R0.1-SNAPSHOT + provided + + + guava + com.google.guava + + + gson + com.google.code.gson + + + joml + org.joml + + + bungeecord-chat + net.md-5 + + + snakeyaml + org.yaml + + + + + me.clip + placeholderapi + 2.11.7 + provided + + + annotations + org.jetbrains + + + adventure-platform-bukkit + net.kyori + + + + + From 707842e6830feac51cd18f5824c2dc4af3cc882b Mon Sep 17 00:00:00 2001 From: TheMasterOfCats Date: Mon, 29 Dec 2025 19:15:41 +0100 Subject: [PATCH 09/11] Made the scoreboard actually turn off - if the player had the scoreboard off it would turn on. Made it also not show the message on chat. --- .../martenm/servertutorialplus/objects/TutorialController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/nl/martenm/servertutorialplus/objects/TutorialController.java b/src/main/java/nl/martenm/servertutorialplus/objects/TutorialController.java index 43d2df7..0b4ec86 100644 --- a/src/main/java/nl/martenm/servertutorialplus/objects/TutorialController.java +++ b/src/main/java/nl/martenm/servertutorialplus/objects/TutorialController.java @@ -54,7 +54,7 @@ public void start(){ TutorialStartEvent event = new TutorialStartEvent(serverTutorial, player); plugin.getServer().getPluginManager().callEvent(event); if (!(plugin.getServer().getPluginManager().getPlugin("TAB") == null)) { - player.performCommand("tab scoreboard"); + player.performCommand("tab scoreboard off " + player.getName() + " -s"); } if(event.isCancelled()){ From b3e1e5ab7c384de85ec8b2aa4c69955aa254e4bb Mon Sep 17 00:00:00 2001 From: TheMasterOfCats Date: Mon, 29 Dec 2025 19:15:44 +0100 Subject: [PATCH 10/11] Made the scoreboard actually turn off - if the player had the scoreboard off it would turn on. Made it also not show the message on chat. --- .../martenm/servertutorialplus/objects/TutorialController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/nl/martenm/servertutorialplus/objects/TutorialController.java b/src/main/java/nl/martenm/servertutorialplus/objects/TutorialController.java index 0b4ec86..af525f0 100644 --- a/src/main/java/nl/martenm/servertutorialplus/objects/TutorialController.java +++ b/src/main/java/nl/martenm/servertutorialplus/objects/TutorialController.java @@ -62,7 +62,7 @@ public void start(){ plugin.lockedPlayers.remove(player.getUniqueId()); plugin.lockedViews.remove(player.getUniqueId()); if (!(plugin.getServer().getPluginManager().getPlugin("TAB") == null)) { - player.performCommand("tab scoreboard"); + player.performCommand("tab scoreboard on " + player.getName() + " -s"); } return; } From d5b907d4451ebf3bc0675fbb101e85fd764b8aea Mon Sep 17 00:00:00 2001 From: TheMasterOfCats Date: Mon, 29 Dec 2025 19:15:48 +0100 Subject: [PATCH 11/11] Made the scoreboard actually turn off - if the player had the scoreboard off it would turn on. Made it also not show the message on chat. --- .../martenm/servertutorialplus/objects/TutorialController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/nl/martenm/servertutorialplus/objects/TutorialController.java b/src/main/java/nl/martenm/servertutorialplus/objects/TutorialController.java index af525f0..3090330 100644 --- a/src/main/java/nl/martenm/servertutorialplus/objects/TutorialController.java +++ b/src/main/java/nl/martenm/servertutorialplus/objects/TutorialController.java @@ -144,7 +144,7 @@ private void finishPoint(){ //Tutorial has been finished! finish(); if (!(plugin.getServer().getPluginManager().getPlugin("TAB") == null)) { - player.performCommand("tab scoreboard"); + player.performCommand("tab scoreboard on " + player.getName() + " -s"); } } else{ current++;