upstream/AE2FluidCraft-Rework
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/AE2FluidCraft-Rework.git synced 2026-11-15 09:34:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix restock crash on out of range

Browse Source
This commit is contained in:
lordIcocain committed 2025-04-11 17:49:33 +03:00
1 parent f388bdaf78
commit 7190bf39f5
2 files changed
+26 -26
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/com/glodblock/github/common/item/ItemBaseWirelessTerminal.java
-3
View File
@@ -109,9 +109,6 @@ public class ItemBaseWirelessTerminal extends ToolWirelessTerminal implements II
if (hasEnergyCard(stack)) {
lines.add(" " + EnumChatFormatting.GOLD + getEnergyCard().getDisplayName());
}
if (hasEnergyCard(stack)) {
lines.add(" " + EnumChatFormatting.GOLD + getEnergyCard().getDisplayName());
}
} else {
lines.add(NameConst.i18n(NameConst.TT_CTRL_FOR_MORE));
}
src/main/java/com/glodblock/github/network/CPacketValueConfig.java
+26 -23
View File
@@ -56,13 +56,17 @@ public class CPacketValueConfig implements IMessage {
((ContainerFluidLevelEmitter) container).setLevel(message.amount, player);
} else if (container instanceof ContainerPlayer) {
ImmutablePair<Integer, ItemStack> result = Util.getUltraWirelessTerm(player);
if (result == null) return null;
if (message.valueIndex == 1) {
ItemBaseWirelessTerminal
.toggleRestockItemsMode(result.getRight(), !Util.isRestock(result.getRight()));
return null;
} else if (Util.isRestock(result.getRight())) {
restockItems(result.getRight(), result.getLeft(), player);
if (result != null) {
final ItemStack wirelessTerm = result.getRight();
IGridNode gridNode = Util.getWirelessGrid(wirelessTerm);
if (gridNode != null && Util.rangeCheck(wirelessTerm, player, gridNode)) {
if (message.valueIndex == 1) {
ItemBaseWirelessTerminal
.toggleRestockItemsMode(result.getRight(), !Util.isRestock(result.getRight()));
} else if (Util.isRestock(result.getRight())) {
restockItems(result.getRight(), gridNode, result.getLeft(), player);
}
}
}
}
}
@@ -70,30 +74,29 @@ public class CPacketValueConfig implements IMessage {
}
@SuppressWarnings("unchecked")
private void restockItems(ItemStack terminal, int slot, EntityPlayer player) {
IGridNode iGridNode = Util.getWirelessGrid(terminal);
if (iGridNode == null) return;
private void restockItems(ItemStack terminal, IGridNode gridNode, int slot, EntityPlayer player) {
WirelessCraftingTerminalInventory inv = new WirelessCraftingTerminalInventory(
terminal,
slot,
iGridNode,
gridNode,
player);
for (int i = 0; i < 9; i++) {
ItemStack is = player.inventory.mainInventory[i];
if (is == null) continue;
int maxSize = is.getMaxStackSize();
if (is.stackSize == maxSize) continue;
if (is != null) {
int maxSize = is.getMaxStackSize();
if (is.stackSize < maxSize) {
int fillSize = maxSize - is.stackSize;
IAEItemStack ias = AEApi.instance().storage().createItemStack(is);
ias.setStackSize(fillSize);
int fillSize = maxSize - is.stackSize;
IAEItemStack ias = AEApi.instance().storage().createItemStack(is);
ias.setStackSize(fillSize);
IAEItemStack extractedItem = (IAEItemStack) inv
.extractItems(ias, Actionable.MODULATE, inv.getActionSource());
if (extractedItem == null) continue;
player.inventory.addItemStackToInventory(extractedItem.getItemStack());
IAEItemStack extractedItem = (IAEItemStack) inv
.extractItems(ias, Actionable.MODULATE, inv.getActionSource());
if (extractedItem != null) {
player.inventory.addItemStackToInventory(extractedItem.getItemStack());
}
}
}
}
}
}