.github/workflows/crowdin-tasks.yml

@@ -25,7 +25,7 @@ jobs:
       - name: Run Crowdin Action
         uses: crowdin/github-action@1.4.13
         with:
-            upload_sources: true
+            upload_sources: false
             upload_translations: false
 
             download_translations: true

LICENSE.txt

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 - 2022 cominixo / TreyRuffy
+Copyright (c) 2020 - 2023 cominixo / TreyRuffy
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

build.gradle

@@ -2,7 +2,7 @@ import java.text.SimpleDateFormat
 
 plugins {
     id "architectury-plugin" version "3.4-SNAPSHOT" // Uses Architectury plugin https://github.com/architectury/architectury-plugin
-    id "dev.architectury.loom" version "1.2-SNAPSHOT" apply false // Uses Architectury Loom
+    id "dev.architectury.loom" version "1.3-SNAPSHOT" apply false // Uses Architectury Loom
     // (fork of Fabric Loom) https://github.com/architectury/architectury-loom - does not apply to root project
     id "net.kyori.indra" version "3.1.2" // Uses Indra plugin
     id "net.kyori.indra.git" version "3.1.2" // Uses Indra Git plugin

common/src/main/java/me/cominixo/betterf3/config/ModConfigFile.java

@@ -388,12 +388,8 @@ private static BaseModule loadModule(final Config moduleConfig) {
     }
 
     if (baseModule instanceof SystemModule systemModule) {
-      if (systemModule.memoryColorToggle == null) {
-        systemModule.memoryColorToggle = moduleConfig.getOrElse("memory_color_toggle", systemModule.defaultMemoryColorToggle);
-      }
-      if (systemModule.timeFormat == null) {
-        systemModule.timeFormat = moduleConfig.getOrElse("time_format", systemModule.defaultTimeFormat);
-      }
+      systemModule.memoryColorToggle = moduleConfig.getOrElse("memory_color_toggle", systemModule.defaultMemoryColorToggle);
+      systemModule.timeFormat = moduleConfig.getOrElse("time_format", systemModule.defaultTimeFormat);
     }
 
     baseModule.enabled = moduleConfig.getOrElse("enabled", true);
@@ -474,6 +470,15 @@ private static Config saveModule(final BaseModule module) {
         moduleConfig.set("total_chunks_color", chunkModule.totalColor.getRgb());
     }
 
+    if (module instanceof SystemModule systemModule) {
+      if (systemModule.memoryColorToggle != null) {
+        moduleConfig.set("memory_color_toggle", systemModule.memoryColorToggle);
+      }
+      if (systemModule.timeFormat != null) {
+        moduleConfig.set("time_format", systemModule.timeFormat);
+      }
+    }
+
     moduleConfig.set("enabled", module.enabled);
     moduleConfig.set("lines", lines);
 

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

@@ -21,14 +21,13 @@
 import net.minecraft.client.render.VertexFormat;
 import net.minecraft.client.render.VertexFormats;
 import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.server.integrated.IntegratedServer;
 import net.minecraft.text.Text;
-import net.minecraft.util.MetricsData;
 import net.minecraft.util.Util;
 import org.joml.Matrix4f;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.Redirect;
@@ -64,15 +63,13 @@ public abstract class DebugMixin {
   @SuppressWarnings("checkstyle:MethodName")
   @Shadow protected abstract List<String> getRightText();
 
-  @Shadow protected abstract void drawMetricsData(DrawContext context, MetricsData metricsData, int x, int width,
-                                                  boolean showFps);
-
   /**
    * Sets up modules on the left side of the screen.
    *
    * @return the left side modules
    */
-  public List<Text> newLeftText() {
+  @Unique
+  public List<Text> betterF3$newLeftText() {
 
     final List<Text> list = new ArrayList<>();
 
@@ -103,7 +100,8 @@ public List<Text> newLeftText() {
    *
    * @return the right side modules
    */
-  public List<Text> newRightText() {
+  @Unique
+  public List<Text> betterF3$newRightText() {
 
     final List<Text> list = new ArrayList<>();
 
@@ -141,9 +139,9 @@ public void drawRightText(final DrawContext context, final CallbackInfo ci) {
       return;
     }
 
-    final List<Text> list = this.newRightText();
+    final List<Text> list = this.betterF3$newRightText();
 
-    final VertexConsumerProvider.Immediate immediate = this.immediate(PositionEnum.RIGHT, list, context.getMatrices());
+    final VertexConsumerProvider.Immediate immediate = this.betterF3$immediate(PositionEnum.RIGHT, list, context.getMatrices());
 
     for (int i = 0; i < list.size(); i++) {
 
@@ -173,8 +171,9 @@ public void drawRightText(final DrawContext context, final CallbackInfo ci) {
    * @param matrixStack The MatrixStack
    * @return VertexConsumerProvider
    */
-  public VertexConsumerProvider.Immediate immediate(final PositionEnum pos, final List<Text> list,
-                                                    final MatrixStack matrixStack) {
+  @Unique
+  public VertexConsumerProvider.Immediate betterF3$immediate(final PositionEnum pos, final List<Text> list,
+                                                             final MatrixStack matrixStack) {
 
     final float f = (float) (GeneralOptions.backgroundColor >> 24 & 255) / 255.0F;
     final float g = (float) (GeneralOptions.backgroundColor >> 16 & 255) / 255.0F;
@@ -261,8 +260,8 @@ public void drawLeftText(final DrawContext context, final CallbackInfo ci) {
       return;
     }
 
-    final List<Text> list = this.newLeftText();
-    final VertexConsumerProvider.Immediate immediate = this.immediate(PositionEnum.LEFT, list, context.getMatrices());
+    final List<Text> list = this.betterF3$newLeftText();
+    final VertexConsumerProvider.Immediate immediate = this.betterF3$immediate(PositionEnum.LEFT, list, context.getMatrices());
 
     for (int i = 0; i < list.size(); i++) {
 
@@ -308,14 +307,6 @@ public void renderBefore(final DrawContext context, final CallbackInfo ci) {
       return;
     }
     context.getMatrices().push();
-    if (this.client.options.debugTpsEnabled && this.client.world != null) {
-      final int scaledWidth = this.client.getWindow().getScaledWidth();
-      this.drawMetricsData(context, this.client.getMetricsData(), 0, scaledWidth / 2, true);
-      final IntegratedServer integratedServer = this.client.getServer();
-      if (integratedServer != null) {
-        this.drawMetricsData(context, integratedServer.getMetricsData(), scaledWidth - Math.min(scaledWidth / 2, 240), scaledWidth / 2, false);
-      }
-    }
   }
 
   /**
@@ -324,7 +315,7 @@ public void renderBefore(final DrawContext context, final CallbackInfo ci) {
    * @param context Draw Context
    * @param ci Callback info
    */
-  @Inject(method = "method_51746", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/hud/DebugHud;drawLeftText(Lnet/minecraft/client/gui/DrawContext;)V"))
+  @Inject(method = "method_51746", at = @At(value = "HEAD"))
   public void renderFontScaleBefore(final DrawContext context, final CallbackInfo ci) {
     if (!GeneralOptions.disableMod) {
       context.getMatrices().scale((float) GeneralOptions.fontScale, (float) GeneralOptions.fontScale, 1F);
@@ -337,14 +328,12 @@ public void renderFontScaleBefore(final DrawContext context, final CallbackInfo
    * @param context Draw Context
    * @param ci CallbackInfo
    */
-  @Inject(method = "method_51746", at = @At(value = "FIELD", target = "Lnet/minecraft/client/option/GameOptions;debugTpsEnabled:Z"), cancellable = true)
+  @Inject(method = "method_51746", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/hud/DebugHud;drawRightText(Lnet/minecraft/client/gui/DrawContext;)V", shift = At.Shift.AFTER))
   public void renderFontScaleRightAfter(final DrawContext context, final CallbackInfo ci) {
     if (GeneralOptions.disableMod) {
       return;
     }
     context.getMatrices().pop();
-    this.client.getProfiler().pop();
-    ci.cancel();
   }
 
   /**
@@ -353,7 +342,7 @@ public void renderFontScaleRightAfter(final DrawContext context, final CallbackI
    * @param context Draw Context
    * @param ci Callback info
    */
-  @Inject(method = "render", at = @At("HEAD"))
+  @Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/profiler/Profiler;push(Ljava/lang/String;)V"))
   public void renderAnimation(final DrawContext context, final CallbackInfo ci) {
 
     if (GeneralOptions.disableMod) {
@@ -369,7 +358,7 @@ public void renderAnimation(final DrawContext context, final CallbackInfo ci) {
       int i = ((START_X_POS / 2 + xPos) / 10) - 9;
 
       if (xPos != 0 && !closingAnimation) {
-        xPos /= GeneralOptions.animationSpeed;
+        xPos = (int) (xPos / GeneralOptions.animationSpeed);
         xPos -= i;
       }
 
@@ -380,7 +369,7 @@ public void renderAnimation(final DrawContext context, final CallbackInfo ci) {
       if (closingAnimation) {
 
         xPos += i;
-        xPos *= GeneralOptions.animationSpeed;
+        xPos = (int) (xPos * GeneralOptions.animationSpeed);
 
         if (xPos >= 300) {
           this.client.options.debugEnabled = false;

common/src/main/java/me/cominixo/betterf3/utils/DebugLine.java

@@ -80,7 +80,7 @@ public Text toText(final TextColor nameColor, final TextColor valueColor) {
     } else {
       valueStyled = Utils.styledText(this.value, valueColor);
     }
-    if (this.value.toString().equals("")) {
+    if (this.value.toString().isEmpty()) {
       this.active = false;
     }
     return Text.translatable(this.format, nameStyled, valueStyled);

common/src/main/resources/assets/betterf3/lang/af_za.json

@@ -35,6 +35,9 @@
   "config.betterf3.always_enable_profiler.tooltip": "Always enable the profiler when using F3.",
   "config.betterf3.always_enable_tps_graph": "Always Enable the TPS Graph",
   "config.betterf3.always_enable_tps_graph.tooltip": "Always enable the TPS graph when using F3.",
+  "config.betterf3.always_enable_tps_graph.tooltip_new": "Always enable the TPS graph when using F3. Cannot be used with the ping graph.",
+  "config.betterf3.always_enable_ping_graph": "Always Enable the Ping Graph",
+  "config.betterf3.always_enable_ping_graph.tooltip": "Always enable the ping graph when using F3. Cannot be used with the TPS graph.",
   "config.betterf3.fontScale": "Font Scale",
   "config.betterf3.fontScale.tooltip": "Set the scale of the font.",
   "config.betterf3.category.modules": "Modules",
@@ -153,6 +156,9 @@
   "text.betterf3.line.fancy": "Fancy",
   "text.betterf3.line.pie_graph": "Pie Graph (Shift+F3)",
   "text.betterf3.line.fps_tps": "FPS / TPS (Alt+F3)",
+  "text.betterf3.line.pie_graph_new": "Pie Graph (F3+1)",
+  "text.betterf3.line.fps_tps_new": "FPS / TPS (F3+2)",
+  "text.betterf3.line.ping": "Ping / Bandwidth (F3+3)",
   "text.betterf3.line.help": "For help",
   "text.betterf3.line.visible": "Visible",
   "text.betterf3.line.hidden": "Hidden",
@@ -216,4 +222,4 @@
   "text.betterf3.line.slime_chunk.true": "true",
   "text.betterf3.line.slime_chunk.false": "false",
   "text.betterf3.line.slime_chunk.unknown": "unknown"
-}
+}

common/src/main/resources/assets/betterf3/lang/ar_sa.json

@@ -35,6 +35,9 @@
   "config.betterf3.always_enable_profiler.tooltip": "تمكين الملف الشخصي دائماً عند استخدام F3.",
   "config.betterf3.always_enable_tps_graph": "Always Enable the TPS Graph",
   "config.betterf3.always_enable_tps_graph.tooltip": "Always enable the TPS graph when using F3.",
+  "config.betterf3.always_enable_tps_graph.tooltip_new": "Always enable the TPS graph when using F3. Cannot be used with the ping graph.",
+  "config.betterf3.always_enable_ping_graph": "Always Enable the Ping Graph",
+  "config.betterf3.always_enable_ping_graph.tooltip": "Always enable the ping graph when using F3. Cannot be used with the TPS graph.",
   "config.betterf3.fontScale": "Font Scale",
   "config.betterf3.fontScale.tooltip": "Set the scale of the font.",
   "config.betterf3.category.modules": "Modules",
@@ -97,13 +100,13 @@
   "debug.betterf3.modmenu.help": "F3 + M = BetterF3 Options",
   "text.betterf3.module.minecraft": "Minecraft",
   "text.betterf3.module.fps": "FPS",
-  "text.betterf3.module.graphics": "Graphics",
+  "text.betterf3.module.graphics": "الجرافيك",
   "text.betterf3.module.server": "Server",
   "text.betterf3.module.coords": "Coordinates",
   "text.betterf3.module.chunks": "Chunks",
   "text.betterf3.module.location": "Location",
   "text.betterf3.module.entity": "Entities",
-  "text.betterf3.module.sound": "Sounds",
+  "text.betterf3.module.sound": "الأصوات",
   "text.betterf3.module.help": "Help",
   "text.betterf3.module.miscleft": "Misc Left",
   "text.betterf3.module.miscright": "Misc Right",
@@ -153,6 +156,9 @@
   "text.betterf3.line.fancy": "فاخر",
   "text.betterf3.line.pie_graph": "Pie Graph (Shift+F3)",
   "text.betterf3.line.fps_tps": "FPS / TPS (Alt+F3)",
+  "text.betterf3.line.pie_graph_new": "Pie Graph (F3+1)",
+  "text.betterf3.line.fps_tps_new": "FPS / TPS (F3+2)",
+  "text.betterf3.line.ping": "Ping / Bandwidth (F3+3)",
   "text.betterf3.line.help": "For help",
   "text.betterf3.line.visible": "ظاهر",
   "text.betterf3.line.hidden": "مخفي",
@@ -216,4 +222,4 @@
   "text.betterf3.line.slime_chunk.true": "true",
   "text.betterf3.line.slime_chunk.false": "false",
   "text.betterf3.line.slime_chunk.unknown": "unknown"
-}
+}

common/src/main/resources/assets/betterf3/lang/ast_es.json

@@ -35,6 +35,9 @@
   "config.betterf3.always_enable_profiler.tooltip": "Always enable the profiler when using F3.",
   "config.betterf3.always_enable_tps_graph": "Always Enable the TPS Graph",
   "config.betterf3.always_enable_tps_graph.tooltip": "Always enable the TPS graph when using F3.",
+  "config.betterf3.always_enable_tps_graph.tooltip_new": "Always enable the TPS graph when using F3. Cannot be used with the ping graph.",
+  "config.betterf3.always_enable_ping_graph": "Always Enable the Ping Graph",
+  "config.betterf3.always_enable_ping_graph.tooltip": "Always enable the ping graph when using F3. Cannot be used with the TPS graph.",
   "config.betterf3.fontScale": "Font Scale",
   "config.betterf3.fontScale.tooltip": "Set the scale of the font.",
   "config.betterf3.category.modules": "Modules",
@@ -153,6 +156,9 @@
   "text.betterf3.line.fancy": "Fancy",
   "text.betterf3.line.pie_graph": "Pie Graph (Shift+F3)",
   "text.betterf3.line.fps_tps": "FPS / TPS (Alt+F3)",
+  "text.betterf3.line.pie_graph_new": "Pie Graph (F3+1)",
+  "text.betterf3.line.fps_tps_new": "FPS / TPS (F3+2)",
+  "text.betterf3.line.ping": "Ping / Bandwidth (F3+3)",
   "text.betterf3.line.help": "For help",
   "text.betterf3.line.visible": "Visible",
   "text.betterf3.line.hidden": "Hidden",
@@ -216,4 +222,4 @@
   "text.betterf3.line.slime_chunk.true": "true",
   "text.betterf3.line.slime_chunk.false": "false",
   "text.betterf3.line.slime_chunk.unknown": "unknown"
-}
+}

common/src/main/resources/assets/betterf3/lang/az_az.json

@@ -35,6 +35,9 @@
   "config.betterf3.always_enable_profiler.tooltip": "Always enable the profiler when using F3.",
   "config.betterf3.always_enable_tps_graph": "Always Enable the TPS Graph",
   "config.betterf3.always_enable_tps_graph.tooltip": "Always enable the TPS graph when using F3.",
+  "config.betterf3.always_enable_tps_graph.tooltip_new": "Always enable the TPS graph when using F3. Cannot be used with the ping graph.",
+  "config.betterf3.always_enable_ping_graph": "Always Enable the Ping Graph",
+  "config.betterf3.always_enable_ping_graph.tooltip": "Always enable the ping graph when using F3. Cannot be used with the TPS graph.",
   "config.betterf3.fontScale": "Font Scale",
   "config.betterf3.fontScale.tooltip": "Set the scale of the font.",
   "config.betterf3.category.modules": "Modules",
@@ -153,6 +156,9 @@
   "text.betterf3.line.fancy": "Fancy",
   "text.betterf3.line.pie_graph": "Pie Graph (Shift+F3)",
   "text.betterf3.line.fps_tps": "FPS / TPS (Alt+F3)",
+  "text.betterf3.line.pie_graph_new": "Pie Graph (F3+1)",
+  "text.betterf3.line.fps_tps_new": "FPS / TPS (F3+2)",
+  "text.betterf3.line.ping": "Ping / Bandwidth (F3+3)",
   "text.betterf3.line.help": "For help",
   "text.betterf3.line.visible": "Visible",
   "text.betterf3.line.hidden": "Hidden",
@@ -216,4 +222,4 @@
   "text.betterf3.line.slime_chunk.true": "true",
   "text.betterf3.line.slime_chunk.false": "false",
   "text.betterf3.line.slime_chunk.unknown": "unknown"
-}
+}

common/src/main/resources/assets/betterf3/lang/ba_ru.json

@@ -35,6 +35,9 @@
   "config.betterf3.always_enable_profiler.tooltip": "Always enable the profiler when using F3.",
   "config.betterf3.always_enable_tps_graph": "Always Enable the TPS Graph",
   "config.betterf3.always_enable_tps_graph.tooltip": "Always enable the TPS graph when using F3.",
+  "config.betterf3.always_enable_tps_graph.tooltip_new": "Always enable the TPS graph when using F3. Cannot be used with the ping graph.",
+  "config.betterf3.always_enable_ping_graph": "Always Enable the Ping Graph",
+  "config.betterf3.always_enable_ping_graph.tooltip": "Always enable the ping graph when using F3. Cannot be used with the TPS graph.",
   "config.betterf3.fontScale": "Font Scale",
   "config.betterf3.fontScale.tooltip": "Set the scale of the font.",
   "config.betterf3.category.modules": "Modules",
@@ -153,6 +156,9 @@
   "text.betterf3.line.fancy": "Fancy",
   "text.betterf3.line.pie_graph": "Pie Graph (Shift+F3)",
   "text.betterf3.line.fps_tps": "FPS / TPS (Alt+F3)",
+  "text.betterf3.line.pie_graph_new": "Pie Graph (F3+1)",
+  "text.betterf3.line.fps_tps_new": "FPS / TPS (F3+2)",
+  "text.betterf3.line.ping": "Ping / Bandwidth (F3+3)",
   "text.betterf3.line.help": "For help",
   "text.betterf3.line.visible": "Visible",
   "text.betterf3.line.hidden": "Hidden",
@@ -216,4 +222,4 @@
   "text.betterf3.line.slime_chunk.true": "true",
   "text.betterf3.line.slime_chunk.false": "false",
   "text.betterf3.line.slime_chunk.unknown": "unknown"
-}
+}

common/src/main/resources/assets/betterf3/lang/be_by.json

@@ -35,6 +35,9 @@
   "config.betterf3.always_enable_profiler.tooltip": "Заўсёды ўключаць прафайлер пры выкарыстанні F3.",
   "config.betterf3.always_enable_tps_graph": "Заўсёды ўключаць графік TPS",
   "config.betterf3.always_enable_tps_graph.tooltip": "Заўсёды ўключаць графік TPS пры выкарыстанні F3.",
+  "config.betterf3.always_enable_tps_graph.tooltip_new": "Always enable the TPS graph when using F3. Cannot be used with the ping graph.",
+  "config.betterf3.always_enable_ping_graph": "Always Enable the Ping Graph",
+  "config.betterf3.always_enable_ping_graph.tooltip": "Always enable the ping graph when using F3. Cannot be used with the TPS graph.",
   "config.betterf3.fontScale": "Маштаб шрыфту",
   "config.betterf3.fontScale.tooltip": "Задаць маштаб шрыфту.",
   "config.betterf3.category.modules": "Модулі",
@@ -153,6 +156,9 @@
   "text.betterf3.line.fancy": "Дакладна",
   "text.betterf3.line.pie_graph": "Дыяграма рэндарынгу (Shift + F3)",
   "text.betterf3.line.fps_tps": "FPS / TPS (Alt + F3)",
+  "text.betterf3.line.pie_graph_new": "Pie Graph (F3+1)",
+  "text.betterf3.line.fps_tps_new": "FPS / TPS (F3+2)",
+  "text.betterf3.line.ping": "Ping / Bandwidth (F3+3)",
   "text.betterf3.line.help": "Дапамога",
   "text.betterf3.line.visible": "Паказана",
   "text.betterf3.line.hidden": "Схаваны",
@@ -216,4 +222,4 @@
   "text.betterf3.line.slime_chunk.true": "так",
   "text.betterf3.line.slime_chunk.false": "не",
   "text.betterf3.line.slime_chunk.unknown": "невядома"
-}
+}