Add Valkyrie Magister Staff

CHANGELOG.md

@@ -1,3 +1,8 @@
+# 2.2.0
+
+- Add new weapons, obtainable only as loot from Aether dungeons
+  - Valkyrie Magister Staff
+
 # 2.1.1
 
 - Udpdate Russian translation, thanks to @Heimdallr

gradle.properties

@@ -12,7 +12,7 @@ fabric_api_version=0.102.0+1.21.1
 # Mod
 maven_group=net
 archives_base_name=wizards
-mod_version=2.1.1
+mod_version=2.2.0
 minecraft_compat_version=1.21
 
 # Dependencies

src/main/java/net/wizards/item/Weapons.java

@@ -47,6 +47,7 @@ private static Supplier<Ingredient> ingredient(String idString, boolean requirem
         }
     }
 
+    private static final String AETHER = "aether";
     private static final String BETTER_END = "betterend";
     private static final String BETTER_NETHER = "betternether";
 
@@ -138,6 +139,15 @@ public static void register(Map<String, ItemConfig.Weapon> configs) {
                     Weapon.CustomMaterial.matching(ToolMaterials.NETHERITE, repair))
                     .attribute(ItemConfig.Attribute.bonus(SpellSchools.FROST.id, 7));
         }
+        if (WizardsMod.tweaksConfig.value.ignore_items_required_mods || FabricLoader.getInstance().isModLoaded(AETHER)) {
+            var repair = ingredient("aether:ambrosium_shard", FabricLoader.getInstance().isModLoaded(AETHER), Items.NETHERITE_INGOT);
+            staff("aether_wizard_staff",
+                    Weapon.CustomMaterial.matching(ToolMaterials.NETHERITE, repair))
+                    .attribute(ItemConfig.Attribute.bonus(SpellSchools.ARCANE.id, 7))
+                    .attribute(ItemConfig.Attribute.bonus(SpellSchools.FIRE.id, 7))
+                    .attribute(ItemConfig.Attribute.bonus(SpellSchools.FROST.id, 7));
+        }
+
 
         Weapon.register(configs, entries, Group.KEY);
     }

src/main/resources/assets/wizards/lang/en_us.json

@@ -22,6 +22,7 @@
   "item.wizards.staff_crystal_arcane": "Crystal Arcane Staff",
   "item.wizards.staff_ruby_fire": "Ruby Fire Staff",
   "item.wizards.staff_smaragdant_frost": "Smaragdant Frost Staff",
+  "item.wizards.aether_wizard_staff": "Valkyrie Magister Staff",
   "item.wizards.wizard_robe_head": "Wizard Hat",
   "item.wizards.wizard_robe_chest": "Wizard Robe Top",
   "item.wizards.wizard_robe_legs": "Wizard Robe Bottom",

src/main/resources/assets/wizards/models/item/aether_wizard_staff.json

@@ -0,0 +1,6 @@
+{
+  "parent": "wizards:item/medium_staff",
+  "textures": {
+    "layer0": "wizards:item/aether_wizard_staff"
+  }
+}

src/main/resources/data/rpg_series/tags/item/tier_4_aether_weapons.json

@@ -0,0 +1,9 @@
+{
+  "replace": false,
+  "values": [
+    {
+      "id": "wizards:aether_wizard_staff",
+      "required": false
+    }
+  ]
+}

src/main/resources/data/wizards/spell_assignments/aether_wizard_staff.json

@@ -0,0 +1,4 @@
+{
+  "is_proxy": true,
+  "spell_ids": [ "wizards:arcane_bolt" ]
+}

src/main/resources/data/wizards/tags/item/staves.json

@@ -18,6 +18,10 @@
     {
       "id": "wizards:staff_smaragdant_frost",
       "required": false
+    },
+    {
+      "id": "wizards:aether_wizard_staff",
+      "required": false
     }
   ]
 }

src/main/resources/data/wizards/weapon_attributes/aether_wizard_staff.json

@@ -0,0 +1,3 @@
+{
+  "parent": "bettercombat:staff"
+}