Skip to content

Commit a35cf7b

Browse files
benwoo1110benwoo1110
committed
Update for latest mv5 api support
1 parent 164c89c commit a35cf7b

File tree

6 files changed

+30
-72
lines changed

6 files changed

+30
-72
lines changed

‎src/main/java/org/mvplugins/multiverse/signportals/MultiverseSignPortals.java‎

Lines changed: 12 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,23 @@
88
package org.mvplugins.multiverse.signportals;
99

1010
import com.dumptruckman.minecraft.util.Logging;
11-
import org.mvplugins.multiverse.core.MultiverseCore;
12-
import org.mvplugins.multiverse.core.api.config.MVCoreConfig;
11+
import org.mvplugins.multiverse.core.MultiverseCoreApi;
12+
import org.mvplugins.multiverse.core.MultiversePlugin;
13+
import org.mvplugins.multiverse.core.config.MVCoreConfig;
1314
import org.mvplugins.multiverse.core.inject.PluginServiceLocator;
14-
import org.mvplugins.multiverse.core.submodules.MVCore;
15-
import org.mvplugins.multiverse.core.submodules.MVPlugin;
15+
import org.mvplugins.multiverse.core.inject.PluginServiceLocatorFactory;
16+
import org.mvplugins.multiverse.core.utils.StringFormatter;
1617
import org.mvplugins.multiverse.external.jvnet.hk2.annotations.Service;
1718
import org.mvplugins.multiverse.external.vavr.control.Option;
1819
import org.mvplugins.multiverse.external.vavr.control.Try;
19-
import org.bukkit.plugin.java.JavaPlugin;
2020
import org.mvplugins.multiverse.signportals.listeners.SignPortalsListener;
2121

2222
import java.util.logging.Level;
2323

