feat: update template to 1.21

JamCoreModding · Jul 2, 2024 · a2fb3c0 · a2fb3c0
1 parent f62cd4c
commit a2fb3c0
Show file tree

Hide file tree

Showing 22 changed files with 32 additions and 450 deletions.
diff --git a/.github/workflows/build.yml.disabled b/.github/workflows/build.yml.disabled
@@ -27,32 +27,20 @@ jobs:
       - name: Validate Gradle Wrapper
         uses: gradle/wrapper-validation-action@v1
 
-      - name: Setup JDK 17
+      - name: Setup JDK 21
         uses: actions/setup-java@v1
         with:
-          java-version: 17
+          java-version: 21
 
       - name: Build
-        run: ./gradlew clean forge:build neoforge:build fabric:build quilt:build
+        run: ./gradlew clean neoforge:build fabric:build
 
       - name: Capture Fabric Build Artifacts
         uses: actions/upload-artifact@v2
         with:
           name: Fabric Artifacts
           path: fabric/build/libs/
 
-      - name: Capture Quilt Build Artifacts
-        uses: actions/upload-artifact@v2
-        with:
-          name: Quilt Artifacts
-          path: quilt/build/libs/
-
-      - name: Capture Forge Build Artifacts
-        uses: actions/upload-artifact@v2
-        with:
-          name: Forge Artifacts
-          path: forge/build/libs/
-
       - name: Capture NeoForge Build Artifacts
         uses: actions/upload-artifact@v2
         with:

diff --git a/.github/workflows/test-template.yml b/.github/workflows/test-template.yml
@@ -23,33 +23,21 @@ jobs:
       - name: Validate Gradle Wrapper
         uses: gradle/wrapper-validation-action@v2
 
-      - name: Setup JDK 17
+      - name: Setup JDK 21
         uses: actions/setup-java@v2
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 21
 
       - name: Build
-        run: ./gradlew clean forge:build neoforge:build fabric:build quilt:build
+        run: ./gradlew clean neoforge:build fabric:build
 
       - name: Capture Fabric Build Artifacts
         uses: actions/upload-artifact@v4
         with:
           name: Fabric Artifacts
           path: fabric/build/libs/
 
-      - name: Capture Quilt Build Artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: Quilt Artifacts
-          path: quilt/build/libs/
-
-      - name: Capture Forge Build Artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: Forge Artifacts
-          path: forge/build/libs/
-
       - name: Capture NeoForge Build Artifacts
         uses: actions/upload-artifact@v4
         with:

diff --git a/build.gradle.easytemplate b/build.gradle.easytemplate
@@ -1,6 +1,6 @@
 plugins {
     id "architectury-plugin" version "3.4-SNAPSHOT"
-    id "dev.architectury.loom" version "1.5-SNAPSHOT" apply false
+    id "dev.architectury.loom" version "1.7-SNAPSHOT" apply false
     {{#if unified_publishing}}
     id "me.shedaniel.unified-publishing" version "0.1.+" apply false
     {{/if}}
@@ -76,9 +76,13 @@ allprojects {
         }
     }
 
+    base {
+        archivesName = "{{mod_id}}"
+    }
+
     tasks.withType(JavaCompile) {
         options.encoding = "UTF-8"
-        options.release = 17
+        options.release = 21
     }
 
     tasks.create("prepareWorkspace") {}
@@ -94,8 +98,6 @@ allprojects {
         {{/if}}
         {{#if unified_publishing}}
         dependsOn("fabric:publishUnified")
-        dependsOn("quilt:publishUnified")
-        dependsOn("forge:publishUnified")
         dependsOn("neoforge:publishUnified")
         {{/if}}
     }

diff --git a/common/build.gradle b/common/build.gradle
@@ -4,6 +4,6 @@ architectury {
 
 dependencies {
     modImplementation libs.fabric.loader
-    modApi libs.architectury.common
+    modImplementation libs.architectury.common
     modImplementation libs.jamlib.common
 }
diff --git a/fabric/build.gradle.easytemplate b/fabric/build.gradle.easytemplate
@@ -1,5 +1,5 @@
 plugins {
-    id "com.github.johnrengelman.shadow" version "7.1.2"
+    id "com.github.johnrengelman.shadow" version "8.1.1"
     {{#if unified_publishing}}
     id "me.shedaniel.unified-publishing"
     {{/if}}
@@ -24,8 +24,8 @@ configurations {
 
 dependencies {
     modImplementation libs.fabric.loader
-    modApi libs.fabric.api
-    modApi libs.architectury.fabric
+    modImplementation libs.fabric.api
+    modImplementation libs.architectury.fabric
     modRuntimeOnly libs.modmenu
     modImplementation libs.jamlib.fabric
 

diff --git a/forge/build.gradle.easytemplate b/forge/build.gradle.easytemplate
diff --git a/forge/gradle.properties b/forge/gradle.properties
diff --git a/...va/{{#replace "\." "%%"}}{{group}}.{{mod_id}}{{%%replace}}/forge/{{main_class}}Forge.java b/...va/{{#replace "\." "%%"}}{{group}}.{{mod_id}}{{%%replace}}/forge/{{main_class}}Forge.java
diff --git a/...eplace "\." "%%"}}{{group}}.{{mod_id}}{{%%replace}}/forge/{{main_class}}PlatformImpl.java b/...eplace "\." "%%"}}{{group}}.{{mod_id}}{{%%replace}}/forge/{{main_class}}PlatformImpl.java
diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml
diff --git a/forge/src/main/resources/pack.mcmeta b/forge/src/main/resources/pack.mcmeta
diff --git a/gradle.properties b/gradle.properties
@@ -2,10 +2,14 @@ org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 org.gradle.parallel=true
 
-version=1.0.0
-minecraft_version=1.20.4
+version=1.0.0+1.21
+minecraft_version=1.21
 branch=main
 group={{ group }}
 mod_name={{ name }}
 mod_id={{ mod_id }}
-enabled_platforms=fabric,quilt,forge,neoforge
+enabled_platforms=fabric,neoforge
+
+systemProp.javax.xml.parsers.SAXParserFactory=com.sun.org.apache.xerces.internal.jaxp.SAXParserFactoryImpl
+systemProp.javax.xml.transform.TransformerFactory=com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl
+systemProp.javax.xml.parsers.DocumentBuilderFactory=com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl
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-8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists