From 7438c7075c1952ce72488328b590dc8c6e001d89 Mon Sep 17 00:00:00 2001 From: asdflj <854865755@qq.com> Date: Fri, 24 Feb 2023 09:40:21 +0800 Subject: [PATCH 1/3] fix can't be display in network details --- .../java/com/glodblock/github/common/block/FCBaseBlock.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/com/glodblock/github/common/block/FCBaseBlock.java b/src/main/java/com/glodblock/github/common/block/FCBaseBlock.java index 03969baf..1876a959 100644 --- a/src/main/java/com/glodblock/github/common/block/FCBaseBlock.java +++ b/src/main/java/com/glodblock/github/common/block/FCBaseBlock.java @@ -10,6 +10,9 @@ import net.minecraft.tileentity.TileEntity; import appeng.block.AEBaseTileBlock; import appeng.core.features.AEFeature; +import appeng.core.features.ActivityState; +import appeng.core.features.BlockStackSrc; +import appeng.tile.AEBaseTile; import com.glodblock.github.FluidCraft; import com.glodblock.github.loader.IRegister; @@ -27,6 +30,7 @@ public abstract class FCBaseBlock extends AEBaseTileBlock implements IRegister clazz) { + AEBaseTile.registerTileItem(clazz, new BlockStackSrc(this, 0, ActivityState.Enabled)); super.setTileEntity(clazz); } From 232b64e819610a2849a2a49ed50836efe9e4bb34 Mon Sep 17 00:00:00 2001 From: asdflj <854865755@qq.com> Date: Fri, 24 Feb 2023 11:16:54 +0800 Subject: [PATCH 2/3] fix Universal terminal patten mode recipe transfer to slot item stack size error --- .../github/inventory/ItemBiggerAppEngInventory.java | 8 ++++++++ .../item/WirelessPatternTerminalExInventory.java | 2 ++ .../inventory/item/WirelessPatternTerminalInventory.java | 2 ++ 3 files changed, 12 insertions(+) diff --git a/src/main/java/com/glodblock/github/inventory/ItemBiggerAppEngInventory.java b/src/main/java/com/glodblock/github/inventory/ItemBiggerAppEngInventory.java index d2459bfb..65455cbf 100644 --- a/src/main/java/com/glodblock/github/inventory/ItemBiggerAppEngInventory.java +++ b/src/main/java/com/glodblock/github/inventory/ItemBiggerAppEngInventory.java @@ -19,6 +19,14 @@ public class ItemBiggerAppEngInventory extends BiggerAppEngInventory { this.readFromNBT(Platform.openNbtData(is), name); } + public void setCraftingMode(boolean mode) { + Platform.openNbtData(is).setBoolean("craftingMode", mode); + } + + public boolean getCraftingMode(boolean mode) { + return Platform.openNbtData(is).getBoolean("craftingMode"); + } + @Override public void markDirty() { boolean isCraft = Platform.openNbtData(is).getBoolean("craftingMode"); diff --git a/src/main/java/com/glodblock/github/inventory/item/WirelessPatternTerminalExInventory.java b/src/main/java/com/glodblock/github/inventory/item/WirelessPatternTerminalExInventory.java index 7c94898e..9ae17419 100644 --- a/src/main/java/com/glodblock/github/inventory/item/WirelessPatternTerminalExInventory.java +++ b/src/main/java/com/glodblock/github/inventory/item/WirelessPatternTerminalExInventory.java @@ -326,6 +326,8 @@ public class WirelessPatternTerminalExInventory extends MEMonitorHandler Date: Fri, 24 Feb 2023 16:30:39 +0800 Subject: [PATCH 3/3] add universal terminal more tips --- .../github/common/item/ItemWirelessUltraTerminal.java | 3 +++ src/main/java/com/glodblock/github/util/NameConst.java | 2 ++ src/main/resources/assets/ae2fc/lang/en_US.lang | 2 ++ src/main/resources/assets/ae2fc/lang/zh_CN.lang | 2 ++ 4 files changed, 9 insertions(+) diff --git a/src/main/java/com/glodblock/github/common/item/ItemWirelessUltraTerminal.java b/src/main/java/com/glodblock/github/common/item/ItemWirelessUltraTerminal.java index d27705f0..684a2897 100644 --- a/src/main/java/com/glodblock/github/common/item/ItemWirelessUltraTerminal.java +++ b/src/main/java/com/glodblock/github/common/item/ItemWirelessUltraTerminal.java @@ -3,6 +3,7 @@ package com.glodblock.github.common.item; import static net.minecraft.client.gui.GuiScreen.isShiftKeyDown; import java.util.ArrayList; +import java.util.Arrays; import java.util.EnumSet; import java.util.List; @@ -77,6 +78,8 @@ public class ItemWirelessUltraTerminal extends ItemBaseWirelessTerminal if (isShiftKeyDown()) { lines.add(StatCollector.translateToLocal(NameConst.TT_ULTRA_TERMINAL)); lines.add(StatCollector.translateToLocal(NameConst.TT_ULTRA_TERMINAL + "." + guiGuiType(stack))); + lines.add(NameConst.i18n(NameConst.TT_ULTRA_TERMINAL_TIPS)); + lines.addAll(Arrays.asList(NameConst.i18n(NameConst.TT_ULTRA_TERMINAL_TIPS_DESC).split("\\\\n"))); } else { lines.add(NameConst.i18n(NameConst.TT_SHIFT_FOR_MORE)); } diff --git a/src/main/java/com/glodblock/github/util/NameConst.java b/src/main/java/com/glodblock/github/util/NameConst.java index 72c17295..52862f2e 100644 --- a/src/main/java/com/glodblock/github/util/NameConst.java +++ b/src/main/java/com/glodblock/github/util/NameConst.java @@ -85,6 +85,8 @@ public class NameConst { public static final String TT_WIRELESS_INSTALLED = TT_WIRELESS + "installed"; public static final String TT_FLUID_AUTO_FILLER = TT_KEY + "fluid_auto_filler"; public static final String TT_ULTRA_TERMINAL = TT_KEY + "ultra_terminal"; + public static final String TT_ULTRA_TERMINAL_TIPS = TT_ULTRA_TERMINAL + ".tips"; + public static final String TT_ULTRA_TERMINAL_TIPS_DESC = TT_ULTRA_TERMINAL_TIPS + ".desc"; public static final String WAILA_KEY = FluidCraft.MODID + ".waila."; public static final String WAILA_ENABLE = WAILA_KEY + "enable"; diff --git a/src/main/resources/assets/ae2fc/lang/en_US.lang b/src/main/resources/assets/ae2fc/lang/en_US.lang index f451143a..a09652ee 100644 --- a/src/main/resources/assets/ae2fc/lang/en_US.lang +++ b/src/main/resources/assets/ae2fc/lang/en_US.lang @@ -100,6 +100,8 @@ ae2fc.tooltip.ultra_terminal.WIRELESS_ESSENTIA_TERMINAL=Mode: Essentia Terminal ae2fc.tooltip.ultra_terminal.WIRELESS_INTERFACE_TERMINAL=Mode: Interface Terminal ae2fc.tooltip.ultra_terminal.WIRELESS_FLUID_PATTERN_TERMINAL_EX=Mode: Processing Pattern Terminal 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.cell_contents=Contains Fluid: ae2fc.tooltip.cell_empty=Cell is empty diff --git a/src/main/resources/assets/ae2fc/lang/zh_CN.lang b/src/main/resources/assets/ae2fc/lang/zh_CN.lang index 8940cd95..1c989cf1 100644 --- a/src/main/resources/assets/ae2fc/lang/zh_CN.lang +++ b/src/main/resources/assets/ae2fc/lang/zh_CN.lang @@ -100,6 +100,8 @@ ae2fc.tooltip.ultra_terminal.WIRELESS_ESSENTIA_TERMINAL=模式: 源质 ae2fc.tooltip.ultra_terminal.WIRELESS_INTERFACE_TERMINAL=模式: 接口 ae2fc.tooltip.ultra_terminal.WIRELESS_FLUID_PATTERN_TERMINAL_EX=模式: 增广样板 ae2fc.tooltip.ultra_terminal=Shift右击切换模式。 +ae2fc.tooltip.ultra_terminal.tips=使用提示: +ae2fc.tooltip.ultra_terminal.tips.desc=1.你可以把它放到饰品栏内并用热键打开.\n2.接口模式按§3Shift§7切换出接口命名按钮.\n3.当你在合成计划界面时.\n按§3Shift§7点击取消按钮会自动添加合成缺失的物品到NEI收藏栏. ae2fc.tooltip.cell_contents=内含流体: ae2fc.tooltip.cell_empty=空存储