Fixed encoding issues with the formatting character - and included re…

…sources.

pom.xml

@@ -25,10 +25,8 @@
 	        <filtering>true</filtering>
 	        <directory>${basedir}/resources</directory>
 	        <includes>
-	          <include>plugin.yml</include>
-	          <include>config.yml</include>
+	          <include>*.yml</include>
 	          <include>README.md</include>
-	          <include>skyblockData.yml</include>
 	        </includes>
 	      </resource>
 	    </resources>
@@ -40,8 +38,9 @@
 	        <artifactId>maven-compiler-plugin</artifactId>
 	        <version>2.3.2</version>
 	        <configuration>
-	          <source>1.6</source>
-	          <target>1.6</target>
+	          	<source>1.7</source>
+	          	<target>1.7</target>
+				<encoding>utf-8</encoding>
 	        </configuration>
 	      </plugin>
 	    </plugins>

resources/island.yml

@@ -0,0 +1,38 @@
+general:
+  #level[integer] - the level of the island from blocks.
+  level: 0
+  #bonusLevels[integer] - levels added from challenges or other sources
+  bonusLevels: 0
+  #warpLocationX/Y/Z[integer] - the location of the island's warp point
+  warpLocationX: 0
+  warpLocationY: 0
+  warpLocationZ: 0
+  #warpActive[boolean] - if true, other players can warp to the location defined by warpLocation
+  warpActive: false
+  #biome[string] - DO NOT CHANGE. The current biome of the island set by the plugin.
+  biome: OCEAN
+  #locked[boolean] - DO NOT CHANGE. If true, the island is currently locked. Set by the plugin.
+  locked: false
+party:
+  #leader[string] - the group leader's name.
+  leader: 'none'
+  #maxSize[integer] - the maximum number of players allowed in the group (including the leader)
+  maxSize: 4
+  #maxSize[integer] - the maximum number of players allowed in the group (including the leader)
+  currentSize: 1
+  #useDiminishingReturns - If true, diminishing returns will be used for all blocks using the default scale (custom scales can be defined in the section below)
+  members: []
+banned:
+  list: []
+log:
+  logPos: 2
+  1: '&d[skyblock] The island has been created.'
+  2: ''
+  3: ''
+  4: ''
+  5: ''
+  6: ''
+  7: ''
+  8: ''
+  9: ''
+  10: ''

resources/levelConfig.yml

@@ -0,0 +1,142 @@
+general:
+  #pointsPerLevel - number of points needed to advance 1 island level.
+  pointsPerLevel: 1000
+  #default - the default value for blocks not listed in blockValues here.
+  default: 10
+  #useDiminishingReturns - If true, diminishing returns will be used for all blocks using the default scale (custom scales can be defined in the section below)
+  #If useDiminishingReturns is false, the blocks listed in the dimishingReturns section will still be affected.
+  useDiminishingReturns: false
+  #defaultScale - the default value to use for diminishing returns. This is the number of blocks before DR starts to lower value.
+  defaultScale: 10000
+#blockValues [ID: VALUE] - the blocks listed below will have custom values instead of the default.
+blockValues:
+  02: 20
+  03: 20
+  07: 0
+  08: 0
+  09: 0
+  10: 0
+  11: 0
+  12: 20
+  13: 20
+  14: 500
+  15: 200
+  16: 200
+  18: 0
+  20: 50
+  21: 300
+  22: 500
+  24: 20
+  25: 20
+  26: 1000
+  27: 20
+  28: 20
+  29: 60
+  30: 20
+  33: 40
+  34: 0
+  35: 50
+  36: 0
+  41: 1500
+  42: 300
+  43: 20
+  45: 50
+  46: 80
+  47: 50
+  48: 30
+  49: 200
+  51: 0
+  55: 0
+  56: 400
+  57: 5000
+  59: 0
+  60: 40
+  63: 0
+  65: 0
+  68: 0
+  70: 0
+  72: 0
+  79: 50
+  80: 50
+  81: 0
+  82: 50
+  83: 0
+  84: 50
+  90: 0
+  91: 20
+  92: 50
+  98: 20
+  99: 100
+  100: 100
+  101: 20
+  102: 20
+  103: 0
+  104: 0
+  105: 0
+  106: 10
+  108: 30
+  109: 20
+  110: 20
+  112: 20
+  114: 20
+  116: 150
+  122: 5000
+  123: 20
+  124: 20
+  127: 0
+  128: 20
+  129: 200
+  130: 2000
+  133: 1000
+  138: 2000
+  144: 1000
+  145: 150
+  152: 150
+  153: 50
+  155: 100
+  156: 100
+  157: 20
+  159: 50
+  171: 20
+  172: 20
+#blockLimits - blocks listed here will stop adding to island levels after the given number of blocks.
+blockLimits:
+  04: 10000
+  87: 10000
+  88: 10000
+  121: 10000
+  106: 100
+  130: 3
+  138: 10
+#diminishingReturns [ID: SCALE] - The listed blocks will add more to island level before SCALE number of blocks are counted towards the island level, and less to island level after SCALE.
+diminishingReturns:
+  1: 10000
+  2: 10000
+  3: 10000
+  5: 10000
+  12: 10000
+  17: 100
+  26: 1
+  31: 100
+  37: 100
+  38: 100
+  39: 100
+  40: 100
+  43: 20000
+  44: 10000
+  49: 50
+  67: 5000
+  85: 5000
+  98: 20000
+  99: 30
+  100: 30
+  107: 100
+  108: 5000
+  109: 5000
+  110: 10000
+  112: 20000
+  113: 5000
+  114: 5000
+  128: 5000
+  139: 5000
+  156: 10000

