Merge pull request #130 from Grasscutters/java-16

Upgrade to versions of Java beyond 8

README.md

@@ -16,7 +16,7 @@ A WIP server reimplementation for *some anime game* 2.3-2.6
 * If you update from an older version, delete `config.json` for regeneration
 
 ### Prerequisites
-* JDK-8u202 ([mirror link](https://mirrors.huaweicloud.com/java/jdk/8u202-b08/) since Oracle required an account to download old builds)
+* Java 16
 * Mongodb (recommended 4.0+)
 * Proxy daemon: mitmproxy (mitmdump, recommended), Fiddler Classic, etc.
 

build.gradle

@@ -14,12 +14,11 @@ plugins {
     id 'application'
 }
 
-sourceCompatibility = 1.8
+sourceCompatibility = 16
-targetCompatibility = 1.8
+targetCompatibility = 16
 
 repositories {
     mavenCentral()
-    jcenter()
 }
 
 dependencies {
@@ -33,9 +32,9 @@ dependencies {
 	implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.8'
 	implementation group: 'com.google.protobuf', name: 'protobuf-java', version: '3.18.1'
 	
-	implementation group: 'org.reflections', name: 'reflections', version: '0.9.12'
+	implementation group: 'org.reflections', name: 'reflections', version: '0.10.2'
 
-	implementation group: 'dev.morphia.morphia', name: 'core', version: '1.6.1'
+	implementation group: 'dev.morphia.morphia', name: 'morphia-core', version: '2.2.6'
 
     implementation group: 'org.greenrobot', name: 'eventbus-java', version: '3.3.1'
 }

src/main/java/emu/grasscutter/Grasscutter.java

@@ -34,7 +34,7 @@ public final class Grasscutter {
 	private static DispatchServer dispatchServer;
 	private static GameServer gameServer;
 	
-	public static final Reflections reflector = new Reflections();
+	public static final Reflections reflector = new Reflections("emu.grasscutter");
 	
 	static {
 		// Declare logback configuration.

src/main/java/emu/grasscutter/command/CommandMap.java

@@ -11,6 +11,7 @@ import java.util.*;
 public final class CommandMap {
     private final Map<String, CommandHandler> commands = new HashMap<>();
     private final Map<String, Command> annotations = new HashMap<>();
+    
     public CommandMap() {
         this(false);
     }

src/main/java/emu/grasscutter/database/DatabaseCounter.java

@@ -3,7 +3,7 @@ package emu.grasscutter.database;
 import dev.morphia.annotations.Entity;
 import dev.morphia.annotations.Id;
 
-@Entity(value = "counters", noClassnameStored = true)
+@Entity(value = "counters", useDiscriminator = false)
 public class DatabaseCounter {
 	@Id
 	private String id;

src/main/java/emu/grasscutter/database/DatabaseHelper.java

@@ -2,23 +2,16 @@ package emu.grasscutter.database;
 
 import java.util.List;
 
-import com.mongodb.WriteResult;
+import com.mongodb.client.result.DeleteResult;
-
+import dev.morphia.query.experimental.filters.Filters;
-import dev.morphia.query.FindOptions;
-import dev.morphia.query.Query;
-import dev.morphia.query.internal.MorphiaCursor;
 import emu.grasscutter.GenshinConstants;
-import emu.grasscutter.Grasscutter;
 import emu.grasscutter.game.Account;
 import emu.grasscutter.game.GenshinPlayer;
 import emu.grasscutter.game.avatar.GenshinAvatar;
 import emu.grasscutter.game.friends.Friendship;
 import emu.grasscutter.game.inventory.GenshinItem;
 
-public class DatabaseHelper {
+public final class DatabaseHelper {
-	
-	protected static FindOptions FIND_ONE = new FindOptions().limit(1);
-	
 	public static Account createAccount(String username) {
 		return createAccountWithId(username, 0);
 	}
@@ -36,7 +29,6 @@ public class DatabaseHelper {
 			if (reservedId == GenshinConstants.SERVER_CONSOLE_UID) {
 				return null;
 			}
-			
 			exists = DatabaseHelper.getAccountByPlayerId(reservedId);
 			if (exists != null) {
 				return null;
@@ -69,7 +61,7 @@ public class DatabaseHelper {
 		account.setId(Integer.toString(DatabaseManager.getNextId(account)));
 		account.setUsername(username);
 		account.setPassword(password);
-        DatabaseHelper.saveAccount(account);
+		DatabaseHelper.saveAccount(account);
 		return account;
 	}
 
@@ -78,50 +70,37 @@ public class DatabaseHelper {
 	}
 
 	public static Account getAccountByName(String username) {
-		MorphiaCursor<Account> cursor = DatabaseManager.getAccountDatastore().createQuery(Account.class).field("username").equalIgnoreCase(username).find(FIND_ONE);
+		return DatabaseManager.getDatastore().find(Account.class).filter(Filters.eq("username", username)).first();
-		if (!cursor.hasNext()) return null;
-		return cursor.next();
 	}
 
 	public static Account getAccountByToken(String token) {
-		if (token == null) return null;
+		if(token == null) return null;
-		MorphiaCursor<Account> cursor = DatabaseManager.getAccountDatastore().createQuery(Account.class).field("token").equal(token).find(FIND_ONE);
+		return DatabaseManager.getDatastore().find(Account.class).filter(Filters.eq("token", token)).first();
-		if (!cursor.hasNext()) return null;
-		return cursor.next();
 	}
 
 	public static Account getAccountById(String uid) {
-		MorphiaCursor<Account> cursor = DatabaseManager.getAccountDatastore().createQuery(Account.class).field("_id").equal(uid).find(FIND_ONE);
+		return DatabaseManager.getDatastore().find(Account.class).filter(Filters.eq("_id", uid)).first();
-		if (!cursor.hasNext()) return null;
-		return cursor.next();
 	}
 
 	public static Account getAccountByPlayerId(int playerId) {
-		MorphiaCursor<Account> cursor = DatabaseManager.getAccountDatastore().createQuery(Account.class).field("playerId").equal(playerId).find(FIND_ONE);
+		return DatabaseManager.getDatastore().find(Account.class).filter(Filters.eq("playerId", playerId)).first();
-		if (!cursor.hasNext()) return null;
-		return cursor.next();
 	}
 
 	public static boolean deleteAccount(String username) {
-		Query<Account> q = DatabaseManager.getAccountDatastore().createQuery(Account.class).field("username").equalIgnoreCase(username);
+		return DatabaseManager.getDatastore().find(Account.class).filter(Filters.eq("username", username)).delete().getDeletedCount() > 0;
-		return DatabaseManager.getDatastore().findAndDelete(q) != null;
 	}
 
 	public static GenshinPlayer getPlayerById(int id) {
-		Query<GenshinPlayer> query = DatabaseManager.getDatastore().createQuery(GenshinPlayer.class).field("_id").equal(id);
+		return DatabaseManager.getDatastore().find(GenshinPlayer.class).filter(Filters.eq("_id", id)).first();
-		MorphiaCursor<GenshinPlayer> cursor = query.find(FIND_ONE);
-		if (!cursor.hasNext()) return null;
-		return cursor.next();
 	}
 
 	public static boolean checkPlayerExists(int id) {
-		MorphiaCursor<GenshinPlayer> query = DatabaseManager.getDatastore().createQuery(GenshinPlayer.class).field("_id").equal(id).find(FIND_ONE);
+		return DatabaseManager.getDatastore().find(GenshinPlayer.class).filter(Filters.eq("_id", id)).first() != null;
-		return query.hasNext();
 	}
 
 	public static synchronized GenshinPlayer createPlayer(GenshinPlayer character, int reservedId) {
 		// Check if reserved id
-		int id = 0;
+		int id;
 		if (reservedId > 0 && !checkPlayerExists(reservedId)) {
 			id = reservedId;
 			character.setUid(id);
@@ -139,7 +118,7 @@ public class DatabaseHelper {
 
 	public static synchronized int getNextPlayerId(int reservedId) {
 		// Check if reserved id
-		int id = 0;
+		int id;
 		if (reservedId > 0 && !checkPlayerExists(reservedId)) {
 			id = reservedId;
 		} else {
@@ -160,8 +139,7 @@ public class DatabaseHelper {
 	}
 
 	public static List<GenshinAvatar> getAvatars(GenshinPlayer player) {
-		Query<GenshinAvatar> query = DatabaseManager.getDatastore().createQuery(GenshinAvatar.class).filter("ownerId", player.getUid());
+		return DatabaseManager.getDatastore().find(GenshinAvatar.class).filter(Filters.eq("ownerId", player.getUid())).stream().toList();
-		return query.find().toList();
 	}
 
 	public static void saveItem(GenshinItem item) {
@@ -169,22 +147,19 @@ public class DatabaseHelper {
 	}
 
 	public static boolean deleteItem(GenshinItem item) {
-		WriteResult result = DatabaseManager.getDatastore().delete(item);
+		DeleteResult result = DatabaseManager.getDatastore().delete(item);
 		return result.wasAcknowledged();
 	}
 
 	public static List<GenshinItem> getInventoryItems(GenshinPlayer player) {
-		Query<GenshinItem> query = DatabaseManager.getDatastore().createQuery(GenshinItem.class).filter("ownerId", player.getUid());
+		return DatabaseManager.getDatastore().find(GenshinItem.class).filter(Filters.eq("ownerId", player.getUid())).stream().toList();
-		return query.find().toList();
 	}
 	public static List<Friendship> getFriends(GenshinPlayer player) {
-		Query<Friendship> query = DatabaseManager.getDatastore().createQuery(Friendship.class).filter("ownerId", player.getUid());
+		return DatabaseManager.getDatastore().find(Friendship.class).filter(Filters.eq("ownerId", player.getUid())).stream().toList();
-		return query.find().toList();
 	}
 
 	public static List<Friendship> getReverseFriends(GenshinPlayer player) {
-		Query<Friendship> query = DatabaseManager.getDatastore().createQuery(Friendship.class).filter("friendId", player.getUid());
+		return DatabaseManager.getDatastore().find(Friendship.class).filter(Filters.eq("friendId", player.getUid())).stream().toList();
-		return query.find().toList();
 	}
 
 	public static void saveFriendship(Friendship friendship) {
@@ -196,13 +171,9 @@ public class DatabaseHelper {
 	}
 
 	public static Friendship getReverseFriendship(Friendship friendship) {
-		Query<Friendship> query = DatabaseManager.getDatastore().createQuery(Friendship.class);
+		return DatabaseManager.getDatastore().find(Friendship.class).filter(Filters.and(
-		query.and(
+				Filters.eq("ownerId", friendship.getFriendId()),
-			query.criteria("ownerId").equal(friendship.getFriendId()),
+				Filters.eq("friendId", friendship.getOwnerId())
-			query.criteria("friendId").equal(friendship.getOwnerId())
+		)).first();
-		);
-		MorphiaCursor<Friendship> reverseFriendship = query.find(FIND_ONE);
-		if (!reverseFriendship.hasNext()) return null;
-		return reverseFriendship.next();
 	}
 }

src/main/java/emu/grasscutter/database/DatabaseManager.java

@@ -1,13 +1,16 @@
 package emu.grasscutter.database;
 
-import com.mongodb.MongoClient;
 import com.mongodb.MongoClientURI;
 import com.mongodb.MongoCommandException;
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoClients;
 import com.mongodb.client.MongoDatabase;
 import com.mongodb.client.MongoIterable;
 
 import dev.morphia.Datastore;
 import dev.morphia.Morphia;
+import dev.morphia.mapping.MapperOptions;
+import dev.morphia.query.experimental.filters.Filters;
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.game.Account;
 import emu.grasscutter.game.GenshinPlayer;
@@ -16,6 +19,7 @@ import emu.grasscutter.game.friends.Friendship;
 import emu.grasscutter.game.inventory.GenshinItem;
 
 public final class DatabaseManager {
+
 	private static MongoClient mongoClient;
 	private static MongoClient dispatchMongoClient;
 
@@ -26,15 +30,11 @@ public final class DatabaseManager {
 		DatabaseCounter.class, Account.class, GenshinPlayer.class, GenshinAvatar.class, GenshinItem.class, Friendship.class
 	};
     
-    public static MongoClient getMongoClient() {
+    public static Datastore getDatastore() {
-        return mongoClient;
+    	return datastore;
     }
     
-	public static Datastore getDatastore() {
+    public static MongoDatabase getDatabase() {
-		return datastore;
-	}
-
-	public static MongoDatabase getDatabase() {
     	return getDatastore().getDatabase();
     }
 
@@ -50,27 +50,23 @@ public final class DatabaseManager {
 	
 	public static void initialize() {
 		// Initialize
-		mongoClient = new MongoClient(new MongoClientURI(Grasscutter.getConfig().DatabaseUrl));
+		MongoClient mongoClient = MongoClients.create(Grasscutter.getConfig().DatabaseUrl);
-		Morphia morphia = new Morphia();
 		
-		// TODO Update when migrating to Morphia 2.0
+		// Set mapper options.
-		morphia.getMapper().getOptions().setStoreEmpties(true);
+		MapperOptions mapperOptions = MapperOptions.builder()
-		morphia.getMapper().getOptions().setStoreNulls(false);
+				.storeEmpties(true).storeNulls(false).build();
-		morphia.getMapper().getOptions().setDisableEmbeddedIndexes(true);
+		// Create data store.
-		
+		datastore = Morphia.createDatastore(mongoClient, Grasscutter.getConfig().DatabaseCollection, mapperOptions);
-		// Map
+		// Map classes.
-		morphia.map(mappedClasses);
+		datastore.getMapper().map(mappedClasses);
-		
-		// Build datastore
-		datastore = morphia.createDatastore(mongoClient, Grasscutter.getConfig().DatabaseCollection);
 		
 		// Ensure indexes
 		try {
 			datastore.ensureIndexes();
-		} catch (MongoCommandException e) {
+		} catch (MongoCommandException exception) {
-			Grasscutter.getLogger().info("Mongo index error: ", e);
+			Grasscutter.getLogger().info("Mongo index error: ", exception);
 			// Duplicate index error
-			if (e.getCode() == 85) {
+			if (exception.getCode() == 85) {
 				// Drop all indexes and re add them
 				MongoIterable<String> collections = datastore.getDatabase().listCollectionNames();
 				for (String name : collections) {
@@ -82,8 +78,8 @@ public final class DatabaseManager {
 		}
 
 		if(Grasscutter.getConfig().RunMode.equalsIgnoreCase("GAME_ONLY")) {
-			dispatchMongoClient = new MongoClient(new MongoClientURI(Grasscutter.getConfig().getGameServerOptions().DispatchServerDatabaseUrl));
+			dispatchMongoClient = MongoClients.create(Grasscutter.getConfig().getGameServerOptions().DispatchServerDatabaseUrl);
-			dispatchDatastore = morphia.createDatastore(dispatchMongoClient, Grasscutter.getConfig().getGameServerOptions().DispatchServerDatabaseCollection);
+			dispatchDatastore = Morphia.createDatastore(dispatchMongoClient, Grasscutter.getConfig().getGameServerOptions().DispatchServerDatabaseCollection);
 
 			// Ensure indexes for dispatch server
 			try {
@@ -105,7 +101,7 @@ public final class DatabaseManager {
 	}
 
 	public static synchronized int getNextId(Class<?> c) {
-		DatabaseCounter counter = getDatastore().createQuery(DatabaseCounter.class).field("_id").equal(c.getSimpleName()).find().tryNext();
+		DatabaseCounter counter = getDatastore().find(DatabaseCounter.class).filter(Filters.eq("_id", c.getName())).first();
 		if (counter == null) {
 			counter = new DatabaseCounter(c.getSimpleName());
 		}

src/main/java/emu/grasscutter/game/Account.java

@@ -1,22 +1,18 @@
 package emu.grasscutter.game;
 
-import dev.morphia.annotations.AlsoLoad;
+import dev.morphia.annotations.*;
-import dev.morphia.annotations.Collation;
-import dev.morphia.annotations.Entity;
-import dev.morphia.annotations.Id;
-import dev.morphia.annotations.Indexed;
-import dev.morphia.annotations.PreLoad;
 import emu.grasscutter.database.DatabaseHelper;
 import emu.grasscutter.utils.Crypto;
 import emu.grasscutter.utils.Utils;
-import dev.morphia.annotations.IndexOptions;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import org.bson.Document;
+
 import com.mongodb.DBObject;
 
-@Entity(value = "accounts", noClassnameStored = true)
+@Entity(value = "accounts", useDiscriminator = false)
 public class Account {
 	@Id private String id;
 	
@@ -122,15 +118,15 @@ public class Account {
 		return this.token;
 	}
 	
-	@PreLoad
-	public void onLoad(DBObject dbObj) {
-		// Grant the superuser permissions to accounts created before the permissions update
-		if (!dbObj.containsField("permissions")) {
-			this.addPermission("*");
-		}
-	}
-	
 	public void save() {
 		DatabaseHelper.saveAccount(this);
 	}
+
+	@PreLoad
+	public void onLoad(Document document) {
+		// Grant the superuser permissions to accounts created before the permissions update
+		if (!document.containsKey("permissions")) {
+			this.addPermission("*");
+		}
+	}
 }

src/main/java/emu/grasscutter/game/GenshinPlayer.java

@@ -61,7 +61,7 @@ import emu.grasscutter.utils.Position;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 
-@Entity(value = "players", noClassnameStored = true)
+@Entity(value = "players", useDiscriminator = false)
 public class GenshinPlayer {
 	@Id private int id;
 	@Indexed(options = @IndexOptions(unique = true)) private String accountId;

src/main/java/emu/grasscutter/game/TeamInfo.java

@@ -3,10 +3,12 @@ package emu.grasscutter.game;
 import java.util.ArrayList;
 import java.util.List;
 
+import dev.morphia.annotations.Entity;
 import emu.grasscutter.GenshinConstants;
 import emu.grasscutter.Grasscutter;
 import emu.grasscutter.game.avatar.GenshinAvatar;
 
+@Entity
 public class TeamInfo {
 	private String name;
 	private List<Integer> avatars;

src/main/java/emu/grasscutter/game/TeamManager.java

@@ -8,6 +8,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import dev.morphia.annotations.Entity;
 import dev.morphia.annotations.Transient;
 import emu.grasscutter.GenshinConstants;
 import emu.grasscutter.Grasscutter;
@@ -41,6 +42,7 @@ import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
 import it.unimi.dsi.fastutil.ints.IntSet;
 
+@Entity
 public class TeamManager {
 	@Transient private GenshinPlayer player;
 	

src/main/java/emu/grasscutter/game/avatar/AvatarProfileData.java

@@ -1,5 +1,8 @@
 package emu.grasscutter.game.avatar;
 
+import dev.morphia.annotations.Entity;
+
+@Entity
 public class AvatarProfileData {
 	private int avatarId;
 	private int level;

src/main/java/emu/grasscutter/game/avatar/GenshinAvatar.java

@@ -56,7 +56,7 @@ import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 
-@Entity(value = "avatars", noClassnameStored = true)
+@Entity(value = "avatars", useDiscriminator = false)
 public class GenshinAvatar {
 	@Id private ObjectId id;
 	@Indexed private int ownerId;	// Id of player that this avatar belongs to

src/main/java/emu/grasscutter/game/friends/Friendship.java

@@ -9,7 +9,7 @@ import emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief;
 import emu.grasscutter.net.proto.FriendOnlineStateOuterClass.FriendOnlineState;
 import emu.grasscutter.net.proto.HeadImageOuterClass.HeadImage;
 
-@Entity(value = "friendships", noClassnameStored = true)
+@Entity(value = "friendships", useDiscriminator = false)
 public class Friendship {
 	@Id private ObjectId id;
 	

src/main/java/emu/grasscutter/game/friends/PlayerProfile.java

@@ -4,6 +4,7 @@ import dev.morphia.annotations.*;
 import emu.grasscutter.game.GenshinPlayer;
 import emu.grasscutter.utils.Utils;
 
+@Entity
 public class PlayerProfile {
 	@Transient private GenshinPlayer player;
 	

src/main/java/emu/grasscutter/game/gacha/PlayerGachaBannerInfo.java

@@ -1,5 +1,8 @@
 package emu.grasscutter.game.gacha;
 
+import dev.morphia.annotations.Entity;
+
+@Entity
 public class PlayerGachaBannerInfo {
 	private int pity5 = 0;
 	private int pity4 = 0;

src/main/java/emu/grasscutter/game/gacha/PlayerGachaInfo.java

@@ -1,5 +1,8 @@
 package emu.grasscutter.game.gacha;
 
+import dev.morphia.annotations.Entity;
+
+@Entity
 public class PlayerGachaInfo {
 	private PlayerGachaBannerInfo standardBanner;
 	private PlayerGachaBannerInfo eventCharacterBanner;

src/main/java/emu/grasscutter/game/inventory/GenshinItem.java

@@ -34,7 +34,7 @@ import emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfo;
 import emu.grasscutter.net.proto.WeaponOuterClass.Weapon;
 import emu.grasscutter.utils.WeightedList;
 
-@Entity(value = "items", noClassnameStored = true)
+@Entity(value = "items", useDiscriminator = false)
 public class GenshinItem {
 	@Id private ObjectId id;
 	@Indexed private int ownerId;

src/main/java/emu/grasscutter/utils/Position.java

@@ -2,8 +2,10 @@ package emu.grasscutter.utils;
 
 import java.io.Serializable;
 
+import dev.morphia.annotations.Entity;
 import emu.grasscutter.net.proto.VectorOuterClass.Vector;
 
+@Entity
 public class Position implements Serializable {
 	private static final long serialVersionUID = -2001232313615923575L;