Completed 1.20.6 update

Glitchfiend · May 5, 2024 · 2863cb4 · 2863cb4
1 parent 1ef909c
commit 2863cb4
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 44 deletions.
diff --git a/.github/workflows/gradle-publish.yml b/.github/workflows/gradle-publish.yml
@@ -14,30 +14,30 @@
        with:
          fetch-depth: 0
          fetch-tags: true
-#     - name: Set up JDK 21
-#       uses: actions/setup-java@v3
-#       with:
-#         java-version: '21'
-#         distribution: 'oracle'
-#         server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
-#         settings-path: ${{ github.workspace }} # location for the settings.xml file
-#     - name: Setup Gradle
-#       uses: gradle/gradle-build-action@v2
-#     - name: Publish
-#       run: ./gradlew publish
-#       env:
-#         MAVEN_USER: ${{ secrets.MAVEN_USER }}
-#         MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
-#         BUILD_NUMBER: ${{ github.run_number }}
-#     - name: CurseForge Publish
-#       run: ./gradlew curseforge -PcurseApiKey=${CURSE_API_KEY}
-#       env:
-#         CURSE_API_KEY: ${{ secrets.CURSE_API_KEY }}
-#         BUILD_NUMBER: ${{ github.run_number }}
-#       continue-on-error: true
-#     - name: Modrinth Publish
-#       run: ./gradlew modrinth -PmodrinthToken=${MODRINTH_TOKEN}
-#       env:
-#         MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
-#         BUILD_NUMBER: ${{ github.run_number }}
-#       continue-on-error: true
+     - name: Set up JDK 21
+       uses: actions/setup-java@v3
+       with:
+         java-version: '21'
+         distribution: 'oracle'
+         server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
+         settings-path: ${{ github.workspace }} # location for the settings.xml file
+     - name: Setup Gradle
+       uses: gradle/gradle-build-action@v2
+     - name: Publish
+       run: ./gradlew publish
+       env:
+         MAVEN_USER: ${{ secrets.MAVEN_USER }}
+         MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
+         BUILD_NUMBER: ${{ github.run_number }}
+     - name: CurseForge Publish
+       run: ./gradlew curseforge -PcurseApiKey=${CURSE_API_KEY}
+       env:
+         CURSE_API_KEY: ${{ secrets.CURSE_API_KEY }}
+         BUILD_NUMBER: ${{ github.run_number }}
+       continue-on-error: true
+     - name: Modrinth Publish
+       run: ./gradlew modrinth -PmodrinthToken=${MODRINTH_TOKEN}
+       env:
+         MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
+         BUILD_NUMBER: ${{ github.run_number }}
+       continue-on-error: true
diff --git a/forge/build.gradle b/forge/build.gradle
@@ -8,8 +8,17 @@ base.archivesName.set("${mod_name}-forge")
 
 mixin {
     add sourceSets.main, "${mod_id}.refmap.json"
-    config "${mod_id}.mixins.json"
-    config "${mod_id}.forge.mixins.json"
+}
+
+// As of 1.20.6 Forge no longer has reobf tasks. This has broken mixins adding configs correctly into the manifest file
+// See: https://github.com/SpongePowered/MixinGradle/blob/f800b26d2b180d98d9aa9355e5b3086d71218508/src/main/groovy/org/spongepowered/asm/gradle/plugins/MixinExtension.groovy#L184
+// Instead, we will do it ourselves.
+jar {
+    manifest {
+        attributes([
+            'MixinConfigs': "${mod_id}.mixins.json" + "," + "${mod_id}.forge.mixins.json",
+        ])
+    }
 }
 
 minecraft {
@@ -27,25 +36,31 @@ minecraft {
             workingDirectory project.file('run')
             ideaModule "${rootProject.name}.${project.name}.main"
             taskName 'Client'
-            property 'mixin.env.remapRefMap', 'true'
-            property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg"
+            mods {
+                modClientRun {
+                    source sourceSets.main
+                }
+            }
         }
 
         server {
             workingDirectory project.file('run')
             ideaModule "${rootProject.name}.${project.name}.main"
             taskName 'Server'
-            property 'mixin.env.remapRefMap', 'true'
-            property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg"
+            mods {
+                modServerRun {
+                    source sourceSets.main
+                }
+            }
         }
     }
 }
 
 dependencies {
     minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
     compileOnly project(":Common")
-    implementation fg.deobf('com.github.glitchfiend:GlitchCore-forge:' + minecraft_version + '-' + glitchcore_version)
-    implementation fg.deobf('com.github.glitchfiend:TerraBlender-forge:' + minecraft_version + '-' + terrablender_version)
+    implementation 'com.github.glitchfiend:GlitchCore-forge:' + minecraft_version + '-' + glitchcore_version
+    implementation 'com.github.glitchfiend:TerraBlender-forge:' + minecraft_version + '-' + terrablender_version
     annotationProcessor 'org.spongepowered:mixin:0.8.5:processor'
 
     // Hack fix for now, force jopt-simple to be exactly 5.0.4 because Mojang ships that version, but some transtive dependencies request 6.0+

diff --git a/forge/src/main/java/biomesoplenty/forge/core/BiomesOPlentyForge.java b/forge/src/main/java/biomesoplenty/forge/core/BiomesOPlentyForge.java
@@ -32,8 +32,6 @@ public BiomesOPlentyForge()
         FORGE_FLUID_REGISTER.register(bus);
 
         BiomesOPlenty.init();
-        GlitchCoreForge.prepareModEventHandlers(bus);
-
         ModFluidTypes.setup();
     }
 

