mirror of
https://github.com/SimplexDevelopment/FreedomNetworkSuite.git
synced 2024-11-13 04:33:33 +00:00
Minor update
This commit is contained in:
parent
5f6e7a153e
commit
b9a5440733
@ -0,0 +1,26 @@
|
|||||||
|
package me.totalfreedom.datura.cmd;
|
||||||
|
|
||||||
|
import me.totalfreedom.command.CommandBase;
|
||||||
|
import me.totalfreedom.command.annotation.Completion;
|
||||||
|
import me.totalfreedom.command.annotation.Info;
|
||||||
|
import me.totalfreedom.command.annotation.Permissive;
|
||||||
|
import me.totalfreedom.command.annotation.Subcommand;
|
||||||
|
import me.totalfreedom.datura.Datura;
|
||||||
|
import org.bukkit.entity.Player;
|
||||||
|
|
||||||
|
@Completion(args = {"%player%"}, index = 0)
|
||||||
|
@Info(name = "kick", description = "Kick a player from the server.", usage = "/kick <player>")
|
||||||
|
@Permissive(perm = "datura.kick")
|
||||||
|
public class KickCommand extends CommandBase
|
||||||
|
{
|
||||||
|
protected KickCommand(final Datura plugin)
|
||||||
|
{
|
||||||
|
super(plugin);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Subcommand(permission = "datura.kick", args = {Player.class})
|
||||||
|
public void kick(final Player player)
|
||||||
|
{
|
||||||
|
player.kickPlayer("You have been kicked from the server.");
|
||||||
|
}
|
||||||
|
}
|
@ -1,30 +0,0 @@
|
|||||||
package me.totalfreedom.fossil.command;
|
|
||||||
|
|
||||||
import me.totalfreedom.command.CommandBase;
|
|
||||||
import me.totalfreedom.command.annotation.Base;
|
|
||||||
import me.totalfreedom.command.annotation.Info;
|
|
||||||
import me.totalfreedom.command.annotation.Permissive;
|
|
||||||
import me.totalfreedom.command.annotation.Subcommand;
|
|
||||||
import me.totalfreedom.fossil.Fossil;
|
|
||||||
import net.kyori.adventure.text.Component;
|
|
||||||
import org.bukkit.command.CommandSender;
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
|
|
||||||
@Info(name = "kick", description = "Kick a player", usage = "/<command> <player>")
|
|
||||||
@Permissive(perm = "fossil.kick")
|
|
||||||
public class KickCommand extends CommandBase
|
|
||||||
{
|
|
||||||
public KickCommand(final Fossil plugin) {
|
|
||||||
super(plugin);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Base
|
|
||||||
public void run(final CommandSender sender) {
|
|
||||||
sender.sendMessage(Component.text("You must specify a player to kick."));
|
|
||||||
}
|
|
||||||
|
|
||||||
@Subcommand(permission = "fossil.kick", args = {Player.class, String.class})
|
|
||||||
public void kickPlayer(final Player player, final String string) {
|
|
||||||
player.kick(Component.text(string));
|
|
||||||
}
|
|
||||||
}
|
|
8
Fossil/src/main/resources/plugin.yml
Normal file
8
Fossil/src/main/resources/plugin.yml
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
name: Fossil
|
||||||
|
version: 1.0
|
||||||
|
main: me.totalfreedom.fossil.Fossil
|
||||||
|
author: TotalFreedom
|
||||||
|
description: The Fun Module for the Freedom Network.
|
||||||
|
depend:
|
||||||
|
- Datura
|
||||||
|
- Patchwork
|
@ -11,11 +11,18 @@ import org.bukkit.event.block.Action;
|
|||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
|
||||||
|
import java.util.function.Function;
|
||||||
|
|
||||||
@FunctionalInterface
|
@FunctionalInterface
|
||||||
public interface Context<T>
|
public interface Context<T>
|
||||||
{
|
{
|
||||||
T get();
|
T get();
|
||||||
|
|
||||||
|
default <S> Context<S> map(@NotNull final Function<T, S> mapper)
|
||||||
|
{
|
||||||
|
return () -> mapper.apply(get());
|
||||||
|
}
|
||||||
|
|
||||||
default @Nullable String asString()
|
default @Nullable String asString()
|
||||||
{
|
{
|
||||||
if (get() instanceof String string)
|
if (get() instanceof String string)
|
||||||
|
@ -1,19 +1,25 @@
|
|||||||
package me.totalfreedom.command;
|
package me.totalfreedom.command;
|
||||||
|
|
||||||
import me.totalfreedom.api.Context;
|
import me.totalfreedom.api.Context;
|
||||||
|
import me.totalfreedom.command.annotation.Completion;
|
||||||
import me.totalfreedom.command.annotation.Subcommand;
|
import me.totalfreedom.command.annotation.Subcommand;
|
||||||
import me.totalfreedom.provider.ContextProvider;
|
import me.totalfreedom.provider.ContextProvider;
|
||||||
import me.totalfreedom.utils.FreedomLogger;
|
import me.totalfreedom.utils.FreedomLogger;
|
||||||
import net.kyori.adventure.text.Component;
|
import net.kyori.adventure.text.Component;
|
||||||
|
import org.bukkit.Bukkit;
|
||||||
|
import org.bukkit.World;
|
||||||
import org.bukkit.command.Command;
|
import org.bukkit.command.Command;
|
||||||
import org.bukkit.command.CommandSender;
|
import org.bukkit.command.CommandSender;
|
||||||
import org.bukkit.command.ConsoleCommandSender;
|
import org.bukkit.command.ConsoleCommandSender;
|
||||||
import org.bukkit.command.PluginIdentifiableCommand;
|
import org.bukkit.command.PluginIdentifiableCommand;
|
||||||
|
import org.bukkit.entity.Player;
|
||||||
import org.bukkit.plugin.Plugin;
|
import org.bukkit.plugin.Plugin;
|
||||||
import org.bukkit.plugin.java.JavaPlugin;
|
import org.bukkit.plugin.java.JavaPlugin;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
|
import java.util.List;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
public class BukkitDelegator extends Command implements PluginIdentifiableCommand
|
public class BukkitDelegator extends Command implements PluginIdentifiableCommand
|
||||||
@ -25,8 +31,8 @@ public class BukkitDelegator extends Command implements PluginIdentifiableComman
|
|||||||
BukkitDelegator(final JavaPlugin plugin, final CommandBase command)
|
BukkitDelegator(final JavaPlugin plugin, final CommandBase command)
|
||||||
{
|
{
|
||||||
super(command.getInfo().name());
|
super(command.getInfo().name());
|
||||||
this.plugin = plugin;
|
|
||||||
this.command = command;
|
this.command = command;
|
||||||
|
this.plugin = command.getPlugin();
|
||||||
this.setDescription(command.getInfo().description());
|
this.setDescription(command.getInfo().description());
|
||||||
this.setUsage(command.getInfo().usage());
|
this.setUsage(command.getInfo().usage());
|
||||||
this.setPermission(command.getPerms().perm());
|
this.setPermission(command.getPerms().perm());
|
||||||
@ -80,7 +86,7 @@ public class BukkitDelegator extends Command implements PluginIdentifiableComman
|
|||||||
final Context<?> context = () -> provider.fromString(arg);
|
final Context<?> context = () -> provider.fromString(arg);
|
||||||
if (!argType.isInstance(context.get()))
|
if (!argType.isInstance(context.get()))
|
||||||
{
|
{
|
||||||
throw new IllegalStateException();
|
throw new IllegalStateException(); // TODO: Change this.
|
||||||
}
|
}
|
||||||
objects = Arrays.copyOf(objects, objects.length + 1);
|
objects = Arrays.copyOf(objects, objects.length + 1);
|
||||||
objects[objects.length - 1] = context.get();
|
objects[objects.length - 1] = context.get();
|
||||||
@ -113,6 +119,50 @@ public class BukkitDelegator extends Command implements PluginIdentifiableComman
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<String> tabComplete(final CommandSender sender, final String alias, final String[] args)
|
||||||
|
{
|
||||||
|
final Set<Completion> completions = command.getCompletions();
|
||||||
|
final List<String> results = new ArrayList<>();
|
||||||
|
for (final Completion completion : completions)
|
||||||
|
{
|
||||||
|
if (completion.index() != args.length)
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (final String p : completion.args())
|
||||||
|
{
|
||||||
|
switch (p)
|
||||||
|
{
|
||||||
|
case "%player%" -> results.addAll(Bukkit.getOnlinePlayers()
|
||||||
|
.stream()
|
||||||
|
.map(Player::getName)
|
||||||
|
.toList());
|
||||||
|
case "%world%" -> results.addAll(Bukkit.getWorlds()
|
||||||
|
.stream()
|
||||||
|
.map(World::getName)
|
||||||
|
.toList());
|
||||||
|
case "%number%" -> results.addAll(List.of(
|
||||||
|
"0",
|
||||||
|
"1",
|
||||||
|
"2",
|
||||||
|
"3",
|
||||||
|
"4",
|
||||||
|
"5",
|
||||||
|
"6",
|
||||||
|
"7",
|
||||||
|
"8",
|
||||||
|
"9"));
|
||||||
|
case "%location%" -> results.add("world,x,y,z");
|
||||||
|
default -> results.add(p);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return results.stream().filter(s -> s.startsWith(args[args.length - 1])).toList();
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public @NotNull Plugin getPlugin()
|
public @NotNull Plugin getPlugin()
|
||||||
{
|
{
|
||||||
|
@ -1,15 +1,14 @@
|
|||||||
package me.totalfreedom.command;
|
package me.totalfreedom.command;
|
||||||
|
|
||||||
import me.totalfreedom.command.annotation.Base;
|
import me.totalfreedom.command.annotation.*;
|
||||||
import me.totalfreedom.command.annotation.Info;
|
|
||||||
import me.totalfreedom.command.annotation.Permissive;
|
|
||||||
import me.totalfreedom.command.annotation.Subcommand;
|
|
||||||
import me.totalfreedom.utils.Pair;
|
import me.totalfreedom.utils.Pair;
|
||||||
|
import net.kyori.adventure.text.Component;
|
||||||
|
import net.kyori.adventure.text.format.NamedTextColor;
|
||||||
|
import org.bukkit.command.CommandSender;
|
||||||
import org.bukkit.plugin.java.JavaPlugin;
|
import org.bukkit.plugin.java.JavaPlugin;
|
||||||
|
|
||||||
import java.lang.reflect.Method;
|
import java.lang.reflect.Method;
|
||||||
import java.util.HashMap;
|
import java.util.*;
|
||||||
import java.util.Map;
|
|
||||||
import java.util.stream.Stream;
|
import java.util.stream.Stream;
|
||||||
|
|
||||||
public abstract class CommandBase
|
public abstract class CommandBase
|
||||||
@ -18,6 +17,7 @@ public abstract class CommandBase
|
|||||||
private final Info info;
|
private final Info info;
|
||||||
private final Permissive perms;
|
private final Permissive perms;
|
||||||
private final Map<Subcommand, Method> subcommands;
|
private final Map<Subcommand, Method> subcommands;
|
||||||
|
private final Set<Completion> completions;
|
||||||
private final Pair<Base, Method> baseMethodPair;
|
private final Pair<Base, Method> baseMethodPair;
|
||||||
|
|
||||||
protected CommandBase(final JavaPlugin plugin)
|
protected CommandBase(final JavaPlugin plugin)
|
||||||
@ -26,6 +26,7 @@ public abstract class CommandBase
|
|||||||
this.perms = this.getClass().getDeclaredAnnotation(Permissive.class);
|
this.perms = this.getClass().getDeclaredAnnotation(Permissive.class);
|
||||||
this.plugin = plugin;
|
this.plugin = plugin;
|
||||||
this.subcommands = new HashMap<>();
|
this.subcommands = new HashMap<>();
|
||||||
|
this.completions = new HashSet<>();
|
||||||
|
|
||||||
if (this.getClass().isAnnotationPresent(Base.class))
|
if (this.getClass().isAnnotationPresent(Base.class))
|
||||||
{
|
{
|
||||||
@ -40,9 +41,20 @@ public abstract class CommandBase
|
|||||||
this.baseMethodPair = null;
|
this.baseMethodPair = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
registerAnnotations();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void registerAnnotations()
|
||||||
|
{
|
||||||
Stream.of(this.getClass().getDeclaredMethods())
|
Stream.of(this.getClass().getDeclaredMethods())
|
||||||
.filter(method -> method.isAnnotationPresent(Subcommand.class))
|
.filter(method -> method.isAnnotationPresent(Subcommand.class))
|
||||||
.forEach(method -> this.subcommands.put(method.getDeclaredAnnotation(Subcommand.class), method));
|
.forEach(method -> this.subcommands.put(
|
||||||
|
method.getDeclaredAnnotation(Subcommand.class),
|
||||||
|
method));
|
||||||
|
|
||||||
|
List.of(this.getClass().getDeclaredAnnotationsByType(Completion.class))
|
||||||
|
.stream()
|
||||||
|
.forEach(completions::add);
|
||||||
}
|
}
|
||||||
|
|
||||||
public Pair<Base, Method> getBaseMethodPair()
|
public Pair<Base, Method> getBaseMethodPair()
|
||||||
@ -69,4 +81,9 @@ public abstract class CommandBase
|
|||||||
{
|
{
|
||||||
return this.subcommands;
|
return this.subcommands;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Set<Completion> getCompletions()
|
||||||
|
{
|
||||||
|
return this.completions;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -0,0 +1,15 @@
|
|||||||
|
package me.totalfreedom.command.annotation;
|
||||||
|
|
||||||
|
import java.lang.annotation.ElementType;
|
||||||
|
import java.lang.annotation.Retention;
|
||||||
|
import java.lang.annotation.RetentionPolicy;
|
||||||
|
import java.lang.annotation.Target;
|
||||||
|
|
||||||
|
@Target(ElementType.TYPE)
|
||||||
|
@Retention(RetentionPolicy.RUNTIME)
|
||||||
|
public @interface Completion
|
||||||
|
{
|
||||||
|
String[] args();
|
||||||
|
|
||||||
|
int index();
|
||||||
|
}
|
@ -6,8 +6,6 @@ import java.lang.annotation.RetentionPolicy;
|
|||||||
@Retention(RetentionPolicy.RUNTIME)
|
@Retention(RetentionPolicy.RUNTIME)
|
||||||
public @interface Subcommand
|
public @interface Subcommand
|
||||||
{
|
{
|
||||||
String name() default "";
|
|
||||||
|
|
||||||
String permission();
|
String permission();
|
||||||
|
|
||||||
Class<?>[] args() default {};
|
Class<?>[] args() default {};
|
||||||
|
11
Patchwork/src/main/java/me/totalfreedom/particle/Trail.java
Normal file
11
Patchwork/src/main/java/me/totalfreedom/particle/Trail.java
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
package me.totalfreedom.particle;
|
||||||
|
|
||||||
|
import org.bukkit.Color;
|
||||||
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
|
||||||
|
public interface Trail
|
||||||
|
{
|
||||||
|
TrailType getTrailType();
|
||||||
|
|
||||||
|
@Nullable Color getColor();
|
||||||
|
}
|
@ -0,0 +1,32 @@
|
|||||||
|
package me.totalfreedom.particle;
|
||||||
|
|
||||||
|
import org.bukkit.Particle;
|
||||||
|
|
||||||
|
public enum TrailType
|
||||||
|
{
|
||||||
|
DEFAULT(Particle.REDSTONE),
|
||||||
|
HEART(Particle.HEART),
|
||||||
|
FLAME(Particle.FLAME),
|
||||||
|
RAINBOW(Particle.REDSTONE),
|
||||||
|
MUSIC(Particle.NOTE),
|
||||||
|
SNOW(Particle.SNOWBALL),
|
||||||
|
SPELL(Particle.SPELL_MOB),
|
||||||
|
SPELL_AMBIENT(Particle.SPELL_MOB_AMBIENT),
|
||||||
|
PORTAL(Particle.PORTAL),
|
||||||
|
ENCHANTMENT(Particle.ENCHANTMENT_TABLE),
|
||||||
|
STROBE(Particle.DUST_COLOR_TRANSITION),
|
||||||
|
VIBRATION(Particle.VIBRATION),
|
||||||
|
SPARK(Particle.ELECTRIC_SPARK);
|
||||||
|
|
||||||
|
final Particle type;
|
||||||
|
|
||||||
|
TrailType(final Particle type)
|
||||||
|
{
|
||||||
|
this.type = type;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Particle getType()
|
||||||
|
{
|
||||||
|
return type;
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user