diff --git a/pom.xml b/pom.xml index 7a6ea5bcf..29c2c9d47 100644 --- a/pom.xml +++ b/pom.xml @@ -9,8 +9,8 @@ false package - 1.8 - 1.8 + 11 + 11 UTF-8 @@ -48,9 +48,9 @@ org.apache.maven.plugins maven-compiler-plugin - 1.8 - 1.8 - 1.8 + 11 + 11 + 11 @@ -58,7 +58,7 @@ volmit - http://repo.volmit.com/repository/volmit/ + https://repo.volmit.com/repository/volmit/ @@ -71,7 +71,7 @@ org.spigotmc spigot-api - 1.16.1-R0.1-SNAPSHOT + 1.16.5-R0.1-SNAPSHOT provided diff --git a/src/main/java/com/volmit/iris/pregen/DirectWorldWriter.java b/src/main/java/com/volmit/iris/pregen/DirectWorldWriter.java index 6a6739b89..6fd08f8e9 100644 --- a/src/main/java/com/volmit/iris/pregen/DirectWorldWriter.java +++ b/src/main/java/com/volmit/iris/pregen/DirectWorldWriter.java @@ -240,9 +240,11 @@ public class DirectWorldWriter { private static Map computeBiomeIDs() { Map biomeIds = new KMap<>(); - for(Biome i : Biome.values()) + for(Biome biome : Biome.values()) { - biomeIds.put(i, INMS.get().getBiomeId(i)); + if (biome != Biome.CUSTOM) { + biomeIds.put(biome, INMS.get().getBiomeId(biome)); + } } return biomeIds; diff --git a/src/main/java/com/volmit/iris/util/FakeWorld.java b/src/main/java/com/volmit/iris/util/FakeWorld.java index a2b6724f3..bf93b40f9 100644 --- a/src/main/java/com/volmit/iris/util/FakeWorld.java +++ b/src/main/java/com/volmit/iris/util/FakeWorld.java @@ -17,6 +17,8 @@ import org.bukkit.util.BoundingBox; import org.bukkit.util.Consumer; import org.bukkit.util.RayTraceResult; import org.bukkit.util.Vector; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import java.io.File; import java.util.*; @@ -325,6 +327,10 @@ public class FakeWorld implements World return null; } + @NotNull @Override public Item dropItem(@NotNull Location location, @NotNull ItemStack itemStack, @Nullable Consumer consumer) { + return null; + } + @Override public Item dropItemNaturally(Location location, ItemStack item) { @@ -332,6 +338,10 @@ public class FakeWorld implements World return null; } + @NotNull @Override public Item dropItemNaturally(@NotNull Location location, @NotNull ItemStack itemStack, @Nullable Consumer consumer) { + return null; + } + @Override public Arrow spawnArrow(Location location, Vector direction, float speed, float spread) { @@ -535,6 +545,10 @@ public class FakeWorld implements World return false; } + @Override public boolean setSpawnLocation(int i, int i1, int i2, float v) { + return false; + } + @Override public boolean setSpawnLocation(int x, int y, int z) { @@ -568,6 +582,10 @@ public class FakeWorld implements World } + @Override public long getGameTime() { + return 0; + } + @Override public boolean hasStorm() { @@ -620,6 +638,18 @@ public class FakeWorld implements World } + @Override public boolean isClearWeather() { + return false; + } + + @Override public void setClearWeatherDuration(int i) { + + } + + @Override public int getClearWeatherDuration() { + return 0; + } + @Override public boolean createExplosion(double x, double y, double z, float power) { @@ -863,6 +893,10 @@ public class FakeWorld implements World return 0; } + @Override public int getMinHeight() { + return 0; + } + @Override public int getMaxHeight() { diff --git a/src/main/java/com/volmit/iris/util/HeightedFakeWorld.java b/src/main/java/com/volmit/iris/util/HeightedFakeWorld.java index b6d133ab4..12c8bc9c0 100644 --- a/src/main/java/com/volmit/iris/util/HeightedFakeWorld.java +++ b/src/main/java/com/volmit/iris/util/HeightedFakeWorld.java @@ -50,6 +50,8 @@ import org.bukkit.util.BoundingBox; import org.bukkit.util.Consumer; import org.bukkit.util.RayTraceResult; import org.bukkit.util.Vector; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; @SuppressWarnings("deprecation") public class HeightedFakeWorld implements World @@ -348,6 +350,10 @@ public class HeightedFakeWorld implements World return null; } + @NotNull @Override public Item dropItem(@NotNull Location location, @NotNull ItemStack itemStack, @Nullable Consumer consumer) { + return null; + } + @Override public Item dropItemNaturally(Location location, ItemStack item) { @@ -355,6 +361,10 @@ public class HeightedFakeWorld implements World return null; } + @NotNull @Override public Item dropItemNaturally(@NotNull Location location, @NotNull ItemStack itemStack, @Nullable Consumer consumer) { + return null; + } + @Override public Arrow spawnArrow(Location location, Vector direction, float speed, float spread) { @@ -558,6 +568,10 @@ public class HeightedFakeWorld implements World return false; } + @Override public boolean setSpawnLocation(int i, int i1, int i2, float v) { + return false; + } + @Override public boolean setSpawnLocation(int x, int y, int z) { @@ -591,6 +605,10 @@ public class HeightedFakeWorld implements World } + @Override public long getGameTime() { + return 0; + } + @Override public boolean hasStorm() { @@ -643,6 +661,18 @@ public class HeightedFakeWorld implements World } + @Override public boolean isClearWeather() { + return false; + } + + @Override public void setClearWeatherDuration(int i) { + + } + + @Override public int getClearWeatherDuration() { + return 0; + } + @Override public boolean createExplosion(double x, double y, double z, float power) { @@ -886,6 +916,10 @@ public class HeightedFakeWorld implements World return 0; } + @Override public int getMinHeight() { + return 0; + } + @Override public int getMaxHeight() { diff --git a/src/main/java/com/volmit/iris/util/MortarSender.java b/src/main/java/com/volmit/iris/util/MortarSender.java index d2d0ba4b6..76ed8ae1a 100644 --- a/src/main/java/com/volmit/iris/util/MortarSender.java +++ b/src/main/java/com/volmit/iris/util/MortarSender.java @@ -1,6 +1,7 @@ package com.volmit.iris.util; import java.util.Set; +import java.util.UUID; import org.bukkit.Server; import org.bukkit.command.CommandSender; @@ -12,6 +13,8 @@ import org.bukkit.plugin.Plugin; import lombok.Getter; import lombok.Setter; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * Represents a volume sender. A command sender with extra crap in it @@ -193,6 +196,16 @@ public class MortarSender implements CommandSender s.sendMessage(C.translateAlternateColorCodes('&', getTag() + str)); } + @Override + public void sendMessage(@Nullable UUID uuid, @NotNull String message) { + sendMessage(message); + } + + @Override + public void sendMessage(@Nullable UUID uuid, @NotNull String[] messages) { + sendMessage(messages); + } + @Override public Server getServer() {