Added Long item IDs

Author: ipkpjersi

server/database/mysql/core.sql

@@ -7,7 +7,7 @@ DROP TABLE IF EXISTS `bank`;
 CREATE TABLE IF NOT EXISTS `bank`
 (
     `playerID` int(10) UNSIGNED NOT NULL,
-    `itemID`   int(10) UNSIGNED NOT NULL,
+    `itemID`   BIGINT NOT NULL,
     `slot`     int(5) UNSIGNED  NOT NULL DEFAULT 0,
     KEY (`playerID`)
 ) ENGINE = InnoDB
@@ -206,7 +206,7 @@ DROP TABLE IF EXISTS `invitems`;
 CREATE TABLE IF NOT EXISTS `invitems`
 (
     `playerID` int(10) UNSIGNED NOT NULL,
-    `itemID`   int(10) UNSIGNED NOT NULL,
+    `itemID`   BIGINT NOT NULL,
     `slot`     int(5) UNSIGNED  NOT NULL,
     KEY (`playerID`)
 ) ENGINE = InnoDB
@@ -549,7 +549,7 @@ CREATE TABLE IF NOT EXISTS `grounditems`
 DROP TABLE IF EXISTS `itemstatuses`;
 CREATE TABLE IF NOT EXISTS `itemstatuses`
 (
-    `itemID`     int(10) UNSIGNED    NOT NULL,
+    `itemID`     BIGINT    NOT NULL,
     `catalogID`  int(10) UNSIGNED    NOT NULL,
     `amount`     int(10) UNSIGNED    NOT NULL DEFAULT 1,
     `noted`      tinyint(1) UNSIGNED NOT NULL DEFAULT 0,

server/database/mysql/patches/2023_12_23_change_itemid_to_bigint.sql

@@ -0,0 +1,5 @@
+ALTER TABLE `_PREFIX_bank` MODIFY `itemID` BIGINT NOT NULL;
+
+ALTER TABLE `_PREFIX_invitems` MODIFY `itemID` BIGINT NOT NULL;
+
+ALTER TABLE `_PREFIX_itemstatuses` MODIFY `itemID` BIGINT NOT NULL;

server/database/mysql/retro.sql

@@ -8,7 +8,7 @@ DROP TABLE IF EXISTS `bank`;
 CREATE TABLE IF NOT EXISTS `bank`
 (
     `playerID` int(10) UNSIGNED NOT NULL,
-    `itemID`   int(10) UNSIGNED NOT NULL,
+    `itemID`   BIGINT NOT NULL,
     `slot`     int(5) UNSIGNED  NOT NULL DEFAULT 0,
     KEY (`playerID`)
 ) ENGINE = InnoDB
@@ -98,7 +98,7 @@ CREATE TABLE IF NOT EXISTS `experience`
     KEY `playerID` (`playerID`)
 ) ENGINE = InnoDB
   DEFAULT CHARSET = utf8;
-  
+
 DROP TABLE IF EXISTS `maxstats`;
 CREATE TABLE IF NOT EXISTS `maxstats`
 (
@@ -126,7 +126,7 @@ CREATE TABLE IF NOT EXISTS `maxstats`
     KEY `playerID` (`playerID`)
 ) ENGINE = InnoDB
   DEFAULT CHARSET = utf8;
-  
+
 DROP TABLE IF EXISTS `capped_experience`;
 CREATE TABLE IF NOT EXISTS `capped_experience`
 (
@@ -215,7 +215,7 @@ DROP TABLE IF EXISTS `invitems`;
 CREATE TABLE IF NOT EXISTS `invitems`
 (
     `playerID` int(10) UNSIGNED    NOT NULL,
-    `itemID`   int(10) UNSIGNED    NOT NULL,
+    `itemID`   BIGINT    NOT NULL,
     `slot`     int(5) UNSIGNED     NOT NULL,
     KEY (`playerID`)
 ) ENGINE = InnoDB
@@ -307,7 +307,7 @@ CREATE TABLE IF NOT EXISTS `players`
     KEY `banned` (`banned`)
 ) ENGINE = InnoDB
   DEFAULT CHARSET = utf8;
-  
+
 ALTER TABLE `players`
 ALTER `cameraauto` SET DEFAULT 1;
 
