Warehosue cleanup

2024-01-24 20:03:27 -06:00
parent 92d8ed9e3f
commit cc1e0d8986
20 changed files with 1038 additions and 1425 deletions
@@ -13,6 +13,7 @@ import engine.Enum.GameObjectType;
 import engine.Enum.ProtectionState;
 import engine.Enum.TransactionType;
 import engine.gameManager.DbManager;
+import engine.gameManager.WarehouseManager;
 import engine.math.Vector3fImmutable;
 import engine.objects.*;
 import engine.server.MBServerStatics;
@@ -109,7 +110,7 @@ public class dbWarehouseHandler extends dbHandlerBase {
             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_locks`=? WHERE `UID` = ?")) {

            preparedStatement.setLong(1, locks);
-            preparedStatement.setInt(2, wh.getUID());
+            preparedStatement.setInt(2, wh.UID);

            return (preparedStatement.executeUpdate() > 0);

@@ -125,7 +126,7 @@ public class dbWarehouseHandler extends dbHandlerBase {
             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_gold`=? WHERE `UID` = ?")) {

            preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.getUID());
+            preparedStatement.setInt(2, wh.UID);

            return (preparedStatement.executeUpdate() > 0);

@@ -141,7 +142,7 @@ public class dbWarehouseHandler extends dbHandlerBase {
             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_stone`=? WHERE `UID` = ?")) {

            preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.getUID());
+            preparedStatement.setInt(2, wh.UID);

            return (preparedStatement.executeUpdate() > 0);

@@ -157,7 +158,7 @@ public class dbWarehouseHandler extends dbHandlerBase {
             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_truesteel`=? WHERE `UID` = ?")) {

            preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.getUID());
+            preparedStatement.setInt(2, wh.UID);

            return (preparedStatement.executeUpdate() > 0);

@@ -173,7 +174,7 @@ public class dbWarehouseHandler extends dbHandlerBase {
             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_iron`=? WHERE `UID` = ?")) {

            preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.getUID());
+            preparedStatement.setInt(2, wh.UID);

            return (preparedStatement.executeUpdate() > 0);

@@ -189,7 +190,7 @@ public class dbWarehouseHandler extends dbHandlerBase {
             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_adamant`=? WHERE `UID` = ?")) {

            preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.getUID());
+            preparedStatement.setInt(2, wh.UID);

            return (preparedStatement.executeUpdate() > 0);

@@ -205,7 +206,7 @@ public class dbWarehouseHandler extends dbHandlerBase {
             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_lumber`=? WHERE `UID` = ?")) {

            preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.getUID());
+            preparedStatement.setInt(2, wh.UID);

            return (preparedStatement.executeUpdate() > 0);

@@ -221,7 +222,7 @@ public class dbWarehouseHandler extends dbHandlerBase {
             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_oak`=? WHERE `UID` = ?")) {

            preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.getUID());
+            preparedStatement.setInt(2, wh.UID);

            return (preparedStatement.executeUpdate() > 0);

@@ -237,7 +238,7 @@ public class dbWarehouseHandler extends dbHandlerBase {
             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_bronzewood`=? WHERE `UID` = ?")) {

            preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.getUID());
+            preparedStatement.setInt(2, wh.UID);

            return (preparedStatement.executeUpdate() > 0);

@@ -253,7 +254,7 @@ public class dbWarehouseHandler extends dbHandlerBase {
             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_mandrake`=? WHERE `UID` = ?")) {

            preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.getUID());
+            preparedStatement.setInt(2, wh.UID);

            return (preparedStatement.executeUpdate() > 0);

@@ -269,7 +270,7 @@ public class dbWarehouseHandler extends dbHandlerBase {
             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_coal`=? WHERE `UID` = ?")) {

            preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.getUID());
+            preparedStatement.setInt(2, wh.UID);

            return (preparedStatement.executeUpdate() > 0);

@@ -285,7 +286,7 @@ public class dbWarehouseHandler extends dbHandlerBase {
             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_agate`=? WHERE `UID` = ?")) {

            preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.getUID());
