Merge pull request #5 from notsceptor/master

Reintroduced the clownfish and fixed an issue with orbit
This commit is contained in:
Telesphoreo 2024-04-22 22:44:00 -05:00 committed by GitHub
commit 42009275eb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 252 additions and 1 deletions

View file

@ -93,9 +93,11 @@ public class TFMExtras extends PlexModule
}
});
addDefaultMessage("playerOrbited", "<aqua>{0} - Orbiting {1}", "0 - The command sender, 1 - The person being orbited");
addDefaultMessage("playerOrbited", "<aqua>{0} - Orbiting {1}", "0 - The command sender", "1 - The person being orbited");
addDefaultMessage("stoppedOrbiting", "<aqua>No longer orbiting {0}", "0 - The person no longer being orbited");
addDefaultMessage("alreadyOrbited", "<red>{0} is already being orbited!", "0 - The person that is already orbited");
addDefaultMessage("restrictClownfish", "<gold>{0} will {1} be able to use the clownfish.", "0 - The player who will be restricted", "1 - Whether they had this option toggled (returns: 'no longer', 'now')");
addDefaultMessage("toggleClownfish", "<gray>You will {0} be affected by the clownfish.", "0 - Whether they had this option toggled (returns: 'no longer', 'now')");
addDefaultMessage("emptyAdminInfo", "<red>The admin information section of the config.yml file has not been configured.");
addDefaultMessage("cakeLyrics", "<rainbow>But there's no sense crying over every mistake. You just keep on trying till you run out of cake.");
addDefaultMessage("areaEffectCloudClear", "<red>{0} - Removing all area effect clouds", "0 - The command sender");

View file

@ -0,0 +1,120 @@
package dev.plex.extras.command;
import dev.plex.cache.DataUtils;
import dev.plex.command.PlexCommand;
import dev.plex.command.annotation.CommandParameters;
import dev.plex.command.annotation.CommandPermissions;
import dev.plex.command.exception.PlayerNotFoundException;
import dev.plex.extras.TFMExtras;
import dev.plex.player.PlexPlayer;
import dev.plex.util.PlexUtils;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.minimessage.MiniMessage;
import org.bukkit.Material;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
@CommandParameters(name = "clownfish", description = "Gives a player a clownfish capable of knocking people back", usage = "/<command> [<toggle>]")
@CommandPermissions(permission = "plex.tfmextras.clownfish")
public class ClownfishCommand extends PlexCommand
{
@Override
protected Component execute(@NotNull CommandSender commandSender, @Nullable Player player, @NotNull String[] args)
{
if (args.length == 0)
{
ItemStack clownfish = new ItemStack(Material.TROPICAL_FISH);
ItemMeta meta = clownfish.getItemMeta();
meta.displayName(Component.text("Clownfish"));
clownfish.setItemMeta(meta);
player.getInventory().addItem(clownfish);
return MiniMessage.miniMessage().deserialize("<rainbow>blub blub... ><_>");
}
else if (args[0].equals("toggle"))
{
List<String> toggledPlayers = TFMExtras.getModule().getConfig().getStringList("server.clownfish.toggled_players");
boolean isToggled = toggledPlayers.contains(player.getUniqueId().toString());
if (isToggled)
{
toggledPlayers.remove(player.getUniqueId().toString());
}
else
{
toggledPlayers.add(player.getUniqueId().toString());
}
TFMExtras.getModule().getConfig().set("server.clownfish.toggled_players", toggledPlayers);
TFMExtras.getModule().getConfig().save();
return messageComponent("toggleClownfish", isToggled ? "now" : "no longer");
}
else if (args[0].equals("restrict") && args.length == 2)
{
if (silentCheckPermission(commandSender, "plex.tfmextras.clownfish.restrict"))
{
PlexPlayer target = DataUtils.getPlayer(args[1]);
if (target == null)
{
throw new PlayerNotFoundException();
}
List<String> restrictedPlayers = TFMExtras.getModule().getConfig().getStringList("server.clownfish.restricted");
boolean isRestricted = restrictedPlayers.contains(target.getUuid().toString());
if (isRestricted)
{
restrictedPlayers.remove(target.getUuid().toString());
}
else
{
restrictedPlayers.add(target.getUuid().toString());
}
TFMExtras.getModule().getConfig().set("server.clownfish.restricted", restrictedPlayers);
TFMExtras.getModule().getConfig().save();
return messageComponent("restrictClownfish", target.getName(), isRestricted ? "now" : "no longer");
}
else
{
return MiniMessage.miniMessage().deserialize("<red>You do not have permission to use this command.");
}
}
else
{
return usage();
}
}
@Override
public @NotNull List<String> smartTabComplete(@NotNull CommandSender sender, @NotNull String alias, @NotNull String[] args) throws IllegalArgumentException {
if (silentCheckPermission(sender, "plex.tfmextras.clownfish.restrict"))
{
if (args.length == 1)
{
return Arrays.asList("toggle", "restrict");
}
else if (args.length == 2 && args[0].equals("restrict"))
{
return PlexUtils.getPlayerNameList();
}
}
else if (args.length == 1)
{
return List.of("toggle");
}
return Collections.emptyList();
}
}

