chore: update to 1.20.5

.gitlab-ci.yml

@@ -1,2 +0,0 @@
-include:
-  - remote: 'https://jfmods.gitlab.io/scripts/jfmod.yml'

.woodpecker.yml

@@ -0,0 +1 @@
+#link https://pages.frohnmeyer-wds.de/scripts/jfmod.yml

build.gradle

@@ -1,12 +0,0 @@
-apply from: "https://jfmods.gitlab.io/scripts/jfmod.gradle"
-
-dependencies {
-    modImplementation("io.gitlab.jfronny.libjf:libjf-config-v0:${project.jfapi_version}")
-    modRuntimeOnly("io.gitlab.jfronny.libjf:libjf-devutil-v0:${project.jfapi_version}")
-
-    modImplementation "com.terraformersmc:modmenu:4.0.5"
-
-    // Compat fix
-    modRuntimeOnly(fabricApi.module("fabric-command-api-v2", "${project.fabric_version}"))
-    modRuntimeOnly(fabricApi.module("fabric-lifecycle-events-v1", "${project.fabric_version}"))
-}

build.gradle.kts

@@ -0,0 +1,38 @@
+plugins {
+    id("jfmod") version "1.6-SNAPSHOT"
+}
+
+allprojects { group = "io.gitlab.jfronny" }
+base.archivesName = "versionchanger"
+
+jfMod {
+    minecraftVersion = "1.20.5"
+    yarn("build.1")
+    loaderVersion = "0.15.10"
+    libJfVersion = "3.15.3"
+    fabricApiVersion = "0.97.6+1.20.5"
+
+    modrinth {
+        projectId = "versionchanger"
+        requiredDependencies.add("libjf")
+        optionalDependencies.add("modmenu")
+    }
+    curseforge {
+        projectId = "400771"
+        requiredDependencies.add("libjf")
+        optionalDependencies.add("modmenu")
+    }
+}
+
+dependencies {
+    modImplementation("io.gitlab.jfronny.libjf:libjf-config-core-v2")
+
+    // Dev env
+    modLocalRuntime("io.gitlab.jfronny.libjf:libjf-config-ui-tiny")
+    modLocalRuntime("io.gitlab.jfronny.libjf:libjf-devutil")
+    modLocalRuntime("com.terraformersmc:modmenu:10.0.0-beta.1")
+    // for modmenu
+    modLocalRuntime("net.fabricmc.fabric-api:fabric-resource-loader-v0")
+    modLocalRuntime("net.fabricmc.fabric-api:fabric-screen-api-v1")
+    modLocalRuntime("net.fabricmc.fabric-api:fabric-key-binding-api-v1")
+}

gradle.properties

@@ -1,16 +0,0 @@
-# Fabric Properties https://fabricmc.net/develop/
-minecraft_version=1.19.1
-yarn_mappings=build.1
-loader_version=0.14.8
-maven_group=io.gitlab.jfronny
-archives_base_name=versionchanger
-
-jfapi_version=2.10.0
-fabric_version=0.58.5+1.19.1
-
-modrinth_id=387LWVd9
-modrinth_required_dependencies=WKwQAwke
-modrinth_optional_dependencies=mOgUt4GM
-curseforge_id=400771
-curseforge_required_dependencies=libjf
-curseforge_optional_dependencies=modmenu

settings.gradle.kts

@@ -0,0 +1,9 @@
+pluginManagement {
+    repositories {
+        maven("https://maven.fabricmc.net/") // FabricMC
+        maven("https://maven.frohnmeyer-wds.de/artifacts") // scripts
+        gradlePluginPortal()
+    }
+}
+
+rootProject.name = "versionchanger"

src/main/java/io/gitlab/jfronny/versionchanger/Cfg.java

@@ -1,9 +1,13 @@
 package io.gitlab.jfronny.versionchanger;
 
-import io.gitlab.jfronny.libjf.config.api.Entry;
-import io.gitlab.jfronny.libjf.config.api.JfConfig;
+import io.gitlab.jfronny.libjf.config.api.v2.Entry;
+import io.gitlab.jfronny.libjf.config.api.v2.JfConfig;
 
-public class Cfg implements JfConfig {
-    @Entry
-    public static String version = "1.7.10 Definitive Edition";
+@JfConfig
+public class Cfg  {
+    @Entry public static String version = "1.7.10 Definitive Edition";
+
+    static {
+        JFC_Cfg.ensureInitialized();
+    }
 }

src/main/java/io/gitlab/jfronny/versionchanger/mixin/MixinMinecraftVersion.java

@@ -13,17 +13,12 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(MinecraftVersion.class)
 public class MixinMinecraftVersion {
-    @Mutable
-    @Final
-    @Shadow
-    private String releaseTarget;
     @Mutable
     @Final
     @Shadow
     private String name;
     @Inject(at = @At("RETURN"), method = "<init>()V")
     public void init(CallbackInfo info) {
-        releaseTarget = Cfg.version;
         name = Cfg.version;
     }
 

src/main/resources/fabric.mod.json

@@ -1,21 +1,21 @@
 {
   "schemaVersion": 1,
   "id": "versionchanger",
-  "version": "${version}",
   "name": "VersionChanger",
+  "version": "${version}",
   "description": "Changes the displayed Minecraft-version",
-  "authors": [
-    "JFronny"
-  ],
+  "authors": ["JFronny"],
   "contact": {
-    "website": "https://jfronny.gitlab.io",
-    "repo": "https://gitlab.com/jfmods/VersionChanger"
+    "email": "projects.contact@frohnmeyer-wds.de",
+    "homepage": "https://jfronny.gitlab.io",
+    "issues": "https://git.frohnmeyer-wds.de/JfMods/VersionChanger/issues",
+    "sources": "https://git.frohnmeyer-wds.de/JfMods/VersionChanger"
   },
   "license": "MIT",
   "icon": "assets/versionchanger/icon.png",
   "environment": "*",
   "entrypoints": {
-    "libjf:config": ["io.gitlab.jfronny.versionchanger.Cfg"]
+    "libjf:config": ["io.gitlab.jfronny.versionchanger.JFC_Cfg"]
   },
   "mixins": [
     "versionchanger.mixins.json"
@@ -23,6 +23,6 @@
   "depends": {
     "fabricloader": ">=0.12.0",
     "minecraft": "*",
-    "libjf-config-v0": ">=2.1.3"
+    "libjf-config-core-v1": ">=2.1.3"
   }
 }