Fix bird catcher and razor-sharp claws names and constants.

src/generated/resources/assets/catherder/lang/de_de.json

@@ -142,8 +142,8 @@
   "talent.catherder.bed_finder": "TODO",
   "talent.catherder.bed_finder.description": "TODO",
   "talent.catherder.bed_finder.mount": "TODO",
-  "talent.catherder.birdcatcher": "TODO",
-  "talent.catherder.birdcatcher.description": "TODO",
+  "talent.catherder.bird_catcher": "TODO",
+  "talent.catherder.bird_catcher.description": "TODO",
   "talent.catherder.catlike_reflexes": "TODO",
   "talent.catherder.catlike_reflexes.description": "TODO",
   "talent.catherder.cheetah_speed": "TODO",
@@ -188,11 +188,11 @@
   "talent.catherder.pounce.description": "TODO",
   "talent.catherder.quick_healer": "TODO",
   "talent.catherder.quick_healer.description": "TODO",
-  "talent.catherder.razorsharp_claws": "TODO",
-  "talent.catherder.razorsharp_claws.cooldown": "",
-  "talent.catherder.razorsharp_claws.description": "",
-  "talent.catherder.razorsharp_claws.level": "",
-  "talent.catherder.razorsharp_claws.miss": "",
+  "talent.catherder.razor_sharp_claws": "TODO",
+  "talent.catherder.razor_sharp_claws.cooldown": "",
+  "talent.catherder.razor_sharp_claws.description": "",
+  "talent.catherder.razor_sharp_claws.level": "",
+  "talent.catherder.razor_sharp_claws.miss": "",
   "talent.catherder.rescue_cat": "TODO",
   "talent.catherder.rescue_cat.description": "TODO",
   "talent.catherder.super_jump": "TODO",

src/generated/resources/assets/catherder/lang/en_gb.json

@@ -142,8 +142,8 @@
   "talent.catherder.bed_finder": "Bed Finder",
   "talent.catherder.bed_finder.description": "While a cat with this skill is on your head, your bed will be highlighted in a black outline. To get the cat on you head, right click on them with a bone in hand. The range at which it can do this is equal to 200 blocks per level, but becomes infinite at level 5.",
   "talent.catherder.bed_finder.mount": "Click to make %s dismount",
-  "talent.catherder.birdcatcher": "Bird Catcher",
-  "talent.catherder.birdcatcher.description": "Every level grants a 10%% chance to make anything your cat kills drop its loot twice, Level 5 grants an extra 10%%, bringing it up to a 60%% chance.",
+  "talent.catherder.bird_catcher": "Bird Catcher",
+  "talent.catherder.bird_catcher.description": "Every level grants a 10%% chance to make anything your cat kills drop its loot twice, Level 5 grants an extra 10%%, bringing it up to a 60%% chance.",
   "talent.catherder.catlike_reflexes": "Catlike Reflexes",
   "talent.catherder.catlike_reflexes.description": "Increases the chance that your cat, will completely block a physical attack.",
   "talent.catherder.cheetah_speed": "Cheetah Speed",
@@ -188,11 +188,11 @@
   "talent.catherder.pounce.description": "",
   "talent.catherder.quick_healer": "Quick Healer",
   "talent.catherder.quick_healer.description": "Improves the rate at which your cat heals without needing to rest Mastering the skill will heal your cat 50%% faster when sitting.",
-  "talent.catherder.razorsharp_claws": "Razor-sharp Claws",
-  "talent.catherder.razorsharp_claws.cooldown": "",
-  "talent.catherder.razorsharp_claws.description": "",
-  "talent.catherder.razorsharp_claws.level": "",
-  "talent.catherder.razorsharp_claws.miss": "",
+  "talent.catherder.razor_sharp_claws": "Razor-sharp Claws",
+  "talent.catherder.razor_sharp_claws.cooldown": "",
+  "talent.catherder.razor_sharp_claws.description": "",
+  "talent.catherder.razor_sharp_claws.level": "",
+  "talent.catherder.razor_sharp_claws.miss": "",
   "talent.catherder.rescue_cat": "Rescue Cat",
   "talent.catherder.rescue_cat.description": "If you're at critical health and a cat with this skill is following you, it will attempt to heal you half a heart per level in this skill, at the cost of 100 NP Mastering this skill reduces the cost to 80 NP.",
   "talent.catherder.super_jump": "Super Jump",

src/generated/resources/assets/catherder/lang/en_us.json

