Skip to content

Commit 920e278

Browse files
committed
修复问题
1 parent 0d40ec2 commit 920e278

File tree

2 files changed

+11
-8
lines changed

2 files changed

+11
-8
lines changed

src/main/java/com/circulation/random_complement/common/network/RCActionButton.java

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import lombok.val;
1414
import net.minecraft.nbt.NBTBase;
1515
import net.minecraft.nbt.NBTTagCompound;
16+
import net.minecraftforge.common.util.Constants;
1617
import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
1718
import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
1819
import org.spongepowered.asm.mixin.Unique;
@@ -62,17 +63,17 @@ public IMessage onMessage(RCActionButton message, MessageContext ctx) {
6263
&& pattern.hasTagCompound()
6364
&& !(pNbt = pattern.getTagCompound()).getBoolean("crafting")
6465
) {
65-
val in = pNbt.getTagList("in", 10);
66+
val in = pNbt.getTagList("in", Constants.NBT.TAG_COMPOUND);
6667
boolean success = true;
6768
List<NBTBase> list = new ObjectArrayList<>(in.tagList);
68-
list.addAll(pNbt.getTagList("out", 10).tagList);
69+
list.addAll(pNbt.getTagList("out", Constants.NBT.TAG_COMPOUND).tagList);
6970
if (pNbt.hasKey("Inputs")) {
70-
list.addAll(pNbt.getTagList("Inputs", 10).tagList);
71-
list.addAll(pNbt.getTagList("Outputs", 10).tagList);
71+
list.addAll(pNbt.getTagList("Inputs", Constants.NBT.TAG_COMPOUND).tagList);
72+
list.addAll(pNbt.getTagList("Outputs", Constants.NBT.TAG_COMPOUND).tagList);
7273
}
7374
for (NBTBase item : list) {
7475
if (!(item instanceof NBTTagCompound nbt) || !nbt.hasKey("Count")) continue;
75-
int oldSize = nbt.getInteger("Count");
76+
int oldSize = nbt.hasKey("stackSize") ? nbt.getInteger("stackSize") : nbt.getInteger("Count");
7677
if (!r$correctQuantity(oldSize, action)) {
7778
success = false;
7879
break;
@@ -89,6 +90,8 @@ public IMessage onMessage(RCActionButton message, MessageContext ctx) {
8990
if (success)
9091
nbt.setInteger("Cnt", r$quantityProcessing(oldSize, action));
9192
}
93+
if (newSize > 127) nbt.setInteger("stackSize", newSize);
94+
else nbt.removeTag("stackSize");
9295
}
9396
}
9497
if (success) {

src/main/java/com/circulation/random_complement/mixin/threng/MixinTileLevelMaintainer.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import appeng.me.GridAccessException;
1919
import appeng.util.item.AEItemStack;
2020
import com.circulation.random_complement.common.interfaces.AEIgnoredInputMachine;
21+
import com.circulation.random_complement.common.util.MEHandler;
2122
import com.glodblock.github.common.item.fake.FakeFluids;
2223
import com.glodblock.github.common.item.fake.FakeItemRegister;
2324
import com.glodblock.github.integration.mek.FakeGases;
@@ -32,7 +33,6 @@
3233
import mekanism.api.gas.GasStack;
3334
import net.minecraft.item.ItemStack;
3435
import net.minecraftforge.fluids.FluidStack;
35-
import net.minecraftforge.fml.common.Loader;
3636
import net.minecraftforge.fml.common.Optional;
3737
import org.spongepowered.asm.mixin.Final;
3838
import org.spongepowered.asm.mixin.Mixin;
@@ -136,7 +136,7 @@ public IAEItemStack injectCraftedItems(ICraftingLink link, IAEItemStack stack, A
136136
IEnergyGrid energyGrid = grid.getCache(IEnergyGrid.class);
137137
IStorageGrid gridCache = grid.getCache(IStorageGrid.class);
138138
IMEMonitor<IAEItemStack> storageGrid = gridCache.getInventory(AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class));
139-
if (Loader.isModLoaded("ae2fc")) {
139+
if (MEHandler.loadAE2FC) {
140140
return ae2fc$work(grid, mode, gridCache, stack);
141141
} else {
142142
return storageGrid.injectItems(stack, mode, this.actionSource);
@@ -170,7 +170,7 @@ public IAEItemStack injectCraftedItems(ICraftingLink link, IAEItemStack stack, A
170170
}
171171

172172
return FakeFluids.packFluid2AEDrops(remaining);
173-
} else if (Loader.isModLoaded("mekeng") && FakeGases.isGasFakeItem(stack.getDefinition())) {
173+
} else if (MEHandler.loadMEKEng && FakeGases.isGasFakeItem(stack.getDefinition())) {
174174
return mekeng$work(mode, gridCache, stack);
175175
} else {
176176
IEnergyGrid energyGrid = grid.getCache(IEnergyGrid.class);

0 commit comments

Comments
 (0)