Implement Staff enchantments and enchantment target.

Author: Provismet

build.gradle

@@ -47,6 +47,9 @@ dependencies {
 
 	// Fabric API. This is technically optional, but you probably want it anyway.
 	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
+
+	modImplementation "com.github.Chocohead:Fabric-ASM:${project.fabric_asm_version}"
+	include "com.github.Chocohead:Fabric-ASM:${project.fabric_asm_version}"
 
 	modImplementation "com.github.Provismet:combatplus-core:${project.combatplus_version}"
 }

gradle.properties

@@ -16,4 +16,5 @@ modid=additional-armoury
 
 #Fabric api
 fabric_version=0.91.0+1.20.1
-combatplus_version=0.2.0-mc1.20.1
+fabric_asm_version=v2.3
+combatplus_version=0.3.0-mc1.20.1

src/main/generated/assets/additional-armoury/lang/en_us.json

@@ -1,5 +1,8 @@
 {
   "enchantment.additional-armoury.boost": "Boosting",
+  "enchantment.additional-armoury.eruption": "Eruption",
+  "enchantment.additional-armoury.fireball": "Fireball",
+  "enchantment.additional-armoury.jump": "Soaring",
   "item.additional-armoury.diamond_dagger": "Diamond Dagger",
   "item.additional-armoury.diamond_dagger.effect.awkward": "Diamond Dagger",
   "item.additional-armoury.diamond_dagger.effect.fire_resistance": "Fire Resistance-Tipped Diamond Dagger",

src/main/java/com/provismet/AdditionalArmoury/AdditionalArmouryClient.java

@@ -1,5 +1,6 @@
 package com.provismet.AdditionalArmoury;
 
+import com.provismet.AdditionalArmoury.registries.AAParticleFactories;
 import com.provismet.AdditionalArmoury.registries.ColourRegistry;
 
 import net.fabricmc.api.ClientModInitializer;
@@ -8,5 +9,6 @@ public class AdditionalArmouryClient implements ClientModInitializer {
     @Override
     public void onInitializeClient () {
         ColourRegistry.register();
+        AAParticleFactories.register();
     }
 }

src/main/java/com/provismet/AdditionalArmoury/AdditionalArmouryMain.java

@@ -6,6 +6,7 @@
 import com.provismet.AdditionalArmoury.registries.AAEnchantments;
 import com.provismet.AdditionalArmoury.registries.AAItemGroups;
 import com.provismet.AdditionalArmoury.registries.AAItems;
+import com.provismet.AdditionalArmoury.registries.AAParticleTypes;
 import com.provismet.AdditionalArmoury.registries.AARecipeSerializers;
 
 import net.fabricmc.api.ModInitializer;
@@ -25,5 +26,6 @@ public void onInitialize () {
         AAEnchantments.register();
         AAItemGroups.register();
         AARecipeSerializers.register();
+        AAParticleTypes.register();
     }
 }

src/main/java/com/provismet/AdditionalArmoury/asm/EarlyRiser.java

@@ -0,0 +1,18 @@
+package com.provismet.AdditionalArmoury.asm;
+
+import com.chocohead.mm.api.ClassTinkerers;
+
+import net.fabricmc.loader.api.FabricLoader;
+import net.fabricmc.loader.api.MappingResolver;
+
+public class EarlyRiser implements Runnable {
+    @Override
+    public void run () {
+        MappingResolver remapper = FabricLoader.getInstance().getMappingResolver();
+        String enchantmentTarget = remapper.mapClassName("intermediary", "net.minecraft.class_1886");
+        ClassTinkerers.enumBuilder(enchantmentTarget)
+            .addEnumSubclass("ADDITIONALARMOURY$STAFF", "com.provismet.AdditionalArmoury.asm.StaffEnchantmentTarget")
+            .build();
+    }
+    
+}

src/main/java/com/provismet/AdditionalArmoury/asm/StaffEnchantmentTarget.java

@@ -0,0 +1,22 @@
+package com.provismet.AdditionalArmoury.asm;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+
+import com.provismet.AdditionalArmoury.items.StaffItem;
+
+import net.minecraft.enchantment.EnchantmentTarget;
+import net.minecraft.item.Item;
+
+public class StaffEnchantmentTarget extends StaffEnchantmentTargetMixin {
+    @Override
+    public boolean isAcceptableItem (Item item) {
+        return item instanceof StaffItem;
+    }
+}
+
+@Mixin(EnchantmentTarget.class)
+abstract class StaffEnchantmentTargetMixin {
+    @Shadow
+    abstract boolean isAcceptableItem (Item item);
+}

src/main/java/com/provismet/AdditionalArmoury/enchantments/staff/BoostEnchantment.java

@@ -10,11 +10,11 @@ public BoostEnchantment () {
     }
 
     @Override
