Fluid cleanup and performance improvements (#3581)

Use custom gui widget with custom synchronization for rendering fake fluid slots.

src/main/java/appeng/client/gui/AEBaseGui.java

@@ -57,9 +57,10 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.text.TextFormatting;
 import net.minecraftforge.fluids.Fluid;
-import net.minecraftforge.fluids.FluidStack;
 
+import appeng.api.storage.data.IAEFluidStack;
 import appeng.api.storage.data.IAEItemStack;
+import appeng.client.gui.widgets.GuiCustomSlot;
 import appeng.client.gui.widgets.GuiScrollbar;
 import appeng.client.gui.widgets.ITooltip;
 import appeng.client.me.InternalSlotME;
@@ -84,7 +85,6 @@ import appeng.core.sync.network.NetworkHandler;
 import appeng.core.sync.packets.PacketInventoryAction;
 import appeng.core.sync.packets.PacketSwapSlots;
 import appeng.fluids.client.render.FluidStackSizeRenderer;
-import appeng.fluids.container.slots.IFluidSlot;
 import appeng.fluids.container.slots.IMEFluidSlot;
 import appeng.helpers.InventoryAction;
 
@@ -101,6 +101,7 @@ public abstract class AEBaseGui extends GuiContainer
 	private Stopwatch dbl_clickTimer = Stopwatch.createStarted();
 	private ItemStack dbl_whichItem = ItemStack.EMPTY;
 	private Slot bl_clicked;
+	protected final List<GuiCustomSlot> guiSlots = new ArrayList<>();
 
 	public AEBaseGui( final Container container )
 	{
@@ -154,35 +155,76 @@ public abstract class AEBaseGui extends GuiContainer
 	}
 
 	@Override
-	public void drawScreen( final int mouseX, final int mouseY, final float btn )
+	public void drawScreen( final int mouseX, final int mouseY, final float partialTicks )
 	{
 		super.drawDefaultBackground();
-		super.drawScreen( mouseX, mouseY, btn );
+		super.drawScreen( mouseX, mouseY, partialTicks );
+
+		GlStateManager.pushMatrix();
+		GlStateManager.translate( (float) this.guiLeft, (float) this.guiTop, 0.0F );
+		GlStateManager.enableDepth();
+		for( final GuiCustomSlot c : this.guiSlots )
+		{
+			drawGuiSlot( c, mouseX, mouseY, partialTicks );
+		}
+		GlStateManager.disableDepth();
+		for( final GuiCustomSlot c : this.guiSlots )
+		{
+			drawTooltip( c, mouseX - this.guiLeft, mouseY - this.guiTop );
+		}
+		GlStateManager.popMatrix();
+
 		this.renderHoveredToolTip( mouseX, mouseY );
 
 		for( final Object c : this.buttonList )
 		{
 			if( c instanceof ITooltip )
 			{
-				final ITooltip tooltip = (ITooltip) c;
-				final int x = tooltip.xPos(); // ((GuiImgButton) c).x;
-				int y = tooltip.yPos(); // ((GuiImgButton) c).y;
+				drawTooltip( (ITooltip) c, mouseX, mouseY );
+			}
+		}
+	}
 
-				if( x < mouseX && x + tooltip.getWidth() > mouseX && tooltip.isVisible() )
+	protected void drawGuiSlot( GuiCustomSlot slot, int mouseX, int mouseY, float partialTicks )
+	{
+		if( slot.isSlotEnabled() )
+		{
+			final int left = slot.xPos();
+			final int top = slot.yPos();
+			final int right = left + slot.getWidth();
+			final int bottom = top + slot.getHeight();
+
+			slot.drawContent( this.mc, mouseX, mouseY, partialTicks );
+
+			if( this.isPointInRegion( left, top, slot.getWidth(), slot.getHeight(), mouseX, mouseY ) && slot.canClick( this.mc.player ) )
+			{
+				GlStateManager.disableLighting();
+				GlStateManager.colorMask( true, true, true, false );
+				this.drawGradientRect( left, top, right, bottom, -2130706433, -2130706433 );
+				GlStateManager.colorMask( true, true, true, true );
+				GlStateManager.enableLighting();
+			}
+		}
+	}
+
+	private void drawTooltip( ITooltip tooltip, int mouseX, int mouseY )
+	{
+		final int x = tooltip.xPos(); // ((GuiImgButton) c).x;
+		int y = tooltip.yPos(); // ((GuiImgButton) c).y;
+
+		if( x < mouseX && x + tooltip.getWidth() > mouseX && tooltip.isVisible() )
+		{
+			if( y < mouseY && y + tooltip.getHeight() > mouseY )
+			{
+				if( y < 15 )
 				{
-					if( y < mouseY && y + tooltip.getHeight() > mouseY )
-					{
-						if( y < 15 )
-						{
-							y = 15;
-						}
+					y = 15;
+				}
 
-						final String msg = tooltip.getMessage();
-						if( msg != null )
-						{
-							this.drawTooltip( x + 11, y + 4, msg );
-						}
-					}
+				final String msg = tooltip.getMessage();
+				if( msg != null )
+				{
+					this.drawTooltip( x + 11, y + 4, msg );
 				}
 			}
 		}
@@ -216,23 +258,6 @@ public abstract class AEBaseGui extends GuiContainer
 		this.drawHoveringText( lines, x, y, this.fontRenderer );
 	}
 
-	@Override
-	protected void renderHoveredToolTip( int mouseX, int mouseY )
-	{
-		Slot slot = this.getSlot( mouseX, mouseY );
-		if( slot != null && slot.isEnabled() && slot instanceof IFluidSlot )
-		{
-			IFluidSlot fluidSlot = (IFluidSlot) slot;
-			if( fluidSlot.getFluidStack() != null && fluidSlot.shouldRenderAsFluid() )
-			{
-				FluidStack fluidStack = fluidSlot.getFluidStack();
-				this.drawHoveringText( fluidStack.getLocalizedName(), mouseX, mouseY );
-				return;
-			}
-		}
-		super.renderHoveredToolTip( mouseX, mouseY );
-	}
-
 	@Override
 	protected final void drawGuiContainerForegroundLayer( final int x, final int y )
 	{
@@ -285,6 +310,12 @@ public abstract class AEBaseGui extends GuiContainer
 				}
 			}
 		}