+            preparedStatement.setInt(2, wh.UID);

            return (preparedStatement.executeUpdate() > 0);

@@ -301,7 +302,7 @@ public class dbWarehouseHandler extends dbHandlerBase {
             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_diamond`=? WHERE `UID` = ?")) {

            preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.getUID());
+            preparedStatement.setInt(2, wh.UID);

            return (preparedStatement.executeUpdate() > 0);

@@ -317,7 +318,7 @@ public class dbWarehouseHandler extends dbHandlerBase {
             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_onyx`=? WHERE `UID` = ?")) {

            preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.getUID());
+            preparedStatement.setInt(2, wh.UID);

            return (preparedStatement.executeUpdate() > 0);

@@ -333,7 +334,7 @@ public class dbWarehouseHandler extends dbHandlerBase {
             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_azoth`=? WHERE `UID` = ?")) {

            preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.getUID());
+            preparedStatement.setInt(2, wh.UID);

            return (preparedStatement.executeUpdate() > 0);

@@ -349,7 +350,7 @@ public class dbWarehouseHandler extends dbHandlerBase {
             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_orichalk`=? WHERE `UID` = ?")) {

            preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.getUID());
+            preparedStatement.setInt(2, wh.UID);

            return (preparedStatement.executeUpdate() > 0);

@@ -365,7 +366,7 @@ public class dbWarehouseHandler extends dbHandlerBase {
             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_antimony`=? WHERE `UID` = ?")) {

            preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.getUID());
+            preparedStatement.setInt(2, wh.UID);

            return (preparedStatement.executeUpdate() > 0);

@@ -381,7 +382,7 @@ public class dbWarehouseHandler extends dbHandlerBase {
             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_sulfur`=? WHERE `UID` = ?")) {

            preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.getUID());
+            preparedStatement.setInt(2, wh.UID);

            return (preparedStatement.executeUpdate() > 0);

@@ -397,7 +398,7 @@ public class dbWarehouseHandler extends dbHandlerBase {
             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_quicksilver`=? WHERE `UID` = ?")) {

            preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.getUID());
+            preparedStatement.setInt(2, wh.UID);

            return (preparedStatement.executeUpdate() > 0);

@@ -413,7 +414,7 @@ public class dbWarehouseHandler extends dbHandlerBase {
             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_galvor`=? WHERE `UID` = ?")) {

            preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.getUID());
+            preparedStatement.setInt(2, wh.UID);

            return (preparedStatement.executeUpdate() > 0);

@@ -429,7 +430,7 @@ public class dbWarehouseHandler extends dbHandlerBase {
             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_wormwood`=? WHERE `UID` = ?")) {

            preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.getUID());
+            preparedStatement.setInt(2, wh.UID);

            return (preparedStatement.executeUpdate() > 0);

@@ -445,7 +446,7 @@ public class dbWarehouseHandler extends dbHandlerBase {
             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_obsidian`=? WHERE `UID` = ?")) {

            preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.getUID());
+            preparedStatement.setInt(2, wh.UID);

            return (preparedStatement.executeUpdate() > 0);

@@ -461,7 +462,7 @@ public class dbWarehouseHandler extends dbHandlerBase {
             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_bloodstone`=? WHERE `UID` = ?")) {

            preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.getUID());
+            preparedStatement.setInt(2, wh.UID);

            return (preparedStatement.executeUpdate() > 0);

@@ -477,7 +478,7 @@ public class dbWarehouseHandler extends dbHandlerBase {
             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_mithril`=? WHERE `UID` = ?")) {

            preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.getUID());
+            preparedStatement.setInt(2, wh.UID);

            return (preparedStatement.executeUpdate() > 0);

@@ -545,7 +546,7 @@ public class dbWarehouseHandler extends dbHandlerBase {
            while (rs.next()) {
                warehouse = new Warehouse(rs);
                warehouse.runAfterLoad();
-                warehouse.loadAllTransactions();
+                WarehouseManager.loadAllTransactions(warehouse);
            }

        } catch (SQLException e) {