simon987/Much-Assembly-Required
1
0
Fork 0
mirror of https://github.com/simon987/Much-Assembly-Required.git synced 2025-04-19 10:36:43 +00:00
Code Issues Projects Releases Wiki Activity

add secretKey field to GameServer

Browse Source
This commit is contained in:
Wiewiogr 2018-10-27 17:22:20 +02:00 committed by GitHub
parent 98402dd45b
commit 71f96f27d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Server/src/main/java/net/simon987/server/GameServer.java
View File

@ -1,12 +1,12 @@
package net.simon987.server; package net.simon987.server;
import com.mongodb.MongoClient; import com.mongodb.MongoClient;
import com.mongodb.client.MongoCollection; import com.mongodb.client.MongoCollection;
import com.mongodb.client.MongoCursor; import com.mongodb.client.MongoCursor;
import com.mongodb.client.MongoDatabase; import com.mongodb.client.MongoDatabase;
import com.mongodb.client.model.ReplaceOptions; import com.mongodb.client.model.ReplaceOptions;
import net.simon987.server.crypto.CryptoProvider; import net.simon987.server.crypto.CryptoProvider;
import net.simon987.server.crypto.SecretKeyGenerator;
import net.simon987.server.event.GameEvent; import net.simon987.server.event.GameEvent;
import net.simon987.server.event.GameEventDispatcher; import net.simon987.server.event.GameEventDispatcher;
import net.simon987.server.event.TickEvent; import net.simon987.server.event.TickEvent;
@ -54,6 +54,8 @@ public class GameServer implements Runnable {
private GameRegistry gameRegistry; private GameRegistry gameRegistry;
private String secretKey;
public GameServer() { public GameServer() {
this.config = new ServerConfiguration("config.properties"); this.config = new ServerConfiguration("config.properties");
@ -76,6 +78,12 @@ public class GameServer implements Runnable {
dayNightCycle = new DayNightCycle(); dayNightCycle = new DayNightCycle();
SecretKeyGenerator keyGenerator = new SecretKeyGenerator();
secretKey = config.getString("secret_key");
if (secretKey == null) {
secretKey = keyGenerator.generate();
}
//Load all plugins in plugins folder, if it doesn't exist, create it //Load all plugins in plugins folder, if it doesn't exist, create it
File pluginDir = new File("plugins/"); File pluginDir = new File("plugins/");
File[] pluginDirListing = pluginDir.listFiles(); File[] pluginDirListing = pluginDir.listFiles();
@ -123,7 +131,7 @@ public class GameServer implements Runnable {
return eventDispatcher; return eventDispatcher;
} }
public CryptoProvider getCryptoProvider(){ public CryptoProvider getCryptoProvider() {
return cryptoProvider; return cryptoProvider;
} }
@ -176,12 +184,10 @@ public class GameServer implements Runnable {
user.getControlledUnit().getCpu().reset(); user.getControlledUnit().getCpu().reset();
int cost = user.getControlledUnit().getCpu().execute(timeout); int cost = user.getControlledUnit().getCpu().execute(timeout);
user.getControlledUnit().spendEnergy(cost); user.getControlledUnit().spendEnergy(cost);
} catch (Exception e) { } catch (Exception e) {
LogManager.LOGGER.severe("Error executing " + user.getUsername() + "'s code"); LogManager.LOGGER.severe("Error executing " + user.getUsername() + "'s code");
e.printStackTrace(); e.printStackTrace();
} }
} }
} }
@ -243,7 +249,7 @@ public class GameServer implements Runnable {
public void save() { public void save() {
LogManager.LOGGER.info("Saving to MongoDB | W:" + gameUniverse.getWorldCount() + " | U:" + gameUniverse.getUserCount()); LogManager.LOGGER.info("Saving to MongoDB | W:" + gameUniverse.getWorldCount() + " | U:" + gameUniverse.getUserCount());
try{ try {
MongoDatabase db = mongo.getDatabase(config.getString("mongo_dbname")); MongoDatabase db = mongo.getDatabase(config.getString("mongo_dbname"));
ReplaceOptions updateOptions = new ReplaceOptions(); ReplaceOptions updateOptions = new ReplaceOptions();
updateOptions.upsert(true); updateOptions.upsert(true);
@ -261,7 +267,7 @@ public class GameServer implements Runnable {
worlds.replaceOne(new Document("_id", w.getId()), w.mongoSerialise(), updateOptions); worlds.replaceOne(new Document("_id", w.getId()), w.mongoSerialise(), updateOptions);
//If the world should unload, it is removed from the Universe after having been saved. //If the world should unload, it is removed from the Universe after having been saved.
if (w.shouldUnload()){ if (w.shouldUnload()) {
unloaded_worlds++; unloaded_worlds++;
universe.removeWorld(w); universe.removeWorld(w);
} }
@ -312,4 +318,12 @@ public class GameServer implements Runnable {
public GameRegistry getRegistry() { public GameRegistry getRegistry() {
return gameRegistry; return gameRegistry;
} }
public String getSecretKey() {
return secretKey;
}
public void setSecretKey(String secretKey) {
this.secretKey = secretKey;
}
} }