Add support for Alpha 3

IrisShaders · Jul 19, 2024 · 7a70262 · 7a70262
1 parent 9afac8b
commit 7a70262
Show file tree

Hide file tree

Showing 8 changed files with 3 additions and 347 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -8,7 +8,7 @@ val MINECRAFT_VERSION by extra { "1.21" }
 val NEOFORGE_VERSION by extra { "21.0.57-beta" }
 val FABRIC_LOADER_VERSION by extra { "0.15.11" }
 val FABRIC_API_VERSION by extra { "0.100.1+1.21" }
-val SODIUM_FILE by extra { "sodium-fabric-0.6.0-alpha.2.jar" }
+val SODIUM_FILE by extra { "sodium-fabric-0.6.0-snapshot+mc1.21-local.jar" }
 
 // https://semver.org/
 val MOD_VERSION by extra { "1.8.0" }

diff --git a/...umCompatibility/java/net/irisshaders/iris/compat/sodium/mixin/copyEntity/CuboidMixin.java b/...umCompatibility/java/net/irisshaders/iris/compat/sodium/mixin/copyEntity/CuboidMixin.java
diff --git a/...ompatibility/java/net/irisshaders/iris/compat/sodium/mixin/copyEntity/ModelPartMixin.java b/...ompatibility/java/net/irisshaders/iris/compat/sodium/mixin/copyEntity/ModelPartMixin.java
diff --git a/...ty/java/net/irisshaders/iris/compat/sodium/mixin/copyEntity/cull/EntityRendererMixin.java b/...ty/java/net/irisshaders/iris/compat/sodium/mixin/copyEntity/cull/EntityRendererMixin.java
diff --git a/.../irisshaders/iris/compat/sodium/mixin/copyEntity/shadows/EntityRenderDispatcherMixin.java b/.../irisshaders/iris/compat/sodium/mixin/copyEntity/shadows/EntityRenderDispatcherMixin.java
diff --git a/common/src/sodiumCompatibility/resources/mixins.iris.compat.sodium.json b/common/src/sodiumCompatibility/resources/mixins.iris.compat.sodium.json
@@ -16,10 +16,6 @@
     "block_id.MixinChunkRenderRebuildTask",
     "block_id.MixinChunkVertexBufferBuilder",
     "clouds.MixinCloudRenderer",
-    "copyEntity.CuboidMixin",
-    "copyEntity.ModelPartMixin",
-    "copyEntity.cull.EntityRendererMixin",
-    "copyEntity.shadows.EntityRenderDispatcherMixin",
     "directional_shading.MixinFlatLightPipeline",
     "directional_shading.MixinSmoothLightPipeline",
     "font.MixinGlyphRenderer",

diff --git a/fabric/src/main/java/net/irisshaders/iris/mixin/fabric/MixinDHCrashFix.java b/fabric/src/main/java/net/irisshaders/iris/mixin/fabric/MixinDHCrashFix.java
@@ -29,7 +29,7 @@ public class MixinDHCrashFix {
 	 * @author IMS
 	 * @reason see above
 	 */
-	@Overwrite
+	@Overwrite(remap = false)
 	public HashSet<DhChunkPos> getNormalRenderedChunks() {
 		SodiumWorldRenderer renderer = SodiumWorldRenderer.instance();
 		LevelHeightAccessor height = Minecraft.getInstance().level;
@@ -38,7 +38,7 @@ public HashSet<DhChunkPos> getNormalRenderedChunks() {
 		}).collect(Collectors.toCollection(HashSet::new));
 	}
 
-	@Overwrite
+	@Overwrite(remap = false)
 	public void setFogOcclusion(boolean b) {
 		SodiumClientMod.options().performance.useFogOcclusion = b;
 	}

diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
@@ -60,7 +60,6 @@
   "custom": {
     "sodium:options": {
       "mixin.features.render.world.sky": false,
-      "mixin.features.render.entity": false,
       "mixin.features.render.gui.font": false
     },
     "mc-publish": {