[edited] applied changes made to 1.18 branch

[edited] bump version for update

Author: getItemFromBlock

README.md

@@ -40,13 +40,13 @@ Here is a list of supported devices:
 - Mouse cursor movements  
 - Official gamepads such as Xbox controllers or Playstation DualShock are supported  
 - Knockoff/alternate gamepads (like a Logitech controller) should work  
-- Joysticks/hotas/racing wheels and other devices are supported, unless they requires some funky drivers in which case I can't do anything for you  
+- Joysticks/hotas/racing wheels and other devices should be supported, but I have been proven wrong multiple times already, so if it does not you can still try a gamepad/xbox controller emulator.  
 - WiiMotes are (sadly) not supported  
 
 ## Remarks
 
-Due to a Create limitation, if a network is updated too many times it will break. This can happen if you connect an axis output to an Adjustable Chain Gearshift, for example. I might do something for this in the future.  
+Due to a Create limitation, if a network is updated too many times it will break. This can happen if you connect an axis output to an Adjustable Chain Gearshift, for example. This behavior has been disabled since version 1.2.3 of the mod.  
 
 The joystick axis are directly read from GLFW. With most if not all gamepads, the +X axis points to the right, and the +Y axis points down.
 
-IF YOU USE A NINTENDO CONTROLLER, YOU MIGHT WANNA TAKE A LOOK [AT THIS](https://github.com/getItemFromBlock/Create-Tweaked-Controllers/issues/1).
+IF YOU USE A NINTENDO CONTROLLER, YOU MIGHT WANT TO TAKE A LOOK AT THIS: [https://github.com/getItemFromBlock/Create-Tweaked-Controllers/issues/1](https://github.com/getItemFromBlock/Create-Tweaked-Controllers/issues/1).

build.gradle

@@ -9,6 +9,7 @@ buildscript {
     dependencies {
 
         classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true
+        classpath group: 'org.spongepowered', name: 'mixingradle', version: '0.7-SNAPSHOT'
     }
 }
 // Only edit below this line, the above code adds and enables the necessary things for Forge to be setup.
@@ -17,10 +18,17 @@ plugins {
     id 'maven-publish'
 }
 apply plugin: 'net.minecraftforge.gradle'
+apply plugin: 'org.spongepowered.mixin'
+
+mixin {
+    add sourceSets.main, "${modid}.refmap.json"
+
+    config "${modid}.mixins.json"
+}
 
 jarJar.enable()
 
-version = '1.20.1-1.2.2'
+version = "${modversion}"
 group = 'com.getItemFromBlock.create_tweaked_controllers' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = 'create_tweaked_controllers'
 

gradle.properties

@@ -4,7 +4,7 @@ org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 
 modid = create_tweaked_controllers
-modversion = 1.20.1-1.2.2
+modversion = 1.20.1-1.2.4
 
 minecraft_version = 1.20.1
 minecraft_range = [1.20.1,1.21)

src/main/java/com/getitemfromblock/create_tweaked_controllers/config/ModClientConfig.java

@@ -10,6 +10,7 @@ public class ModClientConfig
     public static final ForgeConfigSpec.ConfigValue<Boolean> USE_CUSTOM_MAPPINGS;
     public static final ForgeConfigSpec.ConfigValue<Boolean> TOGGLE_MOUSE_FOCUS;
     public static final ForgeConfigSpec.ConfigValue<Boolean> AUTO_RESET_MOUSE_FOCUS;
+    //public static final ForgeConfigSpec.ConfigValue<Boolean> AUTO_DETECT_INPUT_TYPE;
     public static final ForgeConfigSpec.ConfigValue<Integer> CONFIG_BUTTON_MAIN_MENU_ROW;
     public static final ForgeConfigSpec.ConfigValue<Integer> CONFIG_BUTTON_MAIN_MENU_OFFSET;
     public static final ForgeConfigSpec.ConfigValue<Integer> CONFIG_BUTTON_INGAME_MENU_ROW;
@@ -25,6 +26,8 @@ public class ModClientConfig
             .define("toggle_mouse_focus", false);
         AUTO_RESET_MOUSE_FOCUS = BUILDER.comment("Does the mouse cursor inputs are automatically reset when the controller item is put down, default is true")
             .define("auto_reset_mouse_focus", true);
+        //AUTO_DETECT_INPUT_TYPE = BUILDER.comment("Does the mod will automatically change the controller profile dependind on what is available on your computer, default is true")
+        //    .define("auto_detect_input_type", true);
         CONFIG_BUTTON_MAIN_MENU_ROW = BUILDER.comment("Row of the Controller Settings button in the main menu, default is 2")
             .defineInRange("config_button_main_menu_row", 2 , 0, 4);
         CONFIG_BUTTON_MAIN_MENU_OFFSET = BUILDER.comment("X Offset of the Controller Settings button in the main menu, default is 4")

src/main/java/com/getitemfromblock/create_tweaked_controllers/controller/ControlProfile.java

@@ -28,18 +28,40 @@ public class ControlProfile
     public GenericInput[] layout = new GenericInput[25];
     public boolean hasJoystickInput = false;
     public ArrayList<KeyMapping> duplicatedKeys = new ArrayList<KeyMapping>();
+
+    public static final byte CURRENT_VERSION_MAJOR = (byte) 0x01;
+    public static final byte CURRENT_VERSION_MINOR = (byte) 0x00;
 
     public ControlProfile()
     {
+        //this(ControlType.KEYBOARD_MOUSE);
         this(0);
     }
 
+    public ControlProfile(ControlType type)
+    {
+        CheckProfileUpgrade();
+        Load(type);
+        Save(type);
+    }
+
     public ControlProfile(int id)
     {
         Load(0);
         Save(0);
     }
 
+    public void Load(ControlType type)
+    {
+        Load("config/gamepad_profiles/gamepad_profile_" + type.toString(), type);
+        UpdateProfileData();
+    }
+
+    public void Save(ControlType type)
+    {
+        Save("config/gamepad_profiles/gamepad_profile_" + type.toString());
+    }
+
     public void Load(int id)
     {
         Load("config/gamepad_profiles/gamepad_profile_" + id);
@@ -51,6 +73,31 @@ public void Save(int id)
         Save("config/gamepad_profiles/gamepad_profile_" + id);
     }
 
+    private void CheckProfileUpgrade()
+    {
+        File f = new File("config/gamepad_profiles/gamepad_profile_0");
+        if(!f.exists() || f.isDirectory())
+        {
+            return;
+        }
+        Load("config/gamepad_profiles/gamepad_profile_0", ControlType.CUSTOM_0, false);
+        Save(ControlType.CUSTOM_0);
+        try
+        {
+            f.delete();
+        }
+        catch (Exception e)
+        {
+            CreateTweakedControllers.error("Error upgrading old controller profile: could not delete old file \"config/gamepad_profiles/gamepad_profile_0\"!");
+            CreateTweakedControllers.error(e.getMessage());
+            for (StackTraceElement line : e.getStackTrace())
+            {
+                CreateTweakedControllers.error(line.toString());
+            }
+            return;
+        }
+    }
+
     static final int[] keys = 
         {
             GLFW.GLFW_KEY_SEMICOLON,
@@ -63,20 +110,32 @@ public void Save(int id)
             GLFW.GLFW_KEY_Y,
             GLFW.GLFW_KEY_T,
             GLFW.GLFW_KEY_H,
-            GLFW.GLFW_KEY_J,
+            GLFW.GLFW_KEY_ENTER,
             GLFW.GLFW_KEY_UP,
             GLFW.GLFW_KEY_RIGHT,
             GLFW.GLFW_KEY_DOWN,
             GLFW.GLFW_KEY_LEFT
         };
 
-    public void InitDefaultLayout()
+    public void InitDefaultLayout(ControlType fallbackType)
+    {
+        if (fallbackType == ControlType.JOYSTICK)
+        {
+            InitDefaultGamepadLayout();
+        }
+        else
+        {
+            InitDefaultKeyboardLayout();
+        }
+    }
+
+    public void InitDefaultKeyboardLayout()
     {
         for (int i = 0; i < 15; i++)
         {
-            if (i == 9 || i == 10)
+            if (i == 9)
             {
-                layout[i] = new MouseButtonInput(i - 9);
+                layout[i] = new MouseButtonInput(0);
             }
             else
             {
@@ -114,12 +173,121 @@ else if (i > 22)
         }
     }
 
-    public void Load(String path)
+    public void InitDefaultGamepadLayout()
+    {
+        for (int i = 0; i < 15; i++)
+        {
+            layout[i] = new JoystickButtonInput(i);
+        }
+        for (int i = 15; i < 25; i++)
+        {
+            if (i == 16 || i == 18 || i == 20 || i == 22)
+            {
+                layout[i] = new JoystickAxisInput(i - 15, 0.05f, -1.0f);
+            }
+            else if (i > 22)
+            {
+                layout[i] = new JoystickAxisInput(i - 15, -1.0f, 1.0f);
+            }
+            else
+            {
+                layout[i] = new JoystickAxisInput(i - 15, 0.05f, 1.0f);
+            }
+        }
+    }
+
+    private void Load(String path, ControlType fallbackType)
+    {
+        Load(path, fallbackType, true);
+    }
+
+    static final byte[] headerNameData = 
+        {
+            'C',
+            'T',
+            'C',
+            'P',
+            'R',
+            'F',
+        };
+
+    private void Load(String path, ControlType fallbackType, boolean hasHeader)
     {
         File f = new File(path);
         if(!f.exists() || f.isDirectory())
         {
-            InitDefaultLayout();
+            InitDefaultLayout(fallbackType);
+            return;
+        }
+        else try
+        {
+            FileInputStream file = new FileInputStream(f);
+            DataInputStream buf = new DataInputStream(file);
+            int version = 0;
+            if (hasHeader)
+            {
+                byte[] header = buf.readNBytes(8);
+                boolean valid = header.length == 8;
+                for (int i = 0; i < 6 && valid; i++)
+                {
+                    if (header[i] != headerNameData[i])
+                    {
+                        valid = false;
+                    }
+                }
+                if (!valid)
+                {
+                    file.close();
+                    throw new IOException("Corrupted Profile Data!");
+                }
+                version = 256 * header[6] + header[7];
+            }
+            for (int i = 0; i < layout.length; i++)
+            {
+                switch (InputType.GetType(buf.readByte()))
+                {
+                    case NONE:
+                        layout[i] = null;
+                        break;
+                    case JOYSTICK_BUTTON:
+                        layout[i] = new JoystickButtonInput();
+                        break;
+                    case JOYSTICK_AXIS:
+                        layout[i] = new JoystickAxisInput();
+                        break;
+                    case MOUSE_BUTTON:
+                        layout[i] = new MouseButtonInput();
+                        break;
+                    case MOUSE_AXIS:
+                        layout[i] = new MouseAxisInput();
+                        break;
+                    case KEYBOARD_KEY:
+                        layout[i] = new KeyboardInput();
+                        break;
+                    default:
+                        throw new IOException("Corrupted Profile Data!");
+                }
+                if (layout[i] != null) layout[i].Deserialize(buf);
+            }
+            file.close();
+        }
+        catch (IOException e)
+        {
+            CreateTweakedControllers.error("Error loading controller profile \""+path+"\"!");
+            for (StackTraceElement line : e.getStackTrace())
+            {
+                CreateTweakedControllers.error(line.toString());
+            }
+            return;
+        }
+    }
+
+    private void Load(String path)
+    {
+        File f = new File(path);
+        if(!f.exists() || f.isDirectory())
+        {
+            InitDefaultLayout(ControlType.KEYBOARD_MOUSE);
             return;
         }
         else try
@@ -179,6 +347,14 @@ public void Save(String path)
             f.createNewFile();
             FileOutputStream file = new FileOutputStream(f);
             DataOutputStream buf = new DataOutputStream(file);
+            /*
+            for (int i = 0; i < headerNameData.length; i++)
+            {
+                buf.writeByte(headerNameData[i]);
+            }
+            buf.writeByte(CURRENT_VERSION_MAJOR);
+            buf.writeByte(CURRENT_VERSION_MINOR);
+            */
             for (int i = 0; i < layout.length; i++)
             {
                 if (layout[i] != null)

src/main/java/com/getitemfromblock/create_tweaked_controllers/controller/ControlType.java

@@ -0,0 +1,24 @@
+package com.getitemfromblock.create_tweaked_controllers.controller;
+
+import com.getitemfromblock.create_tweaked_controllers.input.JoystickInputs;
+
+public enum ControlType
+{
+    KEYBOARD_MOUSE,
+    JOYSTICK,
+    CUSTOM_0,
+    CUSTOM_1;
+
+    public boolean IsAdapted()
+    {
+        switch (this)
+        {
+            case KEYBOARD_MOUSE:
+                return !JoystickInputs.HasJoystick();
+            case JOYSTICK:
+                return JoystickInputs.HasJoystick();
+            default:
+                return true;
+        }
+    }
+}

src/main/java/com/getitemfromblock/create_tweaked_controllers/controller/TweakedControlsUtil.java

@@ -14,6 +14,12 @@ public class TweakedControlsUtil
     private static boolean lastFocusKeyState = false;
     private static boolean isFocusActive = false;
     private static boolean wasFocusActive = false;
+    private static ControlType controlType = ControlType.KEYBOARD_MOUSE;
+
+    public static ControlType GetActiveProfileType()
+    {
+        return controlType;
+    }
 
     public static void FreeFocus()
     {
@@ -22,6 +28,26 @@ public static void FreeFocus()
         wasFocusActive = false;
     }
 
+    public static void SelectProfileType(ControlType type)
+    {
+        profile.Load(type);
+        controlType = type;
+    }
+
+    private static void BackgroundUpdate()
+    {
+        //if (!ModClientConfig.AUTO_DETECT_INPUT_TYPE.get() || controlType.IsAdapted()) return;
+        if (JoystickInputs.HasJoystick())
+        {
+            controlType = ControlType.JOYSTICK;
+        }
+        else
+        {
+            controlType = ControlType.KEYBOARD_MOUSE;
+        }
+        profile.Load(controlType);
+    }
+
     public static void GuiUpdate()
     {
         MouseCursorHandler.Update();
@@ -96,6 +122,7 @@ public static void Update(boolean useFullPrec)
     {
         if (ModClientConfig.USE_CUSTOM_MAPPINGS.get())
         {
+            //BackgroundUpdate();
             HandleMouseKeyBinds();
             if (profile.hasJoystickInput)
             {
@@ -164,4 +191,4 @@ public static void FillGamepadInputs(boolean useFullPrec)
             }
         }
     }
-}
+}