R3944Realms/ExtendedAE_Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整provider&interface按钮位置

Browse Source
This commit is contained in:
GaLi 2025-12-05 13:55:35 +08:00
parent cc17db6917
commit 6dbbb53d9f
2 changed files with 1 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/extendedae_plus/mixin/ae2/client/gui/InterfaceScreenMixin.java
View File

@ -230,7 +230,7 @@ public abstract class InterfaceScreenMixin<T extends AEBaseMenu> {
int topPos = ((AbstractContainerScreenAccessor<?>) (Object) this).eap$getTopPos(); int topPos = ((AbstractContainerScreenAccessor<?>) (Object) this).eap$getTopPos();
int imageWidth = ((AbstractContainerScreenAccessor<?>) (Object) this).eap$getImageWidth(); int imageWidth = ((AbstractContainerScreenAccessor<?>) (Object) this).eap$getImageWidth();
int bx = leftPos - this.eap$divideBy2Button.getWidth() - 1; int bx = leftPos - this.eap$divideBy2Button.getWidth() - 1;
int by = topPos + 30; int by = topPos + 50;
int spacing = 22; int spacing = 22;
if (this.eap$divideBy2Button != null) { if (this.eap$divideBy2Button != null) {
this.eap$divideBy2Button.setX(bx); this.eap$divideBy2Button.setX(bx);

44
src/main/java/com/extendedae_plus/mixin/extendedae/client/gui/GuiExPatternProviderMixin.java
View File

@ -54,8 +54,6 @@ public abstract class GuiExPatternProviderMixin extends PatternProviderScreen<Co
private ActionEPPButton divideBy2Button; private ActionEPPButton divideBy2Button;
private ActionEPPButton x5Button; private ActionEPPButton x5Button;
private ActionEPPButton divideBy5Button; private ActionEPPButton divideBy5Button;
private ActionEPPButton x10Button;
private ActionEPPButton divideBy10Button;
public GuiExPatternProviderMixin(ContainerExPatternProvider menu, Inventory playerInventory, Component title, ScreenStyle style) { public GuiExPatternProviderMixin(ContainerExPatternProvider menu, Inventory playerInventory, Component title, ScreenStyle style) {
super(menu, playerInventory, title, style); super(menu, playerInventory, title, style);
} }
@ -210,18 +208,6 @@ public abstract class GuiExPatternProviderMixin extends PatternProviderScreen<Co
}, NewIcon.DIVIDE2); }, NewIcon.DIVIDE2);
this.divideBy2Button.setVisibility(true); this.divideBy2Button.setVisibility(true);
this.x10Button = new ActionEPPButton((b) -> {
var conn = Minecraft.getInstance().getConnection();
if (conn != null) conn.send(new ScalePatternsC2SPacket(ScalePatternsC2SPacket.Operation.MUL10));
}, NewIcon.MULTIPLY10);
this.x10Button.setVisibility(true);
this.divideBy10Button = new ActionEPPButton((b) -> {
var conn = Minecraft.getInstance().getConnection();
if (conn != null) conn.send(new ScalePatternsC2SPacket(ScalePatternsC2SPacket.Operation.DIV10));
}, NewIcon.DIVIDE10);
this.divideBy10Button.setVisibility(true);
this.divideBy5Button = new ActionEPPButton((b) -> { this.divideBy5Button = new ActionEPPButton((b) -> {
var conn = Minecraft.getInstance().getConnection(); var conn = Minecraft.getInstance().getConnection();
if (conn != null) conn.send(new ScalePatternsC2SPacket(ScalePatternsC2SPacket.Operation.DIV5)); if (conn != null) conn.send(new ScalePatternsC2SPacket(ScalePatternsC2SPacket.Operation.DIV5));
@ -239,8 +225,6 @@ public abstract class GuiExPatternProviderMixin extends PatternProviderScreen<Co
this.addRenderableWidget(this.x2Button); this.addRenderableWidget(this.x2Button);
this.addRenderableWidget(this.divideBy5Button); this.addRenderableWidget(this.divideBy5Button);
this.addRenderableWidget(this.x5Button); this.addRenderableWidget(this.x5Button);
this.addRenderableWidget(this.divideBy10Button);
this.addRenderableWidget(this.x10Button);
} }
@Override @Override
@ -265,12 +249,6 @@ public abstract class GuiExPatternProviderMixin extends PatternProviderScreen<Co
if (this.divideBy2Button != null) { if (this.divideBy2Button != null) {
this.divideBy2Button.setVisibility(true); this.divideBy2Button.setVisibility(true);
} }
if (this.x10Button != null) {
this.x10Button.setVisibility(true);
}
if (this.divideBy10Button != null) {
this.divideBy10Button.setVisibility(true);
}
if (this.divideBy5Button != null) { if (this.divideBy5Button != null) {
this.divideBy5Button.setVisibility(true); this.divideBy5Button.setVisibility(true);
} }
@ -293,12 +271,6 @@ public abstract class GuiExPatternProviderMixin extends PatternProviderScreen<Co
if (this.x5Button != null && !this.renderables.contains(this.x5Button)) { if (this.x5Button != null && !this.renderables.contains(this.x5Button)) {
this.addRenderableWidget(this.x5Button); this.addRenderableWidget(this.x5Button);
} }
if (this.divideBy10Button != null && !this.renderables.contains(this.divideBy10Button)) {
this.addRenderableWidget(this.divideBy10Button);
}
if (this.x10Button != null && !this.renderables.contains(this.x10Button)) {
this.addRenderableWidget(this.x10Button);
}
} catch (Throwable ignored) {} } catch (Throwable ignored) {}
// 如果屏幕尺寸发生变化（窗口/GUI缩放），重新注册右侧外列的自定义按钮，翻页按钮由左侧工具栏托管 // 如果屏幕尺寸发生变化（窗口/GUI缩放），重新注册右侧外列的自定义按钮，翻页按钮由左侧工具栏托管
@ -322,14 +294,6 @@ public abstract class GuiExPatternProviderMixin extends PatternProviderScreen<Co
this.removeWidget(this.x5Button); this.removeWidget(this.x5Button);
this.addRenderableWidget(this.x5Button); this.addRenderableWidget(this.x5Button);
} }
if (this.divideBy10Button != null) {
this.removeWidget(this.divideBy10Button);
this.addRenderableWidget(this.divideBy10Button);
}
if (this.x10Button != null) {
this.removeWidget(this.x10Button);
this.addRenderableWidget(this.x10Button);
}
} catch (Throwable ignored) {} } catch (Throwable ignored) {}
} }
@ -354,14 +318,6 @@ public abstract class GuiExPatternProviderMixin extends PatternProviderScreen<Co
this.x5Button.setX(bx); this.x5Button.setX(bx);
this.x5Button.setY(by + spacing * 3); this.x5Button.setY(by + spacing * 3);
} }
if (this.divideBy10Button != null) {
this.divideBy10Button.setX(bx);
this.divideBy10Button.setY(by + spacing * 4);
}
if (this.x10Button != null) {
this.x10Button.setX(bx);
this.x10Button.setY(by + spacing * 5);
}
// 每帧确保当前页槽位处于启用状态，非当前页禁用 // 每帧确保当前页槽位处于启用状态，非当前页禁用
this.eap$updatePageSlotActivity(); this.eap$updatePageSlotActivity();