From 0b5767e547d67dd386b319dee4ff21e588af105f Mon Sep 17 00:00:00 2001 From: isXander Date: Mon, 5 Jun 2023 22:34:13 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=98=20Bump=20YACL=20to=20beta=207?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle/libs.versions.toml | 2 +- .../controlify/api/bind/ControllerBinding.java | 2 +- .../controlify/bindings/ControllerBindingImpl.java | 4 ++-- .../CyclingControllerElementComponentProcessor.java | 2 +- .../SliderControllerElementComponentProcessor.java | 2 +- .../compatibility/yacl/YACLScreenProcessor.java | 2 +- .../controller/gamepad/BuiltinGamepadTheme.java | 2 +- .../controlify/controller/joystick/JoystickState.java | 2 +- .../gui/controllers/AbstractBindController.java | 10 +++++----- .../gui/controllers/GamepadBindController.java | 6 +++--- .../gui/controllers/JoystickBindController.java | 6 +++--- .../gui/screen/ControllerConfigScreenFactory.java | 10 +++++----- .../gui/screen/GlobalSettingsScreenFactory.java | 8 ++++---- .../compat/yacl/CyclingControllerElementMixin.java | 2 +- .../compat/yacl/SliderControllerElementMixin.java | 2 +- .../compat/yacl/YACLScreenCategoryTabAccessor.java | 2 +- .../mixins/compat/yacl/YACLScreenCategoryTabMixin.java | 4 ++-- .../controlify/mixins/compat/yacl/YACLScreenMixin.java | 2 +- .../controlify/reacharound/ReachAroundMode.java | 2 +- src/main/resources/fabric.mod.json | 2 +- 20 files changed, 37 insertions(+), 37 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index adc3ab0..5062ca0 100644 --- a/gradle/libs.versions.toml +++ b/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" diff --git a/src/main/java/dev/isxander/controlify/api/bind/ControllerBinding.java b/src/main/java/dev/isxander/controlify/api/bind/ControllerBinding.java index 1bc01af..752d84c 100644 --- a/src/main/java/dev/isxander/controlify/api/bind/ControllerBinding.java +++ b/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; diff --git a/src/main/java/dev/isxander/controlify/bindings/ControllerBindingImpl.java b/src/main/java/dev/isxander/controlify/bindings/ControllerBindingImpl.java index 67befdc..8450f23 100644 --- a/src/main/java/dev/isxander/controlify/bindings/ControllerBindingImpl.java +++ b/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.yacl.api.OptionDescription; +import dev.isxander.yacl3.api.Option; +import dev.isxander.yacl3.api.OptionDescription; import net.minecraft.client.KeyMapping; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.locale.Language; diff --git a/src/main/java/dev/isxander/controlify/compatibility/yacl/CyclingControllerElementComponentProcessor.java b/src/main/java/dev/isxander/controlify/compatibility/yacl/CyclingControllerElementComponentProcessor.java index c6d4cb0..0e0a74b 100644 --- a/src/main/java/dev/isxander/controlify/compatibility/yacl/CyclingControllerElementComponentProcessor.java +++ b/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; diff --git a/src/main/java/dev/isxander/controlify/compatibility/yacl/SliderControllerElementComponentProcessor.java b/src/main/java/dev/isxander/controlify/compatibility/yacl/SliderControllerElementComponentProcessor.java index 52a63ad..ade1d68 100644 --- a/src/main/java/dev/isxander/controlify/compatibility/yacl/SliderControllerElementComponentProcessor.java +++ b/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; diff --git a/src/main/java/dev/isxander/controlify/compatibility/yacl/YACLScreenProcessor.java b/src/main/java/dev/isxander/controlify/compatibility/yacl/YACLScreenProcessor.java index cbe5cb8..a3e1288 100644 --- a/src/main/java/dev/isxander/controlify/compatibility/yacl/YACLScreenProcessor.java +++ b/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 { public YACLScreenProcessor(YACLScreen screen) { diff --git a/src/main/java/dev/isxander/controlify/controller/gamepad/BuiltinGamepadTheme.java b/src/main/java/dev/isxander/controlify/controller/gamepad/BuiltinGamepadTheme.java index 14005e9..8fc0c65 100644 --- a/src/main/java/dev/isxander/controlify/controller/gamepad/BuiltinGamepadTheme.java +++ b/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; diff --git a/src/main/java/dev/isxander/controlify/controller/joystick/JoystickState.java b/src/main/java/dev/isxander/controlify/controller/joystick/JoystickState.java index 55f0717..f8b8cfc 100644 --- a/src/main/java/dev/isxander/controlify/controller/joystick/JoystickState.java +++ b/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; diff --git a/src/main/java/dev/isxander/controlify/gui/controllers/AbstractBindController.java b/src/main/java/dev/isxander/controlify/gui/controllers/AbstractBindController.java index 81281df..7da0d0b 100644 --- a/src/main/java/dev/isxander/controlify/gui/controllers/AbstractBindController.java +++ b/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.yacl.api.Option; -import dev.isxander.yacl.api.utils.Dimension; -import dev.isxander.yacl.gui.YACLScreen; -import dev.isxander.yacl.gui.controllers.ControllerWidget; +import dev.isxander.yacl3.api.Controller; +import dev.isxander.yacl3.api.Option; +import dev.isxander.yacl3.api.utils.Dimension; +import dev.isxander.yacl3.gui.YACLScreen; +import dev.isxander.yacl3.gui.controllers.ControllerWidget; import net.minecraft.ChatFormatting; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.network.chat.Component; diff --git a/src/main/java/dev/isxander/controlify/gui/controllers/GamepadBindController.java b/src/main/java/dev/isxander/controlify/gui/controllers/GamepadBindController.java index d6a8dd9..8e9e1fe 100644 --- a/src/main/java/dev/isxander/controlify/gui/controllers/GamepadBindController.java +++ b/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.yacl.api.utils.Dimension; -import dev.isxander.yacl.gui.YACLScreen; +import dev.isxander.yacl3.api.Option; +import dev.isxander.yacl3.api.utils.Dimension; +import dev.isxander.yacl3.gui.YACLScreen; import java.util.Optional; diff --git a/src/main/java/dev/isxander/controlify/gui/controllers/JoystickBindController.java b/src/main/java/dev/isxander/controlify/gui/controllers/JoystickBindController.java index b1c8fa9..5b00e35 100644 --- a/src/main/java/dev/isxander/controlify/gui/controllers/JoystickBindController.java +++ b/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.yacl.api.utils.Dimension; -import dev.isxander.yacl.gui.YACLScreen; +import dev.isxander.yacl3.api.Option; +import dev.isxander.yacl3.api.utils.Dimension; +import dev.isxander.yacl3.gui.YACLScreen; import java.util.Optional; diff --git a/src/main/java/dev/isxander/controlify/gui/screen/ControllerConfigScreenFactory.java b/src/main/java/dev/isxander/controlify/gui/screen/ControllerConfigScreenFactory.java index 79f9401..20b7a95 100644 --- a/src/main/java/dev/isxander/controlify/gui/screen/ControllerConfigScreenFactory.java +++ b/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.yacl.api.controller.BooleanControllerBuilder; -import dev.isxander.yacl.api.controller.FloatSliderControllerBuilder; -import dev.isxander.yacl.api.controller.StringControllerBuilder; -import dev.isxander.yacl.api.controller.TickBoxControllerBuilder; +import dev.isxander.yacl3.api.*; +import dev.isxander.yacl3.api.controller.BooleanControllerBuilder; +import dev.isxander.yacl3.api.controller.FloatSliderControllerBuilder; +import dev.isxander.yacl3.api.controller.StringControllerBuilder; +import dev.isxander.yacl3.api.controller.TickBoxControllerBuilder; import net.minecraft.ChatFormatting; import net.minecraft.Util; import net.minecraft.client.Minecraft; diff --git a/src/main/java/dev/isxander/controlify/gui/screen/GlobalSettingsScreenFactory.java b/src/main/java/dev/isxander/controlify/gui/screen/GlobalSettingsScreenFactory.java index 2449326..200ec0d 100644 --- a/src/main/java/dev/isxander/controlify/gui/screen/GlobalSettingsScreenFactory.java +++ b/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.yacl.api.controller.BooleanControllerBuilder; -import dev.isxander.yacl.api.controller.EnumControllerBuilder; -import dev.isxander.yacl.api.controller.TickBoxControllerBuilder; +import dev.isxander.yacl3.api.*; +import dev.isxander.yacl3.api.controller.BooleanControllerBuilder; +import dev.isxander.yacl3.api.controller.EnumControllerBuilder; +import dev.isxander.yacl3.api.controller.TickBoxControllerBuilder; import net.minecraft.ChatFormatting; import net.minecraft.Util; import net.minecraft.client.gui.screens.Screen; diff --git a/src/main/java/dev/isxander/controlify/mixins/compat/yacl/CyclingControllerElementMixin.java b/src/main/java/dev/isxander/controlify/mixins/compat/yacl/CyclingControllerElementMixin.java index 9290811..5a89cf9 100644 --- a/src/main/java/dev/isxander/controlify/mixins/compat/yacl/CyclingControllerElementMixin.java +++ b/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; diff --git a/src/main/java/dev/isxander/controlify/mixins/compat/yacl/SliderControllerElementMixin.java b/src/main/java/dev/isxander/controlify/mixins/compat/yacl/SliderControllerElementMixin.java index 19c06fc..0a959f9 100644 --- a/src/main/java/dev/isxander/controlify/mixins/compat/yacl/SliderControllerElementMixin.java +++ b/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; diff --git a/src/main/java/dev/isxander/controlify/mixins/compat/yacl/YACLScreenCategoryTabAccessor.java b/src/main/java/dev/isxander/controlify/mixins/compat/yacl/YACLScreenCategoryTabAccessor.java index 367520f..fd144c2 100644 --- a/src/main/java/dev/isxander/controlify/mixins/compat/yacl/YACLScreenCategoryTabAccessor.java +++ b/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; diff --git a/src/main/java/dev/isxander/controlify/mixins/compat/yacl/YACLScreenCategoryTabMixin.java b/src/main/java/dev/isxander/controlify/mixins/compat/yacl/YACLScreenCategoryTabMixin.java index 442d5ed..3e25fe7 100644 --- a/src/main/java/dev/isxander/controlify/mixins/compat/yacl/YACLScreenCategoryTabMixin.java +++ b/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.yacl.gui.YACLScreen; +import dev.isxander.yacl3.api.ConfigCategory; +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; diff --git a/src/main/java/dev/isxander/controlify/mixins/compat/yacl/YACLScreenMixin.java b/src/main/java/dev/isxander/controlify/mixins/compat/yacl/YACLScreenMixin.java index ffbf101..c53f956 100644 --- a/src/main/java/dev/isxander/controlify/mixins/compat/yacl/YACLScreenMixin.java +++ b/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; diff --git a/src/main/java/dev/isxander/controlify/reacharound/ReachAroundMode.java b/src/main/java/dev/isxander/controlify/reacharound/ReachAroundMode.java index 156ac74..93142b5 100644 --- a/src/main/java/dev/isxander/controlify/reacharound/ReachAroundMode.java +++ b/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; diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 9383193..61118a9 100644 --- a/src/main/resources/fabric.mod.json +++ b/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": "*"