Upstream
/
Greenhouses
mirror of https://github.com/BentoBoxWorld/Greenhouses.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Bentobox 1.14 api

This commit is contained in:
tastybento 2020-06-10 21:35:38 -07:00
parent 3f92772e39
commit 6266ffef49
4 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pom.xml
View File

@ -46,12 +46,12 @@
<java.version>1.8</java.version> <java.version>1.8</java.version>
<powermock.version>2.0.2</powermock.version> <powermock.version>2.0.2</powermock.version>
<!-- More visible way how to change dependency versions --> <!-- More visible way how to change dependency versions -->
<spigot.version>1.14.4-R0.1-SNAPSHOT</spigot.version> <spigot.version>1.15.2-R0.1-SNAPSHOT</spigot.version>
<bentobox.version>1.12.0</bentobox.version> <bentobox.version>1.14.0-SNAPSHOT</bentobox.version>
<!-- Revision variable removes warning about dynamic version --> <!-- Revision variable removes warning about dynamic version -->
<revision>${build.version}-SNAPSHOT</revision> <revision>${build.version}-SNAPSHOT</revision>
<!-- This allows to change between versions and snapshots. --> <!-- This allows to change between versions and snapshots. -->
<build.version>1.0.2</build.version> <build.version>1.1.0</build.version>
<build.number>-LOCAL</build.number> <build.number>-LOCAL</build.number>
</properties> </properties>

2
src/main/java/world/bentobox/greenhouses/data/Greenhouse.java
View File

@ -12,6 +12,7 @@ import org.bukkit.util.BoundingBox;
import com.google.gson.annotations.Expose; import com.google.gson.annotations.Expose;
import world.bentobox.bentobox.database.objects.DataObject; 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.BiomeRecipe;
import world.bentobox.greenhouses.greenhouse.Walls; import world.bentobox.greenhouses.greenhouse.Walls;
import world.bentobox.greenhouses.managers.RecipeManager; import world.bentobox.greenhouses.managers.RecipeManager;
@ -21,6 +22,7 @@ import world.bentobox.greenhouses.managers.RecipeManager;
* @author tastybento * @author tastybento
* *
*/ */
@Table(name = "Greenhouses")
public class Greenhouse implements DataObject { public class Greenhouse implements DataObject {
@Expose @Expose

6
src/main/java/world/bentobox/greenhouses/managers/GreenhouseManager.java
View File

@ -118,7 +118,7 @@ public class GreenhouseManager implements Listener {
*/ */
public void saveGreenhouses() { public void saveGreenhouses() {
addon.log("Saving greenhouses..."); 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); finder.getGh().setBiomeRecipe(greenhouseRecipe);
resultSet.add(map.addGreenhouse(finder.getGh())); resultSet.add(map.addGreenhouse(finder.getGh()));
activateGreenhouse(finder.getGh()); activateGreenhouse(finder.getGh());
handler.saveObject(finder.getGh()); handler.saveObjectAsync(finder.getGh());
} }
return new GhResult().setFinder(finder).setResults(resultSet); return new GhResult().setFinder(finder).setResults(resultSet);
} }
@ -187,7 +187,7 @@ public class GreenhouseManager implements Listener {
// Success - set recipe and add to map // Success - set recipe and add to map
finder.getGh().setBiomeRecipe(r); finder.getGh().setBiomeRecipe(r);
activateGreenhouse(finder.getGh()); activateGreenhouse(finder.getGh());
handler.saveObject(finder.getGh()); handler.saveObjectAsync(finder.getGh());
return map.addGreenhouse(finder.getGh()); return map.addGreenhouse(finder.getGh());
}).orElse(GreenhouseResult.FAIL_NO_RECIPE_FOUND)); }).orElse(GreenhouseResult.FAIL_NO_RECIPE_FOUND));
return new GhResult().setFinder(finder).setResults(resultSet); return new GhResult().setFinder(finder).setResults(resultSet);

17
src/main/resources/addon.yml
View File

@ -1,27 +1,16 @@
name: Greenhouses name: Greenhouses
main: world.bentobox.greenhouses.Greenhouses main: world.bentobox.greenhouses.Greenhouses
version: ${version}${build.number} version: ${version}${build.number}
api-version: 1.14
authors: tastybento authors: tastybento
softdepend: AcidIsland, BSkyBlock, SkyGrid softdepend: AcidIsland, BSkyBlock, SkyGrid
permissions: permissions:
bskyblock.greenhouses.player: '[gamemode].greenhouses.player':
description: Gives access to player commands description: Gives access to player commands
default: true default: true
bskyblock.greenhouses.admin: '[gamemode].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:
description: Gives access to admin commands description: Gives access to admin commands
default: op default: op