diff --git a/src/main/java/com/gmail/nossr50/config/hocon/skills/repair/ConfigRepair.java b/src/main/java/com/gmail/nossr50/config/hocon/skills/repair/ConfigRepair.java index 2690e33e1..3bc5d2770 100644 --- a/src/main/java/com/gmail/nossr50/config/hocon/skills/repair/ConfigRepair.java +++ b/src/main/java/com/gmail/nossr50/config/hocon/skills/repair/ConfigRepair.java @@ -32,53 +32,53 @@ public class ConfigRepair { REPAIR_WILDCARDS_DEFAULTS.add(planksWildCard); CONFIG_REPAIRABLES_DEFAULTS = new ArrayList<>(); - CONFIG_REPAIRABLES_DEFAULTS.add(new Repairable(WOODEN_SWORD, planksWildCard, 1, 0, .25D)); - CONFIG_REPAIRABLES_DEFAULTS.add(new Repairable(WOODEN_SHOVEL, planksWildCard, 1, 0, .15D)); - CONFIG_REPAIRABLES_DEFAULTS.add(new Repairable(WOODEN_PICKAXE, Arrays.asList(PLANKS), 1, 0, .5D)); - CONFIG_REPAIRABLES_DEFAULTS.add(new Repairable(WOODEN_AXE, Arrays.asList(PLANKS), 1, 0, .5D)); - CONFIG_REPAIRABLES_DEFAULTS.add(new Repairable(WOODEN_HOE, Arrays.asList(PLANKS), 1, 0, .25D)); - - CONFIG_REPAIRABLES_DEFAULTS.add(new Repairable(STONE_SWORD, COBBLESTONE, 1, 0, .25D)); - CONFIG_REPAIRABLES_DEFAULTS.add(new Repairable(STONE_SHOVEL, COBBLESTONE, 1, 0, .15D)); - CONFIG_REPAIRABLES_DEFAULTS.add(new Repairable(STONE_PICKAXE, COBBLESTONE, 1, 0, .5D)); - CONFIG_REPAIRABLES_DEFAULTS.add(new Repairable(STONE_AXE, COBBLESTONE, 1, 0, .5D)); - CONFIG_REPAIRABLES_DEFAULTS.add(new Repairable(STONE_HOE, COBBLESTONE, 1, 0, .25D)); - - CONFIG_REPAIRABLES_DEFAULTS.add(new Repairable(IRON_SWORD, IRON_INGOT, 1, 0, .5D)); - CONFIG_REPAIRABLES_DEFAULTS.add(new Repairable(IRON_SHOVEL, IRON_INGOT, 1, 0, .3D)); - CONFIG_REPAIRABLES_DEFAULTS.add(new Repairable(IRON_PICKAXE, IRON_INGOT, 1, 0, 1D)); - CONFIG_REPAIRABLES_DEFAULTS.add(new Repairable(IRON_AXE, IRON_INGOT, 1, 0, 1D)); - CONFIG_REPAIRABLES_DEFAULTS.add(new Repairable(IRON_HOE, IRON_INGOT, 1, 0, .5D)); - - CONFIG_REPAIRABLES_DEFAULTS.add(new Repairable(IRON_HELMET, IRON_INGOT, 1, 0, 2D)); - CONFIG_REPAIRABLES_DEFAULTS.add(new Repairable(IRON_CHESTPLATE, IRON_INGOT, 1, 0, 2D)); - CONFIG_REPAIRABLES_DEFAULTS.add(new Repairable(IRON_LEGGINGS, IRON_INGOT, 1, 0, 2D)); - CONFIG_REPAIRABLES_DEFAULTS.add(new Repairable(IRON_BOOTS, IRON_INGOT, 1, 0, 2D)); - - CONFIG_REPAIRABLES_DEFAULTS.add(new Repairable(SHEARS, IRON_INGOT, 1, 0, .5D)); - CONFIG_REPAIRABLES_DEFAULTS.add(new Repairable(FLINT_AND_STEEL, IRON_INGOT, 1, 0, .3D)); - - CONFIG_REPAIRABLES_DEFAULTS.add(new Repairable(GOLDEN_SWORD, GOLD_INGOT, 1, 0, 4D)); - CONFIG_REPAIRABLES_DEFAULTS.add(new Repairable(GOLDEN_SHOVEL, GOLD_INGOT, 1, 0, 2.6D)); - CONFIG_REPAIRABLES_DEFAULTS.add(new Repairable(GOLDEN_PICKAXE, GOLD_INGOT, 1, 0, 8D)); - CONFIG_REPAIRABLES_DEFAULTS.add(new Repairable(GOLDEN_AXE, GOLD_INGOT, 1, 0, 8D)); - CONFIG_REPAIRABLES_DEFAULTS.add(new Repairable(GOLDEN_HOE, GOLD_INGOT, 1, 0, 4D)); - - CONFIG_REPAIRABLES_DEFAULTS.add(new Repairable(GOLDEN_HELMET, GOLD_INGOT, 1, 0, 4D)); - CONFIG_REPAIRABLES_DEFAULTS.add(new Repairable(GOLDEN_CHESTPLATE, GOLD_INGOT, 1, 0, 4D)); - CONFIG_REPAIRABLES_DEFAULTS.add(new Repairable(GOLDEN_LEGGINGS, GOLD_INGOT, 1, 0, 4D)); - CONFIG_REPAIRABLES_DEFAULTS.add(new Repairable(GOLDEN_BOOTS, GOLD_INGOT, 1, 0, 4D)); - - CONFIG_REPAIRABLES_DEFAULTS.add(new Repairable(DIAMOND_SWORD, DIAMOND, 1, 0, .5D)); - CONFIG_REPAIRABLES_DEFAULTS.add(new Repairable(DIAMOND_SHOVEL, DIAMOND, 1, 0, .3D)); - CONFIG_REPAIRABLES_DEFAULTS.add(new Repairable(DIAMOND_PICKAXE, DIAMOND, 1, 0, 1D)); - CONFIG_REPAIRABLES_DEFAULTS.add(new Repairable(DIAMOND_AXE, DIAMOND, 1, 0, 1D)); - CONFIG_REPAIRABLES_DEFAULTS.add(new Repairable(DIAMOND_HOE, DIAMOND, 1, 0, .5D)); - - CONFIG_REPAIRABLES_DEFAULTS.add(new Repairable(DIAMOND_HELMET, DIAMOND, 1, 0, 2D)); - CONFIG_REPAIRABLES_DEFAULTS.add(new Repairable(DIAMOND_CHESTPLATE, DIAMOND, 1, 0, 2D)); - CONFIG_REPAIRABLES_DEFAULTS.add(new Repairable(DIAMOND_LEGGINGS, DIAMOND, 1, 0, 2D)); - CONFIG_REPAIRABLES_DEFAULTS.add(new Repairable(DIAMOND_BOOTS, DIAMOND, 1, 0, 2D)); +// CONFIG_REPAIRABLES_DEFAULTS.add(new Repairable(WOODEN_SWORD, planksWildCard, 1, 0, .25D)); +// CONFIG_REPAIRABLES_DEFAULTS.add(new Repairable(WOODEN_SHOVEL, planksWildCard, 1, 0, .15D)); +// CONFIG_REPAIRABLES_DEFAULTS.add(new Repairable(WOODEN_PICKAXE, Arrays.asList(PLANKS), 1, 0, .5D)); +// CONFIG_REPAIRABLES_DEFAULTS.add(new Repairable(WOODEN_AXE, Arrays.asList(PLANKS), 1, 0, .5D)); +// CONFIG_REPAIRABLES_DEFAULTS.add(new Repairable(WOODEN_HOE, Arrays.asList(PLANKS), 1, 0, .25D)); +// +// CONFIG_REPAIRABLES_DEFAULTS.add(new Repairable(STONE_SWORD, COBBLESTONE, 1, 0, .25D)); +// CONFIG_REPAIRABLES_DEFAULTS.add(new Repairable(STONE_SHOVEL, COBBLESTONE, 1, 0, .15D)); +// CONFIG_REPAIRABLES_DEFAULTS.add(new Repairable(STONE_PICKAXE, COBBLESTONE, 1, 0, .5D)); +// CONFIG_REPAIRABLES_DEFAULTS.add(new Repairable(STONE_AXE, COBBLESTONE, 1, 0, .5D)); +// CONFIG_REPAIRABLES_DEFAULTS.add(new Repairable(STONE_HOE, COBBLESTONE, 1, 0, .25D)); +// +// CONFIG_REPAIRABLES_DEFAULTS.add(new Repairable(IRON_SWORD, IRON_INGOT, 1, 0, .5D)); +// CONFIG_REPAIRABLES_DEFAULTS.add(new Repairable(IRON_SHOVEL, IRON_INGOT, 1, 0, .3D)); +// CONFIG_REPAIRABLES_DEFAULTS.add(new Repairable(IRON_PICKAXE, IRON_INGOT, 1, 0, 1D)); +// CONFIG_REPAIRABLES_DEFAULTS.add(new Repairable(IRON_AXE, IRON_INGOT, 1, 0, 1D)); +// CONFIG_REPAIRABLES_DEFAULTS.add(new Repairable(IRON_HOE, IRON_INGOT, 1, 0, .5D)); +// +// CONFIG_REPAIRABLES_DEFAULTS.add(new Repairable(IRON_HELMET, IRON_INGOT, 1, 0, 2D)); +// CONFIG_REPAIRABLES_DEFAULTS.add(new Repairable(IRON_CHESTPLATE, IRON_INGOT, 1, 0, 2D)); +// CONFIG_REPAIRABLES_DEFAULTS.add(new Repairable(IRON_LEGGINGS, IRON_INGOT, 1, 0, 2D)); +// CONFIG_REPAIRABLES_DEFAULTS.add(new Repairable(IRON_BOOTS, IRON_INGOT, 1, 0, 2D)); +// +// CONFIG_REPAIRABLES_DEFAULTS.add(new Repairable(SHEARS, IRON_INGOT, 1, 0, .5D)); +// CONFIG_REPAIRABLES_DEFAULTS.add(new Repairable(FLINT_AND_STEEL, IRON_INGOT, 1, 0, .3D)); +// +// CONFIG_REPAIRABLES_DEFAULTS.add(new Repairable(GOLDEN_SWORD, GOLD_INGOT, 1, 0, 4D)); +// CONFIG_REPAIRABLES_DEFAULTS.add(new Repairable(GOLDEN_SHOVEL, GOLD_INGOT, 1, 0, 2.6D)); +// CONFIG_REPAIRABLES_DEFAULTS.add(new Repairable(GOLDEN_PICKAXE, GOLD_INGOT, 1, 0, 8D)); +// CONFIG_REPAIRABLES_DEFAULTS.add(new Repairable(GOLDEN_AXE, GOLD_INGOT, 1, 0, 8D)); +// CONFIG_REPAIRABLES_DEFAULTS.add(new Repairable(GOLDEN_HOE, GOLD_INGOT, 1, 0, 4D)); +// +// CONFIG_REPAIRABLES_DEFAULTS.add(new Repairable(GOLDEN_HELMET, GOLD_INGOT, 1, 0, 4D)); +// CONFIG_REPAIRABLES_DEFAULTS.add(new Repairable(GOLDEN_CHESTPLATE, GOLD_INGOT, 1, 0, 4D)); +// CONFIG_REPAIRABLES_DEFAULTS.add(new Repairable(GOLDEN_LEGGINGS, GOLD_INGOT, 1, 0, 4D)); +// CONFIG_REPAIRABLES_DEFAULTS.add(new Repairable(GOLDEN_BOOTS, GOLD_INGOT, 1, 0, 4D)); +// +// CONFIG_REPAIRABLES_DEFAULTS.add(new Repairable(DIAMOND_SWORD, DIAMOND, 1, 0, .5D)); +// CONFIG_REPAIRABLES_DEFAULTS.add(new Repairable(DIAMOND_SHOVEL, DIAMOND, 1, 0, .3D)); +// CONFIG_REPAIRABLES_DEFAULTS.add(new Repairable(DIAMOND_PICKAXE, DIAMOND, 1, 0, 1D)); +// CONFIG_REPAIRABLES_DEFAULTS.add(new Repairable(DIAMOND_AXE, DIAMOND, 1, 0, 1D)); +// CONFIG_REPAIRABLES_DEFAULTS.add(new Repairable(DIAMOND_HOE, DIAMOND, 1, 0, .5D)); +// +// CONFIG_REPAIRABLES_DEFAULTS.add(new Repairable(DIAMOND_HELMET, DIAMOND, 1, 0, 2D)); +// CONFIG_REPAIRABLES_DEFAULTS.add(new Repairable(DIAMOND_CHESTPLATE, DIAMOND, 1, 0, 2D)); +// CONFIG_REPAIRABLES_DEFAULTS.add(new Repairable(DIAMOND_LEGGINGS, DIAMOND, 1, 0, 2D)); +// CONFIG_REPAIRABLES_DEFAULTS.add(new Repairable(DIAMOND_BOOTS, DIAMOND, 1, 0, 2D)); } diff --git a/src/main/java/com/gmail/nossr50/config/hocon/skills/taming/ConfigTaming.java b/src/main/java/com/gmail/nossr50/config/hocon/skills/taming/ConfigTaming.java index 36c731fdd..109476948 100644 --- a/src/main/java/com/gmail/nossr50/config/hocon/skills/taming/ConfigTaming.java +++ b/src/main/java/com/gmail/nossr50/config/hocon/skills/taming/ConfigTaming.java @@ -1,8 +1,16 @@ package com.gmail.nossr50.config.hocon.skills.taming; +import com.gmail.nossr50.config.ConfigConstants; +import ninja.leaping.configurate.objectmapping.Setting; import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; @ConfigSerializable public class ConfigTaming { + @Setting(value = ConfigConstants.SUB_SKILL_NODE) + private ConfigTamingSubSkills subSkills = new ConfigTamingSubSkills(); + + public ConfigTamingSubSkills getSubSkills() { + return subSkills; + } } \ No newline at end of file diff --git a/src/main/java/com/gmail/nossr50/config/hocon/skills/taming/ConfigTamingCallOfTheWild.java b/src/main/java/com/gmail/nossr50/config/hocon/skills/taming/ConfigTamingCallOfTheWild.java new file mode 100644 index 000000000..f747d5397 --- /dev/null +++ b/src/main/java/com/gmail/nossr50/config/hocon/skills/taming/ConfigTamingCallOfTheWild.java @@ -0,0 +1,8 @@ +package com.gmail.nossr50.config.hocon.skills.taming; + +import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; + +@ConfigSerializable +public class ConfigTamingCallOfTheWild { + +} diff --git a/src/main/java/com/gmail/nossr50/config/hocon/skills/taming/ConfigTamingEnvironmentalllyAware.java b/src/main/java/com/gmail/nossr50/config/hocon/skills/taming/ConfigTamingEnvironmentalllyAware.java new file mode 100644 index 000000000..3d52ada4a --- /dev/null +++ b/src/main/java/com/gmail/nossr50/config/hocon/skills/taming/ConfigTamingEnvironmentalllyAware.java @@ -0,0 +1,7 @@ +package com.gmail.nossr50.config.hocon.skills.taming; + +import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; + +@ConfigSerializable +public class ConfigTamingEnvironmentalllyAware { +} diff --git a/src/main/java/com/gmail/nossr50/config/hocon/skills/taming/ConfigTamingFastFoodService.java b/src/main/java/com/gmail/nossr50/config/hocon/skills/taming/ConfigTamingFastFoodService.java new file mode 100644 index 000000000..b36c5d43a --- /dev/null +++ b/src/main/java/com/gmail/nossr50/config/hocon/skills/taming/ConfigTamingFastFoodService.java @@ -0,0 +1,7 @@ +package com.gmail.nossr50.config.hocon.skills.taming; + +import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; + +@ConfigSerializable +public class ConfigTamingFastFoodService { +} diff --git a/src/main/java/com/gmail/nossr50/config/hocon/skills/taming/ConfigTamingGore.java b/src/main/java/com/gmail/nossr50/config/hocon/skills/taming/ConfigTamingGore.java new file mode 100644 index 000000000..cc96a2647 --- /dev/null +++ b/src/main/java/com/gmail/nossr50/config/hocon/skills/taming/ConfigTamingGore.java @@ -0,0 +1,32 @@ +package com.gmail.nossr50.config.hocon.skills.taming; + +import com.gmail.nossr50.config.ConfigConstants; +import com.gmail.nossr50.datatypes.skills.properties.AbstractMaxBonusLevel; +import com.gmail.nossr50.datatypes.skills.properties.MaxBonusLevel; +import ninja.leaping.configurate.objectmapping.Setting; +import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; + +@ConfigSerializable +public class ConfigTamingGore { + + @Setting(value = ConfigConstants.MAX_CHANCE_FIELD_NAME, comment = ConfigConstants.MAX_CHANCE_FIELD_DESCRIPTION) + private double maxChance = 50.0; + + @Setting(value = ConfigConstants.MAX_BONUS_LEVEL_FIELD_NAME, comment = ConfigConstants.MAX_BONUS_LEVEL_DESCRIPTION) + private MaxBonusLevel maxBonusLevel = new AbstractMaxBonusLevel(100); + + @Setting(value = "Gore-Damage-Modifier") + private double goreMofifier = 2.0; + + public double getMaxChance() { + return maxChance; + } + + public MaxBonusLevel getMaxBonusLevel() { + return maxBonusLevel; + } + + public double getGoreMofifier() { + return goreMofifier; + } +} diff --git a/src/main/java/com/gmail/nossr50/config/hocon/skills/taming/ConfigTamingPummel.java b/src/main/java/com/gmail/nossr50/config/hocon/skills/taming/ConfigTamingPummel.java new file mode 100644 index 000000000..24fccd0cb --- /dev/null +++ b/src/main/java/com/gmail/nossr50/config/hocon/skills/taming/ConfigTamingPummel.java @@ -0,0 +1,7 @@ +package com.gmail.nossr50.config.hocon.skills.taming; + +import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; + +@ConfigSerializable +public class ConfigTamingPummel { +} diff --git a/src/main/java/com/gmail/nossr50/config/hocon/skills/taming/ConfigTamingSharpenedClaws.java b/src/main/java/com/gmail/nossr50/config/hocon/skills/taming/ConfigTamingSharpenedClaws.java new file mode 100644 index 000000000..53a850cbb --- /dev/null +++ b/src/main/java/com/gmail/nossr50/config/hocon/skills/taming/ConfigTamingSharpenedClaws.java @@ -0,0 +1,7 @@ +package com.gmail.nossr50.config.hocon.skills.taming; + +import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; + +@ConfigSerializable +public class ConfigTamingSharpenedClaws { +} diff --git a/src/main/java/com/gmail/nossr50/config/hocon/skills/taming/ConfigTamingShockProof.java b/src/main/java/com/gmail/nossr50/config/hocon/skills/taming/ConfigTamingShockProof.java new file mode 100644 index 000000000..6d11e1504 --- /dev/null +++ b/src/main/java/com/gmail/nossr50/config/hocon/skills/taming/ConfigTamingShockProof.java @@ -0,0 +1,7 @@ +package com.gmail.nossr50.config.hocon.skills.taming; + +import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; + +@ConfigSerializable +public class ConfigTamingShockProof { +} diff --git a/src/main/java/com/gmail/nossr50/config/hocon/skills/taming/ConfigTamingSubSkills.java b/src/main/java/com/gmail/nossr50/config/hocon/skills/taming/ConfigTamingSubSkills.java new file mode 100644 index 000000000..1952c00c7 --- /dev/null +++ b/src/main/java/com/gmail/nossr50/config/hocon/skills/taming/ConfigTamingSubSkills.java @@ -0,0 +1,64 @@ +package com.gmail.nossr50.config.hocon.skills.taming; + +import ninja.leaping.configurate.objectmapping.Setting; +import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; + +@ConfigSerializable +public class ConfigTamingSubSkills { + + @Setting(value = "Gore") + private ConfigTamingGore gore = new ConfigTamingGore(); + + @Setting(value = "Call-Of-The-Wild") + private ConfigTamingCallOfTheWild callOfTheWild = new ConfigTamingCallOfTheWild(); + + @Setting(value = "Sharpened-Claws") + private ConfigTamingSharpenedClaws sharpenedClaws = new ConfigTamingSharpenedClaws(); + + @Setting(value = "Shock-Proof") + private ConfigTamingShockProof shockProof = new ConfigTamingShockProof(); + + @Setting(value = "Thick-Fur") + private ConfigTamingThickFur thickFur = new ConfigTamingThickFur(); + + @Setting(value = "Environmentally-Aware") + private ConfigTamingEnvironmentalllyAware environmentalllyAware = new ConfigTamingEnvironmentalllyAware(); + + @Setting(value = "Fast-Food-Service") + private ConfigTamingFastFoodService fastFoodService = new ConfigTamingFastFoodService(); + + @Setting(value = "Pummel") + private ConfigTamingPummel pummel = new ConfigTamingPummel(); + + public ConfigTamingGore getGore() { + return gore; + } + + public ConfigTamingCallOfTheWild getCallOfTheWild() { + return callOfTheWild; + } + + public ConfigTamingSharpenedClaws getSharpenedClaws() { + return sharpenedClaws; + } + + public ConfigTamingShockProof getShockProof() { + return shockProof; + } + + public ConfigTamingThickFur getThickFur() { + return thickFur; + } + + public ConfigTamingEnvironmentalllyAware getEnvironmentalllyAware() { + return environmentalllyAware; + } + + public ConfigTamingFastFoodService getFastFoodService() { + return fastFoodService; + } + + public ConfigTamingPummel getPummel() { + return pummel; + } +} diff --git a/src/main/java/com/gmail/nossr50/config/hocon/skills/taming/ConfigTamingThickFur.java b/src/main/java/com/gmail/nossr50/config/hocon/skills/taming/ConfigTamingThickFur.java new file mode 100644 index 000000000..88c3fb4dd --- /dev/null +++ b/src/main/java/com/gmail/nossr50/config/hocon/skills/taming/ConfigTamingThickFur.java @@ -0,0 +1,7 @@ +package com.gmail.nossr50.config.hocon.skills.taming; + +import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; + +@ConfigSerializable +public class ConfigTamingThickFur { +}