diff --git a/src/main/java/com/glodblock/github/client/gui/base/FCGuiMonitor.java b/src/main/java/com/glodblock/github/client/gui/base/FCGuiMonitor.java index ce885405..df74f56a 100644 --- a/src/main/java/com/glodblock/github/client/gui/base/FCGuiMonitor.java +++ b/src/main/java/com/glodblock/github/client/gui/base/FCGuiMonitor.java @@ -56,6 +56,7 @@ import com.glodblock.github.inventory.gui.GuiType; import com.glodblock.github.network.CPacketInventoryAction; import com.glodblock.github.util.Ae2ReflectClient; import com.glodblock.github.util.ModAndClassUtil; +import com.glodblock.github.util.Util; public abstract class FCGuiMonitor> extends AEBaseMEGui implements ISortSource, IConfigManagerHost, IDropToFillTextField { @@ -343,7 +344,10 @@ public abstract class FCGuiMonitor> extends AEBaseMEGui craftingGridOffsetX -= 25; craftingGridOffsetY -= 6; - if (drawSwitchGuiBtn) drawSwitchGuiBtns(); + if (drawSwitchGuiBtn) { + drawSwitchGuiBtns(); + Util.MouseHandler.loadMousePos(); + } } @SuppressWarnings("unchecked") @@ -597,6 +601,7 @@ public abstract class FCGuiMonitor> extends AEBaseMEGui super.onGuiClosed(); Keyboard.enableRepeatEvents(false); memoryText = this.searchField.getText(); + Util.MouseHandler.saveMousePos(); } public void bindTextureBack(final String file) { diff --git a/src/main/java/com/glodblock/github/util/Util.java b/src/main/java/com/glodblock/github/util/Util.java index 6a8c18e1..0a0b3fd6 100644 --- a/src/main/java/com/glodblock/github/util/Util.java +++ b/src/main/java/com/glodblock/github/util/Util.java @@ -16,6 +16,7 @@ import net.minecraftforge.fluids.*; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.MutablePair; +import org.lwjgl.input.Mouse; import appeng.api.AEApi; import appeng.api.config.Actionable; @@ -52,6 +53,25 @@ import io.netty.buffer.ByteBuf; public final class Util { + public static class MouseHandler { + + private static int mouse_x = 0; + private static int mouse_y = 0; + + public static void saveMousePos() { + mouse_x = Mouse.getX(); + mouse_y = Mouse.getY(); + } + + public static void loadMousePos() { + if (mouse_x != 0 && mouse_y != 0) { + Mouse.setCursorPosition(mouse_x, mouse_y); + mouse_y = 0; + mouse_x = 0; + } + } + } + public static int drainItemPower(AEBaseContainer c, InventoryPlayer ip, int slot, int ticks, double pm, IFluidPortableCell wt) { final ItemStack currentItem = slot < 0 ? ip.getCurrentItem() : ip.getStackInSlot(slot); diff --git a/src/main/resources/assets/ae2fc/lang/en_US.lang b/src/main/resources/assets/ae2fc/lang/en_US.lang index 4b0f6d3b..e40f432f 100644 --- a/src/main/resources/assets/ae2fc/lang/en_US.lang +++ b/src/main/resources/assets/ae2fc/lang/en_US.lang @@ -95,13 +95,9 @@ ae2fc.tooltip.not_combine.hint=Disabled ae2fc.tooltip.combine=Merge the same items ae2fc.tooltip.combine.hint=Enabled ae2fc.tooltip.fluid_terminal_w=Fluid Terminal -ae2fc.tooltip.fluid_terminal_w.hint=Switch to Fluid Terminal ae2fc.tooltip.craft_terminal_w=Crafting Terminal -ae2fc.tooltip.craft_terminal_w.hint=Switch to Crafting Terminal ae2fc.tooltip.pattern_terminal_w=Pattern Terminal -ae2fc.tooltip.pattern_terminal_w.hint=Switch to Pattern Terminal ae2fc.tooltip.essentia_terminal_w=Essentia Terminal -ae2fc.tooltip.essentia_terminal_w.hint=Switch to Essentia Terminal ae2fc.tooltip.wireless.installed=Installed Card: ae2fc.tooltip.not_prio=Allow fluids to be placed first diff --git a/src/main/resources/assets/ae2fc/lang/zh_CN.lang b/src/main/resources/assets/ae2fc/lang/zh_CN.lang index ea1aa9bc..ac2c024f 100644 --- a/src/main/resources/assets/ae2fc/lang/zh_CN.lang +++ b/src/main/resources/assets/ae2fc/lang/zh_CN.lang @@ -13,6 +13,10 @@ item.part_fluid_conversion_monitor.name=ME流体交换监控器 item.portable_fluid_cell.name=便携流体单元 item.wireless_fluid_terminal.name=无线流体终端 item.wireless_fluid_pattern_terminal.name=无线样板终端 +item.wireless_ultra_terminal.WIRELESS_CRAFTING_TERMINAL.name=无线ME通用终端 - 合成 +item.wireless_ultra_terminal.WIRELESS_FLUID_PATTERN_TERMINAL.name=无线ME通用终端 - 样板 +item.wireless_ultra_terminal.WIRELESS_FLUID_TERMINAL.name=无线ME通用终端 - 流体 +item.wireless_ultra_terminal.WIRELESS_ESSENTIA_TERMINAL.name=无线ME通用终端 - 源质 item.fluid_packet.name=流体封包 item.fluid_storage.1.name=%s1k%s-ME流体存储元件 item.fluid_storage.4.name=%s4k%s-ME流体存储元件 @@ -70,6 +74,11 @@ ae2fc.tooltip.level_maintainer.batch_size=§6单次合成数量§r ae2fc.tooltip.level_maintainer.batch_size.hint=当发出合成请求时,请求器发送单次合成数量的多少。更多的单次合成数量将提高储存物品的速度,但需要更多的合成存储空间。 ae2fc.tooltip.level_maintainer.request_size=§6缓存量§r ae2fc.tooltip.level_maintainer.request_size.hint=数量定义了在请求器开始请求新合成之前应该保留多少物品。 +ae2fc.tooltip.ultra_terminal.WIRELESS_CRAFTING_TERMINAL=模式: 合成 +ae2fc.tooltip.ultra_terminal.WIRELESS_FLUID_PATTERN_TERMINAL=模式: 样板 +ae2fc.tooltip.ultra_terminal.WIRELESS_FLUID_TERMINAL=模式: 流体 +ae2fc.tooltip.ultra_terminal.WIRELESS_ESSENTIA_TERMINAL=模式: 源质 +ae2fc.tooltip.ultra_terminal=Shift右击切换模式。 ae2fc.tooltip.cell_contents=内含流体: ae2fc.tooltip.cell_empty=空存储 @@ -85,6 +94,10 @@ ae2fc.tooltip.not_combine=合并输出相同物品 ae2fc.tooltip.not_combine.hint=禁用 ae2fc.tooltip.combine=合并输出相同物品 ae2fc.tooltip.combine.hint=启用 +ae2fc.tooltip.fluid_terminal_w=流体终端 +ae2fc.tooltip.craft_terminal_w=合成终端 +ae2fc.tooltip.pattern_terminal_w=样板终端 +ae2fc.tooltip.essentia_terminal_w=源质终端 ae2fc.tooltip.wireless.installed=已安装的卡: ae2fc.tooltip.not_prio=优先放置流体