🐘 Bump YACL to beta 7

gradle/libs.versions.toml

@@ -13,7 +13,7 @@ quilt_mappings = "1"
 fabric_loader = "0.14.19"
 fabric_api = "0.81.2+1.20"
 mixin_extras = "0.2.0-beta.8"
-yet_another_config_lib = "3.0.0-beta.5+1.20"
+yet_another_config_lib = "3.0.0-beta.7+1.20"
 mod_menu = "7.0.0-beta.2"
 hid4java = "0.7.0"
 quilt_json5 = "1.0.3"

src/main/java/dev/isxander/controlify/api/bind/ControllerBinding.java

@@ -3,7 +3,7 @@ package dev.isxander.controlify.api.bind;
 import com.google.gson.JsonObject;
 import dev.isxander.controlify.bindings.BindContext;
 import dev.isxander.controlify.bindings.IBind;
-import dev.isxander.yacl.api.Option;
+import dev.isxander.yacl3.api.Option;
 import net.minecraft.client.KeyMapping;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;

src/main/java/dev/isxander/controlify/bindings/ControllerBindingImpl.java

@@ -15,8 +15,8 @@ import dev.isxander.controlify.controller.gamepad.GamepadState;
 import dev.isxander.controlify.controller.joystick.JoystickController;
 import dev.isxander.controlify.controller.joystick.JoystickState;
 import dev.isxander.controlify.gui.DrawSize;
-import dev.isxander.yacl.api.Option;
+import dev.isxander.yacl3.api.Option;
-import dev.isxander.yacl.api.OptionDescription;
+import dev.isxander.yacl3.api.OptionDescription;
 import net.minecraft.client.KeyMapping;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.locale.Language;

src/main/java/dev/isxander/controlify/compatibility/yacl/CyclingControllerElementComponentProcessor.java

@@ -3,7 +3,7 @@ package dev.isxander.controlify.compatibility.yacl;
 import dev.isxander.controlify.controller.Controller;
 import dev.isxander.controlify.screenop.ScreenProcessor;
 import dev.isxander.controlify.screenop.ComponentProcessor;
