From 70de0ba00b5ec9ad26c477daf6a3f803738db62a Mon Sep 17 00:00:00 2001 From: t00thpick1 Date: Sun, 19 Jun 2016 17:33:43 -0400 Subject: [PATCH] Enable Beetroot I think --- pom.xml | 2 +- .../com/gmail/nossr50/skills/herbalism/HerbalismManager.java | 5 +++++ src/main/java/com/gmail/nossr50/util/BlockUtils.java | 1 + src/main/resources/config.yml | 1 + src/main/resources/experience.yml | 1 + 5 files changed, 9 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 201cae6c7..d94d9935b 100755 --- a/pom.xml +++ b/pom.xml @@ -135,7 +135,7 @@ org.bukkit bukkit - 1.9-R0.1-SNAPSHOT + 1.10-R0.1-SNAPSHOT provided diff --git a/src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismManager.java b/src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismManager.java index 65d3c3c01..a8ab65ad8 100644 --- a/src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismManager.java +++ b/src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismManager.java @@ -321,6 +321,10 @@ public class HerbalismManager extends SkillManager { case POTATO: seed = Material.POTATO_ITEM; break; + + case BEETROOT_BLOCK: + seed = Material.BEETROOT_SEEDS; + break; default: return; @@ -374,6 +378,7 @@ public class HerbalismManager extends SkillManager { return true; + case BEETROOT_BLOCK: case CARROT: case POTATO: if (greenTerra) { diff --git a/src/main/java/com/gmail/nossr50/util/BlockUtils.java b/src/main/java/com/gmail/nossr50/util/BlockUtils.java index c00f1815e..6855a94ca 100644 --- a/src/main/java/com/gmail/nossr50/util/BlockUtils.java +++ b/src/main/java/com/gmail/nossr50/util/BlockUtils.java @@ -149,6 +149,7 @@ public final class BlockUtils { case CARROT: case POTATO: + case BEETROOT_BLOCK: return blockState.getRawData() == CropState.RIPE.getData(); case CROPS: diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index fa068b027..2320d5de9 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -409,6 +409,7 @@ Skills: Double_Drops: Herbalism: Brown_Mushroom: true + Beetroot_Block: true Cactus: true Carrot: true Cocoa: true diff --git a/src/main/resources/experience.yml b/src/main/resources/experience.yml index 2b3f42bee..aa84d1e22 100644 --- a/src/main/resources/experience.yml +++ b/src/main/resources/experience.yml @@ -151,6 +151,7 @@ Experience: Herbalism: Allium: 300 Azure_Bluet: 150 + Beetroot_Block: 50 Blue_Orchid: 150 Brown_Mushroom: 150 Cactus: 30