Some additional fixes from other branch.

This commit is contained in:
Sebastian Hartte
2020-05-30 22:18:26 +02:00
parent 16d6d55d7f
commit ec3b464655
139 changed files with 1489 additions and 1485 deletions
@@ -64,7 +64,7 @@ public class TileChunkLoader extends AEBaseTile implements ITickable
if( this.ct == null )
{
final MinecraftServer server = FMLCommonHandler.instance().getMinecraftServerInstance();
final MinecraftServer server = ServerLifecycleHooks.getCurrentServer();
if( server != null )
{
final List<PlayerEntityMP> pl = server.getPlayerList().getPlayers();
@@ -26,7 +26,7 @@ import net.minecraft.util.Direction;
import net.minecraft.util.Hand;
import net.minecraft.util.ITickable;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.text.TextComponentString;
import net.minecraft.util.text.StringTextComponent;
import appeng.core.AppEng;
import appeng.tile.AEBaseTile;
@@ -52,7 +52,7 @@ public class TileCubeGenerator extends AEBaseTile implements ITickable
{
for( final PlayerEntity e : AppEng.proxy.getPlayers() )
{
e.sendMessage( new TextComponentString( "Spawning in... " + ( this.countdown / 20 ) ) );
e.sendMessage( new StringTextComponent( "Spawning in... " + ( this.countdown / 20 ) ) );
}
}
@@ -114,7 +114,7 @@ public class TileCubeGenerator extends AEBaseTile implements ITickable
this.size = 64;
}
player.sendMessage( new TextComponentString( "Size: " + this.size ) );
player.sendMessage( new StringTextComponent( "Size: " + this.size ) );
}
else
{
@@ -104,9 +104,9 @@ public class ToolReplicatorCard extends AEBaseItem
final DimensionalCoord min = sc.getMin();
final DimensionalCoord max = sc.getMax();
x += currentSideOff.getFrontOffsetX();
y += currentSideOff.getFrontOffsetY();
z += currentSideOff.getFrontOffsetZ();
x += currentSideOff.getXOffset();
y += currentSideOff.getYOffset();
z += currentSideOff.getZOffset();
final int min_x = min.x;
final int min_y = min.y;