fix #53

Author: not-coded

gradle.properties

@@ -7,7 +7,7 @@ org.gradle.parallel=false
 #org.gradle.configureondemand=true
 
 # Mod properties
-mod.version=1.0.8
+mod.version=1.0.9
 mod.group=net.notcoded
 mod.id=wayfix
 mod.name=WayFix

src/main/java/net/notcoded/wayfix/config/ModClothConfig.java

@@ -50,6 +50,13 @@ public static Screen buildScreen(Screen parent) {
                 .setSaveConsumer(value -> config.injectIcon = value)
                 .build());
 
+        category.addEntry(entryBuilder.startBooleanToggle(getText("useAlternativeIconPath"), config.useAlternativeIconPath)
+                .setDefaultValue(false)
+                .setTooltip(getText("useAlternativeIconPath.tooltip"), getText("useAlternativeIconPath.tooltip2"))
+                .requireRestart()
+                .setSaveConsumer(value -> config.useAlternativeIconPath = value)
+                .build());
+
         category.addEntry(entryBuilder.startBooleanToggle(getText("keyModifiersFix"), config.keyModifiersFix)
                 .setDefaultValue(true)
                 .setTooltip(getText("keyModifiersFix.tooltip"))

src/main/java/net/notcoded/wayfix/config/ModConfig.java

@@ -10,6 +10,9 @@ public class ModConfig {
     @Comment("Injects the Minecraft Icon at Startup instead of defaulting to the normal Wayland icon.")
     public boolean injectIcon = true;
 
+    @Comment("[!] Recommended if on GNOME 48 or are having issues.\nInjects the icons at ~/.icons instead of ~/.local/share/icons")
+    public boolean useAlternativeIconPath = false;
+
     @Comment("Fixes issues where keyboard combinations like 'CTRL + A' or 'CTRL + C' are sent as characters in chat instead of being recognized as key combinations.")
     public boolean keyModifiersFix = true;
 

src/main/java/net/notcoded/wayfix/mixin/MonitorMixin.java

@@ -114,8 +114,17 @@ private static void injectFile(Path target, byte[] data) {
 
 
     private static Path getIconFileLocation(int width, int height) {
-        return XDGPathResolver.getUserDataLocation().resolve("icons/hicolor").resolve(width + "x" + height)
-                .resolve("apps").resolve(ICON_NAME);
+        Path path;
+        if(WayFix.config.useAlternativeIconPath && XDGPathResolver.getHome() != null) {
+            path = XDGPathResolver.getHome().resolve(".icons");
+        } else {
+            path = XDGPathResolver.getUserDataLocation().resolve("icons");
+        }
+
+        return path.resolve("hicolor")
+                .resolve(width + "x" + height)
+                .resolve("apps")
+                .resolve(ICON_NAME);
     }
 
     private static Path getDesktopFileLocation() {

src/main/java/net/notcoded/wayfix/util/DesktopFileInjector.java

@@ -10,7 +10,7 @@
 
 public class XDGPathResolver {
 
-    private static Path getHome(){
+    public static Path getHome(){
         String home = System.getenv().getOrDefault("HOME", System.getProperty("user.home"));
         if (home == null || home.isEmpty()) {
             //throw new IllegalStateException("could not resolve user home");

src/main/java/net/notcoded/wayfix/util/XDGPathResolver.java

@@ -9,6 +9,10 @@
   "wayfix.option.injectIcon": "Inject Minecraft Icon at Startup",
   "wayfix.option.injectIcon.tooltip": "Injects the Minecraft Icon at Startup instead of defaulting to the normal Wayland icon.",
 
+  "wayfix.option.useAlternativeIconPath": "Use Alternative Icon Path",
+  "wayfix.option.useAlternativeIconPath.tooltip": "Recommended if on GNOME 48 or are having issues.",
+  "wayfix.option.useAlternativeIconPath.tooltip2": "Injects the icons at ~/.icons instead of ~/.local/share/icons",
+
   "wayfix.option.keyModifiersFix": "Key Modifiers Fix",
   "wayfix.option.keyModifiersFix.tooltip": "Fixes issues where keyboard combinations like 'CTRL + A' or 'CTRL + C' are sent as characters in chat instead of being recognized as key combinations.",