Merge pull request #1 from TownyAdvanced/master

Update local repository with head.

.classpath

@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre1.8.0_25"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="lib" path="../lib/bpermissions.jar"/>
 	<classpathentry kind="lib" path="../lib/Essentials.jar"/>
 	<classpathentry kind="lib" path="../lib/EssentialsGroupManager.jar"/>
 	<classpathentry kind="lib" path="../lib/iConomy.jar"/>
 	<classpathentry kind="lib" path="../lib/PermissionsEx.jar"/>
-	<classpathentry kind="lib" path="../lib/bukkit.jar">
+	<classpathentry kind="lib" path="../lib/bukkit.jar" sourcepath="/lib/bukkit.jar">
 		<attributes>
 			<attribute name="javadoc_location" value="http://jd.bukkit.org/apidocs/"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="lib" path="../lib/citizensapi-2.0-SNAPSHOT.jar"/>
 	<classpathentry kind="lib" path="../lib/Vault.jar"/>
+	<classpathentry kind="lib" path="../lib/Reserve.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

build.xml

@@ -30,7 +30,7 @@
 
 	<target name="compile" depends="download">
 		<!-- Compile the java code -->
-		<javac srcdir="src" destdir="${build}" includeantruntime="false" target="1.6" source="1.6" debug="true" debuglevel="lines,vars,source">
+		<javac srcdir="src" destdir="${build}" includeantruntime="false" target="1.8" source="1.8" debug="true" debuglevel="lines,vars,source">
 			<classpath>
 				<pathelement location="${env.LIB}/bukkit.jar" />
 				<pathelement location="${env.LIB}/bpermissions.jar" />

src/ChangeLog.txt

@@ -2804,7 +2804,7 @@ v0.92.0.8:
 v0.92.0.9:
     - Spanish.yml updated to 0.42 by SeDark.
     - Fix an NPE that could occur in the wilderness from explosions.
-    - Made it so that town and nation ranks can contain capitol letters. Rank permissions remain lowercased.
+    - Made it so that town and nation ranks can contain capital letters. Rank permissions remain lowercased.
     - Fix area claiming not respecting the min_plot_distance_from_town_plot setting in the config.
     - Players who are in towns now receive a permission node, towny.town.{townname}. 
       - This can be useful for server operators who want to test if a player has a permission node to make sure they are part of a town.
@@ -2813,4 +2813,97 @@ v0.92.0.9:
 	  - default: true
 	  - When set to true, any cost paid by a player to use any variant of '/town spawn' will be paid to the town bank.
 	  - When false the amount will be paid to the server account whose name is set in the closed economy setting.
