Merge branch 'FordFriedel-main' into develop (#147)

README.md

@@ -88,6 +88,7 @@ If you don't want a certain feature, simply disable it.
 - [x] *Leafchopper*: Remove leaves instantly with your axe. Leaves will drop items as if they decayed naturally.
 - [x] *Angel*: A legendary enchantment to accelerate your elytra while pressing shift! Gives a more natural feeling than using rockets. Elytra go brrrr! (Replaces *Wings*)
 - [x] *Unbreakable*: Well... A legendary enchantment for truly unbreakable items. Extremely expensive. (Replaces *Unbreaking* and *Mending*)
+- [x] *Lightning*: Strike lightning on your targets during a storm with this enchantment for swords.
 
 #### Portals (vane-portals)
 

vane-enchantments/src/main/java/org/oddlama/vane/enchantments/Enchantments.java

@@ -12,6 +12,7 @@ public Enchantments() {
 		new org.oddlama.vane.enchantments.enchantments.GrapplingHook(this);
 		new org.oddlama.vane.enchantments.enchantments.HellBent(this);
 		new org.oddlama.vane.enchantments.enchantments.Leafchopper(this);
+		new org.oddlama.vane.enchantments.enchantments.Lightning(this);
 		new org.oddlama.vane.enchantments.enchantments.Rake(this);
 		new org.oddlama.vane.enchantments.enchantments.Seeding(this);
 		new org.oddlama.vane.enchantments.enchantments.Soulbound(this);

vane-enchantments/src/main/java/org/oddlama/vane/enchantments/enchantments/Lightning.java

@@ -0,0 +1,116 @@
+package org.oddlama.vane.enchantments.enchantments;
+
+import org.bukkit.Material;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.entity.EntityDamageByEntityEvent;
+import org.bukkit.event.entity.EntityDamageEvent;
+import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.enchantments.EnchantmentTarget;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+import org.oddlama.vane.annotation.config.ConfigBoolean;
+import org.oddlama.vane.annotation.config.ConfigInt;
+import org.oddlama.vane.annotation.enchantment.Rarity;
+import org.oddlama.vane.annotation.enchantment.VaneEnchantment;
+import org.oddlama.vane.core.config.recipes.RecipeList;
+import org.oddlama.vane.core.config.recipes.ShapedRecipeDefinition;
+import org.oddlama.vane.core.module.Context;
+import org.oddlama.vane.core.enchantments.CustomEnchantment;
+import org.oddlama.vane.enchantments.Enchantments;
+
+import com.destroystokyo.paper.MaterialTags;
+
+@VaneEnchantment(
+    name = "lightning", 
+    max_level = 1, 
+    rarity = Rarity.RARE, 
+    treasure = true, 
+    target = EnchantmentTarget.WEAPON
+)
+public class Lightning extends CustomEnchantment<Enchantments> {
+
+    public Lightning(Context<Enchantments> context) {
+        super(context, false);
+    }
+
+    @ConfigBoolean(
+        def = true,
+        desc = "Toggle lightning enchantment to cancel lightning damage for wielders of the enchant"
+    )
+    private boolean config_lightning_protection;
+
+    @ConfigInt(
+        def = 4,
+        min = 0,
+        max = 20,
+        desc = "Damage modifier for the lightning enchant"
+    )
+    private int config_lightning_damage;
+
+    @Override
+    public RecipeList default_recipes() {
+        return RecipeList.of(new ShapedRecipeDefinition("generic")
+        .shape("r r","utu"," b ")
+        .set_ingredient('r', Material.LIGHTNING_ROD)
+        .set_ingredient('t', "vane_enchantments:ancient_tome_of_knowledge")
+        .set_ingredient('b', Material.BEACON)
+        .set_ingredient('u', Material.TOTEM_OF_UNDYING)
+        .result(on("vane_enchantments:enchanted_ancient_tome_of_knowledge")));
+    }
+
+    @Override
+    public boolean can_enchant(@NotNull ItemStack item_stack) {
+        return MaterialTags.SWORDS.isTagged(item_stack);
+    }
+
+    @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
+    public void on_lightning_attack(final EntityDamageEvent event) {
+
+        // Check if entity is a player
+        if(!(event.getEntity() instanceof Player)) return;
+
+        // Check to see if they were struck by lightning
+        if(!(event.getCause() == DamageCause.LIGHTNING)) return;
+
+        // Check to see if lightning protection is off
+        if(!config_lightning_protection) return;
+
+        Player player = (Player) event.getEntity();
+        final var item = player.getEquipment().getItemInMainHand();
+        final var level = item.getEnchantmentLevel(this.bukkit());
+
+        // If they are not holding a lightning sword, they still take the damage
+        if(level == 0) return;
+
+        // Cancel the damage to the event
+        event.setCancelled(true);
+    }
+
+    @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
+    public void on_sword_attack(final EntityDamageByEntityEvent event) {
+
+        // Only strike when entity is a player
+        if(!(event.getDamager() instanceof Player)) return;
+
+        Player damager = (Player) event.getDamager();
+        final var damagee = event.getEntity();
+        final var world = damager.getWorld();
+        final var item = damager.getEquipment().getItemInMainHand();
+        final var level = item.getEnchantmentLevel(this.bukkit());
+
+        // Get enchantment level
+        if (level == 0) return;
+
+        // Get Storm status
+        if(!world.hasStorm()) return;
+
+        // Test if sky is visible
+        if(damagee.getLocation().getBlockY() < world.getHighestBlockYAt(damagee.getLocation())) return;
+
+        // Execute
+        event.setDamage(event.getDamage() + config_lightning_damage);
+        world.strikeLightning(damagee.getLocation()); 
+    }    
+}

vane-enchantments/src/main/resources/lang-de.yml

@@ -54,6 +54,10 @@ enchantment_hell_bent:
 enchantment_leafchopper:
   name: "Blattschneider"
 
+# FIXME: translation missing
+enchantment_lightning:
+  name: "Blitzschlag"
+
 enchantment_rake:
   name: "Harke"
 

vane-enchantments/src/main/resources/lang-en.yml

@@ -58,6 +58,10 @@ enchantment_leafchopper:
   # The display name of this enchantment. Will be packed into a resource pack.
   name: "Leafchopper"
 
+enchantment_lightning:
+  # The display name of this enchantment. Will be packed into a resource pack.
+  name: "Lightning"
+
 enchantment_rake:
   # The display name of this enchantment. Will be packed into a resource pack.
   name: "Rake"

vane-enchantments/src/main/resources/lang-fr-fr.yml

@@ -48,6 +48,10 @@ enchantment_hell_bent:
 enchantment_leafchopper:
   name: "Taille-feuille"
 
+# FIXME: translation missing
+enchantment_lightning:
+  name: "Lightning"
+
 enchantment_rake:
   name: "Rateau"
 

vane-enchantments/src/main/resources/lang-ru.yml

@@ -58,6 +58,11 @@ enchantment_leafchopper:
   # The display name of this enchantment. Will be packed into a resource pack.
   name: "Листорез"
 
+# FIXME: translation missing
+enchantment_lightning:
+  # The display name of this enchantment. Will be packed into a resource pack.  
+  name: "Lightning"
+
 enchantment_rake:
   # The display name of this enchantment. Will be packed into a resource pack.
   name: "Грабли"