First update pass (1/3) - ~1400 -> 82 errors

This is first update pass, which is mainly import reorganization, name
fixes, etc... Although some parts of second were done where changes
aren't important.
Errors: ~1400 -> 82.
This commit is contained in:
elix-x
2016-06-19 14:43:27 +02:00
parent d9725a7d9b
commit 5498eb6d7c
288 changed files with 1637 additions and 1420 deletions
+1 -1
View File
@@ -56,7 +56,7 @@ public final class AECommand extends CommandBase
}
@Override
public void processCommand( final ICommandSender sender, final String[] args ) throws CommandException
public void execute( final MinecraftServer server, final ICommandSender sender, final String[] args ) throws CommandException
{
if( args.length == 0 )
{
@@ -30,8 +30,8 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.server.MinecraftServer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.RayTraceResult;
import net.minecraft.world.World;
import net.minecraftforge.fml.common.FMLCommonHandler;
@@ -83,7 +83,7 @@ public class ServerHelper extends CommonHelper
if( server != null )
{
return (List) server.getConfigurationManager().playerEntityList;
return (List) server.getPlayerList().getPlayerList();
}
}
@@ -129,7 +129,7 @@ public class ServerHelper extends CommonHelper
}
@Override
public MovingObjectPosition getMOP()
public RayTraceResult getRTR()
{
return null;
}
@@ -21,7 +21,7 @@ package appeng.server.subcommands;
import net.minecraft.command.ICommandSender;
import net.minecraft.server.MinecraftServer;
import net.minecraft.util.ChatComponentTranslation;
import net.minecraft.util.text.TextComponentTranslation;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.world.ChunkEvent;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
@@ -40,7 +40,7 @@ public class ChunkLogger implements ISubCommand
@SubscribeEvent
public void onChunkLoadEvent( final ChunkEvent.Load event )
{
if( !event.world.isRemote )
if( !event.getWorld().isRemote )
{
AELog.info( "Chunk Loaded: " + event.getChunk().xPosition + ", " + event.getChunk().zPosition );
this.displayStack();
@@ -69,7 +69,7 @@ public class ChunkLogger implements ISubCommand
@SubscribeEvent
public void onChunkUnloadEvent( final ChunkEvent.Unload unload )
{
if( !unload.world.isRemote )
if( !unload.getWorld().isRemote )
{
AELog.info( "Chunk Unloaded: " + unload.getChunk().xPosition + ", " + unload.getChunk().zPosition );
this.displayStack();
@@ -90,12 +90,12 @@ public class ChunkLogger implements ISubCommand
if( this.enabled )
{
MinecraftForge.EVENT_BUS.register( this );
sender.addChatMessage( new ChatComponentTranslation( "commands.ae2.ChunkLoggerOn" ) );
sender.addChatMessage( new TextComponentTranslation( "commands.ae2.ChunkLoggerOn" ) );
}
else
{
MinecraftForge.EVENT_BUS.unregister( this );
sender.addChatMessage( new ChatComponentTranslation( "commands.ae2.ChunkLoggerOff" ) );
sender.addChatMessage( new TextComponentTranslation( "commands.ae2.ChunkLoggerOff" ) );
}
}
}
@@ -23,7 +23,7 @@ import com.google.common.base.Joiner;
import net.minecraft.command.ICommandSender;
import net.minecraft.server.MinecraftServer;
import net.minecraft.util.ChatComponentText;
import net.minecraft.util.text.TextComponentString;
import appeng.server.ISubCommand;
@@ -41,6 +41,6 @@ public class Supporters implements ISubCommand
public void call( final MinecraftServer srv, final String[] data, final ICommandSender sender )
{
final String[] who = { "Stig Halvorsen", "Josh Ricker", "Jenny \"Othlon\" Sutherland", "Hristo Bogdanov", "BevoLJ" };
sender.addChatMessage( new ChatComponentText( "Special thanks to " + Joiner.on( ", " ).join( who ) ) );
sender.addChatMessage( new TextComponentString( "Special thanks to " + Joiner.on( ", " ).join( who ) ) );
}
}