codeberg migration

Bump dev.rosewood:rosestacker from 1.5.39 to 1.5.40

.forgejo/workflows/renovate.yml

@@ -0,0 +1,41 @@
+name: Renovate
+
+on:
+  schedule:
+    - cron: '@daily'
+  push:
+    branches: [master]
+  workflow_dispatch:
+
+permissions:
+  contents: read
+  pull-requests: write
+
+jobs:
+  renovate:
+    runs-on: ubuntu-fat
+    container: ghcr.io/renovatebot/renovate:latest
+    steps:
+      - name: Checkout renovate-config repo
+        run: |
+          git clone https://codeberg.org/hyperdefined/renovate-config.git renovate-config
+
+      - name: Show workspace (debug)
+        run: |
+          echo "WORKSPACE: $GITHUB_WORKSPACE"
+          ls -la "$GITHUB_WORKSPACE"
+          ls -la "$GITHUB_WORKSPACE/renovate-config"
+          test -f "$GITHUB_WORKSPACE/renovate-config/config.js" || (echo "config.js missing" && exit 1)
+
+      - name: Run Renovate
+        run: renovate
+        env:
+          RENOVATE_CONFIG_FILE: renovate-config/config.js
+          LOG_LEVEL: debug
+          RENOVATE_GIT_PRIVATE_KEY: ${{ secrets.WOLF_BOT_KEY }}
+          RENOVATE_TOKEN: ${{ secrets.RENOVATE_TOKEN }}
+          GITHUB_COM_TOKEN: ${{ secrets.CODEBERG_PAT }}
+          GIT_AUTHOR_NAME: 'wolf-bot'
+          GIT_AUTHOR_EMAIL: 'wolf@hyper.lol'
+          GIT_COMMITTER_NAME: 'wolf-bot'
+          GIT_COMMITTER_EMAIL: 'wolf@hyper.lol'

.github/FUNDING.yml

@@ -1 +0,0 @@
-buy_me_a_coffee: hyperdefined

.github/dependabot.yml

@@ -1,8 +0,0 @@
-version: 2
-updates:
-- package-ecosystem: gradle
-  directory: "/"
-  schedule:
-    interval: daily
-    time: "11:00"
-  open-pull-requests-limit: 10

build.gradle.kts

