diff --git a/production/MinecraftArduinoControls.main/assets/arduinoctrls/boards/arduino-nano.png b/production/MinecraftArduinoControls.main/assets/arduinoctrls/boards/arduino-nano.png new file mode 100644 index 0000000..092d2b7 Binary files /dev/null and b/production/MinecraftArduinoControls.main/assets/arduinoctrls/boards/arduino-nano.png differ diff --git a/production/MinecraftArduinoControls.main/assets/arduinoctrls/boards/arduino-pro_mini.png b/production/MinecraftArduinoControls.main/assets/arduinoctrls/boards/arduino-pro_mini.png new file mode 100644 index 0000000..31362bf Binary files /dev/null and b/production/MinecraftArduinoControls.main/assets/arduinoctrls/boards/arduino-pro_mini.png differ diff --git a/production/MinecraftArduinoControls.main/assets/arduinoctrls/boards/arduino-uno.png b/production/MinecraftArduinoControls.main/assets/arduinoctrls/boards/arduino-uno.png new file mode 100644 index 0000000..9050ec2 Binary files /dev/null and b/production/MinecraftArduinoControls.main/assets/arduinoctrls/boards/arduino-uno.png differ diff --git a/production/MinecraftArduinoControls.main/me/jonasjones/arduinoctrls/ArduinoControls.class b/production/MinecraftArduinoControls.main/me/jonasjones/arduinoctrls/ArduinoControls.class index 21bbe19..f0c948f 100644 Binary files a/production/MinecraftArduinoControls.main/me/jonasjones/arduinoctrls/ArduinoControls.class and b/production/MinecraftArduinoControls.main/me/jonasjones/arduinoctrls/ArduinoControls.class differ diff --git a/production/MinecraftArduinoControls.main/me/jonasjones/arduinoctrls/config/ModConfigs.class b/production/MinecraftArduinoControls.main/me/jonasjones/arduinoctrls/config/ModConfigs.class index d1ff69e..7a530c7 100644 Binary files a/production/MinecraftArduinoControls.main/me/jonasjones/arduinoctrls/config/ModConfigs.class and b/production/MinecraftArduinoControls.main/me/jonasjones/arduinoctrls/config/ModConfigs.class differ diff --git a/production/MinecraftArduinoControls.main/me/jonasjones/arduinoctrls/config/SimpleConfig$ConfigRequest.class b/production/MinecraftArduinoControls.main/me/jonasjones/arduinoctrls/config/SimpleConfig$ConfigRequest.class index ce6c351..3770c21 100644 Binary files a/production/MinecraftArduinoControls.main/me/jonasjones/arduinoctrls/config/SimpleConfig$ConfigRequest.class and b/production/MinecraftArduinoControls.main/me/jonasjones/arduinoctrls/config/SimpleConfig$ConfigRequest.class differ diff --git a/production/MinecraftArduinoControls.main/me/jonasjones/arduinoctrls/config/SimpleConfig$DefaultConfig.class b/production/MinecraftArduinoControls.main/me/jonasjones/arduinoctrls/config/SimpleConfig$DefaultConfig.class index 1569a4b..b9da04b 100644 Binary files a/production/MinecraftArduinoControls.main/me/jonasjones/arduinoctrls/config/SimpleConfig$DefaultConfig.class and b/production/MinecraftArduinoControls.main/me/jonasjones/arduinoctrls/config/SimpleConfig$DefaultConfig.class differ diff --git a/production/MinecraftArduinoControls.main/me/jonasjones/arduinoctrls/config/SimpleConfig.class b/production/MinecraftArduinoControls.main/me/jonasjones/arduinoctrls/config/SimpleConfig.class index d8bec63..1524d08 100644 Binary files a/production/MinecraftArduinoControls.main/me/jonasjones/arduinoctrls/config/SimpleConfig.class and b/production/MinecraftArduinoControls.main/me/jonasjones/arduinoctrls/config/SimpleConfig.class differ diff --git a/production/MinecraftArduinoControls.main/me/jonasjones/arduinoctrls/gui/GuiHome.class b/production/MinecraftArduinoControls.main/me/jonasjones/arduinoctrls/gui/screens/GuiHome.class similarity index 64% rename from production/MinecraftArduinoControls.main/me/jonasjones/arduinoctrls/gui/GuiHome.class rename to production/MinecraftArduinoControls.main/me/jonasjones/arduinoctrls/gui/screens/GuiHome.class index 892dff2..1a1a6d0 100644 Binary files a/production/MinecraftArduinoControls.main/me/jonasjones/arduinoctrls/gui/GuiHome.class and b/production/MinecraftArduinoControls.main/me/jonasjones/arduinoctrls/gui/screens/GuiHome.class differ diff --git a/production/MinecraftArduinoControls.main/me/jonasjones/arduinoctrls/gui/screens/ModSettings.class b/production/MinecraftArduinoControls.main/me/jonasjones/arduinoctrls/gui/screens/ModSettings.class index 881ef92..c3deed3 100644 Binary files a/production/MinecraftArduinoControls.main/me/jonasjones/arduinoctrls/gui/screens/ModSettings.class and b/production/MinecraftArduinoControls.main/me/jonasjones/arduinoctrls/gui/screens/ModSettings.class differ diff --git a/production/MinecraftArduinoControls.main/me/jonasjones/arduinoctrls/gui/SelectDevice.class b/production/MinecraftArduinoControls.main/me/jonasjones/arduinoctrls/gui/screens/SelectDevice.class similarity index 90% rename from production/MinecraftArduinoControls.main/me/jonasjones/arduinoctrls/gui/SelectDevice.class rename to production/MinecraftArduinoControls.main/me/jonasjones/arduinoctrls/gui/screens/SelectDevice.class index d64964f..1b7bd90 100644 Binary files a/production/MinecraftArduinoControls.main/me/jonasjones/arduinoctrls/gui/SelectDevice.class and b/production/MinecraftArduinoControls.main/me/jonasjones/arduinoctrls/gui/screens/SelectDevice.class differ diff --git a/production/MinecraftArduinoControls.main/me/jonasjones/arduinoctrls/mixin/ArduinoMixin.class b/production/MinecraftArduinoControls.main/me/jonasjones/arduinoctrls/mixin/ArduinoMixin.class index 5c88a5c..956d582 100644 Binary files a/production/MinecraftArduinoControls.main/me/jonasjones/arduinoctrls/mixin/ArduinoMixin.class and b/production/MinecraftArduinoControls.main/me/jonasjones/arduinoctrls/mixin/ArduinoMixin.class differ diff --git a/production/MinecraftArduinoControls.main/me/jonasjones/arduinoctrls/mixin/GameMenuScreenMixin.class b/production/MinecraftArduinoControls.main/me/jonasjones/arduinoctrls/mixin/GameMenuScreenMixin.class index 9e49d55..3f2e929 100644 Binary files a/production/MinecraftArduinoControls.main/me/jonasjones/arduinoctrls/mixin/GameMenuScreenMixin.class and b/production/MinecraftArduinoControls.main/me/jonasjones/arduinoctrls/mixin/GameMenuScreenMixin.class differ diff --git a/src/main/java/me/jonasjones/arduinoctrls/ArduinoControls.java b/src/main/java/me/jonasjones/arduinoctrls/ArduinoControls.java index 1075052..a983af9 100644 --- a/src/main/java/me/jonasjones/arduinoctrls/ArduinoControls.java +++ b/src/main/java/me/jonasjones/arduinoctrls/ArduinoControls.java @@ -18,14 +18,11 @@ public class ArduinoControls implements ClientModInitializer { @Override public void onInitializeClient() { - // register configs - ModConfigs.registerConfigs(); - //message from mod to confirm that it has been loaded LOGGER.info("UwU from Arduino Controls!"); - //make verbose logger show that it is active - VerboseLogger.info("Verbose Logger is now logging."); + // register configs + ModConfigs.registerConfigs(); //blink LED on startup /*try { diff --git a/src/main/java/me/jonasjones/arduinoctrls/config/ModConfigs.java b/src/main/java/me/jonasjones/arduinoctrls/config/ModConfigs.java index 8157803..951d0f4 100644 --- a/src/main/java/me/jonasjones/arduinoctrls/config/ModConfigs.java +++ b/src/main/java/me/jonasjones/arduinoctrls/config/ModConfigs.java @@ -3,6 +3,7 @@ package me.jonasjones.arduinoctrls.config; import com.mojang.datafixers.util.Pair; import me.jonasjones.arduinoctrls.ArduinoControls; +import me.jonasjones.arduinoctrls.util.VerboseLogger; public class ModConfigs { public static SimpleConfig CONFIGMAIN; @@ -17,6 +18,7 @@ public class ModConfigs { public static Boolean BOARDMELTING; public static Boolean VERBOSE = false; //needs to be set to false since the verbose logger is called before config file is fully loaded public static String EDITOR; + public static String CUSTOMEDITOR; //configList public static Boolean DISPLAYENTRYALL; @@ -47,6 +49,11 @@ public class ModConfigs { CONFIGLISTS = SimpleConfig.of(ArduinoControls.MOD_ID + "-lists").provider(configLists).request(); assignConfigs(); + + //make verbose logger show that it is active and print configs to logger + VerboseLogger.info("Verbose Logger is now logging."); + VerboseLogger.info("Loaded config file CONFIGMAIN successfully: " + configMain.getConfigsList().size() + " configurations have been set properly"); + VerboseLogger.info("Loaded config file CONFIGMAIN successfully: " + configLists.getConfigsList().size() + " configurations have been set properly"); } private static void createConfigs() { @@ -57,6 +64,7 @@ public class ModConfigs { configMain.addKeyValuePair(new Pair<>("fun.boardMelting", false), "Whether or not the board should have a flame overlay instead of being greyed out when not connected."); configMain.addKeyValuePair(new Pair<>("debug.verbose", false), "Toggle verbose console output."); configMain.addKeyValuePair(new Pair<>("editor.default", "ingame"), "The default editor for the board program. All valid default Editors can be found at: https://github.com/J-onasJones/MicrocontrollerMC/wiki/Board-Program-Editors#available-editors"); + configMain.addKeyValuePair(new Pair<>("editor.custom", "None"), "The editor to choose if 'editor.default' is set to 'custom'."); //configLists configLists.addKeyValuePair(new Pair<>("displayEntry.all", false), "Whether or not to display all entries. This overrides all other states except for debug and experimental entries. More infos can be found at: https://github.com/J-onasJones/MicrocontrollerMC/wiki/Pin-Map-Entries#list-of-all-entries"); @@ -76,7 +84,6 @@ public class ModConfigs { configLists.addKeyValuePair(new Pair<>("displayEntryIs.playerWalkRight", true), "Display Is Player Walking Right Entry"); configLists.addKeyValuePair(new Pair<>("displayEntryIs.playerWalkLeft", true), "Display Is Player Walking Left Entry"); configLists.addKeyValuePair(new Pair<>("displayEntryIs.playerSneak", true), "Display Is Player Sneaking Entry"); - } private static void assignConfigs() { @@ -86,6 +93,7 @@ public class ModConfigs { BOARDMELTING = CONFIGMAIN.getOrDefault("fun.boardMelting", false); VERBOSE = CONFIGMAIN.getOrDefault("debug.verbose", false); EDITOR = CONFIGMAIN.getOrDefault("editor.default", "ingame"); + CUSTOMEDITOR = CONFIGMAIN.getOrDefault("editor.custom", "None"); DISPLAYENTRYALL = CONFIGLISTS.getOrDefault("displayEntry.all", false); DISPLAYENTRYPLAYERJUMP = CONFIGLISTS.getOrDefault("displayEntry.playerJump", true); @@ -104,7 +112,5 @@ public class ModConfigs { DISPLAYENTRYISPLAYERWALKRIGHT = CONFIGLISTS.getOrDefault("displayEntryIs.playerWalkRight", true); DISPLAYENTRYISPLAYERWALKLEFT = CONFIGLISTS.getOrDefault("displayEntryIs.playerWalkLeft", true); DISPLAYENTRYISPLAYERSNEAK = CONFIGLISTS.getOrDefault("displayEntryIs.playerSneak", true); - - System.out.println("All " + configMain.getConfigsList().size() + " have been set properly"); } } diff --git a/src/main/java/me/jonasjones/arduinoctrls/config/SimpleConfig.java b/src/main/java/me/jonasjones/arduinoctrls/config/SimpleConfig.java index d41e360..0a2fea9 100644 --- a/src/main/java/me/jonasjones/arduinoctrls/config/SimpleConfig.java +++ b/src/main/java/me/jonasjones/arduinoctrls/config/SimpleConfig.java @@ -22,6 +22,7 @@ package me.jonasjones.arduinoctrls.config; * THE SOFTWARE. */ +import me.jonasjones.arduinoctrls.ArduinoControls; import me.jonasjones.arduinoctrls.util.VerboseLogger; import net.fabricmc.loader.api.FabricLoader; @@ -137,13 +138,13 @@ public class SimpleConfig { String identifier = "Config '" + request.filename + "'"; if( !request.file.exists() ) { - VerboseLogger.info( identifier + " is missing, generating default one..." ); + ArduinoControls.LOGGER.info( identifier + " is missing, generating default one..." ); try { createConfig(); } catch (IOException e) { - VerboseLogger.error( identifier + " failed to generate!" ); - VerboseLogger.trace(String.valueOf(e)); + ArduinoControls.LOGGER.error( identifier + " failed to generate!" ); + ArduinoControls.LOGGER.trace(String.valueOf(e)); broken = true; } } @@ -152,8 +153,8 @@ public class SimpleConfig { try { loadConfig(); } catch (Exception e) { - VerboseLogger.error( identifier + " failed to load!" ); - VerboseLogger.trace(String.valueOf(e)); + ArduinoControls.LOGGER.error( identifier + " failed to load!" ); + ArduinoControls.LOGGER.trace(String.valueOf(e)); broken = true; } } diff --git a/src/main/java/me/jonasjones/arduinoctrls/gui/GuiHome.java b/src/main/java/me/jonasjones/arduinoctrls/gui/screens/GuiHome.java similarity index 93% rename from src/main/java/me/jonasjones/arduinoctrls/gui/GuiHome.java rename to src/main/java/me/jonasjones/arduinoctrls/gui/screens/GuiHome.java index 20a14a4..e99dd71 100644 --- a/src/main/java/me/jonasjones/arduinoctrls/gui/GuiHome.java +++ b/src/main/java/me/jonasjones/arduinoctrls/gui/screens/GuiHome.java @@ -1,6 +1,5 @@ -package me.jonasjones.arduinoctrls.gui; +package me.jonasjones.arduinoctrls.gui.screens; -import me.jonasjones.arduinoctrls.gui.screens.ModSettings; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.gui.screen.Screen; diff --git a/src/main/java/me/jonasjones/arduinoctrls/gui/screens/ModSettings.java b/src/main/java/me/jonasjones/arduinoctrls/gui/screens/ModSettings.java index f1d4087..52fdd0c 100644 --- a/src/main/java/me/jonasjones/arduinoctrls/gui/screens/ModSettings.java +++ b/src/main/java/me/jonasjones/arduinoctrls/gui/screens/ModSettings.java @@ -1,10 +1,8 @@ package me.jonasjones.arduinoctrls.gui.screens; -import me.jonasjones.arduinoctrls.gui.SelectDevice; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.gui.screen.option.SoundOptionsScreen; import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.screen.ScreenTexts; diff --git a/src/main/java/me/jonasjones/arduinoctrls/gui/SelectDevice.java b/src/main/java/me/jonasjones/arduinoctrls/gui/screens/SelectDevice.java similarity index 99% rename from src/main/java/me/jonasjones/arduinoctrls/gui/SelectDevice.java rename to src/main/java/me/jonasjones/arduinoctrls/gui/screens/SelectDevice.java index 12d8429..0254bcf 100644 --- a/src/main/java/me/jonasjones/arduinoctrls/gui/SelectDevice.java +++ b/src/main/java/me/jonasjones/arduinoctrls/gui/screens/SelectDevice.java @@ -1,4 +1,4 @@ -package me.jonasjones.arduinoctrls.gui; +package me.jonasjones.arduinoctrls.gui.screens; import com.mojang.logging.LogUtils; import net.fabricmc.api.EnvType; diff --git a/src/main/java/me/jonasjones/arduinoctrls/mixin/ArduinoMixin.java b/src/main/java/me/jonasjones/arduinoctrls/mixin/ArduinoMixin.java index 0ee2ce4..3d062b4 100644 --- a/src/main/java/me/jonasjones/arduinoctrls/mixin/ArduinoMixin.java +++ b/src/main/java/me/jonasjones/arduinoctrls/mixin/ArduinoMixin.java @@ -1,7 +1,6 @@ package me.jonasjones.arduinoctrls.mixin; -import me.jonasjones.arduinoctrls.gui.GuiHome; -import me.jonasjones.arduinoctrls.gui.SelectDevice; +import me.jonasjones.arduinoctrls.gui.screens.GuiHome; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.screen.TitleScreen; import net.minecraft.client.gui.widget.ButtonWidget; diff --git a/src/main/java/me/jonasjones/arduinoctrls/mixin/GameMenuScreenMixin.java b/src/main/java/me/jonasjones/arduinoctrls/mixin/GameMenuScreenMixin.java index 4a7f753..861fb39 100644 --- a/src/main/java/me/jonasjones/arduinoctrls/mixin/GameMenuScreenMixin.java +++ b/src/main/java/me/jonasjones/arduinoctrls/mixin/GameMenuScreenMixin.java @@ -1,6 +1,6 @@ package me.jonasjones.arduinoctrls.mixin; -import me.jonasjones.arduinoctrls.gui.GuiHome; +import me.jonasjones.arduinoctrls.gui.screens.GuiHome; import net.minecraft.client.gui.screen.GameMenuScreen; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.ButtonWidget; diff --git a/src/main/resources/assets/arduinoctrls/boards/arduino-nano.png b/src/main/resources/assets/arduinoctrls/boards/arduino-nano.png new file mode 100644 index 0000000..092d2b7 Binary files /dev/null and b/src/main/resources/assets/arduinoctrls/boards/arduino-nano.png differ diff --git a/src/main/resources/assets/arduinoctrls/boards/arduino-pro_mini.png b/src/main/resources/assets/arduinoctrls/boards/arduino-pro_mini.png new file mode 100644 index 0000000..31362bf Binary files /dev/null and b/src/main/resources/assets/arduinoctrls/boards/arduino-pro_mini.png differ diff --git a/src/main/resources/assets/arduinoctrls/boards/arduino-uno.png b/src/main/resources/assets/arduinoctrls/boards/arduino-uno.png new file mode 100644 index 0000000..9050ec2 Binary files /dev/null and b/src/main/resources/assets/arduinoctrls/boards/arduino-uno.png differ