-	- Fix cost not being used when the '/plot forsale {cost} within {radius}' command is ussed. 
+	- Fix cost not being used when the '/plot forsale {cost} within {radius}' command is ussed. 
+	- Fix mayors not being able to work on blocks inside of their own personal plots when they do not have the towny.claimed.owntown.* node.
+v0.92.0.10:
+    - Add support for Reserve courtesy of creatorfromhell.
+      - Reserve is an optional Vault-replacement available at https://www.spigotmc.org/resources/reserve.50739/
+    - Add /town new to the /town ? help, don't know how this one was missed.
+    - Added /town create as an alias of sorts to /town new.
+    - Improve error seen when a player tries to use /t set spawn when not in the homeblock or when the homeblock isn't set.
+    - Added /ta giveplots as an alias of sorts to /ta givebonus.
+    - Language files bumped to 0.44.
+    - New Command: '/ta set plot {town}' courtesy of Articdive.
+      - When in a town only a single plot can be transfered at one time.
+        - Admin command to change a plot from one town to another.
+        - Does not require a town to have available townblocks to claim.
+      - When in the wilderness two types of sub commands can be used to do area claims:
+        - Admin command to change wilderness into a claim for a town.
+        - Does require a town to have available townblocks to claim.
+        - Does obey proximity rules for claims between towns/homeblocks.
+        - /ta set plot {town} {rect|circle} {radius}
+        - /ta set plot {town} {rect|circle} auto
+      - Does not charge town for the townblock.
+      - Requires towny.command.townyadmin.set.plot permission node.
+    - New Permission node: towny.command.townyadmin.set.plot
+      - Default: false
+      - Child node of towny.admin and towny.command.townyadmin.set.*
+      - For mods who don't have the full towny.admin permission node but are able to change plots to other towns.
+    - New Permission node: towny.command.townyadmin.set.capital
+      - Default: false
+      - Child node of towny.admin and towny.command.townyadmin.set.*
+    - New Permission node: towny.command.townyadmin.set.title
+      - Default: false
+      - Child node of towny.admin and towny.command.townyadmin.set.*
+    - New Permission node: towny.command.townyadmin.set.surname
+      - Default: false
+      - Child node of towny.admin and towny.command.townyadmin.set.*
+    - New Feature: Limiting Outposts by Town and Nation Levels!
+      - See below.
+    - New Config Option: global_town_settings.limit_outposts_using_town_and_nation_levels
+      - default: false
+      - When set to true outposts can be limited by the townOutpostLimit value of the Town Levels and
+        the nationBonusOutpostLimit value in the Nation Levels. 
+      - In this way nations can be made to be the only way of receiving outposts, or as an incentive to receive more outposts.
+      - Towns which are larger can have more outposts.
+      - When activated, this setting will not cause towns who already have higher than their limit to lose outposts. 
+      - They will not be able to start new outposts until they have unclaimed outposts to become under their limit. 
+      - Likewise, towns that join a nation and receive bonus outposts will be over their limit if they leave the nation.
+      - When the feature is enabled, the limits are shown in the /town status screen.
+    - New Config Option: global_townSettings.over_outpost_limits_stops_teleports
+      - default: false
+      - When limit_outposts_using_town_and_nation_levels is also true, towns which are over their outpost
+        limit will not be able to use their /town outpost teleports for the outpost #'s higher than their limit, 
+        until they have dropped below their limit.
+      - eg: If their limit is 3 then they cannot use /t outpost 4 
+    - REQUIRED CONFIG CHANGE:
+      - a new entry to all of your nation_levels in the config must be added, otherwise Towny will not start up properly.
+      - add 'nationBonusOutpostLimit: #' to each nation_level.
+      - default settings are between 0 and 3.
+      - If you do not want to do this you can delete the nation_level section of your config and Towny will re-create it with the missing lines and new default settings.
+    - REQUIRED CONFIG CHANGE:
+      - a new entry to all of your town_levels in the config must be added, otherwise Towny will not start up properly.
+      - add 'townOutpostLimit: #' to each town_level.
+      - default settings are between 0 and 4.
+      - If you do not want to do this you can delete the town_level section of your config and Towny will re-create it with the missing lines and new default settings.
+    - New Config Option: town.min_distance_for_outpost_from_plot
+      - default: 5
+      - Minimum number of plots an outpost must be from any other town's plots.
+      - Useful when min_plot_distance_from_town_plot is set to near-zero to allow towns to have claims 
+        near to each other, but want to keep outposts away from towns. 
+    - 65+ new languages strings are now translateabl. 
+      - These strings are mainly found in the /plot perm, /res, /town, /nation and /townyworld status screens.
+    - New Config Option: global_town_settings.homeblocks_prevent_forcepvp
+      - default: false
+      - If set to true, when a world has forcepvp set to true, homeblocks of towns will not be affected and have PVP set to off.
+    - New Feature: /townyworld commands can be run from console!
+      - Requires the worldname to be supplied after 'tw'
+      - Eg: 'tw world_nether toggle forcepvp'
+      - /tw regen and /tw undo are not usable from the console because they require a player standing in a plot.
+    - New Feature: /town, /res and /nation can be run from the console!
+      - Commands are limited but generally /{command} list and /{command} {name} work.
+      - Previously the console would just show the help page for the /{command} no matter what sub command was used. 
+    - REQUIRED CONFIG CHANGE: add END_CRYSTAL to the protection.item_use_ids list.
+      - Stops end crystals being placed in towns where they shouldn't be able to place items. 
+    - Fix protection of End Crystals in town.
+    - Fix protection of Armour Stands and other entities from the explosions caused by Fireworks.
+    - Added API events, courtesy of Articdive
+      - NationInviteTownEvent
+      - NationRequestAllyNationEvent
+      - TownInvitePlayerEvent
+    - Added bStats metrics. 
+    - Towny now builds using Java 8, thanks for that gentle nudge github.
+    - Italian.yml updated to 0.44 by Leomixer17.
+v0.92.0.11:
+    - Fix players that are jailed in a town which has just deleted itself. 
+    - French.yml updated to 0.44 by TheCalypso

src/com/palmergames/bukkit/config/ConfigNodes.java

@@ -121,6 +121,13 @@ public enum ConfigNodes {
 			"",
 			"# Minimum number of plots any towns home plot must be from the next town.",
 			"# This will prevent someone founding a town right on your doorstep"),
