Run formatter

This commit is contained in:
Nicholas Ignoffo 2017-08-15 21:30:48 -07:00
parent 61c44a831b
commit 08258fd6ef
606 changed files with 13464 additions and 22975 deletions

View file

@ -6,90 +6,78 @@ import WayofTime.bloodmagic.api.util.helper.BindableHelper;
import WayofTime.bloodmagic.api.util.helper.PlayerHelper;
import WayofTime.bloodmagic.util.helper.TextHelper;
import com.google.common.base.Strings;
import net.minecraft.command.*;
import net.minecraft.command.CommandBase;
import net.minecraft.command.CommandException;
import net.minecraft.command.ICommandSender;
import net.minecraft.command.PlayerNotFoundException;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.server.MinecraftServer;
import net.minecraft.util.text.TextComponentTranslation;
public class SubCommandBind extends CommandBase
{
public class SubCommandBind extends CommandBase {
@Override
public String getName()
{
public String getName() {
return "bind";
}
@Override
public String getUsage(ICommandSender commandSender)
{
public String getUsage(ICommandSender commandSender) {
return TextHelper.localizeEffect("commands.bind.usage");
}
@Override
public int getRequiredPermissionLevel()
{
public int getRequiredPermissionLevel() {
return 2;
}
@Override
public void execute(MinecraftServer server, ICommandSender commandSender, String[] args) throws CommandException
{
public void execute(MinecraftServer server, ICommandSender commandSender, String[] args) throws CommandException {
if (commandSender.getEntityWorld().isRemote)
return;
try
{
try {
EntityPlayer player = CommandBase.getCommandSenderAsPlayer(commandSender);
String playerName = player.getName();
String uuid = PlayerHelper.getUUIDFromPlayer(player).toString();
ItemStack held = player.getHeldItemMainhand();
boolean bind = true;
if (held.getItem() instanceof IBindable)
{
if (args.length > 0)
{
if (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(CommandBase.getPlayer(server, commandSender, playerName)).toString();
}
}
if (bind)
{
if (bind) {
BindableHelper.setItemOwnerName(held, playerName);
BindableHelper.setItemOwnerUUID(held, uuid);
commandSender.sendMessage(new TextComponentTranslation("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.sendMessage(new TextComponentTranslation("commands.bind.remove.success"));
}
}
}
} catch (PlayerNotFoundException e)
{
} catch (PlayerNotFoundException e) {
commandSender.sendMessage(new TextComponentTranslation(TextHelper.localizeEffect("commands.error.404")));
}
}
private boolean isBoolean(String string)
{
private boolean isBoolean(String string) {
return string.equalsIgnoreCase("true") || string.equalsIgnoreCase("false");
}
}

View file

@ -5,159 +5,127 @@ import WayofTime.bloodmagic.api.util.helper.NetworkHelper;
import WayofTime.bloodmagic.command.CommandBloodMagic;
import WayofTime.bloodmagic.util.Utils;
import WayofTime.bloodmagic.util.helper.TextHelper;
import net.minecraft.command.*;
import net.minecraft.command.CommandBase;
import net.minecraft.command.CommandException;
import net.minecraft.command.ICommandSender;
import net.minecraft.command.PlayerNotFoundException;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.server.MinecraftServer;
import net.minecraft.util.text.TextComponentString;
import java.util.Locale;
public class SubCommandNetwork extends CommandBase
{
public class SubCommandNetwork extends CommandBase {
@Override
public String getName() {
return "network";
}
@Override
public String getUsage(ICommandSender commandSender)
{
public String getUsage(ICommandSender commandSender) {
return TextHelper.localizeEffect("commands.network.usage");
}
@Override
public int getRequiredPermissionLevel()
{
public int getRequiredPermissionLevel() {
return 2;
}
@Override
public void execute(MinecraftServer server, ICommandSender commandSender, String[] args) throws CommandException
{
if (args.length > 1)
{
public void execute(MinecraftServer server, ICommandSender commandSender, String[] args) throws CommandException {
if (args.length > 1) {
if (args[0].equalsIgnoreCase("help"))
return;
try
{
try {
EntityPlayer player = CommandBase.getPlayer(server, commandSender, args[1]);
try
{
try {
ValidCommands command = ValidCommands.valueOf(args[0].toUpperCase(Locale.ENGLISH));
command.run(player, commandSender, args.length > 0 && args.length < 2, args);
} catch (IllegalArgumentException e)
{
} catch (IllegalArgumentException e) {
}
} catch (PlayerNotFoundException e)
{
} catch (PlayerNotFoundException e) {
CommandBloodMagic.displayErrorString(commandSender, e.getLocalizedMessage());
}
} else
{
} else {
CommandBloodMagic.displayErrorString(commandSender, "commands.error.arg.missing");
}
}
private enum ValidCommands
{
SYPHON("commands.network.syphon.help")
{
private enum ValidCommands {
SYPHON("commands.network.syphon.help") {
@Override
public void run(EntityPlayer player, ICommandSender sender, boolean displayHelp, String... args)
{
if (displayHelp)
{
public void run(EntityPlayer player, ICommandSender sender, boolean displayHelp, String... args) {
if (displayHelp) {
CommandBloodMagic.displayHelpString(sender, this.help);
return;
}
if (args.length == 3)
{
if (Utils.isInteger(args[2]))
{
if (args.length == 3) {
if (Utils.isInteger(args[2])) {
int amount = Integer.parseInt(args[2]);
NetworkHelper.getSoulNetwork(player).syphonAndDamage(player, amount);
CommandBloodMagic.displaySuccessString(sender, "commands.network.syphon.success", amount, player.getDisplayName().getFormattedText());
} else
{
} else {
CommandBloodMagic.displayErrorString(sender, "commands.error.arg.invalid");
}
} else
{
} else {
CommandBloodMagic.displayErrorString(sender, "commands.error.arg.missing");
}
}
},
ADD("commands.network.add.help")
{
ADD("commands.network.add.help") {
@Override
public void run(EntityPlayer player, ICommandSender sender, boolean displayHelp, String... args)
{
if (displayHelp)
{
public void run(EntityPlayer player, ICommandSender sender, boolean displayHelp, String... args) {
if (displayHelp) {
CommandBloodMagic.displayHelpString(sender, this.help);
return;
}
SoulNetwork network = NetworkHelper.getSoulNetwork(player);
if (args.length == 3)
{
if (Utils.isInteger(args[2]))
{
if (args.length == 3) {
if (Utils.isInteger(args[2])) {
int amount = Integer.parseInt(args[2]);
int maxOrb = NetworkHelper.getMaximumForTier(network.getOrbTier());
CommandBloodMagic.displaySuccessString(sender, "commands.network.add.success", network.add(amount, maxOrb), player.getDisplayName().getFormattedText());
} else
{
} else {
CommandBloodMagic.displayErrorString(sender, "commands.error.arg.invalid");
}
} else
{
} else {
CommandBloodMagic.displayErrorString(sender, "commands.error.arg.missing");
}
}
},
SET("commands.network.set.help")
{
SET("commands.network.set.help") {
@Override
public void run(EntityPlayer player, ICommandSender sender, boolean displayHelp, String... args)
{
if (displayHelp)
{
public void run(EntityPlayer player, ICommandSender sender, boolean displayHelp, String... args) {
if (displayHelp) {
CommandBloodMagic.displayHelpString(sender, this.help);
return;
}
SoulNetwork network = NetworkHelper.getSoulNetwork(player);
if (args.length == 3)
{
if (Utils.isInteger(args[2]))
{
if (args.length == 3) {
if (Utils.isInteger(args[2])) {
int amount = Integer.parseInt(args[2]);
network.setCurrentEssence(amount);
CommandBloodMagic.displaySuccessString(sender, "commands.network.set.success", player.getDisplayName().getFormattedText(), amount);
} else
{
} else {
CommandBloodMagic.displayErrorString(sender, "commands.error.arg.invalid");
}
} else
{
} else {
CommandBloodMagic.displayErrorString(sender, "commands.error.arg.missing");
}
}
},
GET("commands.network.get.help")
{
GET("commands.network.get.help") {
@Override
public void run(EntityPlayer player, ICommandSender sender, boolean displayHelp, String... args)
{
if (displayHelp)
{
public void run(EntityPlayer player, ICommandSender sender, boolean displayHelp, String... args) {
if (displayHelp) {
CommandBloodMagic.displayHelpString(sender, this.help);
return;
}
@ -169,53 +137,43 @@ public class SubCommandNetwork extends CommandBase
}
},
FILL("commands.network.fill.help")
{
FILL("commands.network.fill.help") {
@Override
public void run(EntityPlayer player, ICommandSender sender, boolean displayHelp, String... args)
{
if (displayHelp)
{
public void run(EntityPlayer player, ICommandSender sender, boolean displayHelp, String... args) {
if (displayHelp) {
CommandBloodMagic.displayHelpString(sender, this.help, Integer.MAX_VALUE);
return;
}
SoulNetwork network = NetworkHelper.getSoulNetwork(player);
if (args.length > 1)
{
if (args.length > 1) {
network.setCurrentEssence(Integer.MAX_VALUE);
CommandBloodMagic.displaySuccessString(sender, "commands.network.fill.success", player.getDisplayName().getFormattedText());
}
}
},
CAP("commands.network.cap.help")
{
CAP("commands.network.cap.help") {
@Override
public void run(EntityPlayer player, ICommandSender sender, boolean displayHelp, String... args)
{
if (displayHelp)
{
public void run(EntityPlayer player, ICommandSender sender, boolean displayHelp, String... args) {
if (displayHelp) {
CommandBloodMagic.displayHelpString(sender, this.help);
return;
}
SoulNetwork network = NetworkHelper.getSoulNetwork(player);
if (args.length > 1)
{
if (args.length > 1) {
int maxOrb = NetworkHelper.getMaximumForTier(network.getOrbTier());
network.setCurrentEssence(maxOrb);
CommandBloodMagic.displaySuccessString(sender, "commands.network.cap.success", player.getDisplayName().getFormattedText());
}
}
},
;
},;
public String help;
ValidCommands(String help)
{
ValidCommands(String help) {
this.help = help;
}

View file

@ -6,43 +6,40 @@ import WayofTime.bloodmagic.api.util.helper.PlayerHelper;
import WayofTime.bloodmagic.command.CommandBloodMagic;
import WayofTime.bloodmagic.util.Utils;
import WayofTime.bloodmagic.util.helper.TextHelper;
import net.minecraft.command.*;
import net.minecraft.command.CommandBase;
import net.minecraft.command.CommandException;
import net.minecraft.command.ICommandSender;
import net.minecraft.command.PlayerNotFoundException;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.server.MinecraftServer;
import net.minecraft.util.text.TextComponentString;
import java.util.Locale;
public class SubCommandOrb extends CommandBase
{
public class SubCommandOrb extends CommandBase {
@Override
public String getName() {
return "orb";
}
@Override
public String getUsage(ICommandSender commandSender)
{
public String getUsage(ICommandSender commandSender) {
return TextHelper.localizeEffect("commands.orb.usage");
}
@Override
public int getRequiredPermissionLevel()
{
public int getRequiredPermissionLevel() {
return 2;
}
@Override
public void execute(MinecraftServer server, ICommandSender commandSender, String[] args) throws CommandException
{
if (args.length > 0)
{
public void execute(MinecraftServer server, ICommandSender commandSender, String[] args) throws CommandException {
if (args.length > 0) {
if (args[0].equalsIgnoreCase("help"))
return;
try
{
try {
String givenName = commandSender.getName();
if (args.length > 1)
@ -54,70 +51,56 @@ public class SubCommandOrb extends CommandBase
boolean displayHelp = args.length > 0 && args.length < 2;
try
{
switch (ValidCommands.valueOf(args[0].toUpperCase(Locale.ENGLISH)))
{
case SET:
{
if (displayHelp)
{
CommandBloodMagic.displayHelpString(commandSender, ValidCommands.SET.help);
break;
}
if (args.length == 3)
{
if (Utils.isInteger(args[2]))
{
int amount = Integer.parseInt(args[2]);
network.setOrbTier(amount);
CommandBloodMagic.displaySuccessString(commandSender, "commands.success");
} else
{
CommandBloodMagic.displayErrorString(commandSender, "commands.error.arg.invalid");
try {
switch (ValidCommands.valueOf(args[0].toUpperCase(Locale.ENGLISH))) {
case SET: {
if (displayHelp) {
CommandBloodMagic.displayHelpString(commandSender, ValidCommands.SET.help);
break;
}
if (args.length == 3) {
if (Utils.isInteger(args[2])) {
int amount = Integer.parseInt(args[2]);
network.setOrbTier(amount);
CommandBloodMagic.displaySuccessString(commandSender, "commands.success");
} else {
CommandBloodMagic.displayErrorString(commandSender, "commands.error.arg.invalid");
}
} else {
CommandBloodMagic.displayErrorString(commandSender, "commands.error.arg.missing");
}
} else
{
CommandBloodMagic.displayErrorString(commandSender, "commands.error.arg.missing");
}
break;
}
case GET:
{
if (displayHelp)
{
CommandBloodMagic.displayHelpString(commandSender, ValidCommands.GET.help);
break;
}
case GET: {
if (displayHelp) {
CommandBloodMagic.displayHelpString(commandSender, ValidCommands.GET.help);
break;
}
if (args.length > 1)
commandSender.sendMessage(new TextComponentString(TextHelper.localizeEffect("message.orb.currenttier", network.getOrbTier())));
if (args.length > 1)
commandSender.sendMessage(new TextComponentString(TextHelper.localizeEffect("message.orb.currenttier", network.getOrbTier())));
break;
break;
}
}
}
} catch (IllegalArgumentException e)
{
} catch (IllegalArgumentException e) {
CommandBloodMagic.displayErrorString(commandSender, "commands.error.404");
}
} catch (PlayerNotFoundException e)
{
} catch (PlayerNotFoundException e) {
CommandBloodMagic.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;
}
}