Merge branch 'master' into dev

Conflicts: src/main/java/se/crafted/chrisb/ecoCreature/rewards/sources/DeathPenaltySource.java src/main/java/se/crafted/chrisb/ecoCreature/rewards/sources/PVPRewardSource.java src/main/java/se/crafted/chrisb/ecoCreature/settings/RewardSourceFactory.java
mung3r · Sep 2, 2014 · 0bcf196 · 0bcf196
2 parents fc308f4 + 843b565
commit 0bcf196
Show file tree

Hide file tree

Showing 19 changed files with 1,555 additions and 1,559 deletions.
diff --git a/README.md b/README.md
@@ -1,54 +1,54 @@
-ecoCreature - Mob & PVP Rewards
-===============================
-
-## Features:
-
-* Coin rewards, coin penalties and drops for:
-    * Killing mobs
-    * PVP
-    * Kill streaks
+ecoCreature - Mob & PVP Rewards
+===============================
+
+## Features:
+
+* Coin rewards, coin penalties and drops for:
+    * Killing mobs
+    * PVP
+    * Kill streaks
     * Death streaks
     * Leveling
-    * Breaking blocks
-* Share coin rewards with:
-    * [Heroes](http://dev.bukkit.org/server-mods/heroes/) party
-    * [mcMMO](http://dev.bukkit.org/server-mods/mcmmo/) party
-    * Participants in a [MobArena](http://dev.bukkit.org/server-mods/mobarena/)
-* Increase or decrease coin rewards based on:
-    * Biome (swampland, forest, etc.)
-    * Environment (normal, nether, etc.)
-    * Time of Day (day, night, etc.)
-    * Weather (sunny, stormy)
-    * Permissions Group (e.g. default, elite, etc.)
-    * [Factions](http://dev.bukkit.org/server-mods/factions/) (neutral, enemy, etc.)
-    * [Heroes](http://dev.bukkit.org/server-mods/heroes/) party
-    * [mcMMO](http://dev.bukkit.org/server-mods/mcmmo/) party
-    * [MobArena](http://dev.bukkit.org/server-mods/mobarena/) participants
-    * [WorldGuard](http://dev.bukkit.org/server-mods/worldguard/) region
-    * [Regios](http://dev.bukkit.org/server-mods/regios/) region
-    * [Residence](http://dev.bukkit.org/server-mods/residence/) region
-    * [Towny](http://dev.bukkit.org/server-mods/towny-advanced/) membership
-    * Weapon used
-* Customize items drops to include:
-    * Any Minecraft materials (list of [materials](http://jd.bukkit.org/apidocs/org/bukkit/Material.html))
-    * Any Minecraft enchantment (list of [enchantments](http://jd.bukkit.org/apidocs/org/bukkit/enchantments/Enchantment.html))
-    * Any Minecraft entity (list of [entities](http://jd.bukkit.org/apidocs/org/bukkit/entity/EntityType.html))
-* [DeathTpPlus](http://dev.bukkit.org/server-mods/deathtpplus/) rewards:
-    * Rewards for kill streaks
-    * Penalties for death streaks
-* [Heroes](http://dev.bukkit.org/server-mods/heroes/) rewards:
+    * Breaking blocks
+* Share coin rewards with:
+    * [Heroes](http://dev.bukkit.org/server-mods/heroes/) party
+    * [mcMMO](http://dev.bukkit.org/server-mods/mcmmo/) party
+    * Participants in a [MobArena](http://dev.bukkit.org/server-mods/mobarena/)
+* Increase or decrease coin rewards based on:
+    * Biome (swampland, forest, etc.)
+    * Environment (normal, nether, etc.)
+    * Time of Day (day, night, etc.)
+    * Weather (sunny, stormy)
+    * Permissions Group (e.g. default, elite, etc.)
+    * [Factions](http://dev.bukkit.org/server-mods/factions/) (neutral, enemy, etc.)
+    * [Heroes](http://dev.bukkit.org/server-mods/heroes/) party
+    * [mcMMO](http://dev.bukkit.org/server-mods/mcmmo/) party
+    * [MobArena](http://dev.bukkit.org/server-mods/mobarena/) participants
+    * [WorldGuard](http://dev.bukkit.org/server-mods/worldguard/) region
+    * [Regios](http://dev.bukkit.org/server-mods/regios/) region
+    * [Residence](http://dev.bukkit.org/server-mods/residence/) region
+    * [Towny](http://dev.bukkit.org/server-mods/towny-advanced/) membership
+    * Weapon used
+* Customize items drops to include:
+    * Any Minecraft materials (list of [materials](http://jd.bukkit.org/apidocs/org/bukkit/Material.html))
+    * Any Minecraft enchantment (list of [enchantments](http://jd.bukkit.org/apidocs/org/bukkit/enchantments/Enchantment.html))
+    * Any Minecraft entity (list of [entities](http://jd.bukkit.org/apidocs/org/bukkit/entity/EntityType.html))
+* [DeathTpPlus](http://dev.bukkit.org/server-mods/deathtpplus/) rewards:
+    * Rewards for kill streaks
+    * Penalties for death streaks
+* [Heroes](http://dev.bukkit.org/server-mods/heroes/) rewards:
     * Rewards for mastering a class
     * Rewards for leveling
 * [mcMMO](http://dev.bukkit.org/server-mods/mcmmo/) rewards:
-	* Rewards for leveling
-* Prevent exploits:
-    * Camping around Mob Spawners
-    * Mob farming
-    * Limit projectile use (e.g. Bow & Arrow)
-* Multi-world support
-
-## Resources:
-
-* [Official Site](http://dev.bukkit.org/server-mods/ecocreature/)
-* [Download Latest Release](http://dev.bukkit.org/server-mods/ecocreature/files/)
-* [Download Development Release](http://ci.bighatchet.com/job/ecoCreature/)
+	* Rewards for leveling
+* Prevent exploits:
+    * Camping around Mob Spawners
+    * Mob farming
+    * Limit projectile use (e.g. Bow & Arrow)
+* Multi-world support
+
+## Resources:
+
+* [Official Site](http://dev.bukkit.org/server-mods/ecocreature/)
+* [Download Latest Release](http://dev.bukkit.org/server-mods/ecocreature/files/)
+* [Download Development Release](http://ci.bighatchet.com/job/ecoCreature/)
diff --git a/src/main/java/se/crafted/chrisb/ecoCreature/commands/BasicCommand.java b/src/main/java/se/crafted/chrisb/ecoCreature/commands/BasicCommand.java
@@ -1,143 +1,143 @@
-/*
- * This file is part of ecoCreature.
- *
- * Copyright (c) 2011-2014, R. Ramos <http://github.com/mung3r/>
- * ecoCreature is licensed under the GNU Lesser General Public License.
- *
- * ecoCreature is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * ecoCreature is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package se.crafted.chrisb.ecoCreature.commands;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.bukkit.command.CommandSender;
-
-public abstract class BasicCommand implements Command {
-
-    private String name;
-    private String description;
-    private String usage;
-    private String permission;
-    private List<String> notes;
-    private List<String> identifiers;
-    private int minArguments;
-    private int maxArguments;
-
-    public BasicCommand(String name) {
-        this.name = name;
-        description = "";
-        usage = "";
-        permission = "";
-        notes = new ArrayList<String>();
-        identifiers = new ArrayList<String>();
-        minArguments = 0;
-        maxArguments = 0;
-    }
-
-    @Override
-    public void cancelInteraction(CommandSender executor) {}
-
-    @Override
-    public String getDescription() {
-        return description;
-    }
-
-    @Override
-    public List<String> getIdentifiers() {
-        return identifiers;
-    }
-
-    @Override
-    public int getMaxArguments() {
-        return maxArguments;
-    }
-
-    @Override
-    public int getMinArguments() {
-        return minArguments;
-    }
-
-    @Override
-    public String getName() {
-        return name;
-    }
-
-    @Override
-    public List<String> getNotes() {
-        return notes;
-    }
-
-    @Override
-    public String getPermission() {
-        return permission;
-    }
-
-    @Override
-    public String getUsage() {
-        return usage;
-    }
-
-    @Override
-    public boolean isIdentifier(CommandSender executor, String input) {
-        for (String identifier : identifiers) {
-            if (input.equalsIgnoreCase(identifier)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    @Override
-    public boolean isNotInProgress(CommandSender executor) {
-        return true;
-    }
-
-    @Override
-    public boolean isInteractive() {
-        return false;
-    }
-
-    @Override
-    public boolean isShownOnHelpMenu() {
-        return true;
-    }
-
-    public void setArgumentRange(int min, int max) {
-        this.minArguments = min;
-        this.maxArguments = max;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public void setIdentifiers(String... identifiers) {
-        this.identifiers.addAll(Arrays.asList(identifiers));
-    }
-
-    public void setNotes(String... notes) {
-        this.notes.addAll(Arrays.asList(notes));
-    }
-
-    public void setPermission(String permission) {
-        this.permission = permission;
-    }
-
-    public void setUsage(String usage) {
-        this.usage = usage;
-    }
-
-}
+/*
+ * This file is part of ecoCreature.
+ *
+ * Copyright (c) 2011-2014, R. Ramos <http://github.com/mung3r/>
+ * ecoCreature is licensed under the GNU Lesser General Public License.
+ *
+ * ecoCreature is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * ecoCreature is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package se.crafted.chrisb.ecoCreature.commands;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.bukkit.command.CommandSender;
+
+public abstract class BasicCommand implements Command {
+
+    private String name;
+    private String description;
+    private String usage;
+    private String permission;
+    private List<String> notes;
+    private List<String> identifiers;
+    private int minArguments;
+    private int maxArguments;
+
+    public BasicCommand(String name) {
+        this.name = name;
+        description = "";
+        usage = "";
+        permission = "";
+        notes = new ArrayList<String>();
+        identifiers = new ArrayList<String>();
+        minArguments = 0;
+        maxArguments = 0;
+    }
+
+    @Override
+    public void cancelInteraction(CommandSender executor) {}
+
+    @Override
+    public String getDescription() {
+        return description;
+    }
+
+    @Override
+    public List<String> getIdentifiers() {
+        return identifiers;
+    }
+
+    @Override
+    public int getMaxArguments() {
+        return maxArguments;
+    }
+
+    @Override
+    public int getMinArguments() {
+        return minArguments;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public List<String> getNotes() {
+        return notes;
+    }
+
+    @Override
+    public String getPermission() {
+        return permission;
+    }
+
+    @Override
+    public String getUsage() {
+        return usage;
+    }
+
+    @Override
+    public boolean isIdentifier(CommandSender executor, String input) {
+        for (String identifier : identifiers) {
+            if (input.equalsIgnoreCase(identifier)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public boolean isNotInProgress(CommandSender executor) {
+        return true;
+    }
+
+    @Override
+    public boolean isInteractive() {
+        return false;
+    }
+
+    @Override
+    public boolean isShownOnHelpMenu() {
+        return true;
+    }
+
+    public void setArgumentRange(int min, int max) {
+        this.minArguments = min;
+        this.maxArguments = max;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public void setIdentifiers(String... identifiers) {
+        this.identifiers.addAll(Arrays.asList(identifiers));
+    }
+
+    public void setNotes(String... notes) {
+        this.notes.addAll(Arrays.asList(notes));
+    }
+
+    public void setPermission(String permission) {
+        this.permission = permission;
+    }
+
+    public void setUsage(String usage) {
+        this.usage = usage;
+    }
+
+}