Skip to content
This repository has been archived by the owner on Jan 20, 2024. It is now read-only.

Commit

Permalink
Features: add custom death message
Browse files Browse the repository at this point in the history
  • Loading branch information
TheFaser committed Aug 4, 2023
1 parent 9c258ce commit c684003
Show file tree
Hide file tree
Showing 9 changed files with 679 additions and 1 deletion.
2 changes: 2 additions & 0 deletions src/main/java/net/flectone/Main.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import net.flectone.integrations.supervanish.FSuperVanish;
import net.flectone.integrations.vault.FVault;
import net.flectone.integrations.voicechats.simplevoicechat.RegisterSimpleVoiceChat;
import net.flectone.listeners.PlayerDeathEventListener;
import net.flectone.managers.FPlayerManager;
import net.flectone.managers.FileManager;
import net.flectone.managers.TickerManager;
Expand Down Expand Up @@ -72,6 +73,7 @@ public void onEnable() {
hookPlugins();

TickerManager.start();
PlayerDeathEventListener.reload();

info("✔ Plugin enabled");

Expand Down
3 changes: 3 additions & 0 deletions src/main/java/net/flectone/commands/CommandFlectonechat.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import net.flectone.Main;
import net.flectone.custom.FCommands;
import net.flectone.custom.FTabCompleter;
import net.flectone.listeners.PlayerDeathEventListener;
import net.flectone.managers.FPlayerManager;
import net.flectone.managers.FileManager;
import net.flectone.managers.TickerManager;
Expand Down Expand Up @@ -81,6 +82,8 @@ public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command
FPlayerManager.loadPlayers();
MessageBuilder.loadPatterns();

PlayerDeathEventListener.reload();

fCommand.sendMeMessage("command.flectonechat.message");

return true;
Expand Down
77 changes: 77 additions & 0 deletions src/main/java/net/flectone/custom/FDamager.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
package net.flectone.custom;

import net.flectone.utils.NMSUtil;
import net.flectone.utils.ObjectUtil;
import org.bukkit.Material;
import org.bukkit.entity.Entity;
import org.bukkit.inventory.ItemStack;

public class FDamager {

private int time;
private Entity killer;
private String killerItemName;
private String killerItemAsJson;
private Entity finalEntityDamager;
private Material finalBlockDamager;
private String damagerTranslateName;

public FDamager() {
}

public void replaceDamager(Entity damager) {
killer = damager;
time = ObjectUtil.getCurrentTime();
}

public Entity getKiller() {
return killer;
}

public void setKiller(Entity killer) {
this.killer = killer;
}

public void setKillerItem(ItemStack itemStack) {
this.killerItemName = NMSUtil.getMinecraftName(itemStack);
this.killerItemAsJson = NMSUtil.getItemAsJson(itemStack);
}

public String getKillerItemName() {
return killerItemName;
}

public String getKillerItemAsJson() {
return killerItemAsJson;
}

public int getTime() {
return time;
}

public void setFinalDamager(Entity finalDamager) {
this.finalEntityDamager = finalDamager;
this.damagerTranslateName = NMSUtil.getMinecraftName(finalDamager);
}

public void setFinalDamager(Material block) {
this.finalBlockDamager = block;
this.damagerTranslateName = NMSUtil.getMinecraftName(new ItemStack(finalBlockDamager));
}

public String getDamagerTranslateName() {
return damagerTranslateName;
}

public Entity getFinalEntity() {
return finalEntityDamager;
}

public boolean isFinalEntity() {
return finalEntityDamager != null;
}

public boolean isFinalBlock() {
return finalBlockDamager != null;
}
}
16 changes: 16 additions & 0 deletions src/main/java/net/flectone/custom/FPlayer.java
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ public class FPlayer {
private String chat = "local";
private Player lastWriter;
private String worldPrefix = "";
private FDamager lastFDamager = new FDamager();
private boolean isUpdated;

public FPlayer(OfflinePlayer offlinePlayer) {
Expand Down Expand Up @@ -481,4 +482,19 @@ public List<String> getListChatBubbles() {
return listChatBubbles;
}

public FDamager getLastFDamager() {
return lastFDamager;
}

public void setLastDamager(Entity lastDamager) {
this.lastFDamager.replaceDamager(lastDamager);
}

public void resetLastDamager(){
this.lastFDamager = new FDamager();
}

public boolean isDeathByObject(){
return ObjectUtil.getCurrentTime() - this.lastFDamager.getTime() < 5;
}
}

0 comments on commit c684003

Please sign in to comment.