fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.15 port

Browse Source
This commit is contained in:
yueh
2020-05-18 14:02:45 +02:00
parent 0ea86c939c
commit 16d6d55d7f
630 changed files with 4211 additions and 12664 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/fluids/helper/DualityFluidInterface.java
+6 -6
View File
@@ -21,9 +21,9 @@ package appeng.fluids.helper;
import java.util.Optional;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.Direction;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidStack;
@@ -229,13 +229,13 @@ public class DualityFluidInterface implements IGridTickable, IStorageMonitorable
return new DimensionalCoord( this.iHost.getTileEntity() );
}
public boolean hasCapability( Capability<?> capabilityClass, EnumFacing facing )
public boolean hasCapability( Capability<?> capabilityClass, Direction facing )
{
return capabilityClass == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY || capabilityClass == Capabilities.STORAGE_MONITORABLE_ACCESSOR;
}
@SuppressWarnings( "unchecked" )
public <T> T getCapability( Capability<T> capabilityClass, EnumFacing facing )
public <T> T getCapability( Capability<T> capabilityClass, Direction facing )
{
if( capabilityClass == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY )
{
@@ -492,14 +492,14 @@ public class DualityFluidInterface implements IGridTickable, IStorageMonitorable
this.priority = newValue;
}
public void writeToNBT( final NBTTagCompound data )
public void writeToNBT( final CompoundNBT data )
{
data.setInteger( "priority", this.priority );
this.tanks.writeToNBT( data, "storage" );
this.config.writeToNBT( data, "config" );
}
public void readFromNBT( final NBTTagCompound data )
public void readFromNBT( final CompoundNBT data )
{
this.config.readFromNBT( data, "config" );
this.tanks.readFromNBT( data, "storage" );
src/main/java/appeng/fluids/helper/FluidSyncHelper.java
+3 -3
View File
@@ -6,7 +6,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.entity.player.PlayerEntityMP;
import net.minecraft.inventory.IContainerListener;
import appeng.api.storage.data.IAEFluidStack;
@@ -59,9 +59,9 @@ public class FluidSyncHelper
for( final IContainerListener l : listeners )
{
if( l instanceof EntityPlayerMP )
if( l instanceof PlayerEntityMP )
{
NetworkHandler.instance().sendTo( new PacketFluidSlot( data ), (EntityPlayerMP) l );
NetworkHandler.instance().sendTo( new PacketFluidSlot( data ), (PlayerEntityMP) l );
}
}
}
src/main/java/appeng/fluids/helper/IFluidInterfaceHost.java
+2 -2
View File
@@ -22,7 +22,7 @@ package appeng.fluids.helper;
import java.util.EnumSet;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.Direction;
import appeng.api.implementations.IUpgradeableHost;
import appeng.api.networking.security.IActionHost;
@@ -33,7 +33,7 @@ public interface IFluidInterfaceHost extends IActionHost, IGridProxyable, IUpgra
{
DualityFluidInterface getDualityFluidInterface();
EnumSet<EnumFacing> getTargets();
EnumSet<Direction> getTargets();
TileEntity getTileEntity();