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

🤝 Re-add compatibility with YACL

Browse Source
This commit is contained in:
isXander
2023-05-30 14:22:24 +01:00
parent fce4dc37ec
commit 5639436197
5 changed files with 42 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

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

@ -1,9 +1,7 @@
package dev.isxander.controlify.compatibility.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.controlify.controller.Controller;
import dev.isxander.controlify.mixins.compat.yacl.YACLScreenCategoryTabAccessor;
import dev.isxander.controlify.screenop.ScreenProcessor;
import dev.isxander.yacl.gui.YACLScreen;
@ -15,9 +13,10 @@ public class YACLScreenProcessor extends ScreenProcessor<YACLScreen> {
@Override
protected void handleButtons(Controller<?, ?> controller) {
if (controller.bindings().GUI_ABSTRACT_ACTION_1.justPressed()) {
if (screen.tabManager.getCurrentTab() instanceof YACLScreen.CategoryTab categoryTab) {
((YACLScreenCategoryTabAccessor) categoryTab).getSaveFinishedButton().onPress();
}
playClackSound();
// if (screen.tabManager.getCurrentTab() instanceof )
// screen.finishedSaveButton.onPress();
}
super.handleButtons(controller);

12
src/main/java/dev/isxander/controlify/mixins/compat/yacl/YACLScreenCategoryTabAccessor.java Normal file
View File

@ -0,0 +1,12 @@
package dev.isxander.controlify.mixins.compat.yacl;
import dev.isxander.yacl.gui.YACLScreen;
import net.minecraft.client.gui.components.Button;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;
@Mixin(YACLScreen.CategoryTab.class)
public interface YACLScreenCategoryTabAccessor {
@Accessor
Button getSaveFinishedButton();
}

24
src/main/java/dev/isxander/controlify/mixins/compat/yacl/YACLScreenCategoryTabMixin.java Normal file
View File

@ -0,0 +1,24 @@
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 net.minecraft.client.gui.components.Button;
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@Mixin(YACLScreen.CategoryTab.class)
public class YACLScreenCategoryTabMixin {
@Shadow @Final private Button saveFinishedButton;
@Inject(method = "<init>", at = @At("RETURN"))
private void onConstructCategory(YACLScreen this$0, ConfigCategory category, CallbackInfo ci) {
ButtonGuideApi.addGuideToButton(saveFinishedButton, bindings -> bindings.GUI_ABSTRACT_ACTION_1, ButtonRenderPosition.TEXT, ButtonGuidePredicate.ALWAYS);
}
}

2
src/main/resources/controlify.mixins.json
View File

@ -24,6 +24,8 @@
"compat.sodium.SodiumOptionsGUIMixin",
"compat.yacl.CyclingControllerElementMixin",
"compat.yacl.SliderControllerElementMixin",
"compat.yacl.YACLScreenCategoryTabAccessor",
"compat.yacl.YACLScreenCategoryTabMixin",
"compat.yacl.YACLScreenMixin",
"core.ClientPacketListenerMixin",
"core.GuiMixin",