1.17

.gitlab-ci.yml

@@ -18,7 +18,7 @@ build_natives:
     - master
 
 build_test:
-  image: gradle:alpine
+  image: gradle:jdk16
   stage: deploy
   script:
     - gradle --build-cache assemble
@@ -38,7 +38,7 @@ build_test:
     - master
 
 deploy:
-  image: gradle:alpine
+  image: gradle:jdk16
   stage: deploy
   when: manual
   script:

build.gradle

@@ -1,108 +1,26 @@
-plugins {
-    id 'fabric-loom' version '0.5-SNAPSHOT'
-    id 'maven-publish'
-    id "com.modrinth.minotaur" version "1.1.0"
-    id "com.matthewprenger.cursegradle" version "1.4.0"
-}
-
-sourceCompatibility = JavaVersion.VERSION_1_8
-targetCompatibility = JavaVersion.VERSION_1_8
-
-archivesBaseName = project.archives_base_name
-version = project.mod_version
-group = project.maven_group
+apply from: "https://gitlab.com/-/snippets/2121059/raw/master/jfbase.gradle"
 
 ext.flavor = project.hasProperty('flavor') ? project.getProperty('flavor') : 'modrinth'
 
 repositories {
+    maven { url = "https://maven.terraformersmc.com/"; name = "ModMenu" }
     maven { url = "https://maven.shedaniel.me/"; name = "Cloth Config" }
-    maven { url = 'https://maven.terraformersmc.com/'; name = "ModMenu" }
 }
 
 dependencies {
     //to change the versions see the gradle.properties file
     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}"
 
     // Fabric API. This is technically optional, but you probably want it anyway.
     modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
 
-    modApi include ("me.shedaniel.cloth:cloth-config-fabric:4.11.19")
-    modImplementation "com.terraformersmc:modmenu:1.16.9"
-}
-
-processResources {
-    inputs.property "version", project.version
-
-    from(sourceSets.main.resources.srcDirs) {
-        include "fabric.mod.json"
-        expand "version": project.version
-    }
-
-    from(sourceSets.main.resources.srcDirs) {
-        exclude "fabric.mod.json"
-        if (flavor == "curseforge") {
-            exclude "native/natives.dll"
-        }
-    }
-}
-
-// ensure that the encoding is set to UTF-8, no matter what the system default is
-// this fixes some edge cases with special characters not displaying correctly
-// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
-tasks.withType(JavaCompile) {
-    options.encoding = "UTF-8"
-}
-
-// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
-// if it is present.
-// If you remove this task, sources will not be generated.
-task sourcesJar(type: Jar, dependsOn: classes) {
-    classifier = "sources"
-    from sourceSets.main.allSource
-}
-
-jar {
-    from "LICENSE"
+    modApi include ("me.shedaniel.cloth:cloth-config-fabric:5.+")
+    modImplementation "com.terraformersmc:modmenu:2.+"
 }
 
 if (flavor == "curseforge") {
     sourceSets.main.java.filter.exclude("**/unsafe/*")
     sourceSets.main.resources.exclude("**/native/*")
 }
-
-import com.modrinth.minotaur.TaskModrinthUpload
-
-task publishModrinth (type: TaskModrinthUpload){
-    token = System.getenv("MODRINTH_API_TOKEN") // Use an environment property!
-    projectId = 'ibgLmpmd'
-    versionNumber = "${project.mod_version}"
-    uploadFile = remapJar // This is the java jar task
-    addGameVersion("${project.minecraft_version}")
-    addLoader('fabric')
-    versionName = "[${project.minecraft_version}] ${project.mod_version}"
-    afterEvaluate {
-        tasks.publishModrinth.dependsOn(remapJar)
-        tasks.publishModrinth.dependsOn(sourcesJar)
-    }
-}
-
-curseforge {
-    apiKey = System.getenv("CURSEFORGE_API_TOKEN") == null ? "###" : System.getenv("CURSEFORGE_API_TOKEN")
-    project {
-        id = "400842"
-        releaseType = 'release'
-        addGameVersion "Fabric"
-        addGameVersion "${project.minecraft_version}"
-        changelog = ""
-        mainArtifact(file("${project.buildDir}/libs/${archivesBaseName}-${version}.jar"))
-        mainArtifact.displayName = "[${project.minecraft_version}] ${project.mod_version}"
-        afterEvaluate {
-            uploadTask.dependsOn(remapJar)
-        }
-    }
-    options {
-        forgeGradleIntegration = false
-    }
-}

gradle.properties

@@ -2,13 +2,20 @@
 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.6
+minecraft_version=1.17-pre3
+yarn_mappings=build.1
 loader_version=0.11.3
 # Mod Properties
-mod_version=2.0
+mod_version=2.1
 maven_group=io.gitlab.jfronny
 archives_base_name=breakme
 # Dependencies
 # check this on https://modmuss50.me/fabric.html
-fabric_version=0.32.5+1.16
+fabric_version=0.34.8+1.17
+
+modrinth_id=ibgLmpmd
+modrinth_required_dependencies=
+modrinth_optional_dependencies=wRE7Emzz
+curseforge_id=400842
+curseforge_required_dependencies=cloth-config
+curseforge_optional_dependencies=modmenu

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()
-    }
-}