diff --git a/forge/src/main/java/biomesoplenty/forge/init/ModFluidTypes.java b/forge/src/main/java/biomesoplenty/forge/init/ModFluidTypes.java
@@ -19,7 +19,7 @@
 import net.minecraft.world.entity.Mob;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.material.FluidState;
-import net.minecraft.world.level.pathfinder.BlockPathTypes;
+import net.minecraft.world.level.pathfinder.PathType;
 import net.minecraftforge.client.extensions.common.IClientFluidTypeExtensions;
 import net.minecraftforge.common.ForgeMod;
 import net.minecraftforge.common.SoundActions;
@@ -57,7 +57,7 @@ public static void registerFluids()
                         .viscosity(6000))
         {
             @Override
-            public @Nullable BlockPathTypes getBlockPathType(FluidState state, BlockGetter level, BlockPos pos, @Nullable Mob mob, boolean canFluidLog)
+            public @Nullable PathType getBlockPathType(FluidState state, BlockGetter level, BlockPos pos, @Nullable Mob mob, boolean canFluidLog)
             {
                 return canFluidLog ? super.getBlockPathType(state, level, pos, mob, true) : null;
             }
@@ -110,7 +110,7 @@ public void modifyFogRender(Camera camera, FogRenderer.FogMode mode, float rende
                 .viscosity(6000))
         {
             @Override
-            public @Nullable BlockPathTypes getBlockPathType(FluidState state, BlockGetter level, BlockPos pos, @Nullable Mob mob, boolean canFluidLog)
+            public @Nullable PathType getBlockPathType(FluidState state, BlockGetter level, BlockPos pos, @Nullable Mob mob, boolean canFluidLog)
             {
                 return canFluidLog ? super.getBlockPathType(state, level, pos, mob, true) : null;
             }

diff --git a/gradle.properties b/gradle.properties
@@ -40,5 +40,5 @@ org.gradle.daemon=false
 
 # Dependencies
 nightconfig_version=3.6.7
-glitchcore_version=1.1.0.2
-terrablender_version=3.5.0.2
+glitchcore_version=1.1.0.4
+terrablender_version=3.5.0.3
diff --git a/settings.gradle b/settings.gradle
@@ -1,4 +1,4 @@
-include("common", /*"forge",*/ "neoforge", "fabric")
+include("common", "forge", "neoforge", "fabric")
 
 pluginManagement.repositories {
     gradlePluginPortal()
@@ -24,6 +24,6 @@ rootProject.name = "BiomesOPlenty"
 
 // We want lowercase folder names but uppercase project names
 project(":common").name = "Common"
-//project(":forge").name = "Forge"
+project(":forge").name = "Forge"
 project(":neoforge").name = "NeoForge"
 project(":fabric").name = "Fabric"