Skip to content

Commit 6bbc5a8

Browse files
committed
修复一些bug
1 parent 33d11db commit 6bbc5a8

File tree

3 files changed

+11
-25
lines changed

3 files changed

+11
-25
lines changed

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ show_testing_output = false
1616

1717
# Mod Information
1818
# HIGHLY RECOMMEND complying with SemVer for mod_version: https://semver.org/
19-
mod_version = 1.7.5
19+
mod_version = 1.7.6
2020
root_package = com.circulation
2121
mod_id = random_complement
2222
mod_name = RandomComplement

src/main/java/com/circulation/random_complement/mixin/ae2/new_patten_gui/MixinGuiMEMonitorableTwo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public MixinGuiMEMonitorableTwo(Container container) {
4646
}
4747

4848
@Unique
49-
protected void r$addScrollBars(){
49+
protected void r$addScrollBars() {
5050

5151
}
5252

src/main/java/com/circulation/random_complement/mixin/ae2/new_patten_gui/MixinGuiPatternTerm.java

Lines changed: 9 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
11
package com.circulation.random_complement.mixin.ae2.new_patten_gui;
22

3-
import appeng.api.storage.ITerminalHost;
43
import appeng.client.gui.implementations.GuiPatternTerm;
54
import appeng.container.implementations.ContainerPatternEncoder;
6-
import appeng.container.implementations.ContainerWirelessPatternTerminal;
75
import appeng.container.slot.SlotFake;
8-
import appeng.helpers.WirelessTerminalGuiObject;
96
import com.circulation.random_complement.client.RCGuiScrollbar;
107
import com.circulation.random_complement.client.RCScrollbarGui;
118
import com.circulation.random_complement.common.interfaces.RCPatternEncoder;
129
import net.minecraft.client.renderer.GlStateManager;
13-
import net.minecraft.entity.player.InventoryPlayer;
1410
import net.minecraft.inventory.Container;
1511
import org.spongepowered.asm.mixin.Final;
1612
import org.spongepowered.asm.mixin.Intrinsic;
@@ -25,7 +21,7 @@
2521
public abstract class MixinGuiPatternTerm extends MixinGuiMEMonitorableTwo implements RCScrollbarGui {
2622

2723
@Unique
28-
private final RCGuiScrollbar r$scrollbar = new RCGuiScrollbar();
24+
private RCGuiScrollbar r$scrollbar;
2925
@Shadow(remap = false)
3026
@Final
3127
private ContainerPatternEncoder container;
@@ -43,24 +39,9 @@ public MixinGuiPatternTerm(Container container) {
4339
return this.container;
4440
}
4541

46-
@Inject(method = "<init>(Lnet/minecraft/entity/player/InventoryPlayer;Lappeng/api/storage/ITerminalHost;)V", at = @At("TAIL"))
47-
public void onInit(InventoryPlayer inventoryPlayer, ITerminalHost te, CallbackInfo ci) {
48-
r$getScrollBars().add(r$scrollbar);
49-
r$scrollbar.setRcScrollbarGui(this);
50-
r$scrollbar.setDrawBG(() -> {
51-
GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
52-
this.drawTexturedModalRect(r$slotLeft - 13 + guiLeft - 2, r$slotTop + guiTop - 1, 174, 17, 14, 3 * 18);
53-
});
54-
}
55-
56-
@Inject(method = "<init>(Lnet/minecraft/entity/player/InventoryPlayer;Lappeng/helpers/WirelessTerminalGuiObject;Lappeng/container/implementations/ContainerWirelessPatternTerminal;)V", at = @At("TAIL"))
57-
public void onInit(InventoryPlayer inventoryPlayer, WirelessTerminalGuiObject te, ContainerWirelessPatternTerminal wpt, CallbackInfo ci) {
58-
r$getScrollBars().add(r$scrollbar);
59-
r$scrollbar.setRcScrollbarGui(this);
60-
r$scrollbar.setDrawBG(() -> {
61-
GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
62-
this.drawTexturedModalRect(r$slotLeft - 13 + guiLeft - 2, r$slotTop + guiTop - 1, 174, 17, 14, 3 * 18);
63-
});
42+
@Override
43+
protected void r$addScrollBars(){
44+
r$getScrollBars().add(r$scrollbar = new RCGuiScrollbar());
6445
}
6546

6647
@Intrinsic
@@ -79,6 +60,11 @@ public void onInitGui(CallbackInfo ci) {
7960
r$scrollbar.setWidthEx(175);
8061
r$scrollbar.setTop(r$slotTop).setLeft(r$slotLeft - 14).setHeight(3 * 18 - 2).setWidth(12);
8162
r$scrollbar.setRange(0, 9, 1);
63+
r$scrollbar.setRcScrollbarGui(this);
64+
r$scrollbar.setDrawBG(() -> {
65+
GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
66+
this.drawTexturedModalRect(r$slotLeft - 13 + guiLeft - 2, r$slotTop + guiTop - 1, 174, 17, 14, 3 * 18);
67+
});
8268
((RCPatternEncoder) container).setRCSlot(r$scrollbar.getCurrentScroll());
8369
}
8470

0 commit comments

Comments
 (0)