Add Podzol & Red Sand to Excavation

Changelog.txt

@@ -8,6 +8,7 @@ Key:
   - Removal
 
 Version 1.5.00-dev
+ + Added Podzol & Red Sand to Excavation
  + Added Hardened Clay, Stained Clay, and Packed Ice to Mining blocks
  + Added Acacia and Dark Oak to Woodcutting blocks
  + Added Salmon, Clownfish, and Pufferfish to Fishing XP

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

@@ -35,6 +35,8 @@ public class TreasureConfig extends ConfigLoader {
     public List<ExcavationTreasure> excavationFromMycel     = new ArrayList<ExcavationTreasure>();
     public List<ExcavationTreasure> excavationFromSoulSand  = new ArrayList<ExcavationTreasure>();
     public List<ExcavationTreasure> excavationFromSnow      = new ArrayList<ExcavationTreasure>();
+    public List<ExcavationTreasure> excavationFromRedSand   = new ArrayList<ExcavationTreasure>();
+    public List<ExcavationTreasure> excavationFromPodzol    = new ArrayList<ExcavationTreasure>();
 
     public List<HylianTreasure> hylianFromBushes  = new ArrayList<HylianTreasure>();
     public List<HylianTreasure> hylianFromFlowers = new ArrayList<HylianTreasure>();
@@ -371,6 +373,14 @@ public class TreasureConfig extends ConfigLoader {
                     if (dropList.contains("Snow")) {
                         excavationFromSnow.add(excavationTreasure);
                     }
+
+                    if (dropList.contains("Red_Sand")) {
+                        excavationFromRedSand.add(excavationTreasure);
+                    }
+
+                    if (dropList.contains("Podzol")) {
+                        excavationFromPodzol.add(excavationTreasure);
+                    }
                 }
                 else if (isHylian) {
                     HylianTreasure hylianTreasure = new HylianTreasure(item, xp, dropChance, dropLevel);

src/main/java/com/gmail/nossr50/skills/excavation/Excavation.java

@@ -21,13 +21,13 @@ public class Excavation {
     protected static List<ExcavationTreasure> getTreasures(BlockState blockState) {
         switch (blockState.getType()) {
             case DIRT:
-                return TreasureConfig.getInstance().excavationFromDirt;
+                return blockState.getRawData() == 0x2 ? TreasureConfig.getInstance().excavationFromPodzol : TreasureConfig.getInstance().excavationFromDirt;
 
             case GRASS:
                 return TreasureConfig.getInstance().excavationFromGrass;
 
             case SAND:
-                return TreasureConfig.getInstance().excavationFromSand;
+                return blockState.getRawData() == 0x1 ? TreasureConfig.getInstance().excavationFromRedSand : TreasureConfig.getInstance().excavationFromSand;
 
             case GRAVEL:
                 return TreasureConfig.getInstance().excavationFromGravel;

src/main/resources/treasures.yml

@@ -446,7 +446,7 @@ Excavation:
         XP: 3000
         Drop_Chance: 0.05
         Drop_Level: 750
-        Drops_From: [Dirt, Grass, Sand, Gravel, Clay, Mycelium, Soul_Sand]
+        Drops_From: [Dirt, Podzol, Grass, Sand, Red_Sand, Gravel, Clay, Mycelium, Soul_Sand]
     SULPHUR:
         Amount: 1
         XP: 30
@@ -488,13 +488,13 @@ Excavation:
         XP: 80
         Drop_Chance: 0.5
         Drop_Level: 500
-        Drops_From: [Dirt, Grass, Mycelium]
+        Drops_From: [Dirt, Podzol, Grass, Mycelium]
     BROWN_MUSHROOM:
         Amount: 1
         XP: 80
         Drop_Chance: 0.5
         Drop_Level: 500
-        Drops_From: [Dirt, Grass, Mycelium]
+        Drops_From: [Dirt, Podzol, Grass, Mycelium]
     EGG:
         Amount: 1
         XP: 100
@@ -506,7 +506,7 @@ Excavation:
         XP: 80
         Drop_Chance: 0.5
         Drop_Level: 650
-        Drops_From: [Sand]
+        Drops_From: [Sand, Red_Sand]
     WATCH:
         Amount: 1
         XP: 100
@@ -530,43 +530,43 @@ Excavation:
         XP: 80
         Drop_Chance: 5.0
         Drop_Level: 25
-        Drops_From: [Dirt, Grass, Sand, Mycelium]
+        Drops_From: [Dirt, Podzol, Grass, Sand, Red_Sand, Mycelium]
     GOLD_RECORD:
         Amount: 1
         XP: 3000
         Drop_Chance: 0.05
         Drop_Level: 250
-        Drops_From: [Dirt, Grass, Sand, Gravel, Clay, Mycelium, Soul_Sand]
+        Drops_From: [Dirt, Podzol, Grass, Sand, Red_Sand, Gravel, Clay, Mycelium, Soul_Sand]
     GREEN_RECORD:
         Amount: 1
         XP: 3000
         Drop_Chance: 0.05
         Drop_Level: 250
-        Drops_From: [Dirt, Grass, Sand, Gravel, Clay, Mycelium, Soul_Sand]
+        Drops_From: [Dirt, Podzol, Grass, Sand, Red_Sand, Gravel, Clay, Mycelium, Soul_Sand]
     DIAMOND:
         Amount: 1
         XP: 1000
         Drop_Chance: 0.13
         Drop_Level: 350
-        Drops_From: [Dirt, Grass, Sand, Gravel, Clay, Mycelium, Soul_Sand]
+        Drops_From: [Dirt, Podzol, Grass, Sand, Red_Sand, Gravel, Clay, Mycelium, Soul_Sand]
     INK_SACK_BROWN:
         Amount: 1
         XP: 100
         Drop_Chance: 1.33
         Drop_Level: 350
-        Drops_From: [Dirt, Grass, Mycelium]
+        Drops_From: [Dirt, Podzol, Grass, Mycelium]
     QUARTZ:
         Amount: 1
         XP: 100
         Drop_Chance: 0.5
         Drop_Level: 850
-        Drops_From: [Dirt, Sand, Gravel, Mycelium, Soul_Sand]
+        Drops_From: [Dirt, Podzol, Sand, Red_Sand, Gravel, Mycelium, Soul_Sand]
     NAME_TAG:
         Amount: 1
         XP: 3000
         Drop_Chance: 0.05
         Drop_Level: 250
-        Drops_From: [Dirt, Grass, Sand, Gravel, Clay, Mycelium, Soul_Sand]
+        Drops_From: [Dirt, Podzol, Grass, Sand, Red_Sand, Gravel, Clay, Mycelium, Soul_Sand]
 #
 #  Settings for Hylian Luck
 ###