@@ -15,8 +15,8 @@ repositories {
 
 dependencies {
     compileOnly("io.papermc.paper:paper-api:26.1.1.build.+")
-    compileOnly("dev.rosewood:rosestacker:1.5.39")
-    compileOnly("com.github.hyperdefined:hyperlib:1.0.14:all")
+    compileOnly("dev.rosewood:rosestacker:1.5.40")
+    compileOnly("org.codeber.hyperdefined:hyperlib:1.0.15:all")
 }
 
 group = "lol.hyper"

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,9 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip
 networkTimeout=10000
+retries=0
+retryBackOffMs=500
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -57,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/2d6327017519d23b96af35865dc997fcb544fb40/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/3d91ce3b8caaf77ad09f381f43615b715b53f72c/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.

gradlew.bat

@@ -23,8 +23,8 @@
 @rem
 @rem ##########################################################################
 
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
+@rem Set local scope for the variables, and ensure extensions are enabled
+setlocal EnableExtensions
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
@@ -51,7 +51,7 @@ echo. 1>&2
 echo Please set the JAVA_HOME variable in your environment to match the 1>&2
 echo location of your Java installation. 1>&2
 
-goto fail
+"%COMSPEC%" /c exit 1
 
 :findJavaFromJavaHome
 set JAVA_HOME=%JAVA_HOME:"=%
@@ -65,7 +65,7 @@ echo. 1>&2
 echo Please set the JAVA_HOME variable in your environment to match the 1>&2
 echo location of your Java installation. 1>&2
 
-goto fail
+"%COMSPEC%" /c exit 1
 
 :execute
 @rem Setup the command line
@@ -73,21 +73,10 @@ goto fail
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
+@rem endlocal doesn't take effect until after the line is parsed and variables are expanded
+@rem which allows us to clear the local environment before executing the java command
+endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel
 
-:end
-@rem End local scope for the variables with windows NT shell
-if %ERRORLEVEL% equ 0 goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-set EXIT_CODE=%ERRORLEVEL%
-if %EXIT_CODE% equ 0 set EXIT_CODE=1
-if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
-exit /b %EXIT_CODE%
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+:exitWithErrorLevel
+@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts
+"%COMSPEC%" /c exit %ERRORLEVEL%

renovate.json

@@ -0,0 +1,6 @@
+{
+    "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+    "enabled": true,
+    "extends": ["config:base"],
+    "osvVulnerabilityAlerts": true
+}

src/main/java/lol/hyper/toolstats/ToolStats.java

@@ -37,7 +37,7 @@ import java.io.File;
 
 public final class ToolStats extends JavaPlugin {
 
-    public final int CONFIG_VERSION = 17;
+    public final int CONFIG_VERSION = 18;
     public final ComponentLogger logger = this.getComponentLogger();
     public final File configFile = new File(this.getDataFolder(), "config.yml");
     public boolean tokens = false;
@@ -161,7 +161,7 @@ public final class ToolStats extends JavaPlugin {
         registerCommand("toolstats", commandToolStats);
 
         HyperUpdater updater = new HyperUpdater(hyperLib);
-        updater.setGitHub("hyperdefined", "ToolStats");
+        updater.setRepository("hyperdefined", "ToolStats");
         updater.setModrinth("oBZj9E15");
         updater.setHangar("ToolStats", "paper");
         updater.check();

src/main/java/lol/hyper/toolstats/ToolStatsLoader.java

@@ -30,7 +30,7 @@ public class ToolStatsLoader implements PluginLoader {
         MavenLibraryResolver resolver = new MavenLibraryResolver();
 
         resolver.addRepository(new RemoteRepository.Builder("jitpack", "default", "https://jitpack.io").build());
-        resolver.addDependency(new Dependency(new DefaultArtifact("com.github.hyperdefined:hyperlib:jar:all:1.0.14"), null));
+        resolver.addDependency(new Dependency(new DefaultArtifact("org.codeberg.hyperdefined:hyperlib:jar:all:1.0.15"), null));
 
         classpathBuilder.addLibrary(resolver);
     }

src/main/java/lol/hyper/toolstats/tools/TokenData.java

@@ -238,6 +238,21 @@ public class TokenData {
             }
         }
 
+        // set the item model
+        if (tokenConfig.getBoolean("item-model.enabled")) {
+            String itemModelValue = tokenConfig.getString("item-model.value");
+            if (itemModelValue == null || itemModelValue.isEmpty()) {
+                toolStats.logger.info("Could not find item model value for token {}", tokenType);
+                return null;
+            }
+            NamespacedKey itemModelKey = NamespacedKey.fromString(itemModelValue);
+            if (itemModelKey == null) {
+                toolStats.logger.info("{} is not a valid namespaced key!", itemModelValue);
+                return null;
+            }
+            token.setData(DataComponentTypes.ITEM_MODEL, itemModelKey);
+        }
+
         return token;
     }
 

src/main/java/lol/hyper/toolstats/tools/config/ConfigUpdater.java

@@ -44,6 +44,7 @@ public class ConfigUpdater {
             case 14 -> new Version15(toolStats).update(); // 14 to 15
             case 15 -> new Version16(toolStats).update(); // 15 to 16
             case 16 -> new Version17(toolStats).update(); // 16 to 17
+            case 17 -> new Version18(toolStats).update(); // 17 to 18
         }
     }
 }

src/main/java/lol/hyper/toolstats/tools/config/versions/Version18.java

@@ -0,0 +1,68 @@
+/*
+ * This file is part of ToolStats.
+ *
+ * ToolStats is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * ToolStats is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with ToolStats.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package lol.hyper.toolstats.tools.config.versions;
+
+import lol.hyper.toolstats.ToolStats;
+
+import java.io.File;
+import java.io.IOException;
+
+public class Version18 {
+
+    private final ToolStats toolStats;
+
+    /**
+     * Used for updating from version 17 to 18.
+     *
+     * @param toolStats ToolStats instance.
+     */
+    public Version18(ToolStats toolStats) {
+        this.toolStats = toolStats;
+    }
+
+    /**
+     * Perform the config update.
+     */
+    public void update() {
+        // save the old config first
+        try {
+            toolStats.config.save("plugins" + File.separator + "ToolStats" + File.separator + "config-17.yml");
+        } catch (IOException exception) {
+            toolStats.logger.error("Unable to save config-17.yml!", exception);
+        }
+
+        toolStats.logger.info("Updating config.yml to version 18.");
+        toolStats.config.set("config-version", 18);
+
+        for (String key : toolStats.config.getConfigurationSection("tokens.data").getKeys(false)) {
+            toolStats.logger.info("Adding tokens.data.{}.item-model.enabled", key);
+            toolStats.config.set("tokens.data." + key + ".item-model.enabled", false);
+            toolStats.logger.info("Adding tokens.data.{}.item-model.value", key);
+            toolStats.config.set("tokens.data." + key + ".item-model.value", "minecraft:paper");
+        }
+
+        // save the config and reload it
+        try {
+            toolStats.config.save("plugins" + File.separator + "ToolStats" + File.separator + "config.yml");
+        } catch (IOException exception) {
+            toolStats.logger.error("Unable to save config.yml!", exception);
+        }
+        toolStats.loadConfig();
+        toolStats.logger.info("Config has been updated to version 18. A copy of version 17 has been saved as config-17.yml");
+    }
+}

