Patch mixin conflicts in owolib

Fixes #166

Author: Su5eD

gradle.properties

@@ -6,7 +6,7 @@ org.gradle.daemon=true
 # Versions
 versionConnector=1.0.0-beta.11
 versionAdapter=1.4.5-1.20.1-20230902.095059
-versionAdapterDefinition=1.4.5
+versionAdapterDefinition=1.4.6
 
 versionMc=1.20.1
 versionForge=47.1.3

src/main/java/dev/su5ed/sinytra/connector/transformer/MixinPatchTransformer.java

@@ -50,6 +50,18 @@
 public class MixinPatchTransformer implements Transformer {
     private static final List<Patch> PATCHES = List.of(
         // TODO Add mirror mixin method that injects into ForgeHooks#onPlaceItemIntoWorld for server side behavior
+        Patch.builder()
+            .targetClass("net/minecraft/client/Minecraft")
+            .targetMethod("<init>")
+            .targetInjectionPoint("Lnet/fabricmc/loader/impl/game/minecraft/Hooks;startClient(Ljava/io/File;Ljava/lang/Object;)V")
+            .modifyInjectionPoint("Ljava/lang/Thread;currentThread()Ljava/lang/Thread;")
+            .build(),
+        Patch.builder()
+            .targetClass("net/minecraft/client/renderer/ShaderInstance")
+            .targetMethod("<init>")
+            .targetInjectionPoint("Lnet/minecraft/resources/ResourceLocation;<init>(Ljava/lang/String;)V")
+            .disable()
+            .build(),
         Patch.builder()
             .targetClass("net/minecraft/world/item/enchantment/EnchantmentHelper")
             .targetInjectionPoint("Lnet/minecraft/world/item/Item;m_6473_()I")

src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/CreativeModeInventoryScreenMixin.java

@@ -0,0 +1,20 @@
+package dev.su5ed.sinytra.connector.mod.mixin;
+
+import net.minecraft.client.gui.screens.inventory.CreativeModeInventoryScreen;
+import net.minecraft.world.item.CreativeModeTab;
+import org.spongepowered.asm.mixin.Mixin;
+
+@Mixin(value = CreativeModeInventoryScreen.class, priority = 100)
+public class CreativeModeInventoryScreenMixin {
+    private static int fabric_currentPage = -1;
+
+    private void fabric_updateSelection() {}
+
+    private boolean fabric_isGroupVisible(CreativeModeTab tab) {
+        return true;
+    }
+
+    private static int fabric_getPage() {
+        return -1;
+    }
+}

src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/ForgeHooksClientMixin.java

@@ -0,0 +1,26 @@
+package dev.su5ed.sinytra.connector.mod.mixin;
+
+import net.minecraft.client.gui.Font;
+import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent;
+import net.minecraft.network.chat.FormattedText;
+import net.minecraft.world.inventory.tooltip.TooltipComponent;
+import net.minecraft.world.item.ItemStack;
+import net.minecraftforge.client.ForgeHooksClient;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+@Mixin(ForgeHooksClient.class)
+public abstract class ForgeHooksClientMixin {
+
+    @Inject(method = "gatherTooltipComponents(Lnet/minecraft/world/item/ItemStack;Ljava/util/List;Ljava/util/Optional;IIILnet/minecraft/client/gui/Font;)Ljava/util/List;", at = @At("RETURN"), remap = false, cancellable = true)
+    private static void makeTooltipComponentListMutable(ItemStack stack, List<? extends FormattedText> textElements, Optional<TooltipComponent> itemComponent, int mouseX, int screenWidth, int screenHeight, Font fallbackFont, CallbackInfoReturnable<List<ClientTooltipComponent>> cir) {
+        List<ClientTooltipComponent> list = cir.getReturnValue();
+        cir.setReturnValue(new ArrayList<>(list));
+    }
+}

src/mod/resources/connectormod.mixins.json

@@ -9,6 +9,7 @@
     "ForgeHooksMixin",
     "LivingEntityMixin",
     "PoiTypesMixin",
+    "CreativeModeInventoryScreenMixin",
     "network.ConnectionTypeMixin",
     "network.HandshakeHandlerMixin",
     "tags.TagEntryAccessor",
@@ -21,6 +22,7 @@
     "HumanoidArmorLayerMixin",
     "ItemBlockRenderTypesMixin",
     "ItemOverridesMixin",
+    "ForgeHooksClientMixin",
     "boot.MinecraftMixin",
     "recipebook.RecipeBookManagerMixin",
     "recipebook.RecipeBookCategoriesMixin",