From 2932dccb1c0b2cac16fbc3bc038dc3ccdd38eb54 Mon Sep 17 00:00:00 2001
From: JFronny <git@akbvopenfl1.hopto.org>
Date: Tue, 30 Nov 2021 20:18:58 +0100
Subject: [PATCH] Update for 1.18

---
 .gitlab-ci.yml                                | 34 ++-----------------
 build.gradle                                  | 15 ++------
 gradle.properties                             | 15 +++-----
 .../resclone/fetchers/CurseforgeFetcher.java  |  2 +-
 4 files changed, 9 insertions(+), 57 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4b24385..c428712 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,32 +1,2 @@
-image: gradle:jdk17
-
-variables:
-  GRADLE_OPTS: "-Dorg.gradle.daemon=false"
-
-before_script:
-  - export GRADLE_USER_HOME=`pwd`/.gradle
-
-stages:
-  - build
-  - deploy
-
-build_test:
-  stage: build
-  script:
-    - gradle --build-cache build
-    - cp build/libs/* ./
-    - mv *-dev.jar dev.zip
-    - mv *.jar latest.jar
-    - mv dev.zip latest-dev.jar
-  artifacts:
-    paths:
-      - build/libs
-      - latest.jar
-      - latest-dev.jar
-
-deploy:
-  rules:
-    - if: $CI_COMMIT_TAG && '$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME =~ /^master/'
-  stage: deploy
-  script:
-    - gradle --build-cache build curseforge modrinth
+include:
+  - remote: 'https://jfmods.gitlab.io/scripts/jfmod.yml'
diff --git a/build.gradle b/build.gradle
index b5a0834..3f3d11c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,16 +1,5 @@
-apply from: "https://gitlab.com/-/snippets/2121059/raw/master/jfbase.gradle"
-
-repositories {
-    maven {
-        name = 'TerraformersMC'
-        url = 'https://maven.terraformersmc.com/'
-    }
-}
+apply from: "https://jfmods.gitlab.io/scripts/jfmod.gradle"
 
 dependencies {
-    minecraft "com.mojang:minecraft:${project.minecraft_version}"
-    mappings "net.fabricmc:yarn:${project.minecraft_version}+${project.yarn_mappings}:v2"
-    modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
-
-    modImplementation "com.terraformersmc:modmenu:2.0.7"
+    modImplementation "com.terraformersmc:modmenu:3.0.0"
 }
diff --git a/gradle.properties b/gradle.properties
index 1ef2665..37f0254 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,18 +2,11 @@
 org.gradle.jvmargs=-Xmx1G
 # Fabric Properties
 # check these on https://fabricmc.net/versions.html
-minecraft_version=1.17.1
-yarn_mappings=build.63
-loader_version=0.12.5
+minecraft_version=1.18
+yarn_mappings=build.1
+loader_version=0.12.6
 # Mod Properties
-mod_version=1.7.1
 maven_group=io.gitlab.jfronny
 archives_base_name=resclone
 
-modrinth_id=kVAQyCLX
-modrinth_required_dependencies=
-modrinth_optional_dependencies=
-curseforge_id=none
-curseforge_required_dependencies=
-curseforge_optional_dependencies=
-
+modrinth_id=kVAQyCLX
\ No newline at end of file
diff --git a/src/main/java/io/gitlab/jfronny/resclone/fetchers/CurseforgeFetcher.java b/src/main/java/io/gitlab/jfronny/resclone/fetchers/CurseforgeFetcher.java
index 490b522..e3e445f 100644
--- a/src/main/java/io/gitlab/jfronny/resclone/fetchers/CurseforgeFetcher.java
+++ b/src/main/java/io/gitlab/jfronny/resclone/fetchers/CurseforgeFetcher.java
@@ -20,7 +20,7 @@ public class CurseforgeFetcher extends BasePackFetcher {
         try {
             SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'hh:mm:ss.SSS'Z'");
 
-            String version = MinecraftVersion.GAME_VERSION.getName();
+            String version = MinecraftVersion.CURRENT.getName();
 
             CfAddon latest = null;
             Date latestDate = null;