Skip to content

Commit b9ec78d

Browse files
author
Circulate233
committed
微调了一下注入逻辑
1 parent 2718768 commit b9ec78d

2 files changed

Lines changed: 4 additions & 18 deletions

File tree

src/main/java/com/glodblock/github/FluidCraft.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import org.apache.logging.log4j.Logger;
1313

1414
@Mod(modid = FluidCraft.MODID, version = FluidCraft.VERSION, useMetadata = true,
15-
dependencies = "required-after:appliedenergistics2@[v0.56.5,);" +
15+
dependencies = "required-after:appliedenergistics2@[v0.56.7,);" +
1616
"required-after:mixinbooter@[8.0,);"
1717
)
1818
public class FluidCraft {

src/main/java/com/glodblock/github/coremod/mixin/ae2/gui/MixinAEBaseGui.java

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,28 +5,14 @@
55
import appeng.helpers.InventoryAction;
66
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
77
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
8-
import org.lwjgl.input.Mouse;
98
import org.spongepowered.asm.mixin.Mixin;
109
import org.spongepowered.asm.mixin.injection.At;
1110

1211
@Mixin(AEBaseGui.class)
1312
public class MixinAEBaseGui {
1413

15-
@WrapOperation(method = "handleMouseClick", at = @At(value = "NEW", target = "(Lappeng/helpers/InventoryAction;IJ)Lappeng/core/sync/packets/PacketInventoryAction;", ordinal = 0, remap = false))
16-
protected PacketInventoryAction handleMouseClick(final InventoryAction action, final int slot, final long id, final Operation<PacketInventoryAction> original) {
17-
long newid = Mouse.getEventButton();
18-
if (newid == -1) {
19-
newid = Mouse.isButtonDown(0) ? 0 : 1;
20-
}
21-
return original.call(action, slot, newid);
22-
}
23-
24-
@WrapOperation(method = "mouseClickMove", at = @At(value = "NEW", target = "(Lappeng/helpers/InventoryAction;IJ)Lappeng/core/sync/packets/PacketInventoryAction;", ordinal = 0, remap = false))
25-
protected PacketInventoryAction mouseClickMove(final InventoryAction action, final int slot, final long id, final Operation<PacketInventoryAction> original) {
26-
long newid = Mouse.getEventButton();
27-
if (newid == -1) {
28-
newid = Mouse.isButtonDown(0) ? 0 : 1;
29-
}
30-
return original.call(action, slot, newid);
14+
@WrapOperation(method = {"mouseClickMove", "handleMouseClick"}, at = @At(value = "NEW", target = "(Lappeng/helpers/InventoryAction;IJ)Lappeng/core/sync/packets/PacketInventoryAction;",ordinal = 0, remap = false))
15+
protected PacketInventoryAction writeMouseButton(final InventoryAction action, final int slot, final long id, final Operation<PacketInventoryAction> original) {
16+
return original.call(action, slot, action == InventoryAction.PICKUP_OR_SET_DOWN ? 0L : 1L);
3117
}
3218
}

0 commit comments

Comments
 (0)