From 8d6b412dc8c7dee293d2b299993f8bdbc0e9b519 Mon Sep 17 00:00:00 2001 From: Matt Date: Thu, 4 Feb 2016 18:45:50 -0500 Subject: [PATCH] Spelling Corrections --- .../configuration/ConfigurationSection.java | 4 ++-- .../configuration/file/YamlConfiguration.java | 2 +- .../configuration/file/YamlRepresenter.java | 2 +- .../serialization/ConfigurationSerializable.java | 2 +- .../java/com/intellectualcrafters/jnbt/NBTUtils.java | 4 ++-- .../intellectualcrafters/plot/commands/DebugPaste.java | 2 +- .../com/intellectualcrafters/plot/commands/Setup.java | 6 +++--- .../intellectualcrafters/plot/commands/SubCommand.java | 8 +++++--- .../intellectualcrafters/plot/commands/Template.java | 2 +- .../com/intellectualcrafters/plot/database/DBFunc.java | 2 +- .../intellectualcrafters/plot/flag/FlagManager.java | 2 +- .../plot/generator/ClassicPlotManager.java | 2 +- .../com/intellectualcrafters/plot/util/MainUtil.java | 6 +++--- .../plot/util/helpmenu/HelpPage.java | 10 +++++----- .../java/com/plotsquared/bukkit/chat/FancyMessage.java | 10 +++++----- .../java/com/plotsquared/bukkit/chat/MessagePart.java | 2 +- .../bukkit/object/entity/EntityWrapper.java | 2 +- .../com/plotsquared/bukkit/util/BukkitHybridUtils.java | 8 ++++---- .../com/plotsquared/object/schematic/StateWrapper.java | 2 +- 19 files changed, 40 insertions(+), 38 deletions(-) diff --git a/src/main/java/com/intellectualcrafters/configuration/ConfigurationSection.java b/src/main/java/com/intellectualcrafters/configuration/ConfigurationSection.java index c75cc3ae8..50d071cc2 100644 --- a/src/main/java/com/intellectualcrafters/configuration/ConfigurationSection.java +++ b/src/main/java/com/intellectualcrafters/configuration/ConfigurationSection.java @@ -155,9 +155,9 @@ public interface ConfigurationSection { * replaced, regardless of what the new value is. *

* Some implementations may have limitations on what you may store. See - * their individual javadocs for details. No implementations should allow + * their individual javadoc for details. No implementations should allow * you to store {@link Configuration}s or {@link ConfigurationSection}s, - * please use {@link #createSection(java.lang.String)} for that. + * please use {@link #createSection(String)} for that. * * @param path Path of the object to set. * @param value New value to set the path to. diff --git a/src/main/java/com/intellectualcrafters/configuration/file/YamlConfiguration.java b/src/main/java/com/intellectualcrafters/configuration/file/YamlConfiguration.java index 47918f856..a1b1d7d78 100644 --- a/src/main/java/com/intellectualcrafters/configuration/file/YamlConfiguration.java +++ b/src/main/java/com/intellectualcrafters/configuration/file/YamlConfiguration.java @@ -193,7 +193,7 @@ public class YamlConfiguration extends FileConfiguration { } Files.copy(file.toPath(), dest.toPath(), StandardCopyOption.REPLACE_EXISTING); PS.debug("&dCould not read: &7" + file); - PS.debug("&drenamed to: &7" + dest.getName()); + PS.debug("&dRenamed to: &7" + dest.getName()); PS.debug("&c============ Full stacktrace ============"); ex.printStackTrace(); PS.debug("&c========================================="); diff --git a/src/main/java/com/intellectualcrafters/configuration/file/YamlRepresenter.java b/src/main/java/com/intellectualcrafters/configuration/file/YamlRepresenter.java index 3110456af..6e628467f 100644 --- a/src/main/java/com/intellectualcrafters/configuration/file/YamlRepresenter.java +++ b/src/main/java/com/intellectualcrafters/configuration/file/YamlRepresenter.java @@ -28,7 +28,7 @@ public class YamlRepresenter extends Representer { @Override public Node representData(final Object data) { final ConfigurationSerializable serializable = (ConfigurationSerializable) data; - final Map values = new LinkedHashMap(); + final Map values = new LinkedHashMap<>(); values.put(ConfigurationSerialization.SERIALIZED_TYPE_KEY, ConfigurationSerialization.getAlias(serializable.getClass())); values.putAll(serializable.serialize()); diff --git a/src/main/java/com/intellectualcrafters/configuration/serialization/ConfigurationSerializable.java b/src/main/java/com/intellectualcrafters/configuration/serialization/ConfigurationSerializable.java index 4ffedde1f..519364d7b 100644 --- a/src/main/java/com/intellectualcrafters/configuration/serialization/ConfigurationSerializable.java +++ b/src/main/java/com/intellectualcrafters/configuration/serialization/ConfigurationSerializable.java @@ -27,7 +27,7 @@ public interface ConfigurationSerializable { * Creates a Map representation of this class. *

* This class must provide a method to restore this class, as defined in - * the {@link ConfigurationSerializable} interface javadocs. + * the {@link ConfigurationSerializable} interface javadoc. * * @return Map containing the current state of this class */ diff --git a/src/main/java/com/intellectualcrafters/jnbt/NBTUtils.java b/src/main/java/com/intellectualcrafters/jnbt/NBTUtils.java index f5118e77b..8dfa1ea61 100644 --- a/src/main/java/com/intellectualcrafters/jnbt/NBTUtils.java +++ b/src/main/java/com/intellectualcrafters/jnbt/NBTUtils.java @@ -44,7 +44,7 @@ public final class NBTUtils { } else if (clazz.equals(IntArrayTag.class)) { return "TAG_Int_Array"; } else { - throw new IllegalArgumentException("Invalid tag classs (" + clazz.getName() + ")."); + throw new IllegalArgumentException("Invalid tag class (" + clazz.getName() + ")."); } } @@ -83,7 +83,7 @@ public final class NBTUtils { } else if (clazz.equals(IntArrayTag.class)) { return NBTConstants.TYPE_INT_ARRAY; } else { - throw new IllegalArgumentException("Invalid tag classs (" + clazz.getName() + ")."); + throw new IllegalArgumentException("Invalid tag class (" + clazz.getName() + ")."); } } diff --git a/src/main/java/com/intellectualcrafters/plot/commands/DebugPaste.java b/src/main/java/com/intellectualcrafters/plot/commands/DebugPaste.java index 0e44ff916..8a53c09b0 100644 --- a/src/main/java/com/intellectualcrafters/plot/commands/DebugPaste.java +++ b/src/main/java/com/intellectualcrafters/plot/commands/DebugPaste.java @@ -19,7 +19,7 @@ import com.plotsquared.general.commands.CommandDeclaration; command = "debugpaste", aliases = { "dp" }, usage = "/plot debugpaste", -description = "Upload settings.yml & latest.log to hastebin", +description = "Upload settings.yml & latest.log to HasteBin", permission = "plots.debugpaste", category = CommandCategory.DEBUG) public class DebugPaste extends SubCommand { diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Setup.java b/src/main/java/com/intellectualcrafters/plot/commands/Setup.java index 1ed662d60..23aa01ab4 100644 --- a/src/main/java/com/intellectualcrafters/plot/commands/Setup.java +++ b/src/main/java/com/intellectualcrafters/plot/commands/Setup.java @@ -164,7 +164,7 @@ public class Setup extends SubCommand { MainUtil.sendMessage(plr, "&6What terrain would you like in plots?" + "\n&8 - &2NONE&8 - &7No terrain at all" + "\n&8 - &7ORE&8 - &7Just some ore veins and trees" - + "\n&8 - &7ROAD&8 - &7Terrain seperated by roads" + + "\n&8 - &7ROAD&8 - &7Terrain separated by roads" + "\n&8 - &7ALL&8 - &7Entirely vanilla generation"); } object.current++; @@ -176,7 +176,7 @@ public class Setup extends SubCommand { MainUtil.sendMessage(plr, "&cYou must choose the terrain!" + "\n&8 - &2NONE&8 - &7No terrain at all" + "\n&8 - &7ORE&8 - &7Just some ore veins and trees" - + "\n&8 - &7ROAD&8 - &7Terrain seperated by roads" + + "\n&8 - &7ROAD&8 - &7Terrain separated by roads" + "\n&8 - &7ALL&8 - &7Entirely vanilla generation"); return false; } @@ -243,7 +243,7 @@ public class Setup extends SubCommand { try { plr.teleport(BlockManager.manager.getSpawn(world)); } catch (final Exception e) { - plr.sendMessage("&cAn error occured. See console for more information"); + plr.sendMessage("&cAn error occurred. See console for more information"); e.printStackTrace(); } sendMessage(plr, C.SETUP_FINISHED, object.world); diff --git a/src/main/java/com/intellectualcrafters/plot/commands/SubCommand.java b/src/main/java/com/intellectualcrafters/plot/commands/SubCommand.java index 46f18d2ba..02d8c90f9 100644 --- a/src/main/java/com/intellectualcrafters/plot/commands/SubCommand.java +++ b/src/main/java/com/intellectualcrafters/plot/commands/SubCommand.java @@ -22,10 +22,12 @@ package com.intellectualcrafters.plot.commands; import com.intellectualcrafters.plot.config.C; import com.intellectualcrafters.plot.object.PlotPlayer; +import com.intellectualcrafters.plot.util.MainUtil; /** * SubCommand class - * + * + */ @SuppressWarnings({ "deprecation" }) public abstract class SubCommand extends com.plotsquared.general.commands.Command { @@ -38,11 +40,11 @@ public abstract class SubCommand extends com.plotsquared.general.commands.Comman /** * Send a message * - * @param plr Player who will receive the mssage + * @param plr Player who will receive the message * @param c Caption * @param args Arguments (%s's) * - * @see com.intellectualcrafters.plot.util.MainUtil#sendMessage(PlotPlayer, C, String...) + * @see MainUtil#sendMessage(PlotPlayer, C, String...) */ public boolean sendMessage(final PlotPlayer plr, final C c, final String... args) { c.send(plr, args); diff --git a/src/main/java/com/intellectualcrafters/plot/commands/Template.java b/src/main/java/com/intellectualcrafters/plot/commands/Template.java index 1eee3d5c9..aa546787e 100644 --- a/src/main/java/com/intellectualcrafters/plot/commands/Template.java +++ b/src/main/java/com/intellectualcrafters/plot/commands/Template.java @@ -129,7 +129,7 @@ public class Template extends SubCommand { return true; } } - MainUtil.sendMessage(plr, C.COMMAND_SYNTAX, "/plot template [template]"); + MainUtil.sendMessage(plr, C.COMMAND_SYNTAX, "/plot template [template]"); return true; } final String world = args[1]; diff --git a/src/main/java/com/intellectualcrafters/plot/database/DBFunc.java b/src/main/java/com/intellectualcrafters/plot/database/DBFunc.java index 885219d0b..4f99b6f52 100644 --- a/src/main/java/com/intellectualcrafters/plot/database/DBFunc.java +++ b/src/main/java/com/intellectualcrafters/plot/database/DBFunc.java @@ -486,7 +486,7 @@ public class DBFunc { } /** - * Replace all occurances of a uuid in the database with another one + * Replace all occurrences of a uuid in the database with another one * @param old * @param now */ diff --git a/src/main/java/com/intellectualcrafters/plot/flag/FlagManager.java b/src/main/java/com/intellectualcrafters/plot/flag/FlagManager.java index 412509dec..54bc9658f 100644 --- a/src/main/java/com/intellectualcrafters/plot/flag/FlagManager.java +++ b/src/main/java/com/intellectualcrafters/plot/flag/FlagManager.java @@ -372,7 +372,7 @@ public class FlagManager { } /** - * Get a list of registerd AbstragFlag objects based on player permissions + * Get a list of registered AbstractFlag objects based on player permissions * * @param player with permissions * diff --git a/src/main/java/com/intellectualcrafters/plot/generator/ClassicPlotManager.java b/src/main/java/com/intellectualcrafters/plot/generator/ClassicPlotManager.java index 8265b32d8..e3deb0fef 100644 --- a/src/main/java/com/intellectualcrafters/plot/generator/ClassicPlotManager.java +++ b/src/main/java/com/intellectualcrafters/plot/generator/ClassicPlotManager.java @@ -13,7 +13,7 @@ import com.intellectualcrafters.plot.util.SetBlockQueue; import java.util.ArrayList; /** - * A plot manager with square plots which tesselate on a square grid with the following sections: ROAD, WALL, BORDER (wall), PLOT, FLOOR (plot) + * A plot manager with square plots which tessellate on a square grid with the following sections: ROAD, WALL, BORDER (wall), PLOT, FLOOR (plot) */ public class ClassicPlotManager extends SquarePlotManager { @Override diff --git a/src/main/java/com/intellectualcrafters/plot/util/MainUtil.java b/src/main/java/com/intellectualcrafters/plot/util/MainUtil.java index e60c86147..0f8fc03b4 100644 --- a/src/main/java/com/intellectualcrafters/plot/util/MainUtil.java +++ b/src/main/java/com/intellectualcrafters/plot/util/MainUtil.java @@ -2306,7 +2306,7 @@ public class MainUtil { /** * Send a message to the player * - * @param plr Player to recieve message + * @param plr Player to receive message * @param msg Message to send * * @return true Can be used in things such as commands (return PlayerFunctions.sendMessage(...)) @@ -2345,7 +2345,7 @@ public class MainUtil { /** * Send a message to the player * - * @param plr Player to recieve message + * @param plr Player to receive message * @param c Caption to send * * @return boolean success @@ -2357,7 +2357,7 @@ public class MainUtil { /** * Send a message to the player * - * @param plr Player to recieve message + * @param plr Player to receive message * @param c Caption to send * * @return boolean success diff --git a/src/main/java/com/intellectualcrafters/plot/util/helpmenu/HelpPage.java b/src/main/java/com/intellectualcrafters/plot/util/helpmenu/HelpPage.java index d47c9fab0..f4a7f6876 100644 --- a/src/main/java/com/intellectualcrafters/plot/util/helpmenu/HelpPage.java +++ b/src/main/java/com/intellectualcrafters/plot/util/helpmenu/HelpPage.java @@ -10,21 +10,21 @@ import com.intellectualcrafters.plot.util.MainUtil; public class HelpPage { - private final List _helpObjecs; + private final List helpObjects; private final String _header; public HelpPage(final CommandCategory category, final int currentPage, final int maxPages) { - _helpObjecs = new ArrayList<>(); + helpObjects = new ArrayList<>(); _header = C.HELP_PAGE_HEADER.s().replace("%category%", category == null ? "ALL" : category.toString()).replace("%current%", (currentPage + 1) + "").replace("%max%", (maxPages + 1) + ""); } public void render(final PlotPlayer player) { - if (_helpObjecs.size() < 1) { + if (helpObjects.size() < 1) { MainUtil.sendMessage(player, C.NOT_VALID_NUMBER, "(0)"); } else { MainUtil.sendMessage(player, C.HELP_HEADER.s(), false); MainUtil.sendMessage(player, _header, false); - for (final HelpObject object : _helpObjecs) { + for (final HelpObject object : helpObjects) { MainUtil.sendMessage(player, object.toString(), false); } MainUtil.sendMessage(player, C.HELP_FOOTER.s(), false); @@ -32,6 +32,6 @@ public class HelpPage { } public void addHelpItem(final HelpObject object) { - _helpObjecs.add(object); + helpObjects.add(object); } } diff --git a/src/main/java/com/plotsquared/bukkit/chat/FancyMessage.java b/src/main/java/com/plotsquared/bukkit/chat/FancyMessage.java index 4dd0e6d3e..213933e0d 100644 --- a/src/main/java/com/plotsquared/bukkit/chat/FancyMessage.java +++ b/src/main/java/com/plotsquared/bukkit/chat/FancyMessage.java @@ -238,7 +238,7 @@ public class FancyMessage implements JsonRepresentedObject, Cloneable, Iterable< Bukkit.getLogger().log(Level.WARNING, "Argument could not be passed.", e); return this; } catch (final InvocationTargetException e) { - Bukkit.getLogger().log(Level.WARNING, "A error has occured durring invoking of method.", e); + Bukkit.getLogger().log(Level.WARNING, "A error has occurred during invoking of method.", e); return this; } } @@ -265,7 +265,7 @@ public class FancyMessage implements JsonRepresentedObject, Cloneable, Iterable< Bukkit.getLogger().log(Level.WARNING, "Argument could not be passed.", e); return this; } catch (final InvocationTargetException e) { - Bukkit.getLogger().log(Level.WARNING, "A error has occured durring invoking of method.", e); + Bukkit.getLogger().log(Level.WARNING, "A error has occurred during invoking of method.", e); return this; } } @@ -296,7 +296,7 @@ public class FancyMessage implements JsonRepresentedObject, Cloneable, Iterable< Bukkit.getLogger().log(Level.WARNING, "Argument could not be passed.", e); return this; } catch (final InvocationTargetException e) { - Bukkit.getLogger().log(Level.WARNING, "A error has occured durring invoking of method.", e); + Bukkit.getLogger().log(Level.WARNING, "A error has occurred during invoking of method.", e); return this; } } @@ -327,7 +327,7 @@ public class FancyMessage implements JsonRepresentedObject, Cloneable, Iterable< Bukkit.getLogger().log(Level.WARNING, "Argument could not be passed.", e); return this; } catch (final InvocationTargetException e) { - Bukkit.getLogger().log(Level.WARNING, "A error has occured durring invoking of method.", e); + Bukkit.getLogger().log(Level.WARNING, "A error has occurred during invoking of method.", e); return this; } } @@ -618,7 +618,7 @@ public class FancyMessage implements JsonRepresentedObject, Cloneable, Iterable< } catch (final InstantiationException e) { Bukkit.getLogger().log(Level.WARNING, "Underlying class is abstract.", e); } catch (final InvocationTargetException e) { - Bukkit.getLogger().log(Level.WARNING, "A error has occured durring invoking of method.", e); + Bukkit.getLogger().log(Level.WARNING, "A error has occurred during invoking of method.", e); } catch (final NoSuchMethodException e) { Bukkit.getLogger().log(Level.WARNING, "Could not find method.", e); } catch (final ClassNotFoundException e) { diff --git a/src/main/java/com/plotsquared/bukkit/chat/MessagePart.java b/src/main/java/com/plotsquared/bukkit/chat/MessagePart.java index c6b8ec44b..3b7dbe19a 100644 --- a/src/main/java/com/plotsquared/bukkit/chat/MessagePart.java +++ b/src/main/java/com/plotsquared/bukkit/chat/MessagePart.java @@ -111,7 +111,7 @@ final class MessagePart implements JsonRepresentedObject, ConfigurationSerializa } json.endObject(); } catch (final IOException e) { - Bukkit.getLogger().log(Level.WARNING, "A problem occured during writing of JSON string", e); + Bukkit.getLogger().log(Level.WARNING, "A problem occurred during writing of JSON string", e); } } diff --git a/src/main/java/com/plotsquared/bukkit/object/entity/EntityWrapper.java b/src/main/java/com/plotsquared/bukkit/object/entity/EntityWrapper.java index 10fcbf75f..9d1107f9d 100644 --- a/src/main/java/com/plotsquared/bukkit/object/entity/EntityWrapper.java +++ b/src/main/java/com/plotsquared/bukkit/object/entity/EntityWrapper.java @@ -548,7 +548,7 @@ public class EntityWrapper { restoreLiving((LivingEntity) entity); return entity; } - // END AMEABLE // + // END AGEABLE // case SHEEP: { final Sheep sheep = (Sheep) entity; if (dataByte == 1) { diff --git a/src/main/java/com/plotsquared/bukkit/util/BukkitHybridUtils.java b/src/main/java/com/plotsquared/bukkit/util/BukkitHybridUtils.java index 6bdd52cf6..b53de1712 100644 --- a/src/main/java/com/plotsquared/bukkit/util/BukkitHybridUtils.java +++ b/src/main/java/com/plotsquared/bukkit/util/BukkitHybridUtils.java @@ -28,13 +28,13 @@ public class BukkitHybridUtils extends HybridUtils { @Override public void analyzeRegion(final String world, final RegionWrapper region, final RunnableVal whenDone) { - // int diff, int variety, int verticies, int rotation, int height_sd + // int diff, int variety, int vertices, int rotation, int height_sd /* * diff: compare to base by looping through all blocks - * variety: add to hashset for each plotblock + * variety: add to HashSet for each PlotBlock * height_sd: loop over all blocks and get top block * - * verticies: store air map and compare with neighbours + * vertices: store air map and compare with neighbours * for each block check the adjacent * - Store all blocks then go through in second loop * - recheck each block @@ -150,7 +150,7 @@ public class BukkitHybridUtils extends HybridUtils { if (now == 0) { air[i]++; } else { - // check verticies + // check vertices // modifications_adjacent if ((x > 0) && (z > 0) && (y > 0) && (x < (width - 1)) && (z < (length - 1)) && (y < 255)) { if (newblocks[y - 1][x][z] == 0) { diff --git a/src/main/java/com/plotsquared/object/schematic/StateWrapper.java b/src/main/java/com/plotsquared/object/schematic/StateWrapper.java index 1d521b704..805467c36 100644 --- a/src/main/java/com/plotsquared/object/schematic/StateWrapper.java +++ b/src/main/java/com/plotsquared/object/schematic/StateWrapper.java @@ -93,7 +93,7 @@ public class StateWrapper { } /* - * TODO: Move this into the spongee module! + * TODO: Move this into the sponge module! * public Map serializeItem(final org.spongepowered.api.item.inventory.ItemStack item) { final Map data = new HashMap();