try to fix CI

Author: moehreag

1.16_combat-6/src/main/java/io/github/axolotlclient/mixin/MinecraftClientMainMixin.java

@@ -22,16 +22,21 @@
 
 package io.github.axolotlclient.mixin;
 
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+import io.github.axolotlclient.util.OSUtil;
 import net.minecraft.client.main.Main;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
 
 @Mixin(Main.class)
 public abstract class MinecraftClientMainMixin {
 
-	@Redirect(method = "<clinit>", at = @At(value = "INVOKE", target = "Ljava/lang/System;setProperty(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"))
-	private static String axolotlclient$noHeadless(String key, String value) {
+	@WrapOperation(method = "<clinit>", at = @At(value = "INVOKE", target = "Ljava/lang/System;setProperty(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"))
+	private static String axolotlclient$noHeadless(String key, String value, Operation<String> original) {
+		if (OSUtil.getOS() != OSUtil.OperatingSystem.WINDOWS) {
+			return original.call(key, value);
+		}
 		return "";
 	}
 }

1.20/src/main/java/io/github/axolotlclient/mixin/MinecraftClientMainMixin.java

@@ -22,16 +22,21 @@
 
 package io.github.axolotlclient.mixin;
 
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+import io.github.axolotlclient.util.OSUtil;
 import net.minecraft.client.main.Main;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
 
 @Mixin(Main.class)
 public abstract class MinecraftClientMainMixin {
 
-	@Redirect(method = "<clinit>", at = @At(value = "INVOKE", target = "Ljava/lang/System;setProperty(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"))
-	private static String axolotlclient$noHeadless(String key, String value) {
+	@WrapOperation(method = "<clinit>", at = @At(value = "INVOKE", target = "Ljava/lang/System;setProperty(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"))
+	private static String axolotlclient$noHeadless(String key, String value, Operation<String> original) {
+		if (OSUtil.getOS() != OSUtil.OperatingSystem.WINDOWS) {
+			return original.call(key, value);
+		}
 		return "";
 	}
 }

1.21/src/main/java/io/github/axolotlclient/mixin/MinecraftClientMainMixin.java

@@ -22,16 +22,21 @@
 
 package io.github.axolotlclient.mixin;
 
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+import io.github.axolotlclient.util.OSUtil;
 import net.minecraft.client.main.Main;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
 
 @Mixin(Main.class)
 public abstract class MinecraftClientMainMixin {
 
-	@Redirect(method = "<clinit>", at = @At(value = "INVOKE", target = "Ljava/lang/System;setProperty(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"))
-	private static String axolotlclient$noHeadless(String key, String value) {
+	@WrapOperation(method = "<clinit>", at = @At(value = "INVOKE", target = "Ljava/lang/System;setProperty(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"))
+	private static String axolotlclient$noHeadless(String key, String value, Operation<String> original) {
+		if (OSUtil.getOS() != OSUtil.OperatingSystem.WINDOWS) {
+			return original.call(key, value);
+		}
 		return "";
 	}
 }

1.8.9/build.gradle.kts

@@ -21,6 +21,12 @@ loom {
 	}
 }
 
+repositories {
+	exclusiveContent { forRepository { mavenCentral() }
+		filter { includeGroup("org.lwjgl") }
+	}
+}
+
 dependencies {
 	minecraft("com.mojang:minecraft:${project.property("minecraft_18")}")
 	mappings("net.ornithemc:feather:${project.property("mappings_18")}")

1.8.9/src/main/java/io/github/axolotlclient/mixin/MinecraftClientMixin.java

@@ -173,7 +173,7 @@ protected MinecraftClientMixin(TextureManager textureManager) {
 		}
 	}
 
-	@Inject(method = "updateWindow", at = @At("TAIL"))
+	@Inject(method = "updateWindow", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Minecraft;onResolutionChanged(II)V"))
 	public void axolotlclient$onResize(CallbackInfo ci) {
 		Util.window = null;
 		HudManager.getInstance().refreshAllBounds();

1.latest/src/main/java/io/github/axolotlclient/mixin/MinecraftClientMainMixin.java

@@ -22,16 +22,21 @@
 
 package io.github.axolotlclient.mixin;
 
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+import io.github.axolotlclient.util.OSUtil;
 import net.minecraft.client.main.Main;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
 
 @Mixin(Main.class)
 public abstract class MinecraftClientMainMixin {
 
-	@Redirect(method = "<clinit>", at = @At(value = "INVOKE", target = "Ljava/lang/System;setProperty(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"))
-	private static String axolotlclient$noHeadless(String key, String value) {
+	@WrapOperation(method = "<clinit>", at = @At(value = "INVOKE", target = "Ljava/lang/System;setProperty(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;"))
+	private static String axolotlclient$noHeadless(String key, String value, Operation<String> original) {
+		if (OSUtil.getOS() != OSUtil.OperatingSystem.WINDOWS) {
+			return original.call(key, value);
+		}
 		return "";
 	}
 }