-    public void castSpell (ItemStack stack, LivingEntity user) {
+    public boolean castSpell (ItemStack stack, LivingEntity user) {
         double dx = -MathHelper.sin(user.getHeadYaw() / MathHelper.DEGREES_PER_RADIAN);
         double dz = MathHelper.cos(user.getHeadYaw() / MathHelper.DEGREES_PER_RADIAN);
 
-        user.addVelocity(dx, 0.25, dz);
+        user.addVelocity(dx, 0.35, dz);
+        return true;
     }
-    
 }

src/main/java/com/provismet/AdditionalArmoury/enchantments/staff/EruptionEnchantment.java

@@ -0,0 +1,25 @@
+package com.provismet.AdditionalArmoury.enchantments.staff;
+
+import java.util.List;
+
+import com.provismet.AdditionalArmoury.AdditionalArmouryMain;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.LivingEntity;
+import net.minecraft.item.ItemStack;
+
+public class EruptionEnchantment extends StaffEnchantment {
+    public EruptionEnchantment () {
+        super(Rarity.UNCOMMON, 0x8E6345, 64, 40);
+    }
+
+    @Override
+    public boolean castSpell (ItemStack stack, LivingEntity user) {
+        List<Entity> others = user.getWorld().getOtherEntities(user, user.getBoundingBox().expand(5, 0, 5));
+        for (Entity otherEntity : others) {
+            if (otherEntity instanceof LivingEntity) otherEntity.addVelocity(0, 1, 0);
+            AdditionalArmouryMain.LOGGER.info("Found other entity.");
+        }
+        return true;
+    }
+}

src/main/java/com/provismet/AdditionalArmoury/enchantments/staff/FireballEnchantment.java

@@ -0,0 +1,28 @@
+package com.provismet.AdditionalArmoury.enchantments.staff;
+
+import net.minecraft.entity.LivingEntity;
+import net.minecraft.entity.projectile.SmallFireballEntity;
+import net.minecraft.item.ItemStack;
+import net.minecraft.server.world.ServerWorld;
+import net.minecraft.util.math.MathHelper;
+
+public class FireballEnchantment extends StaffEnchantment {
+    public FireballEnchantment () {
+        super(Rarity.COMMON, 0xB71F26, 64, 30);
+    }
+
+    @Override
+    public boolean castSpell (ItemStack stack, LivingEntity user) {
+        if (user.getWorld() instanceof ServerWorld serverWorld) {
+            double dx = -MathHelper.sin(user.getHeadYaw() / MathHelper.DEGREES_PER_RADIAN);
+            double dy = -MathHelper.sin(user.getPitch() / MathHelper.DEGREES_PER_RADIAN);
+            double dz = MathHelper.cos(user.getHeadYaw() / MathHelper.DEGREES_PER_RADIAN);
+
+            SmallFireballEntity fireball = new SmallFireballEntity(serverWorld, user, dx, dy, dz);
+            fireball.setPosition(fireball.getX(), user.getEyeY(), fireball.getZ());
+            serverWorld.spawnEntity(fireball);
+        }
+        return true;
+    }
+    
+}

src/main/java/com/provismet/AdditionalArmoury/enchantments/staff/JumpEnchantment.java

@@ -0,0 +1,23 @@
+package com.provismet.AdditionalArmoury.enchantments.staff;
+
+import net.minecraft.entity.LivingEntity;
+import net.minecraft.entity.effect.StatusEffectInstance;
+import net.minecraft.entity.effect.StatusEffects;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.math.Vec3d;
+
+public class JumpEnchantment extends StaffEnchantment {
+    public JumpEnchantment () {
+        super(Rarity.COMMON, 0x87868C, 64, 30);
+    }
+
+    @Override
+    public boolean castSpell (ItemStack stack, LivingEntity user) {
+        user.addStatusEffect(new StatusEffectInstance(StatusEffects.SLOW_FALLING, 40));
+        
+        Vec3d velocity = user.getVelocity();
+        user.setVelocity(velocity.x, 1, velocity.z);
+        return true;
+    }
+    
+}

src/main/java/com/provismet/AdditionalArmoury/enchantments/staff/PushBackEnchantment.java

@@ -1,11 +1,8 @@
 package com.provismet.AdditionalArmoury.enchantments.staff;
 
-import com.provismet.AdditionalArmoury.items.StaffItem;
+import com.provismet.AdditionalArmoury.registries.AAEnchantmentTargets;
 
 import net.minecraft.enchantment.Enchantment;
-import net.minecraft.enchantment.EnchantmentTarget;
-import net.minecraft.enchantment.MendingEnchantment;
-import net.minecraft.enchantment.UnbreakingEnchantment;
 import net.minecraft.entity.EquipmentSlot;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.item.ItemStack;