@@ -146,8 +146,8 @@
   "talent.catherder.bed_finder": "Bed Finder",
   "talent.catherder.bed_finder.description": "While a cat with this skill is on your head, your bed will be highlighted in a black outline. To get the cat on you head, right click on them with a bone in hand. The range at which it can do this is equal to 200 blocks per level, but becomes infinite at level 5.",
   "talent.catherder.bed_finder.mount": "Click to make %s dismount",
-  "talent.catherder.birdcatcher": "Bird Catcher",
-  "talent.catherder.birdcatcher.description": "Every level grants a 10%% chance to make anything your cat kills drop its loot twice, Level 5 grants an extra 10%%, bringing it up to a 60%% chance.",
+  "talent.catherder.bird_catcher": "Bird Catcher",
+  "talent.catherder.bird_catcher.description": "Every level grants a 10%% chance to make anything your cat kills drop its loot twice, Level 5 grants an extra 10%%, bringing it up to a 60%% chance.",
   "talent.catherder.catlike_reflexes": "Catlike Reflexes",
   "talent.catherder.catlike_reflexes.description": "Increases the chance that your cat, will completely block a physical attack.",
   "talent.catherder.cheetah_speed": "Cheetah Speed",
@@ -192,11 +192,11 @@
   "talent.catherder.pounce.description": "",
   "talent.catherder.quick_healer": "Quick Healer",
   "talent.catherder.quick_healer.description": "Improves the rate at which your cat heals without needing to rest Mastering the skill will heal your cat 50%% faster when sitting.",
-  "talent.catherder.razorsharp_claws": "Razor-sharp Claws",
-  "talent.catherder.razorsharp_claws.cooldown": "",
-  "talent.catherder.razorsharp_claws.description": "",
-  "talent.catherder.razorsharp_claws.level": "",
-  "talent.catherder.razorsharp_claws.miss": "",
+  "talent.catherder.razor_sharp_claws": "Razor-sharp Claws",
+  "talent.catherder.razor_sharp_claws.cooldown": "",
+  "talent.catherder.razor_sharp_claws.description": "",
+  "talent.catherder.razor_sharp_claws.level": "",
+  "talent.catherder.razor_sharp_claws.miss": "",
   "talent.catherder.rescue_cat": "Rescue Cat",
   "talent.catherder.rescue_cat.description": "If you're at critical health and a cat with this skill is following you, it will attempt to heal you half a heart per level in this skill, at the cost of 100 NP Mastering this skill reduces the cost to 80 NP.",
   "talent.catherder.super_jump": "Super Jump",

src/generated/resources/assets/catherder/lang/ko_kr.json

@@ -142,8 +142,8 @@
   "talent.catherder.bed_finder": "TODO",
   "talent.catherder.bed_finder.description": "TODO",
   "talent.catherder.bed_finder.mount": "TODO",
-  "talent.catherder.birdcatcher": "TODO",
-  "talent.catherder.birdcatcher.description": "TODO",
+  "talent.catherder.bird_catcher": "TODO",
+  "talent.catherder.bird_catcher.description": "TODO",
   "talent.catherder.catlike_reflexes": "TODO",
   "talent.catherder.catlike_reflexes.description": "TODO",
   "talent.catherder.cheetah_speed": "TODO",
@@ -188,11 +188,11 @@
   "talent.catherder.pounce.description": "TODO",
   "talent.catherder.quick_healer": "TODO",
   "talent.catherder.quick_healer.description": "TODO",
-  "talent.catherder.razorsharp_claws": "TODO",
-  "talent.catherder.razorsharp_claws.cooldown": "",
-  "talent.catherder.razorsharp_claws.description": "",
-  "talent.catherder.razorsharp_claws.level": "",
-  "talent.catherder.razorsharp_claws.miss": "",
+  "talent.catherder.razor_sharp_claws": "TODO",
+  "talent.catherder.razor_sharp_claws.cooldown": "",
+  "talent.catherder.razor_sharp_claws.description": "",
+  "talent.catherder.razor_sharp_claws.level": "",
+  "talent.catherder.razor_sharp_claws.miss": "",
   "talent.catherder.rescue_cat": "TODO",
   "talent.catherder.rescue_cat.description": "TODO",
   "talent.catherder.super_jump": "TODO",

src/generated/resources/assets/catherder/lang/ru_ru.json

@@ -142,8 +142,8 @@
   "talent.catherder.bed_finder": "TODO",
   "talent.catherder.bed_finder.description": "TODO",
   "talent.catherder.bed_finder.mount": "TODO",
