1.17

.gitlab-ci.yml

@@ -1,4 +1,4 @@
-image: gradle:alpine
+image: gradle:jdk16
 
 variables:
   GRADLE_OPTS: "-Dorg.gradle.daemon=false"

build.gradle

@@ -1,5 +1,23 @@
-plugins {
-    id 'fabric-loom' version '0.5-SNAPSHOT'
+apply from: "https://gitlab.com/-/snippets/2121059/raw/master/jfbase.gradle"
+
+repositories {
+    maven {
+        name = 'TerraformersMC'
+        url = 'https://maven.terraformersmc.com/'
+    }
+}
+
+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 "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
+    modImplementation "com.terraformersmc:modmenu:2.0.0-beta.7"
+}
+
+/*plugins {
+    id 'fabric-loom' version '0.7-SNAPSHOT'
     id 'maven-publish'
     id "com.modrinth.minotaur" version "1.1.0"
 }
@@ -17,11 +35,11 @@ repositories {
 
 dependencies {
     minecraft "com.mojang:minecraft:${project.minecraft_version}"
-    mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
+    mappings "net.fabricmc:yarn:${project.minecraft_version}+${project.yarn_mappings}:v2"
     modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
 
     modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
-    modCompile "com.terraformersmc:modmenu:1.16.8"
+    modImplementation "com.terraformersmc:modmenu:1.16.9"
 }
 
 processResources {
@@ -71,3 +89,4 @@ task publishModrinth (type: TaskModrinthUpload){
         tasks.publishModrinth.dependsOn(sourcesJar)
     }
 }
+*/

gradle.properties

@@ -2,13 +2,21 @@
 org.gradle.jvmargs=-Xmx1G
 # Fabric Properties
 # check these on https://modmuss50.me/fabric.html
-minecraft_version=1.16.5
-yarn_mappings=1.16.5+build.8
+minecraft_version=1.17-pre3
+yarn_mappings=build.1
 loader_version=0.11.3
 # Mod Properties
-mod_version=1.7.0
+mod_version=1.7.1
 maven_group=io.gitlab.jfronny
 archives_base_name=resclone
 # Dependencies
 # check this on https://modmuss50.me/fabric.html
-fabric_version=0.34.1+1.16
+fabric_version=0.34.8+1.17
+
+modrinth_id=kVAQyCLX
+modrinth_required_dependencies=
+modrinth_optional_dependencies=
+curseforge_id=none
+curseforge_required_dependencies=
+curseforge_optional_dependencies=
+

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -130,7 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath

gradlew.bat

@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,21 +64,6 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
@@ -86,7 +71,7 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell

settings.gradle

@@ -1,10 +0,0 @@
-pluginManagement {
-    repositories {
-        jcenter()
-        maven {
-            name = 'Fabric'
-            url = 'https://maven.fabricmc.net/'
-        }
-        gradlePluginPortal()
-    }
-}

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.field_25319.getName();
+            String version = MinecraftVersion.GAME_VERSION.getName();
 
             CfAddon latest = null;
             Date latestDate = null;

src/main/java/io/gitlab/jfronny/resclone/mixin/GameOptionsMixin.java

@@ -2,7 +2,7 @@ package io.gitlab.jfronny.resclone.mixin;
 
 import io.gitlab.jfronny.resclone.Resclone;
 import io.gitlab.jfronny.resclone.data.PackMetaLoaded;
-import net.minecraft.client.options.GameOptions;
+import net.minecraft.client.option.GameOptions;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;