Refactoring, Shadowing, and also Player death and villager names and …

…deaths. Caveat: Villagers that spawn because a village generated don't have names yet.

build.gradle

@@ -1,6 +1,7 @@
 plugins {
     id 'java'
     id("xyz.jpenilla.run-paper") version "2.3.0"
+    id 'com.gradleup.shadow' version '8.3.0'
 }
 
 group = 'io.github.transdrad'
@@ -20,6 +21,7 @@ repositories {
 
 dependencies {
     compileOnly "io.papermc.paper:paper-api:1.21.1-R0.1-SNAPSHOT"
+    implementation "org.ajbrown:name-machine:1.0.0"
 }
 
 def targetJavaVersion = 21
@@ -45,7 +47,7 @@ tasks {
         // Configure the Minecraft version for our task.
         // This is the only required configuration besides applying the plugin.
         // Your plugin's jar (or shadowJar if present) will be used automatically.
-        minecraftVersion("1.21")
+        minecraftVersion("1.21.1")
     }
 }
 

src/main/java/io/github/transdryad/basilexplore/BasilExplore.java

@@ -3,6 +3,7 @@
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.plugin.java.JavaPlugin;
 
+import java.util.Random;
 import java.util.logging.Level;
 
 public final class BasilExplore extends JavaPlugin {
@@ -13,7 +14,6 @@ public void onEnable() {
         this.getLogger().log(Level.INFO, "Enabling BasilExplore.");
         this.saveDefaultConfig();
         getLogger().log(Level.INFO, "Logging in a different way.");
-        FileConfiguration config = this.getConfig();
         getServer().getPluginManager().registerEvents(new BasilListener(), this);
         this.getCommand("home").setExecutor( new CommandHome());
 

src/main/java/io/github/transdryad/basilexplore/BasilListener.java

@@ -1,12 +1,30 @@
 package io.github.transdryad.basilexplore;
 
+import org.ajbrown.namemachine.NameGenerator;
+import org.bukkit.entity.EntityType;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
-import org.bukkit.event.block.BlockBreakEvent;
+import org.bukkit.event.entity.EntityDeathEvent;
+import org.bukkit.event.entity.EntitySpawnEvent;
+import org.bukkit.event.entity.PlayerDeathEvent;
 
 public class BasilListener implements Listener {
+
     @EventHandler
-    public void onBlockBreak(BlockBreakEvent event) {
+    public void onPlayerDeath(PlayerDeathEvent event) {
+        PlayerDeath.playerDeath(event);
+    }
 
+    @EventHandler
+    public void onEntitySpawn(EntitySpawnEvent event) {
+        if (event.getEntityType() == EntityType.VILLAGER) {
+            Villagers.nameVillager(event.getEntity());
+        }
+    }
+    @EventHandler
+    public void onEntityDeath(EntityDeathEvent event) {
+        if (event.getEntityType() == EntityType.VILLAGER) {
+            Villagers.villagerDeath(event.getEntity());
+        }
     }
 }

src/main/java/io/github/transdryad/basilexplore/CommandHome.java

@@ -9,8 +9,6 @@
 
 import java.util.logging.Level;
 
-import io.github.transdryad.basilexplore.Home;
-
 public class CommandHome implements CommandExecutor {
     Home home = new Home();
     JavaPlugin plugin = BasilExplore.getPlugin(BasilExplore.class);
@@ -20,7 +18,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
                 if (sender instanceof Player) {
                     Player player = (Player) sender;
                     Location PlayerLocation = player.getLocation();
-                    player.sendMessage("This plugin is running the config version " + plugin.getConfig().getString("config_version"));
+                    //player.sendMessage("This plugin is running the config version " + plugin.getConfig().getString("config_version"));
                     if (args.length == 0) {
                         plugin.getLogger().log(Level.INFO,player.getName() + " ran /home from " + PlayerLocation.getBlockX() + ", " + PlayerLocation.getBlockY() + ", " + PlayerLocation.getBlockZ() + ".");
                         try {

src/main/java/io/github/transdryad/basilexplore/PlayerDeath.java

@@ -0,0 +1,22 @@
+package io.github.transdryad.basilexplore;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.entity.PlayerDeathEvent;
+import org.bukkit.plugin.java.JavaPlugin;
+
+import java.util.logging.Level;
+
+public class PlayerDeath {
+
+    static JavaPlugin plugin = BasilExplore.getPlugin(BasilExplore.class);
+
+    public static void playerDeath(PlayerDeathEvent event) {
+        Player deadPlayer = event.getPlayer();
+        event.setKeepInventory(false);
+        int x = deadPlayer.getLocation().getBlockX();
+        int y = deadPlayer.getLocation().getBlockY();
+        int z = deadPlayer.getLocation().getBlockZ();
+        deadPlayer.sendMessage("You died at: " + x + ", " + y + ", " + z + ".");
+        plugin.getLogger().log(Level.INFO, deadPlayer.getName() + " died at: " + x + ", " + y + ", " + z + ".");
+    }
+}

src/main/java/io/github/transdryad/basilexplore/Villagers.java

@@ -0,0 +1,32 @@
+package io.github.transdryad.basilexplore;
+
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.TextComponent;
+import org.ajbrown.namemachine.Name;
+import org.ajbrown.namemachine.NameGenerator;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Entity;
+import org.bukkit.plugin.java.JavaPlugin;
+
+import java.util.List;
+import java.util.logging.Level;
+
+public class Villagers {
+
+    static JavaPlugin plugin = BasilExplore.getPlugin(BasilExplore.class);
+
+    static NameGenerator generator = new NameGenerator();
+
+    public static void nameVillager(Entity entity) {
+        List<Name> names = generator.generateNames( 1 );
+        TextComponent textComponent = Component.text(names.getFirst().getFirstName() + " " + names.getFirst().getLastName());
+        entity.customName(textComponent);
+        //plugin.getLogger().log(Level.INFO, "Villager Spawned.");
+    }
+
+    public static void villagerDeath(Entity entity) {
+        Component deadName = entity.name();
+        TextComponent deathMessage = Component.text("The villager ").append(deadName).append(Component.text(" has just died."));
+        Bukkit.broadcast(deathMessage);
+    }
+}