-  "talent.catherder.birdcatcher": "TODO",
-  "talent.catherder.birdcatcher.description": "TODO",
+  "talent.catherder.bird_catcher": "TODO",
+  "talent.catherder.bird_catcher.description": "TODO",
   "talent.catherder.catlike_reflexes": "TODO",
   "talent.catherder.catlike_reflexes.description": "TODO",
   "talent.catherder.cheetah_speed": "TODO",
@@ -188,11 +188,11 @@
   "talent.catherder.pounce.description": "TODO",
   "talent.catherder.quick_healer": "TODO",
   "talent.catherder.quick_healer.description": "TODO",
-  "talent.catherder.razorsharp_claws": "TODO",
-  "talent.catherder.razorsharp_claws.cooldown": "",
-  "talent.catherder.razorsharp_claws.description": "",
-  "talent.catherder.razorsharp_claws.level": "",
-  "talent.catherder.razorsharp_claws.miss": "",
+  "talent.catherder.razor_sharp_claws": "TODO",
+  "talent.catherder.razor_sharp_claws.cooldown": "",
+  "talent.catherder.razor_sharp_claws.description": "",
+  "talent.catherder.razor_sharp_claws.level": "",
+  "talent.catherder.razor_sharp_claws.miss": "",
   "talent.catherder.rescue_cat": "TODO",
   "talent.catherder.rescue_cat.description": "TODO",
   "talent.catherder.super_jump": "TODO",

src/generated/resources/assets/catherder/lang/vi_vn.json

@@ -142,8 +142,8 @@
   "talent.catherder.bed_finder": "TODO",
   "talent.catherder.bed_finder.description": "TODO",
   "talent.catherder.bed_finder.mount": "TODO",
-  "talent.catherder.birdcatcher": "TODO",
-  "talent.catherder.birdcatcher.description": "TODO",
+  "talent.catherder.bird_catcher": "TODO",
+  "talent.catherder.bird_catcher.description": "TODO",
   "talent.catherder.catlike_reflexes": "TODO",
   "talent.catherder.catlike_reflexes.description": "TODO",
   "talent.catherder.cheetah_speed": "TODO",
@@ -188,11 +188,11 @@
   "talent.catherder.pounce.description": "TODO",
   "talent.catherder.quick_healer": "TODO",
   "talent.catherder.quick_healer.description": "TODO",
-  "talent.catherder.razorsharp_claws": "TODO",
-  "talent.catherder.razorsharp_claws.cooldown": "",
-  "talent.catherder.razorsharp_claws.description": "",
-  "talent.catherder.razorsharp_claws.level": "",
-  "talent.catherder.razorsharp_claws.miss": "",
+  "talent.catherder.razor_sharp_claws": "TODO",
+  "talent.catherder.razor_sharp_claws.cooldown": "",
+  "talent.catherder.razor_sharp_claws.description": "",
+  "talent.catherder.razor_sharp_claws.level": "",
+  "talent.catherder.razor_sharp_claws.miss": "",
   "talent.catherder.rescue_cat": "TODO",
   "talent.catherder.rescue_cat.description": "TODO",
   "talent.catherder.super_jump": "TODO",

src/generated/resources/assets/catherder/lang/zh_cn.json

@@ -142,8 +142,8 @@
   "talent.catherder.bed_finder": "TODO",
   "talent.catherder.bed_finder.description": "TODO",
   "talent.catherder.bed_finder.mount": "TODO",
-  "talent.catherder.birdcatcher": "TODO",
-  "talent.catherder.birdcatcher.description": "TODO",
+  "talent.catherder.bird_catcher": "TODO",
+  "talent.catherder.bird_catcher.description": "TODO",
   "talent.catherder.catlike_reflexes": "TODO",
   "talent.catherder.catlike_reflexes.description": "TODO",
   "talent.catherder.cheetah_speed": "TODO",
@@ -188,11 +188,11 @@
   "talent.catherder.pounce.description": "TODO",
   "talent.catherder.quick_healer": "TODO",
   "talent.catherder.quick_healer.description": "TODO",
