From 15c056556d55580918f6f4a4f5b5fa7afb2cd679 Mon Sep 17 00:00:00 2001 From: asdflj <854865755@qq.com> Date: Fri, 2 Sep 2022 10:44:29 +0800 Subject: [PATCH 1/4] update zh_ch lang --- .../resources/assets/ae2fc/lang/zh_CN.lang | 117 ++++++++++-------- 1 file changed, 64 insertions(+), 53 deletions(-) diff --git a/src/main/resources/assets/ae2fc/lang/zh_CN.lang b/src/main/resources/assets/ae2fc/lang/zh_CN.lang index 41514ffa..c2363ff9 100644 --- a/src/main/resources/assets/ae2fc/lang/zh_CN.lang +++ b/src/main/resources/assets/ae2fc/lang/zh_CN.lang @@ -1,53 +1,64 @@ -item.fluid_drop.name=%s液滴 -item.fluid_encoded_pattern.name=编写样板 -item.part_fluid_pattern_terminal.name=ME流体样板终端 -item.part_fluid_pattern_terminal_ex.name=ME增广流体样板终端 -item.part_fluid_interface.name=ME二合一接口 -item.part_fluid_import.name=ME流体输入总线 -item.part_fluid_export.name=ME流体输出总线 -item.fluid_packet.name=流体封包 -item.fluid_storage.1.name=1k-ME流体存储元件 -item.fluid_storage.4.name=4k-ME流体存储元件 -item.fluid_storage.16.name=16k-ME流体存储元件 -item.fluid_storage.64.name=64k-ME流体存储元件 -item.fluid_storage.256.name=256k-ME流体存储元件 -item.fluid_storage.1024.name=1024k-ME流体存储元件 -item.fluid_storage.4096.name=4096k-ME流体存储元件 -item.fluid_part.0.name=1k-ME流体存储组件 -item.fluid_part.1.name=4k-ME流体存储组件 -item.fluid_part.2.name=16k-ME流体存储组件 -item.fluid_part.3.name=64k-ME流体存储组件 -item.fluid_part.4.name=256k-ME流体存储组件 -item.fluid_part.5.name=1024k-ME流体存储组件 -item.fluid_part.6.name=4096k-ME流体存储组件 - -tile.fluid_discretizer.name=ME流体离散器 -tile.fluid_pattern_encoder.name=流体适配型样板编码台 -tile.fluid_packet_decoder.name=ME流体封包解码器 -tile.fluid_interface.name=ME二合一接口 -tile.ingredient_buffer.name=原材料缓存仓 -tile.large_ingredient_buffer.name=大型原材料缓存仓 -tile.oc_pattern_editor.name=OC样板编辑器 - -ae2fc.tooltip.invalid_fluid=流体无效！ -ae2fc.tooltip.encode_pattern=编写样板 -ae2fc.tooltip.fluid_packet=使用ME流体封包解码器\n来将其转换回流体形式。 -ae2fc.tooltip.empty=空 -ae2fc.tooltip.dump_tank=排空该流体槽 -ae2fc.tooltip.switch_fluid_interface=切换ME二合一接口GUI - -ae2fc.gui.part_fluid_pattern_terminal=ME流体样板终端 -ae2fc.gui.part_fluid_pattern_terminal_ex=ME增广流体样板终端 -ae2fc.gui.fluid_pattern_encoder=流体适配型样板编码台 -ae2fc.gui.fluid_packet_decoder=ME流体封包解码器 -ae2fc.gui.ingredient_buffer=原材料缓存仓 -ae2fc.gui.large_ingredient_buffer=大型原材料缓存仓 -ae2fc.gui.fluid_interface=ME二合一接口 -ae2fc.gui.fluid_interface.0=下 -ae2fc.gui.fluid_interface.1=上 -ae2fc.gui.fluid_interface.2=北 -ae2fc.gui.fluid_interface.3=南 -ae2fc.gui.fluid_interface.4=西 -ae2fc.gui.fluid_interface.5=东 -ae2fc.gui.oc_pattern_editor=OC样板编辑器 -ae2fc.gui.button.set=设置 +item.fluid_drop.name=%s液滴 +item.fluid_encoded_pattern.name=编写样板 +item.part_fluid_pattern_terminal.name=ME流体样板终端 +item.part_fluid_pattern_terminal_ex.name=ME增广流体样板终端 +item.part_fluid_interface.name=ME二合一接口 +item.part_fluid_import.name=ME流体输入总线 +item.part_fluid_export.name=ME流体输出总线 +item.fluid_packet.name=流体封包 +item.fluid_storage.1.name=1k-ME流体存储元件 +item.fluid_storage.4.name=4k-ME流体存储元件 +item.fluid_storage.16.name=16k-ME流体存储元件 +item.fluid_storage.64.name=64k-ME流体存储元件 +item.fluid_storage.256.name=256k-ME流体存储元件 +item.fluid_storage.1024.name=1024k-ME流体存储元件 +item.fluid_storage.4096.name=4096k-ME流体存储元件 +item.fluid_part.0.name=1k-ME流体存储组件 +item.fluid_part.1.name=4k-ME流体存储组件 +item.fluid_part.2.name=16k-ME流体存储组件 +item.fluid_part.3.name=64k-ME流体存储组件 +item.fluid_part.4.name=256k-ME流体存储组件 +item.fluid_part.5.name=1024k-ME流体存储组件 +item.fluid_part.6.name=4096k-ME流体存储组件 + +tile.fluid_discretizer.name=ME流体离散器 +tile.fluid_pattern_encoder.name=流体适配型样板编码台 +tile.fluid_packet_decoder.name=ME流体封包解码器 +tile.fluid_interface.name=ME二合一接口 +tile.ingredient_buffer.name=原材料缓存仓 +tile.large_ingredient_buffer.name=大型原材料缓存仓 +tile.oc_pattern_editor.name=OC样板编辑器 + +ae2fc.tooltip.invalid_fluid=流体无效！ +ae2fc.tooltip.encode_pattern=编写样板 +ae2fc.tooltip.fluid_packet=使用ME流体封包解码器\n来将其转换回流体形式。 +ae2fc.tooltip.empty=空 +ae2fc.tooltip.dump_tank=排空该流体槽 +ae2fc.tooltip.switch_fluid_interface=切换ME二合一接口GUI +ae2fc.tooltip.not_combine=合并输出相同物品 +ae2fc.tooltip.not_combine.hint=禁用 +ae2fc.tooltip.combine=合并输出相同物品 +ae2fc.tooltip.combine.hint=启用 + +ae2fc.tooltip.not_prio=优先放置流体 +ae2fc.tooltip.not_prio.hint=启用 +ae2fc.tooltip.prio=优先放置流体 +ae2fc.tooltip.prio.hint=禁用 + +ae2fc.gui.part_fluid_pattern_terminal=ME流体样板终端 +ae2fc.gui.part_fluid_pattern_terminal_ex=ME增广流体样板终端 +ae2fc.gui.fluid_pattern_encoder=流体适配型样板编码台 +ae2fc.gui.fluid_packet_decoder=ME流体封包解码器 +ae2fc.gui.ingredient_buffer=原材料缓存仓 +ae2fc.gui.large_ingredient_buffer=大型原材料缓存仓 +ae2fc.gui.fluid_interface=ME二合一接口 +ae2fc.gui.fluid_interface.0=下 +ae2fc.gui.fluid_interface.1=上 +ae2fc.gui.fluid_interface.2=北 +ae2fc.gui.fluid_interface.3=南 +ae2fc.gui.fluid_interface.4=西 +ae2fc.gui.fluid_interface.5=东 +ae2fc.gui.oc_pattern_editor=OC样板编辑器 +ae2fc.gui.button.set=设置 + +itemGroup.ae2fc=AE2流体合成套件重置 From 92e5c4adc77e61534c3de185d841216d2e8addfb Mon Sep 17 00:00:00 2001 From: zy <854865755@163.com> Date: Sat, 3 Sep 2022 18:55:42 +0800 Subject: [PATCH 2/4] add fluid bus shift click transfer upgrade card into the slot --- .../gui/container/ContainerFluidConfigurable.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidConfigurable.java b/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidConfigurable.java index d4818dc6..a5952662 100644 --- a/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidConfigurable.java +++ b/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidConfigurable.java @@ -18,6 +18,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.Slot; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; @@ -41,6 +43,7 @@ public abstract class ContainerFluidConfigurable extends ContainerUpgradeable { ItemStack tis = clickSlot.getStack(); FluidStack fs = Util.getFluidFromItem(tis); + ItemStack itemstack = tis.copy();; if( fs != null ) { final AppEngInternalAEInventory inv = this.getFakeFluidInv(); @@ -57,9 +60,17 @@ public abstract class ContainerFluidConfigurable extends ContainerUpgradeable { break; } } + } else { + if(!mergeItemStack(itemstack, 0, this.inventorySlots.size(), false)) return null; + Slot slot = (Slot) this.inventorySlots.get(idx); + if (itemstack.stackSize == 0) { + slot.putStack(null); + } else { + slot.onSlotChanged(); + } } this.standardDetectAndSendChanges(); - return null; + return itemstack; } protected void setupConfig() From 49181f3df6dde72a9fed8937591f99036dc8e939 Mon Sep 17 00:00:00 2001 From: zy <854865755@163.com> Date: Sat, 3 Sep 2022 18:55:42 +0800 Subject: [PATCH 3/4] add fluid bus shift click transfer upgrade card into the slot --- .../container/ContainerFluidConfigurable.java | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidConfigurable.java b/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidConfigurable.java index d4818dc6..1a589258 100644 --- a/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidConfigurable.java +++ b/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidConfigurable.java @@ -18,6 +18,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.Slot; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; @@ -41,6 +43,7 @@ public abstract class ContainerFluidConfigurable extends ContainerUpgradeable { ItemStack tis = clickSlot.getStack(); FluidStack fs = Util.getFluidFromItem(tis); + ItemStack itemstack = tis.copy();; if( fs != null ) { final AppEngInternalAEInventory inv = this.getFakeFluidInv(); @@ -57,9 +60,22 @@ public abstract class ContainerFluidConfigurable extends ContainerUpgradeable { break; } } + this.standardDetectAndSendChanges(); + return null; + } else { + if(idx < this.availableUpgrades()){ + if(!mergeItemStack(tis, this.getFakeFluidInv().getSizeInventory()+this.availableUpgrades(), this.inventorySlots.size(), false)) return null; + }else if(idx>=this.getFakeFluidInv().getSizeInventory()+this.availableUpgrades()){ + if(!mergeItemStack(tis, 0, this.availableUpgrades(), false)) return null; + } + if (tis.stackSize == 0) { + clickSlot.putStack(null); + } else { + clickSlot.onSlotChanged(); + } + this.standardDetectAndSendChanges(); + return tis; } - this.standardDetectAndSendChanges(); - return null; } protected void setupConfig() From 6d5c8ca43532af470a271128863fe7055a0d2655 Mon Sep 17 00:00:00 2001 From: asdflj <33802162+asdflj@users.noreply.github.com> Date: Sun, 4 Sep 2022 19:03:33 +0800 Subject: [PATCH 4/4] Update zh_CN.lang --- src/main/resources/assets/ae2fc/lang/zh_CN.lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/assets/ae2fc/lang/zh_CN.lang b/src/main/resources/assets/ae2fc/lang/zh_CN.lang index c2363ff9..0ee792e3 100644 --- a/src/main/resources/assets/ae2fc/lang/zh_CN.lang +++ b/src/main/resources/assets/ae2fc/lang/zh_CN.lang @@ -1,5 +1,5 @@ item.fluid_drop.name=%s液滴 -item.fluid_encoded_pattern.name=编写样板 +item.fluid_encoded_pattern.name=编码样板 item.part_fluid_pattern_terminal.name=ME流体样板终端 item.part_fluid_pattern_terminal_ex.name=ME增广流体样板终端 item.part_fluid_interface.name=ME二合一接口