added funny death messages #11

Merged
zxq5 merged 9 commits from dev into main 2025-08-29 00:48:24 +01:00
3 changed files with 4 additions and 10 deletions
Showing only changes of commit c760ea20e5 - Show all commits
@@ -3,9 +3,6 @@ package dev.zxq5.fantasysmp;
import dev.zxq5.fantasysmp.events.HereticWarner; import dev.zxq5.fantasysmp.events.HereticWarner;
import dev.zxq5.fantasysmp.events.StevenKillCheck; import dev.zxq5.fantasysmp.events.StevenKillCheck;
import dev.zxq5.fantasysmp.items.*; import dev.zxq5.fantasysmp.items.*;
import dev.zxq5.fantasysmp.items.gear.LightningSword;
import dev.zxq5.fantasysmp.items.gear.StevensWrath;
import dev.zxq5.fantasysmp.items.gear.WitheriteGear;
import dev.zxq5.fantasysmp.warps.Warp; import dev.zxq5.fantasysmp.warps.Warp;
import dev.zxq5.fantasysmp.warps.Warper; import dev.zxq5.fantasysmp.warps.Warper;
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;
@@ -5,8 +5,6 @@ import org.bukkit.command.CommandExecutor;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;
import static org.bukkit.Bukkit.getServer;
public class Items implements CommandExecutor { public class Items implements CommandExecutor {
@Override @Override
@@ -33,7 +31,7 @@ public class Items implements CommandExecutor {
CommandExecutor handler; CommandExecutor handler;
switch (args[0]) { switch (args[0]) {
case "witherite" -> handler = new WitheriteGear(); case "witherite" -> handler = new Witherite();
case "lightning" -> handler = new LightningSword(); case "lightning" -> handler = new LightningSword();
case "steven" -> handler = new StevensWrath(); case "steven" -> handler = new StevensWrath();
case "blazing" -> handler = new BlazingGear(); case "blazing" -> handler = new BlazingGear();
@@ -49,7 +47,7 @@ public class Items implements CommandExecutor {
public Items(JavaPlugin plugin) { public Items(JavaPlugin plugin) {
WitheriteGear witherite = new WitheriteGear(); Witherite witherite = new Witherite();
witherite.registerRecipes(); witherite.registerRecipes();
witherite.registerEvents(plugin); witherite.registerEvents(plugin);
@@ -4,7 +4,6 @@ import dev.zxq5.fantasysmp.items.GenericGearSet;
import dev.zxq5.fantasysmp.util.LoreChecker; import dev.zxq5.fantasysmp.util.LoreChecker;
import org.bukkit.*; import org.bukkit.*;
import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandExecutor;
import org.bukkit.entity.Fireball;
import org.bukkit.entity.LivingEntity; import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.entity.WitherSkull; import org.bukkit.entity.WitherSkull;
@@ -22,7 +21,7 @@ import java.util.Objects;
import static org.bukkit.Bukkit.getServer; import static org.bukkit.Bukkit.getServer;
public class WitheriteGear extends GenericGearSet implements Listener, CommandExecutor { public class Witherite extends GenericGearSet implements Listener, CommandExecutor {
private ArrayList<Player> cooldown = new ArrayList<>(); private ArrayList<Player> cooldown = new ArrayList<>();
@Override @Override
@@ -142,7 +141,7 @@ public class WitheriteGear extends GenericGearSet implements Listener, CommandEx
public static void init() {} public static void init() {}
public WitheriteGear() { public Witherite() {
this.setTier5(); this.setTier5();
this.sword.name = "Witherite Sword"; this.sword.name = "Witherite Sword";
this.sword.customItemModel = "witherite_sword"; this.sword.customItemModel = "witherite_sword";