-  "talent.catherder.razorsharp_claws": "TODO",
-  "talent.catherder.razorsharp_claws.cooldown": "",
-  "talent.catherder.razorsharp_claws.description": "",
-  "talent.catherder.razorsharp_claws.level": "",
-  "talent.catherder.razorsharp_claws.miss": "",
+  "talent.catherder.razor_sharp_claws": "TODO",
+  "talent.catherder.razor_sharp_claws.cooldown": "",
+  "talent.catherder.razor_sharp_claws.description": "",
+  "talent.catherder.razor_sharp_claws.level": "",
+  "talent.catherder.razor_sharp_claws.miss": "",
   "talent.catherder.rescue_cat": "TODO",
   "talent.catherder.rescue_cat.description": "TODO",
   "talent.catherder.super_jump": "TODO",

src/generated/resources/assets/catherder/lang/zh_tw.json

@@ -142,8 +142,8 @@
   "talent.catherder.bed_finder": "TODO",
   "talent.catherder.bed_finder.description": "TODO",
   "talent.catherder.bed_finder.mount": "TODO",
-  "talent.catherder.birdcatcher": "TODO",
-  "talent.catherder.birdcatcher.description": "TODO",
+  "talent.catherder.bird_catcher": "TODO",
+  "talent.catherder.bird_catcher.description": "TODO",
   "talent.catherder.catlike_reflexes": "TODO",
   "talent.catherder.catlike_reflexes.description": "TODO",
   "talent.catherder.cheetah_speed": "TODO",
@@ -188,11 +188,11 @@
   "talent.catherder.pounce.description": "TODO",
   "talent.catherder.quick_healer": "TODO",
   "talent.catherder.quick_healer.description": "TODO",
-  "talent.catherder.razorsharp_claws": "TODO",
-  "talent.catherder.razorsharp_claws.cooldown": "",
-  "talent.catherder.razorsharp_claws.description": "",
-  "talent.catherder.razorsharp_claws.level": "",
-  "talent.catherder.razorsharp_claws.miss": "",
+  "talent.catherder.razor_sharp_claws": "TODO",
+  "talent.catherder.razor_sharp_claws.cooldown": "",
+  "talent.catherder.razor_sharp_claws.description": "",
+  "talent.catherder.razor_sharp_claws.level": "",
+  "talent.catherder.razor_sharp_claws.miss": "",
   "talent.catherder.rescue_cat": "TODO",
   "talent.catherder.rescue_cat.description": "TODO",
   "talent.catherder.super_jump": "TODO",

src/main/java/com/sweetrpg/catherder/CatHerder.java

