add example skill tag

ManasMods · Jan 31, 2024 · ae123cb · ae123cb
1 parent ed3d330
commit ae123cb
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/commonTest/src/main/java/com/github/manasmods/testmod/registry/RegisterTest.java b/commonTest/src/main/java/com/github/manasmods/testmod/registry/RegisterTest.java
@@ -10,8 +10,6 @@
 import dev.architectury.registry.registries.Registrar;
 import dev.architectury.registry.registries.RegistrySupplier;
 import net.minecraft.core.BlockPos;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.tags.TagKey;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.ai.attributes.RangedAttribute;
 import net.minecraft.world.entity.npc.Villager;
@@ -54,8 +52,6 @@ public class RegisterTest {
             .end();
     private static final RegistrySupplier<TestSkill> TEST_SKILL = REGISTER.skill("test_skill", TestSkill::new).end();
 
-    static final TagKey<ManasSkill> TEST_SKILL_TAG = TagKey.create(SkillAPI.getSkillRegistryKey(), new ResourceLocation(ManasCore.MOD_ID, "test_skill"));
-
     public static void init() {
         ManasCore.Logger.info("Registered test content!");
 

diff --git a/commonTest/src/main/java/com/github/manasmods/testmod/registry/TestSkill.java b/commonTest/src/main/java/com/github/manasmods/testmod/registry/TestSkill.java
@@ -21,6 +21,8 @@
 import net.minecraft.world.entity.projectile.ThrownTrident;
 import net.minecraft.world.phys.EntityHitResult;
 
+import static com.github.manasmods.testmod.registry.TestTags.TEST_SKILL_TAG;
+
 public class TestSkill extends ManasSkill {
     public TestSkill() {
         super(SkillRarity.Unique);
@@ -105,9 +107,9 @@ public boolean onTouchEntity(ManasSkillInstance instance, LivingEntity owner, Li
     }
 
     public boolean onTakenDamage(ManasSkillInstance instance, LivingEntity owner, DamageSource source, Changeable<Float> amount) {
-        if (instance.is(RegisterTest.TEST_SKILL_TAG)) {
+        if (instance.is(TEST_SKILL_TAG)) {
             owner.heal(amount.get());
-            ManasCore.Logger.info("Healed {} by {} health", owner.getName(), amount.get());
+            ManasCore.Logger.info("Healed {} by {} health", owner.getName().getString(), amount.get());
         }
         return true;
     }

diff --git a/commonTest/src/main/java/com/github/manasmods/testmod/registry/TestTags.java b/commonTest/src/main/java/com/github/manasmods/testmod/registry/TestTags.java
@@ -0,0 +1,11 @@
+package com.github.manasmods.testmod.registry;
+
+import com.github.manasmods.manascore.ManasCore;
+import com.github.manasmods.manascore.api.skill.ManasSkill;
+import com.github.manasmods.manascore.api.skill.SkillAPI;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.tags.TagKey;
+
+public class TestTags {
+    public static final TagKey<ManasSkill> TEST_SKILL_TAG = TagKey.create(SkillAPI.getSkillRegistryKey(), new ResourceLocation(ManasCore.MOD_ID, "test_skill"));
+}
diff --git a/...ata/manascore/tags/skills/test_skill.json → ...ore/tags/manascore/skills/test_skill.json b/...ata/manascore/tags/skills/test_skill.json → ...ore/tags/manascore/skills/test_skill.json