JeremyStarTM/PickShadow
1
0
Fork 0
Code Issues Pull requests Releases Activity

More work on PSPlayer and porting some commands

Browse source
This commit is contained in:
JeremyStar™ 2024-11-16 21:50:28 +01:00
parent c69fc81a87
commit 44dab9e11b
Signed by: JeremyStarTM
GPG key ID: E366BAEF67E4704D
16 changed files with 1341 additions and 526 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
dist/methodmaps/PSPlayer.csv vendored Normal file
View file

@ -0,0 +1,77 @@
TYPE ,CATEGORY ,NULLVALUE,RETURN TYPE ,METHODNAME ,"METHODARGUMENTS"
STATIC ,Lists ,@NotNull ,PSPlayer @NotNull [] ,getOnline ,""
STATIC ,Broadcast , ,void ,broadcast ,"@NotNull String message"
STATIC ,Broadcast , ,void ,broadcastTranslatable ,"@NotNull LanguageString languageString, boolean includePrefix, @NotNull Map.Entry<@NotNull String, @NotNull String> @Nullable ... placeholders"
STATIC ,Broadcast , ,void ,broadcastRaw ,"@NotNull String message"
CONSTRUC,Constructors , , ,<init> ,""
INSTANCE,Air left , ,int ,getLeftAir ,""
INSTANCE,Air left ,@NotNull ,PSPlayer ,setLeftAir ,"int airPoints"
INSTANCE,Attributes ,@Nullable,AttributeInstance ,getAttribute ,"@NotNull Attribute attribute"
INSTANCE,Connection , ,void ,terminate ,""
INSTANCE,Connection , ,void ,kick ,"@NotNull String reason"
INSTANCE,Connection , ,void ,kick ,"@NotNull String reason, @NotNull PlayerKickEvent.Cause cause"
INSTANCE,Connection , ,void ,kickTranslatable ,"@NotNull LanguageString languageString, @NotNull Map.Entry<@NotNull String, @NotNull String> @Nullable... placeholders"
INSTANCE,Connection , ,void ,kickTranslatable ,"@NotNull PlayerKickEvent.Cause cause, @NotNull LanguageString languageString, @NotNull Map.Entry<@NotNull String, @NotNull String> @Nullable... placeholders"
INSTANCE,Connection , ,void ,kickRaw ,"@NotNull String reason"
INSTANCE,Connection , ,void ,kickRaw ,"@NotNull String reason, @NotNull PlayerKickEvent.Cause cause"
INSTANCE,Fall distance , ,float ,getFallDistance ,""
INSTANCE,Fall distance ,@NotNull ,PSPlayer ,setFallDistance ,"float fallDistance"
INSTANCE,Gamemode ,@NotNull ,GameMode ,getGamemode ,""
INSTANCE,Gamemode ,@NotNull ,PSPlayer ,setGamemode ,"@NotNull GameMode gamemode"
INSTANCE,Getters ,@NotNull ,Player ,getBukkitPlayer ,""
INSTANCE,Getters ,@NotNull ,PSPlayer.Data ,getData ,""
INSTANCE,Health , ,double ,getHealth ,""
INSTANCE,Health ,@NotNull ,PSPlayer ,setHealth ,"double healthPoints"
INSTANCE,Health ,@NotNull ,PSPlayer ,heal ,"double healthPoints"
INSTANCE,Health ,@NotNull ,PSPlayer ,heal ,"double healthPoints, @NotNull EntityRegainHealthEvent.RegainReason reason"
INSTANCE,Health ,@NotNull ,PSPlayer ,damage ,"double healthPoints"
INSTANCE,Health ,@NotNull ,PSPlayer ,damage ,"double healthPoints, @NotNull Entity entity"
INSTANCE,Health ,@NotNull ,PSPlayer ,damage ,"double healthPoints, @NotNull DamageSource damageSource"
INSTANCE,Hunger , ,int ,getHunger ,""
INSTANCE,Hunger , ,float ,getSaturation ,""
INSTANCE,Hunger ,@NotNull ,PSPlayer ,setHunger ,"int hungerPoints"
INSTANCE,Hunger ,@NotNull ,PSPlayer ,setSaturation ,"float saturationPoints"
INSTANCE,Location ,@NotNull ,World ,getWorld ,""
INSTANCE,Location ,@NotNull ,Location ,getLocation ,""
INSTANCE,Location ,@Nullable,Location ,getRespawnLocation ,""
INSTANCE,Location ,@NotNull ,PSPlayer ,teleport ,"@NotNull Location location"
INSTANCE,Location ,@NotNull ,PSPlayer ,teleport ,"@NotNull Location location, @NotNull PlayerTeleportEvent.TeleportCause cause"
INSTANCE,Location ,@NotNull ,PSPlayer ,teleport ,"@NotNull Location location, @NotNull TeleportFlag... flags"
INSTANCE,Location ,@NotNull ,PSPlayer ,teleport ,"@NotNull Location location, @NotNull PlayerTeleportEvent.TeleportCause cause, @NotNull TeleportFlag... flags"
INSTANCE,Messaging ,@NotNull ,PSPlayer ,message ,"@NotNull String message"
INSTANCE,Messaging ,@NotNull ,PSPlayer ,messageTranslatable ,"@NotNull LanguageString languageString, boolean includePrefix, @NotNull Map.Entry<@NotNull String, @NotNull String> @Nullable... placeholders"
INSTANCE,Messaging ,@NotNull ,PSPlayer ,messageRaw ,"@NotNull String message"
INSTANCE,Particles ,@NotNull ,PSPlayer ,particle ,"@NotNull Particle particle, int count"
INSTANCE,Particles ,@NotNull ,PSPlayer ,particle ,"@NotNull Particle particle, int count, @NotNull Location location"
INSTANCE,Permissions , ,boolean ,hasPermission ,"@NotNull String permission"
INSTANCE,Permissions , ,boolean ,hasPermission ,"@NotNull Permission permission"
INSTANCE,Player identification , ,boolean ,isOnline ,""
INSTANCE,Player identification ,@NotNull ,UUID ,getUUID ,""
INSTANCE,Player identification ,@NotNull ,String ,getUsername ,""
INSTANCE,Player identification ,@NotNull ,String ,getIdentificationString ,""
INSTANCE,Potion effects ,@NotNull ,PotionEffect @NotNull [],getPotions ,""
INSTANCE,Potion effects ,@NotNull ,PSPlayer ,getPotion ,"@NotNull PotionEffectType type"
INSTANCE,Potion effects ,@NotNull ,PSPlayer ,hasPotion ,"@NotNull PotionEffectType type"
INSTANCE,Potion effects ,@NotNull ,PSPlayer ,applyPotion ,"@NotNull PotionEffect effect"
INSTANCE,Potion effects ,@NotNull ,PSPlayer ,removePotion ,"@NotNull PotionEffectType type"
INSTANCE,Scheduling ,@NotNull ,PSPlayer ,schedule ,"@NotNull Runnable task, long delay"
INSTANCE,Scheduling ,@NotNull ,PSPlayer ,schedule ,"@NotNull Runnable task, @NotNull Runnable retired, long delay"
INSTANCE,Scheduling ,@NotNull ,PSPlayer ,scheduleRepeatedly ,"@NotNull Runnable task, long delay"
INSTANCE,Screen effects ,@NotNull ,PSPlayer ,showCredits ,""
INSTANCE,Screen effects ,@NotNull ,PSPlayer ,showDemoPopup ,""
INSTANCE,Screen effects ,@NotNull ,PSPlayer ,showElderGuardian ,""
INSTANCE,Screen effects ,@NotNull ,PSPlayer ,showElderGuardian ,"boolean silent"
INSTANCE,Sounds ,@NotNull ,PSPlayer ,sound ,"@NotNull Sound sound"
INSTANCE,Sounds ,@NotNull ,PSPlayer ,sound ,"@NotNull Key sound, @NotNull Sound.Source type, float volume, float pitch"
INSTANCE,Sounds ,@NotNull ,PSPlayer ,sound ,"@NotNull Key sound, @NotNull Sound.Source type"
INSTANCE,Sounds ,@NotNull ,PSPlayer ,stopSounds ,""
INSTANCE,Sounds ,@NotNull ,PSPlayer ,stopSound ,"@NotNull Sound sound"
INSTANCE,Times ,@NotNull ,PSPlayer ,title ,""
INSTANCE,Times ,@NotNull ,PSPlayer ,title ,"@NotNull Title title"
INSTANCE,Times ,@NotNull ,PSPlayer ,title ,"@Nullable Component title, @Nullable Component subtitle, @NotNull Title.Times times"
INSTANCE,Times ,@NotNull ,PSPlayer ,title ,"@Nullable Component title, @Nullable Component subtitle, @NotNull Duration fadeIn, @NotNull Duration stay, @NotNull Duration fadeOut"
INSTANCE,Times ,@NotNull ,PSPlayer ,title ,"@Nullable Component title, @Nullable Component subtitle, long fadeIn, long stay, long fadeOut"
INSTANCE,Times ,@NotNull ,PSPlayer ,titleRaw ,"@Nullable String title, @Nullable String subtitle, @NotNull Title.Times times"
INSTANCE,Times ,@NotNull ,PSPlayer ,titleRaw ,"@Nullable String title, @Nullable String subtitle, @NotNull Duration fadeIn, @NotNull Duration stay, @NotNull Duration fadeOut"
INSTANCE,Times ,@NotNull ,PSPlayer ,titleRaw ,"@Nullable String title, @Nullable String subtitle, long fadeIn, long stay, long fadeOut"
INSTANCE,Data ,@NotNull ,PSPlayer ,applyPlayerAttributes ,""
1 TYPE CATEGORY NULLVALUE RETURN TYPE METHODNAME METHODARGUMENTS
2 STATIC Lists @NotNull PSPlayer @NotNull [] getOnline
3 STATIC Broadcast void broadcast @NotNull String message
4 STATIC Broadcast void broadcastTranslatable @NotNull LanguageString languageString, boolean includePrefix, @NotNull Map.Entry<@NotNull String, @NotNull String> @Nullable ... placeholders
5 STATIC Broadcast void broadcastRaw @NotNull String message
6 CONSTRUC Constructors <init>
7 INSTANCE Air left int getLeftAir
8 INSTANCE Air left @NotNull PSPlayer setLeftAir int airPoints
9 INSTANCE Attributes @Nullable AttributeInstance getAttribute @NotNull Attribute attribute
10 INSTANCE Connection void terminate
11 INSTANCE Connection void kick @NotNull String reason
12 INSTANCE Connection void kick @NotNull String reason, @NotNull PlayerKickEvent.Cause cause
13 INSTANCE Connection void kickTranslatable @NotNull LanguageString languageString, @NotNull Map.Entry<@NotNull String, @NotNull String> @Nullable... placeholders
14 INSTANCE Connection void kickTranslatable @NotNull PlayerKickEvent.Cause cause, @NotNull LanguageString languageString, @NotNull Map.Entry<@NotNull String, @NotNull String> @Nullable... placeholders
15 INSTANCE Connection void kickRaw @NotNull String reason
16 INSTANCE Connection void kickRaw @NotNull String reason, @NotNull PlayerKickEvent.Cause cause
17 INSTANCE Fall distance float getFallDistance
18 INSTANCE Fall distance @NotNull PSPlayer setFallDistance float fallDistance
19 INSTANCE Gamemode @NotNull GameMode getGamemode
20 INSTANCE Gamemode @NotNull PSPlayer setGamemode @NotNull GameMode gamemode
21 INSTANCE Getters @NotNull Player getBukkitPlayer
22 INSTANCE Getters @NotNull PSPlayer.Data getData
23 INSTANCE Health double getHealth
24 INSTANCE Health @NotNull PSPlayer setHealth double healthPoints
25 INSTANCE Health @NotNull PSPlayer heal double healthPoints
26 INSTANCE Health @NotNull PSPlayer heal double healthPoints, @NotNull EntityRegainHealthEvent.RegainReason reason
27 INSTANCE Health @NotNull PSPlayer damage double healthPoints
28 INSTANCE Health @NotNull PSPlayer damage double healthPoints, @NotNull Entity entity
29 INSTANCE Health @NotNull PSPlayer damage double healthPoints, @NotNull DamageSource damageSource
30 INSTANCE Hunger int getHunger
31 INSTANCE Hunger float getSaturation
32 INSTANCE Hunger @NotNull PSPlayer setHunger int hungerPoints
33 INSTANCE Hunger @NotNull PSPlayer setSaturation float saturationPoints
34 INSTANCE Location @NotNull World getWorld
35 INSTANCE Location @NotNull Location getLocation
36 INSTANCE Location @Nullable Location getRespawnLocation
37 INSTANCE Location @NotNull PSPlayer teleport @NotNull Location location
38 INSTANCE Location @NotNull PSPlayer teleport @NotNull Location location, @NotNull PlayerTeleportEvent.TeleportCause cause
39 INSTANCE Location @NotNull PSPlayer teleport @NotNull Location location, @NotNull TeleportFlag... flags
40 INSTANCE Location @NotNull PSPlayer teleport @NotNull Location location, @NotNull PlayerTeleportEvent.TeleportCause cause, @NotNull TeleportFlag... flags
41 INSTANCE Messaging @NotNull PSPlayer message @NotNull String message
42 INSTANCE Messaging @NotNull PSPlayer messageTranslatable @NotNull LanguageString languageString, boolean includePrefix, @NotNull Map.Entry<@NotNull String, @NotNull String> @Nullable... placeholders
43 INSTANCE Messaging @NotNull PSPlayer messageRaw @NotNull String message
44 INSTANCE Particles @NotNull PSPlayer particle @NotNull Particle particle, int count
45 INSTANCE Particles @NotNull PSPlayer particle @NotNull Particle particle, int count, @NotNull Location location
46 INSTANCE Permissions boolean hasPermission @NotNull String permission
47 INSTANCE Permissions boolean hasPermission @NotNull Permission permission
48 INSTANCE Player identification boolean isOnline
49 INSTANCE Player identification @NotNull UUID getUUID
50 INSTANCE Player identification @NotNull String getUsername
51 INSTANCE Player identification @NotNull String getIdentificationString
52 INSTANCE Potion effects @NotNull PotionEffect @NotNull [] getPotions
53 INSTANCE Potion effects @NotNull PSPlayer getPotion @NotNull PotionEffectType type
54 INSTANCE Potion effects @NotNull PSPlayer hasPotion @NotNull PotionEffectType type
55 INSTANCE Potion effects @NotNull PSPlayer applyPotion @NotNull PotionEffect effect
56 INSTANCE Potion effects @NotNull PSPlayer removePotion @NotNull PotionEffectType type
57 INSTANCE Scheduling @NotNull PSPlayer schedule @NotNull Runnable task, long delay
58 INSTANCE Scheduling @NotNull PSPlayer schedule @NotNull Runnable task, @NotNull Runnable retired, long delay
59 INSTANCE Scheduling @NotNull PSPlayer scheduleRepeatedly @NotNull Runnable task, long delay
60 INSTANCE Screen effects @NotNull PSPlayer showCredits
61 INSTANCE Screen effects @NotNull PSPlayer showDemoPopup
62 INSTANCE Screen effects @NotNull PSPlayer showElderGuardian
63 INSTANCE Screen effects @NotNull PSPlayer showElderGuardian boolean silent
64 INSTANCE Sounds @NotNull PSPlayer sound @NotNull Sound sound
65 INSTANCE Sounds @NotNull PSPlayer sound @NotNull Key sound, @NotNull Sound.Source type, float volume, float pitch
66 INSTANCE Sounds @NotNull PSPlayer sound @NotNull Key sound, @NotNull Sound.Source type
67 INSTANCE Sounds @NotNull PSPlayer stopSounds
68 INSTANCE Sounds @NotNull PSPlayer stopSound @NotNull Sound sound
69 INSTANCE Times @NotNull PSPlayer title
70 INSTANCE Times @NotNull PSPlayer title @NotNull Title title
71 INSTANCE Times @NotNull PSPlayer title @Nullable Component title, @Nullable Component subtitle, @NotNull Title.Times times
72 INSTANCE Times @NotNull PSPlayer title @Nullable Component title, @Nullable Component subtitle, @NotNull Duration fadeIn, @NotNull Duration stay, @NotNull Duration fadeOut
73 INSTANCE Times @NotNull PSPlayer title @Nullable Component title, @Nullable Component subtitle, long fadeIn, long stay, long fadeOut
74 INSTANCE Times @NotNull PSPlayer titleRaw @Nullable String title, @Nullable String subtitle, @NotNull Title.Times times
75 INSTANCE Times @NotNull PSPlayer titleRaw @Nullable String title, @Nullable String subtitle, @NotNull Duration fadeIn, @NotNull Duration stay, @NotNull Duration fadeOut
76 INSTANCE Times @NotNull PSPlayer titleRaw @Nullable String title, @Nullable String subtitle, long fadeIn, long stay, long fadeOut
77 INSTANCE Data @NotNull PSPlayer applyPlayerAttributes

