From c1c1aef1f5bf35e5c78b6e33df23a0f29ed878b5 Mon Sep 17 00:00:00 2001 From: GlodBlock <1356392126@qq.com> Date: Sun, 23 Oct 2022 18:10:37 +0800 Subject: [PATCH] fluid terminal clean up --- .../github/client/gui/GuiFCBaseFluidMonitor.java | 8 ++++---- .../com/glodblock/github/client/me/FluidRepo.java | 9 +++------ .../github/common/item/ItemFluidDrop.java | 7 ++++++- .../github/common/parts/PartFluidTerminal.java | 4 ++-- src/main/java/com/glodblock/github/util/Util.java | 1 + src/main/resources/META-INF/ae2fc_at.cfg | 2 ++ src/main/resources/assets/ae2fc/lang/en_US.lang | 4 ++++ .../textures/blocks/fluid_terminal_board.png | Bin 244 -> 0 bytes 8 files changed, 22 insertions(+), 13 deletions(-) delete mode 100644 src/main/resources/assets/ae2fc/textures/blocks/fluid_terminal_board.png diff --git a/src/main/java/com/glodblock/github/client/gui/GuiFCBaseFluidMonitor.java b/src/main/java/com/glodblock/github/client/gui/GuiFCBaseFluidMonitor.java index 5470b1a9f..ea5cda31c 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiFCBaseFluidMonitor.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiFCBaseFluidMonitor.java @@ -39,8 +39,10 @@ import com.glodblock.github.network.CPacketInventoryAction; import com.glodblock.github.util.Ae2ReflectClient; import com.glodblock.github.util.ModAndClassUtil; +import com.glodblock.github.util.NameConst; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; @@ -52,8 +54,6 @@ import java.io.IOException; import java.util.List; -import static com.glodblock.github.common.item.ItemFluidDrop.newStack1; - public class GuiFCBaseFluidMonitor extends AEBaseMEGui implements ISortSource, IConfigManagerHost { public static int craftingGridOffsetX; @@ -105,7 +105,7 @@ public GuiFCBaseFluidMonitor(final InventoryPlayer inventoryPlayer, final ITermi public void postUpdate(final List list) { for (final IAEFluidStack is : list) { - IAEItemStack stack = AEItemStack.create(newStack1(is.getFluidStack())); + IAEItemStack stack = AEItemStack.create(ItemFluidDrop.newDisplayStack(is.getFluidStack())); stack.setStackSize(is.getStackSize()); this.repo.postUpdate(stack); } @@ -302,7 +302,7 @@ public void setSearchString(String memoryText, boolean updateView) { @Override public void drawFG(final int offsetX, final int offsetY, final int mouseX, final int mouseY) { - this.fontRendererObj.drawString(this.getGuiDisplayName(GuiText.Terminal.getLocal()), 8, 6, 4210752); + this.fontRendererObj.drawString(this.getGuiDisplayName(I18n.format(NameConst.GUI_FLUID_TERMINAL)), 8, 6, 4210752); this.fontRendererObj.drawString(GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752); } diff --git a/src/main/java/com/glodblock/github/client/me/FluidRepo.java b/src/main/java/com/glodblock/github/client/me/FluidRepo.java index e102d1de2..368852318 100644 --- a/src/main/java/com/glodblock/github/client/me/FluidRepo.java +++ b/src/main/java/com/glodblock/github/client/me/FluidRepo.java @@ -89,15 +89,12 @@ void setSearch(final String search) { } public void postUpdate(final IAEItemStack is) { - IAEFluidStack fluid = ItemFluidDrop.getAeFluidStack(is); - IAEItemStack i = AEItemStack.create(is.getItemStack().setStackDisplayName(fluid.getFluid().getLocalizedName())); - i.setStackSize(is.getStackSize()); - final IAEItemStack st = this.list.findPrecise(i); + final IAEItemStack st = this.list.findPrecise(is); if (st != null) { st.reset(); - st.add(i); + st.add(is); } else { - this.list.add(i); + this.list.add(is); } } diff --git a/src/main/java/com/glodblock/github/common/item/ItemFluidDrop.java b/src/main/java/com/glodblock/github/common/item/ItemFluidDrop.java index 1c033d0c1..9ce6d1a97 100644 --- a/src/main/java/com/glodblock/github/common/item/ItemFluidDrop.java +++ b/src/main/java/com/glodblock/github/common/item/ItemFluidDrop.java @@ -46,6 +46,9 @@ public void getSubItems(Item item, CreativeTabs tab, List list) { @Override public String getItemStackDisplayName(ItemStack stack) { FluidStack fluid = getFluidStack(stack); + if (ItemFluidPacket.isDisplay(stack)) { + return fluid != null ? fluid.getLocalizedName() : StatCollector.translateToLocalFormatted("error.unknown"); + } return StatCollector.translateToLocalFormatted("item.fluid_drop.name", fluid == null ? "???" : fluid.getLocalizedName()); } @@ -54,6 +57,7 @@ public String getItemStackDisplayName(ItemStack stack) { @SideOnly(Side.CLIENT) public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean flag) { FluidStack fluid = getFluidStack(stack); + if (ItemFluidPacket.isDisplay(stack)) return; if (fluid != null) { tooltip.add(String.format(EnumChatFormatting.GRAY + "%s, 1 mB", fluid.getLocalizedName())); } else { @@ -79,13 +83,14 @@ public static ItemStack newStack(@Nullable FluidStack fluid) { return stack; } - public static ItemStack newStack1(FluidStack fluid) { + public static ItemStack newDisplayStack(FluidStack fluid) { if (fluid == null) { return null; } ItemStack stack = new ItemStack(ItemAndBlockHolder.DROP, fluid.amount); NBTTagCompound tag = new NBTTagCompound(); tag.setString("Fluid", fluid.getFluid().getName()); + tag.setBoolean("DisplayOnly", true); stack.setTagCompound(tag); return stack; } diff --git a/src/main/java/com/glodblock/github/common/parts/PartFluidTerminal.java b/src/main/java/com/glodblock/github/common/parts/PartFluidTerminal.java index dd518eb69..655f036a2 100644 --- a/src/main/java/com/glodblock/github/common/parts/PartFluidTerminal.java +++ b/src/main/java/com/glodblock/github/common/parts/PartFluidTerminal.java @@ -19,8 +19,8 @@ public class PartFluidTerminal extends FCBasePart { private static final FCPartsTexture FRONT_BRIGHT_ICON = FCPartsTexture.PartFluidTerminal_Bright; - private static final FCPartsTexture FRONT_DARK_ICON = FCPartsTexture.PartFluidTerminal_Dark; - private static final FCPartsTexture FRONT_COLORED_ICON = FCPartsTexture.PartFluidTerminal_Colored; + private static final FCPartsTexture FRONT_DARK_ICON = FCPartsTexture.PartFluidTerminal_Colored; + private static final FCPartsTexture FRONT_COLORED_ICON = FCPartsTexture.PartFluidTerminal_Dark; public PartFluidTerminal(ItemStack is) { super(is, true); diff --git a/src/main/java/com/glodblock/github/util/Util.java b/src/main/java/com/glodblock/github/util/Util.java index 080ef9381..5eadad500 100644 --- a/src/main/java/com/glodblock/github/util/Util.java +++ b/src/main/java/com/glodblock/github/util/Util.java @@ -18,6 +18,7 @@ import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.*; import org.apache.commons.lang3.tuple.MutablePair; + public final class Util { public static EnumFacing from(ForgeDirection direction) { diff --git a/src/main/resources/META-INF/ae2fc_at.cfg b/src/main/resources/META-INF/ae2fc_at.cfg index d9650cf70..43816380a 100644 --- a/src/main/resources/META-INF/ae2fc_at.cfg +++ b/src/main/resources/META-INF/ae2fc_at.cfg @@ -5,3 +5,5 @@ public net.minecraft.client.gui.inventory.GuiContainer field_147003_i # guiLeft public net.minecraft.client.gui.inventory.GuiContainer field_147009_r # guiTop #Pattern Value Setting public net.minecraft.client.gui.inventory.GuiContainer field_147006_u #theSlot + +public net.minecraft.client.renderer.texture.TextureMap field_110574_e # mapRegisteredSprites diff --git a/src/main/resources/assets/ae2fc/lang/en_US.lang b/src/main/resources/assets/ae2fc/lang/en_US.lang index e7e74d14b..4e867890b 100644 --- a/src/main/resources/assets/ae2fc/lang/en_US.lang +++ b/src/main/resources/assets/ae2fc/lang/en_US.lang @@ -64,4 +64,8 @@ ae2fc.gui.oc_pattern_editor=OC Pattern Editor ae2fc.gui.button.set=Set ae2fc.gui.part_fluid_import=ME Fluid Import Bus ae2fc.gui.part_fluid_export=ME Fluid Export Bus +ae2fc.gui.part_fluid_terminal=Fluid Terminal + +error.unknown=Unknown + itemGroup.ae2fc=Fluid Craft For AE2 diff --git a/src/main/resources/assets/ae2fc/textures/blocks/fluid_terminal_board.png b/src/main/resources/assets/ae2fc/textures/blocks/fluid_terminal_board.png deleted file mode 100644 index c5c2a4c1edaa8f868bb93b8996ca72dde1ea2609..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 244 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6-E$sR$z z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8X6a5n0T@z_$#98Qbry z%m)femAFQf1m~xflqVLYG6W=M=9TFAxrQi|8S9zq85+8Ob}|R5a`AL=46*P}mauW~ z4*j-&<2)^i+0v_$Qx9)w>v~ha!i(pe2|&l_TRY8Ht+i(Xn#bVj>gTe~DWM4f%JW2x