Async/Await + Libasynql

.poggit.yml

@@ -4,6 +4,10 @@ projects:
     icon: "icon.png"
     path: ""
     libs:
+      - src: poggit/libasynql/libasynql
+        version: ^3.3.0
+      - src: SOF3/await-generator/await-generator
+        version: ^3.1.1
       - src: dktapps-pm-pl/pmforms/pmforms
         version: ^2.0.0
     lint: false
@@ -15,4 +19,4 @@ projects:
       - .gitignore
       - CONTRIBUTING.md
       - SECURITY.md
-...
+...

plugin.yml

@@ -10,10 +10,11 @@ authors:
 description: "Plots and Protection Plugin for PocketMine-MP Servers"
 load: STARTUP
 softdepend:
-- EconomyAPI
+- Capital
 - DEVirion
-- WorldStyler
 - EasyCommandAutofill
+- EconomyAPI
+- WorldStyler
 permissions:
   myplot.command:
     default: true

resources/config.yml

@@ -37,17 +37,25 @@ Custom Messages: false
 UI Forms: true
 
 # The data provider where plot data is stored.
-# Current providers are: sqlite, mysql, json, and yaml.
-DataProvider: sqlite
-
-# contains settings for mysql provider to use when selected
-MySQLSettings:
-  Host: 127.0.0.1
-  Port: 3306
-  Username: default
-  Password: password
-  DatabaseName: MyPlot
-  ShutdownOnFailure: false
+Database:
+  # The database type. "sqlite" and "mysql" are supported.
+  type: sqlite
+
+  # Edit these settings only if you choose "sqlite".
+  sqlite:
+    # The file name of the database in the plugin data folder.
+    # You can also put an absolute path here.
+    file: plots.db
+  # Edit these settings only if you choose "mysql".
+  mysql:
+    host: 127.0.0.1
+    # Avoid using the "root" user for security reasons.
+    username: default
+    password: password
+    schema: myplot
+  # The maximum number of simultaneous SQL queries
+  # Recommended: 1 for sqlite, 2 for MySQL. You may want to further increase this value if your MySQL connection is very slow.
+  worker-limit: 1
 
 # Use an economy with MyPlot. This will allow for plot pricing such as claiming, clearing, etc.
 # Currently supported economy plugins: Economy$
@@ -56,7 +64,7 @@ UseEconomy: false
 
 # Amount of plots to be cached.
 # Increasing this number will improve performance, but also increase memory usage.
-PlotCacheSize: 256
+PlotCacheSize: 2500
 
 # When a player enters a plot, a popup with basic info will be shown
 ShowPlotPopup: true
@@ -121,12 +129,12 @@ DefaultWorld:
   RoadWidth: 7
 
   # The block that the road is made of (Default is Oak Planks)
-  RoadBlock: '5:0'
+  RoadBlock: oak planks
   # The block that plot walls are made of (Default is Stone Slabs)
-  WallBlock: '44:0'
+  WallBlock: stone slab
   # The block used as the plot floor (Default is Grass)
-  PlotFloorBlock: '2:0'
+  PlotFloorBlock: grass
   # The block that fills the rest of the plot (Default is Dirt)
-  PlotFillBlock: '3:0'
+  PlotFillBlock: dirt
   # The block at the bottom (Default is Bedrock)
-  BottomBlock: '7:0'
+  BottomBlock: bedrock

resources/eng.ini

@@ -14,6 +14,7 @@ command.name=plot
 command.alias=p
 command.desc=Claim and manage your plots
 command.usage=/p [help]
+command.usable=You cannot use this command right now
 command.unknown=Unknown command. Try /p help for a list of commands
 
 subcommand.usage=Usage: {%0}
@@ -282,8 +283,7 @@ clone.wrongid="The plot id should be in the format X;Z"
 clone.nomoney=You do not have enough money to clone this plot
 clone.success=Plot {%0} has been successfully cloned to plot {%1}
 clone.form=Clone
-clone.formlabel1=Origin Plot Location
-clone.formlabel2=Clone Plot Location
+clone.formcoordslabel=Clone Plot Location
 clone.formxcoord=Plot X Coordinate
 clone.formzcoord=Plot Z Coordinate
 clone.formworld=Plot World Name

resources/langtemplate.ini

@@ -14,6 +14,7 @@ command.name=plot
 command.alias=p
 command.desc=
 command.usage=/p [help]
+command.usable=
 command.unknown=
 
 subcommand.usage=
@@ -269,8 +270,7 @@ clone.wrongid=
 clone.nomoney=
 clone.success=
 clone.form=
-clone.formlabel1=
-clone.formlabel2=
+clone.formcoordslabel=
 clone.formxcoord=
 clone.formzcoord=
 clone.formworld=

resources/mysql.sql

