From c05d866f2f6f1e8ffcce9bc170ba580c261578ea Mon Sep 17 00:00:00 2001 From: Ben Woo <30431861+benwoo1110@users.noreply.github.com> Date: Wed, 15 Feb 2023 10:28:56 +0800 Subject: [PATCH] refactor: Remove buscript entirely (#2837) --- pom.xml | 9 ------ .../MultiverseCore/MultiverseCore.java | 30 ------------------ .../MultiverseCoreConfiguration.java | 19 ------------ .../MultiverseCore/api/MVConfig.java | 12 ------- .../MultiverseCore/api/MVCore.java | 14 ++------- .../utils/TestInstanceCreator.java | 31 +++++-------------- 6 files changed, 11 insertions(+), 104 deletions(-) diff --git a/pom.xml b/pom.xml index c1a7813a..c8b0bd79 100644 --- a/pom.xml +++ b/pom.xml @@ -228,10 +228,6 @@ me.main__.util com.onarandombox.serializationconfig - - buscript - com.onarandombox.buscript - org.bstats com.onarandombox.bstats @@ -327,11 +323,6 @@ json-smart 2.4.8 - - com.dumptruckman.minecraft - buscript - 2.0-SNAPSHOT - org.bstats bstats-bukkit diff --git a/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java b/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java index 4f98cfae..6a707d8d 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java +++ b/src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java @@ -17,7 +17,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import buscript.Buscript; import com.dumptruckman.minecraft.util.Logging; import com.onarandombox.MultiverseCore.anchor.AnchorManager; import com.onarandombox.MultiverseCore.api.BlockSafety; @@ -85,7 +84,6 @@ public class MultiverseCore extends JavaPlugin implements MVCore { // Setup various managers private final AnchorManager anchorManager = new AnchorManager(this); private BlockSafety blockSafety = new SimpleBlockSafety(this); - private Buscript buscript; private MVCommandManager commandManager; private DestinationsProvider destinationsProvider; private MVEconomist economist; @@ -168,7 +166,6 @@ public class MultiverseCore extends JavaPlugin implements MVCore { this.registerCommands(); this.registerDestinations(); this.setupMetrics(); - this.initializeBuscript(); this.saveMVConfig(); this.logEnableMessage(); } @@ -238,25 +235,6 @@ public class MultiverseCore extends JavaPlugin implements MVCore { } } - /** - * Initializes the buscript javascript library. - */ - private void initializeBuscript() { - if (!this.getMVConfig().getEnableBuscript()) { - return; - } - - try { - buscript = new Buscript(this); - // Add global variable "multiverse" to javascript environment - buscript.setScriptVariable("multiverse", this); - } catch (NullPointerException e) { - Logging.warning("Buscript failed to load! The script command will be disabled! " + - "If you would like not to see this message, " + - "use `/mv conf enablebuscript false` to disable Buscript from loading."); - } - } - /** * Logs the enable message. */ @@ -517,14 +495,6 @@ public class MultiverseCore extends JavaPlugin implements MVCore { return config; } - /** - * {@inheritDoc} - */ - @Override - public Buscript getScriptAPI() { - return buscript; - } - /** * {@inheritDoc} */ diff --git a/src/main/java/com/onarandombox/MultiverseCore/MultiverseCoreConfiguration.java b/src/main/java/com/onarandombox/MultiverseCore/MultiverseCoreConfiguration.java index 7547a8a4..443a5757 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/MultiverseCoreConfiguration.java +++ b/src/main/java/com/onarandombox/MultiverseCore/MultiverseCoreConfiguration.java @@ -55,8 +55,6 @@ public class MultiverseCoreConfiguration extends SerializationConfig implements @Property private volatile boolean displaypermerrors; @Property - private volatile boolean enablebuscript; - @Property private volatile int globaldebug; @Property private volatile boolean silentstart; @@ -99,7 +97,6 @@ public class MultiverseCoreConfiguration extends SerializationConfig implements teleportintercept = true; firstspawnoverride = true; displaypermerrors = true; - enablebuscript = true; globaldebug = 0; messagecooldown = 5000; teleportcooldown = 1000; @@ -214,22 +211,6 @@ public class MultiverseCoreConfiguration extends SerializationConfig implements return this.displaypermerrors; } - /** - * {@inheritDoc} - */ - @Override - public boolean getEnableBuscript() { - return this.enablebuscript; - } - - /** - * {@inheritDoc} - */ - @Override - public void setEnableBuscript(boolean enableBuscript) { - this.enablebuscript = enableBuscript; - } - /** * {@inheritDoc} */ diff --git a/src/main/java/com/onarandombox/MultiverseCore/api/MVConfig.java b/src/main/java/com/onarandombox/MultiverseCore/api/MVConfig.java index d908b1ec..63a45208 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/api/MVConfig.java +++ b/src/main/java/com/onarandombox/MultiverseCore/api/MVConfig.java @@ -86,18 +86,6 @@ public interface MVConfig extends ConfigurationSerializable { */ boolean getDisplayPermErrors(); - /** - * Sets enableBuscript. - * @param enableBuscript The new value. - */ - void setEnableBuscript(boolean enableBuscript); - - /** - * Gets enableBuscript. - * @return enableBuscript. - */ - boolean getEnableBuscript(); - /** * Sets firstSpawnOverride. * @param firstSpawnOverride The new value. diff --git a/src/main/java/com/onarandombox/MultiverseCore/api/MVCore.java b/src/main/java/com/onarandombox/MultiverseCore/api/MVCore.java index b73b9eac..40f11d5f 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/api/MVCore.java +++ b/src/main/java/com/onarandombox/MultiverseCore/api/MVCore.java @@ -7,16 +7,15 @@ package com.onarandombox.MultiverseCore.api; -import buscript.Buscript; +import com.onarandombox.MultiverseCore.anchor.AnchorManager; import com.onarandombox.MultiverseCore.commandtools.MVCommandManager; import com.onarandombox.MultiverseCore.destination.DestinationsProvider; -import com.onarandombox.MultiverseCore.anchor.AnchorManager; import com.onarandombox.MultiverseCore.economy.MVEconomist; -import com.onarandombox.MultiverseCore.utils.MVPermissions; -import com.onarandombox.MultiverseCore.utils.MVPlayerSession; import com.onarandombox.MultiverseCore.teleportation.SimpleBlockSafety; import com.onarandombox.MultiverseCore.teleportation.SimpleLocationManipulation; import com.onarandombox.MultiverseCore.teleportation.SimpleSafeTTeleporter; +import com.onarandombox.MultiverseCore.utils.MVPermissions; +import com.onarandombox.MultiverseCore.utils.MVPlayerSession; import com.onarandombox.MultiverseCore.utils.UnsafeCallWrapper; import org.bukkit.entity.Player; @@ -187,11 +186,4 @@ public interface MVCore extends MVPlugin { * @return The configuration. */ MVConfig getMVConfig(); - - /** - * Gets the buscript object for Multiverse. This is what handles Javascript processing. - * - * @return The Multiverse buscript object. - */ - Buscript getScriptAPI(); } diff --git a/src/test/java/com/onarandombox/MultiverseCore/utils/TestInstanceCreator.java b/src/test/java/com/onarandombox/MultiverseCore/utils/TestInstanceCreator.java index 12f1fc72..2ad96240 100644 --- a/src/test/java/com/onarandombox/MultiverseCore/utils/TestInstanceCreator.java +++ b/src/test/java/com/onarandombox/MultiverseCore/utils/TestInstanceCreator.java @@ -7,7 +7,14 @@ package com.onarandombox.MultiverseCore.utils; -import buscript.Buscript; +import java.io.File; +import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; +import java.util.logging.Level; +import java.util.logging.Logger; + import com.onarandombox.MultiverseCore.MultiverseCore; import com.onarandombox.MultiverseCore.api.MVWorld; import com.onarandombox.MultiverseCore.listeners.MVEntityListener; @@ -32,14 +39,6 @@ import org.mockito.internal.util.reflection.ReflectionMemberAccessor; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; -import java.io.File; -import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; -import java.util.logging.Level; -import java.util.logging.Logger; - import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.any; import static org.mockito.Mockito.anyBoolean; @@ -203,20 +202,6 @@ public class TestInstanceCreator { serverfield.setAccessible(true); serverfield.set(core, mockServer); - // Set buscript - Buscript buscript; - Field buscriptfield = MultiverseCore.class.getDeclaredField("buscript"); - buscriptfield.setAccessible(true); - - try { - buscript = spy(new Buscript(core)); - when(buscript.getPlugin()).thenReturn(core); - } catch (NullPointerException e) { - buscript = null; - } - - buscriptfield.set(core, buscript); - // Set worldManager SimpleMVWorldManager wm = spy(new SimpleMVWorldManager(core)); Field worldmanagerfield = MultiverseCore.class.getDeclaredField("worldManager");