Release 2.7.1 (#383)

eldoriarpg · Jul 27, 2024 · ac62440 · ac62440
2 parents 76f9059 + f41540e
commit ac62440
Show file tree

Hide file tree

Showing 9 changed files with 34 additions and 31 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -9,13 +9,15 @@ plugins {
 }
 
 group = "de.eldoria"
-version = "2.7.0"
+version = "2.7.1"
 
-var publishModules = setOf("schematicbrushreborn-api",
-        "schematicbrushreborn-core",
-        "schematicbrushreborn-paper",
-        "schematicbrushreborn-paper-legacy",
-        "schematicbrushreborn-spigot")
+var publishModules = setOf(
+    "schematicbrushreborn-api",
+    "schematicbrushreborn-core",
+    "schematicbrushreborn-paper",
+    "schematicbrushreborn-paper-legacy",
+    "schematicbrushreborn-spigot"
+)
 
 allprojects {
     repositories {
@@ -41,7 +43,7 @@ allprojects {
     }
 
     java {
-        toolchain{
+        toolchain {
             languageVersion = JavaLanguageVersion.of(21)
         }
         withSourcesJar()
@@ -77,7 +79,11 @@ allprojects {
     }
 
     publishData {
-        useInternalEldoNexusRepos()
+        if (project.name.contains("api")) {
+            useEldoNexusRepos()
+        } else {
+            useInternalEldoNexusRepos()
+        }
     }
 
     tasks {

diff --git a/schematicbrushreborn-core/src/main/java/de/eldoria/schematicbrush/commands/admin/Info.java b/schematicbrushreborn-core/src/main/java/de/eldoria/schematicbrush/commands/admin/Info.java
@@ -34,7 +34,7 @@ public void onCommand(@NotNull CommandSender sender, @NotNull String alias, @Not
                    + "<name>Version:<value> " + descr.getVersion() + "\n"
                    + "<name>Spigot:<value> https://www.spigotmc.org/resources/98499\n"
                    + "<name>Patreon:<value> https://www.patreon.com/eldoriaplugins\n"
-                   + "<name>Support:<value> https://discord.gg/zRW9Vpu";
+                   + "<name>Support:<value> https://sbr.discord.eldoria.de";
         messageSender().sendMessage(sender, info);
     }
 }
diff --git a/...rushreborn-core/src/main/java/de/eldoria/schematicbrush/commands/brushpresets/Remove.java b/...rushreborn-core/src/main/java/de/eldoria/schematicbrush/commands/brushpresets/Remove.java
@@ -53,7 +53,7 @@ public void onCommand(@NotNull Player player, @NotNull String alias, @NotNull Ar
                             err -> handleCommandError(player, err)));
         }
         removal.whenComplete(Futures.whenComplete(
-                succ -> messageSender().sendMessage(player, "command.brushpresets.remove.removed", Replacement.create("name", name)),
+                succ -> messageSender().sendMessage(player, "commands.brushPresets.remove.removed", Replacement.create("name", name)),
                 err -> handleCommandError(player, err)));
     }
 

diff --git a/schematicbrushreborn-core/src/main/resources/messages.properties b/schematicbrushreborn-core/src/main/resources/messages.properties
@@ -1,7 +1,4 @@
-about=
-
-command.brushpresets.remove.removed=
-
+commands.about=
 commands.admin.migrate.migrationDone=
 commands.admin.migrate.migrationStarted=
 commands.admin.migrate.sourceTypeInvalid=
@@ -25,6 +22,7 @@ commands.brush.sessions.weight=
 commands.brushPreset.info.global.title=
 commands.brushPreset.info.private.title=
 commands.brushPresets.descr.changed=
+commands.brushPresets.remove.removed=
 commands.modify.next.skip=
 commands.modify.previous.empty=
 commands.modify.previous.previous=

diff --git a/schematicbrushreborn-core/src/main/resources/messages_de_DE.properties b/schematicbrushreborn-core/src/main/resources/messages_de_DE.properties
@@ -1,7 +1,4 @@
-about=<plugin_name> von <authors>\nVersion: <version>\nSpigot: <website>\nSupport: <discord>
-
-command.brushpresets.remove.removed=Brush <warn><name><default> entfernt.
-
+commands.about=<plugin_name> von <authors>\nVersion: <version>\nSpigot: <website>\nSupport: <discord>
 commands.admin.migrate.migrationDone=Migration abgeschlossen
 commands.admin.migrate.migrationStarted=Migration gestartet
 commands.admin.migrate.sourceTypeInvalid=Quelle <type> ist ungültig.
@@ -12,7 +9,7 @@ commands.admin.restartRendering.done=Rendering neu gestartet.
 commands.brush.bind.bound=Brush gebunden. Verwendet <value><schematics><default> Schematics in <value><sets><default> Sets.
 commands.brush.refresh.refreshFailed=Schematics konnten nicht aktualisiert werden.
 commands.brush.refresh.refreshSession=Schematics aktualisiert.
-commands.brush.refresh.refreshed=Brush-Schemtics aktualisiert.
+commands.brush.refresh.refreshed=Brush-Schematics aktualisiert.
 commands.brush.saveBrush.saved=Brush gespeichert.
 commands.brush.sessions.addModifiers=Modifikatoren hinzufügen
 commands.brush.sessions.addPreset=Vorlage hinzufügen
@@ -21,11 +18,12 @@ commands.brush.sessions.menu=Schematic Brush Menü
 commands.brush.sessions.refreshSchematics=Schematics aktualisieren
 commands.brush.sessions.saveBrush=Brush speichern
 commands.brush.sessions.savePreset=Vorlage speichern
-commands.brush.sessions.weight=Die Gewichtung des Sets wenn mehrere Sets verwendet werden.\nEin höherer Wert resultiert in mehr Schematic von diesem Set.
+commands.brush.sessions.weight=Die Gewichtung des Sets, wenn mehrere Sets verwendet werden.\nEin höherer Wert resultiert in mehr Schematic von diesem Set.
 commands.brushPreset.info.global.title=Globale Voreinstellungen
 commands.brushPreset.info.private.title=Private Voreinstellungen
 commands.brushPresets.descr.changed=Beschreibung von Brush <value><name><default> geändert!
-commands.modify.next.skip=Schemic übersprungen.
+commands.brushPresets.remove.removed=Brush <warn><name><default> entfernt.
+commands.modify.next.skip=Schematic übersprungen.
 commands.modify.previous.empty=Die Historie ist leer
 commands.modify.previous.previous=Vorherige Schematic
 commands.modify.selection.changed=Schema-Auswahl geändert.
@@ -71,7 +69,7 @@ components.modifier.type.replaceAll.description=Ersetze bestehende Blöcke
 components.modifier.type.replaceAll.name=Alles Ersetzen
 components.modifier.type.rotation.description=Rotiere die Schematic.
 components.modifier.type.rotation.name=Rotation
-components.provider.filter.blockFilter.description=Exkludiere Blöcke beim einfügen
+components.provider.filter.blockFilter.description=Exkludiere Blöcke beim Einfügen
 components.provider.filter.blockFilter.name=Block Filter
 components.provider.flip.fixed.description=Ein statischer Spiegel Wert
 components.provider.flip.fixed.name=Statisch

diff --git a/schematicbrushreborn-core/src/main/resources/messages_en_US.properties b/schematicbrushreborn-core/src/main/resources/messages_en_US.properties
@@ -1,7 +1,4 @@
-about=<plugin_name> by <authors>\nVersion: <version>\nSpigot: <website>\nSupport: <discord>
-
-command.brushpresets.remove.removed=Brush <warn><name><default> removed.
-
+commands.about=<plugin_name> by <authors>\nVersion: <version>\nSpigot: <website>\nSupport: <discord>
 commands.admin.migrate.migrationDone=Migration done
 commands.admin.migrate.migrationStarted=Migration started
 commands.admin.migrate.sourceTypeInvalid=Source type <type> is invalid.
@@ -25,6 +22,7 @@ commands.brush.sessions.weight=The weight of the schematic set when multiple set
 commands.brushPreset.info.global.title=Global Presets
 commands.brushPreset.info.private.title=Private Presets
 commands.brushPresets.descr.changed=Changed description of brush <value><name><default>!
+commands.brushPresets.remove.removed=Brush <warn><name><default> removed.
 commands.modify.next.skip=Skipped Schematic.
 commands.modify.previous.empty=The history is empty
 commands.modify.previous.previous=Previous Schematic
@@ -72,7 +70,7 @@ components.modifier.type.replaceAll.name=Replace All
 components.modifier.type.rotation.description=Rotate a schematic.
 components.modifier.type.rotation.name=Rotation
 components.provider.filter.blockFilter.description=Exclude blocks from pasting
-components.provider.filter.blockFilter.name=
+components.provider.filter.blockFilter.name=Block Filter
 components.provider.flip.fixed.description=A fixed flip value
 components.provider.flip.fixed.name=Fixed
 components.provider.flip.list.description=A list of possible flip values which will be chosen by random

diff --git a/schematicbrushreborn-core/src/main/resources/messages_zh_TW.properties b/schematicbrushreborn-core/src/main/resources/messages_zh_TW.properties
@@ -1,10 +1,12 @@
-about=%PLUGIN_NAME% by %AUTHORS%\n版本: %VERSION%\nSpigot: %WEBSITE%\nDiscord: %DISCORD%
+commands.about=%PLUGIN_NAME% by %AUTHORS%\n版本: %VERSION%\nSpigot: %WEBSITE%\nDiscord: %DISCORD%
+
 dialog.accept=同意
 dialog.add=加入
 dialog.deny=拒絕
 dialog.leftClickChange=左鍵點擊更改
 dialog.remove=刪除
 dialog.rightClickRemove=右鍵點擊刪除
+
 error.invalidArguments=無效的參數. 語法: %SYNTAX%
 error.invalidBoolean=無效的參數值, %TRUE% 或 %FALSE%
 error.invalidCommand=無效的指令
@@ -15,6 +17,7 @@ error.invalidNumber=無效號碼
 error.invalidRange=輸入的參數值超出範圍. 最大: %MAX% 最小: %MIN%
 error.invalidSender=不能在這裡執行此指令.
 error.missingArgument=參數 %INDEX% 已被訪問但不存在.
+error.notABrush=這不是原理圖筆刷.
 error.notAsConsole=不能用控制臺執行此指令.
 error.notAsPlayer=玩家不能執行此指令
 error.notOnline=未知玩家. 此玩家不在線上.
@@ -24,6 +27,5 @@ error.permission=你沒有執行此指令的權限. (%PERMISSION%)
 error.tooLarge=數字過大. 最大值: %MAX%
 error.tooSmall=數字太小. 最小值: %MIN%
 error.unkownPlayer=未知玩家. 此玩家沒有玩過本伺服器.
-error.unkownWorld=未知玩家. 此玩家沒有玩過本伺服器.
-error.notABrush=這不是原理圖筆刷.
 error.unkownPreset=預設 %NAME% 不存在.
+error.unkownWorld=未知玩家. 此玩家沒有玩過本伺服器.
diff --git a/schematicbrushreborn-paper/build.gradle.kts b/schematicbrushreborn-paper/build.gradle.kts
@@ -8,6 +8,7 @@ val shadebase = "de.eldoria.schematicbrush.libs."
 dependencies {
     implementation(project(":schematicbrushreborn-core"))
     bukkitLibrary(libs.bundles.utilities)
+    bukkitLibrary(libs.bundles.jackson)
     bukkitLibrary(libs.adventure.bukkit)
 }
 

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -32,7 +32,7 @@ dependencyResolutionManagement {
             library("adventure-bukkit", "net.kyori:adventure-platform-bukkit:4.3.3")
             library("adventure-minimessage", "net.kyori:adventure-text-minimessage:4.17.0")
             // utilities
-            version("utilities", "2.1.1")
+            version("utilities", "2.1.2")
             library("eldoutil-plugin", "de.eldoria.util","plugin").versionRef("utilities")
             library("eldoutil-jackson", "de.eldoria.util","jackson-configuration").versionRef("utilities")
             library("eldoutil-serialization", "de.eldoria.util","legacy-serialization").versionRef("utilities")