9
dist/methodmaps/template.csv vendored Normal file
View file

@ -0,0 +1,9 @@
TYPE ,CATEGORY ,NULLVALUE,RETURN TYPE ,METHODNAME ,"METHODARGUMENTS"
STATIC ,Getters ,@NotNull ,Class<?> @Nullable [] ,getSomeClass ,"@NotNull String name"
CONSTRUC,Constructors , , ,<init> ,""
INSTANCE,Termination , ,void ,terminate ,""
INSTANCE,Termination , ,void ,terminate ,"@NotNull Cause cause"
INSTANCE,Termination , ,void ,terminate ,"@NotNull String reason"
INSTANCE,Termination , ,void ,terminate ,"@NotNull String reason, @NotNull Cause cause"
INSTANCE,Checks , ,boolean ,exists ,"@NotNull Object thing"
INSTANCE,Checks , ,boolean ,existsWithCondition ,"@NotNull Object thing, @NotNull Condition ... conditions"
1 TYPE CATEGORY NULLVALUE RETURN TYPE METHODNAME METHODARGUMENTS
2 STATIC Getters @NotNull Class<?> @Nullable [] getSomeClass @NotNull String name
3 CONSTRUC Constructors <init>
4 INSTANCE Termination void terminate
5 INSTANCE Termination void terminate @NotNull Cause cause
6 INSTANCE Termination void terminate @NotNull String reason
7 INSTANCE Termination void terminate @NotNull String reason, @NotNull Cause cause
8 INSTANCE Checks boolean exists @NotNull Object thing
9 INSTANCE Checks boolean existsWithCondition @NotNull Object thing, @NotNull Condition ... conditions

