From 996b3df9cbdab42f6a5dc40cf80b635b1bf9adef Mon Sep 17 00:00:00 2001 From: makamys Date: Sun, 10 Mar 2024 22:05:18 +0100 Subject: [PATCH] Use vanilla field to count number of chunk updates Fixes D-Tools compat --- .../angelica/mixins/early/sodium/MixinMinecraft.java | 5 ----- .../mixins/early/sodium/MixinRenderGlobal.java | 5 ----- .../angelica/mixins/interfaces/IRenderGlobalExt.java | 1 - .../sodium/client/render/SodiumWorldRenderer.java | 4 ---- .../client/render/chunk/ChunkRenderManager.java | 11 ++--------- 5 files changed, 2 insertions(+), 24 deletions(-) diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/early/sodium/MixinMinecraft.java b/src/main/java/com/gtnewhorizons/angelica/mixins/early/sodium/MixinMinecraft.java index 8613cdbda..f286ba43b 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/early/sodium/MixinMinecraft.java +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/early/sodium/MixinMinecraft.java @@ -25,11 +25,6 @@ public class MixinMinecraft { } } - @Redirect(method="runGameLoop", at=@At(value="FIELD", target="Lnet/minecraft/client/renderer/WorldRenderer;chunksUpdated:I", ordinal=0)) - private int sodium$chunksUpdated() { - return ((IRenderGlobalExt)this.renderGlobal).getChunksSubmitted(); - } - @Redirect(method = "runGameLoop", at = @At(value = "FIELD", target = "Lnet/minecraft/client/settings/GameSettings;fancyGraphics:Z")) private boolean sodium$overrideFancyGrass(GameSettings gameSettings) { return SodiumClientMod.options().quality.grassQuality.isFancy(); diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/early/sodium/MixinRenderGlobal.java b/src/main/java/com/gtnewhorizons/angelica/mixins/early/sodium/MixinRenderGlobal.java index 58516628f..0d92ab574 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/early/sodium/MixinRenderGlobal.java +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/early/sodium/MixinRenderGlobal.java @@ -60,11 +60,6 @@ public class MixinRenderGlobal implements IRenderGlobalExt { this.renderer.scheduleTerrainUpdate(); } - @Override - public int getChunksSubmitted() { - return this.renderer.getChunksSubmitted(); - } - @Inject(method="", at=@At("RETURN")) private void sodium$initRenderer(Minecraft mc, CallbackInfo ci) { this.renderer = SodiumWorldRenderer.create(mc); diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/interfaces/IRenderGlobalExt.java b/src/main/java/com/gtnewhorizons/angelica/mixins/interfaces/IRenderGlobalExt.java index fc262db3d..43133d0c7 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/interfaces/IRenderGlobalExt.java +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/interfaces/IRenderGlobalExt.java @@ -2,6 +2,5 @@ package com.gtnewhorizons.angelica.mixins.interfaces; public interface IRenderGlobalExt { void scheduleTerrainUpdate(); - int getChunksSubmitted(); } diff --git a/src/main/java/me/jellysquid/mods/sodium/client/render/SodiumWorldRenderer.java b/src/main/java/me/jellysquid/mods/sodium/client/render/SodiumWorldRenderer.java index 59f4eb998..74e0240f9 100644 --- a/src/main/java/me/jellysquid/mods/sodium/client/render/SodiumWorldRenderer.java +++ b/src/main/java/me/jellysquid/mods/sodium/client/render/SodiumWorldRenderer.java @@ -124,10 +124,6 @@ public class SodiumWorldRenderer implements ChunkStatusListener { } } - public int getChunksSubmitted() { - return this.chunkRenderManager != null ? this.chunkRenderManager.getAndResetSubmitted() : 0; - } - private void loadWorld(WorldClient world) { this.world = world; diff --git a/src/main/java/me/jellysquid/mods/sodium/client/render/chunk/ChunkRenderManager.java b/src/main/java/me/jellysquid/mods/sodium/client/render/chunk/ChunkRenderManager.java index dcae5e399..e08db88b8 100644 --- a/src/main/java/me/jellysquid/mods/sodium/client/render/chunk/ChunkRenderManager.java +++ b/src/main/java/me/jellysquid/mods/sodium/client/render/chunk/ChunkRenderManager.java @@ -37,6 +37,7 @@ import me.jellysquid.mods.sodium.common.util.IdTable; import me.jellysquid.mods.sodium.common.util.collections.FutureDequeDrain; import net.coderbot.iris.shadows.ShadowRenderingState; import net.minecraft.client.multiplayer.WorldClient; +import net.minecraft.client.renderer.WorldRenderer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.chunk.storage.ExtendedBlockStorage; import net.minecraftforge.common.util.ForgeDirection; @@ -97,7 +98,6 @@ public class ChunkRenderManager implements ChunkSt @Getter private int submitted; - private int totalSubmitted; private final boolean translucencySorting; @@ -580,7 +580,7 @@ public class ChunkRenderManager implements ChunkSt sortedAnything = true; submitted++; } - totalSubmitted += submitted; + WorldRenderer.chunksUpdated += submitted; this.dirty |= submitted > 0; @@ -596,13 +596,6 @@ public class ChunkRenderManager implements ChunkSt } } - public int getAndResetSubmitted() { - // Return how many chunks were submitted since the last call to this method - final int submitted = totalSubmitted; - totalSubmitted = 0; - return submitted; - } - public void markDirty() { this.dirty = true; }