Skip to content

Commit 42bef5d

Browse files
committed
Fix #22
1 parent 1d6d050 commit 42bef5d

File tree

3 files changed

+5
-9
lines changed

3 files changed

+5
-9
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,25 +15,25 @@
1515
import java.util.concurrent.ExecutionException;
1616
import java.util.concurrent.Future;
1717

18-
@Mixin(value = ContainerCraftConfirm.class, remap = false)
18+
@Mixin(ContainerCraftConfirm.class)
1919
public abstract class MixinContainerCraftConfirm implements RCAEBaseContainer {
2020

2121
@Unique
2222
private boolean r$isPlayer = false;
2323

24-
@WrapOperation(method = "detectAndSendChanges", at = @At(value = "INVOKE", target = "Lappeng/api/networking/crafting/ICraftingJob;isSimulation()Z", ordinal = 1))
24+
@WrapOperation(method = "detectAndSendChanges", at = @At(value = "INVOKE", target = "Lappeng/api/networking/crafting/ICraftingJob;isSimulation()Z", ordinal = 1, remap = false))
2525
public boolean isSimulation1(ICraftingJob instance, Operation<Boolean> original) {
2626
if (!r$isPlayer) return original.call(instance);
2727
return true;
2828
}
2929

30-
@WrapOperation(method = "detectAndSendChanges", at = @At(value = "INVOKE", target = "Lappeng/api/networking/crafting/ICraftingJob;isSimulation()Z", ordinal = 2))
30+
@WrapOperation(method = "detectAndSendChanges", at = @At(value = "INVOKE", target = "Lappeng/api/networking/crafting/ICraftingJob;isSimulation()Z", ordinal = 2, remap = false))
3131
public boolean isSimulation2(ICraftingJob instance, Operation<Boolean> original) {
3232
if (!r$isPlayer) return original.call(instance);
3333
return true;
3434
}
3535

36-
@Inject(method = "setJob",at = @At("HEAD"))
36+
@Inject(method = "setJob", at = @At("HEAD"), remap = false)
3737
public void setJob(Future<ICraftingJob> job, CallbackInfo ci) {
3838
if (job == null) return;
3939
try {

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424

2525
import java.util.ArrayList;
2626

27-
//TODO:允许开关而不是总是开启
2827
@Mixin(value = CraftingTreeNode.class, remap = false)
2928
public class MixinCraftingTreeNode {
3029

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,9 @@ public abstract class MixinGuiCraftConfirm {
2929
@Final
3030
private ContainerCraftConfirm ccc;
3131

32-
@Shadow
33-
protected abstract boolean isSimulation();
34-
3532
@Inject(method = "postUpdate", at = @At("TAIL"))
3633
public void postUpdate(List<IAEItemStack> list, byte ref, CallbackInfo ci) {
37-
if (ref == 2 && !this.isSimulation() && !this.missing.isEmpty() && !this.ccc.noCPU) {
34+
if (ref == 2 && !this.missing.isEmpty() && !this.ccc.noCPU) {
3835
this.start.x -= 20;
3936
this.start.width += 20;
4037
this.start.displayString = I18n.format("gui.rc.miss_craft.text");

0 commit comments

Comments
 (0)