Merge branch 'refs/heads/1.20.4' into 1.20.2

FrozenBlock · May 16, 2024 · f9d3b82 · f9d3b82
2 parents 81d594a + 52da51a
commit f9d3b82
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/main/java/net/frozenblock/wilderwild/mixin/WilderWildMixinPlugin.java b/src/main/java/net/frozenblock/wilderwild/mixin/WilderWildMixinPlugin.java
@@ -55,7 +55,7 @@ public boolean shouldApplyMixin(String targetClassName, @NotNull String mixinCla
 		MixinsConfig config = MixinsConfig.get();
 		boolean hasEmbeddium = FabricLoader.getInstance().isModLoaded("embeddium");
 		boolean disableNonSodium = hasEmbeddium || FrozenBools.HAS_SODIUM;
-		boolean enableSodium = FrozenBools.HAS_SODIUM && FabricLoader.getInstance().getModContainer("sodium").orElseThrow().getMetadata().getVersion().getFriendlyString().contains("0.5.");
+		boolean enableSodium = FrozenBools.HAS_SODIUM;
 		if (mixinClassName.contains("client.sodium")) {
 			return config.client_sodium && enableSodium && !hasEmbeddium;
 		} else if (mixinClassName.contains("client.embeddium")) {

diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -70,6 +70,9 @@
     "cloth-config": "*",
     "terrablender": "*"
   },
+  "breaks": {
+    "sodium": "<0.5.0"
+  },
   "custom": {
     "modmenu": {
       "links": {