Skip to content

Commit 44bf473

Browse files
BONNeBONNe
committed
Merge remote-tracking branch 'origin/develop' into master
# Conflicts: # pom.xml # src/main/resources/addon.yml
2 parents 6d3aab0 + c79f7e2 commit 44bf473

File tree

13 files changed

+135
-47
lines changed

13 files changed

+135
-47
lines changed

‎pom.xml‎

Lines changed: 31 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,18 +54,18 @@
5454
<properties>
5555
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
5656
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
57-
<java.version>16</java.version>
57+
<java.version>17</java.version>
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.17.1-R0.1-SNAPSHOT</spigot.version>
62-
<bentobox.version>1.17.1</bentobox.version>
61+
<spigot.version>1.19-R0.1-SNAPSHOT</spigot.version>
62+
<bentobox.version>1.21.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.15.2</build.version>
68+
<build.version>1.16.0</build.version>
6969
<!-- Sonar Cloud -->
7070
<sonar.projectKey>BentoBoxWorld_BSkyBlock</sonar.projectKey>
7171
<sonar.organization>bentobox-world</sonar.organization>
@@ -230,7 +230,33 @@
230230
<version>3.0.0-M5</version>
231231
<configuration>
232232
<argLine>
233-
--illegal-access=permit
233+
--add-opens java.base/java.lang=ALL-UNNAMED
234+
--add-opens java.base/java.math=ALL-UNNAMED
235+
--add-opens java.base/java.io=ALL-UNNAMED
236+
--add-opens java.base/java.util=ALL-UNNAMED
237+
--add-opens
238+
java.base/java.util.stream=ALL-UNNAMED
239+
--add-opens java.base/java.text=ALL-UNNAMED
240+
--add-opens
241+
java.base/java.util.regex=ALL-UNNAMED
242+
--add-opens
243+
java.base/java.nio.channels.spi=ALL-UNNAMED
244+
--add-opens java.base/sun.nio.ch=ALL-UNNAMED
245+
--add-opens java.base/java.net=ALL-UNNAMED
246+
--add-opens
247+
java.base/java.util.concurrent=ALL-UNNAMED
248+
--add-opens java.base/sun.nio.fs=ALL-UNNAMED
249+
--add-opens java.base/sun.nio.cs=ALL-UNNAMED
250+
--add-opens java.base/java.nio.file=ALL-UNNAMED
251+
--add-opens
252+
java.base/java.nio.charset=ALL-UNNAMED
253+
--add-opens
254+
java.base/java.lang.reflect=ALL-UNNAMED
255+
--add-opens
256+
java.logging/java.util.logging=ALL-UNNAMED
257+
--add-opens java.base/java.lang.ref=ALL-UNNAMED
258+
--add-opens java.base/java.util.jar=ALL-UNNAMED
259+
--add-opens java.base/java.util.zip=ALL-UNNAMED
234260
</argLine>
235261
</configuration>
236262
</plugin>

‎src/main/java/world/bentobox/bskyblock/Settings.java‎

Lines changed: 59 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
package world.bentobox.bskyblock;
22

3-
import java.util.ArrayList;
4-
import java.util.HashMap;
5-
import java.util.HashSet;
6-
import java.util.List;
7-
import java.util.Map;
8-
import java.util.Set;
3+
import java.util.*;
94

105
import org.bukkit.Difficulty;
116
import org.bukkit.GameMode;
@@ -21,8 +16,7 @@
2116
import world.bentobox.bentobox.api.configuration.WorldSettings;
2217
import world.bentobox.bentobox.api.flags.Flag;
2318
import world.bentobox.bentobox.database.objects.adapters.Adapter;
24-
import world.bentobox.bentobox.database.objects.adapters.FlagSerializer;
25-
import world.bentobox.bentobox.database.objects.adapters.FlagSerializer2;
19+
import world.bentobox.bentobox.database.objects.adapters.FlagBooleanSerializer;
2620

