update database, default clan, sql stuff

This commit is contained in:
RedSparr0w 2019-11-06 13:37:45 +13:00
parent 13171d3d78
commit 0c326b548e
7 changed files with 130 additions and 329 deletions

11
.idea/09Scape.iml generated
View file

@ -3,8 +3,6 @@
<component name="NewModuleRootManager" inherit-compiler-output="true"> <component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output /> <exclude-output />
<content url="file://$MODULE_DIR$"> <content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/09HDscape-management-server/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/09HDscape-server/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/Server/src" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/Server/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/Management-Server/src" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/Management-Server/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/Client/src" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/Client/src" isTestSource="false" />
@ -44,15 +42,6 @@
<jarDirectory url="file://$MODULE_DIR$/Client/lib" recursive="false" /> <jarDirectory url="file://$MODULE_DIR$/Client/lib" recursive="false" />
</library> </library>
</orderEntry> </orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/Client/lib/jogamp-all-platforms/jar/atomic/jogl.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library"> <orderEntry type="module-library">
<library> <library>
<CLASSES> <CLASSES>

View file

@ -10,6 +10,11 @@ import org.keldagrim.system.OperatingSystem;
*/ */
public final class ServerConstants { public final class ServerConstants {
/**
* The port to be used for communications.
*/
public static final String SERVER_NAME = "RS 2009";
/** /**
* The port to be used for communications. * The port to be used for communications.
*/ */
@ -49,12 +54,14 @@ public final class ServerConstants {
* The administrators. * The administrators.
*/ */
public static final String[] ADMINISTRATORS = { public static final String[] ADMINISTRATORS = {
"ethan", "ethan",
"austin", "austin",
"redsparr0w",
}; };
public static final String[] DATABASE_NAMES = { public static final String[] DATABASE_NAMES = {
"keldagr1_server", "keldagr1_global" "server",
"global",
}; };
/** /**

View file

@ -24,11 +24,6 @@ public class Constants {
*/ */
public static final String CACHE_NAME = File.separator + ".keldagrim_530"; public static final String CACHE_NAME = File.separator + ".keldagrim_530";
/**
* Management Server
*/
public static final String MANAGEMENT_SERVER = "management.keldagrim.com";
/** /**
* Gets the screen coordinates to place panels in the center * Gets the screen coordinates to place panels in the center
* @param {Dimension} the panel size, null to use default frame size * @param {Dimension} the panel size, null to use default frame size

View file

@ -3,6 +3,7 @@ package org.keldagrim.net.packet;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.util.List; import java.util.List;
import org.crandor.game.world.GameWorld;
import org.keldagrim.ServerConstants; import org.keldagrim.ServerConstants;
import org.keldagrim.net.IoSession; import org.keldagrim.net.IoSession;
import org.keldagrim.system.PunishmentStorage; import org.keldagrim.system.PunishmentStorage;
@ -14,6 +15,7 @@ import org.keldagrim.world.PlayerSession;
import org.keldagrim.world.WorldDatabase; import org.keldagrim.world.WorldDatabase;
import org.keldagrim.world.info.Response; import org.keldagrim.world.info.Response;
import org.keldagrim.world.info.UIDInfo; import org.keldagrim.world.info.UIDInfo;
import org.keldagrim.world.info.WorldInfo;
/** /**
* Repository class for world packets. * Repository class for world packets.
@ -54,6 +56,14 @@ public final class WorldPacketRepository {
player.getWorld().getSession().write(buffer); player.getWorld().getSession().write(buffer);
} }
public static void sendPlayerMessage(PlayerSession player, String[] messages) {
if (player == null) {
return;
}
for (String message : messages)
sendPlayerMessage(player, message);
}
/** /**
* Sends the contact information. * Sends the contact information.
* @param player The player. * @param player The player.
@ -430,7 +440,7 @@ public final class WorldPacketRepository {
} }
ClanRepository clan = ClanRepository.get(server, clanName); ClanRepository clan = ClanRepository.get(server, clanName);
if (clan == null) { if (clan == null) {
sendPlayerMessage(player, "The channel you tried to join does not exist. Try joining the main clan named 'Keldagrim'.:clan:"); sendPlayerMessage(player, new String[]{ "The channel you tried to join does not exist.", "Try joining the main clan named '" + ServerConstants.SERVER_NAME + "'.:clan:" });
return; return;
} }
clan.enter(player); clan.enter(player);

File diff suppressed because one or more lines are too long

View file

@ -12,13 +12,6 @@ import org.crandor.tools.mysql.Database;
*/ */
public final class ServerConstants { public final class ServerConstants {
/**
* The administrators.
*/
public static final String[] ADMINISTRATORS = {
"RedSparr0w",
};
/** /**
* The cache path. * The cache path.
*/ */
@ -150,15 +143,16 @@ public final class ServerConstants {
/** /**
* The string of donation messages displayed on an interface. * The string of donation messages displayed on an interface.
*/ */
public static final String[] MESSAGES = new String[] {"Welcome!" }; public static final String[] MESSAGES = new String[] { "Welcome!" };
public static final String[] DATABASE_NAMES = { public static final String[] DATABASE_NAMES = {
"server", "global" "server",
"global",
}; };
public static final Database[] DATABASES = { public static final Database[] DATABASES = {
new Database((SQLManager.LOCAL ? "localhost" : "redsparr0w.com"), (SQLManager.LOCAL ? "server" : DATABASE_NAMES[0]), (SQLManager.LOCAL ? "root" : "username"), (SQLManager.LOCAL ? "" : "password")), new Database(SQLManager.SQL_SERVER_ADDRESS, DATABASE_NAMES[0], (SQLManager.LOCAL ? "root" : "username"), (SQLManager.LOCAL ? "" : "password")),
new Database((SQLManager.LOCAL ? "localhost" : "redsparr0w.com"), (SQLManager.LOCAL ? "global" : DATABASE_NAMES[1]), (SQLManager.LOCAL ? "root" : "username"), (SQLManager.LOCAL ? "" : "password")) new Database(SQLManager.SQL_SERVER_ADDRESS, DATABASE_NAMES[1], (SQLManager.LOCAL ? "root" : "username"), (SQLManager.LOCAL ? "" : "password"))
}; };
/** /**

View file

@ -21,21 +21,23 @@ public final class SQLManager {
*/ */
public static final boolean LOCAL = true; public static final boolean LOCAL = true;
public static final String SQL_SERVER_ADDRESS = LOCAL ? "127.0.0.1" : "mywebsite.com";
/**
* The username of the user.
*/
private static final String USERNAME = LOCAL ? "root" : "username";
/**
* The password of the user.
*/
private static final String PASSWORD = LOCAL ? "" : "password";
/** /**
* The database URL. * The database URL.
*/ */
public static final String DATABASE_URL = (LOCAL ? "127.0.0.1" : "keldagrim.org") + ":3306/"+ (LOCAL ? "global" : ServerConstants.DATABASE_NAMES[1]); public static final String DATABASE_URL = SQL_SERVER_ADDRESS + ":3306/" + ServerConstants.DATABASE_NAMES[1];
public static final String DATABASE_URL_SERVER = (LOCAL ? "127.0.0.1" : "keldagrim.org") + ":3306/"+ (LOCAL ? "server" : ServerConstants.DATABASE_NAMES[0]); public static final String DATABASE_URL_SERVER = SQL_SERVER_ADDRESS + ":3306/" + ServerConstants.DATABASE_NAMES[0];
/**
* The username of the user.
*/
private static final String USERNAME = (LOCAL ? "root" : "keldagr1_ethan");
/**
* The password of the user.
*/
private static final String PASSWORD = (LOCAL ? "" : "2jf4wkz$");
/** /**
* IF the sql manager is initialized. * IF the sql manager is initialized.