Cleanup

PlayPro · Jul 13, 2023 · 1e007c9 · 1e007c9
1 parent df9b478
commit 1e007c9
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 25 deletions.
diff --git a/src/main/java/net/coreprotect/bukkit/BukkitAdapter.java b/src/main/java/net/coreprotect/bukkit/BukkitAdapter.java
@@ -212,4 +212,9 @@ public boolean isSign(Material material) {
         return Tag.SIGNS.isTagged(material);
     }
 
+    @Override
+    public boolean isChiseledBookshelf(Material material) {
+        return false;
+    }
+
 }
diff --git a/src/main/java/net/coreprotect/bukkit/BukkitInterface.java b/src/main/java/net/coreprotect/bukkit/BukkitInterface.java
@@ -67,4 +67,6 @@ public interface BukkitInterface {
 
     public boolean isSign(Material material);
 
+    public boolean isChiseledBookshelf(Material material);
+
 }
diff --git a/src/main/java/net/coreprotect/bukkit/Bukkit_v1_20.java b/src/main/java/net/coreprotect/bukkit/Bukkit_v1_20.java
@@ -104,4 +104,9 @@ public boolean isSign(Material material) {
         return Tag.ALL_SIGNS.isTagged(material);
     }
 
+    @Override
+    public boolean isChiseledBookshelf(Material material) {
+        return material == Material.CHISELED_BOOKSHELF;
+    }
+
 }
