GH-994 Add lightning command (#1076)

* Add lightning command, move Catboy feature to troll package

* Change @context annotation to @sender, remove misleading shortcut, move catboy to separate package, change interface name

* Add executor to LightningCommand for target player

* Make LightningCommand package-private

* Review.

---------

Co-authored-by: vLuckyyy <[email protected]>

Author: Jakubk15

eternalcore-core/src/main/java/com/eternalcode/core/configuration/implementation/PluginConfiguration.java

@@ -5,10 +5,11 @@
 import com.eternalcode.core.database.DatabaseType;
 import com.eternalcode.core.feature.afk.AfkSettings;
 import com.eternalcode.core.feature.automessage.AutoMessageSettings;
-import com.eternalcode.core.feature.catboy.CatBoySettings;
+import com.eternalcode.core.feature.catboy.CatboyConfig;
 import com.eternalcode.core.feature.chat.ChatSettings;
 import com.eternalcode.core.feature.helpop.HelpOpSettings;
 import com.eternalcode.core.feature.jail.JailSettings;
+import com.eternalcode.core.feature.lightning.LightningConfig;
 import com.eternalcode.core.feature.randomteleport.RandomTeleportSettingsImpl;
 import com.eternalcode.core.feature.serverlinks.ServerLinksConfig;
 import com.eternalcode.core.feature.spawn.SpawnSettings;
@@ -391,21 +392,12 @@ public Set<String> allowedCommands() {
     }
 
     @Bean
-    @Comment({ " ", "# 4fun Section" })
-    FunSection fun = new FunSection();
+    @Comment({ " ", "# Settings for catboy feature" })
+    public CatboyConfig catboy = new CatboyConfig();
 
-    public static class FunSection extends OkaeriConfig implements CatBoySettings {
-        @Comment({
-            "# Speed of player walk speed while using /catboy feature",
-            "# Default minecraft walk speed is 0.2"
-        })
-        public float catboyWalkSpeed = 0.4F;
-
-        @Override
-        public float getCatboyWalkSpeed() {
-            return this.catboyWalkSpeed;
-        }
-    }
+    @Bean
+    @Comment({ " ", "# Settings for lightning strike" })
+    public LightningConfig lightning = new LightningConfig();
 
     @Bean
     @Comment({ " ", "# ServerLinks Section" })

eternalcore-core/src/main/java/com/eternalcode/core/feature/catboy/CatBoySettings.java

@@ -0,0 +1,16 @@
+package com.eternalcode.core.feature.catboy;
+
+import eu.okaeri.configs.OkaeriConfig;
+import eu.okaeri.configs.annotation.Comment;
+import lombok.Getter;
+import lombok.experimental.Accessors;
+
+@Getter
+@Accessors(fluent = true)
+public class CatboyConfig extends OkaeriConfig implements CatboySettings {
+    @Comment({
+        "# Speed of player walk speed while using /catboy feature",
+        "# Default minecraft walk speed is 0.2"
+    })
+    public float catboyWalkSpeed = 0.4F;
+}

eternalcore-core/src/main/java/com/eternalcode/core/feature/catboy/CatboyConfig.java

@@ -7,8 +7,6 @@
 import com.eternalcode.core.injector.annotations.component.Controller;
 import com.eternalcode.core.publish.Subscribe;
 import com.eternalcode.core.publish.event.EternalShutdownEvent;
-import java.time.Duration;
-import java.util.Optional;
 import org.bukkit.Server;
 import org.bukkit.Sound;
 import org.bukkit.World;
@@ -21,6 +19,9 @@
 import org.bukkit.event.entity.EntityDismountEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 
+import java.time.Duration;
+import java.util.Optional;
+
 @Controller
 class CatboyController implements Listener {
 

eternalcore-core/src/main/java/com/eternalcode/core/feature/catboy/CatboyController.java

@@ -6,14 +6,15 @@
 import com.eternalcode.core.feature.catboy.event.CatboySwitchEvent;
 import com.eternalcode.core.injector.annotations.Inject;
 import com.eternalcode.core.injector.annotations.component.Service;
+import org.bukkit.entity.Cat;
+import org.bukkit.entity.Player;
+
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
 import java.util.UUID;
-import org.bukkit.entity.Cat;
-import org.bukkit.entity.Player;
 
 @Service
 class CatboyServiceImpl implements CatboyService {
@@ -23,19 +24,19 @@ class CatboyServiceImpl implements CatboyService {
     private final EventCaller eventCaller;
 
     private final CatBoyEntityService catBoyEntityService;
-    private final CatBoySettings catBoySettings;
+    private final CatboySettings catboySettings;
     private final MinecraftScheduler scheduler;
 
     @Inject
     CatboyServiceImpl(
         EventCaller eventCaller,
         CatBoyEntityService catBoyEntityService,
-        CatBoySettings catBoySettings,
+        CatboySettings catboySettings,
         MinecraftScheduler scheduler
     ) {
         this.eventCaller = eventCaller;
         this.catBoyEntityService = catBoyEntityService;
-        this.catBoySettings = catBoySettings;
+        this.catboySettings = catboySettings;
         this.scheduler = scheduler;
     }
 
@@ -46,7 +47,7 @@ public void markAsCatboy(Player player, Cat.Type type) {
 
         Cat cat = this.catBoyEntityService.createCatboyEntity(player, type);
         player.addPassenger(cat);
-        player.setWalkSpeed(this.catBoySettings.getCatboyWalkSpeed());
+        player.setWalkSpeed(this.catboySettings.catboyWalkSpeed());
         this.eventCaller.callEvent(new CatboySwitchEvent(player, true));
     }
 

eternalcore-core/src/main/java/com/eternalcode/core/feature/catboy/CatboyServiceImpl.java

@@ -0,0 +1,6 @@
+package com.eternalcode.core.feature.catboy;
+
+public interface CatboySettings {
+
+    float catboyWalkSpeed();
+}

eternalcore-core/src/main/java/com/eternalcode/core/feature/catboy/CatboySettings.java

@@ -0,0 +1,40 @@
+package com.eternalcode.core.feature.lightning;
+
+import com.eternalcode.core.injector.annotations.Inject;
+import dev.rollczi.litecommands.annotations.argument.Arg;
+import dev.rollczi.litecommands.annotations.command.Command;
+import dev.rollczi.litecommands.annotations.context.Sender;
+import dev.rollczi.litecommands.annotations.execute.Execute;
+import dev.rollczi.litecommands.annotations.permission.Permission;
+import org.bukkit.block.Block;
+import org.bukkit.entity.Player;
+
+@Command(name = "lightning", aliases = { "strike" })
+@Permission("eternalcore.lightning")
+class LightningCommand {
+
+    private final LightningSettings settings;
+
+    @Inject
+    public LightningCommand(LightningSettings settings) {
+        this.settings = settings;
+    }
+
+    @Execute
+    void execute(@Sender Player player) {
+        Block block = player.getTargetBlockExact(this.settings.maxLightningBlockDistance());
+        if (block == null) {
+            if (this.settings.lightningStrikePlayerIfNoBlock()) {
+                player.getWorld().strikeLightning(player.getLocation());
+                return;
+            }
+            return;
+        }
+        block.getWorld().strikeLightning(block.getLocation());
+    }
+
+    @Execute
+    void player(@Sender Player sender, @Arg Player target) {
+        target.getWorld().strikeLightning(sender.getLocation());
+    }
+}

eternalcore-core/src/main/java/com/eternalcode/core/feature/lightning/LightningCommand.java

@@ -0,0 +1,17 @@
+package com.eternalcode.core.feature.lightning;
+
+import eu.okaeri.configs.OkaeriConfig;
+import eu.okaeri.configs.annotation.Comment;
+import lombok.Getter;
+import lombok.experimental.Accessors;
+
+@Getter
+@Accessors(fluent = true)
+public class LightningConfig extends OkaeriConfig implements LightningSettings {
+    @Comment({" ", "# Maximum distance for the lightning strike block when using /lightning."})
+    @Comment("# If you will look at a block that is further than this distance, the lightning will strike at the player.")
+    public int maxLightningBlockDistance = 100;
+
+    @Comment({" ", "# If there is no block in the range of lightning strike, should the lightning strike the player?"})
+    public boolean lightningStrikePlayerIfNoBlock = true;
+}

eternalcore-core/src/main/java/com/eternalcode/core/feature/lightning/LightningConfig.java

@@ -0,0 +1,7 @@
+package com.eternalcode.core.feature.lightning;
+
+public interface LightningSettings {
+
+    int maxLightningBlockDistance();
+    boolean lightningStrikePlayerIfNoBlock();
+}