src/main/resources/config.yml

@@ -15,6 +15,9 @@ tokens:
         enabled: false
         type: float
         value: 1001
+      item-model:
+        enabled: false
+        value: "minecraft:paper"
     mob-kills:
       title: "&7ToolStats: &8Mob Kills Token"
       lore:
@@ -26,6 +29,9 @@ tokens:
         enabled: false
         type: float
         value: 1001
+      item-model:
+        enabled: false
+        value: "minecraft:paper"
     blocks-mined:
       title: "&7ToolStats: &8Blocks Mined Token"
       lore:
@@ -37,6 +43,9 @@ tokens:
         enabled: false
         type: float
         value: 1001
+      item-model:
+        enabled: false
+        value: "minecraft:paper"
     crops-mined:
       title: "&7ToolStats: &8Crops Mined Token"
       lore:
@@ -48,6 +57,9 @@ tokens:
         enabled: false
         type: float
         value: 1001
+      item-model:
+        enabled: false
+        value: "minecraft:paper"
     fish-caught:
       title: "&7ToolStats: &8Fish Caught Token"
       lore:
@@ -59,6 +71,9 @@ tokens:
         enabled: false
         type: float
         value: 1001
+      item-model:
+        enabled: false
+        value: "minecraft:paper"
     sheep-sheared:
       title: "&7ToolStats: &8Sheep Sheared Token"
       lore:
@@ -70,6 +85,9 @@ tokens:
         enabled: false
         type: float
         value: 1001
+      item-model:
+        enabled: false
+        value: "minecraft:paper"
     damage-taken:
       title: "&7ToolStats: &8Damage Taken Token"
       lore:
@@ -81,6 +99,9 @@ tokens:
         enabled: false
         type: float
         value: 1001
+      item-model:
+        enabled: false
+        value: "minecraft:paper"
     damage-done:
       title: "&7ToolStats: &8Damage Done Token"
       lore:
@@ -92,6 +113,9 @@ tokens:
         enabled: false
         type: float
         value: 1001
+      item-model:
+        enabled: false
+        value: "minecraft:paper"
     arrows-shot:
       title: "&7ToolStats: &8Arrows Shot Token"
       lore:
@@ -103,6 +127,9 @@ tokens:
         enabled: false
         type: float
         value: 1001
+      item-model:
+        enabled: false
+        value: "minecraft:paper"
     flight-time:
       title: "&7ToolStats: &8Flight Time Token"
       lore:
@@ -114,6 +141,9 @@ tokens:
         enabled: false
         type: float
         value: 1001
+      item-model:
+        enabled: false
+        value: "minecraft:paper"
     reset:
       title: "&7ToolStats: &8Reset Token"
       lore:
@@ -125,6 +155,9 @@ tokens:
         enabled: false
         type: float
         value: 1001
+      item-model:
+        enabled: false
+        value: "minecraft:paper"
     remove:
       title: "&7ToolStats: &8Remove Token"
       lore:
@@ -136,6 +169,9 @@ tokens:
         enabled: false
         type: float
         value: 1001
+      item-model:
+        enabled: false
+        value: "minecraft:paper"
     wither-kills:
       title: "&7ToolStats: &8Wither Kills Token"
       lore:
@@ -147,6 +183,9 @@ tokens:
         enabled: false
         type: float
         value: 1001
+      item-model:
+        enabled: false
+        value: "minecraft:paper"
     enderdragon-kills:
       title: "&7ToolStats: &8Ender Dragon Kills Token"
       lore:
@@ -158,6 +197,9 @@ tokens:
         enabled: false
         type: float
         value: 1001
+      item-model:
+        enabled: false
+        value: "minecraft:paper"
     critical-strikes:
       title: "&7ToolStats: &8Critical Strikes Token"
       lore:
@@ -169,6 +211,9 @@ tokens:
         enabled: false
         type: float
         value: 1001
+      item-model:
+        enabled: false
+        value: "minecraft:paper"
     trident-throws:
       title: "&7ToolStats: &8Trident Throws Token"
       lore:
@@ -180,6 +225,9 @@ tokens:
         enabled: false
         type: float
         value: 1001
+      item-model:
+        enabled: false
+        value: "minecraft:paper"
     logs-stripped:
       title: "&7ToolStats: &8Logs Stripped Token"
       lore:
@@ -191,6 +239,9 @@ tokens:
         enabled: false
         type: float
         value: 1001
+      item-model:
+        enabled: false
+        value: "minecraft:paper"
 
 enabled:
   # Will show "Crafted by <player>"
@@ -437,4 +488,4 @@ world-limit:
     - world_1
     - world_2
 
-config-version: 17
+config-version: 18