59
extension/src/main/java/de/jeremystartm/pickshadow/extension/api/command/Command.java
View file

@ -328,6 +328,7 @@ public abstract class Command implements CommandExecutor {
true,
entry("player", arguments[index])
));
throw new IllegalArgumentException("The specified target player '" + arguments[index] + "' isn't online or is invalid");
} else
player = PSPlayerFactory.get(bukkitPlayer);
@ -338,6 +339,42 @@ public abstract class Command implements CommandExecutor {
}
}
/**
* Determines the target player.
*
* @param player command sender
* @param arguments array of arguments
* @param index index of the player name to check at
* @return target player and if the supplied command sender was used
* @throws IndexOutOfBoundsException if the size of {@code arguments} is smaller than the specified {@code index}
* @throws IllegalCallerException if no target was specified in {@code arguments} and the sender is the server console
* @throws IllegalArgumentException if the specified target in {@code arguments} is invalid or does not exist
* @since v1-release0
*/
public static @NotNull Map.Entry<@NotNull PSPlayer, @NotNull Boolean> determineTarget(@NotNull PSPlayer player, @NotNull String @NotNull [] arguments, int index) throws IndexOutOfBoundsException, IllegalCallerException, IllegalArgumentException {
if (arguments.length == index) {
return entry(player, true);
} else if (arguments.length > index) {
Player bukkitPlayer = Bukkit.getPlayer(arguments[index]);
PSPlayer target;
if (bukkitPlayer == null) {
player.messageTranslatable(
LanguageString.ERROR_PLAYER_NOT_FOUND,
true,
entry("player", arguments[index])
);
throw new IllegalArgumentException("The specified target player '" + arguments[index] + "' isn't online or is invalid");
} else
target = PSPlayerFactory.get(bukkitPlayer);
return entry(target, target.getUsername().equals(player.getUsername()));
} else {
throw new IndexOutOfBoundsException("Size of 'arguments' is smaller than the specified 'index'");
}
}
// -----> Inner classes
/**
* Represents by whom a command can be used.
@ -417,7 +454,7 @@ public abstract class Command implements CommandExecutor {
@NotNull String description,
@NotNull String syntax,
@NotNull String mode,
@Range(from = 0, to = 2) int @Nullable [] executionOrder,
@NotNull String @Nullable [] executionOrder,
@NotNull Command.ExecutionTarget executionTarget
) {
/**
@ -426,28 +463,28 @@ public abstract class Command implements CommandExecutor {
*/
public Information {
if (executionOrder == null)
executionOrder = new int[]{ 0, 1, 2 };
executionOrder = new String[]{ "all", "console", "player" };
// Verify 'executionOrder'
// -> Amount of items
if (executionOrder.length != 3)
throw new IllegalStateException("'executionOrder' does not contain exactly three items");
// -> Bounds
// -> Options
if (
(executionOrder[0] < 0 || executionOrder[0] > 2)
|| (executionOrder[1] < 0 || executionOrder[1] > 2)
|| (executionOrder[2] < 0 || executionOrder[2] > 2)
(!executionOrder[0].equals("all") && !executionOrder[0].equals("console") && !executionOrder[0].equals("player"))
|| (!executionOrder[1].equals("all") && !executionOrder[1].equals("console") && !executionOrder[1].equals("player"))
|| (!executionOrder[2].equals("all") && !executionOrder[2].equals("console") && !executionOrder[2].equals("player"))
)
throw new IllegalStateException("Some item in 'executionOrder' is either smaller than '0' or bigger than '2'");
throw new IllegalStateException("Some item in 'executionOrder' is neither \"all\", \"console\" nor \"player\"");
// -> Duplicate values
if (
executionOrder[0] == executionOrder[1]
|| executionOrder[0] == executionOrder[2]
|| executionOrder[1] == executionOrder[2]
executionOrder[0].equals(executionOrder[1])
|| executionOrder[0].equals(executionOrder[2])
|| executionOrder[1].equals(executionOrder[2])
)
throw new IllegalStateException("Two or more items in 'executionOrder' have the same value");
throw new IllegalStateException("Duplicate values found in 'executionOrder'");
}
}
}

932
extension/src/main/java/de/jeremystartm/pickshadow/extension/api/entity/player/PSPlayer.java
View file

File diff suppressed because it is too large Load diff

7
extension/src/main/java/de/jeremystartm/pickshadow/extension/api/translation/LanguageString.java
View file