2424
@Service
25-
public class MultiverseSignPortals extends JavaPlugin implements MVPlugin {
25+
public class MultiverseSignPortals extends MultiversePlugin {
2626

27-
private MultiverseCore core;
27+
private MultiverseCoreApi core;
2828
private PluginServiceLocator serviceLocator;
2929

3030
private final static int requiresProtocol = 50;
@@ -38,29 +38,13 @@ public void onLoad() {
3838
public void onEnable() {
3939
Logging.init(this);
4040

41-
this.core = (MultiverseCore) getServer().getPluginManager().getPlugin("Multiverse-Core");
42-
// Test if the Core was found, if not we'll disable this plugin.
43-
if (this.core == null) {
44-
Logging.info("Multiverse-Core not found, will keep looking.");
45-
getServer().getPluginManager().disablePlugin(this);
46-
return;
47-
}
48-
if (this.core.getProtocolVersion() < requiresProtocol) {
49-
Logging.severe("Your Multiverse-Core is OUT OF DATE");
50-
Logging.severe("This version of SignPortals requires Protocol Level: " + requiresProtocol);
51-
Logging.severe("Your of Core Protocol Level is: " + this.core.getProtocolVersion());
52-
Logging.severe("Grab an updated copy at: ");
53-
Logging.severe("http://dev.bukkit.org/bukkit-plugins/multiverse-core/");
54-
getServer().getPluginManager().disablePlugin(this);
55-
return;
56-
}
41+
this.core = MultiverseCoreApi.get();
5742

5843
initializeDependencyInjection();
5944
registerEvents();
6045
Logging.setDebugLevel(serviceLocator.getActiveService(MVCoreConfig.class).getGlobalDebug());
6146

62-
this.core.incrementPluginCount();
63-
Logging.log(true, Level.INFO, " Enabled - By %s", getAuthors());
47+
Logging.log(true, Level.INFO, " Enabled - By %s", StringFormatter.joinAnd(getDescription().getAuthors()));
6448
}
6549

6650
public void onDisable() {
@@ -70,7 +54,7 @@ public void onDisable() {
7054
}
7155

7256
private void initializeDependencyInjection() {
73-
serviceLocator = core.getServiceLocatorFactory()
57+
serviceLocator = PluginServiceLocatorFactory.get()
7458
.registerPlugin(new MultiverseSignPortalsPluginBinder(this), core.getServiceLocator())
7559
.flatMap(PluginServiceLocator::enable)
7660
.getOrElseThrow(exception -> {
@@ -102,24 +86,6 @@ private void registerEvents() {
10286
});
10387
}
10488

105-
/**
106-
* Parse the Authors Array into a readable String with ',' and 'and'.
107-
*
108-
* @return An comma separated string of authors
109-
*/
110-
@Override
111-
public String getAuthors() {
112-
String authors = "";
113-
for (int i = 0; i < this.getDescription().getAuthors().size(); i++) {
114-
if (i == this.getDescription().getAuthors().size() - 1) {
115-
authors += " and " + this.getDescription().getAuthors().get(i);
116-
} else {
117-
authors += ", " + this.getDescription().getAuthors().get(i);
118-
}
119-
}
120-
return authors.substring(2);
121-
}
122-
12389
@Override
12490
public PluginServiceLocator getServiceLocator() {
12591
return serviceLocator;
@@ -130,12 +96,7 @@ public String getVersionInfo() {
13096
}
13197

13298
@Override
133-
public MVCore getCore() {
134-
return this.core;
135-
}
136-
137-
@Override
138-
public int getProtocolVersion() {
139-
return 1;
99+
public int getTargetCoreProtocolVersion() {
100+
return requiresProtocol;
140101
}
141102
}

‎src/main/java/org/mvplugins/multiverse/signportals/MultiverseSignPortalsPluginBinder.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package org.mvplugins.multiverse.signportals;
22

33
import org.mvplugins.multiverse.core.inject.binder.JavaPluginBinder;
4-
import org.mvplugins.multiverse.core.submodules.MVPlugin;
54
import org.mvplugins.multiverse.external.glassfish.hk2.utilities.binding.ScopedBindingBuilder;
65
import org.mvplugins.multiverse.external.jetbrains.annotations.NotNull;
76

@@ -14,6 +13,6 @@ protected MultiverseSignPortalsPluginBinder(@NotNull MultiverseSignPortals plugi
1413
@Override
1514
protected ScopedBindingBuilder<MultiverseSignPortals> bindPluginClass(
1615
ScopedBindingBuilder<MultiverseSignPortals> bindingBuilder) {
17-
return super.bindPluginClass(bindingBuilder).to(MVPlugin.class).to(MultiverseSignPortals.class);
16+
return super.bindPluginClass(bindingBuilder).to(MultiverseSignPortals.class);
1817
}
1918
}

‎src/main/java/org/mvplugins/multiverse/signportals/listeners/MVSPBlockListener.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
import org.bukkit.permissions.Permission;
1313
import org.bukkit.permissions.PermissionDefault;
1414
import org.bukkit.plugin.PluginManager;
15-
import org.mvplugins.multiverse.core.api.destination.DestinationInstance;
16-
import org.mvplugins.multiverse.core.api.destination.DestinationsProvider;
17-
import org.mvplugins.multiverse.core.api.teleportation.SafetyTeleporter;
15+
import org.mvplugins.multiverse.core.destination.DestinationInstance;
16+
import org.mvplugins.multiverse.core.destination.DestinationsProvider;
17+
import org.mvplugins.multiverse.core.teleportation.AsyncSafetyTeleporter;
1818
import org.mvplugins.multiverse.external.jakarta.inject.Inject;
1919
import org.mvplugins.multiverse.external.jetbrains.annotations.NotNull;
2020
import org.mvplugins.multiverse.external.jvnet.hk2.annotations.Service;
@@ -44,15 +44,15 @@ public class MVSPBlockListener implements SignPortalsListener {
4444
private final PortalDetector pd;
4545
private final PortalDetector portalDetector;
4646
private final DestinationsProvider destinationsProvider;
47-
private final SafetyTeleporter safetyTeleporter;
47+
private final AsyncSafetyTeleporter safetyTeleporter;
4848

4949
@Inject
5050
public MVSPBlockListener(@NotNull MultiverseSignPortals plugin,
5151
@NotNull PortalDetector pd,
5252
@NotNull PluginManager pluginManager,
5353
@NotNull PortalDetector portalDetector,
5454
@NotNull DestinationsProvider destinationsProvider,
55-
@NotNull SafetyTeleporter safetyTeleporter) {
55+
@NotNull AsyncSafetyTeleporter safetyTeleporter) {
5656
this.plugin = plugin;
5757
this.pd = pd;
5858
this.portalDetector = portalDetector;

‎src/main/java/org/mvplugins/multiverse/signportals/listeners/MVSPPlayerListener.java‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,12 @@
1212
import org.bukkit.permissions.Permission;
1313
import org.bukkit.permissions.PermissionDefault;
1414
import org.bukkit.plugin.PluginManager;
15-
import org.mvplugins.multiverse.core.api.destination.DestinationInstance;
16-
import org.mvplugins.multiverse.core.api.destination.DestinationsProvider;
17-
import org.mvplugins.multiverse.core.api.teleportation.SafetyTeleporter;
15+
import org.mvplugins.multiverse.core.destination.DestinationInstance;
16+
import org.mvplugins.multiverse.core.destination.DestinationsProvider;
17+
import org.mvplugins.multiverse.core.teleportation.AsyncSafetyTeleporter;
1818
import org.mvplugins.multiverse.external.jakarta.inject.Inject;
1919
import org.mvplugins.multiverse.external.jetbrains.annotations.NotNull;
2020
import org.mvplugins.multiverse.external.jvnet.hk2.annotations.Service;
21-
import org.mvplugins.multiverse.signportals.MultiverseSignPortals;
2221
import org.mvplugins.multiverse.signportals.exceptions.MoreThanOneSignFoundException;
2322
import org.mvplugins.multiverse.signportals.exceptions.NoMultiverseSignFoundException;
2423
import org.mvplugins.multiverse.signportals.utils.PortalDetector;
@@ -39,14 +38,14 @@ public class MVSPPlayerListener implements SignPortalsListener {
3938
private static final String USE_PERMISSION = "multiverse.signportal.use";
4039
private static final String VALIDATE_PERMISSION = "multiverse.signportal.validate";
4140
private final DestinationsProvider destinationsProvider;
42-
private final SafetyTeleporter safetyTeleporter;
41+
private final AsyncSafetyTeleporter safetyTeleporter;
4342
private final PortalDetector pd;
4443

4544
@Inject
4645
MVSPPlayerListener(@NotNull PortalDetector pd,
4746
@NotNull PluginManager pluginManager,
4847
@NotNull DestinationsProvider destinationsProvider,
49-
@NotNull SafetyTeleporter safetyTeleporter) {
48+
@NotNull AsyncSafetyTeleporter safetyTeleporter) {
5049
this.destinationsProvider = destinationsProvider;
5150
this.safetyTeleporter = safetyTeleporter;
5251
pluginManager.addPermission(new Permission(VALIDATE_PERMISSION, PermissionDefault.OP));

‎src/main/java/org/mvplugins/multiverse/signportals/listeners/MVSPVersionListener.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99

1010
import com.dumptruckman.minecraft.util.Logging;
1111
import org.bukkit.ChatColor;
12-
import org.mvplugins.multiverse.core.api.destination.DestinationInstance;
13-
import org.mvplugins.multiverse.core.api.destination.DestinationsProvider;
14-
import org.mvplugins.multiverse.core.api.event.MVDebugModeEvent;
15-
import org.mvplugins.multiverse.core.api.event.MVDumpsDebugInfoEvent;
16-
import org.mvplugins.multiverse.core.api.event.MVPlayerTouchedPortalEvent;
12+
import org.mvplugins.multiverse.core.destination.DestinationInstance;
13+
import org.mvplugins.multiverse.core.destination.DestinationsProvider;
14+
import org.mvplugins.multiverse.core.event.MVDebugModeEvent;
15+
import org.mvplugins.multiverse.core.event.MVDumpsDebugInfoEvent;
16+
import org.mvplugins.multiverse.core.event.MVPlayerTouchedPortalEvent;
1717
import org.mvplugins.multiverse.external.jakarta.inject.Inject;
1818
import org.mvplugins.multiverse.external.jetbrains.annotations.NotNull;
1919
import org.mvplugins.multiverse.external.jvnet.hk2.annotations.Service;

‎src/main/java/org/mvplugins/multiverse/signportals/utils/PortalDetector.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,11 @@
88
package org.mvplugins.multiverse.signportals.utils;
99

1010
import com.dumptruckman.minecraft.util.Logging;
11-
import org.mvplugins.multiverse.core.api.destination.DestinationInstance;
12-
import org.mvplugins.multiverse.core.api.teleportation.LocationManipulation;
11+
import org.mvplugins.multiverse.core.destination.DestinationInstance;
12+
import org.mvplugins.multiverse.core.teleportation.LocationManipulation;
1313
import org.mvplugins.multiverse.core.permissions.CorePermissionsChecker;
1414
import org.mvplugins.multiverse.external.jakarta.inject.Inject;
1515
import org.mvplugins.multiverse.external.jvnet.hk2.annotations.Service;
16-
import org.mvplugins.multiverse.signportals.MultiverseSignPortals;
1716
import org.mvplugins.multiverse.signportals.enums.Axis;
1817
import org.mvplugins.multiverse.signportals.exceptions.MoreThanOneSignFoundException;
1918
import org.mvplugins.multiverse.signportals.exceptions.NoMultiverseSignFoundException;

0 commit comments

Comments
 (0)