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

restock cleanup

Browse Source
This commit is contained in:
lordIcocain committed 2025-04-11 19:16:32 +03:00
1 parent 7190bf39f5
commit b9cd36f3cc
5 files changed
+23 -18
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/com/glodblock/github/inventory/item/WirelessMagnetCardFilterInventory.java
+1 -1
View File
@@ -38,7 +38,7 @@ public class WirelessMagnetCardFilterInventory extends BaseWirelessInventory imp
private boolean ignoreMeta;
private boolean useOre;
private boolean useOreDict;
private String oreDictFilter;
private String oreDictFilter = "";
protected Predicate<IAEItemStack> filterPredicate = null;
private WirelessMagnet.ListMode listMode = WirelessMagnet.ListMode.WhiteList;
private final AppEngInternalInventory filterInventory;
src/main/java/com/glodblock/github/loader/KeybindLoader.java
-8
View File
@@ -4,7 +4,6 @@ import net.minecraft.client.Minecraft;
import net.minecraft.client.entity.EntityClientPlayerMP;
import net.minecraft.client.settings.KeyBinding;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ChatComponentText;
import org.apache.commons.lang3.tuple.ImmutablePair;
import org.lwjgl.input.Keyboard;
@@ -12,7 +11,6 @@ import org.lwjgl.input.Keyboard;
import com.glodblock.github.FluidCraft;
import com.glodblock.github.common.item.ItemWirelessUltraTerminal;
import com.glodblock.github.network.CPacketValueConfig;
import com.glodblock.github.util.NameConst;
import com.glodblock.github.util.Util;
import cpw.mods.fml.client.registry.ClientRegistry;
@@ -81,13 +79,7 @@ public class KeybindLoader implements Runnable {
ImmutablePair<Integer, ItemStack> term = Util.getUltraWirelessTerm(p);
if (term != null) {
p.addChatMessage(
new ChatComponentText(
NameConst.i18n(
!Util.isRestock(term.getRight()) ? NameConst.TT_ULTRA_TERMINAL_RESTOCK_ON
: NameConst.TT_ULTRA_TERMINAL_RESTOCK_OFF)));
FluidCraft.proxy.netHandler.sendToServer(new CPacketValueConfig(0, 1));
}
}
}
src/main/java/com/glodblock/github/network/CPacketValueConfig.java
+17 -7
View File
@@ -4,12 +4,15 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.Container;
import net.minecraft.inventory.ContainerPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ChatComponentText;
import net.minecraft.util.StatCollector;
import org.apache.commons.lang3.tuple.ImmutablePair;
import com.glodblock.github.client.gui.container.ContainerFluidLevelEmitter;
import com.glodblock.github.common.item.ItemBaseWirelessTerminal;
import com.glodblock.github.inventory.item.WirelessCraftingTerminalInventory;
import com.glodblock.github.util.NameConst;
import com.glodblock.github.util.Util;
import appeng.api.AEApi;
@@ -58,13 +61,20 @@ public class CPacketValueConfig implements IMessage {
ImmutablePair<Integer, ItemStack> result = Util.getUltraWirelessTerm(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);
if (message.valueIndex == 1) {
ItemBaseWirelessTerminal
.toggleRestockItemsMode(wirelessTerm, !Util.isRestock(wirelessTerm));
player.addChatMessage(
new ChatComponentText(
StatCollector.translateToLocal(
!Util.isRestock(wirelessTerm)
? NameConst.TT_ULTRA_TERMINAL_RESTOCK_ON
: NameConst.TT_ULTRA_TERMINAL_RESTOCK_OFF)));
} else {
IGridNode gridNode = Util.getWirelessGrid(wirelessTerm);
if (gridNode != null && Util.isRestock(wirelessTerm)
&& Util.rangeCheck(wirelessTerm, player, gridNode)) {
restockItems(wirelessTerm, gridNode, result.getLeft(), player);
}
}
}
src/main/java/com/glodblock/github/proxy/ClientProxy.java
+3 -2
View File
@@ -60,8 +60,9 @@ public class ClientProxy extends CommonProxy {
if (refreshTick + reStockTime < System.currentTimeMillis()) {
// try to stock items
ImmutablePair<Integer, ItemStack> result = Util.getUltraWirelessTerm(mc.thePlayer);
if (result == null || !Util.isRestock(result.getRight()) || mc.currentScreen != null) return;
FluidCraft.proxy.netHandler.sendToServer(new CPacketValueConfig(1, 0));
if (result != null && mc.currentScreen == null && Util.isRestock(result.getRight())) {
FluidCraft.proxy.netHandler.sendToServer(new CPacketValueConfig(1, 0));
}
refreshTick = System.currentTimeMillis();
}
}