djib/Controlify
1
0
Fork 0
forked from Clones/Controlify
Code Pull Requests Activity

🐘 Bump YACL to beta 7

Browse Source
This commit is contained in:
isXander
2023-06-05 22:34:13 +01:00
parent 6f75006605
commit 0b5767e547
20 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/dev/isxander/controlify/api/bind/ControllerBinding.java
View File

@ -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;

4
src/main/java/dev/isxander/controlify/bindings/ControllerBindingImpl.java
View File

@ -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;

2
src/main/java/dev/isxander/controlify/compatibility/yacl/CyclingControllerElementComponentProcessor.java
View File

@ -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;

2
src/main/java/dev/isxander/controlify/compatibility/yacl/SliderControllerElementComponentProcessor.java
View File

@ -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;

2
src/main/java/dev/isxander/controlify/compatibility/yacl/YACLScreenProcessor.java
View File

@ -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) {

2
src/main/java/dev/isxander/controlify/controller/gamepad/BuiltinGamepadTheme.java
View File

@ -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;

2
src/main/java/dev/isxander/controlify/controller/joystick/JoystickState.java
View File

@ -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;

10
src/main/java/dev/isxander/controlify/gui/controllers/AbstractBindController.java
View File

@ -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;

6
src/main/java/dev/isxander/controlify/gui/controllers/GamepadBindController.java
View File

@ -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;

6
src/main/java/dev/isxander/controlify/gui/controllers/JoystickBindController.java
View File

@ -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;

10
src/main/java/dev/isxander/controlify/gui/screen/ControllerConfigScreenFactory.java
View File

@ -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;

8
src/main/java/dev/isxander/controlify/gui/screen/GlobalSettingsScreenFactory.java
View File

@ -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;

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

@ -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;

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

@ -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;

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

@ -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;

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

@ -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;

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

@ -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;

2
src/main/java/dev/isxander/controlify/reacharound/ReachAroundMode.java
View File

@ -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;

2
src/main/resources/fabric.mod.json
View File

@ -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": "*"