+
+		for( final GuiCustomSlot slot : this.guiSlots )
+		{
+			slot.drawBackground( ox, oy );
+		}
+
 	}
 
 	@Override
@@ -305,6 +336,14 @@ public abstract class AEBaseGui extends GuiContainer
 			}
 		}
 
+		for( GuiCustomSlot slot : this.guiSlots )
+		{
+			if( this.isPointInRegion( slot.xPos(), slot.yPos(), slot.getWidth(), slot.getHeight(), xCoord, yCoord ) && slot.canClick( this.mc.player ) )
+			{
+				slot.slotClicked( this.mc.player.inventory.getItemStack(), btn );
+			}
+		}
+
 		if( this.getScrollBar() != null )
 		{
 			this.getScrollBar().click( this, xCoord - this.guiLeft, yCoord - this.guiTop );
@@ -743,18 +782,18 @@ public abstract class AEBaseGui extends GuiContainer
 
 			return;
 		}
-		else if( s instanceof IFluidSlot && ( (IFluidSlot) s ).shouldRenderAsFluid() )
+		else if( s instanceof IMEFluidSlot && ( (IMEFluidSlot) s ).shouldRenderAsFluid() )
 		{
-			final IFluidSlot slot = (IFluidSlot) s;
-			final FluidStack fs = slot.getFluidStack();
+			final IMEFluidSlot slot = (IMEFluidSlot) s;
+			final IAEFluidStack fs = slot.getAEFluidStack();
 
 			if( fs != null && this.isPowered() )
 			{
 				GlStateManager.disableLighting();
 				GlStateManager.disableBlend();
-				Fluid fluid = fs.getFluid();
+				final Fluid fluid = fs.getFluid();
 				Minecraft.getMinecraft().getTextureManager().bindTexture( TextureMap.LOCATION_BLOCKS_TEXTURE );
-				TextureAtlasSprite sprite = Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite( fluid.getStill().toString() );
+				final TextureAtlasSprite sprite = Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite( fluid.getStill().toString() );
 
 				// Set color for dynamic fluids
 				// Convert int color to RGB
@@ -767,11 +806,7 @@ public abstract class AEBaseGui extends GuiContainer
 				GlStateManager.enableLighting();
 				GlStateManager.enableBlend();
 
-				if( s instanceof IMEFluidSlot )
-				{
-					final IMEFluidSlot meFluidSlot = (IMEFluidSlot) s;
-					this.fluidStackSizeRenderer.renderStackSize( this.fontRenderer, meFluidSlot.getAEFluidStack(), s.xPos, s.yPos );
-				}
+				this.fluidStackSizeRenderer.renderStackSize( this.fontRenderer, fs, s.xPos, s.yPos );
 			}
 			else if( !this.isPowered() )
 			{

src/main/java/appeng/client/gui/widgets/GuiCustomSlot.java

@@ -0,0 +1,85 @@
+
+package appeng.client.gui.widgets;
+
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.Gui;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+
+
+public abstract class GuiCustomSlot extends Gui implements ITooltip
+{
+	private final int x;
+	private final int y;
+	private final int id;
+
+	public GuiCustomSlot( final int id, final int x, final int y )
+	{
+		this.x = x;
+		this.y = y;
+		this.id = id;
+	}
+
+	public int getId()
+	{
+		return id;
+	}
+
+	public boolean canClick( final EntityPlayer player )
+	{
+		return true;
+	}
+
+	public void slotClicked( final ItemStack clickStack, final int mouseButton )
+	{
+	}
+
+	public abstract void drawContent( final Minecraft mc, final int mouseX, final int mouseY, final float partialTicks );
+
+	public void drawBackground( int guileft, int guitop )
+	{
+	}
+
+	@Override
+	public String getMessage()
+	{
+		return null;
+	}
+
+	@Override
+	public int xPos()
+	{
+		return this.x;
+	}
+
+	@Override
+	public int yPos()
+	{
+		return this.y;
+	}
+
+	@Override
+	public int getWidth()
+	{
+		return 16;
+	}
+
+	@Override
+	public int getHeight()
+	{
+		return 16;
+	}
+
+	@Override
+	public boolean isVisible()
+	{
+		return false;
+	}
+
+	public boolean isSlotEnabled()
+	{
+		return true;
+	}
+
+}

src/main/java/appeng/client/gui/widgets/GuiFluidTank.java

@@ -1,128 +0,0 @@
-/*
- * This file is part of Applied Energistics 2.
- * Copyright (c) 2013 - 2018, AlgorithmX2, All rights reserved.
- *
- * Applied Energistics 2 is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Applied Energistics 2 is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Applied Energistics 2.  If not, see <http://www.gnu.org/licenses/lgpl>.
- */
-
-package appeng.client.gui.widgets;
-
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.client.renderer.texture.TextureAtlasSprite;
-import net.minecraft.client.renderer.texture.TextureMap;
-import net.minecraftforge.fluids.FluidStack;
-import net.minecraftforge.fluids.IFluidTank;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
-
-import appeng.api.util.AEColor;
-
-
-@SideOnly( Side.CLIENT )
-public class GuiFluidTank extends GuiButton implements ITooltip
-{
-	private final IFluidTank tank;
-
-	public GuiFluidTank( int buttonId, IFluidTank tank, int x, int y, int w, int h )
-	{
-		super( buttonId, x, y, w, h, "" );
-		this.tank = tank;
-	}
-
-	@Override
-	public void drawButton( final Minecraft mc, final int mouseX, final int mouseY, final float partialTicks )
-	{
-		if( this.visible )
-		{
-			GlStateManager.disableBlend();
-			GlStateManager.disableLighting();
-
-			drawRect( this.x, this.y, this.x + this.width, this.y + this.height, AEColor.GRAY.blackVariant | 0xFF000000 );
-
-			if( this.tank != null )
-			{
-				final FluidStack fluid = this.tank.getFluid();
-				if( fluid != null && fluid.amount > 0 )
-				{
-					mc.getTextureManager().bindTexture( TextureMap.LOCATION_BLOCKS_TEXTURE );
-
-					float red = ( fluid.getFluid().getColor() >> 16 & 255 ) / 255.0F;
-					float green = ( fluid.getFluid().getColor() >> 8 & 255 ) / 255.0F;
-					float blue = ( fluid.getFluid().getColor() & 255 ) / 255.0F;
-					GlStateManager.color( red, green, blue );
-
-					TextureAtlasSprite sprite = mc.getTextureMapBlocks().getAtlasSprite( fluid.getFluid().getStill().toString() );
-					final int scaledHeight = (int) ( this.height * ( (float) fluid.amount / this.tank.getCapacity() ) );
-
-					int iconHeightRemainder = scaledHeight % 16;
-					if( iconHeightRemainder > 0 )
-					{
-						drawTexturedModalRect( this.x, this.y + this.height - iconHeightRemainder, sprite, 16, iconHeightRemainder );
-					}
-					for( int i = 0; i < scaledHeight / 16; i++ )
-					{
-						drawTexturedModalRect( this.x, this.y + this.height - iconHeightRemainder - ( i + 1 ) * 16, sprite, 16, 16 );
-					}
-				}
-			}
-		}
-	}
-
-	@Override
-	public String getMessage()
-	{
-		if( this.tank != null && this.tank.getFluid() != null && this.tank.getFluid().amount > 0 )
-		{
-			String desc = this.tank.getFluid().getFluid().getLocalizedName( this.tank.getFluid() );
-			String amountToText = this.tank.getFluid().amount + "mB";
-
-			return desc + "\n" + amountToText;
-		}
-		return null;
-	}
-
-	@Override
-	public int xPos()
-	{
-		return this.x - 2;
-	}
-
-	@Override
-	public int yPos()
-	{
-		return this.y - 2;
-	}
-
-	@Override
-	public int getWidth()
-	{
-		return this.width + 4;
-	}
-
-	@Override
-	public int getHeight()
-	{
-		return this.height + 4;
-	}
-
-	@Override
-	public boolean isVisible()
-	{
-		return true;
-	}
-
-}

src/main/java/appeng/client/me/InternalFluidSlotME.java

@@ -19,8 +19,6 @@
 package appeng.client.me;
 
 
-import net.minecraftforge.fluids.FluidStack;
-
 import appeng.api.storage.data.IAEFluidStack;
 
 
@@ -45,11 +43,6 @@ public class InternalFluidSlotME
 		this.yPos = displayY;
 	}
 
-	FluidStack getStack()
-	{
-		return this.getAEStack() == null ? null : this.getAEStack().getFluidStack();
-	}
-
 	IAEFluidStack getAEStack()
 	{
 		return this.repo.getReferenceFluid( this.offset );

src/main/java/appeng/client/me/SlotFluidME.java

@@ -24,7 +24,6 @@ import javax.annotation.Nonnull;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.items.SlotItemHandler;
 
 import appeng.api.storage.data.IAEFluidStack;
@@ -70,12 +69,6 @@ public class SlotFluidME extends SlotItemHandler implements IMEFluidSlot
 		return ItemStack.EMPTY;
 	}
 
-	@Override
-	public FluidStack getFluidStack()
-	{
-		return this.slot.getStack();
-	}
-
 	@Override
 	public boolean getHasStack()
 	{