Most of the 1.8 Port.
This commit is contained in:
@@ -19,13 +19,14 @@
|
||||
package appeng.server;
|
||||
|
||||
|
||||
import com.google.common.base.Joiner;
|
||||
|
||||
import net.minecraft.command.CommandBase;
|
||||
import net.minecraft.command.CommandException;
|
||||
import net.minecraft.command.ICommandSender;
|
||||
import net.minecraft.command.WrongUsageException;
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
|
||||
import com.google.common.base.Joiner;
|
||||
|
||||
|
||||
public final class AECommand extends CommandBase
|
||||
{
|
||||
@@ -50,9 +51,9 @@ public final class AECommand extends CommandBase
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public String getCommandName()
|
||||
public String getName()
|
||||
{
|
||||
return "ae2";
|
||||
}
|
||||
@@ -64,7 +65,9 @@ public final class AECommand extends CommandBase
|
||||
}
|
||||
|
||||
@Override
|
||||
public void processCommand( ICommandSender sender, String[] args )
|
||||
public void execute(
|
||||
ICommandSender sender,
|
||||
String[] args ) throws CommandException
|
||||
{
|
||||
if( args.length == 0 )
|
||||
{
|
||||
@@ -98,7 +101,7 @@ public final class AECommand extends CommandBase
|
||||
try
|
||||
{
|
||||
Commands c = Commands.valueOf( args[0] );
|
||||
if( sender.canCommandSenderUseCommand( c.level, this.getCommandName() ) )
|
||||
if( sender.canUseCommand( c.level, this.getName() ) )
|
||||
{
|
||||
c.command.call( this.srv, args, sender );
|
||||
}
|
||||
|
||||
@@ -30,10 +30,9 @@ import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
import net.minecraft.util.MovingObjectPosition;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import cpw.mods.fml.common.FMLCommonHandler;
|
||||
|
||||
import net.minecraftforge.fml.common.FMLCommonHandler;
|
||||
import appeng.api.parts.CableRenderMode;
|
||||
import appeng.block.AEBaseBlock;
|
||||
import appeng.client.EffectType;
|
||||
@@ -50,7 +49,13 @@ public class ServerHelper extends CommonHelper
|
||||
private EntityPlayer renderModeBased;
|
||||
|
||||
@Override
|
||||
public void init()
|
||||
public void configureIcon(Object item, String name )
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void preinit()
|
||||
{
|
||||
|
||||
}
|
||||
@@ -189,4 +194,12 @@ public class ServerHelper extends CommonHelper
|
||||
{
|
||||
throw new IllegalStateException( "Unable to Load Core Mod, please verify that AE2 is properly install in the mods folder, with a .jar extension." );
|
||||
}
|
||||
|
||||
@Override
|
||||
public ResourceLocation addIcon(
|
||||
String string )
|
||||
{
|
||||
// TODO Auto-generated method stub
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -24,9 +24,7 @@ import net.minecraft.server.MinecraftServer;
|
||||
import net.minecraft.util.ChatComponentTranslation;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.event.world.ChunkEvent;
|
||||
|
||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||
|
||||
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
|
||||
import appeng.core.AEConfig;
|
||||
import appeng.core.AELog;
|
||||
import appeng.core.features.AEFeature;
|
||||
|
||||
@@ -19,14 +19,13 @@
|
||||
package appeng.server.subcommands;
|
||||
|
||||
|
||||
import com.google.common.base.Joiner;
|
||||
|
||||
import net.minecraft.command.ICommandSender;
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
import net.minecraft.util.ChatComponentText;
|
||||
|
||||
import appeng.server.ISubCommand;
|
||||
|
||||
import com.google.common.base.Joiner;
|
||||
|
||||
|
||||
public class Supporters implements ISubCommand
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user