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/misc/TileCellWorkbench.java
+3 -3
View File
@@ -22,7 +22,7 @@ package appeng.tile.misc;
import java.util.List;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.items.IItemHandler;
@@ -103,7 +103,7 @@ public class TileCellWorkbench extends AEBaseTile implements IUpgradeableHost, I
}
@Override
public NBTTagCompound writeToNBT( final NBTTagCompound data )
public CompoundNBT writeToNBT( final CompoundNBT data )
{
super.writeToNBT( data );
this.cell.writeToNBT( data, "cell" );
@@ -113,7 +113,7 @@ public class TileCellWorkbench extends AEBaseTile implements IUpgradeableHost, I
}
@Override
public void readFromNBT( final NBTTagCompound data )
public void readFromNBT( final CompoundNBT data )
{
super.readFromNBT( data );
this.cell.readFromNBT( data, "cell" );
src/main/java/appeng/tile/misc/TileCharger.java
+6 -6
View File
@@ -26,9 +26,9 @@ import java.util.List;
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.util.EnumFacing;
import net.minecraft.util.Direction;
import net.minecraftforge.items.IItemHandler;
import appeng.api.AEApi;
@@ -67,7 +67,7 @@ public class TileCharger extends AENetworkPowerTile implements ICrankable, IGrid
public TileCharger()
{
this.getProxy().setValidSides( EnumSet.noneOf( EnumFacing.class ) );
this.getProxy().setValidSides( EnumSet.noneOf( Direction.class ) );
this.getProxy().setFlags();
this.setInternalMaxPower( POWER_MAXIMUM_AMOUNT );
this.getProxy().setIdlePowerUsage( 0 );
@@ -108,7 +108,7 @@ public class TileCharger extends AENetworkPowerTile implements ICrankable, IGrid
}
@Override
public void setOrientation( final EnumFacing inForward, final EnumFacing inUp )
public void setOrientation( final Direction inForward, final Direction inUp )
{
super.setOrientation( inForward, inUp );
this.getProxy().setValidSides( EnumSet.of( this.getUp(), this.getUp().getOpposite() ) );
@@ -147,7 +147,7 @@ public class TileCharger extends AENetworkPowerTile implements ICrankable, IGrid
}
@Override
public boolean canCrankAttach( final EnumFacing directionToCrank )
public boolean canCrankAttach( final Direction directionToCrank )
{
return this.getUp() == directionToCrank || this.getUp().getOpposite() == directionToCrank;
}
@@ -173,7 +173,7 @@ public class TileCharger extends AENetworkPowerTile implements ICrankable, IGrid
this.markForUpdate();
}
public void activate( final EntityPlayer player )
public void activate( final PlayerEntity player )
{
if( !Platform.hasPermissions( new DimensionalCoord( this ), player ) )
{
src/main/java/appeng/tile/misc/TileCondenser.java
+6 -6
View File
@@ -22,8 +22,8 @@ package appeng.tile.misc;
import javax.annotation.Nullable;
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.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidStack;
@@ -85,7 +85,7 @@ public class TileCondenser extends AEBaseInvTile implements IConfigManagerHost,
}
@Override
public NBTTagCompound writeToNBT( final NBTTagCompound data )
public CompoundNBT writeToNBT( final CompoundNBT data )
{
super.writeToNBT( data );
this.cm.writeToNBT( data );
@@ -94,7 +94,7 @@ public class TileCondenser extends AEBaseInvTile implements IConfigManagerHost,
}
@Override
public void readFromNBT( final NBTTagCompound data )
public void readFromNBT( final CompoundNBT data )
{
super.readFromNBT( data );
this.cm.readFromNBT( data );
@@ -220,7 +220,7 @@ public class TileCondenser extends AEBaseInvTile implements IConfigManagerHost,
}
@Override
public boolean hasCapability( Capability<?> capability, EnumFacing facing )
public boolean hasCapability( Capability<?> capability, Direction facing )
{
if( capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY )
{
@@ -235,7 +235,7 @@ public class TileCondenser extends AEBaseInvTile implements IConfigManagerHost,
@SuppressWarnings( "unchecked" )
@Override
public <T> T getCapability( Capability<T> capability, @Nullable EnumFacing facing )
public <T> T getCapability( Capability<T> capability, @Nullable Direction facing )
{
if( capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY )
{
src/main/java/appeng/tile/misc/TileInscriber.java
+11 -11
View File
@@ -31,8 +31,8 @@ import com.google.common.collect.Lists;
import io.netty.buffer.ByteBuf;
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.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.items.IItemHandler;
@@ -104,7 +104,7 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable,
public TileInscriber()
{
this.getProxy().setValidSides( EnumSet.noneOf( EnumFacing.class ) );
this.getProxy().setValidSides( EnumSet.noneOf( Direction.class ) );
this.setInternalMaxPower( 1600 );
this.getProxy().setIdlePowerUsage( 0 );
this.settings = new ConfigManager( this );
@@ -132,7 +132,7 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable,
}
@Override
public NBTTagCompound writeToNBT( final NBTTagCompound data )
public CompoundNBT writeToNBT( final CompoundNBT data )
{
super.writeToNBT( data );
this.upgrades.writeToNBT( data, "upgrades" );
@@ -141,7 +141,7 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable,
}
@Override
public void readFromNBT( final NBTTagCompound data )
public void readFromNBT( final CompoundNBT data )
{
super.readFromNBT( data );
this.upgrades.readFromNBT( data, "upgrades" );
@@ -205,7 +205,7 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable,
}
@Override
public void setOrientation( final EnumFacing inForward, final EnumFacing inUp )
public void setOrientation( final Direction inForward, final Direction inUp )
{
super.setOrientation( inForward, inUp );
this.getProxy().setValidSides( EnumSet.complementOf( EnumSet.of( this.getForward() ) ) );
@@ -470,7 +470,7 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable,
}
@Override
protected IItemHandler getItemHandlerForSide( @Nonnull EnumFacing facing )
protected IItemHandler getItemHandlerForSide( @Nonnull Direction facing )
{
if( facing == this.getUp() )
{
@@ -538,21 +538,21 @@ public class TileInscriber extends AENetworkPowerTile implements IGridTickable,
if( !plateA.isEmpty() )
{
final NBTTagCompound tag = Platform.openNbtData( plateA );
final CompoundNBT tag = Platform.openNbtData( plateA );
name += tag.getString( "InscribeName" );
}
if( !plateB.isEmpty() )
{
final NBTTagCompound tag = Platform.openNbtData( plateB );
final CompoundNBT tag = Platform.openNbtData( plateB );
name += " " + tag.getString( "InscribeName" );
}
final ItemStack startingItem = input.copy();
final ItemStack renamedItem = input.copy();
final NBTTagCompound tag = Platform.openNbtData( renamedItem );
final CompoundNBT tag = Platform.openNbtData( renamedItem );
final NBTTagCompound display = tag.getCompoundTag( "display" );
final CompoundNBT display = tag.getCompoundTag( "display" );
tag.setTag( "display", display );
if( name.length() > 0 )
src/main/java/appeng/tile/misc/TileInterface.java
+15 -15
View File
@@ -31,9 +31,9 @@ import io.netty.buffer.ByteBuf;
import net.minecraft.inventory.InventoryCrafting;
import net.minecraft.item.ItemStack;
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.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.common.capabilities.Capability;
@@ -87,14 +87,14 @@ public class TileInterface extends AENetworkInvTile implements IGridTickable, II
this.duality.notifyNeighbors();
}
public void setSide( final EnumFacing facing )
public void setSide( final Direction facing )
{
if( Platform.isClient() )
{
return;
}
EnumFacing newForward = facing;
Direction newForward = facing;
if( !this.omniDirectional && this.getForward() == facing.getOpposite() )
{
@@ -116,14 +116,14 @@ public class TileInterface extends AENetworkInvTile implements IGridTickable, II
if( this.omniDirectional )
{
this.setOrientation( EnumFacing.NORTH, EnumFacing.UP );
this.setOrientation( Direction.NORTH, Direction.UP );
}
else
{
EnumFacing newUp = EnumFacing.UP;
if( newForward == EnumFacing.UP || newForward == EnumFacing.DOWN )
Direction newUp = Direction.UP;
if( newForward == Direction.UP || newForward == Direction.DOWN )
{
newUp = EnumFacing.NORTH;
newUp = Direction.NORTH;
}
this.setOrientation( newForward, newUp );
}
@@ -137,7 +137,7 @@ public class TileInterface extends AENetworkInvTile implements IGridTickable, II
{
if( this.omniDirectional )
{
this.getProxy().setValidSides( EnumSet.allOf( EnumFacing.class ) );
this.getProxy().setValidSides( EnumSet.allOf( Direction.class ) );
}
else
{
@@ -167,7 +167,7 @@ public class TileInterface extends AENetworkInvTile implements IGridTickable, II
}
@Override
public NBTTagCompound writeToNBT( final NBTTagCompound data )
public CompoundNBT writeToNBT( final CompoundNBT data )
{
super.writeToNBT( data );
data.setBoolean( "omniDirectional", this.omniDirectional );
@@ -176,7 +176,7 @@ public class TileInterface extends AENetworkInvTile implements IGridTickable, II
}
@Override
public void readFromNBT( final NBTTagCompound data )
public void readFromNBT( final CompoundNBT data )
{
super.readFromNBT( data );
this.omniDirectional = data.getBoolean( "omniDirectional" );
@@ -255,11 +255,11 @@ public class TileInterface extends AENetworkInvTile implements IGridTickable, II
}
@Override
public EnumSet<EnumFacing> getTargets()
public EnumSet<Direction> getTargets()
{
if( this.omniDirectional )
{
return EnumSet.allOf( EnumFacing.class );
return EnumSet.allOf( Direction.class );
}
return EnumSet.of( this.getForward() );
}
@@ -339,13 +339,13 @@ public class TileInterface extends AENetworkInvTile implements IGridTickable, II
}
@Override
public boolean hasCapability( Capability<?> capability, @Nullable EnumFacing facing )
public boolean hasCapability( Capability<?> capability, @Nullable Direction facing )
{
return this.duality.hasCapability( capability, facing ) || super.hasCapability( capability, facing );
}
@Override
public <T> T getCapability( Capability<T> capability, @Nullable EnumFacing facing )
public <T> T getCapability( Capability<T> capability, @Nullable Direction facing )
{
T result = this.duality.getCapability( capability, facing );
if( result != null )
src/main/java/appeng/tile/misc/TilePaint.java
+12 -12
View File
@@ -29,10 +29,10 @@ import java.util.List;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import net.minecraft.block.state.IBlockState;
import net.minecraft.block.BlockState;
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.util.math.BlockPos;
import net.minecraft.util.math.Vec3d;
import net.minecraft.world.EnumSkyBlock;
@@ -58,7 +58,7 @@ public class TilePaint extends AEBaseTile
}
@Override
public NBTTagCompound writeToNBT( final NBTTagCompound data )
public CompoundNBT writeToNBT( final CompoundNBT data )
{
super.writeToNBT( data );
final ByteBuf myDat = Unpooled.buffer();
@@ -87,7 +87,7 @@ public class TilePaint extends AEBaseTile
}
@Override
public void readFromNBT( final NBTTagCompound data )
public void readFromNBT( final CompoundNBT data )
{
super.readFromNBT( data );
if( data.hasKey( "dots" ) )
@@ -160,7 +160,7 @@ public class TilePaint extends AEBaseTile
return;
}
for( final EnumFacing side : EnumFacing.VALUES )
for( final Direction side : Direction.VALUES )
{
if( !this.isSideValid( side ) )
{
@@ -171,14 +171,14 @@ public class TilePaint extends AEBaseTile
this.updateData();
}
public boolean isSideValid( final EnumFacing side )
public boolean isSideValid( final Direction side )
{
final BlockPos p = this.pos.offset( side );
final IBlockState blk = this.world.getBlockState( p );
final BlockState blk = this.world.getBlockState( p );
return blk.getBlock().isSideSolid( this.world.getBlockState( p ), this.world, p, side.getOpposite() );
}
private void removeSide( final EnumFacing side )
private void removeSide( final Direction side )
{
final Iterator<Splotch> i = this.dots.iterator();
while( i.hasNext() )
@@ -218,7 +218,7 @@ public class TilePaint extends AEBaseTile
}
}
public void cleanSide( final EnumFacing side )
public void cleanSide( final Direction side )
{
if( this.dots == null )
{
@@ -235,11 +235,11 @@ public class TilePaint extends AEBaseTile
return this.isLit;
}
public void addBlot( final ItemStack type, final EnumFacing side, final Vec3d hitVec )
public void addBlot( final ItemStack type, final Direction side, final Vec3d hitVec )
{
final BlockPos p = this.pos.offset( side );
final IBlockState blk = this.world.getBlockState( p );
final BlockState blk = this.world.getBlockState( p );
if( blk.getBlock().isSideSolid( this.world.getBlockState( p ), this.world, p, side.getOpposite() ) )
{
final ItemPaintBall ipb = (ItemPaintBall) type.getItem();
src/main/java/appeng/tile/misc/TileQuartzGrowthAccelerator.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.implementations.IPowerChannelState;
import appeng.api.implementations.tiles.ICrystalGrowthAccelerator;
@@ -44,7 +44,7 @@ public class TileQuartzGrowthAccelerator extends AENetworkTile implements IPower
public TileQuartzGrowthAccelerator()
{
this.getProxy().setValidSides( EnumSet.noneOf( EnumFacing.class ) );
this.getProxy().setValidSides( EnumSet.noneOf( Direction.class ) );
this.getProxy().setFlags();
this.getProxy().setIdlePowerUsage( 8 );
}
@@ -85,7 +85,7 @@ public class TileQuartzGrowthAccelerator extends AENetworkTile implements IPower
}
@Override
public void setOrientation( final EnumFacing inForward, final EnumFacing inUp )
public void setOrientation( final Direction inForward, final Direction inUp )
{
super.setOrientation( inForward, inUp );
this.getProxy().setValidSides( EnumSet.of( this.getUp(), this.getUp().getOpposite() ) );
src/main/java/appeng/tile/misc/TileSecurityStation.java
+11 -11
View File
@@ -26,12 +26,12 @@ import java.util.Map;
import io.netty.buffer.ByteBuf;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTBase;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.EnumFacing;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.util.Direction;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.common.MinecraftForge;
@@ -158,7 +158,7 @@ public class TileSecurityStation extends AENetworkTile implements ITerminalHost,
}
@Override
public NBTTagCompound writeToNBT( final NBTTagCompound data )
public CompoundNBT writeToNBT( final CompoundNBT data )
{
super.writeToNBT( data );
this.cm.writeToNBT( data );
@@ -167,12 +167,12 @@ public class TileSecurityStation extends AENetworkTile implements ITerminalHost,
data.setLong( "securityKey", this.securityKey );
this.getConfigSlot().writeToNBT( data, "config" );
final NBTTagCompound storedItems = new NBTTagCompound();
final CompoundNBT storedItems = new CompoundNBT();
int offset = 0;
for( final IAEItemStack ais : this.inventory.getStoredItems() )
{
final NBTTagCompound it = new NBTTagCompound();
final CompoundNBT it = new CompoundNBT();
ais.createItemStack().writeToNBT( it );
storedItems.setTag( String.valueOf( offset ), it );
offset++;
@@ -183,7 +183,7 @@ public class TileSecurityStation extends AENetworkTile implements ITerminalHost,
}
@Override
public void readFromNBT( final NBTTagCompound data )
public void readFromNBT( final CompoundNBT data )
{
super.readFromNBT( data );
this.cm.readFromNBT( data );
@@ -195,13 +195,13 @@ public class TileSecurityStation extends AENetworkTile implements ITerminalHost,
this.securityKey = data.getLong( "securityKey" );
this.getConfigSlot().readFromNBT( data, "config" );
final NBTTagCompound storedItems = data.getCompoundTag( "storedItems" );
final CompoundNBT storedItems = data.getCompoundTag( "storedItems" );
for( final Object key : storedItems.getKeySet() )
{
final NBTBase obj = storedItems.getTag( (String) key );
if( obj instanceof NBTTagCompound )
if( obj instanceof CompoundNBT )
{
this.inventory.getStoredItems().add( AEItemStack.fromItemStack( new ItemStack( (NBTTagCompound) obj ) ) );
this.inventory.getStoredItems().add( AEItemStack.fromItemStack( new ItemStack( (CompoundNBT) obj ) ) );
}
}
}
@@ -355,7 +355,7 @@ public class TileSecurityStation extends AENetworkTile implements ITerminalHost,
}
@Override
public boolean recolourBlock( final EnumFacing side, final AEColor newPaintedColor, final EntityPlayer who )
public boolean recolourBlock( final Direction side, final AEColor newPaintedColor, final PlayerEntity who )
{
if( this.paintedColor == newPaintedColor )
{
src/main/java/appeng/tile/misc/TileVibrationChamber.java
+5 -5
View File
@@ -27,9 +27,9 @@ import io.netty.buffer.ByteBuf;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.tileentity.TileEntityFurnace;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.Direction;
import net.minecraftforge.items.IItemHandler;
import appeng.api.config.Actionable;
@@ -98,7 +98,7 @@ public class TileVibrationChamber extends AENetworkInvTile implements IGridTicka
}
@Override
public NBTTagCompound writeToNBT( final NBTTagCompound data )
public CompoundNBT writeToNBT( final CompoundNBT data )
{
super.writeToNBT( data );
data.setDouble( "burnTime", this.getBurnTime() );
@@ -108,7 +108,7 @@ public class TileVibrationChamber extends AENetworkInvTile implements IGridTicka
}
@Override
public void readFromNBT( final NBTTagCompound data )
public void readFromNBT( final CompoundNBT data )
{
super.readFromNBT( data );
this.setBurnTime( data.getDouble( "burnTime" ) );
@@ -117,7 +117,7 @@ public class TileVibrationChamber extends AENetworkInvTile implements IGridTicka
}
@Override
protected IItemHandler getItemHandlerForSide( @Nonnull EnumFacing facing )
protected IItemHandler getItemHandlerForSide( @Nonnull Direction facing )
{
return this.invExt;
}