Эх сурвалжийг харах

prefix mixins like good modders

Jared 3 жил өмнө
parent
commit
4f8e027337

+ 2 - 2
Common/src/main/java/com/blamejared/controlling/api/DisplayMode.java

@@ -12,8 +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).controlling$getKey()
+                        .getValue() == ((AccessKeyMapping) keyEntry.getKeybinding()).controlling$getKey().getValue()) {
                     return true;
                 }
             }

+ 2 - 2
Common/src/main/java/com/blamejared/controlling/client/FreeKeysList.java

@@ -51,14 +51,14 @@ public class FreeKeysList extends CustomList {
         allEntries.clear();
         
         addEntry(new HeaderEntry("Available Keys"));
-        AccessInputConstantsKey.getNAME_MAP()
+        AccessInputConstantsKey.controlling$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))) {
+                            .noneMatch(keyBinding -> ((AccessKeyMapping) keyBinding).controlling$getKey().equals(input))) {
                         int i = mc.font.width(input.getDisplayName().getString());
                         if(i > this.maxListLabelWidth) {
                             this.maxListLabelWidth = i;

+ 4 - 4
Common/src/main/java/com/blamejared/controlling/client/NewKeyBindsScreen.java

@@ -288,7 +288,7 @@ public class NewKeyBindsScreen extends KeyBindsScreen {
         Component text = new TranslatableComponent("options.search");
         font.draw(stack, text, this.width / 2f - (155 / 2f) - (font.width(text.getString())) - 5, this.height - 29 - 42, 16777215);
         
-        for(Widget widget : getScreenAccess().getRenderables()) {
+        for(Widget widget : getScreenAccess().controlling$getRenderables()) {
             widget.render(stack, mouseX, mouseY, partialTicks);
         }
     }
@@ -375,7 +375,7 @@ public class NewKeyBindsScreen extends KeyBindsScreen {
             } else {
                 Services.PLATFORM.setKey(options, this.selectedKey, InputConstants.getKey(keyCode, scanCode));
             }
-            if(!Services.PLATFORM.isKeyCodeModifier(((AccessKeyMapping) this.selectedKey).getKey())) {
+            if(!Services.PLATFORM.isKeyCodeModifier(((AccessKeyMapping) this.selectedKey).controlling$getKey())) {
                 this.selectedKey = null;
             }
             this.lastKeySelection = Util.getMillis();
@@ -389,13 +389,13 @@ public class NewKeyBindsScreen extends KeyBindsScreen {
     
     private KeyBindsList getKeyBindsList() {
         
-        return getAccess().getKeyBindsList();
+        return getAccess().controlling$getKeyBindsList();
     }
     
     
     private void setKeyBindsList(KeyBindsList newList) {
         
-        getAccess().setKeyBindsList(newList);
+        getAccess().controlling$setKeyBindsList(newList);
     }
     
     private AccessScreen getScreenAccess() {

+ 1 - 1
Common/src/main/java/com/blamejared/controlling/mixin/AccessInputConstantsKey.java

@@ -10,7 +10,7 @@ import java.util.Map;
 public interface AccessInputConstantsKey {
     
     @Accessor("NAME_MAP")
-    static Map<String, InputConstants.Key> getNAME_MAP() {
+    static Map<String, InputConstants.Key> controlling$getNAME_MAP() {
         
         throw new AssertionError();
     }

+ 2 - 2
Common/src/main/java/com/blamejared/controlling/mixin/AccessKeyBindsScreen.java

@@ -9,9 +9,9 @@ import org.spongepowered.asm.mixin.gen.Accessor;
 public interface AccessKeyBindsScreen {
     
     @Accessor("keyBindsList")
-    KeyBindsList getKeyBindsList();
+    KeyBindsList controlling$getKeyBindsList();
     
     @Accessor("keyBindsList")
-    void setKeyBindsList(KeyBindsList newList);
+    void controlling$setKeyBindsList(KeyBindsList newList);
     
 }

+ 1 - 1
Common/src/main/java/com/blamejared/controlling/mixin/AccessKeyMapping.java

@@ -9,6 +9,6 @@ import org.spongepowered.asm.mixin.gen.Accessor;
 public interface AccessKeyMapping {
     
     @Accessor("key")
-    InputConstants.Key getKey();
+    InputConstants.Key controlling$getKey();
     
 }

+ 1 - 1
Common/src/main/java/com/blamejared/controlling/mixin/AccessOptionsSubScreen.java

@@ -9,6 +9,6 @@ import org.spongepowered.asm.mixin.gen.Accessor;
 public interface AccessOptionsSubScreen {
     
     @Accessor("lastScreen")
-    Screen getLastScreen();
+    Screen controlling$getLastScreen();
     
 }

+ 1 - 1
Common/src/main/java/com/blamejared/controlling/mixin/AccessScreen.java

@@ -11,6 +11,6 @@ import java.util.List;
 public interface AccessScreen {
     
     @Accessor("renderables")
-    List<Widget> getRenderables();
+    List<Widget> controlling$getRenderables();
     
 }

+ 1 - 1
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).controlling$getLastScreen(), Minecraft.getInstance().options));
             }
         } catch(Exception e) {
             e.printStackTrace();