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/spatial/StorageHelper.java
+7 -7
View File
@@ -23,9 +23,9 @@ import java.util.ArrayList;
import java.util.List;
import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState;
import net.minecraft.block.BlockState;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.entity.player.PlayerEntityMP;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.MathHelper;
@@ -111,9 +111,9 @@ public class StorageHelper
// load the chunk!
newWorld.getChunkProvider().provideChunk( MathHelper.floor( link.x ) >> 4, MathHelper.floor( link.z ) >> 4 );
if( entity instanceof EntityPlayerMP && link.dim.provider instanceof StorageWorldProvider )
if( entity instanceof PlayerEntityMP && link.dim.provider instanceof StorageWorldProvider )
{
AppEng.instance().getAdvancementTriggers().getSpatialExplorer().trigger( (EntityPlayerMP) entity );
AppEng.instance().getAdvancementTriggers().getSpatialExplorer().trigger( (PlayerEntityMP) entity );
}
entity.changeDimension( link.dim.provider.getDimension(), new METeleporter( link ) );
@@ -230,7 +230,7 @@ public class StorageHelper
@Override
public void visit( final BlockPos pos )
{
final IBlockState state = this.dst.getBlockState( pos );
final BlockState state = this.dst.getBlockState( pos );
final Block blk = state.getBlock();
blk.neighborChanged( state, this.dst, pos, blk, pos );
}
@@ -240,9 +240,9 @@ public class StorageHelper
{
private final World dst;
private final IBlockState state;
private final BlockState state;
public WrapInMatrixFrame( final IBlockState state, final World dst2 )
public WrapInMatrixFrame( final BlockState state, final World dst2 )
{
this.dst = dst2;
this.state = state;