Skip to content

Commit efbce5d

Browse files
committed
Merge branch 'develop' into master
# Conflicts: # pom.xml # src/main/resources/addon.yml
2 parents 78e6a30 + 48a5ca7 commit efbce5d

File tree

6 files changed

+27
-17
lines changed

6 files changed

+27
-17
lines changed

README.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
AcidIsland™
22
===========
33
[![Build Status](https://ci.codemc.org/buildStatus/icon?job=BentoBoxWorld/AcidIsland)](https://ci.codemc.org/job/BentoBoxWorld/job/AcidIsland/)
4-
[![Lines Of Code](https://sonarcloud.io/api/project_badges/measure?project=world.bentobox%3Aacidisland&metric=ncloc)](https://sonarcloud.io/component_measures?id=world.bentobox%3Aacidisland&metric=ncloc)
5-
[![Maintainability Rating](https://sonarcloud.io/api/project_badges/measure?project=world.bentobox%3Aacidisland&metric=sqale_rating)](https://sonarcloud.io/component_measures?id=world.bentobox%3Aacidisland&metric=Maintainability)
6-
[![Reliability Rating](https://sonarcloud.io/api/project_badges/measure?project=world.bentobox%3Aacidisland&metric=reliability_rating)](https://sonarcloud.io/component_measures?id=world.bentobox%3Aacidisland&metric=Reliability)
7-
[![Security Rating](https://sonarcloud.io/api/project_badges/measure?project=world.bentobox%3Aacidisland&metric=security_rating)](https://sonarcloud.io/component_measures?id=world.bentobox%3Aacidisland&metric=Security)
8-
[![Bugs](https://sonarcloud.io/api/project_badges/measure?project=world.bentobox%3Aacidisland&metric=bugs)](https://sonarcloud.io/project/issues?id=world.bentobox%3Aacidisland&resolved=false&types=BUG)
4+
[![Lines Of Code](https://sonarcloud.io/api/project_badges/measure?project=BentoBoxWorld_AcidIsland&metric=ncloc)](https://sonarcloud.io/component_measures?id=BentoBoxWorld_AcidIsland&metric=ncloc)
5+
[![Maintainability Rating](https://sonarcloud.io/api/project_badges/measure?project=BentoBoxWorld_AcidIsland&metric=sqale_rating)](https://sonarcloud.io/component_measures?id=BentoBoxWorld_AcidIslandd&metric=Maintainability)
6+
[![Reliability Rating](https://sonarcloud.io/api/project_badges/measure?project=BentoBoxWorld_AcidIsland&metric=reliability_rating)](https://sonarcloud.io/component_measures?id=BentoBoxWorld_AcidIsland&metric=Reliability)
7+
[![Security Rating](https://sonarcloud.io/api/project_badges/measure?project=BentoBoxWorld_AcidIsland&metric=security_rating)](https://sonarcloud.io/component_measures?id=BentoBoxWorld_AcidIsland&metric=Security)
8+
[![Bugs](https://sonarcloud.io/api/project_badges/measure?project=BentoBoxWorld_AcidIsland&metric=bugs)](https://sonarcloud.io/project/issues?id=BentoBoxWorld_AcidIsland&resolved=false&types=BUG)
99

1010
# Introduction
1111
AcidIsland™ add-on for BentoBox, so to run an AcidIsland™ game, you must have BentoBox installed. Docs can be found at [https://docs.bentobox.world](https://docs.bentobox.world).

pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -58,14 +58,14 @@
5858
<!-- Non-minecraft related dependencies -->
5959
<powermock.version>2.0.9</powermock.version>
6060
<!-- More visible way how to change dependency versions -->
61-
<spigot.version>1.19.3-R0.1-SNAPSHOT</spigot.version>
62-
<bentobox.version>1.22.0-SNAPSHOT</bentobox.version>
61+
<spigot.version>1.19.4-R0.1-SNAPSHOT</spigot.version>
62+
<bentobox.version>1.23.0</bentobox.version>
6363
<!-- Revision variable removes warning about dynamic version -->
6464
<revision>${build.version}-SNAPSHOT</revision>
6565
<!-- Do not change unless you want different name for local builds. -->
6666
<build.number>-LOCAL</build.number>
6767
<!-- This allows to change between versions. -->
68-
<build.version>1.17.1</build.version>
68+
<build.version>1.17.2</build.version>
6969
<!-- Sonar Cloud -->
7070
<sonar.projectKey>BentoBoxWorld_AcidIsland</sonar.projectKey>
7171
<sonar.organization>bentobox-world</sonar.organization>

src/main/java/world/bentobox/acidisland/AcidIsland.java

+8
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,14 @@ public class AcidIsland extends GameModeAddon {
4141

4242
private static final String NETHER = "_nether";
4343
private static final String THE_END = "_the_end";
44+
45+
/**
46+
* This addon uses the new chunk generation API for the sea bottom
47+
*/
48+
@Override
49+
public boolean isUsesNewChunkGeneration() {
50+
return true;
51+
}
4452

4553
@Override
4654
public void onLoad() {

src/main/java/world/bentobox/acidisland/AcidIslandPladdon.java

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package world.bentobox.acidisland;
22

3+
34
import world.bentobox.bentobox.api.addons.Addon;
45
import world.bentobox.bentobox.api.addons.Pladdon;
56

src/main/resources/addon.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: AcidIsland
22
main: world.bentobox.acidisland.AcidIsland
33
version: ${version}${build.number}
4-
api-version: 1.22
4+
api-version: 1.22.1
55
metrics: true
66
repository: "BentoBoxWorld/AcidIsland"
77
icon: "OAK_BOAT"

src/main/resources/plugin.yml

+9-8
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
name: Pladdon
2-
main: world.bentobox.acidisland.AcidIslandPladdon
3-
version: ${version}
4-
api-version: 1.21
5-
description: AcidIsland
6-
author: tastybento
7-
depend:
8-
- BentoBox
1+
name: BentoBox-AcidIsland
2+
main: world.bentobox.acidisland.AcidIslandPladdon
3+
version: ${project.version}${build.number}
4+
api-version: "1.19"
5+
6+
authors: [tastybento]
7+
contributors: ["The BentoBoxWorld Community"]
8+
website: https://bentobox.world
9+
description: ${project.description}

0 commit comments

Comments
 (0)