layed the ground work for the new commands

This commit is contained in:
danielb 2024-05-26 21:56:58 +00:00
parent c3e799b7aa
commit bb65475364
12 changed files with 407 additions and 7 deletions

View File

@ -0,0 +1,40 @@
package de.butzlabben.WorldSystem;
//once all old code is deprecated this will become the new plugin core
import co.aikar.commands.BukkitCommandManager;
import de.butzlabben.WorldSystem.commands.WSCommands;
import de.butzlabben.WorldSystem.configs.LanguageConfig;
public class WorldSystem { //TODO extends JavaPlugin
private static final String LOCALE = "en";
//TODO: @Override
public void onEnable() {
//create configs
create_configs();
//register commands
BukkitCommandManager manager = new BukkitCommandManager(getInstance()); //TODO this);
manager.registerCommand(new WSCommands());
}
public static de.butzlabben.world.WorldSystem getInstance() {
return de.butzlabben.world.WorldSystem.getInstance();
}
private void create_configs() {
//Establish the language for the plugin
LanguageConfig.verify_all_configs();
LanguageConfig.set_config(LOCALE);
}
}

View File

@ -0,0 +1,40 @@
package de.butzlabben.WorldSystem.commands;
import de.butzlabben.WorldSystem.configs.LanguageConfig;
import de.butzlabben.WorldSystem.data.WorldSystemData;
import de.butzlabben.world.WorldSystem;
import de.butzlabben.world.config.MessageConfig;
import org.bukkit.entity.Player;
public class CreateWorldCommand {
private static final int WORLD_COUNT_LIMIT = 1; //REPLACE WITH CONFIG
private static final boolean ALLOW_TEMPLATE_CHOICE = false; //REPLACE WITH CONFIG
public CreateWorldCommand(Player player) {
WorldSystemData ws_data = WorldSystemData.connect();
int world_count = ws_data.getWorldCountForPlayer(player.getUniqueId().toString());
if (world_count < WORLD_COUNT_LIMIT) {
player.sendMessage(LanguageConfig.getWorldAlreadyExists());
}
if (ALLOW_TEMPLATE_CHOICE) {
//TODO
} else {
create_default_world();
}
}
private void create_default_world() {
//get default template from world generator
//then create
create_world();
}
private void create_world() {
}
}

View File

@ -2,6 +2,7 @@ package de.butzlabben.WorldSystem.commands;
import co.aikar.commands.BaseCommand;
import co.aikar.commands.annotation.CommandAlias;
import co.aikar.commands.annotation.CommandPermission;
import co.aikar.commands.annotation.Subcommand;
import de.butzlabben.world.config.MessageConfig;
import org.bukkit.entity.Player;
@ -9,10 +10,8 @@ import org.bukkit.entity.Player;
@CommandAlias("ws-new")
public class WSCommands extends BaseCommand {
@Subcommand("create")
@CommandPermission("ws.get")
//@Syntax("")
//@Description("Lists all of your or another players residences.")
public static void create_world(Player player, String[] args) {
player.sendMessage(MessageConfig.getNotOnWorld());
}
public static void create_world(Player player, String[] args) {new CreateWorldCommand(player);}
}

View File

@ -0,0 +1,4 @@
package de.butzlabben.WorldSystem.configs;
public class Config {
}

View File

