EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-25 22:56:45 +01:00
Code Issues Projects Releases Wiki Activity

Add Beetroot to herbalism skill

Browse Source 
Merge pull request #2918 from isokissa3/master

His was better.

(cherry picked from commit 3ed0fdf330)
This commit is contained in:
t00thpick1 2016-06-26 17:14:19 -04:00
parent b1b8c4d713
commit 8901db4e18
7 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/gmail/nossr50/commands/skills/HerbalismCommand.java
View File

@ -87,7 +87,7 @@ public class HerbalismCommand extends SkillCommand {
protected void permissionsCheck(Player player) {
hasHylianLuck = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.HYLIAN_LUCK);
canGreenTerra = Permissions.greenTerra(player);
canGreenThumbPlants = Permissions.greenThumbPlant(player, Material.CROPS) || Permissions.greenThumbPlant(player, Material.CARROT) || Permissions.greenThumbPlant(player, Material.POTATO) || Permissions.greenThumbPlant(player, Material.NETHER_WARTS) || Permissions.greenThumbPlant(player, Material.COCOA);
canGreenThumbPlants = Permissions.greenThumbPlant(player, Material.CROPS) || Permissions.greenThumbPlant(player, Material.CARROT) || Permissions.greenThumbPlant(player, Material.POTATO) || Permissions.greenThumbPlant(player, Material.BEETROOT) || Permissions.greenThumbPlant(player, Material.NETHER_WARTS) || Permissions.greenThumbPlant(player, Material.COCOA);
canGreenThumbBlocks = Permissions.greenThumbBlock(player, Material.DIRT) || Permissions.greenThumbBlock(player, Material.COBBLESTONE) || Permissions.greenThumbBlock(player, Material.COBBLE_WALL) || Permissions.greenThumbBlock(player, Material.SMOOTH_BRICK);
canFarmersDiet = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.FARMERS_DIET);
canDoubleDrop = Permissions.secondaryAbilityEnabled(player, SecondaryAbility.HERBALISM_DOUBLE_DROPS) && !skill.getDoubleDropsDisabled();

1
src/main/java/com/gmail/nossr50/listeners/EntityListener.java
View File

@ -576,6 +576,7 @@ public class EntityListener implements Listener {
* RESTORES 3 HUNGER - RESTORES 5 1/2 HUNGER @
* 1000
*/
case BEETROOT:
case BREAD: /* RESTORES 2 1/2 HUNGER - RESTORES 5 HUNGER @ 1000 */
case CARROT_ITEM: /*
* RESTORES 2 HUNGER - RESTORES 4 1/2 HUNGER @

18
src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismManager.java
View File

@ -321,7 +321,7 @@ public class HerbalismManager extends SkillManager {
case POTATO:
seed = Material.POTATO_ITEM;
break;
case BEETROOT_BLOCK:
seed = Material.BEETROOT_SEEDS;
break;
@ -353,6 +353,10 @@ public class HerbalismManager extends SkillManager {
blockState.setMetadata(mcMMO.greenThumbDataKey, new FixedMetadataValue(mcMMO.p, (int) (System.currentTimeMillis() / Misc.TIME_CONVERSION_FACTOR)));
switch (blockState.getType()) {
case POTATO:
case CARROT:
case BEETROOT_BLOCK:
case CROPS:
Crops crops = (Crops) blockState.getData();
@ -378,18 +382,6 @@ public class HerbalismManager extends SkillManager {
return true;
case BEETROOT_BLOCK:
case CARROT:
case POTATO:
if (greenTerra) {
blockState.setRawData(CropState.MEDIUM.getData());
}
else {
blockState.setRawData(greenThumbStage);
}
return true;
case NETHER_WARTS:
NetherWarts warts = (NetherWarts) blockState.getData();

4
src/main/java/com/gmail/nossr50/util/BlockUtils.java
View File

@ -147,11 +147,9 @@ public final class BlockUtils {
case YELLOW_FLOWER:
return true;
case BEETROOT_BLOCK:
case CARROT:
case POTATO:
case BEETROOT_BLOCK:
return blockState.getRawData() == CropState.RIPE.getData();
case CROPS:
return ((Crops) blockState.getData()).getState() == CropState.RIPE;

2
src/main/java/com/gmail/nossr50/util/ItemUtils.java
View File

@ -592,6 +592,8 @@ public final class ItemUtils {
case CHORUS_FRUIT:
case CHORUS_FLOWER:
case POTATO_ITEM:
case BEETROOT:
case BEETROOT_SEEDS:
case NETHER_WARTS:
case BROWN_MUSHROOM:
case RED_MUSHROOM:

1
src/main/resources/config.yml
View File

@ -408,6 +408,7 @@ Skills:
###
Double_Drops:
Herbalism:
Beetroot_Block: true
Brown_Mushroom: true
Beetroot_Block: true
Cactus: true

3
src/main/resources/plugin.yml
View File

@ -340,6 +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.carrot:
description: Allows access to the Green Thumb ability for carrots
mcmmo.ability.herbalism.greenthumb.plants.cocoa:
@ -350,6 +351,8 @@ 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:
description: Allows access to the Green Thumb ability for beetrootes
mcmmo.ability.herbalism.hylianluck:
description: Allows access to the Hylian Luck ability
mcmmo.ability.herbalism.shroomthumb: