From 3057ff2689e75285523221865f8cd346a479ac46 Mon Sep 17 00:00:00 2001
From: quat1024 <quat1024@users.noreply.github.com>
Date: Sun, 16 Jul 2023 02:05:39 -0400
Subject: [PATCH] Update EMI and remove the workaround

---
 Fabric/build.gradle                                        | 4 ++--
 Forge/build.gradle                                         | 6 +++---
 Xplat/build.gradle                                         | 2 +-
 .../tags/items/things_you_need_for_package_crafting.json   | 7 +------
 4 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/Fabric/build.gradle b/Fabric/build.gradle
index da0d4d1..3b14d1b 100644
--- a/Fabric/build.gradle
+++ b/Fabric/build.gradle
@@ -72,9 +72,9 @@ dependencies {
 		//modLocalRuntime "maven.modrinth:sodium:mc1.18.2-0.4.1"
 	}
 
-	modCompileOnly "dev.emi:emi-fabric:1.0.8+1.20.1:api"
+	modCompileOnly "dev.emi:emi-fabric:1.0.11+1.20.1:api"
 	if(runWithEmi) {
-		modLocalRuntime "dev.emi:emi-fabric:1.0.8+1.20.1"
+		modLocalRuntime "dev.emi:emi-fabric:1.0.11+1.20.1"
 	}
 }
 
diff --git a/Forge/build.gradle b/Forge/build.gradle
index b159b61..7fb6a9d 100644
--- a/Forge/build.gradle
+++ b/Forge/build.gradle
@@ -56,9 +56,9 @@ dependencies {
 	
 	compileOnly project(":Xplat")
 
-	compileOnly fg.deobf("dev.emi:emi-forge:1.0.8+1.20.1:api")
-	testCompileOnly fg.deobf("dev.emi:emi-forge:1.0.8+1.20.1:api") //forgegradle is Weird episode 500
-	runtimeOnly fg.deobf("dev.emi:emi-forge:1.0.8+1.20.1")
+	compileOnly fg.deobf("dev.emi:emi-forge:1.0.11+1.20.1:api")
+	testCompileOnly fg.deobf("dev.emi:emi-forge:1.0.11+1.20.1:api") //forgegradle is Weird episode 500
+	runtimeOnly fg.deobf("dev.emi:emi-forge:1.0.11+1.20.1")
 }
 
 //fold in xplat resources and sources
diff --git a/Xplat/build.gradle b/Xplat/build.gradle
index cb3cf59..6e4b985 100644
--- a/Xplat/build.gradle
+++ b/Xplat/build.gradle
@@ -41,7 +41,7 @@ dependencies {
 	compileOnly "org.spongepowered:mixin:0.8.5"
 	compileOnly "org.jetbrains:annotations:24.0.1"
 
-	compileOnly "dev.emi:emi-xplat-mojmap:1.0.8+1.20.1:api"
+	compileOnly "dev.emi:emi-xplat-mojmap:1.0.11+1.20.1:api"
 }
 
 tasks.withType(GenerateModuleMetadata) {
diff --git a/Xplat/src/main/resources/data/packages/tags/items/things_you_need_for_package_crafting.json b/Xplat/src/main/resources/data/packages/tags/items/things_you_need_for_package_crafting.json
index 06e811d..0539dfd 100644
--- a/Xplat/src/main/resources/data/packages/tags/items/things_you_need_for_package_crafting.json
+++ b/Xplat/src/main/resources/data/packages/tags/items/things_you_need_for_package_crafting.json
@@ -1,11 +1,6 @@
 {
 	"replace": false,
 	"values": [
-		"minecraft:copper_ingot",
-		{
-			"required": false,
-			"id": "working_around_emi_issue_242:remove_this_later"
-		},
-		"minecraft:structure_void"
+		"minecraft:copper_ingot"
 	]
 }
\ No newline at end of file