Upstream/AcidIsland
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/AcidIsland.git synced 2025-02-24 16:21:19 +01:00
Code Issues Projects Releases Wiki Activity

Swirch to 1.13 API

Browse Source
This commit is contained in:
tastybento 2018-07-26 22:45:55 -07:00
parent 064feb3030
commit 49cf4a8e96
4 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -57,7 +57,7 @@
<dependency>
<groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId>
<version>1.12.2-R0.1-SNAPSHOT</version>
<version>1.13-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>

14
src/main/java/bskyblock/addon/acidisland/AISettings.java
View File

@ -389,7 +389,9 @@ public class AISettings implements DataObject, WorldSettings {
private boolean closePanelOnClickOutside = true;
//---------------------------------------------------------------------------------------/
@ConfigComment("Do not change this value below")
@ConfigComment("These settings should not be edited")
@ConfigEntry(path = "do-not-edit-these-settings.reset-epoch")
private long resetEpoch = 0;
private String uniqueId = "config";
@ -650,6 +652,7 @@ public class AISettings implements DataObject, WorldSettings {
/**
* @return the resetLimit
*/
@Override
public int getResetLimit() {
return resetLimit;
}
@ -1325,4 +1328,13 @@ public class AISettings implements DataObject, WorldSettings {
this.geoLimitSettings = geoLimitSettings;
}
@Override
public long getResetEpoch() {
return resetEpoch;
}
@Override
public void setResetEpoch(long timestamp) {
this.resetEpoch = timestamp;
}
}

5
src/main/java/bskyblock/addon/acidisland/commands/AcidCommand.java
View File

@ -6,6 +6,8 @@ import bskyblock.addon.acidisland.AcidIsland;
import us.tastybento.bskyblock.api.addons.Addon;
import us.tastybento.bskyblock.api.commands.CompositeCommand;
import us.tastybento.bskyblock.api.user.User;
import us.tastybento.bskyblock.commands.admin.AdminClearResetsAllCommand;
import us.tastybento.bskyblock.commands.admin.AdminClearResetsCommand;
import us.tastybento.bskyblock.commands.admin.AdminGetRankCommand;
import us.tastybento.bskyblock.commands.admin.AdminInfoCommand;
import us.tastybento.bskyblock.commands.admin.AdminRegisterCommand;
@ -55,6 +57,9 @@ public class AcidCommand extends CompositeCommand {
new AdminVersionCommand(this);
// Range
new AdminRangeCommand(this);
// Resets
new AdminClearResetsCommand(this);
new AdminClearResetsAllCommand(this);
}
@Override

10
src/main/java/bskyblock/addon/acidisland/listeners/AcidEffect.java
View File

@ -94,7 +94,7 @@ public class AcidEffect implements Listener {
// Check for acid rain
if (addon.getSettings().getAcidRainDamage() > 0D && isRaining
&& !biome.name().contains("DESERT")
&& !biome.equals(Biome.HELL)
&& !biome.equals(Biome.NETHER)
&& !biome.name().contains("SAVANNA")) {
if (isSafeFromRain(player)) {
wetPlayers.remove(player);
@ -261,7 +261,7 @@ public class AcidEffect implements Listener {
case LEATHER_HELMET:
red = red + 0.04;
break;
case GOLD_HELMET:
case GOLDEN_HELMET:
red = red + 0.08;
break;
case CHAINMAIL_HELMET:
@ -282,7 +282,7 @@ public class AcidEffect implements Listener {
case LEATHER_BOOTS:
red = red + 0.04;
break;
case GOLD_BOOTS:
case GOLDEN_BOOTS:
red = red + 0.04;
break;
case CHAINMAIL_BOOTS:
@ -304,7 +304,7 @@ public class AcidEffect implements Listener {
case LEATHER_LEGGINGS:
red = red + 0.08;
break;
case GOLD_LEGGINGS:
case GOLDEN_LEGGINGS:
red = red + 0.12;
break;
case CHAINMAIL_LEGGINGS:
@ -326,7 +326,7 @@ public class AcidEffect implements Listener {
case LEATHER_CHESTPLATE:
red = red + 0.12;
break;
case GOLD_CHESTPLATE:
case GOLDEN_CHESTPLATE:
red = red + 0.20;
break;
case CHAINMAIL_CHESTPLATE: