Skip to content
This repository was archived by the owner on Feb 9, 2020. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ npm-debug.log*
yarn-debug.log*
yarn-error.log*

# WebStorm
.idea/

# Runtime data
pids
*.pid
Expand Down
179 changes: 179 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions src/pocketnode/PocketNode.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,8 @@ class PocketNode {
global.TRAVIS_BUILD = process.argv.join(" ").indexOf("--travis-build") !== -1;

let server = new Server(this, logger, paths);
if(TRAVIS_BUILD === true){
if(TRAVIS_BUILD === true)
server.shutdown();
}
}
}

Expand Down
42 changes: 30 additions & 12 deletions src/pocketnode/Server.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
const MinecraftInfo = pocketnode("network/minecraft/Info");
const Config = pocketnode("utils/Config");
const Translate = pocketnode("utils/Translate");

const PluginManager = pocketnode("plugin/PluginManager");
const SourcePluginLoader = pocketnode("plugin/SourcePluginLoader");
Expand All @@ -10,9 +11,6 @@ const BatchPacket = pocketnode("network/minecraft/protocol/BatchPacket");

const CommandMap = pocketnode("command/CommandMap");
const ConsoleCommandReader = pocketnode("command/ConsoleCommandReader");
const HelpCommand = pocketnode("command/defaults/HelpCommand");
const StopCommand = pocketnode("command/defaults/StopCommand");
const PluginsCommand = pocketnode("command/defaults/PluginsCommand");

const Player = pocketnode("player/Player");
const PlayerList = pocketnode("player/PlayerList");
Expand All @@ -21,8 +19,12 @@ const ResourcePackManager = pocketnode("resourcepacks/ResourcePackManager");

const SFS = pocketnode("utils/SimpleFileSystem");

const fs = require('fs');

