Merge pull request #30 from GTNewHorizons/cleanup

fluid terminal code clean up

src/main/java/com/glodblock/github/client/gui/GuiFCBaseFluidMonitor.java

@@ -39,8 +39,10 @@ import com.glodblock.github.common.item.ItemFluidDrop;
 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 org.lwjgl.input.Mouse;
 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 class GuiFCBaseFluidMonitor extends AEBaseMEGui implements ISortSource, I
 
     public void postUpdate(final List<IAEFluidStack> 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 class GuiFCBaseFluidMonitor extends AEBaseMEGui implements ISortSource, I
 
     @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);
     }
 

src/main/java/com/glodblock/github/client/me/FluidRepo.java

@@ -89,15 +89,12 @@ public class FluidRepo extends ItemRepo {
     }
 
     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);
         }
     }
 

src/main/java/com/glodblock/github/common/item/ItemFluidDrop.java

@@ -46,6 +46,9 @@ public class ItemFluidDrop extends Item {
     @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 class ItemFluidDrop extends Item {
     @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 class ItemFluidDrop extends Item {
         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;
     }

src/main/java/com/glodblock/github/common/parts/PartFluidTerminal.java

@@ -19,8 +19,8 @@ import java.util.Objects;
 
 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);

src/main/java/com/glodblock/github/util/Util.java

@@ -18,6 +18,7 @@ import net.minecraft.util.EnumFacing;
 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) {

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

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