Merge branch '1.19.1' into 1.19.4

IrisShaders · Dec 26, 2023 · c4f17ce · c4f17ce
2 parents ae13071 + 7c90451
commit c4f17ce
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/src/main/java/net/coderbot/iris/Iris.java b/src/main/java/net/coderbot/iris/Iris.java
@@ -262,11 +262,15 @@ public static void handleKeybinds(Minecraft minecraft) {
 			}
 		} else if (shaderpackScreenKeybind.consumeClick()) {
 			minecraft.setScreen(new ShaderPackScreen(null));
+		} else if (wireframeKeybind.consumeClick()) {
+			if (irisConfig.areDebugOptionsEnabled() && minecraft.player != null && !Minecraft.getInstance().isLocalServer()) {
+				minecraft.player.displayClientMessage(Component.literal("No cheating; wireframe only in singleplayer!"), false);
+			}
 		}
 	}
 
 	public static boolean shouldActivateWireframe() {
-		return wireframeKeybind.isDown();
+		return irisConfig.areDebugOptionsEnabled() && wireframeKeybind.isDown();
 	}
 
 	public static void toggleShaders(Minecraft minecraft, boolean enabled) throws IOException {

diff --git a/src/main/java/net/coderbot/iris/mixin/MixinGlStateManager_DepthColorOverride.java b/src/main/java/net/coderbot/iris/mixin/MixinGlStateManager_DepthColorOverride.java
@@ -28,7 +28,7 @@ public class MixinGlStateManager_DepthColorOverride {
 		}
 	}
 
-	@Redirect(method = "_drawElements", at = @At(value = "INVOKE", target = "Lorg/lwjgl/opengl/GL11;glDrawElements(IIIJ)V"))
+	@Redirect(method = "_drawElements", at = @At(value = "INVOKE", target = "Lorg/lwjgl/opengl/GL11;glDrawElements(IIIJ)V"), remap = false)
 	private static void iris$modify(int mode, int count, int type, long indices) {
 		if (mode == GL43C.GL_TRIANGLES && ImmediateState.usingTessellation) {
 			mode = GL43C.GL_PATCHES;
@@ -37,7 +37,7 @@ public class MixinGlStateManager_DepthColorOverride {
 		GL43C.glDrawElements(mode, count, type, indices);
 	}
 
-	@Inject(method = "_glUseProgram", at = @At("TAIL"))
+	@Inject(method = "_glUseProgram", at = @At("TAIL"), remap = false)
 	private static void iris$resetTessellation(int pInt0, CallbackInfo ci) {
 		ImmediateState.usingTessellation = false;
 	}

diff --git a/...atibility/java/net/coderbot/iris/compat/sodium/mixin/shader_overrides/MixinGlProgram.java b/...atibility/java/net/coderbot/iris/compat/sodium/mixin/shader_overrides/MixinGlProgram.java
@@ -13,7 +13,7 @@
 
 import java.util.function.IntFunction;
 
-@Mixin(GlProgram.class)
+@Mixin(value = GlProgram.class, remap = false)
 public class MixinGlProgram extends GlObject implements ShaderBindingContextExt {
 	public <U extends GlUniform<?>> U bindUniformIfPresent(String name, IntFunction<U> factory) {
 		int index = GlStateManager._glGetUniformLocation(this.handle(), name);