Merge pull request #3185 from nathanprocks/master

Add shaking from shulkers

src/main/java/com/gmail/nossr50/config/treasure/TreasureConfig.java

@@ -61,6 +61,7 @@ public class TreasureConfig extends ConfigLoader {
     public List<ShakeTreasure> shakeFromPigZombie      = new ArrayList<ShakeTreasure>();
     public List<ShakeTreasure> shakeFromPlayer         = new ArrayList<ShakeTreasure>();
     public List<ShakeTreasure> shakeFromSheep          = new ArrayList<ShakeTreasure>();
+    public List<ShakeTreasure> shakeFromShulker        = new ArrayList<ShakeTreasure>();
     public List<ShakeTreasure> shakeFromSkeleton       = new ArrayList<ShakeTreasure>();
     public List<ShakeTreasure> shakeFromSlime          = new ArrayList<ShakeTreasure>();
     public List<ShakeTreasure> shakeFromSnowman        = new ArrayList<ShakeTreasure>();
@@ -355,6 +356,8 @@ public class TreasureConfig extends ConfigLoader {
                         shakeFromPlayer.add(shakeTreasure);
                     } else if (type.equals("Shake.SHEEP")) {
                         shakeFromSheep.add(shakeTreasure);
+                    } else if (type.equals("Shake.SHULKER")) {
+                        shakeFromShulker.add(shakeTreasure);
                     } else if (type.equals("Shake.SKELETON")) {
                         shakeFromSkeleton.add(shakeTreasure);
                     } else if (type.equals("Shake.SLIME")) {

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

@@ -113,6 +113,9 @@ public final class Fishing {
             case SHEEP:
                 return TreasureConfig.getInstance().shakeFromSheep;
 
+            case SHULKER:
+                return TreasureConfig.getInstance().shakeFromShulker;
+
             case SKELETON:
                 return TreasureConfig.getInstance().shakeFromSkeleton;
 

src/main/resources/treasures.yml

@@ -811,6 +811,17 @@ Shake:
             XP: 0
             Drop_Chance: 100.0
             Drop_Level: 0
+    SHULKER:
+        SHULKER_SHELL:
+            Amount: 1
+            XP: 0
+            Drop_Chance: 25.0
+            Drop_Level: 0
+        PURPUR_BLOCK:
+            Amount: 1
+            XP: 0
+            Drop_Chance: 75.0
+            Drop_Level: 0
     SKELETON:
         SKULL_ITEM:
             Data: 0