From 66fc0ff338de981e2908c3e86f70f17d305ff008 Mon Sep 17 00:00:00 2001
From: JFronny <jo.frohnmeyer@protonmail.com>
Date: Wed, 10 Nov 2021 17:10:11 +0100
Subject: [PATCH] LibJF 2.1.3

---
 .gitlab-ci.yml                                | 22 +++++++++++--------
 build.gradle                                  |  8 ++++++-
 gradle.properties                             |  8 ++++---
 .../java/io/gitlab/jfronny/slyde/Cfg.java     |  4 ++--
 src/main/resources/fabric.mod.json            |  4 ++--
 5 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d27849f..4b24385 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: gradle:jdk16
+image: gradle:jdk17
 
 variables:
   GRADLE_OPTS: "-Dorg.gradle.daemon=false"
@@ -6,23 +6,27 @@ variables:
 before_script:
   - export GRADLE_USER_HOME=`pwd`/.gradle
 
+stages:
+  - build
+  - deploy
+
 build_test:
-  stage: deploy
+  stage: build
   script:
-    - gradle --build-cache assemble
+    - gradle --build-cache build
     - cp build/libs/* ./
-    - rm *-dev.jar
+    - mv *-dev.jar dev.zip
     - mv *.jar latest.jar
+    - mv dev.zip latest-dev.jar
   artifacts:
     paths:
       - build/libs
       - latest.jar
-  only:
-    - master
+      - latest-dev.jar
 
 deploy:
+  rules:
+    - if: $CI_COMMIT_TAG && '$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME =~ /^master/'
   stage: deploy
-  when: manual
   script:
-    - gradle --build-cache publishModrinth
-    - gradle --build-cache curseforge
+    - gradle --build-cache build curseforge modrinth
diff --git a/build.gradle b/build.gradle
index efb7cf7..0195016 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,6 +6,9 @@ repositories {
         name = 'TerraformersMC'
         url = 'https://maven.terraformersmc.com/'
     }
+    maven {
+        url "https://gitlab.com/api/v4/projects/25805200/packages/maven"
+    }
 }
 
 dependencies {
@@ -19,6 +22,9 @@ dependencies {
 
     modImplementation "maven.modrinth:sodium:mc1.17.1-0.3.0"
 
-    download("https://gitlab.com/jfmods/LibJF/-/jobs/artifacts/master/raw/latest-dev.jar?job=build_test", "libjf")
+    include modImplementation("io.gitlab.jfronny.libjf:libjf-config-v0:${project.jfapi_version}")
+    include("io.gitlab.jfronny.libjf:libjf-unsafe-v0:${project.jfapi_version}")
+    include("io.gitlab.jfronny.libjf:libjf-base:${project.jfapi_version}")
+
     modImplementation "com.terraformersmc:modmenu:2.0.5"
 }
diff --git a/gradle.properties b/gradle.properties
index 9892ebe..541faef 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,15 +1,17 @@
 # Done to increase the memory available to gradle.
 org.gradle.jvmargs=-Xmx1G
 # Fabric Properties
-# check these on https://modmuss50.me/fabric.html
+# check these on https://fabricmc.net/versions.html
 minecraft_version=1.17.1
-yarn_mappings=build.40
-loader_version=0.11.6
+yarn_mappings=build.63
+loader_version=0.12.5
 # Mod Properties
 mod_version=1.4.1
 maven_group=io.gitlab.jfronny
 archives_base_name=Slyde
 
+jfapi_version=2.1.3
+
 modrinth_id=diCZrsch
 modrinth_required_dependencies=
 modrinth_optional_dependencies=wRE7Emzz
diff --git a/src/main/java/io/gitlab/jfronny/slyde/Cfg.java b/src/main/java/io/gitlab/jfronny/slyde/Cfg.java
index b4dd538..136e5e1 100644
--- a/src/main/java/io/gitlab/jfronny/slyde/Cfg.java
+++ b/src/main/java/io/gitlab/jfronny/slyde/Cfg.java
@@ -1,7 +1,7 @@
 package io.gitlab.jfronny.slyde;
 
-import io.gitlab.jfronny.libjf.config.Entry;
-import io.gitlab.jfronny.libjf.config.JfConfig;
+import io.gitlab.jfronny.libjf.config.api.Entry;
+import io.gitlab.jfronny.libjf.config.api.JfConfig;
 
 public class Cfg implements JfConfig {
     @Entry
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index d6b5b69..a2c9608 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -23,8 +23,8 @@
     "slyde.mixins.json"
   ],
   "depends": {
-    "fabricloader": ">=0.10.0+build.208",
+    "fabricloader": ">=0.12.0",
     "minecraft": "*",
-    "libjf": ">=1.2.0"
+    "libjf-config-v0": ">=2.1.3"
   }
 }