Make 1.8.9 compile again

4 files changed, 56 insertions, 22 deletions

diff --git a/src/main/java/moe/nea/ultranotifier/mixin/AccessorChatHud.java b/src/main/java/moe/nea/ultranotifier/mixin/AccessorChatHud.java
deleted file mode 100644
index 25efbfe..0000000
--- a/src/main/java/moe/nea/ultranotifier/mixin/AccessorChatHud.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package moe.nea.ultranotifier.mixin;
-
-import net.minecraft.client.gui.hud.ChatHud;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Invoker;
-
-@Mixin(ChatHud.class)
-public interface AccessorChatHud {
-	@Invoker("getLineHeight")
-	int getLineHeight_ultranotifier();
-}
diff --git a/src/main/java/moe/nea/ultranotifier/mixin/AccessorChatHudImpl.java b/src/main/java/moe/nea/ultranotifier/mixin/AccessorChatHudImpl.java
new file mode 100644
index 0000000..ec30dcf
--- /dev/null
+++ b/src/main/java/moe/nea/ultranotifier/mixin/AccessorChatHudImpl.java
@@ -0,0 +1,23 @@
+package moe.nea.ultranotifier.mixin;
+
+import moe.nea.ultranotifier.util.minecrat.AccessorChatHud;
+import net.minecraft.client.gui.hud.ChatHud;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+
+@Mixin(ChatHud.class)
+public abstract class AccessorChatHudImpl implements AccessorChatHud {
+
+	//#if MC>1.17
+	@Shadow
+	protected abstract int getLineHeight();
+	//#endif
+	@Override
+	public int getLineHeight_ultranotifier() {
+		//#if MC>1.17
+		return getLineHeight();
+		//#else
+		//$$return 9; // TODO: better typing here
+		//#endif
+	}
+}
diff --git a/src/main/java/moe/nea/ultranotifier/mixin/ChatHudCategoryTracker.java b/src/main/java/moe/nea/ultranotifier/mixin/ChatHudCategoryTracker.java
index 4d31bde..8538720 100644
--- a/src/main/java/moe/nea/ultranotifier/mixin/ChatHudCategoryTracker.java
+++ b/src/main/java/moe/nea/ultranotifier/mixin/ChatHudCategoryTracker.java
@@ -4,32 +4,38 @@ import moe.nea.ultranotifier.datamodel.CategorizedChatLine;
 import moe.nea.ultranotifier.datamodel.ChatCategoryArbiter;
 import moe.nea.ultranotifier.datamodel.HasCategorizedChatLine;
 import net.minecraft.client.gui.hud.ChatHudLine;
-import net.minecraft.client.gui.hud.MessageIndicator;
-import net.minecraft.network.message.MessageSignatureData;
 import net.minecraft.text.Text;
 import org.jetbrains.annotations.NotNull;
-import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-@Mixin(ChatHudLine.class)
-public class ChatHudCategoryTracker implements HasCategorizedChatLine {
-	@Shadow
-	@Final
-	private Text content;
+//#if MC> 1.20
+import net.minecraft.client.gui.hud.MessageIndicator;
+import net.minecraft.network.message.MessageSignatureData;
+//#endif
 
+@Mixin(ChatHudLine.class)
+public class ChatHudCategoryTracker<T> implements HasCategorizedChatLine {
 	@Unique
 	CategorizedChatLine categorizedSelf;
 
 	@Inject(method = "<init>", at = @At("TAIL"))
 	private void onInit(
 		int creationTick,
+		//#if MC>1.20
 		Text content,
+		//#elseif MC<1.16
+		//$$net.minecraft.util.text.ITextComponent content,
+		//$$int weird,
+		//#else
+		//$$T content,
+		//#endif
+		//#if MC>1.20
 		MessageSignatureData signature, MessageIndicator tag,
+		//#endif
 		CallbackInfo ci
 	) {
 		categorizedSelf = ChatCategoryArbiter.INSTANCE.categorize(content);
diff --git a/src/main/java/moe/nea/ultranotifier/mixin/ChatScreenTabRenderer.java b/src/main/java/moe/nea/ultranotifier/mixin/ChatScreenTabRenderer.java
index 7a5a127..972e40c 100644
--- a/src/main/java/moe/nea/ultranotifier/mixin/ChatScreenTabRenderer.java
+++ b/src/main/java/moe/nea/ultranotifier/mixin/ChatScreenTabRenderer.java
@@ -2,7 +2,6 @@ package moe.nea.ultranotifier.mixin;
 
 import moe.nea.ultranotifier.gui.ChatUi;
 import moe.nea.ultranotifier.util.render.ScreenRenderUtils;
-import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.ChatScreen;
 import org.objectweb.asm.Opcodes;
 import org.spongepowered.asm.mixin.Mixin;
@@ -11,6 +10,9 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+//#if MC>1.16
+import net.minecraft.client.gui.DrawContext;
+import net.minecraft.client.util.math.MatrixStack;
 //#endif
 
 @Mixin(ChatScreen.class)
@@ -49,12 +51,26 @@ public abstract class ChatScreenTabRenderer {
 
 	@Inject(
 		method = "mouseClicked",
-		at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/Screen;mouseClicked(DDI)Z", opcode = Opcodes.INVOKESPECIAL)
+		at = @At(value = "INVOKE",
+			//#if MC > 1.16
+			target = "Lnet/minecraft/client/gui/screen/Screen;mouseClicked(DDI)Z",
+			//#else
+			//$$target = "Lnet/minecraft/client/gui/GuiScreen;mouseClicked(III)V",
+			//#endif
+			opcode = Opcodes.INVOKESPECIAL)
 	)
 	private void onMouseClick(
+		//#if MC > 1.16
 		double mouseX, double mouseY,
+		//#else
+		//$$int mouseX, int mouseY,
+		//#endif
 		int button,
+		//#if MC > 1.16
 		CallbackInfoReturnable<Boolean> cir
+		//#else
+		//$$CallbackInfo cir
+		//#endif
 	) {
 		chatUi().clickMouse(mouseX, mouseY, button);
 	}