diff --git a/pom.xml b/pom.xml index ede2850..5fe674a 100644 --- a/pom.xml +++ b/pom.xml @@ -46,12 +46,12 @@ 1.8 2.0.2 - 1.14.4-R0.1-SNAPSHOT - 1.12.0 + 1.15.2-R0.1-SNAPSHOT + 1.14.0-SNAPSHOT ${build.version}-SNAPSHOT - 1.0.2 + 1.1.0 -LOCAL diff --git a/src/main/java/world/bentobox/greenhouses/data/Greenhouse.java b/src/main/java/world/bentobox/greenhouses/data/Greenhouse.java index 089ce7c..67b20ab 100644 --- a/src/main/java/world/bentobox/greenhouses/data/Greenhouse.java +++ b/src/main/java/world/bentobox/greenhouses/data/Greenhouse.java @@ -12,6 +12,7 @@ import org.bukkit.util.BoundingBox; import com.google.gson.annotations.Expose; import world.bentobox.bentobox.database.objects.DataObject; +import world.bentobox.bentobox.database.objects.Table; import world.bentobox.greenhouses.greenhouse.BiomeRecipe; import world.bentobox.greenhouses.greenhouse.Walls; import world.bentobox.greenhouses.managers.RecipeManager; @@ -21,6 +22,7 @@ import world.bentobox.greenhouses.managers.RecipeManager; * @author tastybento * */ +@Table(name = "Greenhouses") public class Greenhouse implements DataObject { @Expose diff --git a/src/main/java/world/bentobox/greenhouses/managers/GreenhouseManager.java b/src/main/java/world/bentobox/greenhouses/managers/GreenhouseManager.java index ab6c24b..8490465 100644 --- a/src/main/java/world/bentobox/greenhouses/managers/GreenhouseManager.java +++ b/src/main/java/world/bentobox/greenhouses/managers/GreenhouseManager.java @@ -118,7 +118,7 @@ public class GreenhouseManager implements Listener { */ public void saveGreenhouses() { addon.log("Saving greenhouses..."); - map.getGreenhouses().forEach(handler::saveObject); + map.getGreenhouses().forEach(handler::saveObjectAsync); } /** @@ -175,7 +175,7 @@ public class GreenhouseManager implements Listener { finder.getGh().setBiomeRecipe(greenhouseRecipe); resultSet.add(map.addGreenhouse(finder.getGh())); activateGreenhouse(finder.getGh()); - handler.saveObject(finder.getGh()); + handler.saveObjectAsync(finder.getGh()); } return new GhResult().setFinder(finder).setResults(resultSet); } @@ -187,7 +187,7 @@ public class GreenhouseManager implements Listener { // Success - set recipe and add to map finder.getGh().setBiomeRecipe(r); activateGreenhouse(finder.getGh()); - handler.saveObject(finder.getGh()); + handler.saveObjectAsync(finder.getGh()); return map.addGreenhouse(finder.getGh()); }).orElse(GreenhouseResult.FAIL_NO_RECIPE_FOUND)); return new GhResult().setFinder(finder).setResults(resultSet); diff --git a/src/main/resources/addon.yml b/src/main/resources/addon.yml index 354fcde..19c660c 100755 --- a/src/main/resources/addon.yml +++ b/src/main/resources/addon.yml @@ -1,27 +1,16 @@ name: Greenhouses main: world.bentobox.greenhouses.Greenhouses version: ${version}${build.number} +api-version: 1.14 authors: tastybento softdepend: AcidIsland, BSkyBlock, SkyGrid permissions: - bskyblock.greenhouses.player: + '[gamemode].greenhouses.player': description: Gives access to player commands default: true - bskyblock.greenhouses.admin: - description: Gives access to admin commands - default: op - acidisland.greenhouses.player: - description: Gives access to player commands - default: true - acidisland.greenhouses.admin: - description: Gives access to admin commands - default: op - skygrid.greenhouses.player: - description: Gives access to player commands - default: true - skygrid.greenhouses.admin: + '[gamemode].greenhouses.admin': description: Gives access to admin commands default: op