-import dev.isxander.yacl.gui.controllers.cycling.CyclingControllerElement;
+import dev.isxander.yacl3.gui.controllers.cycling.CyclingControllerElement;
 
 public class CyclingControllerElementComponentProcessor implements ComponentProcessor {
     private final CyclingControllerElement cyclingController;

src/main/java/dev/isxander/controlify/compatibility/yacl/SliderControllerElementComponentProcessor.java

@@ -4,7 +4,7 @@ import dev.isxander.controlify.controller.Controller;
 import dev.isxander.controlify.screenop.ScreenProcessor;
 import dev.isxander.controlify.screenop.ComponentProcessor;
 import dev.isxander.controlify.utils.NavigationHelper;
-import dev.isxander.yacl.gui.controllers.slider.SliderControllerElement;
+import dev.isxander.yacl3.gui.controllers.slider.SliderControllerElement;
 
 public class SliderControllerElementComponentProcessor implements ComponentProcessor {
     private final SliderControllerElement slider;

src/main/java/dev/isxander/controlify/compatibility/yacl/YACLScreenProcessor.java

@@ -3,7 +3,7 @@ package dev.isxander.controlify.compatibility.yacl;
 import dev.isxander.controlify.controller.Controller;
 import dev.isxander.controlify.mixins.compat.yacl.YACLScreenCategoryTabAccessor;
 import dev.isxander.controlify.screenop.ScreenProcessor;
-import dev.isxander.yacl.gui.YACLScreen;
+import dev.isxander.yacl3.gui.YACLScreen;
 
 public class YACLScreenProcessor extends ScreenProcessor<YACLScreen> {
     public YACLScreenProcessor(YACLScreen screen) {

src/main/java/dev/isxander/controlify/controller/gamepad/BuiltinGamepadTheme.java

@@ -1,6 +1,6 @@
 package dev.isxander.controlify.controller.gamepad;
 
-import dev.isxander.yacl.api.NameableEnum;
+import dev.isxander.yacl3.api.NameableEnum;
 import net.minecraft.network.chat.CommonComponents;
 import net.minecraft.network.chat.Component;
 

src/main/java/dev/isxander/controlify/controller/joystick/JoystickState.java

@@ -6,7 +6,7 @@ import dev.isxander.controlify.controller.joystick.mapping.JoystickMapping;
 import dev.isxander.controlify.controller.joystick.mapping.UnmappedJoystickMapping;
 import dev.isxander.controlify.debug.DebugProperties;
 import dev.isxander.controlify.utils.ControllerUtils;
-import dev.isxander.yacl.api.NameableEnum;
+import dev.isxander.yacl3.api.NameableEnum;
 import net.minecraft.network.chat.Component;
 import org.lwjgl.glfw.GLFW;
 

src/main/java/dev/isxander/controlify/gui/controllers/AbstractBindController.java

@@ -6,11 +6,11 @@ import dev.isxander.controlify.bindings.IBind;
 import dev.isxander.controlify.controller.ControllerState;
 import dev.isxander.controlify.screenop.ComponentProcessor;
 import dev.isxander.controlify.screenop.ScreenProcessor;
-import dev.isxander.yacl.api.Controller;
+import dev.isxander.yacl3.api.Controller;
-import dev.isxander.yacl.api.Option;
+import dev.isxander.yacl3.api.Option;
-import dev.isxander.yacl.api.utils.Dimension;
+import dev.isxander.yacl3.api.utils.Dimension;
-import dev.isxander.yacl.gui.YACLScreen;
+import dev.isxander.yacl3.gui.YACLScreen;
-import dev.isxander.yacl.gui.controllers.ControllerWidget;
+import dev.isxander.yacl3.gui.controllers.ControllerWidget;
 import net.minecraft.ChatFormatting;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.network.chat.Component;

src/main/java/dev/isxander/controlify/gui/controllers/GamepadBindController.java

@@ -5,9 +5,9 @@ import dev.isxander.controlify.bindings.GamepadBinds;
 import dev.isxander.controlify.bindings.IBind;
 import dev.isxander.controlify.controller.gamepad.GamepadController;
 import dev.isxander.controlify.controller.gamepad.GamepadState;
-import dev.isxander.yacl.api.Option;
+import dev.isxander.yacl3.api.Option;
-import dev.isxander.yacl.api.utils.Dimension;
+import dev.isxander.yacl3.api.utils.Dimension;
-import dev.isxander.yacl.gui.YACLScreen;
+import dev.isxander.yacl3.gui.YACLScreen;
 
 import java.util.Optional;
 

src/main/java/dev/isxander/controlify/gui/controllers/JoystickBindController.java

@@ -3,9 +3,9 @@ package dev.isxander.controlify.gui.controllers;
 import dev.isxander.controlify.bindings.*;
 import dev.isxander.controlify.controller.joystick.JoystickController;
 import dev.isxander.controlify.controller.joystick.JoystickState;
-import dev.isxander.yacl.api.Option;
+import dev.isxander.yacl3.api.Option;
-import dev.isxander.yacl.api.utils.Dimension;
+import dev.isxander.yacl3.api.utils.Dimension;
-import dev.isxander.yacl.gui.YACLScreen;
+import dev.isxander.yacl3.gui.YACLScreen;
 
 import java.util.Optional;
 

src/main/java/dev/isxander/controlify/gui/screen/ControllerConfigScreenFactory.java

@@ -13,11 +13,11 @@ import dev.isxander.controlify.gui.controllers.AbstractBindController;
 import dev.isxander.controlify.rumble.BasicRumbleEffect;
 import dev.isxander.controlify.rumble.RumbleSource;
 import dev.isxander.controlify.rumble.RumbleState;
-import dev.isxander.yacl.api.*;
+import dev.isxander.yacl3.api.*;
-import dev.isxander.yacl.api.controller.BooleanControllerBuilder;
+import dev.isxander.yacl3.api.controller.BooleanControllerBuilder;
-import dev.isxander.yacl.api.controller.FloatSliderControllerBuilder;
+import dev.isxander.yacl3.api.controller.FloatSliderControllerBuilder;
-import dev.isxander.yacl.api.controller.StringControllerBuilder;
+import dev.isxander.yacl3.api.controller.StringControllerBuilder;
-import dev.isxander.yacl.api.controller.TickBoxControllerBuilder;
+import dev.isxander.yacl3.api.controller.TickBoxControllerBuilder;
 import net.minecraft.ChatFormatting;
 import net.minecraft.Util;
 import net.minecraft.client.Minecraft;

src/main/java/dev/isxander/controlify/gui/screen/GlobalSettingsScreenFactory.java

@@ -3,10 +3,10 @@ package dev.isxander.controlify.gui.screen;
 import dev.isxander.controlify.Controlify;
 import dev.isxander.controlify.config.GlobalSettings;
 import dev.isxander.controlify.reacharound.ReachAroundMode;
-import dev.isxander.yacl.api.*;
+import dev.isxander.yacl3.api.*;
-import dev.isxander.yacl.api.controller.BooleanControllerBuilder;
+import dev.isxander.yacl3.api.controller.BooleanControllerBuilder;
-import dev.isxander.yacl.api.controller.EnumControllerBuilder;
+import dev.isxander.yacl3.api.controller.EnumControllerBuilder;
-import dev.isxander.yacl.api.controller.TickBoxControllerBuilder;
+import dev.isxander.yacl3.api.controller.TickBoxControllerBuilder;
 import net.minecraft.ChatFormatting;
 import net.minecraft.Util;
 import net.minecraft.client.gui.screens.Screen;

src/main/java/dev/isxander/controlify/mixins/compat/yacl/CyclingControllerElementMixin.java

@@ -3,7 +3,7 @@ package dev.isxander.controlify.mixins.compat.yacl;
 import dev.isxander.controlify.screenop.ComponentProcessor;
 import dev.isxander.controlify.screenop.ComponentProcessorProvider;
 import dev.isxander.controlify.compatibility.yacl.CyclingControllerElementComponentProcessor;
-import dev.isxander.yacl.gui.controllers.cycling.CyclingControllerElement;
+import dev.isxander.yacl3.gui.controllers.cycling.CyclingControllerElement;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 

src/main/java/dev/isxander/controlify/mixins/compat/yacl/SliderControllerElementMixin.java

@@ -3,7 +3,7 @@ package dev.isxander.controlify.mixins.compat.yacl;
 import dev.isxander.controlify.screenop.ComponentProcessor;
 import dev.isxander.controlify.screenop.ComponentProcessorProvider;
 import dev.isxander.controlify.compatibility.yacl.SliderControllerElementComponentProcessor;
-import dev.isxander.yacl.gui.controllers.slider.SliderControllerElement;
+import dev.isxander.yacl3.gui.controllers.slider.SliderControllerElement;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 

src/main/java/dev/isxander/controlify/mixins/compat/yacl/YACLScreenCategoryTabAccessor.java

@@ -1,6 +1,6 @@
 package dev.isxander.controlify.mixins.compat.yacl;
 
-import dev.isxander.yacl.gui.YACLScreen;
+import dev.isxander.yacl3.gui.YACLScreen;
 import net.minecraft.client.gui.components.Button;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;

src/main/java/dev/isxander/controlify/mixins/compat/yacl/YACLScreenCategoryTabMixin.java

@@ -3,8 +3,8 @@ package dev.isxander.controlify.mixins.compat.yacl;
 import dev.isxander.controlify.api.buttonguide.ButtonGuideApi;
 import dev.isxander.controlify.api.buttonguide.ButtonGuidePredicate;
 import dev.isxander.controlify.api.buttonguide.ButtonRenderPosition;
-import dev.isxander.yacl.api.ConfigCategory;
+import dev.isxander.yacl3.api.ConfigCategory;
-import dev.isxander.yacl.gui.YACLScreen;
+import dev.isxander.yacl3.gui.YACLScreen;
 import net.minecraft.client.gui.components.Button;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;

src/main/java/dev/isxander/controlify/mixins/compat/yacl/YACLScreenMixin.java

@@ -3,7 +3,7 @@ package dev.isxander.controlify.mixins.compat.yacl;
 import dev.isxander.controlify.screenop.ScreenProcessor;
 import dev.isxander.controlify.screenop.ScreenProcessorProvider;
 import dev.isxander.controlify.compatibility.yacl.YACLScreenProcessor;
-import dev.isxander.yacl.gui.YACLScreen;
+import dev.isxander.yacl3.gui.YACLScreen;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 

src/main/java/dev/isxander/controlify/reacharound/ReachAroundMode.java

@@ -1,7 +1,7 @@
 package dev.isxander.controlify.reacharound;
 
 import dev.isxander.controlify.Controlify;
-import dev.isxander.yacl.api.NameableEnum;
+import dev.isxander.yacl3.api.NameableEnum;
 import net.minecraft.client.Minecraft;
 import net.minecraft.network.chat.Component;
 

src/main/resources/fabric.mod.json

@@ -34,7 +34,7 @@
     "fabricloader": ">=0.14.0",
     "minecraft": ">1.20-",
     "java": ">=17",
-    "yet_another_config_lib": ">=3.0.0-"
+    "yet_another_config_lib_v3": ">=3.0.0-"
   },
   "breaks": {
     "midnightcontrols": "*"