diff --git a/src/main/java/net/coreprotect/database/Database.java b/src/main/java/net/coreprotect/database/Database.java
@@ -348,7 +348,7 @@ public static void createDatabaseTables(String prefix, boolean purge) {
                     index = ", INDEX(time), INDEX(user,time), INDEX(wid,x,z,time)";
                     statement.executeUpdate("CREATE TABLE IF NOT EXISTS " + prefix + "command(rowid int NOT NULL AUTO_INCREMENT,PRIMARY KEY(rowid),time int, user int, wid int, x int, y int (3), z int, message varchar(16000)" + index + ") ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4");
                     index = ", INDEX(wid,x,z,time), INDEX(user,time), INDEX(type,time)";
-                    statement.executeUpdate("CREATE TABLE IF NOT EXISTS " + prefix + "container(rowid int NOT NULL AUTO_INCREMENT,PRIMARY KEY(rowid), time int, user int, wid int, x int, y int, z int, type int, data int, amount int, slot tinyint, metadata blob, action tinyint, rolled_back tinyint" + index + ") ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4");
+                    statement.executeUpdate("CREATE TABLE IF NOT EXISTS " + prefix + "container(rowid int NOT NULL AUTO_INCREMENT,PRIMARY KEY(rowid), time int, user int, wid int, x int, y int, z int, type int, data int, amount int, metadata blob, action tinyint, rolled_back tinyint" + index + ") ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4");
                     index = ", INDEX(wid,x,z,time), INDEX(user,time), INDEX(type,time)";
                     statement.executeUpdate("CREATE TABLE IF NOT EXISTS " + prefix + "item(rowid int NOT NULL AUTO_INCREMENT,PRIMARY KEY(rowid), time int, user int, wid int, x int, y int, z int, type int, data blob, amount int, action tinyint, rolled_back tinyint" + index + ") ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4");
                     statement.executeUpdate("CREATE TABLE IF NOT EXISTS " + prefix + "database_lock(rowid int NOT NULL AUTO_INCREMENT,PRIMARY KEY(rowid),status tinyint,time int) ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4");
@@ -426,7 +426,7 @@ else if (type.equalsIgnoreCase("index")) {
                     statement.executeUpdate("CREATE TABLE IF NOT EXISTS " + prefix + "command (time INTEGER, user INTEGER, wid INTEGER, x INTEGER, y INTEGER, z INTEGER, message TEXT);");
                 }
                 if (!tableData.contains(prefix + "container")) {
-                    statement.executeUpdate("CREATE TABLE IF NOT EXISTS " + prefix + "container (time INTEGER, user INTEGER, wid INTEGER, x INTEGER, y INTEGER, z INTEGER, type INTEGER, data INTEGER, amount INTEGER, slot INTEGER, metadata BLOB, action INTEGER, rolled_back INTEGER);");
+                    statement.executeUpdate("CREATE TABLE IF NOT EXISTS " + prefix + "container (time INTEGER, user INTEGER, wid INTEGER, x INTEGER, y INTEGER, z INTEGER, type INTEGER, data INTEGER, amount INTEGER, metadata BLOB, action INTEGER, rolled_back INTEGER);");
                 }
                 if (!tableData.contains(prefix + "item")) {
                     statement.executeUpdate("CREATE TABLE IF NOT EXISTS " + prefix + "item (time INTEGER, user INTEGER, wid INTEGER, x INTEGER, y INTEGER, z INTEGER, type INTEGER, data BLOB, amount INTEGER, action INTEGER, rolled_back INTEGER);");

diff --git a/src/main/java/net/coreprotect/database/Rollback.java b/src/main/java/net/coreprotect/database/Rollback.java
@@ -1716,7 +1716,7 @@ else if (type != null && type.equals(Material.JUKEBOX)) {
                                 modifiedArmor = addedItem ? setArmor : modifiedArmor;
                             }
                             if (!addedItem) {
-                                if (type.name().equals("CHISELED_BOOKSHELF")) {
+                                if (BukkitAdapter.ADAPTER.isChiseledBookshelf(type)) {
                                     ItemStack[] inventoryContents = inventory.getStorageContents();
                                     int i = 0;
                                     for (ItemStack stack : inventoryContents) {

diff --git a/src/main/java/net/coreprotect/listener/player/PlayerInteractListener.java b/src/main/java/net/coreprotect/listener/player/PlayerInteractListener.java
@@ -684,7 +684,7 @@ else if (event.getHand().equals(EquipmentSlot.OFF_HAND) && offHand != null && Ta
                             }
                         }
                     }
-                    else if (type.name().equals("CHISELED_BOOKSHELF")) {
+                    else if (BukkitAdapter.ADAPTER.isChiseledBookshelf(type)) {
                         BlockState blockState = block.getState();
                         if (blockState instanceof BlockInventoryHolder) {
                             InventoryChangeListener.inventoryTransaction(player.getName(), blockState.getLocation(), null);

diff --git a/src/main/java/net/coreprotect/patch/script/__2_22_0.java b/src/main/java/net/coreprotect/patch/script/__2_22_0.java
@@ -161,27 +161,6 @@ protected static boolean patch(Statement statement) {
                     Chat.console(Phrase.build(Phrase.PATCH_SKIP_UPDATE, ConfigHandler.prefix + "sign", Selector.FIRST, Selector.FIRST));
                 }
             }
-
-            if (!Patch.continuePatch()) {
-                return false;
-            }
-
-            if (Config.getGlobal().MYSQL) {
-                try {
-                    statement.executeUpdate("ALTER TABLE " + ConfigHandler.prefix + "container ADD COLUMN slot TINYINT DEFAULT 0;");
-                }
-                catch (Exception e) {
-                    Chat.console(Phrase.build(Phrase.PATCH_SKIP_UPDATE, ConfigHandler.prefix + "container", Selector.FIRST, Selector.FIRST));
-                }
-            }
-            else {
-                try {
-                    statement.executeUpdate("ALTER TABLE " + ConfigHandler.prefix + "container ADD COLUMN slot INTEGER DEFAULT 0;");
-                }
-                catch (Exception e) {
-                    Chat.console(Phrase.build(Phrase.PATCH_SKIP_UPDATE, ConfigHandler.prefix + "container", Selector.FIRST, Selector.FIRST));
-                }
-            }
         }
         catch (Exception e) {
             e.printStackTrace();