Fluid cleanup and performance improvements (#3581)

Use custom gui widget with custom synchronization for rendering fake fluid slots.
2018-07-04 19:12:12 +02:00
parent 979531afb7
commit 5d26b98ab8
40 changed files with 1499 additions and 777 deletions
@@ -0,0 +1,117 @@
+
+package appeng.fluids.container;
+
+
+import java.util.Collections;
+import java.util.Map;
+
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.IContainerListener;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.fluids.FluidUtil;
+
+import appeng.api.config.Upgrades;
+import appeng.api.implementations.IUpgradeableHost;
+import appeng.api.storage.data.IAEFluidStack;
+import appeng.container.implementations.ContainerUpgradeable;
+import appeng.fluids.helper.FluidSyncHelper;
+import appeng.fluids.util.AEFluidStack;
+import appeng.fluids.util.IAEFluidTank;
+import appeng.util.Platform;
+
+
+public abstract class ContainerFluidConfigurable extends ContainerUpgradeable implements IFluidSyncContainer
+{
+	private FluidSyncHelper sync = null;
+
+	public ContainerFluidConfigurable( InventoryPlayer ip, IUpgradeableHost te )
+	{
+		super( ip, te );
+	}
+
+	public abstract IAEFluidTank getFluidConfigInventory();
+
+	private FluidSyncHelper getSynchHelper()
+	{
+		if( this.sync == null )
+		{
+			this.sync = new FluidSyncHelper( getFluidConfigInventory(), 0 );
+		}
+		return this.sync;
+	}
+
+	@Override
+	protected ItemStack transferStackToContainer( ItemStack input )
+	{
+		FluidStack fs = FluidUtil.getFluidContained( input );
+		if( fs != null )
+		{
+			final IAEFluidTank t = getFluidConfigInventory();
+			final IAEFluidStack stack = AEFluidStack.fromFluidStack( fs );
+			for( int i = 0; i < t.getSlots(); ++i )
+			{
+				if( t.getFluidInSlot( i ) == null && this.isValidForConfig( i, stack ) )
+				{
+					t.setFluidInSlot( i, stack );
+					break;
+				}
+			}
+		}
+		return input;
+	}
+
+	protected boolean isValidForConfig( int slot, IAEFluidStack fs )
+	{
+		if( this.supportCapacity() )
+		{
+			// assumes 4 slots per upgrade
+			final int upgrades = this.getUpgradeable().getInstalledUpgrades( Upgrades.CAPACITY );
+
+			if( slot > 0 && upgrades < 1 )
+			{
+				return false;
+			}
+			if( slot > 4 && upgrades < 2 )
+			{
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	@Override
+	protected void standardDetectAndSendChanges()
+	{
+		if( Platform.isServer() )
+		{
+			this.getSynchHelper().sendDiff( this.listeners );
+
+			// clear out config items that are no longer valid (eg capacity upgrade removed)
+			final IAEFluidTank t = getFluidConfigInventory();
+			for( int i = 0; i < t.getSlots(); ++i )
+			{
+				if( t.getFluidInSlot( i ) != null && !this.isValidForConfig( i, t.getFluidInSlot( i ) ) )
+				{
+					t.setFluidInSlot( i, null );
+				}
+			}
+		}
+		super.standardDetectAndSendChanges();
+	}
+
+	@Override
+	public void addListener( IContainerListener listener )
+	{
+		super.addListener( listener );
+		this.getSynchHelper().sendFull( Collections.singleton( listener ) );
+	}
+
+	@Override
+	public void receiveFluidSlots( Map<Integer, IAEFluidStack> fluids )
+	{
+		this.getSynchHelper().readPacket( fluids );
+	}
+
+}