Skip to content

Update to 1.21.3 #147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tastybento merged 1 commit into from
Nov 9, 2024
Merged

Update to 1.21.3 #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 6 additions & 10 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,9 @@

<distributionManagement>
<snapshotRepository>
<id>codemc-snapshots</id>
<url>https://repo.codemc.org/repository/maven-snapshots</url>
<id>codemc</id>
<url>https://repo.codemc.org/repository/bentoboxworld/</url>
</snapshotRepository>
<repository>
<id>codemc-releases</id>
<url>https://repo.codemc.org/repository/maven-releases</url>
</repository>
</distributionManagement>

<properties>
Expand All @@ -46,8 +42,8 @@
<java.version>17</java.version>
<powermock.version>2.0.2</powermock.version>
<!-- More visible way how to change dependency versions -->
<spigot.version>1.20-R0.1-SNAPSHOT</spigot.version>
<bentobox.version>2.0.0-SNAPSHOT</bentobox.version>
<spigot.version>1.21.3-R0.1-SNAPSHOT</spigot.version>
<bentobox.version>2.7.1-SNAPSHOT</bentobox.version>
<bank.version>1.4.0</bank.version>
<level.version>2.5.0</level.version>
<greenhouses.version>1.4.0-SNAPSHOT</greenhouses.version>
Expand All @@ -56,7 +52,7 @@
<!-- Revision variable removes warning about dynamic version -->
<revision>${build.version}-SNAPSHOT</revision>
<!-- This allows to change between versions and snapshots. -->
<build.version>2.2.0</build.version>
<build.version>2.3.0</build.version>
<build.number>-LOCAL</build.number>
<!-- Sonar Cloud -->
<sonar.projectKey>BentoBoxWorld_Biomes</sonar.projectKey>
Expand Down Expand Up @@ -135,7 +131,7 @@
</repository>
<repository>
<id>codemc-repo</id>
<url>https://repo.codemc.org/repository/maven-public/</url>
<url>https://repo.codemc.org/repository/bentoboxworld/</url>
</repository>
<repository>
<id>vault-repo</id>
Expand Down
10 changes: 7 additions & 3 deletions src/main/java/world/bentobox/biomes/managers/BiomesImportManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import com.google.gson.GsonBuilder;
import com.google.gson.annotations.Expose;
import org.bukkit.Material;
import org.bukkit.Registry;
import org.bukkit.World;
import org.bukkit.block.Biome;
import org.bukkit.configuration.ConfigurationSection;
Expand Down Expand Up @@ -232,9 +233,12 @@ private int importBiomes(@NotNull ConfigurationSection reader, GameModeAddon gam
biomesObject.setUniqueId(Utils.sanitizeInput(prefix + biomeId.toLowerCase()));

// Read biome or replace it with VOID
biomesObject.setBiome(
Enums.getIfPresent(Biome.class, details.getString("biome", "").toUpperCase()).
or(Biome.THE_VOID));
Biome b = Registry.BIOME.match(details.getString("biome", ""));
if (b != null) {
biomesObject.setBiome(b);
} else {
biomesObject.setBiome(Biome.THE_VOID);
}
// Read environment or replace with Normal
biomesObject.setEnvironment(
Enums.getIfPresent(World.Environment.class, details.getString("environment", "").toUpperCase()).
Expand Down
5 changes: 2 additions & 3 deletions src/main/java/world/bentobox/biomes/tasks/BiomeUpdateTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
import org.bukkit.util.BlockVector;

import world.bentobox.bentobox.api.user.User;
import world.bentobox.bentobox.paperlib.PaperLib;
import world.bentobox.bentobox.util.Util;
import world.bentobox.biomes.BiomesAddon;
import world.bentobox.biomes.database.objects.BiomesObject;
Expand Down Expand Up @@ -88,7 +87,7 @@ public void processBiomeChange(UpdateQueue updateQueue)
// Scan the next chunk
this.scanNextChunk().thenAccept(result ->
{
if (!PaperLib.isPaper() && !Bukkit.isPrimaryThread())
if (!Util.isPaper() && !Bukkit.isPrimaryThread())
{
this.addon.logError("scanChunk not on Primary Thread!");
}
Expand Down Expand Up @@ -179,7 +178,7 @@ private CompletableFuture<Boolean> scanChunk(ChunkData chunkData, Chunk chunk)
return completed;
}

if (PaperLib.isPaper())
if (Util.isPaper())
{
Bukkit.getScheduler().runTaskAsynchronously(this.addon.getPlugin(),
() -> this.runBiomeChange(chunkData, chunk, completed));
Expand Down
Loading