@@ -16,24 +13,26 @@ public abstract class StaffEnchantment extends Enchantment {
     public final int chargeTime;
 
     protected StaffEnchantment (Rarity weight, int colour, int maxUses, int chargeTime) {
-        super(weight, EnchantmentTarget.WEAPON, new EquipmentSlot[] {EquipmentSlot.MAINHAND});
+        super(weight, AAEnchantmentTargets.STAFF, new EquipmentSlot[] {EquipmentSlot.MAINHAND});
         this.colour = colour;
         this.maxUses = maxUses;
         this.chargeTime = chargeTime;
     }
 
     @Override
-    protected boolean canAccept (Enchantment other) {
-        return super.canAccept(other) &&
-            !(other instanceof MendingEnchantment) &&
-            !(other instanceof UnbreakingEnchantment) &&
-            !(other instanceof StaffEnchantment);
+    public int getMinPower (int level) {
+        return 1;
+    }
+
+    @Override
+    public int getMaxPower (int level) {
+        return 50;
     }
-    
+
     @Override
-    public boolean isAcceptableItem (ItemStack stack) {
-        return stack.getItem() instanceof StaffItem;
+    protected boolean canAccept (Enchantment other) {
+        return super.canAccept(other) && !(other instanceof StaffEnchantment);
     }
 
-    public abstract void castSpell (ItemStack stack, LivingEntity user);
+    public abstract boolean castSpell (ItemStack stack, LivingEntity user);
 }

src/main/java/com/provismet/AdditionalArmoury/enchantments/staff/StaffEnchantment.java

@@ -7,6 +7,7 @@
 import org.jetbrains.annotations.Nullable;
 
 import com.provismet.AdditionalArmoury.enchantments.staff.StaffEnchantment;
+import com.provismet.AdditionalArmoury.particles.effects.SpellChargeParticleEffect;
 
 import net.minecraft.enchantment.Enchantment;
 import net.minecraft.enchantment.EnchantmentHelper;
@@ -20,6 +21,7 @@
 import net.minecraft.util.TypedActionResult;
 import net.minecraft.util.UseAction;
 import net.minecraft.util.math.ColorHelper;
+import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;
 
 public class StaffItem extends Item implements Vanishable {
@@ -79,6 +81,16 @@ public TypedActionResult<ItemStack> use (World world, PlayerEntity user, Hand ha
         }
     }
 
+    @Override
+    public void usageTick (World world, LivingEntity user, ItemStack stack, int remainingUseTicks) {
+        if (world.isClient()) {
+            StaffEnchantment enchantment = StaffItem.getFirstStaffEnchantment(stack);
+
+            if (enchantment != null)
+                world.addParticle(new SpellChargeParticleEffect(Vec3d.unpackRgb(enchantment.colour).toVector3f(), 0.1f), user.getX(), user.getY(), user.getZ(), 0, 0, 0);
+        }
+    }
+
     @Override
     public UseAction getUseAction (ItemStack stack) {
         if (StaffItem.getFirstStaffEnchantment(stack) == null) return super.getUseAction(stack);
@@ -102,6 +114,11 @@ public int getEnchantability () {
         return 1;
     }
 
+    @Override
+    public boolean isEnchantable (ItemStack stack) {
+        return true;
+    }
+
     @Override
     public boolean isItemBarVisible (ItemStack stack) {
         return this.getMaxUseCount(stack) > 0;
@@ -127,23 +144,25 @@ public int getItemBarColor (ItemStack stack) {
         else progress = uses / maxUses;
 
         return ColorHelper.Argb.lerp(progress, 0xFF3251FF, 0xFFB2BDFF);
-        //return MathHelper.hsvToRgb(0.9059f, MathHelper.lerp(progress, 0.8f, 0.3f), 1f);
     }
 
     @Override
     public ItemStack finishUsing (ItemStack stack, World world, LivingEntity user) {
         List<StaffEnchantment> enchantments = StaffItem.getStaffEnchantments(stack);
+        boolean wasUsed = false;
 
         if (enchantments.size() > 0) {
-            enchantments.forEach(enchant -> {
-                enchant.castSpell(stack, user);
-            });
-
-            this.setMaxUseCount(stack, enchantments.get(0).maxUses);
-            this.incrementUseCount(stack);
+            for (StaffEnchantment enchant : enchantments) {
+                if (enchant.castSpell(stack, user)) wasUsed = true;
+            }
+
+            if (wasUsed && user instanceof PlayerEntity player && !player.isCreative()) {
+                this.setMaxUseCount(stack, enchantments.get(0).maxUses);
+                this.incrementUseCount(stack);
+            }
         }
 
-        if (user instanceof PlayerEntity player) {
+        if (wasUsed && user instanceof PlayerEntity player) {
             player.getItemCooldownManager().set(this, 10);
         }
         return stack;