v1.0.1

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
+- Initial Release

common/src/main/resources/numismatics-common.mixins.json

@@ -6,7 +6,6 @@
   "client": [
     "client.MixinBitmapProvider$Definition",
     "client.MixinChatScreen",
-    "client.MixinGoggleOverlayRenderer",
     "client.MixinPonderTooltipHandler"
   ],
   "mixins": [

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));
+    }
+}

fabric/src/main/resources/numismatics.mixins.json

@@ -4,6 +4,7 @@
   "package": "dev.ithundxr.createnumismatics.mixin",
   "compatibilityLevel": "JAVA_17",
   "client": [
+    "client.MixinGoggleOverlayRenderer"
   ],
   "mixins": [
   ],

common/src/main/java/dev/ithundxr/createnumismatics/mixin/client/MixinGoggleOverlayRenderer.java → 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;

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"

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