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/automation/BlockUpgradeInventory.java
+2 -2
View File
@@ -21,7 +21,7 @@ package appeng.parts.automation;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.BlockItem;
import net.minecraft.item.ItemStack;
import appeng.api.config.Upgrades;
@@ -47,7 +47,7 @@ public class BlockUpgradeInventory extends UpgradeInventory
{
final Item encodedItem = is.getItem();
if( encodedItem instanceof ItemBlock && Block.getBlockFromItem( encodedItem ) == this.block )
if( encodedItem instanceof BlockItem && Block.getBlockFromItem( encodedItem ) == this.block )
{
max = upgrades.getSupported().get( is );
break;
src/main/java/appeng/parts/automation/PartAbstractFormationPlane.java
+21 -21
View File
@@ -3,11 +3,11 @@ package appeng.parts.automation;
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.IBlockAccess;
import net.minecraft.world.IBlockReader;
import appeng.api.config.Actionable;
import appeng.api.networking.security.IActionSource;
@@ -84,8 +84,8 @@ public abstract class PartAbstractFormationPlane<T extends IAEStack<T>> extends
final BlockPos pos = te.getPos();
final EnumFacing e = bch.getWorldX();
final EnumFacing u = bch.getWorldY();
final Direction e = bch.getWorldX();
final Direction u = bch.getWorldY();
if( this.isTransitionPlane( te.getWorld().getTileEntity( pos.offset( e.getOpposite() ) ), this.getSide() ) )
{
@@ -115,33 +115,33 @@ public abstract class PartAbstractFormationPlane<T extends IAEStack<T>> extends
public PlaneConnections getConnections()
{
final EnumFacing facingRight, facingUp;
final Direction facingRight, facingUp;
AEPartLocation location = this.getSide();
switch( location )
{
case UP:
facingRight = EnumFacing.EAST;
facingUp = EnumFacing.NORTH;
facingRight = Direction.EAST;
facingUp = Direction.NORTH;
break;
case DOWN:
facingRight = EnumFacing.WEST;
facingUp = EnumFacing.NORTH;
facingRight = Direction.WEST;
facingUp = Direction.NORTH;
break;
case NORTH:
facingRight = EnumFacing.WEST;
facingUp = EnumFacing.UP;
facingRight = Direction.WEST;
facingUp = Direction.UP;
break;
case SOUTH:
facingRight = EnumFacing.EAST;
facingUp = EnumFacing.UP;
facingRight = Direction.EAST;
facingUp = Direction.UP;
break;
case WEST:
facingRight = EnumFacing.SOUTH;
facingUp = EnumFacing.UP;
facingRight = Direction.SOUTH;
facingUp = Direction.UP;
break;
case EAST:
facingRight = EnumFacing.NORTH;
facingUp = EnumFacing.UP;
facingRight = Direction.NORTH;
facingUp = Direction.UP;
break;
default:
case INTERNAL:
@@ -182,7 +182,7 @@ public abstract class PartAbstractFormationPlane<T extends IAEStack<T>> extends
}
@Override
public void onNeighborChanged( IBlockAccess w, BlockPos pos, BlockPos neighbor )
public void onNeighborChanged( IBlockReader w, BlockPos pos, BlockPos neighbor )
{
if( pos.offset( this.getSide().getFacing() ).equals( neighbor ) )
{
@@ -224,14 +224,14 @@ public abstract class PartAbstractFormationPlane<T extends IAEStack<T>> extends
}
@Override
public void readFromNBT( final NBTTagCompound data )
public void readFromNBT( final CompoundNBT data )
{
super.readFromNBT( data );
this.priority = data.getInteger( "priority" );
}
@Override
public void writeToNBT( final NBTTagCompound data )
public void writeToNBT( final CompoundNBT data )
{
super.writeToNBT( data );
data.setInteger( "priority", this.getPriority() );
src/main/java/appeng/parts/automation/PartAnnihilationPlane.java
+27 -25
View File
@@ -23,17 +23,19 @@ import java.util.List;
import com.google.common.collect.Lists;
import net.minecraft.block.BlockState;
import net.minecraft.entity.item.I
import net.minecraft.entity.item.ItemEntity;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.Entity;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.init.Blocks;
import net.minecraft.entity.item.EntityItem;temEntity;
import net.minecraft.block.Blocks;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.Direction;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.IBlockReader;
import net.minecraft.world.World;
import net.minecraft.world.WorldServer;
@@ -113,8 +115,8 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab
final BlockPos pos = te.getPos();
final EnumFacing e = bch.getWorldX();
final EnumFacing u = bch.getWorldY();
final Direction e = bch.getWorldX();
final Direction u = bch.getWorldY();
if( this.isAnnihilationPlane( te.getWorld().getTileEntity( pos.offset( e.getOpposite() ) ), this.getSide() ) )
{
@@ -148,33 +150,33 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab
public PlaneConnections getConnections()
{
final EnumFacing facingRight, facingUp;
final Direction facingRight, facingUp;
AEPartLocation location = this.getSide();
switch( location )
{
case UP:
facingRight = EnumFacing.EAST;
facingUp = EnumFacing.NORTH;
facingRight = Direction.EAST;
facingUp = Direction.NORTH;
break;
case DOWN:
facingRight = EnumFacing.WEST;
facingUp = EnumFacing.NORTH;
facingRight = Direction.WEST;
facingUp = Direction.NORTH;
break;
case NORTH:
facingRight = EnumFacing.WEST;
facingUp = EnumFacing.UP;
facingRight = Direction.WEST;
facingUp = Direction.UP;
break;
case SOUTH:
facingRight = EnumFacing.EAST;
facingUp = EnumFacing.UP;
facingRight = Direction.EAST;
facingUp = Direction.UP;
break;
case WEST:
facingRight = EnumFacing.SOUTH;
facingUp = EnumFacing.UP;
facingRight = Direction.SOUTH;
facingUp = Direction.UP;
break;
case EAST:
facingRight = EnumFacing.NORTH;
facingUp = EnumFacing.UP;
facingRight = Direction.NORTH;
facingUp = Direction.UP;
break;
default:
case INTERNAL:
@@ -215,7 +217,7 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab
}
@Override
public void onNeighborChanged( IBlockAccess w, BlockPos pos, BlockPos neighbor )
public void onNeighborChanged( IBlockReader w, BlockPos pos, BlockPos neighbor )
{
if( pos.offset( this.getSide().getFacing() ).equals( neighbor ) )
{
@@ -286,7 +288,7 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab
if( capture )
{
final boolean changed = this.storeEntityItem( (EntityItem) entity );
final boolean changed = this.storeEntityItem( (ItemEntity) entity );
if( changed )
{
@@ -308,7 +310,7 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab
*
* @param entityItem {@link EntityItem} to store
*/
private boolean storeEntityItem( final EntityItem entityItem )
private boolean storeEntityItem( final ItemEntity entityItem )
{
if( !entityItem.isDead )
{
@@ -473,7 +475,7 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab
*/
private boolean canHandleBlock( final WorldServer w, final BlockPos pos )
{
final IBlockState state = w.getBlockState( pos );
final BlockState state = w.getBlockState( pos );
final Material material = state.getMaterial();
final float hardness = state.getBlockHardness( w, pos );
final boolean ignoreMaterials = material == Material.AIR || material == Material.LAVA || material == Material.WATER || material.isLiquid();
@@ -496,7 +498,7 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab
*/
protected float calculateEnergyUsage( final WorldServer w, final BlockPos pos, final List<ItemStack> items )
{
final IBlockState state = w.getBlockState( pos );
final BlockState state = w.getBlockState( pos );
final float hardness = state.getBlockHardness( w, pos );
float requiredEnergy = 1 + hardness;
src/main/java/appeng/parts/automation/PartExportBus.java
+6 -6
View File
@@ -22,10 +22,10 @@ package appeng.parts.automation;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
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.EnumHand;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.util.Hand;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.Vec3d;
@@ -101,7 +101,7 @@ public class PartExportBus extends PartSharedItemBus implements ICraftingRequest
}
@Override
public void readFromNBT( final NBTTagCompound extra )
public void readFromNBT( final CompoundNBT extra )
{
super.readFromNBT( extra );
this.craftingTracker.readFromNBT( extra );
@@ -109,7 +109,7 @@ public class PartExportBus extends PartSharedItemBus implements ICraftingRequest
}
@Override
public void writeToNBT( final NBTTagCompound extra )
public void writeToNBT( final CompoundNBT extra )
{
super.writeToNBT( extra );
this.craftingTracker.writeToNBT( extra );
@@ -215,7 +215,7 @@ public class PartExportBus extends PartSharedItemBus implements ICraftingRequest
}
@Override
public boolean onPartActivate( final EntityPlayer player, final EnumHand hand, final Vec3d pos )
public boolean onPartActivate( final PlayerEntity player, final Hand hand, final Vec3d pos )
{
if( Platform.isServer() )
{
src/main/java/appeng/parts/automation/PartFormationPlane.java
+14 -14
View File
@@ -25,19 +25,19 @@ import java.util.List;
import net.minecraft.entity.Entity;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.block.Blocks;
import net.minecraft.item.Item;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemBlockSpecial;
import net.minecraft.item.BlockItem;
import net.minecraft.item.BlockItemSpecial;
import net.minecraft.item.ItemFirework;
import net.minecraft.item.ItemSkull;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumActionResult;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumHand;
import net.minecraft.util.Direction;
import net.minecraft.util.Hand;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Vec3d;
@@ -155,7 +155,7 @@ public class PartFormationPlane extends PartAbstractFormationPlane<IAEItemStack>
}
@Override
public void readFromNBT( final NBTTagCompound data )
public void readFromNBT( final CompoundNBT data )
{
super.readFromNBT( data );
this.Config.readFromNBT( data, "config" );
@@ -163,7 +163,7 @@ public class PartFormationPlane extends PartAbstractFormationPlane<IAEItemStack>
}
@Override
public void writeToNBT( final NBTTagCompound data )
public void writeToNBT( final CompoundNBT data )
{
super.writeToNBT( data );
this.Config.writeToNBT( data, "config" );
@@ -194,7 +194,7 @@ public class PartFormationPlane extends PartAbstractFormationPlane<IAEItemStack>
}
@Override
public boolean onPartActivate( final EntityPlayer player, final EnumHand hand, final Vec3d pos )
public boolean onPartActivate( final PlayerEntity player, final Hand hand, final Vec3d pos )
{
if( Platform.isServer() )
{
@@ -239,12 +239,12 @@ public class PartFormationPlane extends PartAbstractFormationPlane<IAEItemStack>
if( w.getBlockState( tePos ).getBlock().isReplaceable( w, tePos ) )
{
if( placeBlock == YesNo.YES && ( i instanceof ItemBlock || i instanceof ItemBlockSpecial || i instanceof IPlantable || i instanceof ItemSkull || i instanceof ItemFirework || i instanceof IPartItem || i == Item
if( placeBlock == YesNo.YES && ( i instanceof BlockItem || i instanceof BlockItemSpecial || i instanceof IPlantable || i instanceof ItemSkull || i instanceof ItemFirework || i instanceof IPartItem || i == Item
.getItemFromBlock( Blocks.REEDS ) ) )
{
final EntityPlayer player = Platform.getPlayer( (WorldServer) w );
final PlayerEntity player = Platform.getPlayer( (WorldServer) w );
Platform.configurePlayer( player, side, this.getTile() );
EnumHand hand = player.getActiveHand();
Hand hand = player.getActiveHand();
player.setHeldItem( hand, is );
maxStorage = is.getCount();
@@ -269,7 +269,7 @@ public class PartFormationPlane extends PartAbstractFormationPlane<IAEItemStack>
if( !Worked && side.yOffset == 0 )
{
Worked = i.onItemUse( player, w, tePos.offset( EnumFacing.DOWN ), hand, EnumFacing.UP, side.xOffset, side.yOffset,
Worked = i.onItemUse( player, w, tePos.offset( Direction.DOWN ), hand, Direction.UP, side.xOffset, side.yOffset,
side.zOffset ) == EnumActionResult.SUCCESS;
}
src/main/java/appeng/parts/automation/PartIdentityAnnihilationPlane.java
+3 -3
View File
@@ -22,8 +22,8 @@ package appeng.parts.automation;
import java.util.ArrayList;
import java.util.List;
import net.minecraft.block.state.IBlockState;
import net.minecraft.init.Items;
import net.minecraft.block.BlockState;
import net.minecraft.item.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
@@ -80,7 +80,7 @@ public class PartIdentityAnnihilationPlane extends PartAnnihilationPlane
protected List<ItemStack> obtainBlockDrops( final WorldServer w, final BlockPos pos )
{
final FakePlayer fakePlayer = FakePlayerFactory.getMinecraft( w );
final IBlockState state = w.getBlockState( pos );
final BlockState state = w.getBlockState( pos );
if( state.getBlock().canSilkHarvest( w, pos, state, fakePlayer ) )
{
src/main/java/appeng/parts/automation/PartImportBus.java
+4 -4
View File
@@ -19,10 +19,10 @@
package appeng.parts.automation;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Items;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.Items;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumHand;
import net.minecraft.util.Hand;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.Vec3d;
@@ -128,7 +128,7 @@ public class PartImportBus extends PartSharedItemBus implements IInventoryDestin
}
@Override
public boolean onPartActivate( final EntityPlayer player, final EnumHand hand, final Vec3d pos )
public boolean onPartActivate( final PlayerEntity player, final Hand hand, final Vec3d pos )
{
if( Platform.isServer() )
{
src/main/java/appeng/parts/automation/PartLevelEmitter.java
+6 -6
View File
@@ -22,12 +22,12 @@ package appeng.parts.automation;
import java.util.Collection;
import java.util.Random;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.PlayerEntity;
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.EnumHand;
import net.minecraft.util.Hand;
import net.minecraft.util.EnumParticleTypes;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.BlockPos;
@@ -463,7 +463,7 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH
}
@Override
public boolean onPartActivate( final EntityPlayer player, final EnumHand hand, final Vec3d pos )
public boolean onPartActivate( final PlayerEntity player, final Hand hand, final Vec3d pos )
{
if( Platform.isServer() )
{
@@ -502,7 +502,7 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH
}
@Override
public void readFromNBT( final NBTTagCompound data )
public void readFromNBT( final CompoundNBT data )
{
super.readFromNBT( data );
this.lastReportedValue = data.getLong( "lastReportedValue" );
@@ -512,7 +512,7 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH
}
@Override
public void writeToNBT( final NBTTagCompound data )
public void writeToNBT( final CompoundNBT data )
{
super.writeToNBT( data );
data.setLong( "lastReportedValue", this.lastReportedValue );
src/main/java/appeng/parts/automation/PartSharedItemBus.java
+4 -4
View File
@@ -22,7 +22,7 @@ package appeng.parts.automation;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.IBlockReader;
import net.minecraft.world.World;
import net.minecraftforge.items.IItemHandler;
@@ -53,14 +53,14 @@ public abstract class PartSharedItemBus extends PartUpgradeable implements IGrid
}
@Override
public void readFromNBT( final net.minecraft.nbt.NBTTagCompound extra )
public void readFromNBT( final net.minecraft.nbt.CompoundNBT extra )
{
super.readFromNBT( extra );
this.getConfig().readFromNBT( extra, "config" );
}
@Override
public void writeToNBT( final net.minecraft.nbt.NBTTagCompound extra )
public void writeToNBT( final net.minecraft.nbt.CompoundNBT extra )
{
super.writeToNBT( extra );
this.getConfig().writeToNBT( extra, "config" );
@@ -78,7 +78,7 @@ public abstract class PartSharedItemBus extends PartUpgradeable implements IGrid
}
@Override
public void onNeighborChanged( IBlockAccess w, BlockPos pos, BlockPos neighbor )
public void onNeighborChanged( IBlockReader w, BlockPos pos, BlockPos neighbor )
{
this.updateState();
if( this.lastRedstone != this.getHost().hasRedstone( this.getSide() ) )
src/main/java/appeng/parts/automation/PartUpgradeable.java
+2 -2
View File
@@ -120,7 +120,7 @@ public abstract class PartUpgradeable extends PartBasicState implements IAEAppEn
}
@Override
public void readFromNBT( final net.minecraft.nbt.NBTTagCompound extra )
public void readFromNBT( final net.minecraft.nbt.CompoundNBT extra )
{
super.readFromNBT( extra );
this.manager.readFromNBT( extra );
@@ -128,7 +128,7 @@ public abstract class PartUpgradeable extends PartBasicState implements IAEAppEn
}
@Override
public void writeToNBT( final net.minecraft.nbt.NBTTagCompound extra )
public void writeToNBT( final net.minecraft.nbt.CompoundNBT extra )
{
super.writeToNBT( extra );
this.manager.writeToNBT( extra );
src/main/java/appeng/parts/automation/PlaneBakedModel.java
+4 -4
View File
@@ -27,14 +27,14 @@ import javax.annotation.Nullable;
import com.google.common.collect.ImmutableList;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.renderer.block.model.BakedQuad;
import net.minecraft.block.BlockState;
import net.minecraft.client.renderer.model.BakedQuad;
import net.minecraft.client.renderer.block.model.IBakedModel;
import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
import net.minecraft.client.renderer.block.model.ItemOverrideList;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.renderer.vertex.VertexFormat;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.Direction;
import appeng.client.render.cablebus.CubeBuilder;
@@ -72,7 +72,7 @@ public class PlaneBakedModel implements IBakedModel
}
@Override
public List<BakedQuad> getQuads( @Nullable IBlockState state, @Nullable EnumFacing side, long rand )
public List<BakedQuad> getQuads( @Nullable BlockState state, @Nullable Direction side, long rand )
{
if( side == null )
{
src/main/java/appeng/parts/automation/UpgradeInventory.java
+3 -3
View File
@@ -19,10 +19,10 @@
package appeng.parts.automation;
import net.minecraft.init.Items;
import net.minecraft.item.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.CompoundNBT;
import net.minecraftforge.items.IItemHandler;
import appeng.api.config.Upgrades;
@@ -135,7 +135,7 @@ public abstract class UpgradeInventory extends AppEngInternalInventory implement
}
@Override
public void readFromNBT( final NBTTagCompound target )
public void readFromNBT( final CompoundNBT target )
{
super.readFromNBT( target );
this.updateUpgradeInfo();