View file

@ -0,0 +1,106 @@
package dev.plex.extras.listener;
import dev.plex.extras.TFMExtras;
import dev.plex.listener.PlexListener;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.minimessage.MiniMessage;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.Sound;
import org.bukkit.Particle;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.block.Action;
import org.bukkit.event.player.PlayerInteractEvent;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta;
import org.bukkit.util.Vector;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.Random;
public class ClownfishListener extends PlexListener
{
@EventHandler
public void onPlayerInteract(PlayerInteractEvent event)
{
Player player = event.getPlayer();
if (!player.hasPermission("plex.tfmextras.clownfish"))
{
return;
}
if (event.getAction() == Action.RIGHT_CLICK_AIR || event.getAction() == Action.RIGHT_CLICK_BLOCK)
{
ItemStack item = player.getInventory().getItemInMainHand();
if (item.getType() == Material.TROPICAL_FISH && item.hasItemMeta())
{
ItemMeta meta = item.getItemMeta();
if (meta.hasDisplayName() && Objects.equals(meta.displayName(), Component.text("Clownfish")))
{
final List<String> restrictedPlayers = TFMExtras.getModule().getConfig().getStringList("server.clownfish.restricted");
if (restrictedPlayers.contains(player.getUniqueId().toString()))
{
player.sendMessage(MiniMessage.miniMessage().deserialize("<gray>You have been restricted from using the clownfish"));
return;
}
double radius = TFMExtras.getModule().getConfig().getInt("server.clownfish.radius");
double strength = TFMExtras.getModule().getConfig().getInt("server.clownfish.strength");
List<String> pushedPlayers = new ArrayList<>();
final Vector senderPos = player.getLocation().toVector();
final List<Player> players = player.getWorld().getPlayers();
final List<String> toggledPlayers = TFMExtras.getModule().getConfig().getStringList("server.clownfish.toggled_players");
for (final Player target : players)
{
if (target.equals(player) || toggledPlayers.contains(target.getUniqueId().toString()))
{
continue;
}
final Location targetPos = target.getLocation();
final Vector targetPosVec = targetPos.toVector();
if (targetPosVec.distanceSquared(senderPos) < (radius * radius))
{
target.setFlying(false);
for (Sound sound : Sound.values())
{
if (sound.toString().contains("HIT"))
{
target.playSound(target.getLocation(), sound, 100.0f, 0.5f + new Random().nextFloat() * 2.0f);
}
}
target.getWorld().spawnParticle(Particle.CLOUD, target.getLocation(), 5);
target.setVelocity(targetPosVec.subtract(senderPos).normalize().multiply(strength));
pushedPlayers.add(target.getName());
}
}
if (!pushedPlayers.isEmpty())
{
for (Sound sound : Sound.values())
{
if (sound.toString().contains("HIT"))
{
player.playSound(player.getLocation(), sound, 100.0f, 0.5f + new Random().nextFloat() * 2.0f);
}
}
}
}
}
}
}
}

View file

@ -3,11 +3,13 @@ package dev.plex.extras.listener;
import dev.plex.Plex;
import dev.plex.extras.command.OrbitCommand;
import org.bukkit.Bukkit;
import org.bukkit.GameMode;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import dev.plex.listener.PlexListener;
import org.bukkit.event.entity.EntityPotionEffectEvent;
import org.bukkit.event.player.PlayerGameModeChangeEvent;
import org.bukkit.potion.PotionEffect;
import org.bukkit.potion.PotionEffectType;
@ -32,4 +34,18 @@ public class OrbitEffectListener extends PlexListener
}
}
}
@EventHandler(priority = EventPriority.LOWEST)
public void onPlayerGameModeChange(PlayerGameModeChangeEvent event)
{
Player player = event.getPlayer();
Bukkit.getScheduler().runTaskLater(Plex.get(), () ->
{
if (OrbitCommand.isPlayerOrbited(player.getUniqueId()) && event.getNewGameMode() != GameMode.SURVIVAL)
{
player.setGameMode(GameMode.SURVIVAL);
}
}, 2);
}
}

View file

@ -12,5 +12,12 @@ server:
teleport-on-join:
- "Taahh"
allow-unsafe-enchantments: true
clownfish:
radius: 5
strength: 2.5
toggled_players:
- "9285ace6-7393-45c5-9420-00fc66374ff4"
restricted:
- "9285ace6-7393-45c5-9420-00fc66374ff4"
player-worlds:
size: 500