@@ -564,7 +564,7 @@ CREATE TABLE IF NOT EXISTS `grounditems`
 DROP TABLE IF EXISTS `itemstatuses`;
 CREATE TABLE IF NOT EXISTS `itemstatuses`
 (
-    `itemID`     int(10) UNSIGNED    NOT NULL,
+    `itemID`     BIGINT    NOT NULL,
     `catalogID`  int(10) UNSIGNED    NOT NULL,
     `amount`     int(10) UNSIGNED    NOT NULL DEFAULT 1,
     `noted`      tinyint(1) UNSIGNED NOT NULL DEFAULT 0,

server/src/com/openrsc/server/Server.java

@@ -128,7 +128,7 @@ public class Server implements Runnable {
 	private final Map<Integer, Integer> outgoingCountPerPacketOpcode = new HashMap<>();
 	private int privateMessagesSent = 0;
 
-	private volatile int maxItemId;
+	private volatile long maxItemId;
 
 	private final ListeningExecutorService sqlLoggingThreadPool;
 	private final ListeningExecutorService sqlThreadPool;
@@ -1149,11 +1149,11 @@ public void incrementOutgoingPacketCount(final int packetOpcode) {
 		outgoingCountPerPacketOpcode.put(packetOpcode, outgoingCountPerPacketOpcode.get(packetOpcode) + 1);
 	}
 
-	public synchronized int getMaxItemID() {
+	public synchronized long getMaxItemID() {
 		return maxItemId;
 	}
 
-	public synchronized int incrementMaxItemID() {
+	public synchronized long incrementMaxItemID() {
 		return ++maxItemId;
 	}
 

server/src/com/openrsc/server/database/GameDatabase.java

@@ -48,7 +48,7 @@ public GameDatabase(final Server server) {
 		open.set(false);
 	}
 
-	public abstract Set<Integer> getItemIDList();
+	public abstract Set<Long> getItemIDList();
 
 	protected abstract void openInternal();
 
@@ -82,7 +82,7 @@ public GameDatabase(final Server server) {
 
 	protected abstract FloorItem[] queryGroundItems() throws GameDatabaseException;
 
-	public abstract Integer[] queryInUseItemIds() throws GameDatabaseException;
+	public abstract Long[] queryInUseItemIds() throws GameDatabaseException;
 
 	public abstract void queryAddDropLog(ItemDrop drop) throws GameDatabaseException;
 
@@ -283,9 +283,9 @@ public GameDatabase(final Server server) {
 
 	public abstract int queryPlayerIdFromDiscordId(final long discordId) throws GameDatabaseException;
 
-	public abstract int queryMaxItemID() throws GameDatabaseException;
+	public abstract long queryMaxItemID() throws GameDatabaseException;
 
-	public abstract int addItemToPlayer(Item item);
+	public abstract long addItemToPlayer(Item item);
 
 	public abstract long queryCheckPlayerMute(final int playerId, final int muteType) throws GameDatabaseException;
 
@@ -494,7 +494,7 @@ public FloorItem[] getGroundItems() throws GameDatabaseException {
 		return queryGroundItems();
 	}
 
-	public Integer[] getInUseItemIds() throws GameDatabaseException {
+	public Long[] getInUseItemIds() throws GameDatabaseException {
 		return queryInUseItemIds();
 	}
 
@@ -510,7 +510,7 @@ public void itemUpdate(final Item item) throws GameDatabaseException {
 		queryItemUpdate(item);
 	}
 
-	public int incrementMaxItemId(final Player player) {
+	public long incrementMaxItemId(final Player player) {
 		return player.getWorld().getServer().incrementMaxItemID();
 	}
 
@@ -1046,7 +1046,7 @@ public void querySavePlayerMaxSkills(Player player) throws GameDatabaseException
 		querySavePlayerMaxSkills(player.getDatabaseID(), skills);
 	}
 
-	public int getMaxItemID() {
+	public long getMaxItemID() {
 		try {
 			return queryMaxItemID();
 		}

server/src/com/openrsc/server/database/WorldPopulator.java

@@ -173,8 +173,8 @@ public void populateWorld() {
 			LOGGER.info("Loaded {}", box(countGI) + " grounditems.");
 
 			//Load the in-use ItemID's from the database
-			Integer inUseItemIds[] = getWorld().getServer().getDatabase().getInUseItemIds();
-			for (Integer itemId : inUseItemIds)
+			Long inUseItemIds[] = getWorld().getServer().getDatabase().getInUseItemIds();
+			for (Long itemId : inUseItemIds)
 				getWorld().getServer().getDatabase().getItemIDList().add(itemId);
 
 			LOGGER.info("Loaded {}", box(getWorld().getServer().getDatabase().getItemIDList().size()) + " itemIDs.");