Initial Fluid Integration (#3510)
* Added Fluid Storage Cells * Added Fluid Import Bus * Added Fluid Export Bus * Added Fluid Storage Bus * Added Fluid Terminal. While holding a item with the FLUID_HANDLER_ITEM_CAPABILITY, such as a tank Left click on a fluid to extract the fluid Right click to insert the fluid
This commit is contained in:
@@ -67,6 +67,8 @@ import net.minecraft.world.World;
|
||||
import net.minecraft.world.WorldServer;
|
||||
import net.minecraft.world.chunk.Chunk;
|
||||
import net.minecraftforge.common.util.FakePlayerFactory;
|
||||
import net.minecraftforge.fluids.FluidRegistry;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
import net.minecraftforge.fml.common.FMLCommonHandler;
|
||||
import net.minecraftforge.fml.common.Loader;
|
||||
import net.minecraftforge.fml.common.ModContainer;
|
||||
@@ -121,6 +123,7 @@ import appeng.me.GridNode;
|
||||
import appeng.me.helpers.AENetworkProxy;
|
||||
import appeng.util.helpers.ItemComparisonHelper;
|
||||
import appeng.util.helpers.P2PHelper;
|
||||
import appeng.util.item.AEFluidStack;
|
||||
import appeng.util.item.AEItemStack;
|
||||
import appeng.util.prioritylist.IPartitionList;
|
||||
|
||||
@@ -610,6 +613,17 @@ public class Platform
|
||||
return n == null ? "** Null" : n;
|
||||
}
|
||||
|
||||
public static String getModId( final IAEFluidStack fs )
|
||||
{
|
||||
if( fs == null || fs.getFluidStack() == null )
|
||||
{
|
||||
return "** Null";
|
||||
}
|
||||
|
||||
final String n = FluidRegistry.getModId( fs.getFluidStack() );
|
||||
return n == null ? "** Null" : n;
|
||||
}
|
||||
|
||||
public static String getItemDisplayName( final Object o )
|
||||
{
|
||||
if( o == null )
|
||||
@@ -655,6 +669,33 @@ public class Platform
|
||||
}
|
||||
}
|
||||
|
||||
public static String getFluidDisplayName( Object o )
|
||||
{
|
||||
if( o == null )
|
||||
{
|
||||
return "** Null";
|
||||
}
|
||||
FluidStack fluidStack = null;
|
||||
if( o instanceof AEFluidStack )
|
||||
{
|
||||
fluidStack = ( (AEFluidStack) o ).getFluidStack();
|
||||
}
|
||||
else if( o instanceof FluidStack )
|
||||
{
|
||||
fluidStack = (FluidStack) o;
|
||||
}
|
||||
else
|
||||
{
|
||||
return "**Invalid Object";
|
||||
}
|
||||
String n = fluidStack.getLocalizedName();
|
||||
if( n == null || "".equalsIgnoreCase( n ) )
|
||||
{
|
||||
n = fluidStack.getUnlocalizedName();
|
||||
}
|
||||
return n == null ? "** Null" : n;
|
||||
}
|
||||
|
||||
public static boolean isWrench( final EntityPlayer player, final ItemStack eq, final BlockPos pos )
|
||||
{
|
||||
if( !eq.isEmpty() )
|
||||
|
||||
Reference in New Issue
Block a user