Skip to content

Commit 50be687

Browse files
committed
删除部分AE2fc的内容实现,他们将被包含在一个fork里
1 parent 920e278 commit 50be687

21 files changed

+18
-521
lines changed

src/main/java/com/circulation/random_complement/RandomComplement.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
@Mod(modid = "random_complement", name = Tags.MOD_NAME, version = Tags.VERSION,
1515
dependencies = "required-after:mixinbooter@[8.0,);" +
16+
"after:ae2fc@[2.7.0,);" +
1617
"after:appliedenergistics2@[v0.56.7,);" +
1718
"after:jei@[4.29.8,);" +
1819
"after:jeiutilities@[0.2.13,);" +

src/main/java/com/circulation/random_complement/mixin/ae2/MixinDualityInterface.java

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

3-
import appeng.api.config.Actionable;
3+
import appeng.api.AEApi;
44
import appeng.api.config.Settings;
55
import appeng.api.config.Upgrades;
66
import appeng.api.config.YesNo;
77
import appeng.api.networking.crafting.ICraftingPatternDetails;
88
import appeng.api.networking.security.IActionSource;
99
import appeng.api.storage.IMEInventory;
10+
import appeng.api.storage.channels.IItemStorageChannel;
1011
import appeng.api.storage.data.IAEItemStack;
1112
import appeng.helpers.DualityInterface;
1213
import appeng.helpers.IInterfaceHost;
1314
import appeng.helpers.MultiCraftingTracker;
15+
import appeng.me.GridAccessException;
16+
import appeng.me.helpers.AENetworkProxy;
1417
import appeng.parts.automation.UpgradeInventory;
1518
import appeng.util.ConfigManager;
1619
import com.circulation.random_complement.client.RCSettings;
@@ -61,6 +64,10 @@ public abstract class MixinDualityInterface implements RCIConfigurableObject, RC
6164
@Final
6265
private IActionSource mySource;
6366

67+
@Shadow
68+
@Final
69+
private AENetworkProxy gridProxy;
70+
6471
@Inject(method = "<init>", at = @At("TAIL"))
6572
public void onInit(CallbackInfo ci) {
6673
this.randomComplement$rcSettings = new RCConfigManager(this);
@@ -117,7 +124,8 @@ public boolean intelligentBlocking(DualityInterface instance, Operation<Boolean>
117124
}
118125

119126
@WrapOperation(method = "usePlan", at = @At(value = "INVOKE", target = "Lappeng/helpers/MultiCraftingTracker;isBusy(I)Z"))
120-
private boolean usePlan(MultiCraftingTracker instance, int slot, Operation<Boolean> original, @Local(name = "itemStack") IAEItemStack itemStack) {
121-
return original.call(instance, slot) && (itemStack.getStackSize() > 0 && destination.extractItems(itemStack, Actionable.SIMULATE, mySource) == null);
127+
private boolean usePlan(MultiCraftingTracker instance, int slot, Operation<Boolean> original, @Local(name = "itemStack") IAEItemStack itemStack) throws GridAccessException {
128+
IAEItemStack s;
129+
return original.call(instance, slot) && (itemStack.getStackSize() > 0 && ((s = this.gridProxy.getStorage().getInventory(AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class)).getStorageList().findPrecise(itemStack)) == null || s.getStackSize() == 0));
122130
}
123131
}

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
import com.circulation.random_complement.common.network.ContainerRollBACK;
1515
import com.circulation.random_complement.common.util.AEBookmarkGroup;
1616
import com.google.common.base.Joiner;
17+
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
18+
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
1719
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
1820
import mezz.jei.Internal;
1921
import mezz.jei.bookmarks.BookmarkGroup;
@@ -33,7 +35,6 @@
3335
import org.spongepowered.asm.mixin.Unique;
3436
import org.spongepowered.asm.mixin.injection.At;
3537
import org.spongepowered.asm.mixin.injection.Inject;
36-
import org.spongepowered.asm.mixin.injection.Redirect;
3738
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
3839

3940
import java.util.List;
@@ -136,13 +137,13 @@ public void onActionPerformed1(GuiButton btn, CallbackInfo ci) {
136137
bookmarkList.add(group);
137138
}
138139

139-
@Redirect(method = "drawFG", at = @At(value = "INVOKE", target = "Lappeng/util/Platform;getItemDisplayName(Ljava/lang/Object;)Ljava/lang/String;"), remap = false)
140-
public String addItemInformation(Object n) {
140+
@WrapOperation(method = "drawFG", at = @At(value = "INVOKE", target = "Lappeng/util/Platform;getItemDisplayName(Ljava/lang/Object;)Ljava/lang/String;"), remap = false)
141+
public String addItemInformation(Object n, Operation<String> original) {
141142
String out;
142143
if (!(out = randomComplement$getItemInformation(n)).isEmpty()) {
143-
return randomComplement$getItemDisplayName(n) + out;
144+
return original.call(n) + out;
144145
} else {
145-
return randomComplement$getItemDisplayName(n);
146+
return original.call(n);
146147
}
147148
}
148149

src/main/java/com/circulation/random_complement/mixin/ae2fc/MixinAllGuiFactory.java

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

src/main/java/com/circulation/random_complement/mixin/ae2fc/MixinCPacketLoadPattern.java

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

src/main/java/com/circulation/random_complement/mixin/ae2fc/MixinItemOrPartGuiFactory.java

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

src/main/java/com/circulation/random_complement/mixin/ae2fc/container/MixinContainerExtendedFluidPatternTerminal.java

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

src/main/java/com/circulation/random_complement/mixin/ae2fc/container/MixinContainerFluidPatternTerminal.java

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

src/main/java/com/circulation/random_complement/mixin/ae2fc/container/MixinContainerUltimateEncoder.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import appeng.container.slot.SlotRestrictedInput;
1212
import appeng.core.AELog;
1313
import appeng.core.sync.network.NetworkHandler;
14-
import appeng.helpers.InventoryAction;
1514
import appeng.helpers.WirelessTerminalGuiObject;
1615
import appeng.util.Platform;
1716
import appeng.util.item.AEItemStack;
@@ -185,12 +184,4 @@ public void encode(CallbackInfo ci) {
185184
}
186185
}
187186

188-
@Inject(method = "doAction", at = @At("HEAD"), cancellable = true)
189-
public void doAction(EntityPlayerMP player, InventoryAction action, int slotId, long id, CallbackInfo ci) {
190-
if (id != 0) {
191-
super.doAction(player, action, slotId, 0);
192-
ci.cancel();
193-
}
194-
}
195-
196187
}

src/main/java/com/circulation/random_complement/mixin/ae2fc/container/MixinContainerWirelessFluidPatternTerminal.java

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

0 commit comments

Comments
 (0)