Merge pull request #1 from ezeiger92/many-fixes

Pull in fixes

pom.xml

@@ -135,7 +135,7 @@
         <dependency>
             <groupId>org.bukkit</groupId>
             <artifactId>bukkit</artifactId>
-            <version>1.12-pre2-SNAPSHOT</version>
+            <version>1.12.1-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

src/main/java/com/gmail/nossr50/listeners/PlayerListener.java

@@ -240,7 +240,7 @@ public class PlayerListener implements Listener {
                 return;
 
             case IN_GROUND:
-                Block block = player.getTargetBlock((HashSet<Byte>) null, 100);
+                Block block = player.getTargetBlock((HashSet<Material>) null, 100);
 
                 if (fishingManager.canIceFish(block)) {
                     event.setCancelled(true);

src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java

@@ -104,7 +104,7 @@ public class FishingManager extends SkillManager {
             vehicle.remove();
         }
 
-        player.teleport(player.getTargetBlock((HashSet<Byte>) null, 100).getLocation(), TeleportCause.PLUGIN);
+        player.teleport(player.getTargetBlock((HashSet<Material>) null, 100).getLocation(), TeleportCause.PLUGIN);
 
         String unleashMessage = AdvancedConfig.getInstance().getPlayerUnleashMessage();
 
@@ -167,7 +167,7 @@ public class FishingManager extends SkillManager {
             return false;
         }
 
-        Block targetBlock = getPlayer().getTargetBlock((HashSet<Byte>) BlockUtils.getTransparentBlocks(), 100);
+        Block targetBlock = getPlayer().getTargetBlock((HashSet<Material>) BlockUtils.getTransparentBlocks(), 100);
 
         if (!targetBlock.isLiquid()) {
             return false;
@@ -649,6 +649,6 @@ public class FishingManager extends SkillManager {
             }
         }
 
-        return 0;
+        return 1;
     }
 }

src/main/java/com/gmail/nossr50/skills/mining/MiningManager.java

@@ -94,7 +94,7 @@ public class MiningManager extends SkillManager {
      */
     public void remoteDetonation() {
         Player player = getPlayer();
-        Block targetBlock = player.getTargetBlock((HashSet<Byte>) BlockUtils.getTransparentBlocks(), BlastMining.MAXIMUM_REMOTE_DETONATION_DISTANCE);
+        Block targetBlock = player.getTargetBlock((HashSet<Material>) BlockUtils.getTransparentBlocks(), BlastMining.MAXIMUM_REMOTE_DETONATION_DISTANCE);
 
         if (targetBlock.getType() != Material.TNT || !EventUtils.simulateBlockBreak(targetBlock, player, true) || !blastMiningCooldownOver()) {
             return;

src/main/java/com/gmail/nossr50/util/BlockUtils.java

@@ -305,12 +305,12 @@ public final class BlockUtils {
      *
      * @return HashSet with the IDs of every transparent block
      */
-    public static HashSet<Byte> getTransparentBlocks() {
-        HashSet<Byte> transparentBlocks = new HashSet<Byte>();
+    public static HashSet<Material> getTransparentBlocks() {
+        HashSet<Material> transparentBlocks = new HashSet<Material>();
 
         for (Material material : Material.values()) {
             if (material.isTransparent()) {
-                transparentBlocks.add((byte) material.getId());
+                transparentBlocks.add(material);
             }
         }
 

src/main/resources/plugin.yml

@@ -340,7 +340,7 @@ permissions:
             mcmmo.ability.herbalism.greenthumb.plants.crops: true
             mcmmo.ability.herbalism.greenthumb.plants.netherwarts: true
             mcmmo.ability.herbalism.greenthumb.plants.potato: true
-            mcmmo.ability.herbalism.greenthumb.plants.beetroot: true
+            mcmmo.ability.herbalism.greenthumb.plants.beetrootblock: true
     mcmmo.ability.herbalism.greenthumb.plants.carrot:
         description: Allows access to the Green Thumb ability for carrots
     mcmmo.ability.herbalism.greenthumb.plants.cocoa:
@@ -351,7 +351,7 @@ permissions:
         description: Allows access to the Green Thumb ability for netherwart
     mcmmo.ability.herbalism.greenthumb.plants.potato:
         description: Allows access to the Green Thumb ability for potatoes
-    mcmmo.ability.herbalism.greenthumb.plants.beetroot:
+    mcmmo.ability.herbalism.greenthumb.plants.beetrootblock:
         description: Allows access to the Green Thumb ability for beetrootes
     mcmmo.ability.herbalism.hylianluck:
         description: Allows access to the Hylian Luck ability