Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-23 01:37:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change adapter to allow for a 'isBest' system, meaning adapters can specify they are best used with version X.

Browse Source
This commit is contained in:
Me4502 2016-12-06 14:19:44 +10:00 committed by wizjany
parent ad1bf9cf92
commit 2754d9f9ec
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/adapter/SpongeImplAdapter.java
View File

@ -73,6 +73,10 @@ public interface SpongeImplAdapter {
SpongeWorld getWorld(World world); SpongeWorld getWorld(World world);
default boolean isBest() {
return true;
}
default Location adapt(org.spongepowered.api.world.Location<org.spongepowered.api.world.World> loc, Vector3d rot) { default Location adapt(org.spongepowered.api.world.Location<org.spongepowered.api.world.World> loc, Vector3d rot) {
Vector position = new Vector(loc.getX(), loc.getY(), loc.getZ()); Vector position = new Vector(loc.getX(), loc.getY(), loc.getZ());

15
worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/adapter/SpongeImplLoader.java
View File

@ -19,7 +19,9 @@
package com.sk89q.worldedit.sponge.adapter; package com.sk89q.worldedit.sponge.adapter;
import com.google.common.collect.Lists;
import com.sk89q.worldedit.util.io.Closer; import com.sk89q.worldedit.util.io.Closer;
import org.spongepowered.api.Sponge;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
@ -149,11 +151,12 @@ public class SpongeImplLoader {
* @throws AdapterLoadException thrown if no adapter could be found * @throws AdapterLoadException thrown if no adapter could be found
*/ */
public SpongeImplAdapter loadAdapter() throws AdapterLoadException { public SpongeImplAdapter loadAdapter() throws AdapterLoadException {
List<SpongeImplAdapter> suitableAdapters = Lists.newArrayList();
for (String className : adapterCandidates) { for (String className : adapterCandidates) {
try { try {
Class<?> cls = Class.forName(className); Class<?> cls = Class.forName(className);
if (SpongeImplAdapter.class.isAssignableFrom(cls)) { if (SpongeImplAdapter.class.isAssignableFrom(cls)) {
return (SpongeImplAdapter) cls.newInstance(); suitableAdapters.add((SpongeImplAdapter) cls.newInstance());
} else { } else {
log.log(Level.WARNING, "Failed to load the Sponge adapter class '" + className + log.log(Level.WARNING, "Failed to load the Sponge adapter class '" + className +
"' because it does not implement " + SpongeImplAdapter.class.getCanonicalName()); "' because it does not implement " + SpongeImplAdapter.class.getCanonicalName());
@ -171,6 +174,14 @@ public class SpongeImplLoader {
} }
} }
throw new AdapterLoadException(LOAD_ERROR_MESSAGE); if (suitableAdapters.isEmpty()) {
throw new AdapterLoadException(LOAD_ERROR_MESSAGE);
} else {
if (suitableAdapters.size() == 1) {
return suitableAdapters.get(0);
} else {
return suitableAdapters.stream().filter(SpongeImplAdapter::isBest).findFirst().orElse(suitableAdapters.get(0));
}
}
} }
} }