2721
/**
2822
* All the plugin settings are here
@@ -232,13 +226,12 @@ public class Settings implements WorldSettings {
232226
@ConfigComment(" SUB-OWNER = 900")
233227
@ConfigComment(" OWNER = 1000")
234228
@ConfigEntry(path = "world.default-island-flags")
235-
@Adapter(FlagSerializer.class)
236-
private Map<Flag, Integer> defaultIslandFlags = new HashMap<>();
229+
private Map<String, Integer> defaultIslandFlagNames = new HashMap<>();
237230

238231
@ConfigComment("These are the default settings for new islands")
239232
@ConfigEntry(path = "world.default-island-settings")
240-
@Adapter(FlagSerializer2.class)
241-
private Map<Flag, Integer> defaultIslandSettings = new HashMap<>();
233+
@Adapter(FlagBooleanSerializer.class)
234+
private Map<String, Integer> defaultIslandSettingNames = new HashMap<>();
242235

243236
@ConfigComment("These settings/flags are hidden from users")
244237
@ConfigComment("Ops can toggle hiding in-game using SHIFT-LEFT-CLICK on flags in settings")
@@ -690,22 +683,57 @@ public Map<String, Boolean> getWorldFlags() {
690683
return worldFlags;
691684
}
692685

686+
693687
/**
694688
* @return the defaultIslandFlags
689+
* @deprecated since 1.21
695690
*/
696691
@Override
697-
public Map<Flag, Integer> getDefaultIslandFlags() {
698-
return defaultIslandFlags;
692+
public Map<Flag, Integer> getDefaultIslandFlags()
693+
{
694+
return Collections.emptyMap();
699695
}
700696

697+
701698
/**
702699
* @return the defaultIslandSettings
700+
* @deprecated since 1.21
701+
*/
702+
@Override
703+
public Map<Flag, Integer> getDefaultIslandSettings()
704+
{
705+
return Collections.emptyMap();
706+
}
707+
708+
709+
/**
710+
* Return map of flags ID's linked to default rank for new island.
711+
* This is necessary so users could specify any flag names in settings file from other plugins and addons.
712+
* Otherwise, Flag reader would mark flag as invalid and remove it.
713+
* @since 1.21
714+
* @return default rank settings for new islands.
715+
*/
716+
@Override
717+
public Map<String, Integer> getDefaultIslandFlagNames()
718+
{
719+
return this.defaultIslandFlagNames;
720+
}
721+
722+
723+
/**
724+
* Return map of flags ID's linked to default settings for new island.
725+
* This is necessary so users could specify any flag names in settings file from other plugins and addons.
726+
* Otherwise, Flag reader would mark flag as invalid and remove it.
727+
* @since 1.21
728+
* @return default settings for new islands.
703729
*/
704730
@Override
705-
public Map<Flag, Integer> getDefaultIslandSettings() {
706-
return defaultIslandSettings;
731+
public Map<String, Integer> getDefaultIslandSettingNames()
732+
{
733+
return this.defaultIslandSettingNames;
707734
}
708735

736+
709737
/**
710738
* @return the hidden flags
711739
*/
@@ -1097,20 +1125,29 @@ public void setWorldFlags(Map<String, Boolean> worldFlags) {
10971125
this.worldFlags = worldFlags;
10981126
}
10991127

1128+
11001129
/**
1101-
* @param defaultIslandFlags the defaultIslandFlags to set
1130+
* Sets default island flag names.
1131+
*
1132+
* @param defaultIslandFlagNames the default island flag names
11021133
*/
1103-
public void setDefaultIslandFlags(Map<Flag, Integer> defaultIslandFlags) {
1104-
this.defaultIslandFlags = defaultIslandFlags;
1134+
public void setDefaultIslandFlagNames(Map<String, Integer> defaultIslandFlagNames)
1135+
{
1136+
this.defaultIslandFlagNames = defaultIslandFlagNames;
11051137
}
11061138

1139+
11071140
/**
1108-
* @param defaultIslandSettings the defaultIslandSettings to set
1141+
* Sets default island setting names.
1142+
*
1143+
* @param defaultIslandSettingNames the default island setting names
11091144
*/
1110-
public void setDefaultIslandSettings(Map<Flag, Integer> defaultIslandSettings) {
1111-
this.defaultIslandSettings = defaultIslandSettings;
1145+
public void setDefaultIslandSettingNames(Map<String, Integer> defaultIslandSettingNames)
1146+
{
1147+
this.defaultIslandSettingNames = defaultIslandSettingNames;
11121148
}
11131149

1150+
11141151
/**
11151152
* @param hiddenFlags the hidden flags to set
11161153
*/

‎src/main/java/world/bentobox/bskyblock/commands/IslandAboutCommand.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public void setup() {
2323
@Override
2424
public boolean execute(User user, String label, List<String> args) {
2525
user.sendRawMessage("About " + getAddon().getDescription().getName() + " " + getAddon().getDescription().getVersion() + ":");
26-
user.sendRawMessage("Copyright (c) 2017 - 2020 tastybento, Poslovitch");
26+
user.sendRawMessage("Copyright (c) 2017 - 2022 tastybento, Poslovitch");
2727
user.sendRawMessage("See https://www.eclipse.org/legal/epl-2.0/");
2828
user.sendRawMessage("for license information.");
2929
return true;

‎src/main/java/world/bentobox/bskyblock/generators/ChunkGeneratorWorld.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public ChunkGeneratorWorld(BSkyBlock addon) {
3939
public ChunkData generateChunks(World world) {
4040
ChunkData result = createChunkData(world);
4141
if (world.getEnvironment().equals(Environment.NORMAL) && addon.getSettings().getSeaHeight() > 0) {
42-
result.setRegion(0, 0, 0, 16, addon.getSettings().getSeaHeight() + 1, 16, Material.WATER);
42+
result.setRegion(0, world.getMinHeight(), 0, 16, addon.getSettings().getSeaHeight() + 1, 16, Material.WATER);
4343
}
4444
if (world.getEnvironment().equals(Environment.NETHER) && addon.getSettings().isNetherRoof()) {
4545
roofChunk.forEach((k,v) -> result.setBlock(k.getBlockX(), world.getMaxHeight() + k.getBlockY(), k.getBlockZ(), v));
@@ -58,7 +58,7 @@ private void setBiome(World world, BiomeGrid biomeGrid) {
5858
world.getEnvironment() == Environment.NETHER ? addon.getSettings().getDefaultNetherBiome() : addon.getSettings().getDefaultEndBiome();
5959
for (int x = 0; x < 16; x+=4) {
6060
for (int z = 0; z < 16; z+=4) {
61-
for (int y = 0; y < world.getMaxHeight(); y+=4) {
61+
for (int y = world.getMinHeight(); y < world.getMaxHeight(); y+=4) {
6262
biomeGrid.setBiome(x, y, z, biome);
6363
}
6464
}

‎src/main/resources/addon.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: BSkyBlock
22
main: world.bentobox.bskyblock.BSkyBlock
33
version: ${version}${build.number}
4-
api-version: 1.16.5
4+
api-version: 1.21.0
55
metrics: true
66
icon: "OAK_SAPLING"
77
repository: "BentoBoxWorld/BSkyBlock"

‎src/main/resources/locales/de.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
bskyblock:
3+
sign:
4+
line0: "&cBSkyBlock"
5+
line1: Herzlich willkommen!
6+
line2: "[name]"
7+
line3: Fall nicht hin! &c<3

‎src/main/resources/locales/fr.yml‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,10 @@
1-
###########################################################################################
2-
# Ceci est un fichier YAML. Soyez prudent lors de l'édition.Vérifiez vos changements dans #
3-
# le vérificateur YAML suivant: http://yaml-online-parser.appspot.com #
4-
###########################################################################################
5-
6-
meta:
7-
authors:
8-
- x9nico
9-
1+
---
102
bskyblock:
113
sign:
124
line0: "&cBSkyBlock"
13-
line1: "Bienvenue!"
5+
line1: Bienvenue!
146
line2: "[name]"
15-
line3: "Ne tombez pas ! &c<3"
16-
7+
line3: Ne tombez pas ! &c<3
8+
meta:
9+
authors:
10+
- x9nico

‎src/main/resources/locales/pt.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1+
---
12
bskyblock:
23
sign:
34
line0: "&cBSkyBlock"
5+
line1: Bem vindo(a)!
46
line2: "[name]"
57
line3: Não caia! &c<3
6-
line1: Bem vinda!

‎src/main/resources/locales/ro.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
---
2+
bskyblock:
3+
sign:
4+
line0: "&cBSkyBlock"
5+
line1: "Bine ai venit!"
6+
line2: "[name]"
7+
line3: "Sa nu cazi! &c<3"
8+

‎src/main/resources/locales/tr.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
bskyblock:
3+
sign:
4+
line0: "&cBSkyBlock"
5+
line1: Hoş Geldin!
6+
line2: "[name]"
7+
line3: Aşağı Düşme! &c<3

0 commit comments

Comments
 (0)