make config nicer (and a bit more understandable)

not-coded · Sep 21, 2024 · 89d0a1f · 89d0a1f
1 parent 375d549
commit 89d0a1f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/src/main/java/net/notcoded/wayfix/config/ModConfig.java b/src/main/java/net/notcoded/wayfix/config/ModConfig.java
@@ -4,6 +4,7 @@
 import me.shedaniel.autoconfig.annotation.Config;
 import me.shedaniel.autoconfig.annotation.ConfigEntry.Gui.*;
 import net.minecraft.client.util.Monitor;
+import net.minecraft.client.util.VideoMode;
 import net.notcoded.wayfix.WayFix;
 import org.lwjgl.glfw.GLFW;
 
@@ -40,6 +41,7 @@ public static class Monitors {
         public String monitorInfo;
         public String monitorName;
         @Excluded public long monitorID;
+        @PrefixText
         public boolean primary;
 
         public Monitors() {
@@ -67,11 +69,13 @@ public static long getMonitor(String name) {
     }
 
     public static class MonitorSelector {
+        @PrefixText
         public ArrayList<Monitors> monitors = new ArrayList<>();
 
         public MonitorSelector(ArrayList<Monitor> monitors) {
             for(Monitor monitor : monitors) {
-                this.monitors.add(new Monitors(monitor.getCurrentVideoMode().toString(), monitor.getHandle()));
+                VideoMode mode = monitor.getCurrentVideoMode();
+                this.monitors.add(new Monitors(String.format("%sx%s@%s", mode.getWidth(), mode.getHeight(), mode.getRefreshRate()), monitor.getHandle()));
             }
         }
     }

diff --git a/src/main/resources/assets/wayfix/lang/en_us.json b/src/main/resources/assets/wayfix/lang/en_us.json
@@ -20,10 +20,12 @@
   "text.autoconfig.wayfix.option.fullscreen.monitorName.@Tooltip": "Full-screens the window in the selected monitor (view list below!!!!). (by default Minecraft sometimes full-screens on the wrong monitor due to Wayland limitations)",
 
   "text.autoconfig.wayfix.option.fullscreen.monitorSelector": "Monitors List (for above option)",
-  "text.autoconfig.wayfix.option.fullscreen.monitorSelector.monitors": "Monitors (only to look and copy ID from! [DO NOT MODIFY])",
+  "text.autoconfig.wayfix.option.fullscreen.monitorSelector.monitors": "Monitors",
+  "text.autoconfig.wayfix.option.fullscreen.monitorSelector.monitors.@PrefixText": "This is only to look at and copy the Monitor Name from! (DO NOT MODIFY)",
 
   "text.autoconfig.wayfix.option.Monitors": "Monitor",
-  "text.autoconfig.wayfix.option.Monitors.monitorInfo": "Monitor Info (do not modify)",
-  "text.autoconfig.wayfix.option.Monitors.monitorName": "Monitor Name (copy to clipboard)",
-  "text.autoconfig.wayfix.option.Monitors.primary": "Is Primary Monitor (do not modify)"
+  "text.autoconfig.wayfix.option.Monitors.monitorInfo": "Monitor Info",
+  "text.autoconfig.wayfix.option.Monitors.monitorName": "Monitor Name",
+  "text.autoconfig.wayfix.option.Monitors.primary.@PrefixText": "↑↑ Copy me to the \"Select Monitor\" field! (if you want to choose this monitor as the fullscreen one) ↑↑",
+  "text.autoconfig.wayfix.option.Monitors.primary": "Is Primary Monitor"
 }