Fix Architectury 1.20.x

Author: XXMA16

src/main/java/me/modmuss50/optifabric/compat/architectury/mixin/GameRendererNew4erMixin.java

@@ -0,0 +1,46 @@
+package me.modmuss50.optifabric.compat.architectury.mixin;
+
+import me.modmuss50.optifabric.compat.InterceptingMixin;
+import me.modmuss50.optifabric.compat.PlacatingSurrogate;
+import me.modmuss50.optifabric.compat.Shim;
+import net.minecraft.client.gui.DrawableHelper;
+import net.minecraft.client.render.GameRenderer;
+import net.minecraft.client.util.Window;
+import net.minecraft.client.util.math.MatrixStack;
+import org.joml.Matrix4f;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.At.Shift;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
+
+@Mixin(GameRenderer.class)
+@InterceptingMixin("dev/architectury/mixin/fabric/client/MixinGameRenderer")
+abstract class GameRendererNew4erMixin {
+	@Shim
+	private native void renderScreenPre(float tickDelta, long startTime, boolean tick, CallbackInfo ci, int mouseX, int mouseY, Window window, Matrix4f matrix, MatrixStack matrices, DrawableHelper drawContext);
+
+	@PlacatingSurrogate
+	private void renderScreenPre(float tickDelta, long startTime, boolean tick, CallbackInfo ci, int mouseX, int mouseY, Window window, float guiFarPlane, Matrix4f matrix, MatrixStack matrices) {
+	}
+
+	@Inject(method = "render(FJZ)V", locals = LocalCapture.CAPTURE_FAILHARD, cancellable = true,
+			at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/Screen;renderWithTooltip(Lnet/minecraft/class_332;IIF)V", ordinal = 0))
+	private void renderScreenPre(float tickDelta, long startTime, boolean tick, CallbackInfo ci, int mouseX, int mouseY, Window window, float guiFarPlane, Matrix4f matrix, MatrixStack matrices, float idk, DrawableHelper drawContext) {
+		renderScreenPre(tickDelta, startTime, tick, ci, mouseX, mouseY, window, matrix, matrices, drawContext);
+	}
+
+	@Shim
+	private native void renderScreenPost(float tickDelta, long startTime, boolean tick, CallbackInfo ci, int mouseX, int mouseY, Window window, Matrix4f matrix, MatrixStack matrices, DrawableHelper drawContext);
+
+	@PlacatingSurrogate
+	private void renderScreenPost(float tickDelta, long startTime, boolean tick, CallbackInfo ci, int mouseX, int mouseY, Window window, float guiFarPlane, Matrix4f matrix, MatrixStack matrices) {
+	}
+
+	@Inject(method = "render(FJZ)V", locals = LocalCapture.CAPTURE_FAILHARD,
+			at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/Screen;renderWithTooltip(Lnet/minecraft/class_332;IIF)V", shift = Shift.AFTER, ordinal = 0))
+	private void renderScreenPost(float tickDelta, long startTime, boolean tick, CallbackInfo ci, int mouseX, int mouseY, Window window, float guiFarPlane, Matrix4f matrix, MatrixStack matrices, float idk, DrawableHelper drawContext) {
+		renderScreenPost(tickDelta, startTime, tick, ci, mouseX, mouseY, window, matrix, matrices, drawContext);
+	}
+}

src/main/java/me/modmuss50/optifabric/mod/OptifabricSetup.java

@@ -67,7 +67,7 @@ protected boolean isPresent() {
 				return injector.predictFuture(RemappingUtils.getClassName("class_702")).filter(node -> {//ParticleManager
 					//(MatrixStack, VertexConsumerProvider$Immediate, LightmapTextureManager, Camera, Frustum)
 					String desc = RemappingUtils.mapMethodDescriptor("(Lnet/minecraft/class_4587;Lnet/minecraft/class_4597$class_4598;"
-																	+ "Lnet/minecraft/class_765;Lnet/minecraft/class_4184;FLnet/minecraft/class_4604;)V");
+							+ "Lnet/minecraft/class_765;Lnet/minecraft/class_4184;FLnet/minecraft/class_4604;)V");
 
 					for (MethodNode method : node.methods) {
 						if (("renderParticles".equals(method.name) || "render".equals(method.name)) && desc.equals(method.desc)) {
@@ -404,7 +404,9 @@ protected boolean isPresent() {
 			Mixins.addConfiguration("optifabric.compat.images.mixins.json");
 		}
 
-		if (isPresent("architectury", ">=7.0.52")) {
+		if (isPresent("architectury", ">=9.0.6")) {
+			Mixins.addConfiguration("optifabric.compat.architectury-AB.new4er-mixins.json");
+		} else if (isPresent("architectury", ">=7.0.52")) {
 			Mixins.addConfiguration("optifabric.compat.architectury-AB.newererer-mixins.json");
 		} else if (isPresent("architectury", ">=3.7")) {
 			Mixins.addConfiguration("optifabric.compat.architectury-AB.newerer-mixins.json");

src/main/resources/optifabric.compat.architectury-AB.new4er-mixins.json

@@ -0,0 +1,8 @@
+{
+    "parent": "optifabric.mixins.json",
+    "package": "me.modmuss50.optifabric.compat.architectury.mixin",
+    "plugin": "me.modmuss50.optifabric.compat.InterceptingMixinPlugin",
+    "mixins": [
+        "GameRendererNew4erMixin"
+    ]
+}