From 023e2bda2aa4e6338715396db6ad8ddf836fd4d7 Mon Sep 17 00:00:00 2001
From: JFronny <git@akbvopenfl1.hopto.org>
Date: Fri, 2 Dec 2022 16:30:22 +0100
Subject: [PATCH] Update to new infrastructure

---
 .gitlab-ci.yml                     |  2 --
 .woodpecker.yml                    |  1 +
 build.gradle => build.gradle.kts   | 20 +++++++++++++-------
 gradle.properties                  | 11 ++++++-----
 settings.gradle.kts                | 13 +++++++++++++
 src/main/resources/fabric.mod.json | 24 +++++++++---------------
 6 files changed, 42 insertions(+), 29 deletions(-)
 delete mode 100644 .gitlab-ci.yml
 create mode 100644 .woodpecker.yml
 rename build.gradle => build.gradle.kts (50%)
 create mode 100644 settings.gradle.kts

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
deleted file mode 100644
index c428712..0000000
--- a/.gitlab-ci.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-include:
-  - remote: 'https://jfmods.gitlab.io/scripts/jfmod.yml'
diff --git a/.woodpecker.yml b/.woodpecker.yml
new file mode 100644
index 0000000..f2c1117
--- /dev/null
+++ b/.woodpecker.yml
@@ -0,0 +1 @@
+#link https://pages.frohnmeyer-wds.de/scripts/jfmod.yml
\ No newline at end of file
diff --git a/build.gradle b/build.gradle.kts
similarity index 50%
rename from build.gradle
rename to build.gradle.kts
index c722228..9cac7a3 100644
--- a/build.gradle
+++ b/build.gradle.kts
@@ -1,12 +1,18 @@
-apply from: "https://jfmods.gitlab.io/scripts/gradle/v2.gradle"
+import io.gitlab.jfronny.scripts.*
+
+plugins {
+    id("jfmod") version "1.2-SNAPSHOT"
+    id("io.gitlab.jfronny.libjf.libjf-config-compiler-plugin")
+}
+
 
 dependencies {
-    modImplementation("io.gitlab.jfronny.libjf:libjf-config-core-v1:${project.libjf_version}")
-    modImplementation("io.gitlab.jfronny.libjf:libjf-unsafe-v0:${project.libjf_version}")
+    modImplementation("io.gitlab.jfronny.libjf:libjf-config-core-v1:${prop("libjf_version")}")
+    modImplementation("io.gitlab.jfronny.libjf:libjf-unsafe-v0:${prop("libjf_version")}")
 
     // Dev env
-    modLocalRuntime("io.gitlab.jfronny.libjf:libjf-config-reflect-v1:${project.libjf_version}")
-    modLocalRuntime("io.gitlab.jfronny.libjf:libjf-config-ui-tiny-v1:${project.libjf_version}")
-    modLocalRuntime("io.gitlab.jfronny.libjf:libjf-devutil:${project.libjf_version}")
-    modLocalRuntime("com.terraformersmc:modmenu:4.0.6")
+    modLocalRuntime("io.gitlab.jfronny.libjf:libjf-config-reflect-v1:${prop("libjf_version")}")
+    modLocalRuntime("io.gitlab.jfronny.libjf:libjf-config-ui-tiny-v1:${prop("libjf_version")}")
+    modLocalRuntime("io.gitlab.jfronny.libjf:libjf-devutil:${prop("libjf_version")}")
+    modLocalRuntime("com.terraformersmc:modmenu:4.1.1")
 }
diff --git a/gradle.properties b/gradle.properties
index 6e6e5b3..0df0f9a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,16 +1,17 @@
 # https://fabricmc.net/develop/
 minecraft_version=1.19.2
-yarn_mappings=build.8
-loader_version=0.14.9
+yarn_mappings=build.24
+loader_version=0.14.11
+
 maven_group=io.jfronny.gitlab
 archives_base_name=quickmath
 
-fabric_version=0.60.0+1.19.2
-libjf_version=3.0.3
-
 modrinth_id=quickmath
 modrinth_required_dependencies=libjf
 modrinth_optional_dependencies=modmenu
 curseforge_id=400837
 curseforge_required_dependencies=libjf
 curseforge_optional_dependencies=modmenu
+
+fabric_version=0.68.0+1.19.2
+libjf_version=3.2.1
diff --git a/settings.gradle.kts b/settings.gradle.kts
new file mode 100644
index 0000000..759b3a5
--- /dev/null
+++ b/settings.gradle.kts
@@ -0,0 +1,13 @@
+pluginManagement {
+    val libjf_version: String by settings
+    repositories {
+        maven("https://maven.fabricmc.net/") // FabricMC
+        maven("https://maven.frohnmeyer-wds.de/artifacts") // scripts
+        gradlePluginPortal()
+    }
+    plugins {
+        id("io.gitlab.jfronny.libjf.libjf-config-compiler-plugin") version libjf_version
+    }
+}
+
+rootProject.name = "quickmath"
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index 3876258..b230019 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -4,31 +4,25 @@
   "provides": ["quickmeth"],
   "version": "${version}",
   "name": "QuickMäth",
-  "description": "Replaces math methods with incorrect alternatives",
+  "description": "Replaces math methods with incorrect alternatives, causing interesting corruption",
   "authors": [
     "JFronny"
   ],
   "contact": {
-    "website": "https://jfronny.gitlab.io",
-    "repo": "https://gitlab.com/jfmods/quickmath"
+    "email": "projects.contact@frohnmeyer-wds.de",
+    "homepage": "https://jfronny.gitlab.io",
+    "issues": "https://git.frohnmeyer-wds.de/JfMods/QuickMath/issues",
+    "sources": "https://git.frohnmeyer-wds.de/JfMods/QuickMath"
   },
   "license": "MIT",
   "icon": "assets/quickmath/icon.png",
   "environment": "*",
   "entrypoints": {
-    "libjf:config": [
-      "io.gitlab.jfronny.quickmath.Cfg"
-    ],
-    "libjf:asm": [
-      "io.gitlab.jfronny.quickmath.BytecodeTransformer"
-    ],
-    "main": [
-      "io.gitlab.jfronny.quickmath.ModMain"
-    ]
+    "libjf:config": ["io.gitlab.jfronny.quickmath.Cfg"],
+    "libjf:asm": ["io.gitlab.jfronny.quickmath.BytecodeTransformer"],
+    "main": ["io.gitlab.jfronny.quickmath.ModMain"]
   },
-  "mixins": [
-    "quickmath.mixins.json"
-  ],
+  "mixins": ["quickmath.mixins.json"],
   "depends": {
     "fabricloader": ">=0.13.3",
     "minecraft": "*",