@@ -55,7 +55,7 @@ public class CatHerder {
     public static final RegistryObject<Talent> CATLIKE_REFLEXES = registerInst("catlike_reflexes", CatlikeReflexesTalent::new);
     public static final RegistryObject<Talent> HAPPY_EATER = registerInst("happy_eater", HappyEaterTalent::new);
     public static final RegistryObject<Talent> HELL_BEAST = registerInst("hell_beast", HellBeastTalent::new);
-    public static final RegistryObject<Talent> BIRDCATCHER = registerInst("birdcatcher", null);
+    public static final RegistryObject<Talent> BIRD_CATCHER = registerInst("bird_catcher", null);
     public static final RegistryObject<Talent> PACK_CAT = registerInst("pack_cat", PackCatTalent::new);
     public static final RegistryObject<Talent> PEST_FIGHTER = registerInst("pest_fighter", PestFighterTalent::new);
     public static final RegistryObject<Talent> POISON_FANG = registerInst("poison_fang", PoisonFangTalent::new);
@@ -65,7 +65,7 @@ public class CatHerder {
     public static final RegistryObject<Talent> MOUNT = registerInst("mount", MountTalent::new);
     public static final RegistryObject<Talent> SUPER_JUMP = registerInst("super_jump", SuperJumpTalent::new);
     public static final RegistryObject<Talent> POUNCE = registerInst("pounce", PounceTalent::new);
-    public static final RegistryObject<Talent> RAZORSHARP_CLAWS = registerInst("razorsharp_claws", RazorsharpClawsTalent::new);
+    public static final RegistryObject<Talent> RAZOR_SHARP_CLAWS = registerInst("razor_sharp_claws", RazorsharpClawsTalent::new);
 
     private static <T extends Talent> RegistryObject<Talent> registerInst(final String name, final BiFunction<Talent, Integer, TalentInstance> sup) {
         return register(name, () -> new Talent(sup));

src/main/java/com/sweetrpg/catherder/common/lib/Constants.java

@@ -102,8 +102,8 @@ public class Constants {
     public static final String TRANSLATION_KEY_TALENT_SUPERJUMP_DESCRIPTION = "talent.catherder.super_jump.description";
     public static final String TRANSLATION_KEY_TALENT_CATLIKEREFLEXES_NAME = "talent.catherder.catlike_reflexes";
     public static final String TRANSLATION_KEY_TALENT_CATLIKEREFLEXES_DESCRIPTION = "talent.catherder.catlike_reflexes.description";
-    public static final String TRANSLATION_KEY_TALENT_BIRDCATCHER_NAME = "talent.catherder.birdcatcher";
-    public static final String TRANSLATION_KEY_TALENT_BIRDCATCHER_DESCRIPTION = "talent.catherder.birdcatcher.description";
+    public static final String TRANSLATION_KEY_TALENT_bird_catcher_NAME = "talent.catherder.bird_catcher";
+    public static final String TRANSLATION_KEY_TALENT_bird_catcher_DESCRIPTION = "talent.catherder.bird_catcher.description";
     public static final String TRANSLATION_KEY_TALENT_HELLBEAST_NAME = "talent.catherder.hell_beast";
     public static final String TRANSLATION_KEY_TALENT_HELLBEAST_DESCRIPTION = "talent.catherder.hell_beast.description";
     public static final String TRANSLATION_KEY_TALENT_MOUNT_NAME = "talent.catherder.mount";
@@ -129,11 +129,11 @@ public class Constants {
     public static final String TRANSLATION_KEY_TALENT_POISONFANG_DESCRIPTION = "talent.catherder.poison_fang.description";
     public static final String TRANSLATION_KEY_TALENT_RESCUECAT_NAME = "talent.catherder.rescue_cat";
     public static final String TRANSLATION_KEY_TALENT_RESCUECAT_DESCRIPTION = "talent.catherder.rescue_cat.description";
-    public static final String TRANSLATION_KEY_TALENT_RAZORSHARPCLAWS_NAME = "talent.catherder.razorsharp_claws";
-    public static final String TRANSLATION_KEY_TALENT_RAZORSHARPCLAWS_DESCRIPTION = "talent.catherder.razorsharp_claws.description";
-    public static final String TRANSLATION_KEY_TALENT_RAZORSHARPCLAWS_COOLDOWN = "talent.catherder.razorsharp_claws.cooldown";
-    public static final String TRANSLATION_KEY_TALENT_RAZORSHARPCLAWS_LEVEL = "talent.catherder.razorsharp_claws.level";
-    public static final String TRANSLATION_KEY_TALENT_RAZORSHARPCLAWS_MISS = "talent.catherder.razorsharp_claws.miss";
+    public static final String TRANSLATION_KEY_TALENT_RAZORSHARPCLAWS_NAME = "talent.catherder.razor_sharp_claws";
+    public static final String TRANSLATION_KEY_TALENT_RAZORSHARPCLAWS_DESCRIPTION = "talent.catherder.razor_sharp_claws.description";
+    public static final String TRANSLATION_KEY_TALENT_RAZORSHARPCLAWS_COOLDOWN = "talent.catherder.razor_sharp_claws.cooldown";
+    public static final String TRANSLATION_KEY_TALENT_RAZORSHARPCLAWS_LEVEL = "talent.catherder.razor_sharp_claws.level";
+    public static final String TRANSLATION_KEY_TALENT_RAZORSHARPCLAWS_MISS = "talent.catherder.razor_sharp_claws.miss";
     public static final String TRANSLATION_KEY_TALENT_NERMAL_NAME = "talent.catherder.nermal";
     public static final String TRANSLATION_KEY_TALENT_NERMAL_DESCRIPTION = "talent.catherder.nermal.description";
     public static final String TRANSLATION_KEY_TALENT_NERMAL_MSG_1_LINE_1 = "talent.catherder.nermal.msg.1.line.1";

src/main/java/com/sweetrpg/catherder/common/talent/BirdCatcherTalent.java

@@ -16,7 +16,7 @@ public static void onLootDrop(final LootingLevelEvent event) {
             Entity trueSource = damageSource.getEntity();
             if (trueSource instanceof CatEntity) {
                 CatEntity cat = (CatEntity) trueSource;
-                int level = cat.getCatLevel(CatHerder.BIRDCATCHER);
+                int level = cat.getCatLevel(CatHerder.BIRD_CATCHER);
 
                 if (cat.getRandom().nextInt(6) < level + (level >= 5 ? 1 : 0)) {
                     event.setLootingLevel(event.getLootingLevel() + level / 2);