fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Lots of compile fixes

Browse Source
This commit is contained in:
Sebastian Hartte
2020-06-04 03:02:48 +02:00
parent 6eb2a9504a
commit 237463dd94
241 changed files with 3438 additions and 3474 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/spatial/DefaultSpatialHandler.java
+3 -4
View File
@@ -47,13 +47,12 @@ public class DefaultSpatialHandler implements IMovableHandler
@Override
public void moveTile( final TileEntity te, final World w, final BlockPos newPosition )
{
te.setWorld( w );
te.setPos( newPosition );
te.setWorldAndPos( w, newPosition );
final Chunk c = w.getChunkFromBlockCoords( newPosition );
final Chunk c = w.getChunkAt( newPosition );
c.addTileEntity( newPosition, te );
if( c.isLoaded() )
if( w.getChunkProvider().isChunkLoaded(c.getPos()) )
{
final BlockState state = w.getBlockState( newPosition );
w.addTileEntity( te );
src/main/java/appeng/spatial/StorageHelper.java
+8 -6
View File
@@ -22,6 +22,7 @@ package appeng.spatial;
import java.util.ArrayList;
import java.util.List;
import appeng.core.Api;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.entity.Entity;
@@ -30,7 +31,8 @@ import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.MathHelper;
import net.minecraft.world.World;
import net.minecraft.world.WorldServer;
import net.minecraft.world.ServerWorld;
import net.minecraft.world.server.ServerWorld;
import net.minecraftforge.common.util.ITeleporter;
import appeng.api.AEApi;
@@ -63,13 +65,13 @@ public class StorageHelper
*/
private Entity teleportEntity( Entity entity, final TelDestination link )
{
final WorldServer oldWorld;
final WorldServer newWorld;
final ServerWorld oldWorld;
final ServerWorld newWorld;
try
{
oldWorld = (WorldServer) entity.world;
newWorld = (WorldServer) link.dim;
oldWorld = (ServerWorld) entity.world;
newWorld = (ServerWorld) link.dim;
}
catch( final Throwable e )
{
@@ -116,7 +118,7 @@ public class StorageHelper
AppEng.instance().getAdvancementTriggers().getSpatialExplorer().trigger( (ServerPlayerEntity) entity );
}
entity.changeDimension( link.dim.provider.getDimension(), new METeleporter( link ) );
entity.changeDimension( link.dim.getDimension().getType(), new METeleporter( link ) );
if( !passangersOnOtherSide.isEmpty() )
{
src/main/java/appeng/spatial/StorageWorldProvider.java
-2
View File
@@ -22,9 +22,7 @@ package appeng.spatial;
import net.minecraft.entity.Entity;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Vec3d;
import net.minecraft.world.DimensionType;
import net.minecraft.world.biome.Biome;
import net.minecraft.world.biome.BiomeProviderSingle;
import net.minecraft.world.chunk.Chunk;
import net.minecraft.world.dimension.Dimension;
import net.minecraft.world.gen.ChunkGenerator;