fix: Fix inverted ifs, cleanup

Author: BlayTheNinth

common/src/main/java/net/blay09/mods/defaultoptions/DefaultOptionsInitializer.java

@@ -12,7 +12,7 @@
 
 public class DefaultOptionsInitializer {
 
-    private static final Set<String> userModifiedKeys = new HashSet<>();
+    private static final Set<String> userSeenKeys = new HashSet<>();
 
     static {
         DefaultOptionsAPI.__internalMethods = new InternalMethodsImpl();
@@ -54,7 +54,7 @@ public static void postSave() {
         }
     }
 
-    public static void collectUserModifiedKeys(Options options) {
+    public static void collectSeenKeys(Options options) {
         try (final var reader = Files.newReader(options.getFile(), Charsets.UTF_8)) {
             reader.lines().forEach((line) -> {
                 try {
@@ -63,7 +63,7 @@ public static void collectUserModifiedKeys(Options options) {
                         if (colonIndex != -1) {
                             final var key = line.substring(0, colonIndex);
                             final var name = key.substring("key_".length());
-                            userModifiedKeys.add(name);
+                            userSeenKeys.add(name);
                         }
                     }
                 } catch (Exception ignored) {
@@ -73,10 +73,10 @@ public static void collectUserModifiedKeys(Options options) {
         }
     }
 
-    public static void markUserModifiedKeys(Options options) {
+    public static void markUserSeenKeys(Options options) {
         for (final var keyMapping : options.keyMappings) {
-            if (userModifiedKeys.contains(keyMapping.getName())) {
-                ((DefaultOptionsKeyMapping) keyMapping).defaultoptions$setUserModified(true);
+            if (userSeenKeys.contains(keyMapping.getName())) {
+                ((DefaultOptionsKeyMapping) keyMapping).defaultoptions$setSeen(true);
             }
         }
     }

common/src/main/java/net/blay09/mods/defaultoptions/DefaultOptionsKeyMapping.java

@@ -1,6 +1,6 @@
 package net.blay09.mods.defaultoptions;
 
 public interface DefaultOptionsKeyMapping {
-    boolean defaultoptions$wasUserModified();
-    void defaultoptions$setUserModified(boolean modified);
+    boolean defaultoptions$wasSeen();
+    void defaultoptions$setSeen(boolean seen);
 }

common/src/main/java/net/blay09/mods/defaultoptions/keys/DefaultKeyMapping.java

@@ -10,7 +10,7 @@
 public record DefaultKeyMapping(InputConstants.Key input, Set<KeyModifier> modifiers) {
     public boolean matches(KeyMapping keyMapping) {
         final var keyModifiers = PlatformBindings.INSTANCE.getKeyModifiers(keyMapping);
-        if (modifiers.equals(keyModifiers)) {
+        if (!modifiers.equals(keyModifiers)) {
             return false;
         }
 

common/src/main/java/net/blay09/mods/defaultoptions/keys/KeyMappingDefaultsHandler.java

@@ -78,7 +78,7 @@ public boolean shouldLoadDefaults() {
 
     @Override
     public void loadDefaults() {
-        DefaultOptionsInitializer.markUserModifiedKeys(Minecraft.getInstance().options);
+        DefaultOptionsInitializer.markUserSeenKeys(Minecraft.getInstance().options);
 
         // Clear old values
         defaultKeys.clear();
@@ -130,7 +130,7 @@ public void loadDefaults() {
                 // If the key is still on the original default and has not yet been modified on this run (i.e. through options load),
                 // we update it to the new default. Essentially options.txt now acts as what was previously knownkeys.txt.
                 // That way we don't override changes the player themselves may have made already.
-                if (((DefaultOptionsKeyMapping) keyMapping).defaultoptions$wasUserModified()
+                if (!((DefaultOptionsKeyMapping) keyMapping).defaultoptions$wasSeen()
                         && originalDefaultMapping.matches(keyMapping)
                         && !defaultKeyMapping.matches(keyMapping)) {
                     final var defaultKeyModifiers = PlatformBindings.INSTANCE.getDefaultKeyModifiers(keyMapping);

common/src/main/java/net/blay09/mods/defaultoptions/mixin/KeyMappingMixin.java

@@ -11,22 +11,22 @@
 @Mixin(KeyMapping.class)
 public class KeyMappingMixin implements DefaultOptionsKeyMapping {
 
-    private boolean defaultoptions$userModified = false;
+    private boolean defaultoptions$seen = false;
 
     @Inject(method = "setKey", at = @At("HEAD"))
     void setKey(InputConstants.Key key, CallbackInfo ci) {
         // setKey is only called when the key didn't match the default on options load, so it's not reliable.
         // We just track it additionally to cover all bases.
-        defaultoptions$userModified = true;
+        defaultoptions$seen = true;
     }
 
     @Override
-    public boolean defaultoptions$wasUserModified() {
-        return defaultoptions$userModified;
+    public boolean defaultoptions$wasSeen() {
+        return defaultoptions$seen;
     }
 
     @Override
-    public void defaultoptions$setUserModified(boolean modified) {
-        defaultoptions$userModified = modified;
+    public void defaultoptions$setSeen(boolean seen) {
+        defaultoptions$seen = seen;
     }
 }

common/src/main/java/net/blay09/mods/defaultoptions/mixin/OptionsMixin.java

@@ -11,7 +11,7 @@
 public class OptionsMixin {
     @Inject(method = "load()V", at = @At("HEAD"))
     private void load(CallbackInfo ci) {
-        DefaultOptionsInitializer.collectUserModifiedKeys((Options) (Object) this);
+        DefaultOptionsInitializer.collectSeenKeys((Options) (Object) this);
         DefaultOptionsInitializer.preLoad();
     }
 

forge/src/main/java/net/blay09/mods/defaultoptions/forge/mixin/ForgeKeyMappingMixin.java

@@ -16,7 +16,7 @@ public class ForgeKeyMappingMixin {
     void setKeyModifierAndCode(KeyModifier keyModifier, InputConstants.Key keyCode, CallbackInfo ci) {
         // setKey is only called when the key didn't match the default on options load, so it's not reliable.
         // We just track it additionally to cover all bases.
-        ((DefaultOptionsKeyMapping) this).defaultoptions$setUserModified(true);
+        ((DefaultOptionsKeyMapping) this).defaultoptions$setSeen(true);
     }
 
 }

neoforge/src/main/java/net/blay09/mods/defaultoptions/neoforge/mixin/NeoForgeKeyMappingMixin.java

@@ -16,7 +16,7 @@ public class NeoForgeKeyMappingMixin {
     void setKeyModifierAndCode(KeyModifier keyModifier, InputConstants.Key keyCode, CallbackInfo ci) {
         // setKey is only called when the key didn't match the default on options load, so it's not reliable.
         // We just track it additionally to cover all bases.
-        ((DefaultOptionsKeyMapping) this).defaultoptions$setUserModified(true);
+        ((DefaultOptionsKeyMapping) this).defaultoptions$setSeen(true);
     }
 
 }