diff --git a/src/main/java/com/gmail/nossr50/config/hocon/skills/unarmed/ConfigUnarmed.java b/src/main/java/com/gmail/nossr50/config/hocon/skills/unarmed/ConfigUnarmed.java index a2770eb69..d9dece840 100644 --- a/src/main/java/com/gmail/nossr50/config/hocon/skills/unarmed/ConfigUnarmed.java +++ b/src/main/java/com/gmail/nossr50/config/hocon/skills/unarmed/ConfigUnarmed.java @@ -1,8 +1,24 @@ package com.gmail.nossr50.config.hocon.skills.unarmed; +import com.gmail.nossr50.config.ConfigConstants; +import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; @ConfigSerializable public class ConfigUnarmed { + @Setting(value = ConfigConstants.SUB_SKILL_NODE) + private ConfigUnarmedSubskills subskills = new ConfigUnarmedSubskills(); + + public ConfigUnarmedSubskills getSubskills() { + return subskills; + } + + public ConfigUnarmedDisarm getDisarm() { + return subskills.getDisarm(); + } + + public boolean isPreventItemTheft() { + return subskills.isPreventItemTheft(); + } } \ No newline at end of file diff --git a/src/main/java/com/gmail/nossr50/config/hocon/skills/unarmed/ConfigUnarmedDisarm.java b/src/main/java/com/gmail/nossr50/config/hocon/skills/unarmed/ConfigUnarmedDisarm.java new file mode 100644 index 000000000..8ba2f68ef --- /dev/null +++ b/src/main/java/com/gmail/nossr50/config/hocon/skills/unarmed/ConfigUnarmedDisarm.java @@ -0,0 +1,16 @@ +package com.gmail.nossr50.config.hocon.skills.unarmed; + +import ninja.leaping.configurate.objectmapping.Setting; + +public class ConfigUnarmedDisarm { + + private static final boolean PREVENT_ITEM_THEFT = false; + + @Setting(value = "Prevent-Item-Theft", comment = "Prevents weapons thrown to the ground by disarm from being picked up by anyone but the owner of said item." + + "\nDefault value: "+PREVENT_ITEM_THEFT) + private boolean preventItemTheft = PREVENT_ITEM_THEFT; + + public boolean isPreventItemTheft() { + return preventItemTheft; + } +} diff --git a/src/main/java/com/gmail/nossr50/config/hocon/skills/unarmed/ConfigUnarmedSubskills.java b/src/main/java/com/gmail/nossr50/config/hocon/skills/unarmed/ConfigUnarmedSubskills.java new file mode 100644 index 000000000..1423e84bc --- /dev/null +++ b/src/main/java/com/gmail/nossr50/config/hocon/skills/unarmed/ConfigUnarmedSubskills.java @@ -0,0 +1,19 @@ +package com.gmail.nossr50.config.hocon.skills.unarmed; + +import ninja.leaping.configurate.objectmapping.Setting; +import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; + +@ConfigSerializable +public class ConfigUnarmedSubskills { + + @Setting(value = "Disarm") + public ConfigUnarmedDisarm disarm = new ConfigUnarmedDisarm(); + + public ConfigUnarmedDisarm getDisarm() { + return disarm; + } + + public boolean isPreventItemTheft() { + return disarm.isPreventItemTheft(); + } +} 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 3a97c7314..0f01c66fa 100644 --- a/src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismManager.java +++ b/src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismManager.java @@ -31,6 +31,7 @@ import org.bukkit.metadata.FixedMetadataValue; import java.util.List; public class HerbalismManager extends SkillManager { + public HerbalismManager(McMMOPlayer mcMMOPlayer) { super(mcMMOPlayer, PrimarySkillType.HERBALISM); }