Bring 1.20.1 up to date with 19.0.5 version.

.github/FUNDING.yml

@@ -1,13 +1 @@
-# These are supported funding model platforms
-
-github: [DAQEM] # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
-patreon: daqem # Replace with a single Patreon username
-open_collective: # Replace with a single Open Collective username
-ko_fi: daqem # Replace with a single Ko-fi username
-tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
-community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
-liberapay: # Replace with a single Liberapay username
-issuehunt: # Replace with a single IssueHunt username
-otechie: # Replace with a single Otechie username
-lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
-custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
+ko_fi: daqem

.github/workflows/publish.yml

@@ -15,6 +15,8 @@ jobs:
     env:
       CURSEFORGE_API_KEY: ${{ secrets.CURSEFORGE_API_KEY }}
       MODRINTH_API_KEY: ${{ secrets.MODRINTH_API_KEY }}
+      MAVEN_USER: ${{ secrets.MAVEN_USER }}
+      MAVEN_PASS: ${{ secrets.MAVEN_PASS }}
 
     steps:
       - name: Checkout
@@ -26,8 +28,15 @@ jobs:
           java-version: '17'
           distribution: 'temurin'
 
-      - name: Grant Permissions to gradlew
-        run: chmod +x gradlew
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.8'
+
+      - name: Grant Permissions
+        run: |
+          chmod +x gradlew
+          chmod +x relocate_natives/prepare.sh
 
       - name: Build Jars
         run: ./gradlew build
@@ -37,16 +46,19 @@ jobs:
         run: |
           echo "::set-output name=VERSION_NAME::$(./gradlew -q :common:printVersionName)"
 
-      - name: Check if tag exists 
+      - name: Check if tag exists
         uses: mukunku/tag-exists-action@v1.5.0
         id: checkTag
-        with: 
+        with:
           tag: ${{ steps.gradle_version.outputs.VERSION_NAME }}
 
       - name: Fail if tag exists
         if: steps.checkTag.outputs.exists == 'true'
         run: exit 1
 
+      - name: Publish to DAQEM Maven
+        run: ./gradlew publish
+
       - name: Publish to Modrinth
         run: ./gradlew modrinth
 
@@ -60,4 +72,4 @@ jobs:
             fabric/build/libs/*.jar
             forge/build/libs/*.jar
           name: ${{ steps.gradle_version.outputs.VERSION_NAME }}
-          tag: ${{ steps.gradle_version.outputs.VERSION_NAME }}
+          tag: ${{ steps.gradle_version.outputs.VERSION_NAME }}

.github/workflows/test.yml

@@ -26,10 +26,10 @@ jobs:
         with:
           java-version: '17'
           distribution: 'temurin'
-      
+
       - name: Grant Permissions to gradlew
         run: chmod +x gradlew
-        
+
       - name: Test
         run: ./gradlew :common:test
 

.gitignore

@@ -5,6 +5,7 @@ run/
 out/
 *.iml
 .gradle/
+.gradle-cache/
 output/
 bin/
 libs/
@@ -17,4 +18,8 @@ classes/
 .vscode
 .settings
 *.launch
-.architectury-transformer
+
+relocate_natives/.venv/
+relocate_natives/__pycache__/
+relocate_natives/apple-codesign/
+relocate_natives/cache/

build.gradle

@@ -1,61 +1,76 @@
 plugins {
-    id "architectury-plugin" version "3.4-SNAPSHOT"
-    id "dev.architectury.loom" version "1.3-SNAPSHOT" apply false
+    id 'dev.architectury.loom' version '1.10-SNAPSHOT' apply false
+    id 'architectury-plugin' version '3.4-SNAPSHOT'
+    id 'com.github.johnrengelman.shadow' apply false
 }
 
 architectury {
-    minecraft = rootProject.minecraft_version
+    minecraft = project.minecraft_version
 }
 
-subprojects {
-    apply plugin: "dev.architectury.loom"
-
-    loom {
-        silentMojangMappingsLicense()
-    }
+allprojects {
+    group = rootProject.maven_group
+    version = rootProject.mod_version
 
-    dependencies {
-        minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
-        // The following line declares the mojmap mappings, you may use other mappings as well
-        mappings loom.officialMojangMappings()
-        // The following line declares the yarn mappings you may select this one as well.
-        // mappings "net.fabricmc:yarn:1.20.1+build.10:v2"
+    task printVersionName  {
+        doLast {
+            println version
+        }
     }
 }
 
-allprojects {
-    apply plugin: "java"
-    apply plugin: "architectury-plugin"
-    apply plugin: "maven-publish"
+subprojects {
+    apply plugin: 'dev.architectury.loom'
+    apply plugin: 'architectury-plugin'
+    apply plugin: 'maven-publish'
 
     base {
         archivesName = rootProject.archives_base_name
     }
 
-    version = rootProject.mod_version
-    group = rootProject.maven_group
-
     repositories {
-        maven {
-            url "https://cursemaven.com"
-            content {
+        exclusiveContent {
+            forRepository {
+                maven {
+                    name = "Curseforge"
+                    url = "https://cursemaven.com"
+                }
+            }
+            filter {
                 includeGroup "curse.maven"
             }
         }
+        exclusiveContent {
+            forRepository {
+                maven {
+                    name = "Modrinth"
+                    url = "https://api.modrinth.com/maven"
+                }
+            }
+            filter {
+                includeGroup "maven.modrinth"
+            }
+        }
+        maven { url "https://maven.daqem.com/snapshots/" }
+        maven { url "https://maven.daqem.com/releases" }
     }
 
-    tasks.withType(JavaCompile) {
-        options.encoding = "UTF-8"
-        options.release = 17
+    dependencies {
+        minecraft "net.minecraft:minecraft:$rootProject.minecraft_version"
+        mappings loom.officialMojangMappings()
     }
 
     java {
+        // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
+        // if it is present.
+        // If you remove this line, sources will not be generated.
         withSourcesJar()
+
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 
-    task printVersionName  {
-        doLast {
-            println version
-        }
+    tasks.withType(JavaCompile).configureEach {
+        it.options.release = 17
     }
 }

buildSrc/build.gradle

@@ -0,0 +1,23 @@
+plugins {
+    id 'java-library'
+}
+
+repositories {
+    mavenCentral()
+    gradlePluginPortal()
+}
+
+dependencies {
+    // Shadow plugin
+    implementation 'com.github.johnrengelman.shadow:com.github.johnrengelman.shadow.gradle.plugin:8.1.1'
+
+    // Ant (Required for Shadow)
+    implementation 'org.apache.ant:ant:1.10.14'
+
+    // Force latest ASM (Fixes "Unsupported class file major version 65")
+    implementation 'org.ow2.asm:asm:9.7'
+    implementation 'org.ow2.asm:asm-commons:9.7'
+    implementation 'org.ow2.asm:asm-util:9.7'
+    implementation 'org.ow2.asm:asm-tree:9.7'
+    implementation 'org.ow2.asm:asm-analysis:9.7'
+}