tilera/electrodynamics
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

Worked out a few issue with /machine command

Browse source
This commit is contained in:
Robert S 2014-05-28 20:58:30 -04:00
parent 0e42b23e80
commit 4da9aec9f7
1 changed files with 55 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
src/main/scala/resonantinduction/core/CommandMachine.java
View file

@ -41,41 +41,33 @@ public class CommandMachine extends CommandBase
{ {
if (args != null && args.length > 0 && args[0] != null) if (args != null && args.length > 0 && args[0] != null)
{ {
if (args[0].equalsIgnoreCase("?")) final String command = args[0];
if (command.equalsIgnoreCase("?"))
{ {
sender.sendChatToPlayer(ChatMessageComponent.createFromText("/machine <arguments....>")); sender.sendChatToPlayer(ChatMessageComponent.createFromText("/machine <arguments....>"));
sender.sendChatToPlayer(ChatMessageComponent.createFromText("Each machine has unique commands")); sender.sendChatToPlayer(ChatMessageComponent.createFromText("Each machine has unique commands"));
} }//Commands are only support by players at the moment
else if (sender instanceof EntityPlayer) else if (sender instanceof EntityPlayer)
{ {
if (args.length > 1 && args[1] != null) final boolean hasSubCommand = args.length > 1 && args[1] != null;
{ final boolean hasSecondSub = args.length > 2 && args[2] != null;
final String command = args[1];
final boolean hasSubCommand = args.length > 2 && args[2] != null;
final boolean hasSecondSub = args.length > 3 && args[3] != null;
final boolean hasThirdSub = args.length > 3 && args[3] != null; final boolean hasThirdSub = args.length > 3 && args[3] != null;
final String subCommand = hasSubCommand ? args[2] : null; final String subCommand = hasSubCommand ? args[1] : null;
final String subCommand2 = hasSecondSub ? args[3] : null; final String subCommand2 = hasSecondSub ? args[2] : null;
final String subCommand3 = hasThirdSub ? args[4] : null; final String subCommand3 = hasThirdSub ? args[3] : null;
if (selection.containsKey(((EntityPlayer) sender).username) && selection.get(((EntityPlayer) sender).username) != null) if (selection.containsKey(((EntityPlayer) sender).username) && selection.get(((EntityPlayer) sender).username) != null)
{ {
VectorWorld pos = selection.get(((EntityPlayer) sender).username); VectorWorld pos = selection.get(((EntityPlayer) sender).username);
TileEntity tile = pos.getTileEntity(); TileEntity tile = pos.getTileEntity();
if (tile instanceof ICmdMachine) if (tile instanceof ICmdMachine && ((ICmdMachine) tile).canTakeCommand(sender, args))
{
if (((ICmdMachine) tile).canTakeCommand(sender, args))
{ {
((ICmdMachine) tile).processCommand(sender, args); ((ICmdMachine) tile).processCommand(sender, args);
} }
else else if (command.equalsIgnoreCase("energy"))
{ {
sender.sendChatToPlayer(ChatMessageComponent.createFromText("Machine refuses the command")); if (CompatibilityModule.isHandler(tile))
}
}
else if (CompatibilityModule.isHandler(tile))
{
if (command.equalsIgnoreCase("energy"))
{ {
if (!hasSubCommand) if (!hasSubCommand)
{ {
@ -97,7 +89,7 @@ public class CommandMachine extends CommandBase
{ {
if (hasThirdSub) if (hasThirdSub)
{ {
long joules = Long.getLong(subCommand3, -33); long joules = Long.parseLong(subCommand3, -33);
if (joules >= 0) if (joules >= 0)
{ {
long ex = CompatibilityModule.extractEnergy(tile, direction, Long.MAX_VALUE, false); long ex = CompatibilityModule.extractEnergy(tile, direction, Long.MAX_VALUE, false);
@ -121,6 +113,17 @@ public class CommandMachine extends CommandBase
sender.sendChatToPlayer(ChatMessageComponent.createFromText("Supply an energy value")); sender.sendChatToPlayer(ChatMessageComponent.createFromText("Supply an energy value"));
} }
} }
}
else
{
sender.sendChatToPlayer(ChatMessageComponent.createFromText("Couldn't read input for side argument"));
}
}
else
{
sender.sendChatToPlayer(ChatMessageComponent.createFromText("Need to supply a side"));
}
}
else else
{ {
sender.sendChatToPlayer(ChatMessageComponent.createFromText("Unknown energy command")); sender.sendChatToPlayer(ChatMessageComponent.createFromText("Unknown energy command"));
@ -128,25 +131,12 @@ public class CommandMachine extends CommandBase
} }
else else
{ {
sender.sendChatToPlayer(ChatMessageComponent.createFromText("Need to supply a side")); sender.sendChatToPlayer(ChatMessageComponent.createFromText("Machine is not an energy handler"));
} }
} }
else else
{ {
sender.sendChatToPlayer(ChatMessageComponent.createFromText("Need to supply a side")); sender.sendChatToPlayer(ChatMessageComponent.createFromText("Unknown command, or unsupport for this machine!"));
}
}
}
}
else
{
sender.sendChatToPlayer(ChatMessageComponent.createFromText("Invalid machine selected!"));
selection.remove(((EntityPlayer) sender).username);
}
}
else
{
sender.sendChatToPlayer(ChatMessageComponent.createFromText("Please supply some arguments"));
} }
} }
else else
@ -206,7 +196,7 @@ public class CommandMachine extends CommandBase
{ {
if (event.action == Action.RIGHT_CLICK_BLOCK) if (event.action == Action.RIGHT_CLICK_BLOCK)
{ {
if (event.entityPlayer.getHeldItem() != null && event.entityPlayer.getHeldItem().itemID == Item.blazeRod.itemID) if (event.entityPlayer.getHeldItem() != null && event.entityPlayer.getHeldItem().itemID == ResonantInduction.itemDevStaff.itemID)
{ {
if (event.entityPlayer.isSneaking()) if (event.entityPlayer.isSneaking())
{ {
@ -214,8 +204,7 @@ public class CommandMachine extends CommandBase
TileEntity tile = hit.getTileEntity(); TileEntity tile = hit.getTileEntity();
if (tile != null) if (tile != null)
{ {
event.entityPlayer.sendChatToPlayer(ChatMessageComponent.createFromText("Selecting sentry at " + hit.toString())); event.entityPlayer.sendChatToPlayer(ChatMessageComponent.createFromText("Tile selected at " + hit.x + "x " + hit.y + "y " + hit.z + "z]"));
event.entityPlayer.sendChatToPlayer(ChatMessageComponent.createFromText("Sentry is awaiting orders"));
selection.put(event.entityPlayer.username, hit); selection.put(event.entityPlayer.username, hit);
if (event.isCancelable()) if (event.isCancelable())