1.6 part 4

- Fix crash on '5' and '6' platforms, due to injecting not being right as a result of changes
hamarb123 · Oct 8, 2023 · a97e819 · a97e819
1 parent 09da8d6
commit a97e819
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 11 deletions.
diff --git a/src/main/java/com/hamarb123/macos_input_fixes/mixin/gui/MouseOptionsScreenMixin5.java b/src/main/java/com/hamarb123/macos_input_fixes/mixin/gui/MouseOptionsScreenMixin5.java
@@ -10,19 +10,17 @@
 import net.minecraft.client.gui.screen.option.MouseOptionsScreen;
 import net.minecraft.client.gui.widget.OptionListWidget;
 import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.text.OrderedText;
 
 @Mixin(MouseOptionsScreen.class)
 public abstract class MouseOptionsScreenMixin5
 {
     @Shadow
 	private OptionListWidget buttonList;
 
-	@SuppressWarnings("unchecked")
-	@Inject(method = "render(Lnet/minecraft/client/util/math/MatrixStack;IIF)V", at = @At("RETURN"), cancellable = true)
+	@Inject(method = "method_25394(Lnet/minecraft/class_4587;IIF)V", at = @At("RETURN"), cancellable = true, remap = false)
 	private void render(MatrixStack matrices, int mouseX, int mouseY, float delta, CallbackInfo info)
 	{
-		List<OrderedText> list = (List<OrderedText>)FabricReflectionHelper.GameOptionsScreen_getHoveredButtonTooltip(this.buttonList, mouseX, mouseY);
+		List<?> list = (List<?>)FabricReflectionHelper.GameOptionsScreen_getHoveredButtonTooltip(this.buttonList, mouseX, mouseY);
 		if (list != null) ((ScreenAccessor7)this).renderOrderedTooltip(matrices, list, mouseX, mouseY);
 	}
 }
diff --git a/src/main/java/com/hamarb123/macos_input_fixes/mixin/gui/MouseOptionsScreenMixin6.java b/src/main/java/com/hamarb123/macos_input_fixes/mixin/gui/MouseOptionsScreenMixin6.java
@@ -11,16 +11,14 @@
 import net.minecraft.client.gui.screen.option.MouseOptionsScreen;
 import net.minecraft.client.gui.widget.OptionListWidget;
 import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.text.OrderedText;
 
 @Mixin(MouseOptionsScreen.class)
 public class MouseOptionsScreenMixin6
 {
     @Shadow
 	private OptionListWidget buttonList;
 
-	@SuppressWarnings("unchecked")
-	@Inject(method = "render(Lnet/minecraft/client/util/math/MatrixStack;IIF)V", at = @At("RETURN"), cancellable = true)
+	@Inject(method = "method_25394(Lnet/minecraft/class_4587;IIF)V", at = @At("RETURN"), cancellable = true, remap = false)
 	private void render(MatrixStack matrices, int mouseX, int mouseY, float delta, CallbackInfo info)
 	{
 		Optional<?> optional = buttonList.getHoveredWidget(mouseX, mouseY);
@@ -42,8 +40,7 @@ else if (FabricReflectionHelper.DoubleOptionSliderWidget().isInstance(optional.g
 			Optional<List<?>> optional2 = FabricReflectionHelper.Option_getTooltip(option);
 			if (optional2.isPresent())
 			{
-				//cast is purely to satisfy syntax
-				((ScreenAccessor7)this).renderOrderedTooltip(matrices, (List<? extends OrderedText>)optional2.get(), mouseX, mouseY);
+				((ScreenAccessor7)this).renderOrderedTooltip(matrices, optional2.get(), mouseX, mouseY);
 			}
 		}
 	}

diff --git a/src/main/java/com/hamarb123/macos_input_fixes/mixin/gui/ScreenAccessor7.java b/src/main/java/com/hamarb123/macos_input_fixes/mixin/gui/ScreenAccessor7.java
@@ -4,11 +4,10 @@
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Invoker;
 import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.text.OrderedText;
 
 @Mixin(targets = "net.minecraft.class_437" /*Screen*/, remap = false)
 public interface ScreenAccessor7
 {
 	@Invoker(value = "method_25417(Lnet/minecraft/class_4587;Ljava/util/List;II)V", remap = false)
-	public void renderOrderedTooltip(MatrixStack matrices, List<? extends OrderedText> lines, int x, int y);
+	public void renderOrderedTooltip(MatrixStack matrices, List<?> lines, int x, int y);
 }