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

refactor binding api (sorry enjarai)

Browse Source
This commit is contained in:
isXander
2023-04-14 20:11:57 +01:00
parent 07b57d5637
commit abe6b27cef
16 changed files with 183 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/dev/isxander/controlify/mixins/feature/guide/screen/AbstractButtonMixin.java
View File

@ -3,6 +3,7 @@ package dev.isxander.controlify.mixins.feature.guide.screen;
import com.mojang.blaze3d.vertex.PoseStack;
import dev.isxander.controlify.Controlify;
import dev.isxander.controlify.InputMode;
import dev.isxander.controlify.api.bind.BindRenderer;
import dev.isxander.controlify.api.buttonguide.ButtonRenderPosition;
import dev.isxander.controlify.bindings.IBind;
import dev.isxander.controlify.gui.ButtonGuideRenderer;
@ -31,18 +32,18 @@ public abstract class AbstractButtonMixin extends AbstractWidgetMixin implements
private void renderButtonGuide(PoseStack matrices, Font renderer, int color, CallbackInfo ci) {
if (shouldRender()) {
switch (renderData.position()) {
case LEFT -> getBind().draw(matrices, getX() - getBind().drawSize().width() - 1, getY() + getHeight() / 2);
case RIGHT -> getBind().draw(matrices, getX() + getWidth() + 1, getY() + getHeight() / 2);
case LEFT -> getBind().render(matrices, getX() - getBind().size().width() - 1, getY() + getHeight() / 2);
case RIGHT -> getBind().render(matrices, getX() + getWidth() + 1, getY() + getHeight() / 2);
case TEXT -> {
Font font = Minecraft.getInstance().font;
int x;
if (font.width(getMessage()) > getWidth()) {
x = getX();
} else {
x = getX() + getWidth() / 2 - font.width(getMessage()) / 2 - getBind().drawSize().width();
x = getX() + getWidth() / 2 - font.width(getMessage()) / 2 - getBind().size().width();
}
getBind().draw(matrices, x, getY() + getHeight() / 2);
getBind().render(matrices, x, getY() + getHeight() / 2);
}
}
}
@ -52,7 +53,7 @@ public abstract class AbstractButtonMixin extends AbstractWidgetMixin implements
private void shiftXOffset(PoseStack matrices, Font renderer, int color, CallbackInfo ci) {
matrices.pushPose();
if (!shouldRender() || Minecraft.getInstance().font.width(getMessage()) > getWidth() || renderData.position() != ButtonRenderPosition.TEXT) return;
matrices.translate(getBind().drawSize().width() / 2f, 0, 0);
matrices.translate(getBind().size().width() / 2f, 0, 0);
}
@Inject(method = "renderString", at = @At("RETURN"))
@ -63,7 +64,7 @@ public abstract class AbstractButtonMixin extends AbstractWidgetMixin implements
@Override
protected int shiftDrawSize(int x) {
if (!shouldRender() || Minecraft.getInstance().font.width(getMessage()) < getWidth() || renderData.position() != ButtonRenderPosition.TEXT) return x;
return x + getBind().drawSize().width();
return x + getBind().size().width();
}
@Override
@ -76,11 +77,11 @@ public abstract class AbstractButtonMixin extends AbstractWidgetMixin implements
&& this.isActive()
&& Controlify.instance().currentInputMode() == InputMode.CONTROLLER
&& Controlify.instance().currentController().config().showScreenGuide
&& !renderData.binding().apply(Controlify.instance().currentController().bindings()).unbound()
&& !renderData.binding().apply(Controlify.instance().currentController().bindings()).isUnbound()
&& renderData.renderPredicate().shouldDisplay((AbstractButton) (Object) this);
}
private IBind<?> getBind() {
return renderData.binding().apply(Controlify.instance().currentController().bindings()).currentBind();
private BindRenderer getBind() {
return renderData.binding().apply(Controlify.instance().currentController().bindings()).renderer();
}
}

13
src/main/java/dev/isxander/controlify/mixins/feature/guide/screen/TabNavigationBarMixin.java
View File

@ -4,6 +4,7 @@ import com.google.common.collect.ImmutableList;
import com.mojang.blaze3d.vertex.PoseStack;
import dev.isxander.controlify.Controlify;
import dev.isxander.controlify.InputMode;
import dev.isxander.controlify.api.bind.BindRenderer;
import dev.isxander.controlify.bindings.IBind;
import dev.isxander.controlify.compatibility.ControlifyCompat;
import dev.isxander.controlify.controller.Controller;
@ -39,18 +40,18 @@ public class TabNavigationBarMixin {
TabButton firstTab = tabButtons.get(0);
TabButton lastTab = tabButtons.get(tabButtons.size() - 1);
IBind<?> prevBind = controller.bindings().GUI_PREV_TAB.currentBind();
DrawSize prevBindDrawSize = prevBind.drawSize();
BindRenderer prevBind = controller.bindings().GUI_PREV_TAB.renderer();
DrawSize prevBindDrawSize = prevBind.size();
int firstButtonX = Math.max(firstTab.getX() - 2 - prevBindDrawSize.width(), firstTab.getX() / 2 - prevBindDrawSize.width() / 2);
int firstButtonY = 12;
prevBind.draw(matrices, firstButtonX, firstButtonY);
prevBind.render(matrices, firstButtonX, firstButtonY);
IBind<?> nextBind = controller.bindings().GUI_NEXT_TAB.currentBind();
DrawSize nextBindDrawSize = nextBind.drawSize();
BindRenderer nextBind = controller.bindings().GUI_NEXT_TAB.renderer();
DrawSize nextBindDrawSize = nextBind.size();
int lastButtonEnd = lastTab.getX() + lastTab.getWidth();
int lastButtonX = Math.min(lastTab.getX() + lastTab.getWidth() + 2, lastButtonEnd + (width - lastButtonEnd) / 2 - nextBindDrawSize.width() / 2);
int lastButtonY = 12;
nextBind.draw(matrices, lastButtonX, lastButtonY);
nextBind.render(matrices, lastButtonX, lastButtonY);
ControlifyCompat.ifEndHudBatching();
}