From 776f798aecb792a5881ccae8784888156207a047 Mon Sep 17 00:00:00 2001 From: gnembon Date: Sun, 20 Sep 2020 20:38:01 -0300 Subject: [PATCH] fixes #472 --- .../java/carpet/mixins/WorldRenderer_pausedShakeMixin.java | 3 ++- src/main/resources/assets/carpet/scripts/overlay.sc | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/carpet/mixins/WorldRenderer_pausedShakeMixin.java b/src/main/java/carpet/mixins/WorldRenderer_pausedShakeMixin.java index c6039ad6..ab75a374 100644 --- a/src/main/java/carpet/mixins/WorldRenderer_pausedShakeMixin.java +++ b/src/main/java/carpet/mixins/WorldRenderer_pausedShakeMixin.java @@ -30,7 +30,8 @@ public class WorldRenderer_pausedShakeMixin return previous; } - @ModifyVariable(method = "render", argsOnly = true, ordinal = 0 ,at = @At( + // require 0 is for optifine being a bitch as it usually is. + @ModifyVariable(method = "render", argsOnly = true, require = 0, ordinal = 0 ,at = @At( value = "INVOKE", target = "Lnet/minecraft/client/particle/ParticleManager;renderParticles(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider$Immediate;Lnet/minecraft/client/render/LightmapTextureManager;Lnet/minecraft/client/render/Camera;F)V", shift = At.Shift.BEFORE diff --git a/src/main/resources/assets/carpet/scripts/overlay.sc b/src/main/resources/assets/carpet/scripts/overlay.sc index 17e43e95..8de413af 100644 --- a/src/main/resources/assets/carpet/scripts/overlay.sc +++ b/src/main/resources/assets/carpet/scripts/overlay.sc @@ -183,7 +183,7 @@ __portal_renderer(player_name) -> z = ow_z + 8*dz; nx = x / 8; nz = z / 8; - shapes += ['line', shape_duration, 'from', [x,0,z], 'to', [x,255,z], 'line', 5]; + shapes += ['line', shape_duration, 'from', [x,0,z], 'to', [x,255,z], 'line', 2]; shapes += ['box', shape_duration, 'from', [x,0,z], 'to', [x+8,255,z+8], 'color', 0x00000000, 'fill', 0xffffff05]; shapes += ['label', shape_duration, 'pos', [x+4, 1,z+4], 'text', [nx, floor(py), nz], 'follow', p, 'snap', 'y']; )