Update to MC1.18.1 and remove FTBChunks support temporarily

frank89722 · Dec 22, 2021 · 44c5ca1 · 44c5ca1
1 parent d58c439
commit 44c5ca1
Show file tree

Hide file tree

Showing 21 changed files with 251 additions and 189 deletions.
diff --git a/.github/workflows/build_cf.yml b/.github/workflows/build_cf.yml
@@ -18,10 +18,10 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - name: Set up JDK 8
+      - name: Set up JDK 17
         uses: actions/setup-java@v1
         with:
-          java-version: 8
+          java-version: 7
 
       - uses: actions/cache@v2
         with:

diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         maven { url = 'https://repo.spongepowered.org/repository/maven-public/' }
     }
     dependencies {
-        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '4.+', changing: true
+        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true
         classpath 'org.spongepowered:mixingradle:0.7-SNAPSHOT'
     }
 }
@@ -25,15 +25,15 @@ version = "${MC_VERSION}-${VERSION}-${ENV.GITHUB_RUN_NUMBER ?: 'dev'}"
 group = 'frankv.jmi' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = 'jmi'
 
-java.toolchain.languageVersion = JavaLanguageVersion.of(8) // Mojang ships Java 8 to end users, so your mod should target Java 8.
+java.toolchain.languageVersion = JavaLanguageVersion.of(17)
 
 println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch'))
 
 println("##[set-output name=modid;]${archivesBaseName}")
 println("##[set-output name=version;]${version}")
 
 minecraft {
-    mappings channel: 'official', version: '1.16.5'
+    mappings channel: 'official', version: '1.18.1'
     runs {
         client {
             workingDirectory project.file('run')
@@ -126,19 +126,20 @@ repositories {
 }
 
 dependencies {
-    minecraft 'net.minecraftforge:forge:1.16.5-36.2.0'
-
-    compile 'org.spongepowered:mixin:0.8'
-    annotationProcessor "org.spongepowered:mixin:0.8.2:processor"
-
-    implementation fg.deobf("me.shedaniel:architectury-forge:1.20.28")
-    implementation fg.deobf("dev.ftb.mods:ftb-library-forge:1605.3.3-build.71") { transitive = false }
-    implementation fg.deobf("dev.ftb.mods:ftb-teams-forge:1605.2.2-build.32") { transitive = false }
-    implementation fg.deobf("dev.ftb.mods:ftb-chunks-forge:1605.3.2-build.57") { transitive = false }
-    implementation fg.deobf("curse.maven:waystones-245755:3440017")
-    implementation fg.deobf("curse.maven:journeymap-32274:3395279")
-    implementation fg.deobf("curse.maven:patchouli-306770:3459118")
-    implementation fg.deobf("curse.maven:geolosys-271856:3342071")
+    minecraft "net.minecraftforge:forge:${MC_VERSION}-${FORGE_VERSION}"
+
+    compileOnly 'org.spongepowered:mixin:0.8.5'
+    annotationProcessor "org.spongepowered:mixin:0.8.5:processor"
+
+    //implementation fg.deobf("me.shedaniel:architectury-forge:1.20.28")
+    //implementation fg.deobf("dev.ftb.mods:ftb-library-forge:1605.3.3-build.71") { transitive = false }
+    //implementation fg.deobf("dev.ftb.mods:ftb-teams-forge:1605.2.2-build.32") { transitive = false }
+    //implementation fg.deobf("dev.ftb.mods:ftb-chunks-forge:1605.3.2-build.57") { transitive = false }
+    implementation fg.deobf("curse.maven:balm-531761:3562184")
+	implementation fg.deobf("curse.maven:waystones-245755:3558793")
+    implementation fg.deobf("curse.maven:journeymap-32274:3573567")
+    //implementation fg.deobf("curse.maven:patchouli-306770:3459118")
+    //implementation fg.deobf("curse.maven:geolosys-271856:3342071")
     //compileOnly fg.deobf("info.journeymap:journeymap-api:1.16.5-1.7-SNAPSHOT")
 
 }
@@ -176,7 +177,7 @@ if (ENV.CF_TOKEN) {
             mainArtifact(jar)
             relations {
                 requiredDependency 'journeymap'
-                optionalDependency 'ftb-chunks-forge'
+                //optionalDependency 'ftb-chunks-forge'
                 optionalDependency 'waystones'
             }
             changelog = ENV.CHANGELOG

diff --git a/gradle.properties b/gradle.properties
@@ -2,7 +2,8 @@
 # This is required to provide enough memory for the Minecraft decompilation process.
 org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
-MC_VERSION=1.16.5
-VERSION=0.4
+MC_VERSION=1.18.1
+FORGE_VERSION=39.0.8
+VERSION=0.5
 CURSE_ID=525447
 RELEASE_TYPE=beta
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists