From c93c6cfa68c091ab8e752bc49ece6dca98d115db Mon Sep 17 00:00:00 2001 From: TheBusyBiscuit Date: Sat, 9 May 2020 18:00:10 +0200 Subject: [PATCH] Small refactoring --- pom.xml | 589 +++++++++--------- .../slimefun4/core/SlimefunRegistry.java | 4 - .../implementation/setup/PostSetup.java | 8 +- .../Objects/SlimefunItem/SlimefunItem.java | 9 - .../Slimefun/SlimefunPlugin.java | 2 +- .../items/TestSlimefunItemRegistration.java | 1 - 6 files changed, 306 insertions(+), 307 deletions(-) diff --git a/pom.xml b/pom.xml index e2c82276f..a2dcc9d46 100644 --- a/pom.xml +++ b/pom.xml @@ -1,329 +1,338 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - 4.0.0 - me.mrCookieSlime - Slimefun + 4.0.0 + me.mrCookieSlime + Slimefun - - - 4.3-UNOFFICIAL + + + 4.3-UNOFFICIAL - - UTF-8 - 1.8 - 1.8 + + UTF-8 + 1.8 + 1.8 - - 1.15.2 - https://hub.spigotmc.org/javadocs/bukkit/ + + 1.15.2 + https://hub.spigotmc.org/javadocs/bukkit/ - - TheBusyBiscuit_Slimefun4 - thebusybiscuit-github - https://sonarcloud.io - target/site/jacoco/jacoco.xml - + + TheBusyBiscuit_Slimefun4 + thebusybiscuit-github + https://sonarcloud.io + target/site/jacoco/jacoco.xml + - - GitHub - https://github.com/TheBusyBiscuit/Slimefun4/issues - + + GitHub Issues + https://github.com/TheBusyBiscuit/Slimefun4/issues + - - - paper-repo - https://repo.destroystokyo.com/repository/maven-public/ - - - spigot-repo - https://hub.spigotmc.org/nexus/content/repositories/snapshots/ - - - jitpack.io - https://jitpack.io - - - worldedit-worldguard-repo - https://maven.sk89q.com/repo/ - - - bStats-repo - https://repo.codemc.org/repository/maven-public - - - placeholderapi-repo - http://repo.extendedclip.com/content/repositories/placeholderapi/ - - + + + GNU General Public License v3.0 + https://github.com/TheBusyBiscuit/Slimefun4/blob/master/LICENSE + repo + + - - ${project.basedir}/src/main/java - ${project.basedir}/src/test/java + + + paper-repo + https://repo.destroystokyo.com/repository/maven-public/ + + + spigot-repo + https://hub.spigotmc.org/nexus/content/repositories/snapshots/ + + + jitpack.io + https://jitpack.io + + + worldedit-worldguard-repo + https://maven.sk89q.com/repo/ + + + bStats-repo + https://repo.codemc.org/repository/maven-public + + + placeholderapi-repo + http://repo.extendedclip.com/content/repositories/placeholderapi/ + + - ${project.name} v${project.version} + + ${project.basedir}/src/main/java + ${project.basedir}/src/test/java - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - - - - **/package-info.java - - - + ${project.name} v${project.version} - - - org.apache.maven.plugins - maven-source-plugin - 3.2.1 - - - attach-sources - - jar - - - - + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.1 + + + + + **/package-info.java + + + - - - org.apache.maven.plugins - maven-surefire-plugin - 3.0.0-M4 - + + + org.apache.maven.plugins + maven-source-plugin + 3.2.1 + + + attach-sources + + jar + + + + - - - org.sonarsource.scanner.maven - sonar-maven-plugin - 3.7.0.1746 - + + + org.apache.maven.plugins + maven-surefire-plugin + 3.0.0-M4 + - - - org.jacoco - jacoco-maven-plugin - 0.8.5 + + + org.sonarsource.scanner.maven + sonar-maven-plugin + 3.7.0.1746 + - - - prepare - - prepare-agent - - + + + org.jacoco + jacoco-maven-plugin + 0.8.5 - - report - test - - report - - - - + + + prepare + + prepare-agent + + - - - org.apache.maven.plugins - maven-shade-plugin - 3.2.3 + + report + test + + report + + + + - + + + org.apache.maven.plugins + maven-shade-plugin + 3.2.3 - - - - org.bstats - me.mrCookieSlime.Slimefun.bstats - - - io.github.thebusybiscuit.cscorelib2 - me.mrCookieSlime.Slimefun.cscorelib2 - - + - - - - *:* - - META-INF/* - - - - + + + + org.bstats + me.mrCookieSlime.Slimefun.bstats + + + io.github.thebusybiscuit.cscorelib2 + me.mrCookieSlime.Slimefun.cscorelib2 + + - - - package - - shade - - - - + + + + *:* + + META-INF/* + + + + - - org.apache.maven.plugins - maven-javadoc-plugin - 3.2.0 + + + package + + shade + + + + - - ${project.basedir} - docs + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.2.0 - Slimefun4 - Javadocs - Slimefun4 - Javadocs - false - -html5 + + ${project.basedir} + docs - - - ${bukkit.javadocs} - + Slimefun4 - Javadocs + Slimefun4 - Javadocs + false + -html5 - - - - Slimefun4 - API - io.github.thebusybiscuit.slimefun4.api* - - - Slimefun4 - Core packages - io.github.thebusybiscuit.slimefun4.core* - - - Slimefun4 - Implementations - io.github.thebusybiscuit.slimefun4.implementation* - - - Slimefun4 - Common utility packages - io.github.thebusybiscuit.slimefun4.utils* - - - Slimefun4 - Item Implementations - io.github.thebusybiscuit.slimefun4.implementation.items* - - - Slimefun4 - Old packages - me.mrCookieSlime.Slimefun* - - - - - + + + ${bukkit.javadocs} + - + + + + Slimefun4 - API + io.github.thebusybiscuit.slimefun4.api* + + + Slimefun4 - Core packages + io.github.thebusybiscuit.slimefun4.core* + + + Slimefun4 - Implementations + io.github.thebusybiscuit.slimefun4.implementation* + + + Slimefun4 - Common utility packages + io.github.thebusybiscuit.slimefun4.utils* + + + Slimefun4 - Item Implementations + io.github.thebusybiscuit.slimefun4.implementation.items* + + + Slimefun4 - Old packages + me.mrCookieSlime.Slimefun* + + + + + - - - ${basedir}/src/main/resources - true + - - * - languages/* - - + + + ${basedir}/src/main/resources + true - - - ${basedir} + + * + languages/* + + - - LICENSE - - - - + + + ${basedir} - - - - org.bukkit - bukkit - ${bukkit.version}-R0.1-SNAPSHOT - provided - - - com.github.TheBusyBiscuit - CS-CoreLib - 8081bb4fe4 - provided - + + LICENSE + + + + - - - org.junit.jupiter - junit-jupiter - 5.5.1 - test - - - com.github.seeseemelk - MockBukkit - v1.15-279489afe1-1 - test - - - org.mockito - mockito-core - 3.3.3 - test - + + + + org.bukkit + bukkit + ${bukkit.version}-R0.1-SNAPSHOT + provided + + + com.github.TheBusyBiscuit + CS-CoreLib + 8081bb4fe4 + provided + - - - com.github.thebusybiscuit - CS-CoreLib2 - 0.18 - compile - - - org.bstats - bstats-bukkit - 1.7 - compile - + + + org.junit.jupiter + junit-jupiter + 5.5.1 + test + + + com.github.seeseemelk + MockBukkit + v1.15-279489afe1-1 + test + + + org.mockito + mockito-core + 3.3.3 + test + - - - com.sk89q.worldedit - worldedit-bukkit - 7.1.0 - provided - - - me.clip - placeholderapi - 2.10.6 - provided - - - com.github.TheBusyBiscuit - EmeraldEnchants2 - 3cd370b5d8 - provided - + + + com.github.thebusybiscuit + CS-CoreLib2 + 0.18 + compile + + + org.bstats + bstats-bukkit + 1.7 + compile + - - - me.minebuilders - clearlag-core - 2.9.7 - system - ${project.basedir}/lib/Clearlag.jar - - + + + com.sk89q.worldedit + worldedit-bukkit + 7.1.0 + provided + + + me.clip + placeholderapi + 2.10.6 + provided + + + com.github.TheBusyBiscuit + EmeraldEnchants2 + 3cd370b5d8 + provided + + + + + me.minebuilders + clearlag-core + 2.9.7 + system + ${project.basedir}/lib/Clearlag.jar + + diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/SlimefunRegistry.java b/src/main/java/io/github/thebusybiscuit/slimefun4/core/SlimefunRegistry.java index 50fbf5b8c..f5404f90f 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/SlimefunRegistry.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/core/SlimefunRegistry.java @@ -130,10 +130,6 @@ public class SlimefunRegistry { return enabledItems; } - public int countNonAddonItems() { - return (int) getEnabledSlimefunItems().stream().filter(item -> !item.isAddonItem()).count(); - } - public List getResearches() { return researches; } diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/setup/PostSetup.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/setup/PostSetup.java index 79ea751ee..98ed5def8 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/setup/PostSetup.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/setup/PostSetup.java @@ -87,13 +87,13 @@ public final class PostSetup { CommandSender sender = Bukkit.getConsoleSender(); int total = SlimefunPlugin.getRegistry().getEnabledSlimefunItems().size(); - int vanilla = SlimefunPlugin.getRegistry().countNonAddonItems(); + int slimefunOnly = countNonAddonItems(); sender.sendMessage(""); sender.sendMessage(ChatColor.GREEN + "######################### - Slimefun v" + SlimefunPlugin.getVersion() + " - #########################"); sender.sendMessage(""); sender.sendMessage(ChatColor.GREEN + "Successfully loaded " + total + " Items and " + SlimefunPlugin.getRegistry().getResearches().size() + " Researches"); - sender.sendMessage(ChatColor.GREEN + "( " + vanilla + " Items from Slimefun, " + (total - vanilla) + " Items from " + SlimefunPlugin.getInstalledAddons().size() + " Addons )"); + sender.sendMessage(ChatColor.GREEN + "( " + slimefunOnly + " Items from Slimefun, " + (total - slimefunOnly) + " Items from " + SlimefunPlugin.getInstalledAddons().size() + " Addons )"); sender.sendMessage(""); sender.sendMessage(ChatColor.GREEN + "Slimefun is an Open-Source project that is kept alive by a large community."); sender.sendMessage(ChatColor.GREEN + "Consider helping us maintain this project by contributing on GitHub!"); @@ -117,6 +117,10 @@ public final class PostSetup { SlimefunPlugin.getRegistry().setAutoLoadingMode(true); } + private static int countNonAddonItems() { + return (int) SlimefunPlugin.getRegistry().getEnabledSlimefunItems().stream().filter(item -> item.getAddon() instanceof SlimefunPlugin).count(); + } + private static void loadAutomaticCraftingChamber() { AutomatedCraftingChamber crafter = (AutomatedCraftingChamber) SlimefunItems.AUTOMATED_CRAFTING_CHAMBER.getItem(); diff --git a/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SlimefunItem.java b/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SlimefunItem.java index 3ea5cabc3..2a656eee5 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SlimefunItem.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SlimefunItem.java @@ -275,15 +275,6 @@ public class SlimefunItem implements Placeable { } } - /** - * This method returns whether this {@link SlimefunItem} was added by an addon. - * - * @return Whether this {@link SlimefunItem} was added by an addon. - */ - public final boolean isAddonItem() { - return !(addon instanceof SlimefunPlugin); - } - /** * This method returns whether this {@link SlimefunItem} is disabled. * diff --git a/src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java b/src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java index 922b8f572..8a5015790 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java @@ -103,7 +103,7 @@ import me.mrCookieSlime.Slimefun.api.inventory.UniversalBlockMenu; * @author TheBusyBiscuit * */ -public class SlimefunPlugin extends JavaPlugin implements SlimefunAddon { +public final class SlimefunPlugin extends JavaPlugin implements SlimefunAddon { public static SlimefunPlugin instance; diff --git a/src/test/java/io/github/thebusybiscuit/slimefun4/tests/items/TestSlimefunItemRegistration.java b/src/test/java/io/github/thebusybiscuit/slimefun4/tests/items/TestSlimefunItemRegistration.java index 82cea66ca..4d8173246 100644 --- a/src/test/java/io/github/thebusybiscuit/slimefun4/tests/items/TestSlimefunItemRegistration.java +++ b/src/test/java/io/github/thebusybiscuit/slimefun4/tests/items/TestSlimefunItemRegistration.java @@ -48,7 +48,6 @@ public class TestSlimefunItemRegistration { Assertions.assertEquals(ItemState.ENABLED, item.getState()); Assertions.assertFalse(item.isDisabled()); Assertions.assertEquals(id, item.getID()); - Assertions.assertFalse(item.isAddonItem()); Assertions.assertEquals(item, SlimefunItem.getByID(id)); }