From 397ce00f327f744dec33323b7b1fb41e090bfd5a Mon Sep 17 00:00:00 2001
From: IThundxr <me@ithundxr.dev>
Date: Mon, 8 Apr 2024 13:33:24 -0400
Subject: [PATCH] v1.0.1

---
 changelog.md                                  |  8 +++++--
 .../resources/numismatics-common.mixins.json  |  1 -
 .../client/MixinGoggleOverlayRenderer.java    | 22 +++++++++++++++++++
 .../main/resources/numismatics.mixins.json    |  1 +
 .../client/MixinGoggleOverlayRenderer.java    |  2 +-
 .../main/resources/numismatics.mixins.json    |  3 ++-
 gradle.properties                             |  2 +-
 7 files changed, 33 insertions(+), 6 deletions(-)
 create mode 100644 fabric/src/main/java/dev/ithundxr/createnumismatics/fabric/mixin/client/MixinGoggleOverlayRenderer.java
 rename {common/src/main/java/dev/ithundxr/createnumismatics => forge/src/main/java/dev/ithundxr/createnumismatics/forge}/mixin/client/MixinGoggleOverlayRenderer.java (94%)

diff --git a/changelog.md b/changelog.md
index 5d46b833..48b6e6a8 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,9 @@
 ------------------------------------------------------
-Version 0.0.1
+Version 1.0.1
+------------------------------------------------------
+- Fix crash from different mixin signature on forge
+------------------------------------------------------
+Version 1.0.0
 ------------------------------------------------------
 Additions
-- Everything
\ No newline at end of file
+- Initial Release
\ No newline at end of file
diff --git a/common/src/main/resources/numismatics-common.mixins.json b/common/src/main/resources/numismatics-common.mixins.json
index ecf88a89..59daa093 100644
--- a/common/src/main/resources/numismatics-common.mixins.json
+++ b/common/src/main/resources/numismatics-common.mixins.json
@@ -6,7 +6,6 @@
   "client": [
     "client.MixinBitmapProvider$Definition",
     "client.MixinChatScreen",
-    "client.MixinGoggleOverlayRenderer",
     "client.MixinPonderTooltipHandler"
   ],
   "mixins": [
diff --git a/fabric/src/main/java/dev/ithundxr/createnumismatics/fabric/mixin/client/MixinGoggleOverlayRenderer.java b/fabric/src/main/java/dev/ithundxr/createnumismatics/fabric/mixin/client/MixinGoggleOverlayRenderer.java
new file mode 100644
index 00000000..2dfb01b9
--- /dev/null
+++ b/fabric/src/main/java/dev/ithundxr/createnumismatics/fabric/mixin/client/MixinGoggleOverlayRenderer.java
@@ -0,0 +1,22 @@
+package dev.ithundxr.createnumismatics.fabric.mixin.client;
+
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+import com.simibubi.create.content.equipment.goggles.GoggleOverlayRenderer;
+import com.simibubi.create.content.equipment.goggles.GogglesItem;
+import com.tterrag.registrate.util.entry.ItemEntry;
+import dev.ithundxr.createnumismatics.util.ClientUtils;
+import net.minecraft.world.item.ItemStack;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+
+@Mixin(GoggleOverlayRenderer.class)
+public class MixinGoggleOverlayRenderer {
+    @WrapOperation(
+            method = "renderOverlay",
+            at = @At(value = "INVOKE", target = "Lcom/tterrag/registrate/util/entry/ItemEntry;asStack()Lnet/minecraft/world/item/ItemStack;")
+    )
+    private static ItemStack changeDisplayItem(ItemEntry<GogglesItem> instance, Operation<ItemStack> original) {
+        return ClientUtils.changeGoggleOverlayItem(() -> original.call(instance));
+    }
+}
diff --git a/fabric/src/main/resources/numismatics.mixins.json b/fabric/src/main/resources/numismatics.mixins.json
index ed5ea269..29664f39 100644
--- a/fabric/src/main/resources/numismatics.mixins.json
+++ b/fabric/src/main/resources/numismatics.mixins.json
@@ -4,6 +4,7 @@
   "package": "dev.ithundxr.createnumismatics.mixin",
   "compatibilityLevel": "JAVA_17",
   "client": [
+    "client.MixinGoggleOverlayRenderer"
   ],
   "mixins": [
   ],
diff --git a/common/src/main/java/dev/ithundxr/createnumismatics/mixin/client/MixinGoggleOverlayRenderer.java b/forge/src/main/java/dev/ithundxr/createnumismatics/forge/mixin/client/MixinGoggleOverlayRenderer.java
similarity index 94%
rename from common/src/main/java/dev/ithundxr/createnumismatics/mixin/client/MixinGoggleOverlayRenderer.java
rename to forge/src/main/java/dev/ithundxr/createnumismatics/forge/mixin/client/MixinGoggleOverlayRenderer.java
index 0bbade02..8c325cfa 100644
--- a/common/src/main/java/dev/ithundxr/createnumismatics/mixin/client/MixinGoggleOverlayRenderer.java
+++ b/forge/src/main/java/dev/ithundxr/createnumismatics/forge/mixin/client/MixinGoggleOverlayRenderer.java
@@ -1,4 +1,4 @@
-package dev.ithundxr.createnumismatics.mixin.client;
+package dev.ithundxr.createnumismatics.forge.mixin.client;
 
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
diff --git a/forge/src/main/resources/numismatics.mixins.json b/forge/src/main/resources/numismatics.mixins.json
index 64b7b186..a99481c3 100644
--- a/forge/src/main/resources/numismatics.mixins.json
+++ b/forge/src/main/resources/numismatics.mixins.json
@@ -4,7 +4,8 @@
   "package": "dev.ithundxr.createnumismatics.forge.mixin",
   "compatibilityLevel": "JAVA_17",
   "client": [
-    "client.ClientPacketListenerMixin"
+    "client.ClientPacketListenerMixin",
+    "client.MixinGoggleOverlayRenderer"
   ],
   "mixins": [
     "ServerGamePacketListenerImplMixin"
diff --git a/gradle.properties b/gradle.properties
index dfb3f120..032e46a7 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ org.gradle.jvmargs = -Xmx4G
 
 # Mod Info
 archives_base_name = CreateNumismatics
-mod_version = 1.0.0
+mod_version = 1.0.1
 maven_group = dev.ithundxr
 
 minecraft_version = 1.20.1