Snowscape/Server
1
0
Fork 0
forked from 2009Scape/Server
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity

Merge pull request #20 from RedSparr0w/management-server

Browse source 
Clan changes
This commit is contained in:
Daniel Ginovker 2019-11-06 10:56:15 -05:00 • committed by GitHub
commit 88295dd15a
28 changed files with 221 additions and 704 deletions
Download patch file Download diff file Expand all files Collapse all files

11
.idea/09Scape.iml generated
View file

@ -3,8 +3,6 @@
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<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$/Management-Server/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" />
</library>
</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">
<library>
<CLASSES>

86
.idea/workspace.xml generated
View file

@ -33,20 +33,6 @@
</list>
</option>
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>tutorial</find>
<find>login</find>
<find>starter</find>
<find>setlastlogin</find>
<find>HOME</find>
<find>home teleport</find>
<find>mystical foresig</find>
</findStrings>
<dirStrings>
<dir>C:\Users\Michael\Desktop\rsps_trash\rs2009\Server\src\plugin\interaction\item</dir>
</dirStrings>
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
@ -172,76 +158,4 @@
</map>
</option>
</component>
<component name="masterDetails">
<states>
<state key="ArtifactsStructureConfigurable.UI">
<settings>
<artifact-editor />
<splitter-proportions>
<option name="proportions">
<list>
<option value="0.2" />
</list>
</option>
</splitter-proportions>
</settings>
</state>
<state key="FacetStructureConfigurable.UI">
<settings>
<splitter-proportions>
<option name="proportions">
<list>
<option value="0.2" />
</list>
</option>
</splitter-proportions>
</settings>
</state>
<state key="GlobalLibrariesConfigurable.UI">
<settings>
<splitter-proportions>
<option name="proportions">
<list>
<option value="0.2" />
</list>
</option>
</splitter-proportions>
</settings>
</state>
<state key="JdkListConfigurable.UI">
<settings>
<splitter-proportions>
<option name="proportions">
<list>
<option value="0.2" />
</list>
</option>
</splitter-proportions>
</settings>
</state>
<state key="ModuleStructureConfigurable.UI">
<settings>
<last-edited>09Scape</last-edited>
<splitter-proportions>
<option name="proportions">
<list>
<option value="0.2" />
</list>
</option>
</splitter-proportions>
</settings>
</state>
<state key="ProjectLibrariesConfigurable.UI">
<settings>
<splitter-proportions>
<option name="proportions">
<list>
<option value="0.2" />
</list>
</option>
</splitter-proportions>
</settings>
</state>
</states>
</component>
</project>

2
CompiledServer/production/09Scape/.settings/org.eclipse.jdt.core.prefs
View file

@ -9,4 +9,4 @@ org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.7
org.eclipse.jdt.core.compiler.source=1.8

374
CompiledServer/production/09Scape/global.sql
View file

File diff suppressed because one or more lines are too long

BIN
CompiledServer/production/09Scape/org/crandor/ServerConstants.class
View file

Binary file not shown.

BIN
CompiledServer/production/09Scape/org/crandor/game/system/mysql/SQLManager.class
View file

Binary file not shown.

BIN
CompiledServer/production/09Scape/org/crandor/net/amsc/MSPacketRepository.class
View file

Binary file not shown.

BIN
CompiledServer/production/09Scape/org/keldagrim/Main$1.class Normal file
View file

Binary file not shown.

BIN
CompiledServer/production/09Scape/org/keldagrim/Main$2.class Normal file
View file

Binary file not shown.

BIN
CompiledServer/production/09Scape/org/keldagrim/Main$3.class Normal file
View file

Binary file not shown.

BIN
CompiledServer/production/09Scape/org/keldagrim/Main$4.class Normal file
View file

Binary file not shown.

BIN
CompiledServer/production/09Scape/org/keldagrim/Main$5.class Normal file
View file

Binary file not shown.

BIN
CompiledServer/production/09Scape/org/keldagrim/Main$6.class Normal file
View file

Binary file not shown.

BIN
CompiledServer/production/09Scape/org/keldagrim/Main$7.class Normal file
View file

Binary file not shown.

BIN
CompiledServer/production/09Scape/org/keldagrim/Main$8.class Normal file
View file

Binary file not shown.

BIN
CompiledServer/production/09Scape/org/keldagrim/Main.class Normal file
View file

Binary file not shown.

BIN
CompiledServer/production/09Scape/org/keldagrim/ServerConstants.class
View file

Binary file not shown.

BIN
CompiledServer/production/09Scape/org/keldagrim/launcher/Constants.class
View file

