Skip to content

Commit

Permalink
Change Text and Texture
Browse files Browse the repository at this point in the history
  • Loading branch information
qwer523 committed Jun 10, 2024
1 parent eafd5eb commit 6b86a42
Show file tree
Hide file tree
Showing 30 changed files with 189 additions and 244 deletions.
29 changes: 15 additions & 14 deletions src/generated/resources/assets/gregiceng/lang/en_ud.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
{
"block.gregiceng.adv_stocking_bus": "snᗺ ʇnduI buıʞɔoʇS pǝɔuɐʌpⱯ ƎW",
"block.gregiceng.adv_stocking_bus.desc.0": "sǝɹnʇɔnɹʇs ʞɔoןq ıʇןnɯ oʇ sɯǝʇı ǝpıʌoɹd oʇ ʞɹoʍʇǝu ƎW ǝɥʇ uı sɯǝʇı buıs∩",
"block.gregiceng.adv_stocking_bus.desc.1": "ǝpoɯ ןןnd ɔıʇɐɯoʇnⱯ sɐH",
"block.gregiceng.adv_stocking_bus.desc.0": "",
"block.gregiceng.adv_stocking_hatch": "ɥɔʇɐH ʇnduI buıʞɔoʇS pǝɔuɐʌpⱯ ƎW",
"block.gregiceng.adv_stocking_hatch.desc.0": "sǝɹnʇɔnɹʇs ʞɔoןq ıʇןnɯ oʇ spınןɟ ǝpıʌoɹd oʇ ʞɹoʍʇǝu ƎW ǝɥʇ uı spınןɟ buıs∩",
"block.gregiceng.adv_stocking_hatch.desc.1": "ǝpoɯ ןןnd ɔıʇɐɯoʇnⱯ sɐH",
"block.gregiceng.adv_stocking_hatch.desc.0": "",
"block.gregiceng.crafting_io_buffer": "ɹǝɟɟnᗺ OI buıʇɟɐɹƆ ƎW",
"block.gregiceng.crafting_io_buffer.desc.0": "uǝʇʇɐd ㄣϛ uıɐʇuoɔ uɐɔ puɐ ʞɹoʍʇǝu ƎW ǝɥʇ oʇ pǝʇɔǝuuoɔ ǝq ʇsnW",
"block.gregiceng.crafting_io_buffer.desc.1": "sʇoןs ʇsʎןɐʇɐɔ pınןɟ puɐ sɯǝʇı 6 buıʌɐH",
"block.gregiceng.crafting_io_buffer.desc.2": "ʞɹoʍʇǝu ǝɥʇ oʇ ʞɔɐq ʍoןɟ ʍoןןⱯ",
"block.gregiceng.crafting_io_buffer.desc.0": "",
"block.gregiceng.crafting_io_buffer.desc.1": "",
"block.gregiceng.crafting_io_buffer.desc.2": "",
"block.gregiceng.crafting_io_slave": "ǝʌɐןS OI buıʇɟɐɹƆ ƎW",
"block.gregiceng.crafting_io_slave.desc.0": "",
"block.gregiceng.ev_input_buffer": "ɹǝɟɟnᗺ ʇnduI ΛƎϛ§",
Expand All @@ -24,9 +22,9 @@
"block.gregiceng.opv_output_buffer": "ɹǝɟɟnᗺ ʇndʇnO ΛdOן§6§",
"block.gregiceng.output_buffer.desc": "sʞɔoןqıʇןnW ɹoɟ ʇndʇnO pınןℲ puɐ ɯǝʇI",
"block.gregiceng.stocking_bus": "snᗺ ʇnduI buıʞɔoʇS ƎW",
"block.gregiceng.stocking_bus.desc.0": "sǝɹnʇɔnɹʇs ʞɔoןq ıʇןnɯ oʇ sɯǝʇı ǝpıʌoɹd oʇ ʞɹoʍʇǝu ƎW ǝɥʇ uı sɯǝʇı buıs∩",
"block.gregiceng.stocking_bus.desc.0": "",
"block.gregiceng.stocking_hatch": "ɥɔʇɐH ʇnduI buıʞɔoʇS ƎW",
"block.gregiceng.stocking_hatch.desc.0": "sǝɹnʇɔnɹʇs ʞɔoןq ıʇןnɯ oʇ spınןɟ ǝpıʌoɹd oʇ ʞɹoʍʇǝu ƎW ǝɥʇ uı spınןɟ buıs∩",
"block.gregiceng.stocking_hatch.desc.0": "",
"block.gregiceng.uev_input_buffer": "ɹǝɟɟnᗺ ʇnduI ΛƎ∩ɐ§",
"block.gregiceng.uev_output_buffer": "ɹǝɟɟnᗺ ʇndʇnO ΛƎ∩ɐ§",
"block.gregiceng.uhv_input_buffer": "ɹǝɟɟnᗺ ʇnduI ΛH∩ㄣ§",
Expand All @@ -39,18 +37,21 @@
"block.gregiceng.uxv_output_buffer": "ɹǝɟɟnᗺ ʇndʇnO ΛX∩ǝ§",
"block.gregiceng.zpm_input_buffer": "ɹǝɟɟnᗺ ʇnduI WԀZɔ§",
"block.gregiceng.zpm_output_buffer": "ɹǝɟɟnᗺ ʇndʇnO WԀZɔ§",
"config.gregiceng.option.enableMoreAbility": "ǝʌɐןS/ɹǝɟɟnᗺ OI buıʇɟɐɹƆ ɹoɟ ʎʇıןıqⱯ ǝɹoW ǝןqɐuƎ",
"config.gregiceng.option.enableMoreAbility": "ɹǝɟɟnᗺ ɹoɟ ʎʇıןıqⱯ ǝɹoW ǝןqɐuƎ",
"config.jade.plugin_gregiceng.crafting_io_buffer": "ɹǝɟɟnᗺ OI buıʇɟɐɹƆ",
"gregiceng.tooltip.buffer_bind": "ɹǝɟɟnᗺ OI buıʇɟɐɹƆ %s :Z '%s :ʎ '%s :X oʇ puıᗺ",
"gui.gregiceng.auto_pull_me.desc.disabled": "pǝןqɐsıp sı ןןnd ɔıʇɐɯoʇnⱯ",
"gui.gregiceng.auto_pull_me.desc.enabled": "uo sı ןןnd ɔıʇɐɯoʇnⱯ",
"gui.gregiceng.automatic_return.desc.disabled": "pǝןqɐsıp sı uɹnʇǝᴚ ɔıʇɐɯoʇnⱯ",
"gui.gregiceng.automatic_return.desc.enabled": "uo sı uɹnʇǝᴚ ɔıʇɐɯoʇnⱯ",
"gui.gregiceng.auto_return.desc.disabled": "pǝןqɐsıp sı uɹnʇǝᴚ ɔıʇɐɯoʇnⱯ",
"gui.gregiceng.auto_return.desc.enabled": "uo sı uɹnʇǝᴚ ɔıʇɐɯoʇnⱯ",
"gui.gregiceng.config_disabled.desc": "",
"gui.gregiceng.refund_all.desc": "ןןnɟ uı sןɐıɹǝʇɐɯ ʍɐɹ punɟǝᴚ",
"gui.gregiceng.rename.desc": "ǝɯɐuǝᴚ",
"gui.gregiceng.share_inventory.desc": "ʎɹoʇuǝʌuı ǝɹɐɥs uǝdO",
"gui.gregiceng.share_inventory.desc.0": "ʎɹoʇuǝʌuı ǝɹɐɥs uǝdO",
"gui.gregiceng.share_inventory.desc.1": "",
"gui.gregiceng.share_inventory.title": "ʎɹoʇuǝʌuI ǝɹɐɥS",
"gui.gregiceng.share_tank.desc": "ʞuɐʇ ǝɹɐɥs uǝdO",
"gui.gregiceng.share_tank.desc.0": "ʞuɐʇ ǝɹɐɥs uǝdO",
"gui.gregiceng.share_tank.desc.1": "",
"gui.gregiceng.share_tank.title": "ʞuɐ⟘ ǝɹɐɥS",
"itemGroup.gregiceng.main": "sɔıʇsıbɹǝuƎ ɔıbǝɹ⅁"
}
29 changes: 15 additions & 14 deletions src/generated/resources/assets/gregiceng/lang/en_us.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
{
"block.gregiceng.adv_stocking_bus": "ME Advanced Stocking Input Bus",
"block.gregiceng.adv_stocking_bus.desc.0": "Using items in the ME network to provide items to multi block structures",
"block.gregiceng.adv_stocking_bus.desc.1": "Has Automatic pull mode",
"block.gregiceng.adv_stocking_bus.desc.0": "",
"block.gregiceng.adv_stocking_hatch": "ME Advanced Stocking Input Hatch",
"block.gregiceng.adv_stocking_hatch.desc.0": "Using fluids in the ME network to provide fluids to multi block structures",
"block.gregiceng.adv_stocking_hatch.desc.1": "Has Automatic pull mode",
"block.gregiceng.adv_stocking_hatch.desc.0": "",
"block.gregiceng.crafting_io_buffer": "ME Crafting IO Buffer",
"block.gregiceng.crafting_io_buffer.desc.0": "Must be connected to the ME network and can contain 54 patten",
"block.gregiceng.crafting_io_buffer.desc.1": "Having 9 items and fluid catalyst slots",
"block.gregiceng.crafting_io_buffer.desc.2": "Allow flow back to the network",
"block.gregiceng.crafting_io_buffer.desc.0": "",
"block.gregiceng.crafting_io_buffer.desc.1": "",
"block.gregiceng.crafting_io_buffer.desc.2": "",
"block.gregiceng.crafting_io_slave": "ME Crafting IO Slave",
"block.gregiceng.crafting_io_slave.desc.0": "",
"block.gregiceng.ev_input_buffer": "§5EV Input Buffer",
Expand All @@ -24,9 +22,9 @@
"block.gregiceng.opv_output_buffer": "§9§lOpV Output Buffer",
"block.gregiceng.output_buffer.desc": "Item and Fluid Output for Multiblocks",
"block.gregiceng.stocking_bus": "ME Stocking Input Bus",
"block.gregiceng.stocking_bus.desc.0": "Using items in the ME network to provide items to multi block structures",
"block.gregiceng.stocking_bus.desc.0": "",
"block.gregiceng.stocking_hatch": "ME Stocking Input Hatch",
"block.gregiceng.stocking_hatch.desc.0": "Using fluids in the ME network to provide fluids to multi block structures",
"block.gregiceng.stocking_hatch.desc.0": "",
"block.gregiceng.uev_input_buffer": "§aUEV Input Buffer",
"block.gregiceng.uev_output_buffer": "§aUEV Output Buffer",
"block.gregiceng.uhv_input_buffer": "§4UHV Input Buffer",
Expand All @@ -39,18 +37,21 @@
"block.gregiceng.uxv_output_buffer": "§eUXV Output Buffer",
"block.gregiceng.zpm_input_buffer": "§cZPM Input Buffer",
"block.gregiceng.zpm_output_buffer": "§cZPM Output Buffer",
"config.gregiceng.option.enableMoreAbility": "Enable More Ability for Crafting IO Buffer/Slave",
"config.gregiceng.option.enableMoreAbility": "Enable More Ability for Buffer",
"config.jade.plugin_gregiceng.crafting_io_buffer": "Crafting IO Buffer",
"gregiceng.tooltip.buffer_bind": "Bind to X: %s, Y: %s, Z: %s Crafting IO Buffer",
"gui.gregiceng.auto_pull_me.desc.disabled": "Automatic pull is disabled",
"gui.gregiceng.auto_pull_me.desc.enabled": "Automatic pull is on",
"gui.gregiceng.automatic_return.desc.disabled": "Automatic Return is disabled",
"gui.gregiceng.automatic_return.desc.enabled": "Automatic Return is on",
"gui.gregiceng.auto_return.desc.disabled": "Automatic Return is disabled",
"gui.gregiceng.auto_return.desc.enabled": "Automatic Return is on",
"gui.gregiceng.config_disabled.desc": "",
"gui.gregiceng.refund_all.desc": "Refund raw materials in full",
"gui.gregiceng.rename.desc": "Rename",
"gui.gregiceng.share_inventory.desc": "Open share inventory",
"gui.gregiceng.share_inventory.desc.0": "Open share inventory",
"gui.gregiceng.share_inventory.desc.1": "",
"gui.gregiceng.share_inventory.title": "Share Inventory",
"gui.gregiceng.share_tank.desc": "Open share tank",
"gui.gregiceng.share_tank.desc.0": "Open share tank",
"gui.gregiceng.share_tank.desc.1": "",
"gui.gregiceng.share_tank.title": "Share Tank",
"itemGroup.gregiceng.main": "Gregic Energistics"
}
33 changes: 19 additions & 14 deletions src/generated/resources/assets/gregiceng/lang/zh_cn.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
{
"block.gregiceng.adv_stocking_bus": "ME进阶存储输入总线",
"block.gregiceng.adv_stocking_bus.desc.0": "使用ME网络中的物品向多方块结构提供物品",
"block.gregiceng.adv_stocking_bus.desc.1": "拥有自动拉取功能",
"block.gregiceng.adv_stocking_bus.desc.0": "直接使用ME网络向多方块结构提供物品",
"block.gregiceng.adv_stocking_bus.desc.1": "拥有自动拉取功能,可以自动标记ME网络中的前25种物品",
"block.gregiceng.adv_stocking_bus.desc.2": "小于最小拉取数量的物品不会被自动标记",
"block.gregiceng.adv_stocking_hatch": "ME进阶存储输入仓",
"block.gregiceng.adv_stocking_hatch.desc.0": "使用ME网络中的流体向多方块结构提供流体",
"block.gregiceng.adv_stocking_hatch.desc.1": "拥有自动拉取功能",
"block.gregiceng.adv_stocking_hatch.desc.0": "直接使用ME网络向多方块结构提供流体",
"block.gregiceng.adv_stocking_hatch.desc.1": "拥有自动拉取功能,可以自动标记ME网络中的前25种流体",
"block.gregiceng.adv_stocking_hatch.desc.2": "小于最小拉取数量的流体不会被自动标记",
"block.gregiceng.crafting_io_buffer": "ME样板IO总成",
"block.gregiceng.crafting_io_buffer.desc.0": "需与ME网络连接,可容纳54个样板",
"block.gregiceng.crafting_io_buffer.desc.1": "拥有9个物品和流体催化剂槽",
"block.gregiceng.crafting_io_buffer.desc.2": "允许回流至网络",
"block.gregiceng.crafting_io_buffer.desc.0": "为多方块结构IO物品和流体",
"block.gregiceng.crafting_io_buffer.desc.1": "可以直接处理放入的样板,每个样板拥有独立的内部存储",
"block.gregiceng.crafting_io_buffer.desc.2": "拥有自动回流功能,可以将产物返回ME网络",
"block.gregiceng.crafting_io_slave": "ME样板IO镜像",
"block.gregiceng.crafting_io_slave.desc.0": "无需与ME网络连接,ME样板IO总成的镜像端",
"block.gregiceng.crafting_io_slave.desc.1": "拥有被复制ME样板IO总成的所有配置,包括不消耗品和处理样板",
Expand All @@ -27,9 +29,9 @@
"block.gregiceng.opv_output_buffer": "§9§lOpV§r输出总成",
"block.gregiceng.output_buffer.desc": "为多方块结构输出物品和流体",
"block.gregiceng.stocking_bus": "ME存储输入总线",
"block.gregiceng.stocking_bus.desc.0": "使用ME网络中的物品向多方块结构提供物品",
"block.gregiceng.stocking_bus.desc.0": "直接使用ME网络向多方块结构提供物品",
"block.gregiceng.stocking_hatch": "ME存储输入仓",
"block.gregiceng.stocking_hatch.desc.0": "使用ME网络中的流体向多方块结构提供流体",
"block.gregiceng.stocking_hatch.desc.0": "直接使用ME网络向多方块结构提供流体",
"block.gregiceng.uev_input_buffer": "§aUEV§r输入总成",
"block.gregiceng.uev_output_buffer": "§aUEV§r输出总成",
"block.gregiceng.uhv_input_buffer": "§4UHV§r输入总成",
Expand All @@ -42,17 +44,20 @@
"block.gregiceng.uxv_output_buffer": "§eUXV§r输出总成",
"block.gregiceng.zpm_input_buffer": "§cZPM§r输入总成",
"block.gregiceng.zpm_output_buffer": "§cZPM§r输出总成",
"config.gregiceng.option.enableMoreAbility": "为样板IO总成/镜像启用更多能力",
"config.gregiceng.option.enableMoreAbility": "为总成启用更多能力",
"config.jade.plugin_gregiceng.crafting_io_buffer": "样板IO总成",
"gregiceng.tooltip.buffer_bind": "绑定至 X: %s, Y: %s, Z: %s 样板IO总成",
"gui.gregiceng.auto_pull_me.desc.disabled": "自动拉取已禁用",
"gui.gregiceng.auto_pull_me.desc.enabled": "自动拉取已开启",
"gui.gregiceng.automatic_return.desc.disabled": "自动回流已禁用",
"gui.gregiceng.automatic_return.desc.enabled": "自动回流已开启",
"gui.gregiceng.auto_return.desc.disabled": "自动回流已禁用",
"gui.gregiceng.auto_return.desc.enabled": "自动回流已开启",
"gui.gregiceng.config_disabled.desc": "自动拉取模式下无法进行手动设置",
"gui.gregiceng.refund_all.desc": "退回所有材料",
"gui.gregiceng.rename.desc": "重命名",
"gui.gregiceng.share_inventory.desc": "打开共享库存",
"gui.gregiceng.share_inventory.desc.0": "打开共享库存",
"gui.gregiceng.share_inventory.desc.1": "其中的物品在所有内部存储之间共享",
"gui.gregiceng.share_inventory.title": "共享库存",
"gui.gregiceng.share_tank.desc": "打开共享储罐",
"gui.gregiceng.share_tank.desc.0": "打开共享储罐",
"gui.gregiceng.share_tank.desc.1": "其中的流体在所有内部存储之间共享",
"gui.gregiceng.share_tank.title": "共享储罐"
}
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ protected void setConfig(@Nullable T config) {
protected List<Component> getHoverTexts(List<Component> hoverTexts) {
if (getConfig() == null) {
if (isBlocked.getAsBoolean()) {

hoverTexts.add(Component.translatable("gui.gregiceng.config_disabled.desc"));
} else {
hoverTexts.add(Component.translatable("gtceu.gui.config_slot"));
hoverTexts.add(Component.translatable("gtceu.gui.config_slot.set"));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import appeng.api.stacks.AEKey;

import com.gregtechceu.gtceu.api.gui.GuiTextures;
import com.gregtechceu.gtceu.api.machine.MetaMachine;
import com.gregtechceu.gtceu.api.machine.feature.IFancyUIMachine;

import com.lowdragmc.lowdraglib.gui.widget.ImageWidget;
Expand All @@ -20,6 +21,13 @@
public interface IMEStockingPart<T extends AEKey> extends IFancyUIMachine {
int CONFIG_SIZE = 5 * 5;

static boolean isActive(MetaMachine machine) {
if (machine instanceof IMEStockingPart<?> stockingPart) {
return stockingPart.isOnline();
}
return false;
}

@Override
default Widget createUIWidget() {
final var group = new WidgetGroup(0, 0, 18 * 10 + 31, 18 * 5 + 16);
Expand Down
Loading

0 comments on commit 6b86a42

Please sign in to comment.