@@ -0,0 +1,223 @@
+-- #!mysql
+-- #{myplot
+-- #  {init
+-- #    {plots
+CREATE TABLE IF NOT EXISTS plotsV2
+(
+    level   TEXT,
+    X       INT,
+    Z       INT,
+    name    TEXT,
+    owner   TEXT,
+    helpers TEXT,
+    denied  TEXT,
+    biome   TEXT,
+    pvp     INT,
+    price   FLOAT,
+    PRIMARY KEY (level, X, Z)
+);
+-- #    }
+-- #    {mergedPlots
+CREATE TABLE IF NOT EXISTS mergedPlotsV2
+(
+    level   TEXT,
+    originX INT,
+    originZ INT,
+    mergedX INT,
+    mergedZ INT,
+    PRIMARY KEY (level, originX, originZ, mergedX, mergedZ)
+);
+-- #    }
+-- #  }
+-- #  {test
+-- #    {table
+-- #      :tableName string
+SELECT COUNT(*) AS tables
+FROM information_schema.tables
+WHERE table_schema = DATABASE()
+  AND table_name = :tableName;
+-- #    }
+-- #  }
+-- #  {add
+-- #    {plot
+-- #      :level string
+-- #      :X int
+-- #      :Z int
+-- #      :name string
+-- #      :owner string
+-- #      :helpers string
+-- #      :denied string
+-- #      :biome string
+-- #      :pvp bool false
+-- #      :price float
+INSERT INTO plotsV2 (level, X, Z, name, owner, helpers, denied, biome, pvp, price)
+VALUES (:level, :X, :Z, :name, :owner, :helpers, :denied, :biome, :pvp, :price)
+ON DUPLICATE KEY UPDATE name    = VALUES(:name),
+                        owner   = VALUES(:owner),
+                        helpers = VALUES(:helpers),
+                        denied  = VALUES(:denied),
+                        biome   = VALUES(:biome),
+                        pvp     = VALUES(:pvp),
+                        price   = VALUES(:price);
+-- #    }
+-- #    {merge
+-- #      :level string
+-- #      :originX int
+-- #      :originZ int
+-- #      :mergedX int
+-- #      :mergedZ int
+INSERT IGNORE INTO mergedPlotsV2 (`level`, `originX`, `originZ`, `mergedX`, `mergedZ`)
+VALUES (:level, :originX, :originZ, :mergedX, :mergedZ);
+-- #    }
+-- #  }
+-- #  {get
+-- #    {plot
+-- #      {by-xz
+-- #        :level string
+-- #        :X int
+-- #        :Z int
+SELECT name, owner, helpers, denied, biome, pvp, price
+FROM plotsV2
+WHERE level = :level
+  AND X = :x
+  AND Z = :z;
+-- #      }
+-- #    }
+-- #    {all-plots
+-- #      {by-owner
+-- #        :owner string
+SELECT level, X, Z
+FROM plotsV2
+WHERE owner = :owner;
+-- #      }
+-- #    }
+-- #    {all-plots
+-- #      {by-owner-and-level
+-- #        :owner string
+-- #        :level string
+SELECT level, X, Z
+FROM plotsV2
+WHERE owner = :owner
+  AND level = :level;
+-- #      }
+-- #    }
+-- #    {highest-existing
+-- #      {by-interval
+-- #        :level string
+-- #        :number int
+SELECT X, Z
+FROM plotsV2
+WHERE (level = :level AND ((abs(X) = :number AND abs(Z) <= :number) OR (abs(Z) = :number AND abs(X) <= :number)));
+-- #      }
+-- #    }
+-- #    {merge-plots
+-- #      {by-origin
+-- #        :level string
+-- #        :originX int
+-- #        :originZ int
+SELECT plotsV2.level,
+       X,
+       Z,
+       name,
+       owner,
+       helpers,
+       denied,
+       biome,
+       pvp,
+       price
+FROM plotsV2
+         LEFT JOIN mergedPlotsV2
+                   ON mergedPlotsV2.level = plotsV2.level
+                       AND mergedX = X
+                       AND mergedZ = Z
+WHERE mergedPlotsV2.level = :level
+  AND originX = :originX
+  AND originZ = :originZ;
+-- #      }
+-- #    }
+-- #    {merge-plots
+-- #      {by-merged
+-- #        :level string
+-- #        :mergedX int
+-- #        :mergedZ int
+SELECT plotsV2.level,
+       X,
+       Z,
+       name,
+       owner,
+       helpers,
+       denied,
+       biome,
+       pvp,
+       price
+FROM plotsV2
+         LEFT JOIN mergedPlotsV2
+                   ON mergedPlotsV2.level = plotsV2.level
+                       AND mergedX = X
+                       AND mergedZ = Z
+WHERE mergedPlotsV2.level = :level
+  AND originX = (
+    SELECT originX
+    FROM mergedPlotsV2
+    WHERE mergedX = :mergedX
+      AND mergedZ = :mergedZ
+      AND mergedPlotsV2.level = :level
+)
+  AND originZ = (
+    SELECT originZ
+    FROM mergedPlotsV2
+    WHERE mergedX = :mergedX
+      AND mergedZ = :mergedZ
+      AND mergedPlotsV2.level = :level
+);
+-- #      }
+-- #    }
+-- #  }
+-- #  {remove
+-- #    {plot
+-- #      {by-xz
+-- #        :level string
+-- #        :x int
+-- #        :z int
+DELETE
+FROM plotsV2
+WHERE level = :level
+  AND X = :X
+  AND Z = :Z;
+-- #      }
+-- #    }
+-- #    {merge
+-- #      {by-xz
+-- #        :level string
+-- #        :x int
+-- #        :z int
+-- #        :pvp bool false
+-- #        :price float
+UPDATE plotsV2
+SET name    = '',
+    owner   = '',
+    helpers = '',
+    denied  = '',
+    pvp     = :pvp,
+    price   = :price
+WHERE level = :level
+  AND X = :x
+  AND Z = :z;
+-- #      }
+-- #    }
+-- #    {merge-entry
+-- #      :level string
+-- #      :originX int
+-- #      :originZ int
+-- #      :mergedX int
+-- #      :mergedZ int
+DELETE
+FROM mergedPlotsV2
+WHERE level = :level
+  AND originX = :originX
+  AND originZ = :originZ
+  AND mergedX = :mergedX
+  AND mergedZ = :mergedZ;
+-- #    }
+-- #  }
+-- #}