From 77331b2605868bea76466e7ecd6b52a6de4bc454 Mon Sep 17 00:00:00 2001 From: GJ Date: Mon, 3 Feb 2014 10:47:07 -0500 Subject: [PATCH] Add Podzol & Red Sand to Excavation --- Changelog.txt | 1 + .../config/treasure/TreasureConfig.java | 10 +++++++++ .../nossr50/skills/excavation/Excavation.java | 4 ++-- src/main/resources/treasures.yml | 22 +++++++++---------- 4 files changed, 24 insertions(+), 13 deletions(-) diff --git a/Changelog.txt b/Changelog.txt index d6aedd7d3..95d5c481a 100644 --- a/Changelog.txt +++ b/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 diff --git a/src/main/java/com/gmail/nossr50/config/treasure/TreasureConfig.java b/src/main/java/com/gmail/nossr50/config/treasure/TreasureConfig.java index 8575a1591..2a339c9c5 100644 --- a/src/main/java/com/gmail/nossr50/config/treasure/TreasureConfig.java +++ b/src/main/java/com/gmail/nossr50/config/treasure/TreasureConfig.java @@ -35,6 +35,8 @@ public class TreasureConfig extends ConfigLoader { public List excavationFromMycel = new ArrayList(); public List excavationFromSoulSand = new ArrayList(); public List excavationFromSnow = new ArrayList(); + public List excavationFromRedSand = new ArrayList(); + public List excavationFromPodzol = new ArrayList(); public List hylianFromBushes = new ArrayList(); public List hylianFromFlowers = new ArrayList(); @@ -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); diff --git a/src/main/java/com/gmail/nossr50/skills/excavation/Excavation.java b/src/main/java/com/gmail/nossr50/skills/excavation/Excavation.java index 18d60cce8..7d5a0c59a 100644 --- a/src/main/java/com/gmail/nossr50/skills/excavation/Excavation.java +++ b/src/main/java/com/gmail/nossr50/skills/excavation/Excavation.java @@ -21,13 +21,13 @@ public class Excavation { protected static List 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; diff --git a/src/main/resources/treasures.yml b/src/main/resources/treasures.yml index 37de5dee1..894577537 100644 --- a/src/main/resources/treasures.yml +++ b/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 ###