diff --git a/pom.xml b/pom.xml index c780ea0d8..98b734cd0 100644 --- a/pom.xml +++ b/pom.xml @@ -73,10 +73,10 @@ 42.2.18 5.0.1 - 1.19.3-R0.1-SNAPSHOT + 1.19.4-R0.1-SNAPSHOT - 1.19.3-R0.1-SNAPSHOT + 1.19.4-R0.1-SNAPSHOT 3.0.0 1.7.1 2.10.9 diff --git a/src/main/java/world/bentobox/bentobox/api/panels/reader/ItemTemplateRecord.java b/src/main/java/world/bentobox/bentobox/api/panels/reader/ItemTemplateRecord.java index c1c157124..e5911c802 100644 --- a/src/main/java/world/bentobox/bentobox/api/panels/reader/ItemTemplateRecord.java +++ b/src/main/java/world/bentobox/bentobox/api/panels/reader/ItemTemplateRecord.java @@ -17,8 +17,6 @@ import org.bukkit.inventory.ItemStack; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; -import world.bentobox.bentobox.api.panels.reader.ItemTemplateRecord.ActionRecords; - /** * This Record contains all necessary information about Item Template that can be used to craft panel item. * diff --git a/src/main/java/world/bentobox/bentobox/api/panels/reader/PanelTemplateRecord.java b/src/main/java/world/bentobox/bentobox/api/panels/reader/PanelTemplateRecord.java index 18d5506f1..f260fb564 100644 --- a/src/main/java/world/bentobox/bentobox/api/panels/reader/PanelTemplateRecord.java +++ b/src/main/java/world/bentobox/bentobox/api/panels/reader/PanelTemplateRecord.java @@ -15,7 +15,6 @@ import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; import world.bentobox.bentobox.api.panels.Panel; -import world.bentobox.bentobox.api.panels.reader.PanelTemplateRecord.TemplateItem; /** * This is template object for the panel reader. It contains data that can exist in the panel. diff --git a/src/main/java/world/bentobox/bentobox/listeners/flags/clicklisteners/GeoMobLimitTab.java b/src/main/java/world/bentobox/bentobox/listeners/flags/clicklisteners/GeoMobLimitTab.java index ce37e7635..b721dee20 100644 --- a/src/main/java/world/bentobox/bentobox/listeners/flags/clicklisteners/GeoMobLimitTab.java +++ b/src/main/java/world/bentobox/bentobox/listeners/flags/clicklisteners/GeoMobLimitTab.java @@ -1,7 +1,6 @@ package world.bentobox.bentobox.listeners.flags.clicklisteners; import java.util.Arrays; -import java.util.Collections; import java.util.Comparator; import java.util.List; diff --git a/src/main/java/world/bentobox/bentobox/listeners/flags/protection/BreakBlocksListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/protection/BreakBlocksListener.java index 80deb6ffe..7d18a1378 100644 --- a/src/main/java/world/bentobox/bentobox/listeners/flags/protection/BreakBlocksListener.java +++ b/src/main/java/world/bentobox/bentobox/listeners/flags/protection/BreakBlocksListener.java @@ -74,6 +74,9 @@ public class BreakBlocksListener extends FlagListener { case SPAWNER -> this.checkIsland(e, p, l, Flags.BREAK_SPAWNERS); case DRAGON_EGG -> this.checkIsland(e, p, l, Flags.DRAGON_EGG); case HOPPER -> this.checkIsland(e, p, l, Flags.BREAK_HOPPERS); + default -> { + // Do nothing + } } } diff --git a/src/main/java/world/bentobox/bentobox/nms/v1_19_R2/WorldRegeneratorImpl.java b/src/main/java/world/bentobox/bentobox/nms/v1_19_R3/WorldRegeneratorImpl.java similarity index 87% rename from src/main/java/world/bentobox/bentobox/nms/v1_19_R2/WorldRegeneratorImpl.java rename to src/main/java/world/bentobox/bentobox/nms/v1_19_R3/WorldRegeneratorImpl.java index d74925517..2d1aecc76 100644 --- a/src/main/java/world/bentobox/bentobox/nms/v1_19_R2/WorldRegeneratorImpl.java +++ b/src/main/java/world/bentobox/bentobox/nms/v1_19_R3/WorldRegeneratorImpl.java @@ -1,10 +1,10 @@ -package world.bentobox.bentobox.nms.v1_19_R2; +package world.bentobox.bentobox.nms.v1_19_R3; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.block.data.BlockData; -import org.bukkit.craftbukkit.v1_19_R2.CraftWorld; -import org.bukkit.craftbukkit.v1_19_R2.block.data.CraftBlockData; +import org.bukkit.craftbukkit.v1_19_R3.CraftWorld; +import org.bukkit.craftbukkit.v1_19_R3.block.data.CraftBlockData; import net.minecraft.core.BlockPosition; import net.minecraft.world.level.World; diff --git a/src/main/java/world/bentobox/bentobox/util/MyBiomeGrid.java b/src/main/java/world/bentobox/bentobox/util/MyBiomeGrid.java index c776b715b..bd5499e34 100644 --- a/src/main/java/world/bentobox/bentobox/util/MyBiomeGrid.java +++ b/src/main/java/world/bentobox/bentobox/util/MyBiomeGrid.java @@ -14,22 +14,23 @@ import org.eclipse.jdt.annotation.NonNull; * @author tastybento * */ +@SuppressWarnings("deprecation") public class MyBiomeGrid implements BiomeGrid { Map map = new HashMap<>(); private Biome defaultBiome; public MyBiomeGrid(Environment environment) { switch (environment) { - case NETHER -> { - try { - // 1.16 onwards - defaultBiome = Biome.valueOf("NETHER_WASTES"); - } catch (Exception e) { - // Before 1.16 - defaultBiome = Biome.valueOf("NETHER"); - } + case NETHER -> { + try { + // 1.16 onwards + defaultBiome = Biome.valueOf("NETHER_WASTES"); + } catch (Exception e) { + // Before 1.16 + defaultBiome = Biome.valueOf("NETHER"); } - case THE_END -> defaultBiome = Biome.THE_END; - default -> defaultBiome = Biome.PLAINS; + } + case THE_END -> defaultBiome = Biome.THE_END; + default -> defaultBiome = Biome.PLAINS; } } diff --git a/src/main/java/world/bentobox/bentobox/versions/ServerCompatibility.java b/src/main/java/world/bentobox/bentobox/versions/ServerCompatibility.java index dfef37415..50c58f533 100644 --- a/src/main/java/world/bentobox/bentobox/versions/ServerCompatibility.java +++ b/src/main/java/world/bentobox/bentobox/versions/ServerCompatibility.java @@ -214,6 +214,10 @@ public class ServerCompatibility { * @since 1.22.0 */ V1_19_3(Compatibility.COMPATIBLE), + /** + * @since 1.22.1 + */ + V1_19_4(Compatibility.COMPATIBLE), ; private final Compatibility compatibility;