blockData = SlimefunPlugin.getBlockDataService().getBlockData(b);
@@ -714,22 +694,17 @@ public class BlockStorage {
return getLocationInfo(l, "id");
}
- public static boolean check(Location l, String slimefunItem) {
- if (slimefunItem == null || !hasBlockInfo(l)) {
+ public static boolean check(@Nonnull Location l, @Nullable String slimefunItem) {
+ if (slimefunItem == null) {
return false;
}
- try {
- String id = getLocationInfo(l, "id");
- return id != null && id.equalsIgnoreCase(slimefunItem);
- } catch (Exception x) {
- Slimefun.getLogger().log(Level.SEVERE, x, () -> "An Exception occurred while checking " + new BlockPosition(l) + " for: \"" + slimefunItem + "\"");
- return false;
- }
+ String id = checkID(l);
+ return id != null && id.equals(slimefunItem);
}
- public static boolean isWorldRegistered(String name) {
- return SlimefunPlugin.getRegistry().getWorlds().containsKey(name);
+ public static boolean isWorldLoaded(World world) {
+ return SlimefunPlugin.getRegistry().getWorlds().containsKey(world.getName());
}
public BlockMenu loadInventory(Location l, BlockMenuPreset preset) {
@@ -757,11 +732,6 @@ public class BlockStorage {
}
}
- public void loadUniversalInventory(BlockMenuPreset preset) {
- UniversalBlockMenu inventory = new UniversalBlockMenu(preset);
- SlimefunPlugin.getRegistry().getUniversalInventories().put(preset.getID(), inventory);
- }
-
public void clearInventory(Location l) {
BlockMenu menu = getInventory(l);
@@ -830,7 +800,7 @@ public class BlockStorage {
public static Config getChunkInfo(World world, int x, int z) {
try {
- if (!isWorldRegistered(world.getName())) {
+ if (!isWorldLoaded(world)) {
return emptyBlockData;
}
diff --git a/src/main/java/me/mrCookieSlime/Slimefun/api/inventory/BlockMenuPreset.java b/src/main/java/me/mrCookieSlime/Slimefun/api/inventory/BlockMenuPreset.java
index 4c80fedb2..3239d8f19 100644
--- a/src/main/java/me/mrCookieSlime/Slimefun/api/inventory/BlockMenuPreset.java
+++ b/src/main/java/me/mrCookieSlime/Slimefun/api/inventory/BlockMenuPreset.java
@@ -300,7 +300,7 @@ public abstract class BlockMenuPreset extends ChestMenu {
}
@Nullable
- public static BlockMenuPreset getPreset(String id) {
+ public static BlockMenuPreset getPreset(@Nullable String id) {
return id == null ? null : SlimefunPlugin.getRegistry().getMenuPresets().get(id);
}
diff --git a/src/main/java/me/mrCookieSlime/Slimefun/api/inventory/DirtyChestMenu.java b/src/main/java/me/mrCookieSlime/Slimefun/api/inventory/DirtyChestMenu.java
index 9cf7d9d4d..e6d31b065 100644
--- a/src/main/java/me/mrCookieSlime/Slimefun/api/inventory/DirtyChestMenu.java
+++ b/src/main/java/me/mrCookieSlime/Slimefun/api/inventory/DirtyChestMenu.java
@@ -91,12 +91,14 @@ public class DirtyChestMenu extends ChestMenu {
}
public boolean fits(@Nonnull ItemStack item, int... slots) {
- if (getItemInSlot(slots[0]) == null) {
- // Very small optimization
- return true;
- } else {
- return InvUtils.fits(toInventory(), new ItemStackWrapper(item), slots);
+ for (int slot : slots) {
+ // A small optimization for empty slots
+ if (getItemInSlot(slot) == null) {
+ return true;
+ }
}
+
+ return InvUtils.fits(toInventory(), new ItemStackWrapper(item), slots);
}
@Nullable
diff --git a/src/main/java/me/mrCookieSlime/Slimefun/bstats/bukkit/Metrics.java b/src/main/java/me/mrCookieSlime/Slimefun/bstats/bukkit/Metrics.java
deleted file mode 100644
index 5f44303db..000000000
--- a/src/main/java/me/mrCookieSlime/Slimefun/bstats/bukkit/Metrics.java
+++ /dev/null
@@ -1,741 +0,0 @@
-package me.mrCookieSlime.Slimefun.bstats.bukkit;
-
-import com.google.gson.JsonArray;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-import com.google.gson.JsonPrimitive;
-import org.bukkit.Bukkit;
-import org.bukkit.configuration.file.YamlConfiguration;
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.Plugin;
-import org.bukkit.plugin.RegisteredServiceProvider;
-import org.bukkit.plugin.ServicePriority;
-
-import javax.net.ssl.HttpsURLConnection;
-import java.io.*;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
-import java.util.*;
-import java.util.concurrent.Callable;
-import java.util.logging.Level;
-import java.util.zip.GZIPOutputStream;
-
-/**
- * bStats collects some data for plugin authors.
- *
- * Check out https://bStats.org/ to learn more about bStats!
- *
- * @deprecated This class is not guaranteed to be included in future versions of Slimefun! Please shade bStats yourself
- * by following the instructions at: https://bstats.org/getting-started/include-metrics
- */
-@Deprecated
-public class Metrics {
-
- static {
- // You can use the property to disable the check in your test environment
- if (System.getProperty("bstats.relocatecheck") == null || !System.getProperty("bstats.relocatecheck").equals("false")) {
- // Maven's Relocate is clever and changes strings, too. So we have to use this little "trick" ... :D
- final String defaultPackage = new String(new byte[] { 'o', 'r', 'g', '.', 'b', 's', 't', 'a', 't', 's', '.', 'b', 'u', 'k', 'k', 'i', 't' });
- final String examplePackage = new String(new byte[] { 'y', 'o', 'u', 'r', '.', 'p', 'a', 'c', 'k', 'a', 'g', 'e' });
- // We want to make sure nobody just copy & pastes the example and use the wrong package names
- if (Metrics.class.getPackage().getName().equals(defaultPackage) || Metrics.class.getPackage().getName().equals(examplePackage)) {
- throw new IllegalStateException("bStats Metrics class has not been relocated correctly!");
- }
- }
- }
-
- // The version of this bStats class
- public static final int B_STATS_VERSION = 1;
-
- // The url to which the data is sent
- private static final String URL = "https://bStats.org/submitData/bukkit";
-
- // Is bStats enabled on this server?
- private boolean enabled;
-
- // Should failed requests be logged?
- private static boolean logFailedRequests;
-
- // Should the sent data be logged?
- private static boolean logSentData;
-
- // Should the response text be logged?
- private static boolean logResponseStatusText;
-
- // The uuid of the server
- private static String serverUUID;
-
- // The plugin
- private final Plugin plugin;
-
- // The plugin id
- private final int pluginId;
-
- // A list with all custom charts
- private final List charts = new ArrayList<>();
-
- /**
- * Class constructor.
- *
- * @param plugin
- * The plugin which stats should be submitted.
- * @param pluginId
- * The id of the plugin.
- * It can be found at What is my plugin id?
- */
- public Metrics(Plugin plugin, int pluginId) {
- if (plugin == null) {
- throw new IllegalArgumentException("Plugin cannot be null!");
- }
- this.plugin = plugin;
- this.pluginId = pluginId;
-
- // Get the config file
- File bStatsFolder = new File(plugin.getDataFolder().getParentFile(), "bStats");
- File configFile = new File(bStatsFolder, "config.yml");
- YamlConfiguration config = YamlConfiguration.loadConfiguration(configFile);
-
- // Check if the config file exists
- if (!config.isSet("serverUuid")) {
-
- // Add default values
- config.addDefault("enabled", true);
- // Every server gets it's unique random id.
- config.addDefault("serverUuid", UUID.randomUUID().toString());
- // Should failed request be logged?
- config.addDefault("logFailedRequests", false);
- // Should the sent data be logged?
- config.addDefault("logSentData", false);
- // Should the response text be logged?
- config.addDefault("logResponseStatusText", false);
-
- // Inform the server owners about bStats
- config.options().header("bStats collects some data for plugin authors like how many servers are using their plugins.\n" + "To honor their work, you should not disable it.\n" + "This has nearly no effect on the server performance!\n" + "Check out https://bStats.org/ to learn more :)").copyDefaults(true);
- try {
- config.save(configFile);
- } catch (IOException ignored) {}
- }
-
- // Load the data
- enabled = config.getBoolean("enabled", true);
- serverUUID = config.getString("serverUuid");
- logFailedRequests = config.getBoolean("logFailedRequests", false);
- logSentData = config.getBoolean("logSentData", false);
- logResponseStatusText = config.getBoolean("logResponseStatusText", false);
-
- if (enabled) {
- boolean found = false;
- // Search for all other bStats Metrics classes to see if we are the first one
- for (Class service : Bukkit.getServicesManager().getKnownServices()) {
- try {
- service.getField("B_STATS_VERSION"); // Our identifier :)
- found = true; // We aren't the first
- break;
- } catch (NoSuchFieldException ignored) {}
- }
- // Register our service
- Bukkit.getServicesManager().register(Metrics.class, this, plugin, ServicePriority.Normal);
- if (!found) {
- // We are the first!
- startSubmitting();
- }
- }
- }
-
- /**
- * Checks if bStats is enabled.
- *
- * @return Whether bStats is enabled or not.
- */
- public boolean isEnabled() {
- return enabled;
- }
-
- /**
- * Adds a custom chart.
- *
- * @param chart
- * The chart to add.
- */
- public void addCustomChart(CustomChart chart) {
- if (chart == null) {
- throw new IllegalArgumentException("Chart cannot be null!");
- }
- charts.add(chart);
- }
-
- /**
- * Starts the Scheduler which submits our data every 30 minutes.
- */
- private void startSubmitting() {
- final Timer timer = new Timer(true); // We use a timer cause the Bukkit scheduler is affected by server lags
- timer.scheduleAtFixedRate(new TimerTask() {
-
- @Override
- public void run() {
- if (!plugin.isEnabled()) { // Plugin was disabled
- timer.cancel();
- return;
- }
- // Nevertheless we want our code to run in the Bukkit main thread, so we have to use the Bukkit
- // scheduler
- // Don't be afraid! The connection to the bStats server is still async, only the stats collection is
- // sync ;)
- Bukkit.getScheduler().runTask(plugin, () -> submitData());
- }
- }, 1000 * 60 * 5, 1000 * 60 * 30);
- // Submit the data every 30 minutes, first time after 5 minutes to give other plugins enough time to start
- // WARNING: Changing the frequency has no effect but your plugin WILL be blocked/deleted!
- // WARNING: Just don't do it!
- }
-
- /**
- * Gets the plugin specific data.
- * This method is called using Reflection.
- *
- * @return The plugin specific data.
- */
- public JsonObject getPluginData() {
- JsonObject data = new JsonObject();
-
- String pluginName = plugin.getDescription().getName();
- String pluginVersion = plugin.getDescription().getVersion();
-
- data.addProperty("pluginName", pluginName); // Append the name of the plugin
- data.addProperty("id", pluginId); // Append the id of the plugin
- data.addProperty("pluginVersion", pluginVersion); // Append the version of the plugin
- JsonArray customCharts = new JsonArray();
- for (CustomChart customChart : charts) {
- // Add the data of the custom charts
- JsonObject chart = customChart.getRequestJsonObject();
- if (chart == null) { // If the chart is null, we skip it
- continue;
- }
- customCharts.add(chart);
- }
- data.add("customCharts", customCharts);
-
- return data;
- }
-
- /**
- * Gets the server specific data.
- *
- * @return The server specific data.
- */
- private JsonObject getServerData() {
- // Minecraft specific data
- int playerAmount;
- try {
- // Around MC 1.8 the return type was changed to a collection from an array,
- // This fixes java.lang.NoSuchMethodError: org.bukkit.Bukkit.getOnlinePlayers()Ljava/util/Collection;
- Method onlinePlayersMethod = Class.forName("org.bukkit.Server").getMethod("getOnlinePlayers");
- playerAmount = onlinePlayersMethod.getReturnType().equals(Collection.class) ? ((Collection) onlinePlayersMethod.invoke(Bukkit.getServer())).size() : ((Player[]) onlinePlayersMethod.invoke(Bukkit.getServer())).length;
- } catch (Exception e) {
- playerAmount = Bukkit.getOnlinePlayers().size(); // Just use the new method if the Reflection failed
- }
- int onlineMode = Bukkit.getOnlineMode() ? 1 : 0;
- String bukkitVersion = Bukkit.getVersion();
- String bukkitName = Bukkit.getName();
-
- // OS/Java specific data
- String javaVersion = System.getProperty("java.version");
- String osName = System.getProperty("os.name");
- String osArch = System.getProperty("os.arch");
- String osVersion = System.getProperty("os.version");
- int coreCount = Runtime.getRuntime().availableProcessors();
-
- JsonObject data = new JsonObject();
-
- data.addProperty("serverUUID", serverUUID);
-
- data.addProperty("playerAmount", playerAmount);
- data.addProperty("onlineMode", onlineMode);
- data.addProperty("bukkitVersion", bukkitVersion);
- data.addProperty("bukkitName", bukkitName);
-
- data.addProperty("javaVersion", javaVersion);
- data.addProperty("osName", osName);
- data.addProperty("osArch", osArch);
- data.addProperty("osVersion", osVersion);
- data.addProperty("coreCount", coreCount);
-
- return data;
- }
-
- /**
- * Collects the data and sends it afterwards.
- */
- private void submitData() {
- final JsonObject data = getServerData();
-
- JsonArray pluginData = new JsonArray();
- // Search for all other bStats Metrics classes to get their plugin data
- for (Class service : Bukkit.getServicesManager().getKnownServices()) {
- try {
- service.getField("B_STATS_VERSION"); // Our identifier :)
-
- for (RegisteredServiceProvider provider : Bukkit.getServicesManager().getRegistrations(service)) {
- try {
- Object plugin = provider.getService().getMethod("getPluginData").invoke(provider.getProvider());
- if (plugin instanceof JsonObject) {
- pluginData.add((JsonObject) plugin);
- } else { // old bstats version compatibility
- try {
- Class jsonObjectJsonSimple = Class.forName("org.json.simple.JSONObject");
- if (plugin.getClass().isAssignableFrom(jsonObjectJsonSimple)) {
- Method jsonStringGetter = jsonObjectJsonSimple.getDeclaredMethod("toJSONString");
- jsonStringGetter.setAccessible(true);
- String jsonString = (String) jsonStringGetter.invoke(plugin);
- JsonObject object = new JsonParser().parse(jsonString).getAsJsonObject();
- pluginData.add(object);
- }
- } catch (ClassNotFoundException e) {
- // minecraft version 1.14+
- if (logFailedRequests) {
- this.plugin.getLogger().log(Level.SEVERE, "Encountered unexpected exception", e);
- }
- }
- }
- } catch (NullPointerException | NoSuchMethodException | IllegalAccessException | InvocationTargetException ignored) {}
- }
- } catch (NoSuchFieldException ignored) {}
- }
-
- data.add("plugins", pluginData);
-
- // Create a new thread for the connection to the bStats server
- new Thread(() -> {
- try {
- // Send the data
- sendData(plugin, data);
- } catch (Exception e) {
- // Something went wrong! :(
- if (logFailedRequests) {
- plugin.getLogger().log(Level.WARNING, "Could not submit plugin stats of " + plugin.getName(), e);
- }
- }
- }).start();
- }
-
- /**
- * Sends the data to the bStats server.
- *
- * @param plugin
- * Any plugin. It's just used to get a logger instance.
- * @param data
- * The data to send.
- * @throws Exception
- * If the request failed.
- */
- private static void sendData(Plugin plugin, JsonObject data) throws Exception {
- if (data == null) {
- throw new IllegalArgumentException("Data cannot be null!");
- }
- if (Bukkit.isPrimaryThread()) {
- throw new IllegalAccessException("This method must not be called from the main thread!");
- }
- if (logSentData) {
- plugin.getLogger().info("Sending data to bStats: " + data);
- }
- HttpsURLConnection connection = (HttpsURLConnection) new URL(URL).openConnection();
-
- // Compress the data to save bandwidth
- byte[] compressedData = compress(data.toString());
-
- // Add headers
- connection.setRequestMethod("POST");
- connection.addRequestProperty("Accept", "application/json");
- connection.addRequestProperty("Connection", "close");
- connection.addRequestProperty("Content-Encoding", "gzip"); // We gzip our request
- connection.addRequestProperty("Content-Length", String.valueOf(compressedData.length));
- connection.setRequestProperty("Content-Type", "application/json"); // We send our data in JSON format
- connection.setRequestProperty("User-Agent", "MC-Server/" + B_STATS_VERSION);
-
- // Send data
- connection.setDoOutput(true);
- try (DataOutputStream outputStream = new DataOutputStream(connection.getOutputStream())) {
- outputStream.write(compressedData);
- }
-
- StringBuilder builder = new StringBuilder();
- try (BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(connection.getInputStream()))) {
- String line;
- while ((line = bufferedReader.readLine()) != null) {
- builder.append(line);
- }
- }
-
- if (logResponseStatusText) {
- plugin.getLogger().info("Sent data to bStats and received response: " + builder);
- }
- }
-
- /**
- * Gzips the given String.
- *
- * @param str
- * The string to gzip.
- * @return The gzipped String.
- * @throws IOException
- * If the compression failed.
- */
- private static byte[] compress(final String str) throws IOException {
- if (str == null) {
- return null;
- }
- ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
- try (GZIPOutputStream gzip = new GZIPOutputStream(outputStream)) {
- gzip.write(str.getBytes(StandardCharsets.UTF_8));
- }
- return outputStream.toByteArray();
- }
-
- /**
- * Represents a custom chart.
- */
- public static abstract class CustomChart {
-
- // The id of the chart
- final String chartId;
-
- /**
- * Class constructor.
- *
- * @param chartId
- * The id of the chart.
- */
- CustomChart(String chartId) {
- if (chartId == null || chartId.isEmpty()) {
- throw new IllegalArgumentException("ChartId cannot be null or empty!");
- }
- this.chartId = chartId;
- }
-
- private JsonObject getRequestJsonObject() {
- JsonObject chart = new JsonObject();
- chart.addProperty("chartId", chartId);
- try {
- JsonObject data = getChartData();
- if (data == null) {
- // If the data is null we don't send the chart.
- return null;
- }
- chart.add("data", data);
- } catch (Throwable t) {
- if (logFailedRequests) {
- Bukkit.getLogger().log(Level.WARNING, "Failed to get data for custom chart with id " + chartId, t);
- }
- return null;
- }
- return chart;
- }
-
- protected abstract JsonObject getChartData() throws Exception;
-
- }
-
- /**
- * Represents a custom simple pie.
- */
- public static class SimplePie extends CustomChart {
-
- private final Callable callable;
-
- /**
- * Class constructor.
- *
- * @param chartId
- * The id of the chart.
- * @param callable
- * The callable which is used to request the chart data.
- */
- public SimplePie(String chartId, Callable callable) {
- super(chartId);
- this.callable = callable;
- }
-
- @Override
- protected JsonObject getChartData() throws Exception {
- JsonObject data = new JsonObject();
- String value = callable.call();
- if (value == null || value.isEmpty()) {
- // Null = skip the chart
- return null;
- }
- data.addProperty("value", value);
- return data;
- }
- }
-
- /**
- * Represents a custom advanced pie.
- */
- public static class AdvancedPie extends CustomChart {
-
- private final Callable> callable;
-
- /**
- * Class constructor.
- *
- * @param chartId
- * The id of the chart.
- * @param callable
- * The callable which is used to request the chart data.
- */
- public AdvancedPie(String chartId, Callable> callable) {
- super(chartId);
- this.callable = callable;
- }
-
- @Override
- protected JsonObject getChartData() throws Exception {
- JsonObject data = new JsonObject();
- JsonObject values = new JsonObject();
- Map map = callable.call();
- if (map == null || map.isEmpty()) {
- // Null = skip the chart
- return null;
- }
- boolean allSkipped = true;
- for (Map.Entry entry : map.entrySet()) {
- if (entry.getValue() == 0) {
- continue; // Skip this invalid
- }
- allSkipped = false;
- values.addProperty(entry.getKey(), entry.getValue());
- }
- if (allSkipped) {
- // Null = skip the chart
- return null;
- }
- data.add("values", values);
- return data;
- }
- }
-
- /**
- * Represents a custom drilldown pie.
- */
- public static class DrilldownPie extends CustomChart {
-
- private final Callable>> callable;
-
- /**
- * Class constructor.
- *
- * @param chartId
- * The id of the chart.
- * @param callable
- * The callable which is used to request the chart data.
- */
- public DrilldownPie(String chartId, Callable>> callable) {
- super(chartId);
- this.callable = callable;
- }
-
- @Override
- public JsonObject getChartData() throws Exception {
- JsonObject data = new JsonObject();
- JsonObject values = new JsonObject();
- Map> map = callable.call();
- if (map == null || map.isEmpty()) {
- // Null = skip the chart
- return null;
- }
- boolean reallyAllSkipped = true;
- for (Map.Entry> entryValues : map.entrySet()) {
- JsonObject value = new JsonObject();
- boolean allSkipped = true;
- for (Map.Entry valueEntry : map.get(entryValues.getKey()).entrySet()) {
- value.addProperty(valueEntry.getKey(), valueEntry.getValue());
- allSkipped = false;
- }
- if (!allSkipped) {
- reallyAllSkipped = false;
- values.add(entryValues.getKey(), value);
- }
- }
- if (reallyAllSkipped) {
- // Null = skip the chart
- return null;
- }
- data.add("values", values);
- return data;
- }
- }
-
- /**
- * Represents a custom single line chart.
- */
- public static class SingleLineChart extends CustomChart {
-
- private final Callable callable;
-
- /**
- * Class constructor.
- *
- * @param chartId
- * The id of the chart.
- * @param callable
- * The callable which is used to request the chart data.
- */
- public SingleLineChart(String chartId, Callable callable) {
- super(chartId);
- this.callable = callable;
- }
-
- @Override
- protected JsonObject getChartData() throws Exception {
- JsonObject data = new JsonObject();
- int value = callable.call();
- if (value == 0) {
- // Null = skip the chart
- return null;
- }
- data.addProperty("value", value);
- return data;
- }
-
- }
-
- /**
- * Represents a custom multi line chart.
- */
- public static class MultiLineChart extends CustomChart {
-
- private final Callable> callable;
-
- /**
- * Class constructor.
- *
- * @param chartId
- * The id of the chart.
- * @param callable
- * The callable which is used to request the chart data.
- */
- public MultiLineChart(String chartId, Callable> callable) {
- super(chartId);
- this.callable = callable;
- }
-
- @Override
- protected JsonObject getChartData() throws Exception {
- JsonObject data = new JsonObject();
- JsonObject values = new JsonObject();
- Map map = callable.call();
- if (map == null || map.isEmpty()) {
- // Null = skip the chart
- return null;
- }
- boolean allSkipped = true;
- for (Map.Entry entry : map.entrySet()) {
- if (entry.getValue() == 0) {
- continue; // Skip this invalid
- }
- allSkipped = false;
- values.addProperty(entry.getKey(), entry.getValue());
- }
- if (allSkipped) {
- // Null = skip the chart
- return null;
- }
- data.add("values", values);
- return data;
- }
-
- }
-
- /**
- * Represents a custom simple bar chart.
- */
- public static class SimpleBarChart extends CustomChart {
-
- private final Callable> callable;
-
- /**
- * Class constructor.
- *
- * @param chartId
- * The id of the chart.
- * @param callable
- * The callable which is used to request the chart data.
- */
- public SimpleBarChart(String chartId, Callable> callable) {
- super(chartId);
- this.callable = callable;
- }
-
- @Override
- protected JsonObject getChartData() throws Exception {
- JsonObject data = new JsonObject();
- JsonObject values = new JsonObject();
- Map map = callable.call();
- if (map == null || map.isEmpty()) {
- // Null = skip the chart
- return null;
- }
- for (Map.Entry entry : map.entrySet()) {
- JsonArray categoryValues = new JsonArray();
- categoryValues.add(new JsonPrimitive(entry.getValue()));
- values.add(entry.getKey(), categoryValues);
- }
- data.add("values", values);
- return data;
- }
-
- }
-
- /**
- * Represents a custom advanced bar chart.
- */
- public static class AdvancedBarChart extends CustomChart {
-
- private final Callable> callable;
-
- /**
- * Class constructor.
- *
- * @param chartId
- * The id of the chart.
- * @param callable
- * The callable which is used to request the chart data.
- */
- public AdvancedBarChart(String chartId, Callable> callable) {
- super(chartId);
- this.callable = callable;
- }
-
- @Override
- protected JsonObject getChartData() throws Exception {
- JsonObject data = new JsonObject();
- JsonObject values = new JsonObject();
- Map map = callable.call();
- if (map == null || map.isEmpty()) {
- // Null = skip the chart
- return null;
- }
- boolean allSkipped = true;
- for (Map.Entry entry : map.entrySet()) {
- if (entry.getValue().length == 0) {
- continue; // Skip this invalid
- }
- allSkipped = false;
- JsonArray categoryValues = new JsonArray();
- for (int categoryValue : entry.getValue()) {
- categoryValues.add(new JsonPrimitive(categoryValue));
- }
- values.add(entry.getKey(), categoryValues);
- }
- if (allSkipped) {
- // Null = skip the chart
- return null;
- }
- data.add("values", values);
- return data;
- }
- }
-
-}
\ No newline at end of file
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index 41c82a88a..9413104e2 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -10,7 +10,6 @@ options:
armor-update-interval: 10
enable-armor-effects: true
auto-save-delay-in-minutes: 10
- emerald-enchantment-limit: 2
legacy-ore-washer: false
legacy-dust-washer: false
legacy-ore-grinder: true
@@ -38,6 +37,7 @@ networks:
max-size: 200
cargo-ticker-delay: 0
enable-visualizer: true
+ delete-excess-items: false
items:
talismans: true
diff --git a/src/main/resources/languages/categories_pt.yml b/src/main/resources/languages/categories_pt.yml
new file mode 100644
index 000000000..d208b9c0c
--- /dev/null
+++ b/src/main/resources/languages/categories_pt.yml
@@ -0,0 +1,26 @@
+---
+slimefun:
+ weapons: Armas
+ tools: Ferramentas
+ items: Itens úteis
+ food: Comida
+ basic_machines: Máquinas básicas
+ electricity: Energia e Eletricidade
+ gps: Máquinas baseadas em GPS
+ armor: Armaduras
+ magical_items: Itens mágicos
+ magical_gadgets: Acessórios Mágicos
+ misc: Itens Variados
+ technical_gadgets: Dispositivos Técnicos
+ resources: Recursos
+ cargo: Gestão de Carga
+ tech_misc: Componentes Técnicos
+ magical_armor: Armaduras Mágicas
+ talismans: Talismãs (Tier I)
+ ender_talismans: Ender Talismãs (Tier II)
+ christmas: Natal (Dezembro)
+ valentines_day: Dia dos Namorados (14 de Fevereiro)
+ easter: Páscoa (Abril)
+ birthday: Aniversário do TheBusyBiscuit (26 de Outubro)
+ halloween: Dia das Bruxas (31 de Outubro)
+ androids: Androids Programáveis
diff --git a/src/main/resources/languages/researches_pt-BR.yml b/src/main/resources/languages/researches_pt-BR.yml
index 1333f704b..f4ef860fc 100644
--- a/src/main/resources/languages/researches_pt-BR.yml
+++ b/src/main/resources/languages/researches_pt-BR.yml
@@ -236,3 +236,14 @@ slimefun:
advanced_industrial_miner: Melhor mineração
magical_zombie_pills: Deszombificação
auto_brewer: Cervejaria Industrial
+ enchantment_rune: Encantador Antigo
+ lead_clothing: Roupa de Chumbo
+ tape_measure: Fita métrica
+ iron_golem_assembler: Golems de Ferro Automatizados
+ climbing_pick: Bloco atacante
+ shulker_shell: Shulkers Sintética
+ villager_rune: Resetador de trocas dos aldeões
+ caveman_talisman: Talismã do Homem das Cavernas
+ even_higher_tier_capacitors: Capacitores tier 3
+ elytra_cap: Engrenagem de colisão
+ energy_connectors: Fios de conexão
diff --git a/src/main/resources/languages/researches_zh-CN.yml b/src/main/resources/languages/researches_zh-CN.yml
index 3b2187c3a..a8542078a 100644
--- a/src/main/resources/languages/researches_zh-CN.yml
+++ b/src/main/resources/languages/researches_zh-CN.yml
@@ -245,4 +245,5 @@ slimefun:
villager_rune: 防奸商神器
caveman_talisman: 穴居人护身符
even_higher_tier_capacitors: 三级电容器
+ elytra_cap: 无伤落地
energy_connectors: 有线连接
diff --git a/src/main/resources/tags/spawn_eggs.json b/src/main/resources/tags/spawn_eggs.json
new file mode 100644
index 000000000..3087fa5d4
--- /dev/null
+++ b/src/main/resources/tags/spawn_eggs.json
@@ -0,0 +1,89 @@
+{
+ "values" : [
+ "minecraft:bat_spawn_egg",
+ {
+ "id" : "minecraft:bee_spawn_egg",
+ "required" : false
+ },
+ "minecraft:blaze_spawn_egg",
+ "minecraft:cave_spider_spawn_egg",
+ "minecraft:cat_spawn_egg",
+ "minecraft:chicken_spawn_egg",
+ "minecraft:cod_spawn_egg",
+ "minecraft:cow_spawn_egg",
+ "minecraft:creeper_spawn_egg",
+ "minecraft:dolphin_spawn_egg",
+ "minecraft:donkey_spawn_egg",
+ "minecraft:drowned_spawn_egg",
+ "minecraft:elder_guardian_spawn_egg",
+ "minecraft:enderman_spawn_egg",
+ "minecraft:endermite_spawn_egg",
+ "minecraft:evoker_spawn_egg",
+ "minecraft:fox_spawn_egg",
+ "minecraft:ghast_spawn_egg",
+ "minecraft:guardian_spawn_egg",
+ {
+ "id" : "minecraft:hoglin_spawn_egg",
+ "required" : false
+ },
+ "minecraft:horse_spawn_egg",
+ "minecraft:husk_spawn_egg",
+ "minecraft:llama_spawn_egg",
+ "minecraft:magma_cube_spawn_egg",
+ "minecraft:mooshroom_spawn_egg",
+ "minecraft:mule_spawn_egg",
+ "minecraft:ocelot_spawn_egg",
+ "minecraft:panda_spawn_egg",
+ "minecraft:parrot_spawn_egg",
+ "minecraft:phantom_spawn_egg",
+ "minecraft:pig_spawn_egg",
+ {
+ "id" : "minecraft:piglin_spawn_egg",
+ "required" : false
+ },
+ {
+ "id" : "minecraft:piglin_brute_spawn_egg",
+ "required" : false
+ },
+ "minecraft:pillager_spawn_egg",
+ "minecraft:polar_bear_spawn_egg",
+ "minecraft:pufferfish_spawn_egg",
+ "minecraft:rabbit_spawn_egg",
+ "minecraft:ravager_spawn_egg",
+ "minecraft:salmon_spawn_egg",
+ "minecraft:sheep_spawn_egg",
+ "minecraft:shulker_spawn_egg",
+ "minecraft:silverfish_spawn_egg",
+ "minecraft:skeleton_spawn_egg",
+ "minecraft:skeleton_horse_spawn_egg",
+ "minecraft:slime_spawn_egg",
+ "minecraft:spider_spawn_egg",
+ "minecraft:squid_spawn_egg",
+ "minecraft:stray_spawn_egg",
+ {
+ "id" : "minecraft:strider_spawn_egg",
+ "required" : false
+ },
+ "minecraft:trader_llama_spawn_egg",
+ "minecraft:tropical_fish_spawn_egg",
+ "minecraft:turtle_spawn_egg",
+ "minecraft:vex_spawn_egg",
+ "minecraft:villager_spawn_egg",
+ "minecraft:vindicator_spawn_egg",
+ "minecraft:wandering_trader_spawn_egg",
+ "minecraft:witch_spawn_egg",
+ "minecraft:wither_skeleton_spawn_egg",
+ "minecraft:wolf_spawn_egg",
+ {
+ "id" : "minecraft:zoglin_spawn_egg",
+ "required" : false
+ },
+ "minecraft:zombie_spawn_egg",
+ "minecraft:zombie_horse_spawn_egg",
+ "minecraft:zombie_villager_spawn_egg",
+ {
+ "id" : "minecraft:zombified_piglin_spawn_egg",
+ "required" : false
+ }
+ ]
+}
diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/testing/interfaces/SlimefunItemTest.java b/src/test/java/io/github/thebusybiscuit/slimefun4/testing/interfaces/SlimefunItemTest.java
index d97f56f91..55835ebb1 100644
--- a/src/test/java/io/github/thebusybiscuit/slimefun4/testing/interfaces/SlimefunItemTest.java
+++ b/src/test/java/io/github/thebusybiscuit/slimefun4/testing/interfaces/SlimefunItemTest.java
@@ -17,6 +17,15 @@ import io.github.thebusybiscuit.slimefun4.core.handlers.ItemUseHandler;
import io.github.thebusybiscuit.slimefun4.implementation.SlimefunPlugin;
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem;
+/**
+ * This is a convenient interface for us to use in unit test classes
+ * that test the functionality of a particular {@link SlimefunItem}.
+ *
+ * @author TheBusyBiscuit
+ *
+ * @param
+ * The class type of {@link SlimefunItem} you want to test
+ */
@FunctionalInterface
public interface SlimefunItemTest {
diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/items/TestSlimefunItem.java b/src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/items/TestSlimefunItem.java
new file mode 100644
index 000000000..343303f1a
--- /dev/null
+++ b/src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/items/TestSlimefunItem.java
@@ -0,0 +1,179 @@
+package io.github.thebusybiscuit.slimefun4.testing.tests.items;
+
+import java.util.Optional;
+
+import org.bukkit.Material;
+import org.bukkit.inventory.ItemStack;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+
+import be.seeseemelk.mockbukkit.MockBukkit;
+import io.github.thebusybiscuit.cscorelib2.item.CustomItem;
+import io.github.thebusybiscuit.slimefun4.api.exceptions.UnregisteredItemException;
+import io.github.thebusybiscuit.slimefun4.api.exceptions.WrongItemStackException;
+import io.github.thebusybiscuit.slimefun4.implementation.SlimefunPlugin;
+import io.github.thebusybiscuit.slimefun4.testing.TestUtilities;
+import me.mrCookieSlime.Slimefun.Lists.RecipeType;
+import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem;
+import me.mrCookieSlime.Slimefun.api.SlimefunItemStack;
+
+class TestSlimefunItem {
+
+ private static SlimefunPlugin plugin;
+
+ @BeforeAll
+ public static void load() {
+ MockBukkit.mock();
+ plugin = MockBukkit.load(SlimefunPlugin.class);
+ }
+
+ @AfterAll
+ public static void unload() {
+ MockBukkit.unmock();
+ }
+
+ @Test
+ @DisplayName("Test wiki pages getting assigned correctly")
+ void testWikiPages() {
+ SlimefunItem item = TestUtilities.mockSlimefunItem(plugin, "WIKI_ITEM", new CustomItem(Material.BOOK, "&cTest"));
+ item.register(plugin);
+
+ Assertions.assertFalse(item.getWikipage().isPresent());
+
+ // null should not be a valid argument
+ Assertions.assertThrows(IllegalArgumentException.class, () -> item.addOficialWikipage(null));
+
+ item.addOficialWikipage("Test");
+
+ Optional wiki = item.getWikipage();
+ Assertions.assertTrue(wiki.isPresent());
+ Assertions.assertEquals("https://github.com/Slimefun/Slimefun4/wiki/Test", wiki.get());
+ }
+
+ @Test
+ @DisplayName("Test SlimefunItem registering Recipes properly")
+ void testRecipe() {
+ SlimefunItem item = TestUtilities.mockSlimefunItem(plugin, "RECIPE_TEST", new CustomItem(Material.DIAMOND, "&dAnother one bites the test"));
+
+ ItemStack[] recipe = { null, new ItemStack(Material.DIAMOND), null, null, new ItemStack(Material.DIAMOND), null, null, new ItemStack(Material.DIAMOND), null };
+ item.setRecipe(recipe);
+ item.register(plugin);
+
+ Assertions.assertArrayEquals(recipe, item.getRecipe());
+
+ Assertions.assertThrows(IllegalArgumentException.class, () -> item.setRecipe(null));
+ Assertions.assertThrows(IllegalArgumentException.class, () -> item.setRecipe(new ItemStack[3]));
+ Assertions.assertThrows(IllegalArgumentException.class, () -> item.setRecipe(new ItemStack[20]));
+ }
+
+ @Test
+ @DisplayName("Test Recipe outputs being handled correctly")
+ void testRecipeOutput() {
+ SlimefunItem item = TestUtilities.mockSlimefunItem(plugin, "RECIPE_OUTPUT_TEST", new CustomItem(Material.DIAMOND, "&cTest"));
+ item.register(plugin);
+
+ Assertions.assertEquals(item.getItem(), item.getRecipeOutput());
+
+ ItemStack output = new ItemStack(Material.EMERALD, 64);
+ item.setRecipeOutput(output);
+ Assertions.assertEquals(output, item.getRecipeOutput());
+
+ item.setRecipeOutput(item.getItem());
+ Assertions.assertEquals(item.getItem(), item.getRecipeOutput());
+ }
+
+ @Test
+ @DisplayName("Test Recipe Types being handled properly")
+ void testRecipeType() {
+ SlimefunItem item = TestUtilities.mockSlimefunItem(plugin, "RECIPE_TYPE_TEST", new CustomItem(Material.DIAMOND, "&cTest"));
+ item.register(plugin);
+
+ Assertions.assertNotNull(item.getRecipeType());
+
+ item.setRecipeType(RecipeType.ENHANCED_CRAFTING_TABLE);
+ Assertions.assertEquals(RecipeType.ENHANCED_CRAFTING_TABLE, item.getRecipeType());
+
+ item.setRecipeType(RecipeType.NULL);
+ Assertions.assertEquals(RecipeType.NULL, item.getRecipeType());
+
+ Assertions.assertThrows(IllegalArgumentException.class, () -> item.setRecipeType(null));
+ }
+
+ @ParameterizedTest
+ @DisplayName("Test SlimefunItem#isItem(...)")
+ @ValueSource(booleans = { true, false })
+ void testIsItem(boolean compatibility) {
+ CustomItem item = new CustomItem(Material.BEACON, "&cItem Test");
+ String id = "IS_ITEM_TEST" + (compatibility ? "_COMPATIBLE" : "");
+ SlimefunItem sfItem = TestUtilities.mockSlimefunItem(plugin, id, item);
+ sfItem.register(plugin);
+
+ Assertions.assertTrue(sfItem.isItem(sfItem.getItem()));
+
+ Assertions.assertFalse(sfItem.isItem(null));
+ Assertions.assertFalse(sfItem.isItem(new ItemStack(Material.BEACON)));
+ Assertions.assertFalse(sfItem.isItem(new CustomItem(Material.REDSTONE, "&cTest")));
+
+ if (compatibility) {
+ SlimefunPlugin.getRegistry().setBackwardsCompatible(true);
+
+ Assertions.assertEquals(sfItem, SlimefunItem.getByItem(item));
+ Assertions.assertTrue(sfItem.isItem(item));
+ Assertions.assertTrue(sfItem.isItem(new CustomItem(Material.BEACON, "&cItem Test")));
+
+ SlimefunPlugin.getRegistry().setBackwardsCompatible(false);
+ } else {
+ Assertions.assertFalse(sfItem.isItem(item));
+ Assertions.assertFalse(sfItem.isItem(new CustomItem(Material.BEACON, "&cItem Test")));
+ }
+
+ Assertions.assertEquals(sfItem, SlimefunItem.getByItem(new SlimefunItemStack(sfItem.getId(), item)));
+ }
+
+ @Test
+ @DisplayName("Test WrongItemStackException")
+ void testWrongItemStackException() {
+ SlimefunItem item = TestUtilities.mockSlimefunItem(plugin, "WRONG_ITEMSTACK_EXCEPTION", new CustomItem(Material.NETHER_STAR, "&4Do not modify me"));
+ item.register(plugin);
+ item.load();
+
+ ItemStack itemStack = item.getItem();
+ Assertions.assertThrows(WrongItemStackException.class, () -> itemStack.setAmount(40));
+ }
+
+ @Test
+ @DisplayName("Test UnregisteredItemException")
+ void testUnregisteredItemException() {
+ SlimefunItem item = TestUtilities.mockSlimefunItem(plugin, "UNREGISTERED_ITEM_EXCEPTION", new CustomItem(Material.NETHER_STAR, "&4Do not modify me"));
+ Assertions.assertThrows(UnregisteredItemException.class, () -> item.getAddon());
+ }
+
+ @Test
+ @DisplayName("Test SlimefunItem#equals(...)")
+ void testEquals() {
+ SlimefunItem item = TestUtilities.mockSlimefunItem(plugin, "EQUALS_TEST", new CustomItem(Material.LANTERN, "&6We are equal"));
+ SlimefunItem item2 = TestUtilities.mockSlimefunItem(plugin, "EQUALS_TEST", new CustomItem(Material.LANTERN, "&6We are equal"));
+ SlimefunItem differentItem = TestUtilities.mockSlimefunItem(plugin, "I_AM_DIFFERENT", new CustomItem(Material.LANTERN, "&6We are equal"));
+
+ Assertions.assertEquals(item, item2);
+ Assertions.assertNotEquals(item, differentItem);
+ Assertions.assertNotEquals(item2, differentItem);
+ }
+
+ @Test
+ @DisplayName("Test SlimefunItem#hashCode()")
+ void testHashCode() {
+ SlimefunItem item = TestUtilities.mockSlimefunItem(plugin, "EQUALS_TEST", new CustomItem(Material.LANTERN, "&6We are equal"));
+ SlimefunItem item2 = TestUtilities.mockSlimefunItem(plugin, "EQUALS_TEST", new CustomItem(Material.LANTERN, "&6We are equal"));
+ SlimefunItem differentItem = TestUtilities.mockSlimefunItem(plugin, "I_AM_DIFFERENT", new CustomItem(Material.LANTERN, "&6We are equal"));
+
+ Assertions.assertEquals(item.hashCode(), item2.hashCode());
+ Assertions.assertNotEquals(item.hashCode(), differentItem.hashCode());
+ Assertions.assertNotEquals(item2.hashCode(), differentItem.hashCode());
+ }
+}
diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/listeners/TestCauldronListener.java b/src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/listeners/TestCauldronListener.java
index dbe1ad358..75daede45 100644
--- a/src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/listeners/TestCauldronListener.java
+++ b/src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/listeners/TestCauldronListener.java
@@ -86,7 +86,7 @@ class TestCauldronListener {
@Test
@DisplayName("Test Cauldron being cancelled with slimefun leather armor")
void testCauldronWithSlimefunLeatherArmor() {
- SlimefunItem item = TestUtilities.mockSlimefunItem(plugin, "CAULDRON_TEST_MOCK_LEATHER", new CustomItem(Material.LEATHER_BOOTS, "&6Mock"));
+ SlimefunItem item = TestUtilities.mockSlimefunItem(plugin, "CAULDRON_TEST_MOCK_LEATHER", new CustomItem(Material.LEATHER_BOOTS, "&6Mock Leather Armor"));
item.register(plugin);
PlayerInteractEvent event = mockCauldronEvent(item.getItem());
diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/listeners/TestNetworkListener.java b/src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/listeners/TestNetworkListener.java
index 4e8e1b24e..9506c80af 100644
--- a/src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/listeners/TestNetworkListener.java
+++ b/src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/listeners/TestNetworkListener.java
@@ -25,7 +25,7 @@ class TestNetworkListener {
private static SlimefunPlugin plugin;
private static NetworkListener listener;
- private static NetworkManager manager = new NetworkManager(80, false);
+ private static NetworkManager manager = new NetworkManager(80);
private static ServerMock server;
@BeforeAll
diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/networks/TestNetworkManager.java b/src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/networks/TestNetworkManager.java
index 4aec2a175..161bffdc3 100644
--- a/src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/networks/TestNetworkManager.java
+++ b/src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/networks/TestNetworkManager.java
@@ -11,6 +11,8 @@ import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
import org.mockito.Mockito;
import be.seeseemelk.mockbukkit.MockBukkit;
@@ -37,23 +39,41 @@ class TestNetworkManager {
@Test
@DisplayName("Test illegal network size arguments")
void testIllegalNetworkSize() {
- Assertions.assertThrows(IllegalArgumentException.class, () -> new NetworkManager(-100, false));
- Assertions.assertThrows(IllegalArgumentException.class, () -> new NetworkManager(0, false));
+ Assertions.assertThrows(IllegalArgumentException.class, () -> new NetworkManager(-100));
+ Assertions.assertThrows(IllegalArgumentException.class, () -> new NetworkManager(0));
}
@Test
@DisplayName("Test maximum network size")
void testGetMaxNetworkSize() {
int size = 50;
- NetworkManager manager = new NetworkManager(size, false);
+ NetworkManager manager = new NetworkManager(size);
Assertions.assertEquals(size, manager.getMaxSize());
}
+ @ParameterizedTest
+ @ValueSource(booleans = { true, false })
+ @DisplayName("Test visualizer setting")
+ void testVisualizerSetting(boolean enabled) {
+ NetworkManager manager = new NetworkManager(200, enabled, false);
+
+ Assertions.assertEquals(enabled, manager.isVisualizerEnabled());
+ }
+
+ @ParameterizedTest
+ @ValueSource(booleans = { true, false })
+ @DisplayName("Test item deletion setting")
+ void testItemDeletionSetting(boolean enabled) {
+ NetworkManager manager = new NetworkManager(200, true, enabled);
+
+ Assertions.assertEquals(enabled, manager.isItemDeletionEnabled());
+ }
+
@Test
@DisplayName("Test network list")
void testGetNetworkList() {
- NetworkManager manager = new NetworkManager(10, false);
+ NetworkManager manager = new NetworkManager(10);
World world = server.addSimpleWorld("Simple Network World");
Location loc = new Location(world, 0, 100, 0);
@@ -82,7 +102,7 @@ class TestNetworkManager {
@Test
@DisplayName("Test getting a network at a location")
void testGetNetworkAtLocation() {
- NetworkManager manager = new NetworkManager(10, false);
+ NetworkManager manager = new NetworkManager(10);
World world = server.addSimpleWorld("Simple Network World");
Location loc = new Location(world, 0, 100, 0);
Location loc2 = new Location(world, 0, 200, 0);
@@ -104,7 +124,7 @@ class TestNetworkManager {
@Test
@DisplayName("Test getting all networks at a location")
void testGetNetworksAtLocation() {
- NetworkManager manager = new NetworkManager(10, false);
+ NetworkManager manager = new NetworkManager(10);
World world = server.addSimpleWorld("Simple Network World");
Location loc = new Location(world, 0, 100, 0);
Location loc2 = new Location(world, 0, 200, 0);
@@ -120,7 +140,7 @@ class TestNetworkManager {
@Test
@DisplayName("Test a single node network")
void testSingleNodeNetwork() {
- NetworkManager manager = new NetworkManager(1, false);
+ NetworkManager manager = new NetworkManager(1);
World world = server.addSimpleWorld("Simple Network World");
Location loc = new Location(world, 0, 100, 0);
@@ -134,7 +154,7 @@ class TestNetworkManager {
@Test
@DisplayName("Test networks connecting via corners")
void testCornerConnection() {
- NetworkManager manager = new NetworkManager(100, false);
+ NetworkManager manager = new NetworkManager(100);
World world = server.addSimpleWorld("Simple Network World");
Map map = new HashMap<>();
diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/registration/TestSlimefunItemRegistration.java b/src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/registration/TestSlimefunItemRegistration.java
index 3d67f32e5..aa47fa5b4 100644
--- a/src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/registration/TestSlimefunItemRegistration.java
+++ b/src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/registration/TestSlimefunItemRegistration.java
@@ -1,16 +1,12 @@
package io.github.thebusybiscuit.slimefun4.testing.tests.registration;
-import java.util.Optional;
-
import org.bukkit.Material;
import org.bukkit.NamespacedKey;
-import org.bukkit.inventory.ItemStack;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.ValueSource;
import be.seeseemelk.mockbukkit.MockBukkit;
import io.github.thebusybiscuit.cscorelib2.item.CustomItem;
@@ -19,12 +15,10 @@ import io.github.thebusybiscuit.slimefun4.api.items.ItemState;
import io.github.thebusybiscuit.slimefun4.implementation.SlimefunPlugin;
import io.github.thebusybiscuit.slimefun4.implementation.items.VanillaItem;
import io.github.thebusybiscuit.slimefun4.testing.TestUtilities;
-import me.mrCookieSlime.Slimefun.Lists.RecipeType;
import me.mrCookieSlime.Slimefun.Objects.Category;
import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem;
-import me.mrCookieSlime.Slimefun.api.SlimefunItemStack;
-public class TestSlimefunItemRegistration {
+class TestSlimefunItemRegistration {
private static SlimefunPlugin plugin;
@@ -40,7 +34,8 @@ public class TestSlimefunItemRegistration {
}
@Test
- public void testSuccessfulRegistration() {
+ @DisplayName("Test SlimefunItem registering properly")
+ void testSuccessfulRegistration() {
String id = "TEST_ITEM";
SlimefunItem item = TestUtilities.mockSlimefunItem(plugin, id, new CustomItem(Material.DIAMOND, "&cTest"));
@@ -55,7 +50,8 @@ public class TestSlimefunItemRegistration {
}
@Test
- public void testDisabledItem() {
+ @DisplayName("Test disabled SlimefunItem being disabled")
+ void testDisabledItem() {
SlimefunItem item = TestUtilities.mockSlimefunItem(plugin, "DISABLED_ITEM", new CustomItem(Material.DIAMOND, "&cTest"));
SlimefunPlugin.getItemCfg().setValue("DISABLED_ITEM.enabled", false);
item.register(plugin);
@@ -65,24 +61,8 @@ public class TestSlimefunItemRegistration {
}
@Test
- public void testWikiPages() {
- SlimefunItem item = TestUtilities.mockSlimefunItem(plugin, "WIKI_ITEM", new CustomItem(Material.BOOK, "&cTest"));
- item.register(plugin);
-
- Assertions.assertFalse(item.getWikipage().isPresent());
-
- // null should not be a valid argument
- Assertions.assertThrows(IllegalArgumentException.class, () -> item.addOficialWikipage(null));
-
- item.addOficialWikipage("Test");
-
- Optional wiki = item.getWikipage();
- Assertions.assertTrue(wiki.isPresent());
- Assertions.assertEquals("https://github.com/Slimefun/Slimefun4/wiki/Test", wiki.get());
- }
-
- @Test
- public void testVanillaItemFallback() {
+ @DisplayName("Test VanillaItem falling back to vanilla.")
+ void testVanillaItemFallback() {
VanillaItem item = TestUtilities.mockVanillaItem(plugin, Material.ACACIA_SIGN, false);
item.register(plugin);
@@ -92,7 +72,8 @@ public class TestSlimefunItemRegistration {
}
@Test
- public void testIdConflict() {
+ @DisplayName("Test id conflicts being handled with an exception")
+ void testIdConflict() {
SlimefunItem item = TestUtilities.mockSlimefunItem(plugin, "DUPLICATE_ID", new CustomItem(Material.DIAMOND, "&cTest"));
item.register(plugin);
@@ -104,83 +85,8 @@ public class TestSlimefunItemRegistration {
}
@Test
- public void testRecipe() {
- SlimefunItem item = TestUtilities.mockSlimefunItem(plugin, "RECIPE_TEST", new CustomItem(Material.DIAMOND, "&dAnother one bites the test"));
-
- ItemStack[] recipe = { null, new ItemStack(Material.DIAMOND), null, null, new ItemStack(Material.DIAMOND), null, null, new ItemStack(Material.DIAMOND), null };
- item.setRecipe(recipe);
- item.register(plugin);
-
- Assertions.assertArrayEquals(recipe, item.getRecipe());
-
- Assertions.assertThrows(IllegalArgumentException.class, () -> item.setRecipe(null));
- Assertions.assertThrows(IllegalArgumentException.class, () -> item.setRecipe(new ItemStack[3]));
- Assertions.assertThrows(IllegalArgumentException.class, () -> item.setRecipe(new ItemStack[20]));
- }
-
- @Test
- public void testRecipeOutput() {
- SlimefunItem item = TestUtilities.mockSlimefunItem(plugin, "RECIPE_OUTPUT_TEST", new CustomItem(Material.DIAMOND, "&cTest"));
- item.register(plugin);
-
- Assertions.assertEquals(item.getItem(), item.getRecipeOutput());
-
- ItemStack output = new ItemStack(Material.EMERALD, 64);
- item.setRecipeOutput(output);
- Assertions.assertEquals(output, item.getRecipeOutput());
-
- item.setRecipeOutput(item.getItem());
- Assertions.assertEquals(item.getItem(), item.getRecipeOutput());
- }
-
- @Test
- public void testRecipeType() {
- SlimefunItem item = TestUtilities.mockSlimefunItem(plugin, "RECIPE_TYPE_TEST", new CustomItem(Material.DIAMOND, "&cTest"));
- item.register(plugin);
-
- Assertions.assertNotNull(item.getRecipeType());
-
- item.setRecipeType(RecipeType.ENHANCED_CRAFTING_TABLE);
- Assertions.assertEquals(RecipeType.ENHANCED_CRAFTING_TABLE, item.getRecipeType());
-
- item.setRecipeType(RecipeType.NULL);
- Assertions.assertEquals(RecipeType.NULL, item.getRecipeType());
-
- Assertions.assertThrows(IllegalArgumentException.class, () -> item.setRecipeType(null));
- }
-
- @ParameterizedTest
- @ValueSource(booleans = { true, false })
- public void testIsItem(boolean compatibility) {
- CustomItem item = new CustomItem(Material.BEACON, "&cItem Test");
- String id = "IS_ITEM_TEST" + (compatibility ? "_COMPATIBLE" : "");
- SlimefunItem sfItem = TestUtilities.mockSlimefunItem(plugin, id, item);
- sfItem.register(plugin);
-
- Assertions.assertTrue(sfItem.isItem(sfItem.getItem()));
-
- Assertions.assertFalse(sfItem.isItem(null));
- Assertions.assertFalse(sfItem.isItem(new ItemStack(Material.BEACON)));
- Assertions.assertFalse(sfItem.isItem(new CustomItem(Material.REDSTONE, "&cTest")));
-
- if (compatibility) {
- SlimefunPlugin.getRegistry().setBackwardsCompatible(true);
-
- Assertions.assertEquals(sfItem, SlimefunItem.getByItem(item));
- Assertions.assertTrue(sfItem.isItem(item));
- Assertions.assertTrue(sfItem.isItem(new CustomItem(Material.BEACON, "&cItem Test")));
-
- SlimefunPlugin.getRegistry().setBackwardsCompatible(false);
- } else {
- Assertions.assertFalse(sfItem.isItem(item));
- Assertions.assertFalse(sfItem.isItem(new CustomItem(Material.BEACON, "&cItem Test")));
- }
-
- Assertions.assertEquals(sfItem, SlimefunItem.getByItem(new SlimefunItemStack(sfItem.getId(), item)));
- }
-
- @Test
- public void testCategoryRegistration() {
+ @DisplayName("Test Category registration when registering an item")
+ void testCategoryRegistration() {
SlimefunItem item = TestUtilities.mockSlimefunItem(plugin, "CATEGORY_TEST", new CustomItem(Material.DIAMOND, "&cTest"));
item.register(plugin);
item.load();
@@ -202,7 +108,8 @@ public class TestSlimefunItemRegistration {
}
@Test
- public void testHiddenItem() {
+ @DisplayName("Test hidden items being hidden")
+ void testHiddenItem() {
SlimefunItem item = TestUtilities.mockSlimefunItem(plugin, "HIDDEN_TEST", new CustomItem(Material.DIAMOND, "&cTest"));
item.setHidden(true);
item.register(plugin);
diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/services/TestRecipeService.java b/src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/services/TestRecipeService.java
index 56ff6c85a..b2e60d55f 100644
--- a/src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/services/TestRecipeService.java
+++ b/src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/services/TestRecipeService.java
@@ -96,6 +96,9 @@ class TestRecipeService {
Optional optional2 = service.getFurnaceOutput(new ItemStack(Material.COBBLESTONE));
Assertions.assertTrue(optional2.isPresent());
Assertions.assertEquals(result, optional2.get());
+
+ // Cobblestone should be smeltable
+ Assertions.assertTrue(service.isSmeltable(new ItemStack(Material.COBBLESTONE)));
}
@Test
diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/tasks/TestArmorTask.java b/src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/tasks/TestArmorTask.java
index 6985c90c5..cb40849bc 100644
--- a/src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/tasks/TestArmorTask.java
+++ b/src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/tasks/TestArmorTask.java
@@ -2,6 +2,7 @@ package io.github.thebusybiscuit.slimefun4.testing.tests.tasks;
import java.util.Arrays;
import java.util.Locale;
+import java.util.stream.Stream;
import org.bukkit.Material;
import org.bukkit.entity.Player;
@@ -14,7 +15,8 @@ import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.ValueSource;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
import be.seeseemelk.mockbukkit.MockBukkit;
import be.seeseemelk.mockbukkit.ServerMock;
@@ -32,13 +34,11 @@ class TestArmorTask {
private static ServerMock server;
private static SlimefunPlugin plugin;
- private static ArmorTask task;
@BeforeAll
public static void load() {
server = MockBukkit.mock();
plugin = MockBukkit.load(SlimefunPlugin.class);
- task = new ArmorTask(false);
}
@AfterAll
@@ -63,7 +63,7 @@ class TestArmorTask {
player.getInventory().setHelmet(helmet.clone());
player.getInventory().setChestplate(new ItemStack(Material.DIAMOND_CHESTPLATE));
- task.run();
+ new ArmorTask(false).run();
// Check if all Potion Effects were applied
Assertions.assertTrue(player.getActivePotionEffects().containsAll(Arrays.asList(effects)));
@@ -71,8 +71,8 @@ class TestArmorTask {
@ParameterizedTest
@DisplayName("Test Radiation and Hazmat Suits")
- @ValueSource(booleans = { true, false })
- void testRadiactivity(boolean hazmat) throws InterruptedException {
+ @MethodSource("cartesianBooleans")
+ void testRadiactivity(boolean hazmat, boolean radioactiveFire) throws InterruptedException {
Player player = server.addPlayer();
TestUtilities.awaitProfile(player);
@@ -80,25 +80,38 @@ class TestArmorTask {
player.getWorld().setTime(16000);
Category category = TestUtilities.getCategory(plugin, "hazmat_suit_test");
- SlimefunItemStack item = new SlimefunItemStack("MOCK_URANIUM_" + String.valueOf(hazmat).toUpperCase(Locale.ROOT), Material.EMERALD, "&aHi, I am deadly");
+ SlimefunItemStack item = new SlimefunItemStack("MOCK_URANIUM_" + String.valueOf(hazmat).toUpperCase(Locale.ROOT) + "_" + String.valueOf(radioactiveFire).toUpperCase(Locale.ROOT), Material.EMERALD, "&aHi, I am deadly");
new RadioactiveItem(category, Radioactivity.VERY_DEADLY, item, RecipeType.NULL, new ItemStack[9]).register(plugin);
player.getInventory().setItemInMainHand(item.clone());
player.getInventory().setItemInOffHand(new ItemStack(Material.EMERALD_ORE));
if (hazmat) {
- SlimefunItemStack chestplate = new SlimefunItemStack("MOCK_HAZMAT_SUIT", Material.LEATHER_CHESTPLATE, "&4Hazmat Prototype");
+ SlimefunItemStack chestplate = new SlimefunItemStack("MOCK_HAZMAT_SUIT_" + String.valueOf(radioactiveFire).toUpperCase(Locale.ROOT), Material.LEATHER_CHESTPLATE, "&4Hazmat Prototype");
MockHazmatSuit armor = new MockHazmatSuit(category, chestplate);
armor.register(plugin);
player.getInventory().setChestplate(chestplate.clone());
}
+ ArmorTask task = new ArmorTask(radioactiveFire);
task.run();
// Check if the Player is suffering from radiation
boolean radiation = player.getActivePotionEffects().containsAll(task.getRadiationEffects());
Assertions.assertEquals(!hazmat, radiation);
+ Assertions.assertEquals(!hazmat && radioactiveFire, player.getFireTicks() > 0);
+ }
+
+ /**
+ * This returns an {@link Arguments} {@link Stream} of boolean combinations.
+ * It performs a cartesian product on two boolean sets.
+ *
+ * @return a {@link Stream} of {@link Arguments}
+ */
+ private static Stream cartesianBooleans() {
+ Stream stream = Stream.of(true, false);
+ return stream.flatMap(a -> Stream.of(true, false).map(b -> Arguments.of(a, b)));
}
}
diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/utils/TestLoreComparison.java b/src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/utils/TestLoreComparison.java
new file mode 100644
index 000000000..e25450b7b
--- /dev/null
+++ b/src/test/java/io/github/thebusybiscuit/slimefun4/testing/tests/utils/TestLoreComparison.java
@@ -0,0 +1,112 @@
+package io.github.thebusybiscuit.slimefun4.testing.tests.utils;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.bukkit.ChatColor;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+import be.seeseemelk.mockbukkit.MockBukkit;
+import io.github.thebusybiscuit.slimefun4.implementation.SlimefunPlugin;
+import io.github.thebusybiscuit.slimefun4.utils.SlimefunUtils;
+
+class TestLoreComparison {
+
+ private static final String IGNORED_LINE = ChatColor.GRAY + "Soulbound";
+
+ @BeforeAll
+ public static void load() {
+ MockBukkit.mock();
+ MockBukkit.load(SlimefunPlugin.class);
+ }
+
+ @AfterAll
+ public static void unload() {
+ MockBukkit.unmock();
+ }
+
+ @Test
+ @DisplayName("Test if two equal lores are considered equal")
+ void testEqualLists() {
+ List a = Arrays.asList("a", "b", "c");
+ List b = Arrays.asList("a", "b", "c");
+
+ Assertions.assertTrue(SlimefunUtils.equalsLore(a, b));
+ Assertions.assertTrue(SlimefunUtils.equalsLore(b, a));
+ }
+
+ @Test
+ @DisplayName("Test if two not equal lores are not considered equal")
+ void testNotEqualLists() {
+ List a = Arrays.asList("a", "b", "c");
+ List b = Arrays.asList("1", "2", "3");
+
+ Assertions.assertFalse(SlimefunUtils.equalsLore(a, b));
+ Assertions.assertFalse(SlimefunUtils.equalsLore(b, a));
+ }
+
+ @Test
+ @DisplayName("Test if lores with different length are not considered equal")
+ void testDifferentLengthLists() {
+ List a = Arrays.asList("a", "b", "c");
+ List b = Arrays.asList("a", "b", "c", "d", "e", "f", "g");
+
+ Assertions.assertFalse(SlimefunUtils.equalsLore(a, b));
+ Assertions.assertFalse(SlimefunUtils.equalsLore(b, a));
+ }
+
+ @Test
+ @DisplayName("Test if lores with one ignored element are considered equal")
+ void testIgnoredElementLists() {
+ List a = Arrays.asList("a", "b", IGNORED_LINE, "c");
+ List b = Arrays.asList("a", "b", "c");
+
+ Assertions.assertTrue(SlimefunUtils.equalsLore(a, b));
+ Assertions.assertTrue(SlimefunUtils.equalsLore(b, a));
+ }
+
+ @Test
+ @DisplayName("Test if lores with ignored elements are considered equal")
+ void testIgnoredElementsLists() {
+ List a = Arrays.asList("a", "b", IGNORED_LINE, "c");
+ List b = Arrays.asList("a", IGNORED_LINE, "b", "c");
+
+ Assertions.assertTrue(SlimefunUtils.equalsLore(a, b));
+ Assertions.assertTrue(SlimefunUtils.equalsLore(b, a));
+ }
+
+ @Test
+ @DisplayName("Test if lores with ignored element at start are considered equal")
+ void testIgnoredElementStartLists() {
+ List a = Arrays.asList(IGNORED_LINE, "a", "b", "c");
+ List b = Arrays.asList(IGNORED_LINE, "a", "b", "c");
+
+ Assertions.assertTrue(SlimefunUtils.equalsLore(a, b));
+ Assertions.assertTrue(SlimefunUtils.equalsLore(b, a));
+ }
+
+ @Test
+ @DisplayName("Test if lores with ignored element at end are considered equal")
+ void testIgnoredElementEndLists() {
+ List