fluid display

This commit is contained in:
GlodBlock committed 2022-06-13 10:24:38 +08:00
1 parent 213b43d213
commit 12565b1389
9 files changed
+108 -18

No files matched your search

@@ -387,8 +387,6 @@ public class GuiFCBaseMonitor extends AEBaseMEGui implements ISortSource, IConfi
}
}
System.out.print(action + "\n");
if( Ae2ReflectClient.getDragClick(this).size() > 1 )
{
return;
@@ -13,6 +13,7 @@ import com.glodblock.github.FluidCraft;
import com.glodblock.github.client.gui.container.ContainerFluidCraftConfirm;
import com.glodblock.github.common.parts.PartFluidPatternTerminal;
import com.glodblock.github.common.parts.PartFluidPatternTerminalEx;
import com.glodblock.github.coremod.hooker.CoreModHooks;
import com.glodblock.github.inventory.gui.GuiType;
import com.glodblock.github.network.CPacketFluidPatternTermBtns;
import com.glodblock.github.network.CPacketSwitchGuis;
@@ -252,7 +253,7 @@ public class GuiFluidCraftConfirm extends AEBaseGui {
if( this.tooltip == z - viewStart )
{
lineList.add( GuiText.FromStorage.getLocal() + ": " + Long.toString( stored.getStackSize() ) );
lineList.add( GuiText.FromStorage.getLocal() + ": " + stored.getStackSize());
}
downY += 5;
@@ -277,7 +278,7 @@ public class GuiFluidCraftConfirm extends AEBaseGui {
if( this.tooltip == z - viewStart )
{
lineList.add( GuiText.Missing.getLocal() + ": " + Long.toString( missingStack.getStackSize() ) );
lineList.add( GuiText.Missing.getLocal() + ": " + missingStack.getStackSize());
}
red = true;
@@ -310,7 +311,7 @@ public class GuiFluidCraftConfirm extends AEBaseGui {
final int posX = x * ( 1 + sectionLength ) + xo + sectionLength - 19;
final int posY = y * offY + yo;
final ItemStack is = refStack.copy().getItemStack();
final ItemStack is = CoreModHooks.displayFluid(refStack.copy());
if( this.tooltip == z - viewStart )
{
@@ -131,10 +131,7 @@ public abstract class ContainerFluidConfigurable extends ContainerUpgradeable {
public void setFluid(int id, IAEFluidStack fluidStack) {
final AppEngInternalAEInventory inv = this.getFakeFluidInv();
if (inv != null && this.isValidForConfig(id, AEFluidStack.create(fluidStack))) {
ItemStack tmp = ItemFluidPacket.newStack(fluidStack.getFluidStack());
if (tmp != null) {
tmp.setStackDisplayName(fluidStack.getFluidStack().getLocalizedName());
}
ItemStack tmp = ItemFluidPacket.newDisplayStack(fluidStack.getFluidStack());
inv.setInventorySlotContents(id, tmp);
}
}
@@ -140,7 +140,6 @@ public class ContainerFluidPatternTerminal extends FCBasePartContainer implement
@Override
public void doAction(EntityPlayerMP player, InventoryAction action, int slotId, long id) {
System.out.print(action + "\n");
if (this.isCraftingMode()) {
super.doAction(player, action, slotId, id);
return;