fix: apply mixin refmap on fabric

Author: marcus8448

.github/workflows/codeql.yml

@@ -40,14 +40,14 @@ jobs:
             neoforge/build/tmp/neoFormRecompile
           key: ${{ runner.os }}-gradle-${{ hashFiles('gradle/gradle-wrapper.properties', 'settings.gradle.kts', '**/build.gradle.kts', '**/gradle.properties') }}
 
-      - name: Initialize build environment
-        run: ./gradlew
-
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v3
         with:
           languages: java
 
+      - name: Initialize build environment
+        run: ./gradlew
+
       - name: Build
         run: ./gradlew assemble -x checkLicenses
 

.github/workflows/commit.yml

@@ -47,16 +47,12 @@ jobs:
       - name: Build
         if: ${{ !cancelled() }}
         id: build
-        run: ./gradlew assemble -x checkLicenses -x javadoc
+        run: ./gradlew assemble -x checkLicenses
 
       - name: Test
         if: ${{ steps.build.outcome == 'success' && !cancelled() }}
         run: ./gradlew :fabric:runGametest :neoforge:runGametest
 
-      - name: Javadoc
-        if: ${{ success() }}
-        run: ./gradlew javadoc
-
       - name: Publish
         if: ${{ github.repository == 'TeamGalacticraft/DynamicDimensions' && success() }}
         run: ./gradlew publish -x test

.github/workflows/pr_check.yml

@@ -50,12 +50,8 @@ jobs:
       - name: Build
         if: ${{ !cancelled() }}
         id: build
-        run: ./gradlew assemble -x checkLicenses -x javadoc
+        run: ./gradlew assemble -x checkLicenses
 
       - name: Test
         if: ${{ steps.build.outcome == 'success' && !cancelled() }}
         run: ./gradlew :fabric:runGametest :neoforge:runGametest
-
-      - name: Javadoc
-        if: ${{ success() }}
-        run: ./gradlew javadoc

build.gradle.kts

@@ -1,8 +1,8 @@
 plugins {
     id("org.ajoberstar.grgit") version ("5.2.2")
     id("org.cadixdev.licenser") version("0.6.1") apply(false)
-    id("fabric-loom") version("1.6-SNAPSHOT") apply(false)
-    id("dev.galacticraft.mojarn") version("0.1.2") apply(false)
+    id("fabric-loom") version("1.7-SNAPSHOT") apply(false)
+    id("dev.galacticraft.mojarn") version("0.3.0+8") apply(false)
     id("org.jetbrains.gradle.plugin.idea-ext") version("1.1.8") // required for neoforge
 }
 

common/src/main/resources/dynamicdimensions.mixins.json

@@ -16,6 +16,7 @@
   ],
   "server": [
   ],
+  "refmap": "dynamicdimensions.refmap.json",
   "injectors": {
     "defaultRequire": 1
   }

fabric/build.gradle.kts

@@ -22,6 +22,10 @@ loom {
     interfaceInjection.getIsEnabled().set(false)
     enableTransitiveAccessWideners.set(false)
 
+    mixin {
+        defaultRefmapName.set("dynamicdimensions.refmap.json")
+    }
+
     runs {
         named("client") {
             client()

gradle.properties

@@ -10,20 +10,20 @@ mod.version=0.7.0
 
 # Loader dependencies
 minecraft.version=1.20.6
-fabric.loader.version=0.15.10
-fabric.yarn.build=1
-forge.version=20.6.10-beta
+fabric.loader.version=0.15.11
+fabric.yarn.build=3
+forge.version=20.6.119
 
 # Project metadata
 minecraft.version.min=1.20.6
 fabric.loader.version.min=0.15
 neoforge.version.min=20.6
 
 # Universal Dependencies
-badpackets.version=0.7.2
+badpackets.version=0.7.3
 
 # Fabric dependencies
-fabric.api.version=0.97.8+1.20.6
+fabric.api.version=0.100.4+1.20.6
 fabric.api.modules=\
   fabric-api-base,\
   fabric-command-api-v2,\

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=544c35d6bd849ae8a5ed0bcea39ba677dc40f49df7d1835561582da2009b961d
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionSha256Sum=a4b4158601f8636cdeeab09bd76afb640030bb5b144aafe261a5e8af027dc612
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

neoforge/build.gradle.kts

@@ -38,6 +38,15 @@ tasks.compileJava {
 
 tasks.processResources {
     from(project(":common").sourceSets.main.get().resources)
+
+    // remove refmap on neoforge
+    doLast {
+        file(outputs.files.asFileTree.first { it.name.equals("dynamicdimensions.mixins.json") }.apply {
+            val parse = groovy.json.JsonSlurper().parse(this)!! as MutableMap<*, *>
+            parse.remove("refmap")
+            writeText(groovy.json.JsonOutput.toJson(parse))
+        })
+    }
 }
 
 tasks.javadoc {