icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into 1.16

Browse Source
This commit is contained in:
gnembon committed 2020-07-28 23:57:36 -03:00
2 parents 7f8735021f 592433a4c4
commit dc3881f6d2
1 file changed
+9 -2
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/carpet/mixins/WorldRenderer_scarpetRenderMixin.java
+9 -2
View File
@@ -2,6 +2,7 @@ package carpet.mixins;
import carpet.network.CarpetClient; import carpet.network.CarpetClient;
import carpet.script.utils.ShapesRenderer; import carpet.script.utils.ShapesRenderer;
import com.mojang.blaze3d.systems.RenderSystem;
import net.minecraft.client.MinecraftClient; import net.minecraft.client.MinecraftClient;
import net.minecraft.client.render.BufferBuilderStorage; import net.minecraft.client.render.BufferBuilderStorage;
import net.minecraft.client.render.Camera; import net.minecraft.client.render.Camera;
@@ -24,9 +25,15 @@ public class WorldRenderer_scarpetRenderMixin
CarpetClient.shapes = new ShapesRenderer(client); CarpetClient.shapes = new ShapesRenderer(client);
} }
@Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/debug/DebugRenderer;render(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider$Immediate;DDD)V")) @Inject(method = "render", at = @At("TAIL"))//at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/debug/DebugRenderer;render(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider$Immediate;DDD)V"))
private void renderScarpetThings(MatrixStack matrices, float tickDelta, long limitTime, boolean renderBlockOutline, Camera camera, GameRenderer gameRenderer, LightmapTextureManager lightmapTextureManager, Matrix4f matrix4f, CallbackInfo ci) private void renderScarpetThings(MatrixStack matrices, float tickDelta, long limitTime, boolean renderBlockOutline, Camera camera, GameRenderer gameRenderer, LightmapTextureManager lightmapTextureManager, Matrix4f matrix4f, CallbackInfo ci)
{ {
if (CarpetClient.shapes != null) CarpetClient.shapes.render(camera, tickDelta); if (CarpetClient.shapes != null)
{
RenderSystem.pushMatrix();
RenderSystem.multMatrix(matrices.peek().getModel());
CarpetClient.shapes.render(camera, tickDelta);
RenderSystem.popMatrix();
}
} }
} }