More Bows and Spooky Gear

Added more bows and some of the Halloween themed items from Minecraft Dungeons Added draw animations for bows Added recipes for most of the bows Added recipes for whips and other melee weapons Added Portuguese translation
chronosacaria · Nov 5, 2020 · 820cf84 · 820cf84
1 parent bab2cf6
commit 820cf84
Show file tree

Hide file tree

Showing 214 changed files with 3,522 additions and 226 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -2,14 +2,14 @@
 org.gradle.jvmargs=-Xmx1G
 # Fabric Properties
 # check these on https://modmuss50.me/fabric.html
-minecraft_version=1.16.3
-yarn_mappings=1.16.3+build.47
+minecraft_version=1.16.4
+yarn_mappings=1.16.4+build.6
 loader_version=0.10.6+build.214
 reach_entity_attributes_version=1.0.1
 # Mod Properties
-mod_version=1.1.5c
+mod_version=1.1.7
 maven_group=chronosacaria
 archives_base_name=mcdw
 # Dependencies
 # check this on https://modmuss50.me/fabric.html
-fabric_version=0.25.0+build.415-1.16
+fabric_version=0.25.1+build.416-1.16
diff --git a/src/main/java/chronosacaria/mcdw/client/McdwClient.java b/src/main/java/chronosacaria/mcdw/client/McdwClient.java
@@ -29,13 +29,39 @@ public void onInitializeClient() {
 
         registerBowPredicates(Bows.BOW_BONEBOW);
         //registerBowPredicates(Bows.BOW_TWIN_BOW);
+        registerBowPredicates(Bows.BOW_HAUNTED_BOW);
+
         registerBowPredicates(Bows.BOW_LONGBOW);
         registerBowPredicates(Bows.BOW_RED_SNAKE);
         registerBowPredicates(Bows.BOW_GUARDIAN_BOW);
+
         registerBowPredicates(Bows.BOW_SHORTBOW);
         registerBowPredicates(Bows.BOW_MECHANICAL_SHORTBOW);
         registerBowPredicates(Bows.BOW_PURPLE_STORM);
-        registerBowPredicates(Bows.BOW_HAUNTED_BOW);
+        registerBowPredicates(Bows.BOW_LOVE_SPELL_BOW);
+
+        registerBowPredicates(Bows.BOW_TRICKBOW);
+        registerBowPredicates(Bows.BOW_GREEN_MENACE);
+        registerBowPredicates(Bows.BOW_PINK_SCOUNDREL);
+
+        registerBowPredicates(Bows.BOW_POWER_BOW);
+        registerBowPredicates(Bows.BOW_ELITE_POWER_BOW);
+        registerBowPredicates(Bows.BOW_SABREWING);
+
+        registerBowPredicates(Bows.BOW_HUNTING_BOW);
+        registerBowPredicates(Bows.BOW_MASTERS_BOW);
+        registerBowPredicates(Bows.BOW_HUNTERS_PROMISE);
+        registerBowPredicates(Bows.BOW_ANCIENT_BOW);
+
+        registerBowPredicates(Bows.BOW_SOUL_BOW);
+        registerBowPredicates(Bows.BOW_NOCTURNAL_BOW);
+        registerBowPredicates(Bows.BOW_LOST_SOULS);
+
+        //registerBowPredicates(Bows.BOW_WIND_BOW);
+        //registerBowPredicates(Bows.BOW_ECHO_OF_THE_VALLEY);
+
+        //registerBowPredicates(Bows.BOW_SNOW_BOW);
+        //registerBowPredicates(Bows.BOW_WINTERS_TOUCH);
     }
     public static void registerBowPredicates(McdwBow bow) {
         FabricModelPredicateProviderRegistry.register(bow, new Identifier("pull"),(itemStack, clientWorld,

diff --git a/src/main/java/chronosacaria/mcdw/weapons/Bows.java b/src/main/java/chronosacaria/mcdw/weapons/Bows.java
@@ -11,73 +11,106 @@ public class Bows {
 
     public static McdwBow BOW_BONEBOW;
     //public static McdwBow BOW_TWIN_BOW;
+    public static McdwBow BOW_HAUNTED_BOW;
+
     public static McdwBow BOW_LONGBOW;
     public static McdwBow BOW_RED_SNAKE;
     public static McdwBow BOW_GUARDIAN_BOW;
+
     public static McdwBow BOW_SHORTBOW;
     public static McdwBow BOW_MECHANICAL_SHORTBOW;
     public static McdwBow BOW_PURPLE_STORM;
+    public static McdwBow BOW_LOVE_SPELL_BOW;
 
     public static McdwBow BOW_TRICKBOW;
     public static McdwBow BOW_GREEN_MENACE;
     public static McdwBow BOW_PINK_SCOUNDREL;
+
     public static McdwBow BOW_POWER_BOW;
     public static McdwBow BOW_ELITE_POWER_BOW;
     public static McdwBow BOW_SABREWING;
+
     public static McdwBow BOW_HUNTING_BOW;
     public static McdwBow BOW_MASTERS_BOW;
     public static McdwBow BOW_HUNTERS_PROMISE;
+    public static McdwBow BOW_ANCIENT_BOW;
+
     public static McdwBow BOW_SOUL_BOW;
     public static McdwBow BOW_NOCTURNAL_BOW;
     public static McdwBow BOW_LOST_SOULS;
 
-    public static McdwBow BOW_HAUNTED_BOW;
+    //public static McdwBow BOW_WIND_BOW;
+    //public static McdwBow BOW_ECHO_OF_THE_VALLEY;
+
+    public static McdwBow BOW_SNOW_BOW;
+    public static McdwBow BOW_WINTERS_TOUCH;
+
 
     public static void init() {
         BOW_BONEBOW = new McdwBow(ToolMaterials.WOOD,
                 new Item.Settings().group(Mcdw.RANGED).maxCount(1).maxDamage(350) ,15.0F, 3.2F, "bow_bonebow");
         //BOW_TWIN_BOW = new McdwBow(ToolMaterials.WOOD,
                 //new Item.Settings().group(Mcdw.RANGED).maxCount(1).maxDamage(350) ,16.0F, 3.2F, "bow_twin_bow");
+        BOW_HAUNTED_BOW = new McdwBow(ToolMaterials.WOOD,
+                new Item.Settings().group(Mcdw.RANGED).maxCount(1).maxDamage(350) ,15.0F, 3.2F, "bow_haunted_bow");
+
         BOW_LONGBOW = new McdwBow(ToolMaterials.WOOD,
                 new Item.Settings().group(Mcdw.RANGED).maxCount(1).maxDamage(350) ,20.0F, 6.4F ,"bow_longbow");
         BOW_RED_SNAKE = new McdwBow(ToolMaterials.WOOD,
                 new Item.Settings().group(Mcdw.RANGED).maxCount(1).maxDamage(350) ,30.0F, 6.4F, "bow_red_snake");
         BOW_GUARDIAN_BOW = new McdwBow(ToolMaterials.WOOD,
                 new Item.Settings().group(Mcdw.RANGED).maxCount(1).maxDamage(350) ,30.0F, 6.4F, "bow_guardian_bow");
+
         BOW_SHORTBOW = new McdwBow(ToolMaterials.WOOD,
                 new Item.Settings().group(Mcdw.RANGED).maxCount(1).maxDamage(350) ,8.0F, 2.0F, "bow_shortbow");
         BOW_MECHANICAL_SHORTBOW = new McdwBow(ToolMaterials.WOOD,
-                new Item.Settings().group(Mcdw.RANGED).maxCount(1).maxDamage(350) ,8.0F, 2.8F,
-                "bow_mechanical_shortbow");
+                new Item.Settings().group(Mcdw.RANGED).maxCount(1).maxDamage(350) ,8.0F, 2.8F, "bow_mechanical_shortbow");
         BOW_PURPLE_STORM = new McdwBow(ToolMaterials.WOOD,
                 new Item.Settings().group(Mcdw.RANGED).maxCount(1).maxDamage(350) ,8.0F, 2.0F, "bow_purple_storm");
-        /*BOW_TRICKBOW = new McdwBow(ToolMaterials.WOOD,
-                new Item.Settings().group(Mcdw.RANGED).maxCount(1).maxDamage(350) ,15.0F, "bow_trickbow");
+        BOW_LOVE_SPELL_BOW = new McdwBow(ToolMaterials.WOOD,
+                new Item.Settings().group(Mcdw.RANGED).maxCount(1).maxDamage(350), 8.0F, 2.0F, "bow_love_spell_bow");
+
+        BOW_TRICKBOW = new McdwBow(ToolMaterials.WOOD,
+                new Item.Settings().group(Mcdw.RANGED).maxCount(1).maxDamage(350) ,15.0F, 3.2F, "bow_trickbow");
         BOW_GREEN_MENACE = new McdwBow(ToolMaterials.WOOD,
-                new Item.Settings().group(Mcdw.RANGED).maxCount(1).maxDamage(350) ,15.0F, "bow_green_menace");
+                new Item.Settings().group(Mcdw.RANGED).maxCount(1).maxDamage(350) ,15.0F, 3.2F, "bow_green_menace");
         BOW_PINK_SCOUNDREL = new McdwBow(ToolMaterials.WOOD,
-                new Item.Settings().group(Mcdw.RANGED).maxCount(1).maxDamage(350) ,15.0F, "bow_pink_scoundrel");
+                new Item.Settings().group(Mcdw.RANGED).maxCount(1).maxDamage(350) ,15.0F, 3.2F, "bow_pink_scoundrel");
+
         BOW_POWER_BOW = new McdwBow(ToolMaterials.WOOD,
-                new Item.Settings().group(Mcdw.RANGED).maxCount(1).maxDamage(350) ,15.0F, "bow_power_bow");
+                new Item.Settings().group(Mcdw.RANGED).maxCount(1).maxDamage(350) ,20.0F, 6.4F, "bow_power_bow");
         BOW_ELITE_POWER_BOW = new McdwBow(ToolMaterials.WOOD,
-                new Item.Settings().group(Mcdw.RANGED).maxCount(1).maxDamage(350) ,15.0F, "bow_elite_power_bow");
-        BOW_HUNTING_BOW = new McdwBow(ToolMaterials.WOOD,
-                new Item.Settings().group(Mcdw.RANGED).maxCount(1).maxDamage(350) ,15.0F, "bow_hunting_bow");
+                new Item.Settings().group(Mcdw.RANGED).maxCount(1).maxDamage(350) ,20.0F, 6.4F, "bow_elite_power_bow");
         BOW_SABREWING = new McdwBow(ToolMaterials.WOOD,
-                new Item.Settings().group(Mcdw.RANGED).maxCount(1).maxDamage(350) ,15.0F, "bow_sabrewing");
+                new Item.Settings().group(Mcdw.RANGED).maxCount(1).maxDamage(350) ,15.0F, 3.2F, "bow_sabrewing");
+
+        BOW_HUNTING_BOW = new McdwBow(ToolMaterials.WOOD,
+                new Item.Settings().group(Mcdw.RANGED).maxCount(1).maxDamage(350) ,15.0F, 3.2F, "bow_hunting_bow");
         BOW_MASTERS_BOW = new McdwBow(ToolMaterials.WOOD,
-                new Item.Settings().group(Mcdw.RANGED).maxCount(1).maxDamage(350) ,15.0F, "bow_masters_bow");
+                new Item.Settings().group(Mcdw.RANGED).maxCount(1).maxDamage(350) ,15.0F, 3.2F, "bow_masters_bow");
         BOW_HUNTERS_PROMISE = new McdwBow(ToolMaterials.WOOD,
-                new Item.Settings().group(Mcdw.RANGED).maxCount(1).maxDamage(350) ,15.0F, "bow_hunters_promise");
+                new Item.Settings().group(Mcdw.RANGED).maxCount(1).maxDamage(350) ,15.0F, 3.2F, "bow_hunters_promise");
+        BOW_ANCIENT_BOW = new McdwBow(ToolMaterials.WOOD,
+                new Item.Settings().group(Mcdw.RANGED).maxCount(1).maxDamage(350) ,15.0F, 3.2F, "bow_ancient_bow");
+
         BOW_SOUL_BOW = new McdwBow(ToolMaterials.WOOD,
-                new Item.Settings().group(Mcdw.RANGED).maxCount(1).maxDamage(350) ,15.0F, "bow_soul_bow");
+                new Item.Settings().group(Mcdw.RANGED).maxCount(1).maxDamage(350) ,15.0F, 3.2F, "bow_soul_bow");
         BOW_NOCTURNAL_BOW = new McdwBow(ToolMaterials.WOOD,
-                new Item.Settings().group(Mcdw.RANGED).maxCount(1).maxDamage(350) ,15.0F, "bow_nocturnal_bow");
+                new Item.Settings().group(Mcdw.RANGED).maxCount(1).maxDamage(350) ,15.0F, 3.2F, "bow_nocturnal_bow");
         BOW_LOST_SOULS = new McdwBow(ToolMaterials.WOOD,
-                new Item.Settings().group(Mcdw.RANGED).maxCount(1).maxDamage(350) ,15.0F, "bow_lost_souls");
-*/
-        BOW_HAUNTED_BOW = new McdwBow(ToolMaterials.WOOD,
-                new Item.Settings().group(Mcdw.RANGED).maxCount(1).maxDamage(350) ,15.0F, 3.2F, "bow_haunted_bow");
+                new Item.Settings().group(Mcdw.RANGED).maxCount(1).maxDamage(350) ,15.0F, 3.2F, "bow_lost_souls");
+
+        /*BOW_WIND_BOW = new McdwBow(ToolMaterials.WOOD,
+                new Item.Settings().group(Mcdw.RANGED).maxCount(1).maxDamage(350) ,15.0F, 3.2F, "bow_wind_bow");
+        BOW_ECHO_OF_THE_VALLEY = new McdwBow(ToolMaterials.WOOD,
+                new Item.Settings().group(Mcdw.RANGED).maxCount(1).maxDamage(350) ,15.0F, 3.2F,
+                "bow_echo_of_the_valley");*/
+
+        /*BOW_SNOW_BOW = new McdwBow(ToolMaterials.WOOD,
+                new Item.Settings().group(Mcdw.RANGED).maxCount(1).maxDamage(350) ,15.0F, 3.2F, "bow_snow_bow");
+        BOW_WINTERS_TOUCH = new McdwBow(ToolMaterials.WOOD,
+                new Item.Settings().group(Mcdw.RANGED).maxCount(1).maxDamage(350) ,15.0F, 3.2F, "bow_winters_touch");*/
+
     }
 }
 

diff --git a/src/main/java/chronosacaria/mcdw/weapons/Claymores.java b/src/main/java/chronosacaria/mcdw/weapons/Claymores.java
@@ -8,10 +8,12 @@ public class Claymores {
     public static McdwSword SWORD_BROADSWORD;
     public static McdwSword SWORD_CLAYMORE;
     public static McdwSword SWORD_HEARTSTEALER;
+    public static McdwSword SWORD_GREAT_AXEBLADE;
 
     public static void init() {
-        SWORD_CLAYMORE = new McdwSword(ToolMaterials.IRON, 6, -2.4F, "sword_claymore");
-        SWORD_BROADSWORD = new McdwSword(ToolMaterials.IRON, 5, -1.4F, "sword_broadsword");
-        SWORD_HEARTSTEALER = new McdwSword(ToolMaterials.DIAMOND, 4, -1.8F, "sword_heartstealer");
+        SWORD_CLAYMORE = new McdwSword(ToolMaterials.IRON, 6, -3.0F, "sword_claymore");
+        SWORD_BROADSWORD = new McdwSword(ToolMaterials.IRON, 5, -3.0F, "sword_broadsword");
+        SWORD_HEARTSTEALER = new McdwSword(ToolMaterials.DIAMOND, 4, -3.0F, "sword_heartstealer");
+        SWORD_GREAT_AXEBLADE = new McdwSword(ToolMaterials.DIAMOND, 6, -3.0F, "sword_great_axeblade");
         }
 }
diff --git a/src/main/java/chronosacaria/mcdw/weapons/Daggers.java b/src/main/java/chronosacaria/mcdw/weapons/Daggers.java
@@ -1,18 +1,23 @@
 package chronosacaria.mcdw.weapons;
 
 import chronosacaria.mcdw.bases.McdwDagger;
-import chronosacaria.mcdw.bases.McdwSword;
 import net.minecraft.item.ToolMaterials;
 
 public class Daggers {
     public static McdwDagger DAGGER_DAGGER;
     public static McdwDagger DAGGER_FANGS_OF_FROST;
     public static McdwDagger DAGGER_MOON;
+    //public static McdwDagger DAGGER_CHILL_GALE_KNIFE;
+    //public static McdwDagger DAGGER_RESOLUTE_TEMPEST_KNIFE;
+    //public static McdwDagger DAGGER_SHEER_DAGGER;
 
     public static void init() {
         DAGGER_DAGGER = new McdwDagger(ToolMaterials.IRON, 2, -1.3F, "dagger_dagger");
         DAGGER_FANGS_OF_FROST = new McdwDagger(ToolMaterials.IRON, 3, -1.3F, "dagger_fangs_of_frost");
         DAGGER_MOON = new McdwDagger(ToolMaterials.IRON, 4, -1.3F, "dagger_moon");
+        //DAGGER_CHILL_GALE_KNIFE = new McdwDagger(ToolMaterials.IRON, 4, -1.3F, "dagger_chill_gale_knife");
+        //DAGGER_RESOLUTE_TEMPEST_KNIFE = new McdwDagger(ToolMaterials.IRON, 4, -1.3F, "dagger_resolute_tempest_knife");
+        //DAGGER_SHEER_DAGGER = new McdwDagger(ToolMaterials.IRON, 3, -1.3F, "dagger_sheer_dagger");
     }
 }
 

diff --git a/src/main/java/chronosacaria/mcdw/weapons/Swords.java b/src/main/java/chronosacaria/mcdw/weapons/Swords.java
@@ -7,7 +7,6 @@
 public class Swords {
     public static McdwSword SWORD_DIAMOND_SWORD;
     public static McdwSword SWORD_HAWKBRAND;
-    public static McdwSword SWORD_HEARTSTEALER;
     public static McdwSword SWORD_IRON_SWORD_VAR;
 
     public static void init() {

diff --git a/src/main/resources/assets/mcdw/lang/de_de.json b/src/main/resources/assets/mcdw/lang/de_de.json
@@ -33,12 +33,19 @@
   "item.mcdw.bow_nocturnal_bow": "Nachtbogen",
   "item.mcdw.bow_lost_souls": "Bogen der Verlorenen Seelen",
   "item.mcdw.bow_haunted_bow": "Spukbogen",
+  "item.mcdw.bow_love_spell_bow": "Bezaubernder Bogen",
+  "item.mcdw.bow_ancient_bow": "Antiker Bogen",
+  "item.mcdw.bow_snow_bow": "Schnee Bogen",
+  "item.mcdw.bow_winters_touch": "Berührung des Winters",
 
   "item.mcdw.dagger_dagger": "Dolch",
   "item.mcdw.dagger_fangs_of_frost": "Reißzähne des Frosts",
   "item.mcdw.dagger_moon": "Monddolch",
   "item.mcdw.dagger_soul_knife": "Seelenmesser",
   "item.mcdw.dagger_eternal_knife": "Ewiges Messer",
+  "item.mcdw.dagger_chill_gale_knife": "Kalte Böe",
+  "item.mcdw.dagger_resolute_tempest_knife": "Entschlossen Sturmdolch",
+  "item.mcdw.dagger_sheer_dagger": "Scherendolch",
 
   "item.mcdw.hammer_flail": "Dreschflegel",
   "item.mcdw.hammer_gravity": "Hammer der Schwerkraft",
@@ -76,11 +83,16 @@
   "item.mcdw.sword_broadsword": "Breitschwert",
   "item.mcdw.sword_claymore": "Claymore",
   "item.mcdw.sword_heartstealer": "Herzdieb",
+  "item.mcdw.sword_great_axeblade": "Axtklinge",
   "item.mcdw.sword_cutlass": "Entersäbel",
   "item.mcdw.sword_dancers_sword": "Tänzerschwert",
   "item.mcdw.sword_nameless_blade": "Namenlose Klinge",
   "item.mcdw.sword_katana": "Katana",
   "item.mcdw.sword_masters_katana": "Katana des Meisters",
   "item.mcdw.sword_dark_katana": "Dunkles Katana",
-  "item.mcdw.sword_truthseeker": "Wahrheitssucher"
+  "item.mcdw.sword_truthseeker": "Wahrheitssucher",
+  "item.mcdw.sword_sinister_sword": "Finsteres Schwert",
+
+  "item.mcdw.whip_whip": "Peitsche",
+  "item.mcdw.whip_vine_whip": "Rankenpeitsche"
 }
diff --git a/src/main/resources/assets/mcdw/lang/en_gb.json b/src/main/resources/assets/mcdw/lang/en_gb.json
@@ -31,14 +31,21 @@
   "item.mcdw.bow_hunters_promise": "Hunter's Promise",
   "item.mcdw.bow_soul_bow": "Soul Bow",
   "item.mcdw.bow_nocturnal_bow": "Nocturnal Bow",
-  "item.mcdw.bow_lost_souls": "The Bow of Lost Souls",
+  "item.mcdw.bow_lost_souls": "Bow of Lost Souls",
   "item.mcdw.bow_haunted_bow": "Haunted Bow",
+  "item.mcdw.bow_love_spell_bow": "Love Spell Bow",
+  "item.mcdw.bow_ancient_bow": "Ancient Bow",
+  "item.mcdw.bow_snow_bow": "Snow Bow",
+  "item.mcdw.bow_winters_touch": "Winter's Touch",
 
   "item.mcdw.dagger_dagger": "Dagger",
   "item.mcdw.dagger_fangs_of_frost": "Fangs of Frost",
   "item.mcdw.dagger_moon": "Moon Dagger",
   "item.mcdw.dagger_soul_knife": "Soul Knife",
   "item.mcdw.dagger_eternal_knife": "Eternal Knife",
+  "item.mcdw.dagger_chill_gale_knife": "Chill Gale Knife",
+  "item.mcdw.dagger_resolute_tempest_knife": "Resolute Tempest Knife",
+  "item.mcdw.dagger_sheer_dagger": "Sheer Dagger",
 
   "item.mcdw.hammer_flail": "Flail",
   "item.mcdw.hammer_gravity": "Hammer of Gravity",
@@ -76,11 +83,16 @@
   "item.mcdw.sword_broadsword": "Broadsword",
   "item.mcdw.sword_claymore": "Claymore",
   "item.mcdw.sword_heartstealer": "Heartstealer",
+  "item.mcdw.sword_great_axeblade": "Great Axeblade",
   "item.mcdw.sword_cutlass": "Cutlass",
   "item.mcdw.sword_dancers_sword": "Dancer's Sword",
   "item.mcdw.sword_nameless_blade": "Nameless Blade",
   "item.mcdw.sword_katana": "Katana",
   "item.mcdw.sword_masters_katana": "Master's Katana",
   "item.mcdw.sword_dark_katana": "Dark Katana",
-  "item.mcdw.sword_truthseeker": "Truthseeker"
+  "item.mcdw.sword_truthseeker": "Truthseeker",
+  "item.mcdw.sword_sinister_sword": "Sinister Sword",
+
+  "item.mcdw.whip_whip": "Whip",
+  "item.mcdw.whip_vine_whip": "Vine Whip"
 }
diff --git a/src/main/resources/assets/mcdw/lang/en_us.json b/src/main/resources/assets/mcdw/lang/en_us.json
@@ -31,14 +31,21 @@
   "item.mcdw.bow_hunters_promise": "Hunter's Promise",
   "item.mcdw.bow_soul_bow": "Soul Bow",
   "item.mcdw.bow_nocturnal_bow": "Nocturnal Bow",
-  "item.mcdw.bow_lost_souls": "The Bow of Lost Souls",
+  "item.mcdw.bow_lost_souls": "Bow of Lost Souls",
   "item.mcdw.bow_haunted_bow": "Haunted Bow",
+  "item.mcdw.bow_love_spell_bow": "Love Spell Bow",
+  "item.mcdw.bow_ancient_bow": "Ancient Bow",
+  "item.mcdw.bow_snow_bow": "Snow Bow",
+  "item.mcdw.bow_winters_touch": "Winter's Touch",
 
   "item.mcdw.dagger_dagger": "Dagger",
   "item.mcdw.dagger_fangs_of_frost": "Fangs of Frost",
   "item.mcdw.dagger_moon": "Moon Dagger",
   "item.mcdw.dagger_soul_knife": "Soul Knife",
   "item.mcdw.dagger_eternal_knife": "Eternal Knife",
+  "item.mcdw.dagger_chill_gale_knife": "Chill Gale Knife",
+  "item.mcdw.dagger_resolute_tempest_knife": "Resolute Tempest Knife",
+  "item.mcdw.dagger_sheer_dagger": "Sheer Dagger",
 
   "item.mcdw.hammer_flail": "Flail",
   "item.mcdw.hammer_gravity": "Hammer of Gravity",
@@ -69,18 +76,28 @@
 
   "item.mcdw.sword_iron_sword_var": "Sword",
   "item.mcdw.sword_diamond_sword_var": "Diamond Sword",
+  "item.mcdw.sword_hawkbrand": "Hawkbrand",
+
   "item.mcdw.sword_rapier": "Rapier",
   "item.mcdw.sword_beestinger": "Bee Stinger",
   "item.mcdw.sword_freezing_foil": "Freezing Foil",
-  "item.mcdw.sword_hawkbrand": "Hawkbrand",
-  "item.mcdw.sword_broadsword": "Broadsword",
+
+   "item.mcdw.sword_broadsword": "Broadsword",
   "item.mcdw.sword_claymore": "Claymore",
   "item.mcdw.sword_heartstealer": "Heartstealer",
+  "item.mcdw.sword_great_axeblade": "Great Axeblade",
+
   "item.mcdw.sword_cutlass": "Cutlass",
   "item.mcdw.sword_dancers_sword": "Dancer's Sword",
   "item.mcdw.sword_nameless_blade": "Nameless Blade",
+
   "item.mcdw.sword_katana": "Katana",
   "item.mcdw.sword_masters_katana": "Master's Katana",
   "item.mcdw.sword_dark_katana": "Dark Katana",
-  "item.mcdw.sword_truthseeker": "Truthseeker"
+
+  "item.mcdw.sword_truthseeker": "Truthseeker",
+  "item.mcdw.sword_sinister_sword": "Sinister Sword",
+
+  "item.mcdw.whip_whip": "Whip",
+  "item.mcdw.whip_vine_whip": "Vine Whip"
 }