Merge pull request #100 from OneLiteFeatherNET/develop

TheMeinerLP · web-flow · commit be0b470d4c2e · 2024-12-05T09:43:23.000Z
Release 1.2.1
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -43,7 +43,7 @@ _Put an `x` in the boxes that apply. You can also fill these out after creating
 them, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before
 merging your code._
 
-- [ ] I have read the CONTRIBUTING.md
+- [ ] I have read the [CONTRIBUTING.md](https://github.com/OneLiteFeatherNET/.github/blob/main/CONTRIBUTING.md)
 - [ ] I have added tests that prove my fix is effective or that my feature works
 - [ ] I have added necessary documentation (if appropriate)
 
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -26,7 +26,7 @@ if (!File("$rootDir/.git").exists()) {
 }
 
 group = "net.onelitefeather"
-version = "1.2.0"
+version = "1.2.1"
 val supportedMinecraftVersions = listOf(
     "1.19.4",
     "1.20.6",
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
diff --git a/gradlew.bat b/gradlew.bat
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -21,11 +21,11 @@ dependencyResolutionManagement {
             version("modrinth", "2.+")
             version("hangar", "0.1.2")
             version("paper.yml", "0.6.0")
-            version("paper.run", "2.3.0")
+            version("paper.run", "2.3.1")
             version("shadowJar", "8.1.1")
 
             version("paper", "1.20.6-R0.1-SNAPSHOT")
-            version("bstats", "3.0.2")
+            version("bstats", "3.1.0")
 
             version("cloudcommand", "2.0.0-SNAPSHOT")
 
@@ -34,14 +34,14 @@ dependencyResolutionManagement {
 
             // WorldGuard
             version("wgv6", "6.2")
-            version("wgv7", "7.0.10")
+            version("wgv7", "7.0.12")
             library("wg6", "com.sk89q.worldguard", "worldguard-legacy").versionRef("wgv6")
             library("wg7", "com.sk89q.worldguard", "worldguard-bukkit").versionRef("wgv7")
 
             // PlotSquared
             version("psv4", "4.453")
-            version("psv6", "1.46")
-            version("psv7", "1.46")
+            version("psv6", "1.51")
+            version("psv7", "1.51")
 
             library("psv4.core", "com.github.IntellectualSites.PlotSquared","Core").versionRef("psv4")
             library("psv4.bukkit", "com.github.IntellectualSites.PlotSquared","Bukkit").versionRef("psv4")
diff --git a/src/main/java/net/onelitefeather/antiredstoneclockremastered/commands/DisplayActiveClocksCommand.java b/src/main/java/net/onelitefeather/antiredstoneclockremastered/commands/DisplayActiveClocksCommand.java
@@ -54,10 +54,10 @@ private Component mapClockToMessage(RedstoneClock redstoneClock) {
         return Component.empty().hoverEvent(Component.translatable("antiredstoneclockremastered.command.display.clock.hover").asHoverEvent()).append(
                 Component.translatable("antiredstoneclockremastered.command.display.clock.text")
                         .arguments(
+                                TranslationArgument.numeric(redstoneClock.getTriggerCount()),
                                 TranslationArgument.numeric(location.getBlockX()),
                                 TranslationArgument.numeric(location.getBlockY()),
                                 TranslationArgument.numeric(location.getBlockZ()),
-                                TranslationArgument.numeric(redstoneClock.getTriggerCount()),
                                 Component.empty()
                                         .clickEvent(ClickEvent.callback(audience -> {
                                             if (audience instanceof final Player executor) {
diff --git a/src/main/java/net/onelitefeather/antiredstoneclockremastered/service/RedstoneClockService.java b/src/main/java/net/onelitefeather/antiredstoneclockremastered/service/RedstoneClockService.java
@@ -10,7 +10,9 @@
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
+import org.bukkit.enchantments.Enchantment;
 import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -33,6 +35,7 @@ public final class RedstoneClockService {
     private List<String> ignoredWorlds;
 
     private final ConcurrentHashMap<Location, RedstoneClock> activeClockTesters = new ConcurrentHashMap<>();
+    private final ItemStack SILK_TOUCH_PICKAXE = new ItemStack(Material.DIAMOND_PICKAXE);
 
     public RedstoneClockService(@NotNull AntiRedstoneClockRemastered antiRedstoneClockRemastered) {
         this.antiRedstoneClockRemastered = antiRedstoneClockRemastered;
@@ -43,6 +46,7 @@ public RedstoneClockService(@NotNull AntiRedstoneClockRemastered antiRedstoneClo
         this.notifyConsole = antiRedstoneClockRemastered.getConfig().getBoolean("clock.notifyConsole", true);
         this.dropItems = antiRedstoneClockRemastered.getConfig().getBoolean("clock.drop", false);
         this.ignoredWorlds = antiRedstoneClockRemastered.getConfig().getStringList("check.ignoredWorlds");
+        SILK_TOUCH_PICKAXE.addEnchantment(Enchantment.SILK_TOUCH, 1);
     }
 
     public void checkAndUpdateClockStateWithActiveManual(@NotNull Location location, boolean state) {
@@ -169,7 +173,7 @@ private void sendNotification(final Player player, final Location location) {
     private void breakBlock(@NotNull Location location) {
         Block block = location.getBlock();
         if (this.dropItems) {
-            var drops = block.getDrops();
+            var drops = block.getDrops(SILK_TOUCH_PICKAXE);
             drops.forEach(itemStack -> block.getWorld().dropItem(location, itemStack));
         }
         Runnable removeTask = () -> block.setType(Material.AIR, true);
diff --git a/src/main/java/net/onelitefeather/antiredstoneclockremastered/service/UpdateService.java b/src/main/java/net/onelitefeather/antiredstoneclockremastered/service/UpdateService.java
@@ -44,7 +44,7 @@ public void run() {
     }
 
     public void notifyConsole(ComponentLogger logger) {
-        if (this.remoteVersion.isHigherThan(this.localVersion)) {
+        if (this.remoteVersion != null && this.remoteVersion.isHigherThan(this.localVersion)) {
             logger.warn(Component.translatable("antiredstoneclockremastered.notify.update.console")
                     .arguments(Component.text(localVersion.toString()),
                             Component.text(remoteVersion.toString()),
@@ -55,7 +55,7 @@ public void notifyConsole(ComponentLogger logger) {
 
 
     public void notifyPlayer(Player player) {
-        if (this.remoteVersion.isHigherThan(this.localVersion)) {
+        if (this.remoteVersion != null && this.remoteVersion.isHigherThan(this.localVersion)) {
             notifyPlayer(this.localVersion, this.remoteVersion, player);
         }
     }
diff --git a/src/main/resources/antiredstoneclockremasterd.properties b/src/main/resources/antiredstoneclockremasterd.properties
@@ -1,8 +1,7 @@
 service.notify.detected.clock=<arg:0> <gold><arg:4>Redstone Clock detected at: X,Y,Z(<arg:1>,<arg:2>,<arg:3>)
 antiredstoneclockremastered.command.reload.success=<arg:0> <green>The configuration has been reloaded. <yellow>A server restart is still recommended instead of just reloads
 antiredstoneclockremastered.command.reload.description=<gray>Reloads the AntiRedstone Clock Remastered
-antiredstoneclockremastered.command.display.clock.text=<yellow><arg:4>Clock(<arg:0>,<arg:1>,<arg:2>) was triggered <arg:3>
-antiredstoneclockremastered.command.display.clock.title=<arg:0> <gold>Cached clocks \:
+antiredstoneclockremastered.command.display.clock.text=<yellow><arg:0>Clock(<arg:1>,<arg:2>,<arg:3>) was triggered <arg:4>
 antiredstoneclockremastered.command.display.clock.hover=<green>Click me to teleport
 antiredstoneclockremastered.command.display.description=<gray>Shows you all active cached Cocks
 antiredstoneclockremastered.command.feature.check.toggle.enabled=<arg:0> <yellow>The function is now: <green>Enabled
diff --git a/src/main/resources/antiredstoneclockremasterd_de_DE.properties b/src/main/resources/antiredstoneclockremasterd_de_DE.properties
@@ -1,8 +1,7 @@
 service.notify.detected.clock=<arg\:0> <gold><arg\:4>Redstone-Clock erkannt\: X,Y,Z(<arg\:1>,<arg\:2>,<arg\:3>)
 antiredstoneclockremastered.command.reload.success=<arg\:0> <green>Die Konfiguration wurde neu geladen. <yellow>Ein Serverneustart wird immer noch empfohlen statt nur neu zu laden
 antiredstoneclockremastered.command.reload.description=<gray>Lade die  AntiRedstone Clock Remastered neu
-antiredstoneclockremastered.command.display.clock.text=<yellow><arg\:4>Clock(<arg\:0>,<arg\:1>,<arg\:2>) wurde ausgelöst <arg\:3>
-antiredstoneclockremastered.command.display.clock.title=<arg\:0> <gold>Zwischengespeicherte-Clocks \:
+antiredstoneclockremastered.command.display.clock.text=<yellow><arg\:0>Clock(<arg\:1>,<arg\:2>,<arg\:3>) was triggered <arg\:4>
 antiredstoneclockremastered.command.display.clock.hover=<green>Klicke mich, um dich zu teleportieren
 antiredstoneclockremastered.command.display.description=<gray>Zeigt alle aktiven Zwischengespeichert-Clocks
 antiredstoneclockremastered.command.feature.check.toggle.enabled=<arg\:0> <yellow>Die Funktion ist jetzt\: <green>aktiviert
diff --git a/src/main/resources/antiredstoneclockremasterd_fr_FR.properties b/src/main/resources/antiredstoneclockremasterd_fr_FR.properties
@@ -1,33 +1,32 @@
-service.notify.detected.clock=<arg\:0> <gold><arg\:4>Redstone Clock detected at\: X,Y,Z(<arg\:1>,<arg\:2>,<arg\:3>)
-antiredstoneclockremastered.command.reload.success=<arg\:0> <green>The configuration has been reloaded. <yellow>A server restart is still recommended instead of just reloads
-antiredstoneclockremastered.command.reload.description=<gray>Reloads the AntiRedstone Clock Remastered
-antiredstoneclockremastered.command.display.clock.text=<yellow><arg\:4>Clock(<arg\:0>,<arg\:1>,<arg\:2>) was triggered <arg\:3>
-antiredstoneclockremastered.command.display.clock.title=<arg\:0> <gold>Cached clocks \:
-antiredstoneclockremastered.command.display.clock.hover=<green>Click me to teleport
-antiredstoneclockremastered.command.display.description=<gray>Shows you all active cached Cocks
-antiredstoneclockremastered.command.feature.check.toggle.enabled=<arg\:0> <yellow>The function is now\: <green>Enabled
-antiredstoneclockremastered.command.feature.check.toggle.disabled=<arg\:0> <yellow>The function is now\: <red>Disabled
-antiredstoneclockremastered.command.feature.check.toggle.observer.description=<gray>Turn the detection function of obeservers on or off
-antiredstoneclockremastered.command.feature.check.toggle.piston.description=<gray>Turn the detection function of pistons on or off
-antiredstoneclockremastered.command.feature.check.toggle.comparator.description=<gray>Turn the detection function of comparators on or off
-antiredstoneclockremastered.command.feature.check.toggle.sculk.description=<gray>Turn the detection function of sculks on or off
-antiredstoneclockremastered.command.feature.check.toggle.redstone_and_repeater.description=<gray>Turn the detection function of redstone and repeaters on or off
-antiredstoneclockremastered.command.feature.check.world.add=<arg\:0> <green>The world '<arg\:1>' has been added to the ignored worlds list
-antiredstoneclockremastered.command.feature.check.world.remove=<arg\:0> <red>The world '<arg\:1>' has been removed from the ignored worlds list
-antiredstoneclockremastered.command.feature.check.world.add.description=<gray>This command adds a world to the ignored worlds list
-antiredstoneclockremastered.command.feature.check.world.remove.description=<gray>This command removes a world from the ignored worlds list
-antiredstoneclockremastered.command.feature.check.region.add=<arg\:0> <green>The region '<arg\:1>' has been added to the ignored regions list
-antiredstoneclockremastered.command.feature.check.region.remove=<arg\:0> <red>The region '<arg\:1>' has been removed from the ignored regions list
-antiredstoneclockremastered.command.feature.check.region.add.description=<gray>This command adds a region to the ignored regions list
-antiredstoneclockremastered.command.feature.check.region.remove.description=<gray>This command removes a region from the ignored regions list
-antiredstoneclockremastered.command.feature.clock.set=<arg\:0> <green>The value of this function is now\: <arg\:1>
-antiredstoneclockremastered.command.feature.clock.toggle.autoBreak.description=<gray>Turn the function of auto break on or off
-antiredstoneclockremastered.command.feature.clock.toggle.notifyAdmins.description=<gray>Turn the function of admin notifications on or off
-antiredstoneclockremastered.command.feature.clock.toggle.notifyConsole.description=<gray>Turn the function of console notifications on or off
-antiredstoneclockremastered.command.feature.clock.toggle.drop.description=<gray>Turn the function of drop items on or off
-antiredstoneclockremastered.command.feature.clock.set.delay.description=<gray>Sets the desired value for the function
-antiredstoneclockremastered.command.feature.clock.set.maxCount.description=<gray>Sets the desired value for the function
-antiredstoneclockremastered.notify.donation.console=<green>To keep the project alive, we ask for donations to our https\://opencollective.com/onelitefeather/projects/antiredstoneclock-remastered
-antiredstoneclockremastered.notify.donation.player=<arg\:0> <click\:open_url\:'https\://opencollective.com/onelitefeather/projects/antiredstoneclock-remastered'><green>To keep the project alive, we ask for donations to our <blue>OpenCollective</click>
-antiredstoneclockremastered.notify.update.player=<arg\:0> <yellow><click\:open_url\:'https\://hangar.papermc.io/OneLiteFeather/AntiRedstoneClock-Remastered'>Your version(<arg\:1>) is older than our latest published version (<arg\:2>). Please update as soon as possible to get continued support. Or click me to get on the download page\!</click>
-antiredstoneclockremastered.notify.update.console=<yellow>Your version(<arg\:0>) is older than our latest published version (<arg\:1>). Please update as soon as possible to get continued support. Or click use this link <arg\:2>
+service.notify.detected.clock=<arg\:0> <gold><arg\:4>Horloge de redstone détectée en \: X,Y,Z(<arg\:1>,<arg\:2>,<arg\:3>)
+antiredstoneclockremastered.command.reload.success=<arg\:0> <green>La configuration a été rechargée. <yellow>Un redémarrage du serveur est toujours recommandé au lieu de simples rechargements
+antiredstoneclockremastered.command.reload.description=<gray>Recharger l'horloge AntiRedstone remastérisée
+antiredstoneclockremastered.command.display.clock.text=<yellow><arg\:0>L'horloge(<arg\:1>,<arg\:2>,<arg\:3>) a été activée <arg\:4>
+antiredstoneclockremastered.command.display.clock.hover=<green>Cliquez sur moi pour vous téléporter
+antiredstoneclockremastered.command.display.description=<gray>Vous montre toutes les horloges actives en cache
+antiredstoneclockremastered.command.feature.check.toggle.enabled=<arg\:0> <yellow>La fonction est maintenant \: <green>Activée
+antiredstoneclockremastered.command.feature.check.toggle.disabled=<arg\:0> <yellow>La fonction est maintenant \: <red>Désactivée
+antiredstoneclockremastered.command.feature.check.toggle.observer.description=<gray>Active ou désactive la fonction de détection des observers
+antiredstoneclockremastered.command.feature.check.toggle.piston.description=<gray>Active ou désactive la fonction de détection des pistons
+antiredstoneclockremastered.command.feature.check.toggle.comparator.description=<gray>Active ou désactive la fonction de détection des comparateurs
+antiredstoneclockremastered.command.feature.check.toggle.sculk.description=<gray>Active ou désactive la fonction de détection des sculks
+antiredstoneclockremastered.command.feature.check.toggle.redstone_and_repeater.description=<gray>Active ou désactive la fonction de détection de la redstone et des répéteurs
+antiredstoneclockremastered.command.feature.check.world.add=<arg\:0> <green>Le monde '<arg\:1>' a été ajouté à la liste des mondes ignorés
+antiredstoneclockremastered.command.feature.check.world.remove=<arg\:0> <red>Le monde '<arg\:1>' a été supprimé de la liste des mondes ignorés
+antiredstoneclockremastered.command.feature.check.world.add.description=<gray>Cette commande ajoute un monde à la liste des mondes ignorés
+antiredstoneclockremastered.command.feature.check.world.remove.description=<gray>Cette commande supprime un monde de la liste des mondes ignorés
+antiredstoneclockremastered.command.feature.check.region.add=<arg\:0> <green>La région '<arg\:1>' a été ajoutée à la liste des régions ignorées
+antiredstoneclockremastered.command.feature.check.region.remove=<arg\:0> <red>La région '<arg\:1>' a été retirée de la liste des régions ignorées
+antiredstoneclockremastered.command.feature.check.region.add.description=<gray>Cette commande ajoute une région à la liste des régions ignorées
+antiredstoneclockremastered.command.feature.check.region.remove.description=<gray>Cette commande supprime une région de la liste des régions ignorées
+antiredstoneclockremastered.command.feature.clock.set=<arg\:0> <green>La valeur de cette fonction est maintenant \: <arg\:1>
+antiredstoneclockremastered.command.feature.clock.toggle.autoBreak.description=<gray>Active ou désactive la fonction de cassage automatique
+antiredstoneclockremastered.command.feature.clock.toggle.notifyAdmins.description=<gray>Active ou désactive la fonction des notifications d'administration
+antiredstoneclockremastered.command.feature.clock.toggle.notifyConsole.description=<gray>Active ou désactive la fonction des notifications de la console
+antiredstoneclockremastered.command.feature.clock.toggle.drop.description=<gray>Active ou désactive la fonction de drop d'items
+antiredstoneclockremastered.command.feature.clock.set.delay.description=<gray>Définit la valeur souhaitée pour la fonction
+antiredstoneclockremastered.command.feature.clock.set.maxCount.description=<gray>Définit la valeur souhaitée pour la fonction
+antiredstoneclockremastered.notify.donation.console=<green>Pour assurer la continuité du projet, nous sollicitons des dons sur https\://opencollective.com/onelitefeather/projects/antiredstoneclock-remastered
+antiredstoneclockremastered.notify.donation.player=<arg\:0> <click\:open_url\:'https\://opencollective.com/onelitefeather/projects/antiredstoneclock-remastered'><green>Pour assurer la continuité du projet, nous sollicitons des dons sur notre <blue>OpenCollective</click>
+antiredstoneclockremastered.notify.update.player=<arg\:0> <yellow><click\:open_url\:'https\://hangar.papermc.io/OneLiteFeather/AntiRedstoneClock-Remastered'>Votre version (<arg\:1>) est plus ancienne que notre dernière version publiée (<arg\:2>). Veuillez mettre à jour dès que possible pour continuer à bénéficier du support. Ou cliquez sur moi pour accéder à la page de téléchargement \!</click>
+antiredstoneclockremastered.notify.update.console=<yellow>Votre version (<arg\:0>) est plus ancienne que notre dernière version publiée (<arg\:1>). Veuillez mettre à jour dès que possible pour continuer à bénéficier du support. Ou cliquez sur ce lien <arg\:2>
diff --git a/src/main/resources/antiredstoneclockremasterd_zh_CN.properties b/src/main/resources/antiredstoneclockremasterd_zh_CN.properties

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ if (!File("$rootDir/.git").exists()) {`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`group = "net.onelitefeather"`
`29`		`-version = "1.2.0"`
	`29`	`+version = "1.2.1"`
`30`	`30`	`val supportedMinecraftVersions = listOf(`
`31`	`31`	`"1.19.4",`
`32`	`32`	`"1.20.6",`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public void run() {`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`public void notifyConsole(ComponentLogger logger) {`
`47`		`- if (this.remoteVersion.isHigherThan(this.localVersion)) {`
	`47`	`+ if (this.remoteVersion != null && this.remoteVersion.isHigherThan(this.localVersion)) {`
`48`	`48`	`logger.warn(Component.translatable("antiredstoneclockremastered.notify.update.console")`
`49`	`49`	`.arguments(Component.text(localVersion.toString()),`
`50`	`50`	`Component.text(remoteVersion.toString()),`
`@@ -55,7 +55,7 @@ public void notifyConsole(ComponentLogger logger) {`
`55`	`55`
`56`	`56`
`57`	`57`	`public void notifyPlayer(Player player) {`
`58`		`- if (this.remoteVersion.isHigherThan(this.localVersion)) {`
	`58`	`+ if (this.remoteVersion != null && this.remoteVersion.isHigherThan(this.localVersion)) {`
`59`	`59`	`notifyPlayer(this.localVersion, this.remoteVersion, player);`
`60`	`60`	`}`
`61`	`61`	`}`