Fix #53

Signed-off-by: TreyRuffy <[email protected]>
cominixo · Dec 6, 2021 · c644c04 · c644c04
1 parent bd88bef
commit c644c04
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 84 deletions.
diff --git a/common/src/main/java/me/cominixo/betterf3/mixin/chunk/WorldRendererAccessor.java b/common/src/main/java/me/cominixo/betterf3/mixin/chunk/WorldRendererAccessor.java
diff --git a/common/src/main/java/me/cominixo/betterf3/modules/ChunksModule.java b/common/src/main/java/me/cominixo/betterf3/modules/ChunksModule.java
@@ -9,7 +9,6 @@
 import me.cominixo.betterf3.mixin.chunk.ChunkBuilderAccessor;
 import me.cominixo.betterf3.mixin.chunk.ClientChunkManagerAccessor;
 import me.cominixo.betterf3.mixin.chunk.ClientChunkMapAccessor;
-import me.cominixo.betterf3.mixin.chunk.WorldRendererAccessor;
 import me.cominixo.betterf3.utils.DebugLine;
 import me.cominixo.betterf3.utils.Utils;
 import net.minecraft.client.MinecraftClient;
@@ -71,16 +70,15 @@ public ChunksModule() {
      */
     public void update(final MinecraftClient client) {
 
-        final WorldRendererAccessor worldRendererMixin = (WorldRendererAccessor) client.worldRenderer;
         final int totalChunks;
-        if (worldRendererMixin.getChunks() == null) {
+        if (client.worldRenderer.chunks == null) {
             totalChunks = 0;
         } else {
-            totalChunks = worldRendererMixin.getChunks().chunks.length;
+            totalChunks = client.worldRenderer.chunks.chunks.length;
         }
-        final int renderedChunks = worldRendererMixin.callGetCompletedChunkCount();
+        final int renderedChunks = client.worldRenderer.getCompletedChunkCount();
 
-        final ChunkBuilder chunkBuilder = worldRendererMixin.getChunkBuilder();
+        final ChunkBuilder chunkBuilder = client.worldRenderer.chunkBuilder;
         final ChunkBuilderAccessor chunkBuilderAccessor = (ChunkBuilderAccessor) chunkBuilder;
 
         if (client.world != null) {

diff --git a/common/src/main/java/me/cominixo/betterf3/modules/EntityModule.java b/common/src/main/java/me/cominixo/betterf3/modules/EntityModule.java
@@ -3,7 +3,6 @@
 import it.unimi.dsi.fastutil.objects.Object2IntMap;
 import java.util.Arrays;
 import java.util.List;
-import me.cominixo.betterf3.mixin.chunk.WorldRendererAccessor;
 import me.cominixo.betterf3.utils.DebugLine;
 import me.cominixo.betterf3.utils.Utils;
 import net.minecraft.client.MinecraftClient;
@@ -55,13 +54,13 @@ public EntityModule() {
      * @param client the Minecraft client
      */
     public void update(final MinecraftClient client) {
-        final WorldRendererAccessor worldRendererMixin = (WorldRendererAccessor) client.worldRenderer;
 
+        assert client.worldRenderer.world != null;
         final List<Text> entityValues =
                 Arrays.asList(Utils.styledText(I18n.translate("text.betterf3.line.rendered"), valueColor),
                         Utils.styledText(I18n.translate("text.betterf3.line.total"), this.totalColor),
-                Utils.styledText(worldRendererMixin.getRegularEntityCount(), valueColor),
-                Utils.styledText(worldRendererMixin.getWorld().getRegularEntityCount(), this.totalColor));
+                Utils.styledText(client.worldRenderer.regularEntityCount, valueColor),
+                Utils.styledText(client.worldRenderer.world.getRegularEntityCount(), this.totalColor));
 
         final IntegratedServer integratedServer = client.getServer();
 

diff --git a/common/src/main/java/me/cominixo/betterf3/modules/GraphicsModule.java b/common/src/main/java/me/cominixo/betterf3/modules/GraphicsModule.java
@@ -1,6 +1,5 @@
 package me.cominixo.betterf3.modules;
 
-import me.cominixo.betterf3.mixin.chunk.WorldRendererAccessor;
 import me.cominixo.betterf3.utils.DebugLine;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gl.ShaderEffect;
@@ -38,13 +37,12 @@ public GraphicsModule() {
      * @param client the Minecraft client
      */
     public void update(final MinecraftClient client) {
-        final WorldRendererAccessor worldRendererMixin = (WorldRendererAccessor) client.worldRenderer;
 
         final String cloudString = client.options.cloudRenderMode == CloudRenderMode.OFF ? I18n.translate("text.betterf3.line.off")
                 : (client.options.cloudRenderMode == CloudRenderMode.FAST ? I18n.translate("text.betterf3.line.fast") : I18n.translate("text.betterf3.line.fancy") );
 
         // Render Distance
-        lines.get(0).value(worldRendererMixin.getViewDistance());
+        lines.get(0).value(client.worldRenderer.viewDistance);
         // Graphics
         lines.get(1).value(StringUtils.capitalize(client.options.graphicsMode.toString()));
         // Clouds

diff --git a/common/src/main/resources/betterf3.accesswidener b/common/src/main/resources/betterf3.accesswidener
@@ -1,2 +1,7 @@
 accessWidener   v1  named
-accessible  class   net/minecraft/client/world/ClientChunkManager$ClientChunkMap
+accessible  class   net/minecraft/client/world/ClientChunkManager$ClientChunkMap
+accessible field net/minecraft/client/render/WorldRenderer viewDistance I
+accessible field net/minecraft/client/render/WorldRenderer chunkBuilder Lnet/minecraft/client/render/chunk/ChunkBuilder;
+accessible field net/minecraft/client/render/WorldRenderer world Lnet/minecraft/client/world/ClientWorld;
+accessible field net/minecraft/client/render/WorldRenderer chunks Lnet/minecraft/client/render/BuiltChunkStorage;
+accessible field net/minecraft/client/render/WorldRenderer regularEntityCount I
diff --git a/common/src/main/resources/betterf3.mixins.json b/common/src/main/resources/betterf3.mixins.json
@@ -10,7 +10,6 @@
     "KeyboardMixin",
     "chunk.ChunkBuilderAccessor",
     "chunk.ClientChunkManagerAccessor",
-    "chunk.ClientChunkMapAccessor",
-    "chunk.WorldRendererAccessor"
+    "chunk.ClientChunkMapAccessor"
   ]
 }
diff --git a/fabric/src/main/resources/betterf3.accesswidener b/fabric/src/main/resources/betterf3.accesswidener
@@ -1,2 +1,7 @@
 accessWidener   v1  named
-accessible  class   net/minecraft/client/world/ClientChunkManager$ClientChunkMap
+accessible  class   net/minecraft/client/world/ClientChunkManager$ClientChunkMap
+accessible field net/minecraft/client/render/WorldRenderer viewDistance I
+accessible field net/minecraft/client/render/WorldRenderer chunkBuilder Lnet/minecraft/client/render/chunk/ChunkBuilder;
+accessible field net/minecraft/client/render/WorldRenderer world Lnet/minecraft/client/world/ClientWorld;
+accessible field net/minecraft/client/render/WorldRenderer chunks Lnet/minecraft/client/render/BuiltChunkStorage;
+accessible field net/minecraft/client/render/WorldRenderer regularEntityCount I
diff --git a/forge/src/main/resources/META-INF/accesstransformer.cfg b/forge/src/main/resources/META-INF/accesstransformer.cfg
@@ -1,2 +1,7 @@
 # Access Transformer which makes ClientChunkCache$Storage public
-public net.minecraft.client.multiplayer.ClientChunkCache$Storage
+public net.minecraft.client.multiplayer.ClientChunkCache$Storage
+public net.minecraft.client.renderer.LevelRenderer f_109436_ # chunkRenderDispatcher
+public net.minecraft.client.renderer.LevelRenderer f_109438_ # lastViewDistance
+public net.minecraft.client.renderer.LevelRenderer f_109439_ # renderedEntities
+public net.minecraft.client.renderer.LevelRenderer f_109469_ # viewArea
+public net.minecraft.client.renderer.LevelRenderer f_109465_ # level
diff --git a/gradle.properties b/gradle.properties
@@ -5,7 +5,7 @@ org.gradle.daemon=false
 minecraft_version=1.18
 
 archives_base_name=BetterF3
-mod_version=1.2.1
+mod_version=1.2.2
 maven_group=me.treyruffy.betterf3
 
 architectury_version=3.1.44