Code cleanup

Common/src/main/java/com/blamejared/controlling/api/DisplayMode.java

@@ -12,7 +12,8 @@ public enum DisplayMode {
         
         for(KeyMapping key : Minecraft.getInstance().options.keyMappings) {
             if(!key.getName().equals(keyEntry.getKeybinding().getName()) && !key.isUnbound()) {
-                if(((AccessKeyMapping) key).getKey().getValue() == ((AccessKeyMapping) keyEntry.getKeybinding()).getKey().getValue()) {
+                if(((AccessKeyMapping) key).getKey()
+                        .getValue() == ((AccessKeyMapping) keyEntry.getKeybinding()).getKey().getValue()) {
                     return true;
                 }
             }

Common/src/main/java/com/blamejared/controlling/api/SortOrder.java

@@ -8,8 +8,11 @@ import java.util.List;
 
 public enum SortOrder {
     NONE(entries -> {
-    }), AZ(entries -> entries.sort(Comparator.comparing(o -> ((NewKeyBindsList.KeyEntry) o).getKeyDesc()))), ZA(entries -> {
-        entries.sort((o1, o2) -> ((NewKeyBindsList.KeyEntry) o2).getKeyDesc().compareTo(((NewKeyBindsList.KeyEntry) o1).getKeyDesc()));
+    }),
+    AZ(entries -> entries.sort(Comparator.comparing(o -> ((NewKeyBindsList.KeyEntry) o).getKeyDesc()))),
+    ZA(entries -> {
+        entries.sort((o1, o2) -> ((NewKeyBindsList.KeyEntry) o2).getKeyDesc()
+                .compareTo(((NewKeyBindsList.KeyEntry) o1).getKeyDesc()));
     });
     
     private final ISort sorter;

Common/src/main/java/com/blamejared/controlling/api/events/IKeyEntryListenersEvent.java

@@ -10,4 +10,5 @@ public interface IKeyEntryListenersEvent {
     List<GuiEventListener> getListeners();
     
     NewKeyBindsList.KeyEntry getEntry();
+    
 }

Common/src/main/java/com/blamejared/controlling/api/events/IKeyEntryMouseClickedEvent.java

@@ -15,4 +15,5 @@ public interface IKeyEntryMouseClickedEvent {
     boolean isHandled();
     
     void setHandled(boolean handled);
+    
 }

Common/src/main/java/com/blamejared/controlling/api/events/IKeyEntryMouseReleasedEvent.java

@@ -15,4 +15,5 @@ public interface IKeyEntryMouseReleasedEvent {
     boolean isHandled();
     
     void setHandled(boolean handled);
+    
 }

Common/src/main/java/com/blamejared/controlling/api/events/IKeyEntryRenderEvent.java

@@ -26,4 +26,5 @@ public interface IKeyEntryRenderEvent {
     boolean isHovered();
     
     float getPartialTicks();
+    
 }

Common/src/main/java/com/blamejared/controlling/client/FancyCheckbox.java

@@ -20,12 +20,14 @@ public class FancyCheckbox extends AbstractButton {
     private final OnPress pressFunction;
     
     public FancyCheckbox(int x, int y, int width, int height, Component label, boolean selected, OnPress pressFunction) {
+        
         super(x, y, Minecraft.getInstance().font.width(label) + 2 + width, height, label);
         this.selected = selected;
         this.pressFunction = pressFunction;
     }
     
     public void onPress() {
+        
         this.selected = !this.selected;
         if(pressFunction != null) {
             pressFunction.onPress(this);
@@ -33,14 +35,17 @@ public class FancyCheckbox extends AbstractButton {
     }
     
     public void selected(boolean selected) {
+        
         this.selected = selected;
     }
     
     public boolean selected() {
+        
         return this.selected;
     }
     
     public void updateNarration(NarrationElementOutput elementOutput) {
+        
         elementOutput.add(NarratedElementType.TITLE, this.createNarrationMessage());
         if(this.active) {
             if(this.isFocused()) {
@@ -53,6 +58,7 @@ public class FancyCheckbox extends AbstractButton {
     }
     
     public void renderButton(PoseStack stack, int mouseX, int mouseY, float partialTicks) {
+        
         Minecraft mc = Minecraft.getInstance();
         RenderSystem.setShaderTexture(0, TEXTURE);
         RenderSystem.enableDepthTest();
@@ -69,5 +75,7 @@ public class FancyCheckbox extends AbstractButton {
     public interface OnPress {
         
         void onPress(FancyCheckbox button);
+        
     }
+    
 }

Common/src/main/java/com/blamejared/controlling/client/FreeKeysList.java

@@ -51,15 +51,21 @@ public class FreeKeysList extends CustomList {
         allEntries.clear();
         
         addEntry(new HeaderEntry("Available Keys"));
-        AccessInputConstantsKey.getNAME_MAP().values().stream().filter(input -> !input.toString().startsWith("key.keyboard.world")).sorted(Comparator.comparing(o -> o.getDisplayName().getString())).forEach(input -> {
-            if(keyBindings.stream().noneMatch(keyBinding -> ((AccessKeyMapping) keyBinding).getKey().equals(input))) {
-                int i = mc.font.width(input.getDisplayName().getString());
-                if(i > this.maxListLabelWidth) {
-                    this.maxListLabelWidth = i;
-                }
-                addEntry(new InputEntry(input));
-            }
-        });
+        AccessInputConstantsKey.getNAME_MAP()
+                .values()
+                .stream()
+                .filter(input -> !input.toString().startsWith("key.keyboard.world"))
+                .sorted(Comparator.comparing(o -> o.getDisplayName().getString()))
+                .forEach(input -> {
+                    if(keyBindings.stream()
+                            .noneMatch(keyBinding -> ((AccessKeyMapping) keyBinding).getKey().equals(input))) {
+                        int i = mc.font.width(input.getDisplayName().getString());
+                        if(i > this.maxListLabelWidth) {
+                            this.maxListLabelWidth = i;
+                        }
+                        addEntry(new InputEntry(input));
+                    }
+                });
     }
     
     @Override

Common/src/main/java/com/blamejared/controlling/client/NewKeyBindsList.java

@@ -79,7 +79,8 @@ public class NewKeyBindsList extends CustomList {
         Entry entry = this.getEntryAtPos(mouseY);
         if(entry instanceof KeyEntry keyEntry) {
             
-            controlsScreen.renderTooltip(matrixStack, new TranslatableComponent(keyEntry.getKeybinding().getCategory()), mouseX, mouseY);
+            controlsScreen.renderTooltip(matrixStack, new TranslatableComponent(keyEntry.getKeybinding()
+                    .getCategory()), mouseX, mouseY);
         }
     }
     
@@ -193,6 +194,7 @@ public class NewKeyBindsList extends CustomList {
         
         @Override
         public void render(PoseStack stack, int slotIndex, int y, int x, int rowLeft, int rowWidth, int mouseX, int mouseY, boolean hovered, float partialTicks) {
+            
             Services.EVENT.fireKeyEntryRenderEvent(this, stack, slotIndex, y, x, rowLeft, rowWidth, mouseX, mouseY, hovered, partialTicks);
             boolean flag = NewKeyBindsList.this.controlsScreen.selectedKey == this.keybinding;
             int length = Math.max(0, x + 90 - NewKeyBindsList.this.maxListLabelWidth);
@@ -222,7 +224,8 @@ public class NewKeyBindsList extends CustomList {
             if(flag) {
                 this.btnChangeKeyBinding.setMessage(new TextComponent(ChatFormatting.WHITE + "> " + ChatFormatting.YELLOW + message.getString() + ChatFormatting.WHITE + " <"));
             } else if(flag1) {
-                this.btnChangeKeyBinding.setMessage(message.copy().withStyle(keyCodeModifierConflict ? ChatFormatting.GOLD : ChatFormatting.RED));
+                this.btnChangeKeyBinding.setMessage(message.copy()
+                        .withStyle(keyCodeModifierConflict ? ChatFormatting.GOLD : ChatFormatting.RED));
             }
             
             this.btnChangeKeyBinding.render(stack, mouseX, mouseY, partialTicks);
@@ -230,7 +233,8 @@ public class NewKeyBindsList extends CustomList {
         
         public List<GuiEventListener> children() {
             
-            return Services.EVENT.fireKeyEntryListenersEvent(this).map(IKeyEntryListenersEvent::getListeners, UnaryOperator.identity());
+            return Services.EVENT.fireKeyEntryListenersEvent(this)
+                    .map(IKeyEntryListenersEvent::getListeners, UnaryOperator.identity());
         }
         
         @Override
@@ -247,7 +251,8 @@ public class NewKeyBindsList extends CustomList {
         @Override
         public boolean mouseClicked(double mouseX, double mouseY, int buttonId) {
             
-            if(Services.EVENT.fireKeyEntryMouseClickedEvent(this, mouseX, mouseY, buttonId).map(IKeyEntryMouseClickedEvent::isHandled, UnaryOperator.identity())) {
+            if(Services.EVENT.fireKeyEntryMouseClickedEvent(this, mouseX, mouseY, buttonId)
+                    .map(IKeyEntryMouseClickedEvent::isHandled, UnaryOperator.identity())) {
                 return true;
             }
             
@@ -262,7 +267,8 @@ public class NewKeyBindsList extends CustomList {
         @Override
         public boolean mouseReleased(double mouseX, double mouseY, int buttonId) {
             
-            if(Services.EVENT.fireKeyEntryMouseReleasedEvent(this, mouseX, mouseY, buttonId).map(IKeyEntryMouseReleasedEvent::isHandled, UnaryOperator.identity())) {
+            if(Services.EVENT.fireKeyEntryMouseReleasedEvent(this, mouseX, mouseY, buttonId)
+                    .map(IKeyEntryMouseReleasedEvent::isHandled, UnaryOperator.identity())) {
                 return true;
             }
             

Common/src/main/java/com/blamejared/controlling/client/NewKeyBindsScreen.java

@@ -63,12 +63,14 @@ public class NewKeyBindsScreen extends KeyBindsScreen {
      * window resizes, the buttonList is cleared beforehand.
      */
     protected void init() {
+        
         this.customKeyList = new NewKeyBindsList(this, this.minecraft);
         this.freeKeyList = new FreeKeysList(this, this.minecraft);
         this.setKeyBindsList(this.customKeyList);
         this.addWidget(getKeyBindsList());
         this.setFocused(getKeyBindsList());
-        this.addRenderableWidget(new Button(this.width / 2 - 155 + 160, this.height - 29, 150, 20, new TranslatableComponent("gui.done"), (btn) -> Objects.requireNonNull(this.minecraft).setScreen(this.lastScreen)));
+        this.addRenderableWidget(new Button(this.width / 2 - 155 + 160, this.height - 29, 150, 20, new TranslatableComponent("gui.done"), (btn) -> Objects.requireNonNull(this.minecraft)
+                .setScreen(this.lastScreen)));
         
         this.buttonReset = this.addRenderableWidget(new Button(this.width / 2 - 155, this.height - 29, 74, 20, new TranslatableComponent("controls.resetAll"), (btn) -> {
             
@@ -184,9 +186,18 @@ public class NewKeyBindsScreen extends KeyBindsScreen {
             }
             getKeyBindsList().setScrollAmount(0);
             Predicate<NewKeyBindsList.KeyEntry> filters = switch(searchType) {
-                case NAME -> displayMode.getPredicate().and(keyEntry -> keyEntry.getKeyDesc().toLowerCase().contains(lastSearch.toLowerCase()));
-                case CATEGORY -> displayMode.getPredicate().and(keyEntry -> new TranslatableComponent(keyEntry.getKeybinding().getCategory()).getString().toLowerCase().contains(lastSearch.toLowerCase()));
-                case KEY -> displayMode.getPredicate().and(keyEntry -> keyEntry.getKeybinding().getTranslatedKeyMessage().getString().toLowerCase().contains(lastSearch.toLowerCase()));
+                case NAME -> displayMode.getPredicate()
+                        .and(keyEntry -> keyEntry.getKeyDesc().toLowerCase().contains(lastSearch.toLowerCase()));
+                case CATEGORY -> displayMode.getPredicate()
+                        .and(keyEntry -> new TranslatableComponent(keyEntry.getKeybinding().getCategory()).getString()
+                                .toLowerCase()
+                                .contains(lastSearch.toLowerCase()));
+                case KEY -> displayMode.getPredicate()
+                        .and(keyEntry -> keyEntry.getKeybinding()
+                                .getTranslatedKeyMessage()
+                                .getString()
+                                .toLowerCase()
+                                .contains(lastSearch.toLowerCase()));
             };
             
             
@@ -377,19 +388,23 @@ public class NewKeyBindsScreen extends KeyBindsScreen {
     
     
     private KeyBindsList getKeyBindsList() {
+        
         return getAccess().getKeyBindsList();
     }
     
     
     private void setKeyBindsList(KeyBindsList newList) {
+        
         getAccess().setKeyBindsList(newList);
     }
     
     private AccessScreen getScreenAccess() {
+        
         return ((AccessScreen) this);
     }
     
     private AccessKeyBindsScreen getAccess() {
+        
         return ((AccessKeyBindsScreen) this);
     }
     

Common/src/main/java/com/blamejared/controlling/mixin/AccessInputConstantsKey.java

@@ -11,6 +11,7 @@ public interface AccessInputConstantsKey {
     
     @Accessor("NAME_MAP")
     static Map<String, InputConstants.Key> getNAME_MAP() {
+        
         throw new AssertionError();
     }
     

Common/src/main/java/com/blamejared/controlling/mixin/AccessOptionsSubScreen.java

@@ -10,4 +10,5 @@ public interface AccessOptionsSubScreen {
     
     @Accessor("lastScreen")
     Screen getLastScreen();
+    
 }

Common/src/main/java/com/blamejared/controlling/mixin/AccessScreen.java

@@ -12,4 +12,5 @@ public interface AccessScreen {
     
     @Accessor("renderables")
     List<Widget> getRenderables();
+    
 }

Common/src/main/java/com/blamejared/controlling/platform/IEventHelper.java

@@ -22,4 +22,5 @@ public interface IEventHelper {
     Either<IKeyEntryMouseReleasedEvent, Boolean> fireKeyEntryMouseReleasedEvent(NewKeyBindsList.KeyEntry entry, double mouseX, double mouseY, int buttonId);
     
     Either<IKeyEntryRenderEvent, Unit> fireKeyEntryRenderEvent(NewKeyBindsList.KeyEntry entry, PoseStack stack, int slotIndex, int y, int x, int rowLeft, int rowWidth, int mouseX, int mouseY, boolean hovered, float partialTicks);
+    
 }

Common/src/main/java/com/blamejared/controlling/platform/IPlatformHelper.java

@@ -7,18 +7,22 @@ import net.minecraft.client.Options;
 public interface IPlatformHelper {
     
     default boolean hasConflictingModifier(KeyMapping keybinding, KeyMapping other) {
+        
         return false;
     }
     
     default void setKey(Options options, KeyMapping keybinding, InputConstants.Key key) {
+        
         options.setKey(keybinding, key);
     }
     
     default void setToDefault(Options options, KeyMapping keybinding) {
+        
         options.setKey(keybinding, keybinding.getDefaultKey());
     }
     
     default boolean isKeyCodeModifier(InputConstants.Key key) {
+        
         return false;
     }
     

Common/src/main/java/com/blamejared/controlling/platform/Services.java

@@ -11,7 +11,9 @@ public class Services {
     
     public static <T> T load(Class<T> clazz) {
         
-        final T loadedService = ServiceLoader.load(clazz).findFirst().orElseThrow(() -> new NullPointerException("Failed to load service for " + clazz.getName()));
+        final T loadedService = ServiceLoader.load(clazz)
+                .findFirst()
+                .orElseThrow(() -> new NullPointerException("Failed to load service for " + clazz.getName()));
         ControllingCommon.LOG.debug("Loaded {} for service {}", loadedService, clazz);
         return loadedService;
     }

Fabric/src/main/java/com/blamejared/controlling/api/event/ControllingEvents.java

@@ -10,9 +10,13 @@ import java.util.List;
 
 public class ControllingEvents {
     
-    public static final Event<IEventHandler<KeyEntryListenersEvent, List<GuiEventListener>>> KEY_ENTRY_LISTENERS_EVENT = EventFactory.createArrayBacked(IEventHandler.class, listeners -> event -> Arrays.stream(listeners).flatMap(handler -> handler.handle(event).stream()).toList());
-    public static final Event<IEventHandler<KeyEntryMouseClickedEvent, Boolean>> KEY_ENTRY_MOUSE_CLICKED_EVENT = EventFactory.createArrayBacked(IEventHandler.class, listeners -> event -> Arrays.stream(listeners).anyMatch(handler -> handler.handle(event)));
-    public static final Event<IEventHandler<KeyEntryMouseReleasedEvent, Boolean>> KEY_ENTRY_MOUSE_RELEASED_EVENT = EventFactory.createArrayBacked(IEventHandler.class, listeners -> event -> Arrays.stream(listeners).anyMatch(handler -> handler.handle(event)));
+    public static final Event<IEventHandler<KeyEntryListenersEvent, List<GuiEventListener>>> KEY_ENTRY_LISTENERS_EVENT = EventFactory.createArrayBacked(IEventHandler.class, listeners -> event -> Arrays.stream(listeners)
+            .flatMap(handler -> handler.handle(event).stream())
+            .toList());
+    public static final Event<IEventHandler<KeyEntryMouseClickedEvent, Boolean>> KEY_ENTRY_MOUSE_CLICKED_EVENT = EventFactory.createArrayBacked(IEventHandler.class, listeners -> event -> Arrays.stream(listeners)
+            .anyMatch(handler -> handler.handle(event)));
+    public static final Event<IEventHandler<KeyEntryMouseReleasedEvent, Boolean>> KEY_ENTRY_MOUSE_RELEASED_EVENT = EventFactory.createArrayBacked(IEventHandler.class, listeners -> event -> Arrays.stream(listeners)
+            .anyMatch(handler -> handler.handle(event)));
     public static final Event<IEventHandler<KeyEntryRenderEvent, Unit>> KEY_ENTRY_RENDER_EVENT = EventFactory.createArrayBacked(IEventHandler.class, listeners -> event -> {
         Arrays.stream(listeners).forEach(handler -> handler.handle(event));
         return Unit.INSTANCE;

Fabric/src/main/java/com/blamejared/controlling/api/event/IEventHandler.java

@@ -3,4 +3,5 @@ package com.blamejared.controlling.api.event;
 public interface IEventHandler<T, U> {
     
     U handle(T event);
+    
 }

Forge/src/main/java/com/blamejared/controlling/Controlling.java

@@ -14,7 +14,8 @@ public class Controlling {
     
     public Controlling() {
         
-        ModLoadingContext.get().registerExtensionPoint(IExtensionPoint.DisplayTest.class, () -> new IExtensionPoint.DisplayTest(() -> NetworkConstants.IGNORESERVERONLY, (remote, isServer) -> true));
+        ModLoadingContext.get()
+                .registerExtensionPoint(IExtensionPoint.DisplayTest.class, () -> new IExtensionPoint.DisplayTest(() -> NetworkConstants.IGNORESERVERONLY, (remote, isServer) -> true));
         FMLJavaModLoadingContext.get().getModEventBus().addListener(this::init);
     }
     

Forge/src/main/java/com/blamejared/controlling/events/ClientEventHandler.java

@@ -14,7 +14,7 @@ public class ClientEventHandler {
         
         try {
             if(event.getScreen() instanceof KeyBindsScreen gui && !(event.getScreen() instanceof NewKeyBindsScreen)) {
-                event.setScreen(new NewKeyBindsScreen(((AccessOptionsSubScreen)gui).getLastScreen(), Minecraft.getInstance().options));
+                event.setScreen(new NewKeyBindsScreen(((AccessOptionsSubScreen) gui).getLastScreen(), Minecraft.getInstance().options));
             }
         } catch(Exception e) {
             e.printStackTrace();

Forge/src/main/java/com/blamejared/controlling/platform/ForgeEventHandler.java

@@ -21,6 +21,7 @@ public class ForgeEventHandler implements IEventHelper {
     
     @Override
     public Either<IKeyEntryListenersEvent, List<GuiEventListener>> fireKeyEntryListenersEvent(NewKeyBindsList.KeyEntry entry) {
+        
         KeyEntryListenersEvent event = new KeyEntryListenersEvent(entry);
         MinecraftForge.EVENT_BUS.post(event);
         return Either.left(event);
@@ -28,6 +29,7 @@ public class ForgeEventHandler implements IEventHelper {
     
     @Override
     public Either<IKeyEntryMouseClickedEvent, Boolean> fireKeyEntryMouseClickedEvent(NewKeyBindsList.KeyEntry entry, double mouseX, double mouseY, int buttonId) {
+        
         KeyEntryMouseClickedEvent event = new KeyEntryMouseClickedEvent(entry, mouseX, mouseY, buttonId);
         MinecraftForge.EVENT_BUS.post(event);
         return Either.left(event);
@@ -35,6 +37,7 @@ public class ForgeEventHandler implements IEventHelper {
     
     @Override
     public Either<IKeyEntryMouseReleasedEvent, Boolean> fireKeyEntryMouseReleasedEvent(NewKeyBindsList.KeyEntry entry, double mouseX, double mouseY, int buttonId) {
+        
         KeyEntryMouseReleasedEvent event = new KeyEntryMouseReleasedEvent(entry, mouseX, mouseY, buttonId);
         MinecraftForge.EVENT_BUS.post(event);
         return Either.left(event);
@@ -42,8 +45,10 @@ public class ForgeEventHandler implements IEventHelper {
     
     @Override
     public Either<IKeyEntryRenderEvent, Unit> fireKeyEntryRenderEvent(NewKeyBindsList.KeyEntry entry, PoseStack stack, int slotIndex, int y, int x, int rowLeft, int rowWidth, int mouseX, int mouseY, boolean hovered, float partialTicks) {
+        
         KeyEntryRenderEvent event = new KeyEntryRenderEvent(entry, stack, slotIndex, y, x, rowLeft, rowWidth, mouseX, mouseY, hovered, partialTicks);
         MinecraftForge.EVENT_BUS.post(event);
         return Either.left(event);
     }
+    
 }

Forge/src/main/java/com/blamejared/controlling/platform/ForgePlatformHelper.java

@@ -9,22 +9,27 @@ public class ForgePlatformHelper implements IPlatformHelper {
     
     @Override
     public boolean hasConflictingModifier(KeyMapping keybinding, KeyMapping other) {
+        
         return keybinding.hasKeyModifierConflict(other);
     }
     
     @Override
     public void setKey(Options options, KeyMapping keybinding, InputConstants.Key key) {
+        
         keybinding.setKeyModifierAndCode(KeyModifier.getActiveModifier(), key);
         IPlatformHelper.super.setKey(options, keybinding, key);
     }
     
     @Override
     public boolean isKeyCodeModifier(InputConstants.Key key) {
+        
         return KeyModifier.isKeyCodeModifier(key);
     }
     
     @Override
     public void setToDefault(Options options, KeyMapping keybinding) {
+        
         keybinding.setToDefault();
     }
+    
 }

gradle.properties

@@ -2,27 +2,22 @@
 modVersion=9.0
 group=com.blamejared.controlling
 modJavaVersion=17
-
 # Common
 minecraftVersion=1.18.2
-
 # Forge
 forgeVersion=40.0.1
-
 # Fabric
 fabricVersion=0.47.8+1.18.2
 fabricLoaderVersion=0.13.3
-
 # Mod options
 modName=Controlling
-modAuthor=Jaredlll08
+modAuthor=Jared
 modId=controlling
 modAvatar=https://media.forgecdn.net/avatars/49/603/636079972364045115.png
 curseProjectId=250398
 curseHomepageLink=https://www.curseforge.com/minecraft/mc-mods/controlling
 gitFirstCommit=b0ebaace2f1b7602c789ac71758fd8879cf43a5c
 gitRepo=https://github.com/jaredlll08/controlling
-
 # Gradle
 org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false