diff --git a/src/main/java/com/glodblock/github/inventory/item/WirelessMagnetCardFilterInventory.java b/src/main/java/com/glodblock/github/inventory/item/WirelessMagnetCardFilterInventory.java index badba86e..d911fe61 100644 --- a/src/main/java/com/glodblock/github/inventory/item/WirelessMagnetCardFilterInventory.java +++ b/src/main/java/com/glodblock/github/inventory/item/WirelessMagnetCardFilterInventory.java @@ -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 filterPredicate = null; private WirelessMagnet.ListMode listMode = WirelessMagnet.ListMode.WhiteList; private final AppEngInternalInventory filterInventory; diff --git a/src/main/java/com/glodblock/github/loader/KeybindLoader.java b/src/main/java/com/glodblock/github/loader/KeybindLoader.java index 45f01a75..81654539 100644 --- a/src/main/java/com/glodblock/github/loader/KeybindLoader.java +++ b/src/main/java/com/glodblock/github/loader/KeybindLoader.java @@ -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 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)); - } } } diff --git a/src/main/java/com/glodblock/github/network/CPacketValueConfig.java b/src/main/java/com/glodblock/github/network/CPacketValueConfig.java index e3fd345a..ba3be5ce 100644 --- a/src/main/java/com/glodblock/github/network/CPacketValueConfig.java +++ b/src/main/java/com/glodblock/github/network/CPacketValueConfig.java @@ -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 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); } } } diff --git a/src/main/java/com/glodblock/github/proxy/ClientProxy.java b/src/main/java/com/glodblock/github/proxy/ClientProxy.java index 34489800..13d15256 100644 --- a/src/main/java/com/glodblock/github/proxy/ClientProxy.java +++ b/src/main/java/com/glodblock/github/proxy/ClientProxy.java @@ -60,8 +60,9 @@ public class ClientProxy extends CommonProxy { if (refreshTick + reStockTime < System.currentTimeMillis()) { // try to stock items ImmutablePair 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(); } } diff --git a/src/main/resources/assets/ae2fc/lang/en_US.lang b/src/main/resources/assets/ae2fc/lang/en_US.lang index fbb59d5b..19b2a862 100644 --- a/src/main/resources/assets/ae2fc/lang/en_US.lang +++ b/src/main/resources/assets/ae2fc/lang/en_US.lang @@ -117,6 +117,8 @@ ae2fc.tooltip.ultra_terminal.WIRELESS_FLUID_PATTERN_TERMINAL_EX=Mode: Processing ae2fc.tooltip.ultra_terminal=Right click + sneaking to switch mode. ae2fc.tooltip.ultra_terminal.tips=ToolTips: ae2fc.tooltip.ultra_terminal.tips.desc=1.You can put it to baubles slot and use hotkey to open.\n2.Interface mode hold §3Shift§7 toggle interface renamer button.\n3.When you are in the crafting plan screen.\nHold §3Shift§7 click cancel button will automatically add missing items to NEI bookmark. +ae2fc.tooltip.ultra_terminal.restock.on=Restock activate +ae2fc.tooltip.ultra_terminal.restock.off=Restock deactivated ae2fc.tooltip.infinity_fluid=§aInfinity§r ae2fc.tooltip.fluid_storage.void=Where nothing is everything, and everything is nothing