From 513c6a647febfbfa4b6aa5d309c4eb32f2d91e39 Mon Sep 17 00:00:00 2001 From: dfsek Date: Wed, 10 Mar 2021 02:54:03 -0700 Subject: [PATCH] Bukkit command cleanup --- .../command/structure/SpawnCommand.java | 64 -------------- .../command/structure/StructureCommand.java | 3 +- .../command/structure/load/LoadCommand.java | 55 ------------ .../structure/load/LoadFullCommand.java | 85 ------------------- 4 files changed, 1 insertion(+), 206 deletions(-) delete mode 100644 platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/structure/SpawnCommand.java delete mode 100644 platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/structure/load/LoadCommand.java delete mode 100644 platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/structure/load/LoadFullCommand.java diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/structure/SpawnCommand.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/structure/SpawnCommand.java deleted file mode 100644 index c46556751..000000000 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/structure/SpawnCommand.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.dfsek.terra.bukkit.command.command.structure; - -import com.dfsek.terra.api.structures.parser.lang.constants.NumericConstant; -import com.dfsek.terra.api.structures.script.TerraImplementationArguments; -import com.dfsek.terra.api.structures.script.functions.CheckFunction; -import com.dfsek.terra.api.structures.structure.Rotation; -import com.dfsek.terra.api.structures.structure.buffer.StructureBuffer; -import com.dfsek.terra.api.structures.tokenizer.Position; -import com.dfsek.terra.api.util.FastRandom; -import com.dfsek.terra.bukkit.command.DebugCommand; -import com.dfsek.terra.bukkit.command.WorldCommand; -import com.dfsek.terra.bukkit.world.BukkitAdapter; -import org.bukkit.Location; -import org.bukkit.World; -import org.bukkit.command.Command; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; -import org.jetbrains.annotations.NotNull; - -import java.util.Collections; -import java.util.HashMap; -import java.util.List; - -public class SpawnCommand extends WorldCommand implements DebugCommand { - public SpawnCommand(com.dfsek.terra.bukkit.command.Command parent) { - super(parent); - } - - @Override - public boolean execute(@NotNull Player sender, @NotNull Command command, @NotNull String label, @NotNull String[] args, World world) { - Location p = sender.getLocation(); - int x = p.getBlockX(); - int y = p.getBlockY(); - int z = p.getBlockZ(); - Position dummy = new Position(0, 0); - com.dfsek.terra.api.platform.world.World w = BukkitAdapter.adapt(world); - String check = new CheckFunction(getMain(), new NumericConstant(0, dummy), new NumericConstant(0, dummy), new NumericConstant(0, dummy), dummy).apply(new TerraImplementationArguments(new StructureBuffer( - new com.dfsek.terra.api.math.vector.Location(w, x, y, z) - ), Rotation.NONE, new FastRandom(), 0), new HashMap<>()); - - sender.sendMessage("Found: " + check); - return true; - } - - @Override - public String getName() { - return "spawn"; - } - - @Override - public List getSubCommands() { - return Collections.emptyList(); - } - - @Override - public int arguments() { - return 0; - } - - @Override - public List getTabCompletions(@NotNull CommandSender sender, @NotNull String alias, @NotNull String[] args) { - return Collections.emptyList(); - } -} diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/structure/StructureCommand.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/structure/StructureCommand.java index 16c6b277a..e722a6cc7 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/structure/StructureCommand.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/structure/StructureCommand.java @@ -2,7 +2,6 @@ package com.dfsek.terra.bukkit.command.command.structure; import com.dfsek.terra.bukkit.BukkitCommandSender; import com.dfsek.terra.bukkit.command.PlayerCommand; -import com.dfsek.terra.bukkit.command.command.structure.load.LoadCommand; import com.dfsek.terra.config.lang.LangUtil; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; @@ -31,7 +30,7 @@ public class StructureCommand extends PlayerCommand { @Override public List getSubCommands() { - return Arrays.asList(new ExportCommand(this), new LoadCommand(this), new LocateCommand(this), new SpawnCommand(this)); + return Arrays.asList(new ExportCommand(this), new LocateCommand(this)); } @Override diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/structure/load/LoadCommand.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/structure/load/LoadCommand.java deleted file mode 100644 index c8a88e325..000000000 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/structure/load/LoadCommand.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.dfsek.terra.bukkit.command.command.structure.load; - -import com.dfsek.terra.api.platform.world.World; -import com.dfsek.terra.bukkit.command.DebugCommand; -import com.dfsek.terra.bukkit.command.PlayerCommand; -import com.dfsek.terra.world.TerraWorld; -import org.bukkit.command.Command; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; -import org.jetbrains.annotations.NotNull; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; - -public class LoadCommand extends PlayerCommand implements DebugCommand { - public LoadCommand(com.dfsek.terra.bukkit.command.Command parent) { - super(parent); - } - - public List getStructureNames(World world) { - List names = new ArrayList<>(); - TerraWorld terraWorld = getMain().getWorld(world); - - terraWorld.getConfig().getScriptRegistry().forEach(script -> names.add(script.getId())); - - return names; - } - - @Override - public boolean execute(@NotNull Player sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) { - return true; - } - - @Override - public String getName() { - return "load"; - } - - @Override - public List getSubCommands() { - return Arrays.asList(new LoadFullCommand(this, true), new LoadFullCommand(this, false)); - } - - @Override - public List getTabCompletions(@NotNull CommandSender sender, @NotNull String alias, @NotNull String[] args) { - return Collections.emptyList(); - } - - @Override - public int arguments() { - return 0; - } -} diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/structure/load/LoadFullCommand.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/structure/load/LoadFullCommand.java deleted file mode 100644 index 33ab614a6..000000000 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/structure/load/LoadFullCommand.java +++ /dev/null @@ -1,85 +0,0 @@ -package com.dfsek.terra.bukkit.command.command.structure.load; - -import com.dfsek.terra.api.platform.world.World; -import com.dfsek.terra.api.structures.script.StructureScript; -import com.dfsek.terra.api.structures.structure.Rotation; -import com.dfsek.terra.api.util.FastRandom; -import com.dfsek.terra.api.util.world.PopulationUtil; -import com.dfsek.terra.bukkit.command.DebugCommand; -import com.dfsek.terra.bukkit.world.BukkitAdapter; -import com.dfsek.terra.bukkit.world.BukkitChunk; -import com.dfsek.terra.world.TerraWorld; -import org.bukkit.command.Command; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; -import org.jetbrains.annotations.NotNull; - -import java.util.Collections; -import java.util.List; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -public class LoadFullCommand extends LoadCommand implements DebugCommand { - private final boolean chunk; - - public LoadFullCommand(com.dfsek.terra.bukkit.command.Command parent, boolean chunk) { - super(parent); - this.chunk = chunk; - } - - @Override - public boolean execute(@NotNull Player sender, @NotNull Command command, @NotNull String s, @NotNull String[] args) { - TerraWorld terraWorld = getMain().getWorld(BukkitAdapter.adapt(sender.getWorld())); - long t = System.nanoTime(); - FastRandom chunk = PopulationUtil.getRandom(new BukkitChunk(sender.getLocation().getChunk())); - Rotation r; - try { - r = Rotation.fromDegrees(Integer.parseInt(args[1])); - } catch(Exception e) { - sender.sendMessage("Invalid rotation: " + args[1]); - return true; - } - StructureScript script = terraWorld.getConfig().getScriptRegistry().get(args[0]); - if(script == null) { - sender.sendMessage("Invalid structure: " + args[0]); - return true; - } - if(this.chunk) { - script.execute(BukkitAdapter.adapt(sender.getLocation()), BukkitAdapter.adapt(sender.getLocation().getChunk()), chunk, r); - } else { - script.execute(BukkitAdapter.adapt(sender.getLocation()), chunk, r); - } - long l = System.nanoTime() - t; - - sender.sendMessage("Took " + ((double) l) / 1000000 + "ms"); - return true; - } - - @Override - public String getName() { - return chunk ? "chunk" : "full"; - } - - @Override - public List getSubCommands() { - return Collections.emptyList(); - } - - @Override - public int arguments() { - return 2; - } - - @Override - public List getTabCompletions(@NotNull CommandSender commandSender, @NotNull String s, @NotNull String[] args) { - World w = BukkitAdapter.adapt(((Player) commandSender).getWorld()); - if(!TerraWorld.isTerraWorld(w)) return Collections.emptyList(); - switch(args.length) { - case 1: - return getMain().getWorld(w).getConfig().getScriptRegistry().entries().stream().map(StructureScript::getId).filter(id -> id.startsWith(args[0])).sorted().collect(Collectors.toList()); - case 2: - return Stream.of("0", "90", "180", "270").filter(string -> string.toUpperCase().startsWith(args[1].toUpperCase())).collect(Collectors.toList()); - } - return Collections.emptyList(); - } -}