+    TOWN_MIN_DISTANCE_FOR_OUTPOST_FROM_PLOT(
+    		"town.min_distance_for_outpost_from_plot",
+    		"5",
+    		"",
+    		"# Minimum number of plots an outpost must be from any other town's plots.",
+    		"# Useful when min_plot_distance_from_town_plot is set to near-zero to allow towns to have claims",
+    		"# near to each other, but want to keep outposts away from towns."),
 	TOWN_MAX_DISTANCE_BETWEEN_HOMEBLOCKS(
 			"town.max_distance_between_homeblocks",
 			"0",
@@ -316,6 +323,24 @@ public enum ConfigNodes {
 			"global_town_settings.allow_outposts",
 			"true",
 			"# Allow towns to claim outposts (a townblock not connected to town)."),
+	GTOWN_SETTINGS_LIMIT_OUTPOST_USING_LEVELS(
+			"global_town_settings.limit_outposts_using_town_and_nation_levels",
+			"false",
+			"# When set to true outposts can be limited by the townOutpostLimit value of the Town Levels and",
+			"# the nationBonusOutpostLimit value in the Nation Levels. In this way nations can be made to be",
+			"# the only way of receiving outposts, or as an incentive to receive more outposts. Towns which are",
+			"# larger can have more outposts.",
+			"# When activated, this setting will not cause towns who already have higher than their limit",
+			"# to lose outposts. They will not be able to start new outposts until they have unclaimed outposts",
+			"# to become under their limit. Likewise, towns that join a nation and receive bonus outposts will",
+			"# be over their limit if they leave the nation."),
+	GTOWN_SETTINGS_OVER_OUTPOST_LIMIT_STOP_TELEPORT(
+			"global_town_settings.over_outpost_limits_stops_teleports",
+			"false",
+			"# When limit_outposts_using_town_and_nation_levels is also true, towns which are over their outpost",
+			"# limit will not be able to use their /town outpost teleports for the outpost #'s higher than their limit,",
+			"# until they have dropped below their limit.",
+			"# eg: If their limit is 3 then they cannot use /t outpost 4"),
 	GTOWN_SETTINGS_ALLOW_TOWN_SPAWN(
 			"global_town_settings.allow_town_spawn",
 			"true",
@@ -416,13 +441,16 @@ public enum ConfigNodes {
 			"# If set to true, Towny will prevent a town from toggling PVP while an outsider is within the town's boundaries.",
 			"# When active this feature can cause a bit of lag when the /t toggle pvp command is used, depending on how many players are online."
 	),
+	GTOWN_SETTINGS_HOMEBLOCKS_PREVENT_FORCEPVP(
+			"global_town_settings.homeblocks_prevent_forcepvp",
+			"false",
+			"# If set to true, when a world has forcepvp set to true, homeblocks of towns will not be affected and have PVP set to off."),
 	GTOWN_SETTINGS_MINIMUM_AMOUNT_RESIDENTS_FOR_OUTPOSTS(
 			"global_town_settings.minimum_amount_of_residents_in_town_for_outpost",
 			"0",
 			"# The amount of residents a town needs to claim an outpost,",
 			"# Setting this value to 0, means a town can claim outposts no matter how many residents"
 	),
-
 	GTOWN_SETTINGS_KEEP_INVENTORY_ON_DEATH_IN_TOWN(
 			"global_town_settings.keep_inventory_on_death_in_town",
 			"false",
@@ -645,7 +673,7 @@ public enum ConfigNodes {
 			""),
 	PROT_ITEM_USE_MAT(
 			"protection.item_use_ids",
-			"FLINT_AND_STEEL,BUCKET,WATER_BUCKET,LAVA_BUCKET,MINECART,STORAGE_MINECART,INK_SACK,SHEARS,ENDER_PEARL,GLASS_BOTTLE,FIREBALL,ARMOR_STAND,SKULL_ITEM,BOAT_BIRCH,BOAT_ACACIA,BOAT_DARK_OAK,BOAT_JUNGLE,BOAT,BOAT_SPRUCE",
+			"FLINT_AND_STEEL,BUCKET,WATER_BUCKET,LAVA_BUCKET,MINECART,STORAGE_MINECART,INK_SACK,SHEARS,ENDER_PEARL,GLASS_BOTTLE,FIREBALL,ARMOR_STAND,SKULL_ITEM,BOAT_BIRCH,BOAT_ACACIA,BOAT_DARK_OAK,BOAT_JUNGLE,BOAT,BOAT_SPRUCE,END_CRYSTAL",
 			"",
 			"# Items that can be blocked within towns via town/plot flags",
 			"# 259 - flint and steel",