Binary file not shown.

BIN
CompiledServer/production/09Scape/org/keldagrim/net/packet/WorldPacketRepository.class
View file

Binary file not shown.

BIN
CompiledServer/production/09Scape/org/keldagrim/system/communication/CommunicationInfo.class
View file

Binary file not shown.

13
Management-Server/src/org/keldagrim/ServerConstants.java
View file

@ -10,6 +10,11 @@ import org.keldagrim.system.OperatingSystem;
*/
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.
*/
@ -49,12 +54,14 @@ public final class ServerConstants {
* The administrators.
*/
public static final String[] ADMINISTRATORS = {
"ethan",
"austin",
"ethan",
"austin",
"redsparr0w",
};
public static final String[] DATABASE_NAMES = {
"keldagr1_server", "keldagr1_global"
"server",
"global",
};
/**

5
Management-Server/src/org/keldagrim/launcher/Constants.java
View file

@ -24,11 +24,6 @@ public class Constants {
*/
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
* @param {Dimension} the panel size, null to use default frame size

12
Management-Server/src/org/keldagrim/net/packet/WorldPacketRepository.java
View file

@ -3,6 +3,7 @@ package org.keldagrim.net.packet;
import java.nio.ByteBuffer;
import java.util.List;
import org.crandor.game.world.GameWorld;
import org.keldagrim.ServerConstants;
import org.keldagrim.net.IoSession;
import org.keldagrim.system.PunishmentStorage;
@ -14,6 +15,7 @@ import org.keldagrim.world.PlayerSession;
import org.keldagrim.world.WorldDatabase;
import org.keldagrim.world.info.Response;
import org.keldagrim.world.info.UIDInfo;
import org.keldagrim.world.info.WorldInfo;
/**
* Repository class for world packets.
@ -54,6 +56,14 @@ public final class WorldPacketRepository {
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.
* @param player The player.
@ -430,7 +440,7 @@ public final class WorldPacketRepository {
}
ClanRepository clan = ClanRepository.get(server, clanName);
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;
}
clan.enter(player);

2
Management-Server/src/org/keldagrim/system/communication/CommunicationInfo.java
View file

@ -152,7 +152,7 @@ public final class CommunicationInfo {
statement.setString(3, contacts);
statement.setString(4, blocked);
statement.setString(5, clanName);
statement.setString(6, currentClan == null ? "grim" : currentClan);
statement.setString(6, currentClan);
statement.setString(7, joinRequirement.ordinal() + "," + messageRequirement.ordinal() + "," + kickRequirement.ordinal() + "," + lootRequirement.ordinal());
statement.setString(8, publicChatSetting + "," + privateChatSetting + "," + tradeSetting);
}

374
Server/global.sql
View file

File diff suppressed because one or more lines are too long

18
Server/src/org/crandor/ServerConstants.java
View file

@ -12,13 +12,6 @@ import org.crandor.tools.mysql.Database;
*/
public final class ServerConstants {
/**
* The administrators.
*/
public static final String[] ADMINISTRATORS = {
"RedSparr0w",
};
/**
* The cache path.
*/
@ -150,15 +143,16 @@ public final class ServerConstants {
/**
* 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 = {
"server", "global"
"server",
"global",
};
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.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[0], (SQLManager.LOCAL ? "root" : "username"), (SQLManager.LOCAL ? "" : "password")),
new Database(SQLManager.SQL_SERVER_ADDRESS, DATABASE_NAMES[1], (SQLManager.LOCAL ? "root" : "username"), (SQLManager.LOCAL ? "" : "password"))
};
/**

26
Server/src/org/crandor/game/system/mysql/SQLManager.java
View file

@ -21,21 +21,23 @@ public final class SQLManager {
*/
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.
*/
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_SERVER = (LOCAL ? "127.0.0.1" : "keldagrim.org") + ":3306/"+ (LOCAL ? "server" : 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$");
public static final String DATABASE_URL = SQL_SERVER_ADDRESS + ":3306/" + ServerConstants.DATABASE_NAMES[1];
public static final String DATABASE_URL_SERVER = SQL_SERVER_ADDRESS + ":3306/" + ServerConstants.DATABASE_NAMES[0];
/**
* IF the sql manager is initialized.

2
Server/src/org/crandor/net/amsc/MSPacketRepository.java
View file

@ -379,8 +379,6 @@ public final class MSPacketRepository {
if (buffer.get() == 1) {
String name = buffer.getString();
sendJoinClan(player, name);
} else {
sendJoinClan(player, "keldagrim");
}
}