README.md

@@ -1,7 +1,7 @@
 <div style="text-align: center;"><h1 >BetterF3</h1>
 <br />
 
-[![Version](https://img.shields.io/badge/dynamic/json?color=ed37aa&label=Version&query=%24%5B%27promos%27%5D%5B%271.19-latest%27%5D&url=https%3A%2F%2Fraw.githubusercontent.com%2Fcominixo%2FBetterF3%2Farchitectury%2F1.19%2Fupdate.json?cacheSeconds=2592000)](https://www.curseforge.com/minecraft/mc-mods/betterf3/files)
+[![Version](https://img.shields.io/badge/dynamic/json?color=ed37aa&label=Version&query=%24%5B%27promos%27%5D%5B%271.19.2-latest%27%5D&url=https%3A%2F%2Fapi.modrinth.com%2Fupdates%2Fbetterf3%2Fforge%5Fupdates.json?cacheSeconds=2592000)](https://www.curseforge.com/minecraft/mc-mods/betterf3/files)
 [![Minecraft Versions](https://img.shields.io/badge/Minecraft-1.16.2--1.19+-9450cc)](http://files.minecraftforge.net/)
 [![License: MIT](https://img.shields.io/badge/License-MIT-2230f2.svg)](https://github.com/cominixo/BetterF3/blob/architectury/1.19/LICENSE.txt)
 <br/>

common/src/main/java/me/cominixo/betterf3/config/gui/modules/AddModuleScreen.java

@@ -43,7 +43,7 @@ public static ConfigBuilder configBuilder(final ModulesScreen parent) {
       "config.betterf3.add_button.module_name"),
         DropdownMenuBuilder.TopCellElementBuilder.of(new EmptyModule(true),
           BaseModule::module,
-          object -> Text.translatable(object.toString()))).setSelections(BaseModule.allModules)
+          object -> Text.translatable(object.toString()))).setSelections(BaseModule.distinctModules())
         .setSaveConsumer((BaseModule newValue) -> {
           try {
             parent.modulesListWidget.addModule(newValue.getClass().getDeclaredConstructor().newInstance());

common/src/main/java/me/cominixo/betterf3/mixin/DebugMixin.java

@@ -30,6 +30,7 @@
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 import static me.cominixo.betterf3.utils.Utils.START_X_POS;
@@ -206,16 +207,16 @@ public VertexConsumerProvider.Immediate immediate(final PositionEnum pos, final
           windowWidth += xPos;
         }
 
-        x1 = 1 + windowWidth;
-        x2 = windowWidth + width;
+        x1 = windowWidth - 1;
+        x2 = windowWidth + width + 1;
       } else {
         windowWidth = 2;
 
         if (GeneralOptions.enableAnimations) {
           windowWidth -= xPos;
         }
         x1 = windowWidth - 1;
-        x2 = width + 3 + windowWidth;
+        x2 = width + 1 + windowWidth;
       }
       y1 = y - 1;
       y2 = y + height - 1;
@@ -284,6 +285,18 @@ public void renderLeftText(final MatrixStack matrixStack, final CallbackInfo ci)
     ci.cancel();
   }
 
+  /**
+   * Disables the unneeded math for allocation rate.
+   *
+   * @param instance the allocation rate calculator
+   * @param allocatedBytes the allocated bytes
+   * @return nothing
+   */
+  @Redirect(method = "getRightText", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/hud/DebugHud$AllocationRateCalculator;get(J)J"))
+  public long allocationRateCalculatorGet(final DebugHud.AllocationRateCalculator instance, final long allocatedBytes) {
+    return 0;
+  }
+
   /**
    * Ensures that the TPS graph works.
    *
@@ -292,8 +305,11 @@ public void renderLeftText(final MatrixStack matrixStack, final CallbackInfo ci)
    */
   @Inject(method = "render", at = @At(value = "HEAD"))
   public void renderBefore(final MatrixStack matrices, final CallbackInfo ci) {
+    if (GeneralOptions.disableMod) {
+      return;
+    }
     matrices.push();
-    if (this.client.options.debugTpsEnabled) {
+    if (this.client.options.debugTpsEnabled && this.client.world != null) {
       final int scaledWidth = this.client.getWindow().getScaledWidth();
       this.drawMetricsData(matrices, this.client.getMetricsData(), 0, scaledWidth / 2, true);
       final IntegratedServer integratedServer = this.client.getServer();

common/src/main/java/me/cominixo/betterf3/mixin/autof3/AutomaticDebugMixin.java

@@ -16,10 +16,12 @@
 public class AutomaticDebugMixin {
 
   @Redirect(method = "clear", at = @At(value = "FIELD", target = "Lnet/minecraft/client/option/GameOptions;debugEnabled:Z", opcode = Opcodes.PUTFIELD))
-  private void removeDebugCrosshair(final GameOptions instance, final boolean value) {
+  private void automaticF3(final GameOptions instance, final boolean value) {
     if (!GeneralOptions.disableMod) {
       if (GeneralOptions.autoF3) {
         instance.debugEnabled = true;
+        instance.debugProfilerEnabled = false;
+        instance.debugTpsEnabled = false;
         return;
       }
     }

common/src/main/java/me/cominixo/betterf3/modules/BaseModule.java

@@ -1,8 +1,10 @@
 package me.cominixo.betterf3.modules;
 
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Optional;
+import java.util.TreeSet;
 import me.cominixo.betterf3.utils.DebugLine;
 import me.cominixo.betterf3.utils.DebugLineList;
 import me.cominixo.betterf3.utils.PositionEnum;
@@ -14,7 +16,7 @@
 /**
  * The Base module.
  */
-public abstract class BaseModule {
+public abstract class BaseModule implements Comparable<BaseModule> {
 
   /**
    * The color of the tag.
@@ -204,4 +206,26 @@ public void enabled(final boolean enabled) {
    * @param client the Minecraft client
    */
   public abstract void update(MinecraftClient client);
+
+  /**
+   * Gets a set of the modules.
+   *
+   * @return distinct modules
+   */
+  public static TreeSet<BaseModule> distinctModules() {
+    final HashSet<String> distinctModules = new HashSet<>(allModules.stream().map(BaseModule::toString).distinct().toList());
+    final TreeSet<BaseModule> distinctModulesObjects = new TreeSet<>();
+    for (final BaseModule module : allModules) {
+      if (distinctModules.contains(module.toString())) {
+        distinctModulesObjects.add(module);
+        distinctModules.remove(module.toString());
+      }
+    }
+    return distinctModulesObjects;
+  }
+
+  @Override
+  public int compareTo(final BaseModule o) {
+    return this.toString().compareTo(o.toString());
+  }
 }

common/src/main/java/me/cominixo/betterf3/modules/LocationModule.java

@@ -5,6 +5,7 @@
 import me.cominixo.betterf3.utils.DebugLine;
 import me.cominixo.betterf3.utils.Utils;
 import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.hud.DebugHud;
 import net.minecraft.client.resource.language.I18n;
 import net.minecraft.entity.Entity;
 import net.minecraft.server.integrated.IntegratedServer;
@@ -26,7 +27,7 @@
 import net.minecraft.world.chunk.ChunkStatus;
 import net.minecraft.world.chunk.WorldChunk;
 import net.minecraft.world.chunk.light.LightingProvider;
-import org.apache.commons.lang3.StringUtils;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * The Location module.
@@ -57,6 +58,9 @@ public LocationModule() {
     lines.add(new DebugLine("slime_chunk"));
   }
 
+  @Nullable
+  private CompletableFuture<WorldChunk> chunkFuture;
+
   /**
    * Updates the Location module.
    *
@@ -84,84 +88,89 @@ public void update(final MinecraftClient client) {
       lines.get(7).value(client.world.getRegistryManager().get(Registry.BIOME_KEY).getId(client.world.getBiome(blockPos).value()));
 
       serverWorld = integratedServer != null ? integratedServer.getWorld(client.world.getRegistryKey()) : client.world;
-      if (client.world.isChunkLoaded(blockPos.getX(), blockPos.getZ())) {
-        final WorldChunk clientChunk = client.world.getChunk(chunkPos.x, chunkPos.z);
-        if (clientChunk.isEmpty()) {
-          chunkLightString = I18n.translate("text.betterf3.line.waiting_chunk");
-        } else if (serverWorld != null) {
+      final WorldChunk clientChunk = client.world.getChunk(chunkPos.x, chunkPos.z);
+      if (clientChunk.isEmpty()) {
+        chunkLightString = I18n.translate("text.betterf3.line.waiting_chunk");
+      } else if (serverWorld != null) {
 
-          // Client Chunk Lights
-          final int totalLight = client.world.getChunkManager().getLightingProvider().getLight(blockPos, 0);
-          final int skyLight = client.world.getLightLevel(LightType.SKY, blockPos);
-          final int blockLight = client.world.getLightLevel(LightType.BLOCK, blockPos);
-          chunkLightString = I18n.translate("format.betterf3.chunklight", totalLight, skyLight, blockLight);
+        // Client Chunk Lights
+        final int totalLight = client.world.getChunkManager().getLightingProvider().getLight(blockPos, 0);
+        final int skyLight = client.world.getLightLevel(LightType.SKY, blockPos);
+        final int blockLight = client.world.getLightLevel(LightType.BLOCK, blockPos);
+        chunkLightString = I18n.translate("format.betterf3.chunklight", totalLight, skyLight, blockLight);
 
-          // Server Chunk Lights
-          final LightingProvider lightingProvider = serverWorld.getChunkManager().getLightingProvider();
+        // Server Chunk Lights
+        final LightingProvider lightingProvider = serverWorld.getChunkManager().getLightingProvider();
 
-          final int skyLightServer = lightingProvider.get(LightType.SKY).getLightLevel(blockPos);
-          final int blockLightServer = lightingProvider.get(LightType.BLOCK).getLightLevel(blockPos);
+        final int skyLightServer = lightingProvider.get(LightType.SKY).getLightLevel(blockPos);
+        final int blockLightServer = lightingProvider.get(LightType.BLOCK).getLightLevel(blockPos);
 
-          chunkLightServerString = I18n.translate("format.betterf3.chunklight_server", skyLightServer, blockLightServer);
+        chunkLightServerString = I18n.translate("format.betterf3.chunklight_server", skyLightServer, blockLightServer);
 
-          // Heightmap stuff (Find the highest block)
-          final Heightmap.Type[] heightmapTypes = Heightmap.Type.values();
+        // Heightmap stuff (Find the highest block)
+        final Heightmap.Type[] heightmapTypes = Heightmap.Type.values();
 
-          WorldChunk serverChunk;
+        WorldChunk serverChunk;
 
-          if (serverWorld instanceof ServerWorld) {
-            final CompletableFuture<WorldChunk> chunkCompletableFuture = ((ServerWorld) serverWorld).getChunkManager().getChunkFutureSyncOnMainThread(blockPos.getX(), blockPos.getZ(), ChunkStatus.FULL, false).thenApply(either -> either.map(chunk -> (WorldChunk) chunk, unloaded -> null));
+        if (serverWorld instanceof ServerWorld) {
+          if (this.chunkFuture == null) {
+            this.chunkFuture =
+            ((ServerWorld) serverWorld).getChunkManager().getChunkFutureSyncOnMainThread(chunkPos.x, chunkPos.z, ChunkStatus.FULL, false).thenApply((either) -> either.map((chunk) -> (WorldChunk) chunk, (chunk) -> null));
+          }
 
-            serverChunk = chunkCompletableFuture.getNow(null);
-          } else {
-            serverChunk = clientChunk;
+          if (this.chunkFuture == null) {
+            this.chunkFuture = CompletableFuture.completedFuture(clientChunk);
           }
 
-          for (final Heightmap.Type type : heightmapTypes) {
+          serverChunk = this.chunkFuture.getNow(null);
+        } else {
+          serverChunk = clientChunk;
+        }
 
-            // Client
-            if (type.shouldSendToClient()) {
-              final String typeString = StringUtils.capitalize(type.getName().replace("_", " "));
-              final int blockY = clientChunk.sampleHeightmap(type, blockPos.getX(), blockPos.getZ());
-              if (blockY > -1) {
-                highestBlock.append("  ").append(typeString).append(": ").append(blockY);
-              }
+        for (final Heightmap.Type type : heightmapTypes) {
+
+          // Client
+          if (type.shouldSendToClient()) {
+            final String typeString = DebugHud.HEIGHT_MAP_TYPES.get(type);
+            final int blockY = clientChunk.sampleHeightmap(type, blockPos.getX(), blockPos.getZ());
+            if (blockY > -1) {
+              highestBlock.append("  ").append(typeString).append(": ").append(blockY);
             }
+          }
 
-            // Server
-            if (type.isStoredServerSide() && serverWorld instanceof ServerWorld) {
-              if (serverChunk == null) {
-                serverChunk = clientChunk;
-              }
+          // Server
+          if (type.isStoredServerSide() && serverWorld instanceof ServerWorld) {
+            if (serverChunk == null) {
+              serverChunk = clientChunk;
+            }
 
-              final String typeString = Utils.enumToString(type);
+            final String typeString = DebugHud.HEIGHT_MAP_TYPES.get(type);
 
-              final int blockY = serverChunk.sampleHeightmap(type, blockPos.getX(), blockPos.getZ());
-              if (blockY > -1) {
-                highestBlockServer.append("  ").append(typeString).append(": ").append(blockY);
-              }
+            final int blockY = serverChunk.sampleHeightmap(type, blockPos.getX(), blockPos.getZ());
+            if (blockY > -1) {
+              highestBlockServer.append("  ").append(typeString).append(": ").append(blockY);
             }
           }
+        }
 
-          // Local Difficulty
-          if (blockPos.getY() >= 0 && blockPos.getY() < 256) {
-            final float moonSize;
-            final long inhabitedTime;
+        // Local Difficulty
+        if (blockPos.getY() >= 0 && blockPos.getY() < 256) {
+          final float moonSize;
+          final long inhabitedTime;
 
-            moonSize = serverWorld.getMoonSize();
+          moonSize = serverWorld.getMoonSize();
 
-            inhabitedTime = Objects.requireNonNullElse(serverChunk, clientChunk).getInhabitedTime();
+          inhabitedTime = Objects.requireNonNullElse(serverChunk, clientChunk).getInhabitedTime();
 
-            final LocalDifficulty localDifficulty = new LocalDifficulty(serverWorld.getDifficulty(), serverWorld.getTimeOfDay(), inhabitedTime, moonSize);
-            localDifficultyString = String.format("%.2f  " + I18n.translate("text.betterf3.line.clamped") + ": %.2f", localDifficulty.getLocalDifficulty(), localDifficulty.getClampedLocalDifficulty());
-          }
+          final LocalDifficulty localDifficulty = new LocalDifficulty(serverWorld.getDifficulty(), serverWorld.getTimeOfDay(), inhabitedTime, moonSize);
+          localDifficultyString = String.format("%.2f  " + I18n.translate("text.betterf3.line.clamped") + ": %.2f", localDifficulty.getLocalDifficulty(), localDifficulty.getClampedLocalDifficulty());
+        }
 
-          if (integratedServer != null) {
-            final Random slimeChunk = ChunkRandom.getSlimeRandom(chunkPos.x, chunkPos.z, ((StructureWorldAccess) serverWorld).getSeed(), 0x3ad8025fL);
-            slimeChunkString = String.format("%s", I18n.translate((slimeChunk.nextInt(10) == 0 ) ? "text.betterf3.line.slime_chunk.true" : "text.betterf3.line.slime_chunk.false"));
-          } else {
-            slimeChunkString = String.format("%s", I18n.translate("text.betterf3.line.slime_chunk.unknown"));
-          }
+        if (integratedServer != null) {
+          final Random slimeChunk = ChunkRandom.getSlimeRandom(chunkPos.x, chunkPos.z, ((StructureWorldAccess) serverWorld).getSeed(), 0x3ad8025fL);
+          slimeChunkString = String.format("%s", I18n.translate((slimeChunk.nextInt(10) == 0 ) ? "text.betterf3.line.slime_chunk.true" : "text.betterf3.line.slime_chunk.false"));
+        } else {
+          slimeChunkString = String.format("%s", I18n.translate("text.betterf3.line.slime_chunk.unknown"));
         }
       }
     }