Skip to content

Commit 7c12e26

Browse files
committed
补充修复
1 parent 971403a commit 7c12e26

File tree

4 files changed

+6
-19
lines changed

4 files changed

+6
-19
lines changed

src/main/java/com/circulation/random_complement/mixin/ae2/miss_craft/MixinCraftingTreeNode.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public class MixinCraftingTreeNode {
5454

5555
@Inject(method = "request", at = @At(value = "INVOKE", target = "Lappeng/crafting/CraftingJob;isSimulation()Z", shift = At.Shift.BEFORE), cancellable = true)
5656
public void request(MECraftingInventory inv, long l, IActionSource src, CallbackInfoReturnable<IAEItemStack> cir) {
57-
if (!isPlayer()) return;
57+
if (!canIgnoredInput()) return;
5858
if (canEmit) return;
5959
this.bytes = (int) ((long) this.bytes + l);
6060
if (this.parent != null && this.what.getItem().hasContainerItem(this.what.getDefinition())) {
@@ -72,7 +72,7 @@ public void request(MECraftingInventory inv, long l, IActionSource src, Callback
7272

7373
@WrapOperation(method = "setJob", at = @At(value = "FIELD", opcode = Opcodes.GETFIELD, target = "Lappeng/crafting/CraftingTreeNode;howManyEmitted:J"))
7474
public long setJobHowManyEmitted(CraftingTreeNode instance, Operation<Long> original) {
75-
if (!isPlayer()) return original.call(instance);
75+
if (!canIgnoredInput()) return original.call(instance);
7676
if (canEmit) return original.call(instance);
7777
if (this.parent == null && ((RCCraftingJob) job).isSpecialDeficiency())
7878
return original.call(instance);
@@ -83,7 +83,7 @@ public long setJobHowManyEmitted(CraftingTreeNode instance, Operation<Long> orig
8383

8484
@WrapOperation(method = "getPlan", at = @At(value = "FIELD", opcode = Opcodes.GETFIELD, target = "Lappeng/crafting/CraftingTreeNode;missing:J"))
8585
public long getPlanMissing(CraftingTreeNode instance, Operation<Long> original) {
86-
if (!isPlayer()) return original.call(instance);
86+
if (!canIgnoredInput()) return original.call(instance);
8787
if (canEmit) return original.call(instance);
8888
if (this.parent == null && ((RCCraftingJob) job).isSpecialDeficiency()) return howManyEmitted;
8989
if (this.what.equals(this.job.getOutput())) return original.call(instance);
@@ -92,7 +92,7 @@ public long getPlanMissing(CraftingTreeNode instance, Operation<Long> original)
9292

9393
@WrapOperation(method = "getPlan", at = @At(value = "FIELD", opcode = Opcodes.GETFIELD, target = "Lappeng/crafting/CraftingTreeNode;howManyEmitted:J"))
9494
public long getPlanHowManyEmitted(CraftingTreeNode instance, Operation<Long> original) {
95-
if (!isPlayer()) return original.call(instance);
95+
if (!canIgnoredInput()) return original.call(instance);
9696
if (canEmit) return original.call(instance);
9797
if (this.parent == null && ((RCCraftingJob) job).isSpecialDeficiency())
9898
return original.call(instance);
@@ -103,7 +103,7 @@ public long getPlanHowManyEmitted(CraftingTreeNode instance, Operation<Long> ori
103103

104104
@Inject(method = "notRecursive", at = @At("RETURN"), cancellable = true)
105105
public void notRecursive(ICraftingPatternDetails details, CallbackInfoReturnable<Boolean> cir) {
106-
if (!isPlayer()) return;
106+
if (!canIgnoredInput()) return;
107107
if (canEmit) return;
108108
if (cir.getReturnValueZ()) {
109109
for (var input : details.getCondensedInputs()) {
@@ -116,7 +116,7 @@ public void notRecursive(ICraftingPatternDetails details, CallbackInfoReturnable
116116
}
117117

118118
@Intrinsic
119-
private boolean isPlayer() {
119+
private boolean canIgnoredInput() {
120120
return ((RCCraftingJob) job).canIgnoredInput();
121121
}
122122
}

src/main/java/com/circulation/random_complement/mixin/rcLateMixinLoader.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ public class rcLateMixinLoader implements ILateMixinLoader {
4747

4848
if (isClassPresent("github.kasuminova.mmce.common.tile.MEPatternProvider")) {
4949
addMixinCFG("mixins.random_complement.mmce.json");
50-
addModdedMixinCFG("mixins.random_complement.mmce.mekeng.json", "mekeng");
5150
}
5251
}
5352
if (modLoaded("botania")) {

src/main/resources/mixins.random_complement.mmce.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
],
1212
"server": [],
1313
"client": [
14-
"MixinGuiMEItemInputBus",
1514
"MixinGuiMEPatternProvider"
1615
]
1716
}

src/main/resources/mixins.random_complement.mmce.mekeng.json

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)