lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Normalized code formatting.

Browse source
This commit is contained in:
WayofTime 2016-03-16 18:41:06 -04:00
parent b1db7c5152
commit 134b11f177
122 changed files with 944 additions and 697 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/main/java/WayofTime/bloodmagic/command/CommandBloodMagic.java
View file

@ -11,12 +11,14 @@ import net.minecraft.util.ChatComponentText;
import java.util.*;
public class CommandBloodMagic extends CommandBase {
public class CommandBloodMagic extends CommandBase
{
private final List<String> aliases = new ArrayList<String>();
private final Map<String, ISubCommand> subCommands = new HashMap<String, ISubCommand>();
public CommandBloodMagic() {
public CommandBloodMagic()
{
aliases.add("BloodMagic");
aliases.add("bloodmagic");
aliases.add("bloodMagic");
@ -29,38 +31,46 @@ public class CommandBloodMagic extends CommandBase {
}
@Override
public String getCommandName() {
public String getCommandName()
{
return "/bloodmagic";
}
@Override
public int getRequiredPermissionLevel() {
public int getRequiredPermissionLevel()
{
return 3;
}
@Override
public String getCommandUsage(ICommandSender commandSender) {
public String getCommandUsage(ICommandSender commandSender)
{
return getCommandName() + " help";
}
@Override
public List<String> getCommandAliases() {
public List<String> getCommandAliases()
{
return aliases;
}
@Override
public void processCommand(ICommandSender commandSender, String[] args) {
if (args.length > 0 && subCommands.containsKey(args[0])) {
public void processCommand(ICommandSender commandSender, String[] args)
{
if (args.length > 0 && subCommands.containsKey(args[0]))
{
ISubCommand subCommand = subCommands.get(args[0]);
String[] subArgs = Arrays.copyOfRange(args, 1, args.length);
subCommand.processSubCommand(commandSender, subArgs);
} else {
} else
{
commandSender.addChatMessage(new ChatComponentText(TextHelper.localizeEffect("commands.error.unknown")));
}
}
public Map<String, ISubCommand> getSubCommands() {
public Map<String, ISubCommand> getSubCommands()
{
return subCommands;
}
}

3
src/main/java/WayofTime/bloodmagic/command/ISubCommand.java
View file

@ -3,7 +3,8 @@ package WayofTime.bloodmagic.command;
import net.minecraft.command.ICommand;
import net.minecraft.command.ICommandSender;
public interface ISubCommand {
public interface ISubCommand
{
String getSubCommandName();

41
src/main/java/WayofTime/bloodmagic/command/SubCommandBase.java
View file

@ -12,28 +12,33 @@ import net.minecraft.util.StatCollector;
import java.util.Locale;
public abstract class SubCommandBase implements ISubCommand {
public abstract class SubCommandBase implements ISubCommand
{
private ICommand parent;
private String name;
public SubCommandBase(ICommand parent, String name) {
public SubCommandBase(ICommand parent, String name)
{
this.parent = parent;
this.name = name;
}
@Override
public String getSubCommandName() {
public String getSubCommandName()
{
return name;
}
@Override
public ICommand getParentCommand() {
public ICommand getParentCommand()
{
return parent;
}
@Override
public void processSubCommand(ICommandSender commandSender, String[] args) {
public void processSubCommand(ICommandSender commandSender, String[] args)
{
if (args.length == 0 && !getSubCommandName().equals("help"))
displayErrorString(commandSender, String.format(StatCollector.translateToLocal("commands.format.error"), capitalizeFirstLetter(getSubCommandName()), getArgUsage(commandSender)));
@ -42,19 +47,22 @@ public abstract class SubCommandBase implements ISubCommand {
displayHelpString(commandSender, String.format(StatCollector.translateToLocal("commands.format.help"), capitalizeFirstLetter(getSubCommandName()), getHelpText()));
}
protected EntityPlayerMP getCommandSenderAsPlayer(ICommandSender commandSender) throws PlayerNotFoundException{
protected EntityPlayerMP getCommandSenderAsPlayer(ICommandSender commandSender) throws PlayerNotFoundException
{
if (commandSender instanceof EntityPlayerMP)
return (EntityPlayerMP)commandSender;
return (EntityPlayerMP) commandSender;
else
throw new PlayerNotFoundException(StatCollector.translateToLocal("commands.error.arg.player.missing"));
}
protected EntityPlayerMP getPlayer(ICommandSender commandSender, String playerName) throws PlayerNotFoundException {
protected EntityPlayerMP getPlayer(ICommandSender commandSender, String playerName) throws PlayerNotFoundException
{
EntityPlayerMP entityplayermp = PlayerSelector.matchOnePlayer(commandSender, playerName);
if (entityplayermp != null)
return entityplayermp;
else {
else
{
entityplayermp = MinecraftServer.getServer().getConfigurationManager().getPlayerByUsername(playerName);
if (entityplayermp == null)
@ -64,23 +72,28 @@ public abstract class SubCommandBase implements ISubCommand {
}
}
protected String capitalizeFirstLetter(String toCapital) {
protected String capitalizeFirstLetter(String toCapital)
{
return String.valueOf(toCapital.charAt(0)).toUpperCase(Locale.ENGLISH) + toCapital.substring(1);
}
protected boolean isBounded(int low, int high, int given) {
protected boolean isBounded(int low, int high, int given)
{
return given > low && given < high;
}
protected void displayHelpString(ICommandSender commandSender, String display, Object ... info) {
protected void displayHelpString(ICommandSender commandSender, String display, Object... info)
{
commandSender.addChatMessage(new ChatComponentText(TextHelper.localizeEffect(display, info)));
}
protected void displayErrorString(ICommandSender commandSender, String display, Object ... info) {
protected void displayErrorString(ICommandSender commandSender, String display, Object... info)
{
commandSender.addChatMessage(new ChatComponentText(TextHelper.localizeEffect(display, info)));
}
protected void displaySuccessString(ICommandSender commandSender, String display, Object ... info) {
protected void displaySuccessString(ICommandSender commandSender, String display, Object... info)
{
commandSender.addChatMessage(new ChatComponentText(TextHelper.localizeEffect(display, info)));
}
}

45
src/main/java/WayofTime/bloodmagic/command/sub/SubCommandBind.java
View file

@ -15,71 +15,86 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.ChatComponentText;
import net.minecraft.util.ChatComponentTranslation;
public class SubCommandBind extends SubCommandBase {
public class SubCommandBind extends SubCommandBase
{
public SubCommandBind(ICommand parent) {
public SubCommandBind(ICommand parent)
{
super(parent, "bind");
}
@Override
public String getArgUsage(ICommandSender commandSender) {
public String getArgUsage(ICommandSender commandSender)
{
return TextHelper.localizeEffect("commands.bind.usage");
}
@Override
public String getHelpText() {
public String getHelpText()
{
return TextHelper.localizeEffect("commands.bind.help");
}
@Override
public void processSubCommand(ICommandSender commandSender, String[] args) {
public void processSubCommand(ICommandSender commandSender, String[] args)
{
super.processSubCommand(commandSender, args);
if (commandSender.getEntityWorld().isRemote)
return;
try {
try
{
EntityPlayer player = getCommandSenderAsPlayer(commandSender);
String playerName = player.getName();
String uuid = PlayerHelper.getUUIDFromPlayer(player).toString();
ItemStack held = player.getHeldItem();
boolean bind = true;
if (held != null && held.getItem() instanceof IBindable) {
if (args.length > 0) {
if (held != null && held.getItem() instanceof IBindable)
{
if (args.length > 0)
{
if (args[0].equalsIgnoreCase("help"))
return;
if (isBoolean(args[0])) {
if (isBoolean(args[0]))
{
bind = Boolean.parseBoolean(args[0]);
if (args.length > 2)
playerName = args[1];
} else {
} else
{
playerName = args[0];
uuid = PlayerHelper.getUUIDFromPlayer(getPlayer(commandSender, playerName)).toString();
}
}
if (bind) {
if (bind)
{
BindableHelper.setItemOwnerName(held, playerName);
BindableHelper.setItemOwnerUUID(held, uuid);
commandSender.addChatMessage(new ChatComponentTranslation("commands.bind.success"));
} else {
if (!Strings.isNullOrEmpty(((IBindable) held.getItem()).getOwnerUUID(held))) {
} else
{
if (!Strings.isNullOrEmpty(((IBindable) held.getItem()).getOwnerUUID(held)))
{
held.getTagCompound().removeTag(Constants.NBT.OWNER_UUID);
held.getTagCompound().removeTag(Constants.NBT.OWNER_NAME);
commandSender.addChatMessage(new ChatComponentTranslation("commands.bind.remove.success"));
}
}
}
} catch (PlayerNotFoundException e) {
} catch (PlayerNotFoundException e)
{
commandSender.addChatMessage(new ChatComponentText(TextHelper.localizeEffect("commands.error.404")));
}
}
private boolean isBoolean(String string) {
private boolean isBoolean(String string)
{
return string.equalsIgnoreCase("true") || string.equalsIgnoreCase("false");
}
}

17
src/main/java/WayofTime/bloodmagic/command/sub/SubCommandHelp.java
View file

@ -9,30 +9,35 @@ import net.minecraft.command.ICommandSender;
import net.minecraft.util.ChatComponentText;
import net.minecraft.util.StatCollector;
public class SubCommandHelp extends SubCommandBase {
public class SubCommandHelp extends SubCommandBase
{
public SubCommandHelp(ICommand parent) {
public SubCommandHelp(ICommand parent)
{
super(parent, "help");
}
@Override
public String getArgUsage(ICommandSender commandSender) {
public String getArgUsage(ICommandSender commandSender)
{
return StatCollector.translateToLocal("commands.help.usage");
}
@Override
public String getHelpText() {
public String getHelpText()
{
return StatCollector.translateToLocal("commands.help.help");
}
@Override
public void processSubCommand(ICommandSender commandSender, String[] args) {
public void processSubCommand(ICommandSender commandSender, String[] args)
{
super.processSubCommand(commandSender, args);
if (args.length > 0)
return;
for (ISubCommand subCommand : ((CommandBloodMagic)getParentCommand()).getSubCommands().values())
for (ISubCommand subCommand : ((CommandBloodMagic) getParentCommand()).getSubCommands().values())
commandSender.addChatMessage(new ChatComponentText(TextHelper.localizeEffect("commands.format.help", capitalizeFirstLetter(subCommand.getSubCommandName()), subCommand.getArgUsage(commandSender))));
}
}

252
src/main/java/WayofTime/bloodmagic/command/sub/SubCommandNetwork.java
View file

@ -15,36 +15,44 @@ import net.minecraft.util.StatCollector;
import java.util.Locale;
public class SubCommandNetwork extends SubCommandBase {
public class SubCommandNetwork extends SubCommandBase
{
public SubCommandNetwork(ICommand parent) {
public SubCommandNetwork(ICommand parent)
{
super(parent, "network");
}
@Override
public String getArgUsage(ICommandSender commandSender) {
public String getArgUsage(ICommandSender commandSender)
{
return StatCollector.translateToLocal("commands.network.usage");
}
@Override
public String getHelpText() {
public String getHelpText()
{
return StatCollector.translateToLocal("commands.network.help");
}
@Override
public void processSubCommand(ICommandSender commandSender, String[] args) {
public void processSubCommand(ICommandSender commandSender, String[] args)
{
super.processSubCommand(commandSender, args);
if (args.length > 0) {
if (args.length > 0)
{
if (args[0].equalsIgnoreCase("help"))
return;
try {
try
{
String givenName = commandSender.getName();
EntityPlayer player = getPlayer(commandSender, givenName);
if (args.length > 1) {
if (args.length > 1)
{
givenName = args[1];
player = getPlayer(commandSender, givenName);
}
@ -52,117 +60,148 @@ public class SubCommandNetwork extends SubCommandBase {
SoulNetwork network = NetworkHelper.getSoulNetwork(player);
boolean displayHelp = isBounded(0, 2, args.length);
try {
switch (ValidCommands.valueOf(args[0].toUpperCase(Locale.ENGLISH))) {
case SYPHON: {
if (displayHelp) {
displayHelpString(commandSender, ValidCommands.SYPHON.help);
break;
}
if (args.length == 3) {
if (Utils.isInteger(args[2])) {
int amount = Integer.parseInt(args[2]);
NetworkHelper.syphonAndDamage(NetworkHelper.getSoulNetwork(player), player, amount);
displaySuccessString(commandSender, "commands.network.syphon.success", amount, givenName);
} else {
displayErrorString(commandSender, "commands.error.arg.invalid");
}
} else {
displayErrorString(commandSender, "commands.error.arg.missing");
}
try
{
switch (ValidCommands.valueOf(args[0].toUpperCase(Locale.ENGLISH)))
{
case SYPHON:
{
if (displayHelp)
{
displayHelpString(commandSender, ValidCommands.SYPHON.help);
break;
}
case ADD: {
if (displayHelp) {
displayHelpString(commandSender, ValidCommands.ADD.help);
break;
}
if (args.length == 3) {
if (Utils.isInteger(args[2])) {
int amount = Integer.parseInt(args[2]);
int maxOrb = NetworkHelper.getMaximumForTier(network.getOrbTier());
displaySuccessString(commandSender, "commands.network.add.success", network.addLifeEssence(amount, maxOrb), givenName);
} else {
displayErrorString(commandSender, "commands.error.arg.invalid");
}
} else {
displayErrorString(commandSender, "commands.error.arg.missing");
if (args.length == 3)
{
if (Utils.isInteger(args[2]))
{
int amount = Integer.parseInt(args[2]);
NetworkHelper.syphonAndDamage(NetworkHelper.getSoulNetwork(player), player, amount);
displaySuccessString(commandSender, "commands.network.syphon.success", amount, givenName);
} else
{
displayErrorString(commandSender, "commands.error.arg.invalid");
}
break;
} else
{
displayErrorString(commandSender, "commands.error.arg.missing");
}
case SET: {
if (displayHelp) {
displayHelpString(commandSender, ValidCommands.SET.help);
break;
}
if (args.length == 3) {
if (Utils.isInteger(args[2])) {
int amount = Integer.parseInt(args[2]);
network.setCurrentEssence(amount);
displaySuccessString(commandSender, "commands.network.set.success", givenName, amount);
} else {
displayErrorString(commandSender, "commands.error.arg.invalid");
}
} else {
displayErrorString(commandSender, "commands.error.arg.missing");
}
break;
}
case GET: {
if (displayHelp) {
displayHelpString(commandSender, ValidCommands.GET.help);
break;
}
if (args.length > 1)
commandSender.addChatMessage(new ChatComponentText(TextHelper.localizeEffect("message.divinationsigil.currentessence", network.getCurrentEssence())));
break;
}
case FILL: {
if (displayHelp) {
displayHelpString(commandSender, ValidCommands.FILL.help, Integer.MAX_VALUE);
break;
}
if (args.length > 1) {
network.setCurrentEssence(Integer.MAX_VALUE);
displaySuccessString(commandSender, "commands.network.fill.success", givenName);
}
break;
}
case CAP: {
if (displayHelp) {
displayHelpString(commandSender, ValidCommands.CAP.help);
break;
}
if (args.length > 1) {
int maxOrb = NetworkHelper.getMaximumForTier(network.getOrbTier());
network.setCurrentEssence(maxOrb);
displaySuccessString(commandSender, "commands.network.cap.success", givenName);
}
break;
}
break;
}
} catch (IllegalArgumentException e) {
case ADD:
{
if (displayHelp)
{
displayHelpString(commandSender, ValidCommands.ADD.help);
break;
}
if (args.length == 3)
{
if (Utils.isInteger(args[2]))
{
int amount = Integer.parseInt(args[2]);
int maxOrb = NetworkHelper.getMaximumForTier(network.getOrbTier());
displaySuccessString(commandSender, "commands.network.add.success", network.addLifeEssence(amount, maxOrb), givenName);
} else
{
displayErrorString(commandSender, "commands.error.arg.invalid");
}
} else
{
displayErrorString(commandSender, "commands.error.arg.missing");
}
break;
}
case SET:
{
if (displayHelp)
{
displayHelpString(commandSender, ValidCommands.SET.help);
break;
}
if (args.length == 3)
{
if (Utils.isInteger(args[2]))
{
int amount = Integer.parseInt(args[2]);
network.setCurrentEssence(amount);
displaySuccessString(commandSender, "commands.network.set.success", givenName, amount);
} else
{
displayErrorString(commandSender, "commands.error.arg.invalid");
}
} else
{
displayErrorString(commandSender, "commands.error.arg.missing");
}
break;
}
case GET:
{
if (displayHelp)
{
displayHelpString(commandSender, ValidCommands.GET.help);
break;
}
if (args.length > 1)
commandSender.addChatMessage(new ChatComponentText(TextHelper.localizeEffect("message.divinationsigil.currentessence", network.getCurrentEssence())));
break;
}
case FILL:
{
if (displayHelp)
{
displayHelpString(commandSender, ValidCommands.FILL.help, Integer.MAX_VALUE);
break;
}
if (args.length > 1)
{
network.setCurrentEssence(Integer.MAX_VALUE);
displaySuccessString(commandSender, "commands.network.fill.success", givenName);
}
break;
}
case CAP:
{
if (displayHelp)
{
displayHelpString(commandSender, ValidCommands.CAP.help);
break;
}
if (args.length > 1)
{
int maxOrb = NetworkHelper.getMaximumForTier(network.getOrbTier());
network.setCurrentEssence(maxOrb);
displaySuccessString(commandSender, "commands.network.cap.success", givenName);
}
break;
}
}
} catch (IllegalArgumentException e)
{
displayErrorString(commandSender, "commands.error.404");
}
} catch (PlayerNotFoundException e) {
} catch (PlayerNotFoundException e)
{
displayErrorString(commandSender, "commands.error.404");
}
}
}
private enum ValidCommands {
private enum ValidCommands
{
SYPHON("commands.network.syphon.help"),
ADD("commands.network.add.help"),
SET("commands.network.set.help"),
@ -172,7 +211,8 @@ public class SubCommandNetwork extends SubCommandBase {
public String help;
ValidCommands(String help) {
ValidCommands(String help)
{
this.help = help;
}
}

101
src/main/java/WayofTime/bloodmagic/command/sub/SubCommandOrb.java
View file

@ -15,32 +15,39 @@ import net.minecraft.util.StatCollector;
import java.util.Locale;
public class SubCommandOrb extends SubCommandBase {
public class SubCommandOrb extends SubCommandBase
{
public SubCommandOrb(ICommand parent) {
public SubCommandOrb(ICommand parent)
{
super(parent, "orb");
}
@Override
public String getArgUsage(ICommandSender commandSender) {
public String getArgUsage(ICommandSender commandSender)
{
return StatCollector.translateToLocal("commands.orb.usage");
}
@Override
public String getHelpText() {
public String getHelpText()
{
return StatCollector.translateToLocal("commands.orb.help");
}
@Override
public void processSubCommand(ICommandSender commandSender, String[] args) {
public void processSubCommand(ICommandSender commandSender, String[] args)
{
super.processSubCommand(commandSender, args);
if (args.length > 0) {
if (args.length > 0)
{
if (args[0].equalsIgnoreCase("help"))
return;
try {
try
{
String givenName = commandSender.getName();
if (args.length > 1)
@ -52,56 +59,70 @@ public class SubCommandOrb extends SubCommandBase {
boolean displayHelp = isBounded(0, 2, args.length);
try {
switch (ValidCommands.valueOf(args[0].toUpperCase(Locale.ENGLISH))) {
case SET: {
if (displayHelp) {
displayHelpString(commandSender, ValidCommands.SET.help);
break;
}
if (args.length == 3) {
if (Utils.isInteger(args[2])) {
int amount = Integer.parseInt(args[2]);
network.setOrbTier(amount);
displaySuccessString(commandSender, "commands.success");
} else {
displayErrorString(commandSender, "commands.error.arg.invalid");
}
} else {
displayErrorString(commandSender, "commands.error.arg.missing");
}
try
{
switch (ValidCommands.valueOf(args[0].toUpperCase(Locale.ENGLISH)))
{
case SET:
{
if (displayHelp)
{
displayHelpString(commandSender, ValidCommands.SET.help);
break;
}
case GET: {
if (displayHelp) {
displayHelpString(commandSender, ValidCommands.GET.help);
break;
if (args.length == 3)
{
if (Utils.isInteger(args[2]))
{
int amount = Integer.parseInt(args[2]);
network.setOrbTier(amount);
displaySuccessString(commandSender, "commands.success");
} else
{
displayErrorString(commandSender, "commands.error.arg.invalid");
}
if (args.length > 1)
commandSender.addChatMessage(new ChatComponentText(TextHelper.localizeEffect("message.orb.currenttier", network.getOrbTier())));
break;
} else
{
displayErrorString(commandSender, "commands.error.arg.missing");
}
break;
}
} catch (IllegalArgumentException e) {
case GET:
{
if (displayHelp)
{
displayHelpString(commandSender, ValidCommands.GET.help);
break;
}
if (args.length > 1)
commandSender.addChatMessage(new ChatComponentText(TextHelper.localizeEffect("message.orb.currenttier", network.getOrbTier())));
break;
}
}
} catch (IllegalArgumentException e)
{
displayErrorString(commandSender, "commands.error.404");
}
} catch (PlayerNotFoundException e) {
} catch (PlayerNotFoundException e)
{
displayErrorString(commandSender, "commands.error.404");
}
}
}
private enum ValidCommands {
private enum ValidCommands
{
SET("commands.orb.set.help"),
GET("commands.orb.get.help");
public String help;
ValidCommands(String help) {
ValidCommands(String help)
{
this.help = help;
}
}