class Server {
initVars(){
global.Server = this;

this.PocketNode = {};

this._bannedIps = {};
Expand Down Expand Up @@ -98,6 +100,9 @@ class Server {
this._config = new Config(this.getDataPath() + "pocketnode.json", Config.JSON, {});
this._debuggingLevel = this._config.getNested("debugging.level", 0);

this.translate = new Translate(this.getLang());
this.getLogger().info(this.translate.getString("server.language", [this.getLang()]));

this.getLogger().setDebugging(this._debuggingLevel);

//this._scheduler
Expand All @@ -111,14 +116,15 @@ class Server {

if(!TRAVIS_BUILD) process.stdout.write("\x1b]0;" + this.getName() + " " + this.getPocketNodeVersion() + "\x07");

this.getLogger().debug("Server Id:", this._serverId);
this.getLogger().debug(this.translate.getString("server.id") + ":", this._serverId);

this.getLogger().info("Starting server on " + this.getIp() + ":" + this.getPort());
this.getLogger().info(this.translate.getString("server.starting") + " " + this.getIp() + ":" + this.getPort());

this._raknetAdapter = new RakNetAdapter(this);

this.getLogger().info("This server is running " + this.getName() + " version " + this.getPocketNodeVersion() + " \"" + this.getCodeName() + "\" (API " + this.getApiVersion() + ")");
this.getLogger().info("PocketNode is distributed under the GPLv3 License.");
this.getLogger().info(
this.translate.getString("server.running", [this.getName(), this.getPocketNodeVersion(), this.getCodeName(), this.getApiVersion()]));
this.getLogger().info(this.translate.getString("server.license"));

this._commandMap = new CommandMap(this);
this.registerDefaultCommands();
Expand Down Expand Up @@ -146,15 +152,23 @@ class Server {

this._tickCounter = 0;

this.getLogger().info("Done ("+(Date.now() - this.PocketNode.START_TIME)+"ms)!");
this.getLogger().info(this.translate.getString("server.done")
+ " ("+(Date.now() - this.PocketNode.START_TIME)+"ms)!");

this.tickProcessor();
}

registerDefaultCommands(){
this.getCommandMap().registerCommand(new HelpCommand());
this.getCommandMap().registerCommand(new StopCommand());
this.getCommandMap().registerCommand(new PluginsCommand());
let dir = __dirname + '/command/defaults';
const commands = fs.readdirSync(dir);
commands.forEach(defaultCommand => {
defaultCommand = require(dir + '/' + defaultCommand);
this.getCommandMap().registerCommand(new defaultCommand());
});
}

getTranslateString(node, vars = []) {
return this.translate.getString(node, vars);
}

/**
Expand All @@ -167,7 +181,7 @@ class Server {
shutdown(){
if(!this._running) return;

this.getLogger().info("Shutting down...");
this.getLogger().info(this.translate.getString("server.shutdown"));
this._raknetAdapter.shutdown();
this._pluginManager.disablePlugins();

Expand Down Expand Up @@ -306,6 +320,10 @@ class Server {
return this._config.getNested("server.motd", this.PocketNode.NAME + " Server");
}

getLang() {
return this._config.getNested("server.lang", "en");
}

/**
* @return {Logger}
*/
Expand Down
4 changes: 3 additions & 1 deletion src/pocketnode/command/Command.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,9 @@ class Command {
}

getUsage(){
let usage = TextFormat.RED + "Usage: /" + this.getName() + " ";
let usage = TextFormat.RED +
Server.translate.getString("commandInfo.usage")
+ ": /" + this.getName() + " ";

this.getArguments().forEach(argument => {
if(argument.isRequired()){
Expand Down
2 changes: 1 addition & 1 deletion src/pocketnode/command/CommandMap.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class CommandMap {
});
}
}else{
throw new InvalidParameterError("The command: " + command + " is not an instance of Command!");
throw new InvalidParameterError(Server.translate.getString("commandInfo.invalidParameter", [command]));
}
}

Expand Down
22 changes: 16 additions & 6 deletions src/pocketnode/command/defaults/HelpCommand.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const TextFormat = pocketnode("utils/TextFormat");

class HelpCommand extends Command {
constructor(){
super("help", "Show available commands for this server.", "pocketnode.command.help", ["?"]);
super("help", Server.translate.getString("command.help.desc"), "pocketnode.command.help", ["?"]);
this.addArgument("command", "string", false);
this.addArgument("page", "integer", false);
}
Expand Down Expand Up @@ -45,20 +45,30 @@ class HelpCommand extends Command {

if(page < 1) page = 1;

sender.sendMessage(TextFormat.YELLOW + "----- Help (" + page + " of " + Math.ceil(sorted_commands.length / linesPerPage) + ") -----");
sender.sendMessage(TextFormat.YELLOW + "----- " +
Server.translate.getString("command.help.title")
+ " (" + page + " of " + Math.ceil(sorted_commands.length / linesPerPage) + ") -----");
sorted_commands.slice(((page*linesPerPage)-linesPerPage), (page*linesPerPage)).forEach(command => {
sender.sendMessage(TextFormat.GOLD + "/" + command.getName() + TextFormat.WHITE + ": " + command.getDescription());
});
}else{
if(sender.getServer().getCommandMap().commandExists(command.toLowerCase())){
let cmd = sender.getServer().getCommandMap().getCommand(command.toLowerCase());
if(true){ //test for perms
sender.sendMessage(TextFormat.YELLOW + "----- Help: /" + cmd.getName() + " -----");
sender.sendMessage(TextFormat.GOLD + "Description: " + TextFormat.WHITE + cmd.getDescription());
sender.sendMessage(TextFormat.GOLD + "Usage: " + TextFormat.WHITE + cmd.getUsage().substr(9));
sender.sendMessage(TextFormat.YELLOW + "----- " +
Server.translate.getString("command.help.title")
+": /" + cmd.getName() + " -----");
sender.sendMessage(TextFormat.GOLD +
Server.translate.getString("command.desc")
+ ": " + TextFormat.WHITE + cmd.getDescription());
sender.sendMessage(TextFormat.GOLD +
Server.translate.getString(command.usage)
+ ": " + TextFormat.WHITE + cmd.getUsage().substr(9));
}
}else{
sender.sendMessage(TextFormat.RED + "No help for " + command.toLowerCase());
sender.sendMessage(TextFormat.RED +
Server.translate.getString("command.help.noHelp")
+ " " + command.toLowerCase());
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/pocketnode/command/defaults/PluginsCommand.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const TextFormat = pocketnode("utils/TextFormat");

class PluginsCommand extends Command {
constructor(){
super("plugins", "List the plugins you have enabled on your server.", "pocketnode.command.plugins", ["pl"]);
super("plugins", Server.translate.getString("command.plugins.desc"), "pocketnode.command.plugins", ["pl"]);
}

execute(sender, args){
Expand All @@ -14,7 +14,7 @@ class PluginsCommand extends Command {
list += (plugin.isEnabled() ? TextFormat.GREEN : TextFormat.RED) + plugin.getFullName();
});

sender.sendMessage("Plugin(s) (" + plugins.length + "): " + list);
sender.sendMessage(Server.translate.getString("command.plugins.text") + " (" + plugins.length + "): " + list);
}
}

Expand Down
Loading