From 9350bc314598631dbfe3699ce72e437975f36826 Mon Sep 17 00:00:00 2001 From: plulsls Date: Tue, 6 Jul 2021 20:55:55 +0800 Subject: [PATCH 1/2] fix render in 1.17 fabulous. --- gradlew | 0 .../pistorder/mixins/WorldRendererMixin.java | 23 ++++++++----------- 2 files changed, 10 insertions(+), 13 deletions(-) mode change 100644 => 100755 gradlew diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 diff --git a/src/main/java/me/fallenbreath/pistorder/mixins/WorldRendererMixin.java b/src/main/java/me/fallenbreath/pistorder/mixins/WorldRendererMixin.java index 650b550..df05c65 100644 --- a/src/main/java/me/fallenbreath/pistorder/mixins/WorldRendererMixin.java +++ b/src/main/java/me/fallenbreath/pistorder/mixins/WorldRendererMixin.java @@ -1,5 +1,6 @@ package me.fallenbreath.pistorder.mixins; +import com.mojang.blaze3d.systems.RenderSystem; import me.fallenbreath.pistorder.impl.Pistorder; import net.minecraft.client.render.Camera; import net.minecraft.client.render.GameRenderer; @@ -13,19 +14,15 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(WorldRenderer.class) -public abstract class WorldRendererMixin -{ - // just like onRenderWorldLast in malilib - @Inject( - method = "render", - at = @At( - value = "INVOKE", - ordinal = 1, - target = "Lnet/minecraft/client/render/WorldRenderer;renderWeather(Lnet/minecraft/client/render/LightmapTextureManager;FDDD)V" - ) - ) - private void renderPistorder(MatrixStack matrices, float tickDelta, long limitTime, boolean renderBlockOutline, Camera camera, GameRenderer gameRenderer, LightmapTextureManager lightmapTextureManager, Matrix4f matrix4f, CallbackInfo ci) - { +public abstract class WorldRendererMixin { + @Inject(method = "render", at = @At(value = "RETURN")) + private void renderPistorder(MatrixStack matrices, float tickDelta, long limitTime, boolean renderBlockOutline, Camera camera, GameRenderer gameRenderer, LightmapTextureManager lightmapTextureManager, Matrix4f matrix4f, CallbackInfo ci) { + MatrixStack matrixStack = RenderSystem.getModelViewStack(); + matrixStack.push(); + matrixStack.method_34425(matrices.peek().getModel()); + RenderSystem.applyModelViewMatrix(); Pistorder.getInstance().render(tickDelta); + matrixStack.pop(); + RenderSystem.applyModelViewMatrix(); } } From 063643db4812cc0ae5de2172a7c729ada47408e5 Mon Sep 17 00:00:00 2001 From: Fallen_Breath Date: Wed, 7 Jul 2021 14:40:40 +0800 Subject: [PATCH 2/2] polishing --- .../pistorder/mixins/WorldRendererMixin.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/me/fallenbreath/pistorder/mixins/WorldRendererMixin.java b/src/main/java/me/fallenbreath/pistorder/mixins/WorldRendererMixin.java index df05c65..d868685 100644 --- a/src/main/java/me/fallenbreath/pistorder/mixins/WorldRendererMixin.java +++ b/src/main/java/me/fallenbreath/pistorder/mixins/WorldRendererMixin.java @@ -14,9 +14,14 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(WorldRenderer.class) -public abstract class WorldRendererMixin { +public abstract class WorldRendererMixin +{ + /** + * The way this.client.debugRenderer gets rendered in {@link WorldRenderer#render} + */ @Inject(method = "render", at = @At(value = "RETURN")) - private void renderPistorder(MatrixStack matrices, float tickDelta, long limitTime, boolean renderBlockOutline, Camera camera, GameRenderer gameRenderer, LightmapTextureManager lightmapTextureManager, Matrix4f matrix4f, CallbackInfo ci) { + private void renderPistorder(MatrixStack matrices, float tickDelta, long limitTime, boolean renderBlockOutline, Camera camera, GameRenderer gameRenderer, LightmapTextureManager lightmapTextureManager, Matrix4f matrix4f, CallbackInfo ci) + { MatrixStack matrixStack = RenderSystem.getModelViewStack(); matrixStack.push(); matrixStack.method_34425(matrices.peek().getModel());