Fix Carpet

Fixes #245 Fixes gnembon/fabric-carpet#923
Chocohead · Jun 19, 2021 · d94745f · d94745f
1 parent 7597971
commit d94745f
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 38 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -8,6 +8,6 @@ loader_version=0.10.8
 fabric_version=0.31.0+1.16
 fabric_asm_version=v2.2
 
-mod_version = 1.11.3
+mod_version = 1.11.4
 maven_group = me.modmuss50
 archives_base_name = optifabric
diff --git a/...main/java/me/modmuss50/optifabric/compat/carpet/mixin/ThreadedAnvilChunkStorageMixin.java b/...main/java/me/modmuss50/optifabric/compat/carpet/mixin/ThreadedAnvilChunkStorageMixin.java
diff --git a/src/main/java/me/modmuss50/optifabric/mod/OptifabricSetup.java b/src/main/java/me/modmuss50/optifabric/mod/OptifabricSetup.java
@@ -175,7 +175,9 @@ public boolean getAsBoolean() {
 		}
 
 		if (isPresent("carpet")) {
-			Mixins.addConfiguration("optifabric.compat.carpet.mixins.json");
+			if (!isPresent("minecraft", "1.17.x")) {
+				Mixins.addConfiguration("optifabric.compat.carpet.mixins.json");
+			}
 
 			if (particlesPresent.getAsBoolean()) {
 				Mixins.addConfiguration("optifabric.compat.carpet.extra-mixins.json");

diff --git a/src/main/resources/optifabric.compat.carpet.extra-mixins.json b/src/main/resources/optifabric.compat.carpet.extra-mixins.json
@@ -1,5 +1,5 @@
 {
-	"parent": "optifabric.compat.carpet.mixins.json",
+	"parent": "optifabric.mixins.json",
 	"package": "me.modmuss50.optifabric.compat.carpet.mixin",
 	"plugin": "me.modmuss50.optifabric.compat.carpet.CarpetExtraMixinPlugin",
 	"mixins": [

diff --git a/src/main/resources/optifabric.compat.carpet.mixins.json b/src/main/resources/optifabric.compat.carpet.mixins.json
@@ -3,7 +3,6 @@
 	"package": "me.modmuss50.optifabric.compat.carpet.mixin",
 	"plugin": "me.modmuss50.optifabric.compat.InterceptingMixinPlugin",
 	"mixins": [
-		"ThreadedAnvilChunkStorageMixin",
 		"WorldRendererMixin"
 	]
 }