resources/orphans.yml

@@ -0,0 +1,2 @@
+orphans:
+  list: ""

resources/party.yml

@@ -0,0 +1,20 @@
+general:
+  #level[integer] - the level of the island.
+  level: 0
+  #warpLocationX/Y/Z[integer] - the location of the island's warp point
+  warpLocationX: 0
+  warpLocationY: 0
+  warpLocationZ: 0
+  #warpActive[boolean] - if true, other players can warp to the location defined by warpLocation
+  warpActive: false
+party:
+  #leader[string] - the group leader's name.
+  leader: 'none'
+  #maxSize[integer] - the maximum number of players allowed in the group (including the leader)
+  maxSize: 4
+  #maxSize[integer] - the maximum number of players allowed in the group (including the leader)
+  currentSize: 1
+  #useDiminishingReturns - If true, diminishing returns will be used for all blocks using the default scale (custom scales can be defined in the section below)
+  members: []
+banned:
+  list: []

resources/player.yml

@@ -0,0 +1,13 @@
+player:
+  hasIsland: false
+  islandX: 0
+  islandY: 0
+  islandZ: 0
+  homeX: 0
+  homeY: 0
+  homeZ: 0
+  challenges:
+    cobblestonegenerator:
+      firstCompleted: 0
+      timesCompleted: 0
+      timesCompletedSinceTimer: 0

resources/plugin.yml

@@ -1,12 +1,9 @@
 name: uSkyBlock
 main: us.talabrek.ultimateskyblock.uSkyBlock
-version: ${pom.version}
-description: Ultimate SkyBlock.
+version: 2.0.0
+description: Ultimate SkyBlock. 
 author: Talabrek (based on code by Qgel and others)
 load: STARTUP
-
-depend: [Vault]
-
 commands:
     island:
         description: Commands to use your island
@@ -31,10 +28,6 @@ permissions:
             description: Let the player use the /island command
           usb.island.info:
             description: Let the player check their island level
-          usb.island.info.others:
-            description: Let the player check anothers island level
-            children:
-              usb.island.info: true
           usb.island.topten:
             description: Let the player see the top ten list
           usb.island.sethome:
@@ -43,19 +36,42 @@ permissions:
             description: Let the player use the /challenges command
           usb.island.warp:
             description: Let the player use /island warp to warp to an open island.
-          usb.island.warp.override:
-            description: Let the player use /island warpo to warp to an island regardless of warp settings.
-            default: op
-            children:
-              usb.island.warp: true
+          usb.island.ban:
+            description: Let the player use /island ban to ban players from warping to their island.
+      usb.biome.*:
+        children:
+          usb.biome.ocean:
+            description: Let the player change their islands biome to OCEAN.
+          usb.biome.jungle:
+            description: Let the player change their islands biome to JUNGLE.
+          usb.biome.hell:
+            description: Let the player change their islands biome to HELL.
+          usb.biome.sky:
+            description: Let the player change their islands biome to SKY.
+          usb.biome.desert:
+            description: Let the player change their islands biome to DESERT.
+          usb.biome.forest:
+            description: Let the player change their islands biome to FOREST.
+          usb.biome.swampland:
+            description: Let the player change their islands biome to SWAMPLAND.
+          usb.biome.mushroom:
+            description: Let the player change their islands biome to MUSHROOM_ISLAND.
+          usb.biome.taiga:
+            description: Let the player change their islands biome to TAIGA.
       usb.extra.*:
         children:
           usb.extra.hunger:
+            description: The player will lose hunger 25 percent slower.
+          usb.extra.hunger2:
+            description: The player will lose hunger 50 percent slower.
+          usb.extra.hunger3:
+            description: The player will lose hunger 75 percent slower.
+          usb.extra.hunger4:
             description: The player won't lose hunger on their island.
           usb.extra.partysize:
-            description: The player can have double the party members on their island
+            description: The player can have 8 total members on their island, which is double the default.
           usb.extra.addwarp:
-            description: The player can open his island, allowing other players to warp there.
+            description: The player can open his island allowing other players to warp there.
       usb.party.*:
         children:
           usb.party.create:
@@ -81,11 +97,13 @@ permissions:
           usb.mod.party:
             description: Let a player access the moderator party commands
           usb.mod.challenges:
-            description: Let a player access the moderator challenge commands to view, complete and reset another player's challenges. 
+            description: Let a player access the moderator challenge commands to complete and reset another player's challenges. 
           usb.mod.bypasscooldowns:
             description: Let a player bypass the cooldowns for the /island info and /island restart commands
           usb.mod.bypassprotection:
             description: Let a player bypass the built in island protection
+          usb.mod.setbiome:
+            description: Let a player set another players biome.
       usb.admin.*:
         children:
           usb.admin.reload:
@@ -96,5 +114,7 @@ permissions:
             description: Let a player remove another player's ownership of an island (island blocks remain)
           usb.admin.register:
             description: Let a player register the nearest island (using the bedrock) to another player.
+          usb.admin.bypassspawnprotection:
+            description: Let a player bypass the built in spawn protection.
           usb.admin.purge:
             description: Let a player purge old islands.