From b8ad722e9ea023a8607debfdbdcc94f478b000c0 Mon Sep 17 00:00:00 2001 From: nossr50 Date: Wed, 24 Apr 2019 18:58:29 -0700 Subject: [PATCH] Taming default XP values + updated acrobatics XP values --- .../ConfigExperienceAcrobatics.java | 6 ++-- .../experience/ConfigExperienceSmelting.java | 1 - .../experience/ConfigExperienceTaming.java | 28 +++++++++++++++++++ 3 files changed, 31 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/config/hocon/experience/ConfigExperienceAcrobatics.java b/src/main/java/com/gmail/nossr50/config/hocon/experience/ConfigExperienceAcrobatics.java index 6588f7ac0..c973f1400 100644 --- a/src/main/java/com/gmail/nossr50/config/hocon/experience/ConfigExperienceAcrobatics.java +++ b/src/main/java/com/gmail/nossr50/config/hocon/experience/ConfigExperienceAcrobatics.java @@ -13,9 +13,9 @@ public class ConfigExperienceAcrobatics { static { ACROBATICS_DEFAULT_XP_MAP = new HashMap<>(); - ACROBATICS_DEFAULT_XP_MAP.put("Dodge", 480); - ACROBATICS_DEFAULT_XP_MAP.put("Roll", 80); - ACROBATICS_DEFAULT_XP_MAP.put("Fall", 120); + ACROBATICS_DEFAULT_XP_MAP.put("Dodge", 800); + ACROBATICS_DEFAULT_XP_MAP.put("Roll", 600); + ACROBATICS_DEFAULT_XP_MAP.put("Fall", 600); } @Setting(value = "Acrobatics-Experience-Values", comment = "Experience values for Acrobatics.") diff --git a/src/main/java/com/gmail/nossr50/config/hocon/experience/ConfigExperienceSmelting.java b/src/main/java/com/gmail/nossr50/config/hocon/experience/ConfigExperienceSmelting.java index fecb8f594..28f3b287a 100644 --- a/src/main/java/com/gmail/nossr50/config/hocon/experience/ConfigExperienceSmelting.java +++ b/src/main/java/com/gmail/nossr50/config/hocon/experience/ConfigExperienceSmelting.java @@ -22,7 +22,6 @@ public class ConfigExperienceSmelting { SMELTING_EXPERIENCE_MAP_DEFAULT.put("minecraft:redstone_ore", 15); } - @Setting(value = "Smelting-XP-Values") private HashMap smeltingExperienceMap = SMELTING_EXPERIENCE_MAP_DEFAULT; diff --git a/src/main/java/com/gmail/nossr50/config/hocon/experience/ConfigExperienceTaming.java b/src/main/java/com/gmail/nossr50/config/hocon/experience/ConfigExperienceTaming.java index 80e5e6929..0c3437e42 100644 --- a/src/main/java/com/gmail/nossr50/config/hocon/experience/ConfigExperienceTaming.java +++ b/src/main/java/com/gmail/nossr50/config/hocon/experience/ConfigExperienceTaming.java @@ -1,8 +1,36 @@ package com.gmail.nossr50.config.hocon.experience; +import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; +import java.util.HashMap; + @ConfigSerializable public class ConfigExperienceTaming { + private final static HashMap TAMING_EXPERIENCE_DEFAULT; + + static { + TAMING_EXPERIENCE_DEFAULT = new HashMap<>(); + + TAMING_EXPERIENCE_DEFAULT.put("wolf", 250); + TAMING_EXPERIENCE_DEFAULT.put("ocelot", 500); + TAMING_EXPERIENCE_DEFAULT.put("cat", 500); + TAMING_EXPERIENCE_DEFAULT.put("horse", 1000); + TAMING_EXPERIENCE_DEFAULT.put("donkey", 1000); + TAMING_EXPERIENCE_DEFAULT.put("mule", 1000); + TAMING_EXPERIENCE_DEFAULT.put("skeleton_horse", 1000); + TAMING_EXPERIENCE_DEFAULT.put("zombie_horse", 1000); + TAMING_EXPERIENCE_DEFAULT.put("llama", 1200); + TAMING_EXPERIENCE_DEFAULT.put("parrot", 1100); + TAMING_EXPERIENCE_DEFAULT.put("fox", 1000); + TAMING_EXPERIENCE_DEFAULT.put("panda", 1000); + } + + @Setting(value = "Taming-XP-Values") + private HashMap tamingExperienceMap = TAMING_EXPERIENCE_DEFAULT; + + public HashMap getTamingExperienceMap() { + return tamingExperienceMap; + } } \ No newline at end of file