@ -0,0 +1,311 @@
package de.butzlabben.WorldSystem.configs;
import de.butzlabben.world.WorldSystem;
import de.butzlabben.world.config.PluginConfig;
import net.md_5.bungee.api.ChatColor;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.plugin.java.JavaPlugin;
import java.io.*;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.util.ArrayList;
import java.util.List;
import java.util.logging.Level;
import java.util.stream.Collectors;
public class LanguageConfig {
private static final List<String> defaultCmdHelp = new ArrayList<>(20);
private static File file;
private static File config_folder = new File(de.butzlabben.WorldSystem.WorldSystem.getInstance().getDataFolder() + "/languages"); //TODO replace with new plugin main
static {
defaultCmdHelp.add("/ws get §8- §7Will give you a World");
defaultCmdHelp.add("/ws home §8- §7Teleports you on your World");
defaultCmdHelp.add("/ws sethome §8- §7Sets a specific home");
defaultCmdHelp.add("/ws tp §8- §7Teleports you on a specific World");
defaultCmdHelp.add("/ws addmember §8- §7Adds a player to your World");
defaultCmdHelp.add("/ws delmember§8 - §7Removes a player from your World");
defaultCmdHelp.add("/ws tnt §8- §7Allows/Denys TNT on your World");
defaultCmdHelp.add("/ws fire §8- §7Allows/Denys Fire on your World");
defaultCmdHelp.add("/ws togglechgm §8- §7Allows/Denys a player changing gamemode");
defaultCmdHelp.add("/ws togglebuild §8- §7Allows/Denys a player building");
defaultCmdHelp.add("/ws toggletp §8- §7Allows/Denys a player teleporting");
defaultCmdHelp.add("/ws info §8- §7Shows information about the World");
defaultCmdHelp.add("/ws reset §8- §7Will reset your World");
}
private LanguageConfig() {
}
public static void checkConfig(File f) {
file = f;
if (!file.exists()) {
try {
InputStream in = JavaPlugin.getPlugin(WorldSystem.class).getResource("languages/" + f.getName());
if (in == null) {
in = JavaPlugin.getPlugin(WorldSystem.class).getResource("custom.yml");
}
Files.copy(in, file.toPath());
} catch (IOException e) {
WorldSystem.logger().log(Level.SEVERE,"Wasn't able to create Message file");
e.printStackTrace();
}
}
}
public static void verify_all_configs() {
LanguageConfig.checkConfig(new File(config_folder, "en.yml"));
LanguageConfig.checkConfig(new File(config_folder, "de.yml"));
LanguageConfig.checkConfig(new File(config_folder, "hu.yml"));
LanguageConfig.checkConfig(new File(config_folder, "nl.yml"));
LanguageConfig.checkConfig(new File(config_folder, "pl.yml"));
LanguageConfig.checkConfig(new File(config_folder, "es.yml"));
LanguageConfig.checkConfig(new File(config_folder, "ru.yml"));
LanguageConfig.checkConfig(new File(config_folder, "fi.yml"));
LanguageConfig.checkConfig(new File(config_folder, "ja.yml"));
// Here we are for #5
LanguageConfig.checkConfig(new File(config_folder, "zh.yml"));
LanguageConfig.checkConfig(new File(config_folder, "fr.yml"));
// If has custom language
}
public static void set_config(String locale) {
LanguageConfig.checkConfig(new File(config_folder, locale + ".yml"));
}
private static YamlConfiguration getConfig() {
try {
return YamlConfiguration.loadConfiguration(new InputStreamReader(new FileInputStream(file), StandardCharsets.UTF_8));
} catch (FileNotFoundException e) {
e.printStackTrace();
}
return null;
}
private static String getRawMessage(String path, String alt) {
return ChatColor.translateAlternateColorCodes('&', getConfig().getString(path, alt));
}
private static String getMessage(String path, String alt) {
return PluginConfig.getPrefix() + getRawMessage(path, alt);
}
public static String getNoPermission() {
return getMessage("nopermission", "§cYou don't have permissions!");
}
public static String getSettingUpWorld() {
return getMessage("world.setting_up", "§aSetting up world...");
}
public static String getPlayerList() {
return getMessage("world.playerlist", "Player in this world: %player");
}
public static String getLagDetection() {
return getMessage("lagdetection", "Lagdetection in world from: §c%world");
}
public static String getWrongUsage() {
return getMessage("wrong_usage", "§c%usage");
}
public static String getNoWorldOwn() {
return getMessage("world.does_not_exists.own", "§cYou don't have a world!");
}
public static String getNoWorldOther() {
return getMessage("world.does_not_exists.other", "§cThis player doesn't has a world!");
}
public static String getNotRegistered() {
return getMessage("not_registered", "§cThis player hasn't joined yet!");
}
public static String getAlreadyMember() {
return getMessage("member.already_added", "§cThis player is already a member!");
}
public static String getMemberAdded() {
return getMessage("member.added", "You have added &c%player&6 to your World!");
}
public static String getUnknownError() {
return getMessage("unknown_error", "§cSomething went wrong...");
}
public static String getDeleteWorldOwn() {
return getMessage("world.delete.own", "§cYour world was deleted!");
}
public static String getDeleteWorldOther() {
return getMessage("world.delete.other", "You deleted the world of §c%player§6!");
}
public static String getNoMemberOwn() {
return getMessage("member.not_added.own", "§cThis player isn't a member!");
}
public static String getMemberRemoved() {
return getMessage("member.removed", "You removed §c%player§6 from your world!");
}
public static String getNoMemberAdded() {
return getMessage("member.no_one_added", "§cThere are no members added");
}
public static String getWorldAlreadyExists() {
return getMessage("world.already_exists", "§cYou already have a world!");
}
public static String getWorldCreated() {
return getMessage("world.created", "Your world is now ready. Get there with §a/ws home");
}
public static String getWorldStillCreating() {
return getMessage("world.still_creating", "§cWorld is still creating");
}
public static String getNotOnWorld() {
return getMessage("world.not_on", "§cYou are not on a world!");
}
public static String getWorldStillLoaded() {
return getMessage("world.still_loaded", "§cYour world is still loaded!");
}
public static String getNoRequestSend() {
return getMessage("request.not_sent", "§cYou didn't send a request!");
}
public static String getWorldReseted() {
return getMessage("world.reseted", "Your world was reseted!");
}
public static String getInvalidInput() {
return getMessage("request.invalid_input", "§c%input is not a valid input!");
}
public static String getRequestAlreadySent() {
return getMessage("request.already_sent", "§cYou already sent a request!");
}
public static String getRequestExpired() {
return getMessage("request.expired", "§cYou request is expired!");
}
public static String getTimeUntilExpires() {
return getMessage("request.until_expire", "§cYour request expires in %time seconds!");
}
public static String getConfirmRequest() {
return getMessage("request.confirm", "§cPlease confirm reset of your world: %command");
}
public static String getNoMemberOther() {
return getMessage("member.not_added.other", "§cYou are not added to this world!");
}
public static String getInfoOwner() {
return getMessage("info.owner", "Owner: %data");
}
public static String getInfoId() {
return getMessage("info.id", "ID: %data");
}
public static String getInfoMember() {
return getMessage("info.member", "Member: %data");
}
public static String getInfoTnt() {
return getMessage("info.tnt", "TNT: %data");
}
public static String getInfoFire() {
return getMessage("info.fire", "Fire: %data");
}
public static String getInfoEnabled() {
return getRawMessage("info.enabled", "§aOn");
}
public static String getInfoDisabled() {
return getRawMessage("info.disabled", "§cOff");
}
public static String getToggleGameModeEnabled() {
return getMessage("toggle.gamemode.enabled", "§a%player§6 can now change his gamemode!");
}
public static String getToggleGameModeDisabled() {
return getMessage("toggle.gamemode.disabled", "§c%player§6 can no longer change his gamemode!");
}
public static String getToggleTeleportEnabled() {
return getMessage("toggle.teleport.enabled", "§a%player§6 can now teleport!");
}
public static String getToggleTeleportDisabled() {
return getMessage("toggle.teleport.disabled", "§c%player§6 can no longer teleport!");
}
public static String getToggleBuildEnabled() {
return getMessage("toggle.build.enabled", "§a%player§6 can now build!");
}
public static String getToggleBuildDisabled() {
return getMessage("toggle.build.disabled", "§c%player§6 can no longer build!");
}
public static String getToggleWorldeditEnabled() {
return getMessage("toggle.worldedit.enabled", "§a%player§6 can now use WorldEdit!");
}
public static String getToggleWorldeditDisabled() {
return getMessage("toggle.worldedit.disabled", "§c%player§6 can no longer use WorldEdit!");
}
public static String getToggleFireEnabled() {
return getMessage("toggle.fire.enabled", "§aYou activated fire!");
}
public static String getToggleFireDisabled() {
return getMessage("toggle.fire.disabled", "§cYou deactivated fire!");
}
public static String getToggleTntEnabled() {
return getMessage("toggle.tnt.enabled", "§aYou activated TNT-Damage!");
}
public static String getToggleTntDisabled() {
return getMessage("toggle.tnt.disabled", "§cYou deactivated TNT-Damage!");
}
public static String getDeleteCommandHelp() {
return getRawMessage("command_help.delete_command", "/ws delete §8- §7Will delete a World");
}
public static List<String> getCommandHelp() {
List<String> list = getConfig().getStringList("command_help.list");
if (list == null)
list = defaultCmdHelp;
list = list.stream().map(s -> ChatColor.translateAlternateColorCodes('&', s)).collect(Collectors.toList());
return list;
}
public static String getHomeSet() {
return getMessage("world.set_home", "You set the home");
}
public static String getNotEnoughMoney() {
return getMessage("not_enough_money", "You do not have enough money");
}
}

