Skip to content

Commit

Permalink
Version 1.8.1. Updates to latest APIs.
Browse files Browse the repository at this point in the history
Fixes #16
  • Loading branch information
tastybento committed Dec 6, 2020
1 parent 4966a9c commit 2fdd505
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 10 deletions.
2 changes: 2 additions & 0 deletions .settings/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/org.eclipse.core.resources.prefs
/org.eclipse.jdt.core.prefs
8 changes: 4 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -59,17 +59,17 @@
<powermock.version>2.0.2</powermock.version>
<!-- More visible way how to change dependency versions -->
<spigot.version>1.14.4-R0.1-SNAPSHOT</spigot.version>
<bentobox.version>1.8.0</bentobox.version>
<bskyblock.version>1.8.0</bskyblock.version>
<warps.version>1.6.0</warps.version>
<bentobox.version>1.15.0</bentobox.version>
<bskyblock.version>1.14.3</bskyblock.version>
<warps.version>1.10.0</warps.version>
<challenges.version>0.8.0-SNAPSHOT</challenges.version>
<itemconverter.version>22fd6f5ee4</itemconverter.version>
<!-- Revision variable removes warning about dynamic version -->
<revision>${build.version}-SNAPSHOT</revision>
<!-- Do not change unless you want different name for local builds. -->
<build.number>-LOCAL</build.number>
<!-- This allows to change between versions. -->
<build.version>1.8.0</build.version>
<build.version>1.8.1</build.version>
</properties>

<!-- Profiles will allow to automatically change build version. -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,9 @@ private void getConfigs(User user) throws InvalidConfigurationException {
s.setIslandStartX(config.getInt("island.startx",0));
s.setIslandStartZ(config.getInt("island.startz",0));
s.setSeaHeight(config.getInt("island.sealevel") != 0 ? config.getInt("island.sealevel") - 1 : 0);
s.setIslandHeight(config.getInt("island.islandlevel"));
// ASkyBlock has its bedrock block center 5 below the island height
int height = Math.max(0, config.getInt("island.islandlevel") - 5);
s.setIslandHeight(height);

Flags.PREVENT_TELEPORT_WHEN_FALLING.setSetting(getWorld(), config.getBoolean("general.allowfallingteleport", true));
Flags.GEO_LIMIT_MOBS.setSetting(getWorld(), config.getBoolean("general.restrictwither", true));
Expand Down Expand Up @@ -205,8 +207,8 @@ private void getConfigs(User user) throws InvalidConfigurationException {
Flags.LEVER.setSetting(getWorld(), config.getBoolean("protection.world.LEAVER_BUTTON"));
Flags.BUTTON.setSetting(getWorld(), config.getBoolean("protection.world.LEAVER_BUTTON"));
Flags.MILKING.setSetting(getWorld(), config.getBoolean("protection.world.MILKING"));
Flags.ANIMAL_SPAWN.setSetting(getWorld(), config.getBoolean("protection.world.MOB_SPAWN"));
Flags.MONSTER_SPAWN.setSetting(getWorld(), config.getBoolean("protection.world.MONSTER_SPAWN"));
Flags.ANIMAL_NATURAL_SPAWN.setSetting(getWorld(), config.getBoolean("protection.world.MOB_SPAWN"));
Flags.MONSTER_NATURAL_SPAWN.setSetting(getWorld(), config.getBoolean("protection.world.MONSTER_SPAWN"));
Flags.JUKEBOX.setSetting(getWorld(), config.getBoolean("protection.world.MUSIC"));
Flags.NOTE_BLOCK.setSetting(getWorld(), config.getBoolean("protection.world.MUSIC"));
Flags.PLACE_BLOCKS.setSetting(getWorld(), config.getBoolean("protection.world.PLACE_BLOCKS"));
Expand Down Expand Up @@ -278,11 +280,11 @@ public boolean accept(File dir, String name) {
// New player
p.setUniqueId(uniqueId);
p.setPlayerName(player.getString("playerName"));
names.saveObject(new Names(player.getString("playerName"), uuid));
names.saveObjectAsync(new Names(player.getString("playerName"), uuid));
}
p.getDeaths().putIfAbsent(config.getString("general.worldName"), player.getInt("deaths"));
p.setLocale(player.getString("locale"));
handler.saveObject(p);
handler.saveObjectAsync(p);
count++;
if (count % 10 == 0) {
user.sendRawMessage("Saved " + (count++) + " players");
Expand Down
3 changes: 2 additions & 1 deletion src/main/resources/addon.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@ name: a2b
main: world.bentobox.a2b.A2B
version: ${version}
metrics: true
api-version: 1.15

authors: tastybento

depend: BSkyBlock

softdepend: WelcomeWarps Challenges
softdepend: Warps Challenges

0 comments on commit 2fdd505

Please sign in to comment.