@ -78,10 +78,10 @@ public enum LanguageString {
// Command group 'links'
LINKS_WEBSITE,
LINKS_FORUM,
LINKS_DISCORD,
LINKS_TEAMSPEAK,
LINKS_MESSAGEBOARD,
LINKS_MUMBLE,
LINKS_TEAMSPEAK,
LINKS_DISCORD,
// Command /clearchat
CLEARCHAT_GENERIC,
@ -92,6 +92,7 @@ public enum LanguageString {
// Command /home
HOME,
HOME_OTHER,
HOME_NORESPAWN,
HOME_NORESPAWN_OTHER,

2
extension/src/main/java/de/jeremystartm/pickshadow/extension/command/general/LinkCommand.java
View file

@ -73,7 +73,7 @@ public final class LinkCommand extends Command {
switch (alias) {
case "website" -> sender.sendRichMessage(TranslationManager.get(LanguageString.LINKS_WEBSITE, sender, true));
case "forum", "messageboard", "mb" -> sender.sendRichMessage(TranslationManager.get(LanguageString.LINKS_FORUM, sender, true));
case "forum", "messageboard", "mb" -> sender.sendRichMessage(TranslationManager.get(LanguageString.LINKS_MESSAGEBOARD, sender, true));
case "discord", "dc" -> sender.sendRichMessage(TranslationManager.get(LanguageString.LINKS_DISCORD, sender, true));
case "teamspeak", "ts" -> sender.sendRichMessage(TranslationManager.get(LanguageString.LINKS_TEAMSPEAK, sender, true));
case "mumble" -> sender.sendRichMessage(TranslationManager.get(LanguageString.LINKS_MUMBLE, sender, true));

52
extension/src/main/java/de/jeremystartm/pickshadow/extension/command/general/SpeedCommand.java
View file

@ -23,16 +23,15 @@ import de.jeremystartm.pickshadow.extension.api.command.Command;
import de.jeremystartm.pickshadow.extension.api.command.TabCompletion;
import de.jeremystartm.pickshadow.extension.api.command.completion.StaticTabCompletion;
import de.jeremystartm.pickshadow.extension.api.entity.player.PSPlayer;
import de.jeremystartm.pickshadow.extension.api.entity.player.PSPlayerFactory;
import de.jeremystartm.pickshadow.extension.api.translation.LanguageString;
import de.jeremystartm.pickshadow.extension.api.translation.TranslationManager;
import de.jeremystartm.pickshadow.extension.api.type.PlayerAttribute;
import lombok.Getter;
import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
import java.util.Map;
import static java.util.Map.entry;
/**
@ -92,7 +91,7 @@ public final class SpeedCommand extends Command {
/** {@inheritDoc} */
@Override
protected void invokeAll(@NotNull CommandSender sender, @NotNull String alias, @NotNull String[] arguments) {
protected void invokeAll(@NotNull CommandSender sender, @NotNull String alias, @NotNull String @NotNull [] arguments) {
if (checkPermission(sender, "pickshadow.command.speed")) return;
// Check length of 'arguments'
@ -104,8 +103,8 @@ public final class SpeedCommand extends Command {
return;
}
boolean onSelf;
PSPlayer target;
boolean onSelf;
float speed;
boolean mode;
@ -149,47 +148,14 @@ public final class SpeedCommand extends Command {
if (speed < 0f)
speed = 0f;
// Get player/'target'
switch (arguments.length) {
case 2 -> {
onSelf = true;
// Check if command sender is a player
if (sender instanceof Player senderPlayer)
target = PSPlayerFactory.get(senderPlayer);
else {
sender.sendRichMessage(TranslationManager.get(LanguageString.ERROR_NOT_A_PLAYER, sender, true));
return;
}
}
case 3 -> {
Player bukkitPlayer = Bukkit.getPlayer(arguments[2]);
// Check if 'bukkitPlayer' is null
if (bukkitPlayer == null) {
sender.sendRichMessage(TranslationManager.get(LanguageString.ERROR_PLAYER_NOT_FOUND,
sender,
true,
entry("player", arguments[2])
));
return;
}
// Set 'onSelf'
// Get 'target' and 'onSelf'
try {
onSelf = bukkitPlayer.getName().equals(sender.getName());
} catch (NullPointerException exception) {
onSelf = false;
}
// Set 'target'
target = PSPlayerFactory.get(bukkitPlayer);
}
default -> {
sender.sendRichMessage(TranslationManager.get(LanguageString.ERROR_TOO_MANY_ARGUMENTS, sender, true));
Map.Entry<@NotNull PSPlayer, @NotNull Boolean> targetEntry = determineTarget(sender, arguments, 2);
target = targetEntry.getKey();
onSelf = targetEntry.getValue();
} catch (Exception exception) {
return;
}
}
// Set speed
try {

148
extension/src/main/java/de/jeremystartm/pickshadow/extension/command/general/TrollCommand.java
View file

@ -19,23 +19,20 @@
package de.jeremystartm.pickshadow.extension.command.general;
import de.jeremystartm.pickshadow.extension.Extension;
import de.jeremystartm.pickshadow.extension.api.command.Command;
import de.jeremystartm.pickshadow.extension.api.command.completion.StaticTabCompletion;
import de.jeremystartm.pickshadow.extension.api.command.TabCompletion;
import de.jeremystartm.pickshadow.extension.api.entity.player.PSPlayer;
import de.jeremystartm.pickshadow.extension.api.entity.player.PSPlayerFactory;
import de.jeremystartm.pickshadow.extension.api.translation.LanguageString;
import de.jeremystartm.pickshadow.extension.api.translation.TranslationManager;
import lombok.Getter;
import net.kyori.adventure.key.Key;
import net.kyori.adventure.sound.Sound;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.minimessage.MiniMessage;
import net.kyori.adventure.title.Title;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.Particle;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
import java.time.Duration;
@ -90,7 +87,7 @@ public final class TrollCommand extends Command {
/** {@inheritDoc} */
@Override
protected void invokeAll(@NotNull CommandSender sender, @NotNull String alias, @NotNull String[] arguments) {
protected void invokeAll(@NotNull CommandSender sender, @NotNull String alias, @NotNull String @NotNull [] arguments) {
if (checkPermission(sender, "pickshadow.command.troll"))
return;
@ -99,87 +96,124 @@ public final class TrollCommand extends Command {
return;
}
Player target = Bukkit.getPlayer(arguments[0]);
if (target == null) {
sender.sendRichMessage(TranslationManager.get(LanguageString.ERROR_PLAYER_NOT_FOUND, sender, true, entry("player", arguments[0])));
// Determine target
PSPlayer target;
try {
target = PSPlayerFactory.get(arguments[0]);
} catch (NullPointerException exception) {
sender.sendRichMessage(TranslationManager.get(
LanguageString.ERROR_PLAYER_NOT_FOUND,
sender,
true,
entry("player", arguments[0])
));
return;
}
switch (arguments[1]) {
case "crash" -> {
sender.sendRichMessage(TranslationManager.get(LanguageString.TROLL_CRASH, sender, true, entry("target", target.getName())));
for (int i = 0; i < 10000; i++)
target.spawnParticle(Particle.EXPLOSION, target.getLocation(), 100000);
sender.sendRichMessage(TranslationManager.get(
LanguageString.TROLL_CRASH,
sender,
true,
entry("target", target.getUsername())
));
//for (int i = 0; i < 10000; i++)
// target.particle(Particle.EXPLOSION, 1000000, target.getLocation());
target.terminate();
}
case "credits" -> {
sender.sendRichMessage(TranslationManager.get(LanguageString.TROLL_CREDITS, sender, true, entry("target", target.getName())));
target.showWinScreen();
sender.sendRichMessage(TranslationManager.get(LanguageString.TROLL_CREDITS, sender, true, entry("target", target.getUsername())));
target.showCredits();
}
case "creeper" -> {
sender.sendRichMessage(TranslationManager.get(LanguageString.TROLL_CREEPER, sender, true, entry("target", target.getName())));
target.playSound(Sound.sound(Key.key("minecraft:entity.creeper.primed"), Sound.Source.MASTER, 1f, 1f));
sender.sendRichMessage(TranslationManager.get(LanguageString.TROLL_CREEPER, sender, true, entry("target", target.getUsername())));
target.sound(Key.key("minecraft:entity.creeper.primed"), Sound.Source.MASTER);
}
case "demo" -> {
sender.sendRichMessage(TranslationManager.get(LanguageString.TROLL_DEMO, sender, true, entry("target", target.getName())));
target.showDemoScreen();
sender.sendRichMessage(TranslationManager.get(LanguageString.TROLL_DEMO, sender, true, entry("target", target.getUsername())));
target.showDemoPopup();
}
case "guardian" -> {
sender.sendRichMessage(TranslationManager.get(LanguageString.TROLL_GUARDIAN, sender, true, entry("target", target.getName())));
sender.sendRichMessage(TranslationManager.get(LanguageString.TROLL_GUARDIAN, sender, true, entry("target", target.getUsername())));
target.showElderGuardian();
}
case "hack" -> {
sender.sendRichMessage(TranslationManager.get(LanguageString.TROLL_HACK, sender, true, entry("target", target.getName())));
sender.sendRichMessage(TranslationManager.get(LanguageString.TROLL_HACK, sender, true, entry("target", target.getUsername())));
String format = "<dark_red><bold><obfuscated>";
// Ugly but it works
target.getScheduler().execute(Extension.getInstance(), () -> target.showTitle(Title.title(
target.schedule(() -> target.title(
MiniMessage.miniMessage().deserialize(format + ":/45v.8r9(VU$R)w.9ruv"),
Component.empty(),
Title.Times.times(Duration.ofMillis(0), Duration.ofSeconds(5), Duration.ofMillis(0))
)), null, 20);
target.getScheduler().execute(Extension.getInstance(), () -> target.showTitle(Title.title(
null,
Duration.ofMillis(0),
Duration.ofSeconds(5),
Duration.ofMillis(0)
), 20);
target.schedule(() -> target.title(
MiniMessage.miniMessage().deserialize(format + "tI=)$t0,ivAEr9+"),
Component.empty(),
Title.Times.times(Duration.ofMillis(0), Duration.ofSeconds(5), Duration.ofMillis(0))
)), null, 60);
target.getScheduler().execute(Extension.getInstance(), () -> target.showTitle(Title.title(
null,
Duration.ofMillis(0),
Duration.ofSeconds(5),
Duration.ofMillis(0)
), 60);
target.schedule(() -> target.title(
MiniMessage.miniMessage().deserialize(format + "(U$T98vtiIÜ$)TU9i"),
Component.empty(),
Title.Times.times(Duration.ofMillis(0), Duration.ofSeconds(5), Duration.ofMillis(0))
)), null, 100);
target.getScheduler().execute(Extension.getInstance(), () -> target.showTitle(Title.title(
null,
Duration.ofMillis(0),
Duration.ofSeconds(5),
Duration.ofMillis(0)
), 100);
target.schedule(() -> target.title(
MiniMessage.miniMessage().deserialize(format + "L.f-.3_F:_34-,ldMVams"),
Component.empty(),
Title.Times.times(Duration.ofMillis(0), Duration.ofSeconds(5), Duration.ofMillis(0))
)), null, 140);
target.getScheduler().execute(Extension.getInstance(), () -> target.showTitle(Title.title(
null,
Duration.ofMillis(0),
Duration.ofSeconds(5),
Duration.ofMillis(0)
), 140);
target.schedule(() -> target.title(
MiniMessage.miniMessage().deserialize(format + ")$u095u921,EFJKDA"),
Component.empty(),
Title.Times.times(Duration.ofMillis(0), Duration.ofSeconds(5), Duration.ofMillis(0))
)), null, 180);
target.getScheduler().execute(Extension.getInstance(), () -> target.showTitle(Title.title(
null,
Duration.ofMillis(0),
Duration.ofSeconds(5),
Duration.ofMillis(0)
), 180);
target.schedule(() -> target.title(
MiniMessage.miniMessage().deserialize(format + "joIV;;0p98v"),
Component.empty(),
Title.Times.times(Duration.ofMillis(0), Duration.ofSeconds(5), Duration.ofMillis(0))
)), null, 220);
target.getScheduler().execute(Extension.getInstance(), () -> target.showTitle(Title.title(
null,
Duration.ofMillis(0),
Duration.ofSeconds(5),
Duration.ofMillis(0)
), 220);
target.schedule(() -> target.title(
MiniMessage.miniMessage().deserialize(format + "IV)=RI(VT=)l9re"),
Component.empty(),
Title.Times.times(Duration.ofMillis(0), Duration.ofSeconds(5), Duration.ofMillis(0))
)), null, 260);
target.getScheduler().execute(Extension.getInstance(), () -> target.showTitle(Title.title(
null,
Duration.ofMillis(0),
Duration.ofSeconds(5),
Duration.ofMillis(0)
), 260);
target.schedule(() -> target.title(
MiniMessage.miniMessage().deserialize(format + "$KL%98vu9485u20k8lü="),
Component.empty(),
Title.Times.times(Duration.ofMillis(0), Duration.ofSeconds(5), Duration.ofMillis(0))
)), null, 300);
target.getScheduler().execute(Extension.getInstance(), () -> target.showTitle(Title.title(
null,
Duration.ofMillis(0),
Duration.ofSeconds(5),
Duration.ofMillis(0)
), 300);
target.schedule(() -> target.title(
MiniMessage.miniMessage().deserialize("<dark_red><bold>" + TranslationManager.get(LanguageString.TROLL_HACK_COMPLETE, target, false)),
Component.empty(),
Title.Times.times(Duration.ofMillis(0), Duration.ofSeconds(5), Duration.ofMillis(500))
)), null, 340);
null,
Duration.ofMillis(0),
Duration.ofSeconds(5),
Duration.ofMillis(500)
), 340);
}
case "heavens" -> {
sender.sendRichMessage(TranslationManager.get(LanguageString.TROLL_HEAVENS, sender, true, entry("target", target.getName())));
sender.sendRichMessage(TranslationManager.get(
LanguageString.TROLL_HEAVENS,
sender,
true,
entry("target", target.getUsername())
));
Location location = target.getLocation();
location.setY(10000);

162
extension/src/main/java/de/jeremystartm/pickshadow/extension/command/general/replacement/GamemodeCommand.java
View file

@ -22,16 +22,15 @@ package de.jeremystartm.pickshadow.extension.command.general.replacement;
import de.jeremystartm.pickshadow.extension.api.command.Command;
import de.jeremystartm.pickshadow.extension.api.command.TabCompletion;
import de.jeremystartm.pickshadow.extension.api.command.completion.StaticTabCompletion;
import de.jeremystartm.pickshadow.extension.api.entity.player.PSPlayer;
import de.jeremystartm.pickshadow.extension.api.translation.LanguageString;
import de.jeremystartm.pickshadow.extension.api.translation.TranslationManager;
import lombok.Getter;
import org.bukkit.Bukkit;
import org.bukkit.GameMode;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.bukkit.craftbukkit.command.ServerCommandSender;
import org.jetbrains.annotations.NotNull;
import java.util.Objects;
import java.util.Map;
import static java.util.Map.entry;
@ -85,22 +84,19 @@ public final class GamemodeCommand extends Command {
/** {@inheritDoc} */
@Override
protected void invokeAll(@NotNull CommandSender sender, @NotNull String alias, @NotNull String[] arguments) throws Exception {
if (checkPermission(sender, "pickshadow.command.gamemode")) return;
protected void invokeConsole(@NotNull ServerCommandSender console, @NotNull String alias, @NotNull String[] arguments) throws Exception {
// Check length of 'arguments'
if (arguments.length == 0) {
sender.sendRichMessage(TranslationManager.get(LanguageString.ERROR_TOO_FEW_ARGUMENTS, sender, true));
console.sendRichMessage(TranslationManager.get(LanguageString.ERROR_TOO_FEW_ARGUMENTS, console, true));
return;
} else if (arguments.length > 2) {
sender.sendRichMessage(TranslationManager.get(LanguageString.ERROR_TOO_MANY_ARGUMENTS, sender, true));
console.sendRichMessage(TranslationManager.get(LanguageString.ERROR_TOO_MANY_ARGUMENTS, console, true));
return;
}
boolean onSelf;
GameMode gamemode;
LanguageString gamemodeTranslation;
Player target;
PSPlayer target;
// Determine gamemode
switch (arguments[0]) {
@ -121,9 +117,9 @@ public final class GamemodeCommand extends Command {
gamemodeTranslation = LanguageString.GAMEMODE_SPECTATOR;
}
default -> {
sender.sendRichMessage(TranslationManager.get(
console.sendRichMessage(TranslationManager.get(
LanguageString.ERROR_INVALID_ARGUMENT,
sender,
console,
true,
entry("argument", arguments[0])
));
@ -131,60 +127,110 @@ public final class GamemodeCommand extends Command {
}
}
// Get player
switch (arguments.length) {
case 1 -> {
onSelf = true;
// Check if command sender is a player
if (sender instanceof Player senderPlayer)
target = senderPlayer;
else {
sender.sendRichMessage(TranslationManager.get(LanguageString.ERROR_NOT_A_PLAYER, sender, true));
return;
}
}
case 2 -> {
target = Bukkit.getPlayer(arguments[1]);
// Determine 'target'
try {
onSelf = Objects.requireNonNull(target).getName().equals(sender.getName());
} catch (NullPointerException exception) {
onSelf = false;
}
// Check if 'target' is null
if (target == null) {
sender.sendRichMessage(TranslationManager.get(LanguageString.ERROR_PLAYER_NOT_FOUND,
sender,
true,
entry("player", arguments[1])
));
target = determineTarget(console, arguments, 1).getKey();
} catch (Exception exception) {
return;
}
}
default -> {
sender.sendRichMessage(TranslationManager.get(LanguageString.ERROR_TOO_MANY_ARGUMENTS, sender, true));
return;
}
}
// Set gamemode
target.setGameMode(gamemode);
updateTargetGamemode(target, gamemode, gamemodeTranslation);
// Send success message to console
console.sendRichMessage(TranslationManager.get(
LanguageString.GAMEMODE_REMOTE,
console,
true,
entry("player", target.getUsername()),
entry("gamemode", TranslationManager.get(gamemodeTranslation, target, false))
));
}
/** {@inheritDoc} */
@Override
protected void invokePlayer(@NotNull PSPlayer player, @NotNull String alias, @NotNull String[] arguments) throws Exception {
if (checkPermission(player, "pickshadow.command.gamemode")) return;
// Check length of 'arguments'
if (arguments.length == 0) {
player.messageTranslatable(LanguageString.ERROR_TOO_FEW_ARGUMENTS, true);
return;
} else if (arguments.length > 2) {
player.messageTranslatable(LanguageString.ERROR_TOO_MANY_ARGUMENTS, true);
return;
}
GameMode gamemode;
LanguageString gamemodeTranslation;
PSPlayer target;
boolean onSelf;
// Determine gamemode
switch (arguments[0]) {
case "0", "survival" -> {
gamemode = GameMode.SURVIVAL;
gamemodeTranslation = LanguageString.GAMEMODE_SURVIVAL;
}
case "1", "creative" -> {
gamemode = GameMode.CREATIVE;
gamemodeTranslation = LanguageString.GAMEMODE_CREATIVE;
}
case "2", "adventure" -> {
gamemode = GameMode.ADVENTURE;
gamemodeTranslation = LanguageString.GAMEMODE_ADVENTURE;
}
case "3", "spectator" -> {
gamemode = GameMode.SPECTATOR;
gamemodeTranslation = LanguageString.GAMEMODE_SPECTATOR;
}
default -> {
player.messageTranslatable(
LanguageString.ERROR_INVALID_ARGUMENT,
true,
entry("argument", arguments[0])
);
return;
}
}
// Determine 'target' and 'onSelf'
try {
Map.Entry<@NotNull PSPlayer, @NotNull Boolean> targetEntry = determineTarget(player, arguments, 1);
target = targetEntry.getKey();
onSelf = targetEntry.getValue();
} catch (Exception exception) {
return;
}
// Set gamemode
updateTargetGamemode(target, gamemode, gamemodeTranslation);
// Send success message to sender
if (!onSelf)
player.messageTranslatable(
LanguageString.GAMEMODE_REMOTE,
true,
entry("player", target.getUsername()),
entry("gamemode", TranslationManager.get(gamemodeTranslation, target, false))
);
}
/**
* Updates the gamemode of the specified target player.
*
* @param target target player to update the gamemode for
* @param gamemode gamemode to switch to
* @param gamemodeTranslation matching {@link LanguageString} for the specified gamemode
*/
private static void updateTargetGamemode(@NotNull PSPlayer target, @NotNull GameMode gamemode, @NotNull LanguageString gamemodeTranslation) {
target.setGamemode(gamemode);
// Send message
target.sendRichMessage(TranslationManager.get(
target.messageTranslatable(
LanguageString.GAMEMODE,
target,
true,
entry("gamemode", TranslationManager.get(gamemodeTranslation, target, false))
));
if (!onSelf)
sender.sendRichMessage(TranslationManager.get(
LanguageString.GAMEMODE_REMOTE,
sender,
true,
entry("player", target.getName()),
entry("gamemode", TranslationManager.get(gamemodeTranslation, target, false))
));
);
}
}

125
extension/src/main/java/de/jeremystartm/pickshadow/extension/command/survival/HomeCommand.java
View file

@ -20,17 +20,16 @@
package de.jeremystartm.pickshadow.extension.command.survival;
import de.jeremystartm.pickshadow.extension.api.command.Command;
import de.jeremystartm.pickshadow.extension.api.command.completion.StubTabCompletion;
import de.jeremystartm.pickshadow.extension.api.command.completion.StaticTabCompletion;
import de.jeremystartm.pickshadow.extension.api.command.TabCompletion;
import de.jeremystartm.pickshadow.extension.api.entity.player.PSPlayer;
import de.jeremystartm.pickshadow.extension.api.translation.LanguageString;
import de.jeremystartm.pickshadow.extension.api.translation.TranslationManager;
import lombok.Getter;
import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.bukkit.craftbukkit.command.ServerCommandSender;
import org.jetbrains.annotations.NotNull;
import java.util.Objects;
import java.util.Map;
import static java.util.Map.entry;
@ -52,7 +51,8 @@ public final class HomeCommand extends Command {
* @return tab completion
* @since v1-release0
*/
private final @NotNull TabCompletion completion = StubTabCompletion.completion();
private final @NotNull TabCompletion completion = new StaticTabCompletion()
.players("", 0);
/**
* Creates and initializes an instance of
@ -74,64 +74,83 @@ public final class HomeCommand extends Command {
/** {@inheritDoc} */
@Override
protected void invokeAll(@NotNull CommandSender sender, @NotNull String alias, @NotNull String[] arguments) {
if (checkPermission(sender, "pickshadow.command.home")) return;
protected void invokeConsole(@NotNull ServerCommandSender console, @NotNull String alias, @NotNull String @NotNull [] arguments) {
PSPlayer target;
boolean onSelf;
Player player;
// Get player
switch (arguments.length) {
case 0 -> {
onSelf = true;
// Check if command sender is a player
if (sender instanceof Player senderPlayer)
player = senderPlayer;
else {
sender.sendRichMessage(TranslationManager.get(LanguageString.ERROR_NOT_A_PLAYER, sender, true));
return;
}
}
case 1 -> {
player = Bukkit.getPlayer(arguments[0]);
// Parse arguments
try {
onSelf = !Objects.requireNonNull(player).getName().equals(sender.getName());
} catch (NullPointerException exception) {
onSelf = false;
target = determineTarget(console, arguments, 0).getKey();
} catch (Exception exception) {
return;
}
// Check if 'player' is null
if (player == null) {
sender.sendRichMessage(TranslationManager.get(LanguageString.ERROR_PLAYER_NOT_FOUND,
sender,
if (teleportTarget(target))
console.sendRichMessage(TranslationManager.get(
LanguageString.HOME_OTHER,
console,
true,
entry("player", arguments[0])
entry("target", target.getUsername())
));
return;
}
}
default -> {
sender.sendRichMessage(TranslationManager.get(LanguageString.ERROR_TOO_MANY_ARGUMENTS, sender, true));
return;
}
}
// Teleport player
if (player.getRespawnLocation() == null)
if (onSelf)
sender.sendRichMessage(TranslationManager.get(LanguageString.HOME_NORESPAWN, sender, true));
else
sender.sendRichMessage(TranslationManager.get(
console.sendRichMessage(TranslationManager.get(
LanguageString.HOME_NORESPAWN_OTHER,
sender,
console,
true,
entry("player", player.getName())
entry("target", target.getUsername())
));
}
/** {@inheritDoc} */
@Override
protected void invokePlayer(@NotNull PSPlayer player, @NotNull String alias, @NotNull String @NotNull [] arguments) {
if (checkPermission(player, "pickshadow.command.home")) return;
PSPlayer target;
boolean onSelf;
// Parse arguments
try {
Map.Entry<@NotNull PSPlayer, @NotNull Boolean> targetEntry = determineTarget(player, arguments, 0);
target = targetEntry.getKey();
onSelf = targetEntry.getValue();
} catch (Exception exception) {
return;
}
if (teleportTarget(target)) {
if (!onSelf)
player.messageTranslatable(
LanguageString.HOME_OTHER,
true,
entry("target", target.getUsername())
);
} else
if (onSelf)
player.messageTranslatable(LanguageString.HOME_NORESPAWN, true);
else
player.messageTranslatable(
LanguageString.HOME_NORESPAWN_OTHER,
true,
entry("target", target.getUsername())
);
}
/**
* Teleports the specified target player to their respawn point.
*
* @param target target to teleport
* @return teleportation successful?
* @since v1-release0
*/
private static boolean teleportTarget(@NotNull PSPlayer target) {
// Teleport target
if (target.getRespawnLocation() == null)
return false;
else {
player.teleport(player.getRespawnLocation());
player.setFallDistance(0f);
sender.sendRichMessage(TranslationManager.get(LanguageString.HOME, sender, true));
target.teleport(target.getRespawnLocation());
target.setFallDistance(0f);
target.messageTranslatable(LanguageString.HOME, true);
return true;
}
}
}

106
extension/src/main/java/de/jeremystartm/pickshadow/extension/command/survivalcheat/FeedCommand.java
View file

@ -22,15 +22,14 @@ package de.jeremystartm.pickshadow.extension.command.survivalcheat;
import de.jeremystartm.pickshadow.extension.api.command.Command;
import de.jeremystartm.pickshadow.extension.api.command.TabCompletion;
import de.jeremystartm.pickshadow.extension.api.command.completion.StaticTabCompletion;
import de.jeremystartm.pickshadow.extension.api.entity.player.PSPlayer;
import de.jeremystartm.pickshadow.extension.api.translation.LanguageString;
import de.jeremystartm.pickshadow.extension.api.translation.TranslationManager;
import lombok.Getter;
import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.bukkit.craftbukkit.command.ServerCommandSender;
import org.jetbrains.annotations.NotNull;
import java.util.Objects;
import java.util.*;
import static java.util.Map.entry;
@ -73,63 +72,70 @@ public final class FeedCommand extends Command {
), "feed");
}
/** {@inheritDoc} */
protected void invokeConsole(@NotNull ServerCommandSender console, @NotNull String alias, @NotNull String @NotNull [] arguments) {
PSPlayer target;
// Parse arguments
try {
target = determineTarget(console, arguments, 0).getKey();
} catch (Exception exception) {
return;
}
// Heal target
feedTarget(target);
// Send success message to console
console.sendRichMessage(TranslationManager.get(
LanguageString.HEAL_REMOTE,
console,
true,
entry("player", target.getUsername())
));
}
/** {@inheritDoc} */
@Override
protected void invokeAll(@NotNull CommandSender sender, @NotNull String alias, @NotNull String[] arguments) {
if (checkPermission(sender, "pickshadow.command.feed")) return;
Player player;
protected void invokePlayer(@NotNull PSPlayer player, @NotNull String alias, @NotNull String @NotNull [] arguments) {
if (checkPermission(player, "pickshadow.command.heal")) return;
PSPlayer target;
boolean onSelf;
// Get player
switch (arguments.length) {
case 0 -> {
onSelf = true;
// Check if command sender is a player
if (sender instanceof Player senderPlayer)
player = senderPlayer;
else {
sender.sendRichMessage(TranslationManager.get(LanguageString.ERROR_NOT_A_PLAYER, sender, true));
return;
}
}
case 1 -> {
player = Bukkit.getPlayer(arguments[0]);
// Parse arguments
try {
onSelf = Objects.requireNonNull(player).getName().equals(sender.getName());
} catch (NullPointerException exception) {
onSelf = false;
}
// Check if 'player' is null
if (player == null) {
sender.sendRichMessage(TranslationManager.get(LanguageString.ERROR_PLAYER_NOT_FOUND,
sender,
true,
entry("player", arguments[0])
));
Map.Entry<@NotNull PSPlayer, @NotNull Boolean> targetEntry = determineTarget(player, arguments, 0);
target = targetEntry.getKey();
onSelf = targetEntry.getValue();
} catch (Exception exception) {
return;
}
}
default -> {
sender.sendRichMessage(TranslationManager.get(LanguageString.ERROR_TOO_MANY_ARGUMENTS, sender, true));
return;
}
}
// Heal player
player.setFoodLevel(20);
feedTarget(target);
// Send success message to sender
if (!onSelf)
player.messageTranslatable(
LanguageString.FEED_REMOTE,
true,
entry("player", target.getUsername())
);
}
/**
* Heals the specified target player.
*
* @param target target player to heal
* @since v1-release0
*/
private static void feedTarget(@NotNull PSPlayer target) {
// Heal
target.setHunger(20);
target.setSaturation(20);
// Send success message
player.sendRichMessage(TranslationManager.get(LanguageString.FEED, player, true));
if (!onSelf)
sender.sendRichMessage(TranslationManager.get(
LanguageString.FEED_REMOTE,
sender,
true,
entry("player", player.getName())
));
target.messageTranslatable(LanguageString.FEED, true);
}
}

129
extension/src/main/java/de/jeremystartm/pickshadow/extension/command/survivalcheat/HealCommand.java
View file

@ -23,22 +23,18 @@ import de.jeremystartm.pickshadow.extension.BuildOptions;
import de.jeremystartm.pickshadow.extension.api.command.Command;
import de.jeremystartm.pickshadow.extension.api.command.TabCompletion;
import de.jeremystartm.pickshadow.extension.api.command.completion.StaticTabCompletion;
import de.jeremystartm.pickshadow.extension.api.entity.player.PSPlayer;
import de.jeremystartm.pickshadow.extension.api.translation.LanguageString;
import de.jeremystartm.pickshadow.extension.api.translation.TranslationManager;
import lombok.Getter;
import org.bukkit.Bukkit;
import org.bukkit.attribute.Attribute;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.bukkit.craftbukkit.command.ServerCommandSender;
import org.bukkit.event.entity.EntityRegainHealthEvent;
import org.bukkit.potion.PotionEffect;
import org.bukkit.potion.PotionEffectType;
import org.jetbrains.annotations.NotNull;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Objects;
import java.util.*;
import static java.util.Map.entry;
@ -84,77 +80,90 @@ public final class HealCommand extends Command {
}
/** {@inheritDoc} */
@Override
protected void invokeAll(@NotNull CommandSender sender, @NotNull String alias, @NotNull String[] arguments) {
if (checkPermission(sender, "pickshadow.command.heal")) return;
Player player;
protected void invokeConsole(@NotNull ServerCommandSender console, @NotNull String alias, @NotNull String @NotNull [] arguments) {
List<@NotNull String> argumentsList = new ArrayList<>(Arrays.stream(arguments).toList());
boolean allEffects;
boolean keepEffects;
PSPlayer target;
boolean onSelf;
boolean keepEffects = argumentsList.remove("--keep-effects");
boolean allEffects = argumentsList.remove("--all-effects");
// Get player
switch (argumentsList.size()) {
case 0 -> {
onSelf = true;
// Check if command sender is a player
if (sender instanceof Player senderPlayer)
player = senderPlayer;
else {
sender.sendRichMessage(TranslationManager.get(LanguageString.ERROR_NOT_A_PLAYER, sender, true));
return;
}
}
case 1 -> {
player = Bukkit.getPlayer(argumentsList.getFirst());
// Parse arguments
try {
onSelf = Objects.requireNonNull(player).getName().equals(sender.getName());
} catch (NullPointerException exception) {
onSelf = false;
allEffects = argumentsList.remove("--all-effects");
keepEffects = argumentsList.remove("--keep-effects");
target = determineTarget(console, argumentsList.toArray(new String[0]), 0).getKey();
} catch (Exception exception) {
return;
}
// Check if 'player' is null
if (player == null) {
sender.sendRichMessage(TranslationManager.get(LanguageString.ERROR_PLAYER_NOT_FOUND,
sender,
// Heal target
healTarget(target, allEffects, keepEffects);
// Send success message to console
console.sendRichMessage(TranslationManager.get(
LanguageString.HEAL_REMOTE,
console,
true,
entry("player", argumentsList.getFirst())
entry("player", target.getUsername())
));
}
/** {@inheritDoc} */
@Override
protected void invokePlayer(@NotNull PSPlayer player, @NotNull String alias, @NotNull String @NotNull [] arguments) {
if (checkPermission(player, "pickshadow.command.heal")) return;
List<@NotNull String> argumentsList = new ArrayList<>(Arrays.stream(arguments).toList());
boolean allEffects = argumentsList.remove("--all-effects");
boolean keepEffects = argumentsList.remove("--keep-effects");
PSPlayer target;
boolean onSelf;
// Parse arguments
try {
Map.Entry<@NotNull PSPlayer, @NotNull Boolean> targetEntry = determineTarget(player, argumentsList.toArray(new String[0]), 0);
target = targetEntry.getKey();
onSelf = targetEntry.getValue();
} catch (Exception exception) {
return;
}
}
default -> {
sender.sendRichMessage(TranslationManager.get(LanguageString.ERROR_TOO_MANY_ARGUMENTS, sender, true));
return;
}
}
// Heal player
player.heal(Objects.requireNonNull(player.getAttribute(Attribute.MAX_HEALTH)).getValue() - player.getHealth(), EntityRegainHealthEvent.RegainReason.MAGIC);
player.setFoodLevel(20);
player.setSaturation(20);
player.setRemainingAir(300);
healTarget(target, allEffects, keepEffects);
// Send success message to sender
if (!onSelf)
player.messageTranslatable(
LanguageString.HEAL_REMOTE,
true,
entry("player", target.getUsername())
);
}
/**
* Heals the specified target player.
*
* @param target target player to heal
* @param allEffects whether to remove all effects
* @param keepEffects whether to keep all effects
* @since v1-release0
*/
private static void healTarget(@NotNull PSPlayer target, boolean allEffects, boolean keepEffects) {
// Heal
target.heal(Objects.requireNonNull(target.getAttribute(Attribute.MAX_HEALTH)).getValue() - target.getHealth(), EntityRegainHealthEvent.RegainReason.MAGIC);
target.setHunger(20);
target.setSaturation(20);
target.setAirLeft(300);
// Reset bad or all effects
if (!keepEffects)
if (allEffects)
for (PotionEffect effect : player.getActivePotionEffects())
player.removePotionEffect(effect.getType());
for (PotionEffect effect : target.getPotions())
target.removePotion(effect.getType());
else
for (PotionEffectType effectType : BuildOptions.SETTINGS_EFFECTS_DAMAGING)
player.removePotionEffect(effectType);
target.removePotion(effectType);
// Send success message
player.sendRichMessage(TranslationManager.get(LanguageString.HEAL, player, true));
if (!onSelf)
sender.sendRichMessage(TranslationManager.get(
LanguageString.HEAL_REMOTE,
sender,
true,
entry("player", player.getName())
));
target.messageTranslatable(LanguageString.HEAL, true);
}
}

12
extension/src/main/java/de/jeremystartm/pickshadow/extension/listener/ChatListener.java
View file

@ -68,20 +68,18 @@ public final class ChatListener implements Listener {
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
public void handleChatMessage(@NotNull AsyncChatEvent event) {
PSPlayer player = PSPlayerFactory.get(event.getPlayer());
String message = MiniMessage.miniMessage().serialize(event.originalMessage());
// Cancel chat message
event.setCancelled(true);
// Broadcast the message ourselves
if (!BuildOptions.SMALLSTUFF_CHAT_COMMENTS || !MiniMessage.miniMessage().serialize(event.originalMessage()).startsWith("#"))
PSPlayer.broadcast(
TranslationManager.get(
if (!BuildOptions.SMALLSTUFF_CHAT_COMMENTS || !message.startsWith("#"))
PSPlayer.broadcastTranslatable(
LanguageString.MESSAGING_SERVER,
player.getBukkitPlayer(),
false,
entry("sender", player.getUsername())
)
+ MiniMessage.miniMessage().serialize(event.originalMessage()).replace("\\<", "<")
entry("sender", player.getUsername()),
entry("message", message.replace("\\<", "<"))
);
}

2
extension/src/main/java/de/jeremystartm/pickshadow/extension/misc/DamageDetection.java
View file

@ -68,7 +68,7 @@ public final class DamageDetection {
if (BuildOptions.SMALLSTUFF_STONECUTTER_DAMAGE)
switch (player.getData().getDamageState(STONECUTTER)) {
case -1 -> {
Location location = player.getPosition().clone();
Location location = player.getLocation().clone();
location.setX((long) location.getX() - 1);
location.setY(((long) location.getY()));
location.setZ((long) location.getZ());

7
extension/src/main/resources/translations/de.json
View file

@ -29,10 +29,10 @@
"MESSAGING_ERROR_NOLASTCONTACT": "<error>Du hast in der letzten Zeit keinen angeschrieben.</error>",
"LINKS_WEBSITE": "<error>Das PickShadow Netzwerk hat aktuell keine Webseite.</error>",
"LINKS_FORUM": "<error>Das PickShadow Netzwerk hat aktuell kein Forum.</error>",
"LINKS_DISCORD": "<error>Das PickShadow Netzwerk hat aktuell keine Discord Guilde.</error>",
"LINKS_TEAMSPEAK": "<error>Das PickShadow Netzwerk hat aktuell keinen TeamSpeak Server.</error>",
"LINKS_MESSAGEBOARD": "<error>Das PickShadow Netzwerk hat aktuell kein Forum.</error>",
"LINKS_MUMBLE": "<error>Das PickShadow Netzwerk hat aktuell keinen Mumble Server.</error>",
"LINKS_TEAMSPEAK": "<error>Das PickShadow Netzwerk hat aktuell keinen TeamSpeak Server.</error>",
"LINKS_DISCORD": "<error>Das PickShadow Netzwerk hat aktuell keine Discord Guilde.</error>",
"CLEARCHAT_GENERIC": "<generic>Der Chat wurde von %sender% geleert.</generic>",
"CLEARCHAT_VOID": "<generic>Der Chat wurde von %sender% ins Void geschubst.</generic>",
@ -40,6 +40,7 @@
"CLEARCHAT_BRAINDAMAGE": "<generic>Um weitverbreitenden Gehirnschaden zu verhinden, hat %sender% den Chat geleert.</generic>",
"CLEARCHAT_CRINGE": "<generic>Aufgrund von Massen an Cringe musste %sender% den Chat leeren.</generic>",
"HOME_OTHER": "<generic><mention>%target%</mention> wurde zu seinem/ihrem Respawnpunkt teleportiert.</generic>",
"HOME_NORESPAWN": "<error>Du hast keinen gültigen Respawnpunkt.</error>\n<error>Stelle sicher, dass dein Bett oder Respawn Anker nicht abgebaut oder behindert ist.</error>",
"HOME_NORESPAWN_OTHER": "<error><mention>%player%</mention> hat keinen gültigen Respawnpunkt.</error>\n<error><mention>%player%</mention>'s Bett oder Respawn Anker wurde entweder abgebaut oder ist behindert.</error>",

12
extension/src/main/resources/translations/en.json
View file

@ -36,17 +36,17 @@
"LEGACYEXTENSIONCMD": "<error>What's <mention>PSSP</mention>...?</error>\n<error>The PickShadow Server <italic>Plugin</italic> (PSSP) has been renamed into PickShadow Server <italic>Extension</italic> (PSSE).</error>\n<error>Please use the new name from now on. Thank you.</error>",
"MESSAGING_SERVER": "<mention>%sender%</mention> <#d60532>»</#d60532> ",
"MESSAGING_SERVER": "<mention>%sender%</mention> <#d60532>»</#d60532> %message%",
"MESSAGING_DIRECT": "<generic><mention>%from%</mention> » <mention>%to%</mention> » </generic>%message%",
"MESSAGING_LASTCONTACT": "<generic>The last person you've messaged is <mention>%contact%</mention>.</generic>",
"MESSAGING_ERROR_SELF": "<error>You can't message yourself.</error>",
"MESSAGING_ERROR_NOLASTCONTACT": "<error>You haven't messaged anyone recently.</error>",
"LINKS_WEBSITE": "<error>The PickShadow Network doesn't currently have a website.</error>",
"LINKS_FORUM": "<error>The PickShadow Network doesn't currently have a forum.</error>",
"LINKS_DISCORD": "<error>The PickShadow Network doesn't currently have a Discord guild.</error>",
"LINKS_TEAMSPEAK": "<error>The PickShadow Network doesn't currently have a TeamSpeak server.</error>",
"LINKS_MESSAGEBOARD": "<error>The PickShadow Network doesn't currently have a forum.</error>",
"LINKS_MUMBLE": "<error>The PickShadow Network doesn't currently have a Mumble server.</error>",
"LINKS_TEAMSPEAK": "<error>The PickShadow Network doesn't currently have a TeamSpeak server.</error>",
"LINKS_DISCORD": "<error>The PickShadow Network doesn't currently have a Discord guild.</error>",
"CLEARCHAT_GENERIC": "<generic>The chat has been cleared by %sender%.</generic>",
"CLEARCHAT_VOID": "<generic>The chat has been pushed into the void by %sender%.</generic>",
@ -55,6 +55,7 @@
"CLEARCHAT_CRINGE": "<generic>Due to masses of cringe, %sender% had to clear the chat.</generic>",
"HOME": "<generic><italic>... woosh ...</italic></generic>",
"HOME_OTHER": "<generic><mention>%target%</mention> was teleported to their spawn point.</generic>",
"HOME_NORESPAWN": "<error>You do not have a valid respawn point.</error>\n<error>Please make sure your bed or respawn anchor isn't missing or obstructed.</error>",
"HOME_NORESPAWN_OTHER": "<error><mention>%player%</mention> does not have a valid respawn point.</error>\n<error><mention>%player%</mention>'s bed or respawn anchor is either missing or obstructed.</error>",
@ -76,6 +77,9 @@
"HEAL": "<generic>You have been healed.</generic>",
"HEAL_REMOTE": "<generic><mention>%player%</mention> has been healed.</generic>",
"FEED": "<generic>You have been fed.</generic>",
"FEED_REMOTE": "<generic><mention>%player%</mention> has been fed.</generic>",
"PLUGINS": "<generic><mention>%count%</mention> extensions are installed on this subserver, these being:</generic>",
"PLUGINS_FAKE": "<generic>Do you really think you can get internal information so easily?</generic>\n<generic>Luckily, we aren't dicks and credit what we use.\n<generic>The PickShadow network uses <click:open_url:%link_psse%><link>PSSE</link></click>, <click:open_url:%link_luckperms%><link>LuckPerms</link></click>, <click:open_url:%link_viaversion%><link>ViaVersion</link></click> and <click:open_url:%link_freedomchat%><link>FreedomChat</link></click> to manage subservers.",
"PLUGINS_ENTRY_PREFIX": "<generic>- ",