change: Eliminate the assumption that only one client world exists (CaffeineMC#734)

Author: qouteall

src/main/java/me/jellysquid/mods/sodium/client/render/SodiumWorldRenderer.java

@@ -17,6 +17,7 @@
 import me.jellysquid.mods.sodium.client.util.math.FrustumExtended;
 import me.jellysquid.mods.sodium.client.world.ChunkStatusListener;
 import me.jellysquid.mods.sodium.client.world.ClientChunkManagerExtended;
+import me.jellysquid.mods.sodium.client.world.WorldRendererExtended;
 import me.jellysquid.mods.sodium.common.util.ListUtil;
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.client.MinecraftClient;
@@ -39,8 +40,6 @@
  * Provides an extension to vanilla's {@link WorldRenderer}.
  */
 public class SodiumWorldRenderer implements ChunkStatusListener {
-    private static SodiumWorldRenderer instance;
-
     private final MinecraftClient client;
 
     private ClientWorld world;
@@ -59,29 +58,13 @@ public class SodiumWorldRenderer implements ChunkStatusListener {
     private ChunkRenderer chunkRenderer;
 
     /**
-     * Instantiates Sodium's world renderer. This should be called at the time of the world renderer initialization.
-     */
-    public static SodiumWorldRenderer create() {
-        if (instance == null) {
-            instance = new SodiumWorldRenderer(MinecraftClient.getInstance());
-        }
-
-        return instance;
-    }
-
-    /**
-     * @throws IllegalStateException If the renderer has not yet been created
-     * @return The current instance of this type
+     * @return The SodiumWorldRenderer based on the current dimension
      */
     public static SodiumWorldRenderer getInstance() {
-        if (instance == null) {
-            throw new IllegalStateException("Renderer not initialized");
-        }
-
-        return instance;
+        return ((WorldRendererExtended) MinecraftClient.getInstance().worldRenderer).getSodiumWorldRenderer();
     }
 
-    private SodiumWorldRenderer(MinecraftClient client) {
+    public SodiumWorldRenderer(MinecraftClient client) {
         this.client = client;
     }
 

src/main/java/me/jellysquid/mods/sodium/client/world/WorldRendererExtended.java

@@ -0,0 +1,7 @@
+package me.jellysquid.mods.sodium.client.world;
+
+import me.jellysquid.mods.sodium.client.render.SodiumWorldRenderer;
+
+public interface WorldRendererExtended {
+    SodiumWorldRenderer getSodiumWorldRenderer();
+}

src/main/java/me/jellysquid/mods/sodium/mixin/features/chunk_rendering/MixinWorldRenderer.java

@@ -3,6 +3,7 @@
 import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
 import me.jellysquid.mods.sodium.client.gl.device.RenderDevice;
 import me.jellysquid.mods.sodium.client.render.SodiumWorldRenderer;
+import me.jellysquid.mods.sodium.client.world.WorldRendererExtended;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.option.GameOptions;
 import net.minecraft.client.render.*;
@@ -22,7 +23,7 @@
 import java.util.SortedSet;
 
 @Mixin(WorldRenderer.class)
-public abstract class MixinWorldRenderer {
+public abstract class MixinWorldRenderer implements WorldRendererExtended {
     @Shadow
     @Final
     private BufferBuilderStorage bufferBuilders;
@@ -33,6 +34,11 @@ public abstract class MixinWorldRenderer {
 
     private SodiumWorldRenderer renderer;
 
+    @Override
+    public SodiumWorldRenderer getSodiumWorldRenderer() {
+        return renderer;
+    }
+
     @Redirect(method = "reload()V", at = @At(value = "FIELD", target = "Lnet/minecraft/client/option/GameOptions;viewDistance:I", ordinal = 1))
     private int nullifyBuiltChunkStorage(GameOptions options) {
         // Do not allow any resources to be allocated
@@ -41,7 +47,7 @@ private int nullifyBuiltChunkStorage(GameOptions options) {
 
     @Inject(method = "<init>", at = @At("RETURN"))
     private void init(MinecraftClient client, BufferBuilderStorage bufferBuilders, CallbackInfo ci) {
-        this.renderer = SodiumWorldRenderer.create();
+        this.renderer = new SodiumWorldRenderer(client);
     }
 
     @Inject(method = "setWorld", at = @At("RETURN"))