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/parts/networking/PartCable.java
+11 -11
View File
@@ -26,10 +26,10 @@ import com.google.common.collect.ImmutableSet;
import io.netty.buffer.ByteBuf;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.PlayerEntity;
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 appeng.api.AEApi;
import appeng.api.config.SecurityPermissions;
@@ -108,7 +108,7 @@ public class PartCable extends AEBasePart implements IPartCable
}
@Override
public boolean changeColor( final AEColor newColor, final EntityPlayer who )
public boolean changeColor( final AEColor newColor, final PlayerEntity who )
{
if( this.getCableColor() != newColor )
{
@@ -164,13 +164,13 @@ public class PartCable extends AEBasePart implements IPartCable
}
@Override
public void setValidSides( final EnumSet<EnumFacing> sides )
public void setValidSides( final EnumSet<Direction> sides )
{
this.getProxy().setValidSides( sides );
}
@Override
public boolean isConnected( final EnumFacing side )
public boolean isConnected( final Direction side )
{
return this.getConnections().contains( AEPartLocation.fromFacing( side ) );
}
@@ -267,7 +267,7 @@ public class PartCable extends AEBasePart implements IPartCable
}
@Override
public void writeToNBT( final NBTTagCompound data )
public void writeToNBT( final CompoundNBT data )
{
super.writeToNBT( data );
@@ -292,10 +292,10 @@ public class PartCable extends AEBasePart implements IPartCable
public void writeToStream( final ByteBuf data ) throws IOException
{
int flags = 0;
boolean[] writeSide = new boolean[EnumFacing.values().length];
int[] channelsPerSide = new int[EnumFacing.values().length];
boolean[] writeSide = new boolean[Direction.values().length];
int[] channelsPerSide = new int[Direction.values().length];
for( EnumFacing thisSide : EnumFacing.values() )
for( Direction thisSide : Direction.values() )
{
final IPart part = this.getHost().getPart( thisSide );
if( part != null )
@@ -409,7 +409,7 @@ public class PartCable extends AEBasePart implements IPartCable
return this.channelsOnSide[i];
}
public int getChannelsOnSide( EnumFacing side )
public int getChannelsOnSide( Direction side )
{
if( !this.powered )
{
src/main/java/appeng/parts/networking/PartQuartzFiber.java
+6 -6
View File
@@ -23,11 +23,11 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.EnumSet;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumHand;
import net.minecraft.util.Hand;
import net.minecraft.util.ResourceLocation;
import appeng.api.config.Actionable;
@@ -78,14 +78,14 @@ public class PartQuartzFiber extends AEBasePart implements IEnergyGridProvider
}
@Override
public void readFromNBT( final NBTTagCompound extra )
public void readFromNBT( final CompoundNBT extra )
{
super.readFromNBT( extra );
this.outerProxy.readFromNBT( extra );
}
@Override
public void writeToNBT( final NBTTagCompound extra )
public void writeToNBT( final CompoundNBT extra )
{
super.writeToNBT( extra );
this.outerProxy.writeToNBT( extra );
@@ -125,7 +125,7 @@ public class PartQuartzFiber extends AEBasePart implements IEnergyGridProvider
}
@Override
public void onPlacement( final EntityPlayer player, final EnumHand hand, final ItemStack held, final AEPartLocation side )
public void onPlacement( final PlayerEntity player, final Hand hand, final ItemStack held, final AEPartLocation side )
{
super.onPlacement( player, hand, held, side );
this.outerProxy.setOwner( player );