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/tile/spatial/TileSpatialIOPort.java
+5 -5
View File
@@ -22,8 +22,8 @@ package appeng.tile.spatial;
import javax.annotation.Nonnull;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.EnumFacing;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.util.Direction;
import net.minecraft.world.World;
import net.minecraftforge.items.IItemHandler;
@@ -65,7 +65,7 @@ public class TileSpatialIOPort extends AENetworkInvTile implements IWorldCallabl
}
@Override
public NBTTagCompound writeToNBT( final NBTTagCompound data )
public CompoundNBT writeToNBT( final CompoundNBT data )
{
super.writeToNBT( data );
data.setInteger( "lastRedstoneState", this.lastRedstoneState.ordinal() );
@@ -73,7 +73,7 @@ public class TileSpatialIOPort extends AENetworkInvTile implements IWorldCallabl
}
@Override
public void readFromNBT( final NBTTagCompound data )
public void readFromNBT( final CompoundNBT data )
{
super.readFromNBT( data );
if( data.hasKey( "lastRedstoneState" ) )
@@ -182,7 +182,7 @@ public class TileSpatialIOPort extends AENetworkInvTile implements IWorldCallabl
}
@Override
protected @Nonnull IItemHandler getItemHandlerForSide( @Nonnull EnumFacing side )
protected @Nonnull IItemHandler getItemHandlerForSide( @Nonnull Direction side )
{
return this.invExt;
}
src/main/java/appeng/tile/spatial/TileSpatialPylon.java
+3 -3
View File
@@ -24,7 +24,7 @@ import java.util.EnumSet;
import io.netty.buffer.ByteBuf;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.Direction;
import appeng.api.networking.GridFlags;
import appeng.api.networking.events.MENetworkChannelsChanged;
@@ -63,7 +63,7 @@ public class TileSpatialPylon extends AENetworkTile implements IAEMultiBlock
{
this.getProxy().setFlags( GridFlags.REQUIRE_CHANNEL, GridFlags.MULTIBLOCK );
this.getProxy().setIdlePowerUsage( 0.5 );
this.getProxy().setValidSides( EnumSet.noneOf( EnumFacing.class ) );
this.getProxy().setValidSides( EnumSet.noneOf( Direction.class ) );
}
@Override
@@ -123,7 +123,7 @@ public class TileSpatialPylon extends AENetworkTile implements IAEMultiBlock
public void updateStatus( final SpatialPylonCluster c )
{
this.cluster = c;
this.getProxy().setValidSides( c == null ? EnumSet.noneOf( EnumFacing.class ) : EnumSet.allOf( EnumFacing.class ) );
this.getProxy().setValidSides( c == null ? EnumSet.noneOf( Direction.class ) : EnumSet.allOf( Direction.class ) );
this.recalculateDisplay();
}