View File

@ -2,6 +2,7 @@ package de.butzlabben.world;
import co.aikar.commands.BukkitCommandManager;
import de.butzlabben.WorldSystem.commands.WSCommands;
import de.butzlabben.WorldSystem.configs.LanguageConfig;
import de.butzlabben.world.command.CommandRegistry;
import de.butzlabben.world.config.*;
import de.butzlabben.world.listener.*;
@ -54,7 +55,7 @@ public class WorldSystem extends JavaPlugin {
PluginConfig.checkConfig(config);
// Done with #6
// Message config is Deprecated
MessageConfig.checkConfig(new File(languages, "en.yml"));
MessageConfig.checkConfig(new File(languages, "de.yml"));
@ -91,6 +92,11 @@ public class WorldSystem extends JavaPlugin {
@Override
public void onEnable() {
//create the new plugin system
de.butzlabben.WorldSystem.WorldSystem new_ws = new de.butzlabben.WorldSystem.WorldSystem();
new_ws.onEnable();
//////
getCommand("ws").setExecutor(new CommandRegistry());
getCommand("ws").setTabCompleter(new CommandRegistry());
@ -154,8 +160,6 @@ public class WorldSystem extends JavaPlugin {
//this.getCommand("ws tnt").setExecutor(new WorldTnt());
//this.getCommand("ws fire").setExecutor(new WorldFire());
BukkitCommandManager manager = new BukkitCommandManager(this);
manager.registerCommand(new WSCommands());
// Bstats deactivated
// System.setProperty("bstats.relocatecheck", "false");
// Metrics m = new Metrics(this);

View File

@ -37,6 +37,7 @@ de/butzlabben/world/util/database/DatabaseConnection.class
de/butzlabben/world/gui/playeroption/TeleportStatus.class
de/butzlabben/world/event/WorldToggleTntEvent.class
de/butzlabben/world/event/WorldCreateEvent.class
de/butzlabben/WorldSystem/commands/CreateWorldCommand.class
de/butzlabben/WorldSystem/data/PlayerWorld.class
de/butzlabben/world/util/VersionUtil.class
de/butzlabben/world/event/WorldRemovememberEvent.class

View File

@ -49,6 +49,7 @@
/home/daniel/Software Development/WorldSystem/src/main/java/de/butzlabben/inventory/OrcListener.java
/home/daniel/Software Development/WorldSystem/src/main/java/de/butzlabben/world/wrapper/AsyncCreatorAdapter.java
/home/daniel/Software Development/WorldSystem/src/main/java/de/butzlabben/world/WorldSystem.java
/home/daniel/Software Development/WorldSystem/src/main/java/de/butzlabben/WorldSystem/commands/CreateWorldCommand.java
/home/daniel/Software Development/WorldSystem/src/main/java/de/butzlabben/world/config/GuiConfig.java
/home/daniel/Software Development/WorldSystem/src/main/java/de/butzlabben/world/WorldCheckerRunnable.java
/home/daniel/Software Development/WorldSystem/src/main/java/de/butzlabben/WorldSystem/commands/WSCommands.java