diff --git a/common/src/main/java/me/lucko/luckperms/common/util/DurationFormatter.java b/common/src/main/java/me/lucko/luckperms/common/util/DurationFormatter.java index 7073a72e6..126388c1e 100644 --- a/common/src/main/java/me/lucko/luckperms/common/util/DurationFormatter.java +++ b/common/src/main/java/me/lucko/luckperms/common/util/DurationFormatter.java @@ -29,7 +29,6 @@ import me.lucko.luckperms.common.locale.TranslationManager; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.TextComponent; import net.kyori.adventure.text.TranslatableComponent; -import net.kyori.adventure.text.serializer.plain.PlainComponentSerializer; import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer; import java.time.Duration; diff --git a/settings.gradle b/settings.gradle index 5598dd55f..71cc2068a 100644 --- a/settings.gradle +++ b/settings.gradle @@ -38,7 +38,7 @@ include ( 'sponge', 'sponge:loader', 'sponge:sponge-service', - 'sponge:sponge-service-api8', + 'sponge:sponge-service-proxy', 'velocity', 'standalone', 'standalone:loader', diff --git a/sponge/build.gradle b/sponge/build.gradle index 37490efbc..c27a717f3 100644 --- a/sponge/build.gradle +++ b/sponge/build.gradle @@ -2,6 +2,9 @@ plugins { alias(libs.plugins.shadow) } +sourceCompatibility = 17 +targetCompatibility = 21 + repositories { maven { url 'https://repo.spongepowered.org/repository/maven-public/' } } @@ -9,15 +12,16 @@ repositories { dependencies { implementation project(':common') implementation project(':sponge:sponge-service') - implementation project(':sponge:sponge-service-api8') + implementation project(':sponge:sponge-service-proxy') compileOnly project(':common:loader-utils') - compileOnly('org.spongepowered:spongeapi:8.0.0') { + compileOnly('org.spongepowered:spongeapi:12.0.0') { exclude(module: 'configurate-core') exclude(module: 'configurate-hocon') exclude(module: 'configurate-gson') exclude(module: 'configurate-yaml') } + compileOnly 'com.google.guava:guava:33.3.1-jre' } processResources { diff --git a/sponge/loader/build.gradle b/sponge/loader/build.gradle index 14499ff80..71239ce77 100644 --- a/sponge/loader/build.gradle +++ b/sponge/loader/build.gradle @@ -2,12 +2,15 @@ plugins { alias(libs.plugins.shadow) } +sourceCompatibility = 17 +targetCompatibility = 21 + repositories { maven { url 'https://repo.spongepowered.org/repository/maven-public/' } } dependencies { - compileOnly 'org.spongepowered:spongeapi:8.0.0' + compileOnly 'org.spongepowered:spongeapi:12.0.0' implementation project(':api') implementation project(':common:loader-utils') diff --git a/sponge/loader/src/main/resources/META-INF/sponge_plugins.json b/sponge/loader/src/main/resources/META-INF/sponge_plugins.json index 50dc3de4d..3945b53fb 100644 --- a/sponge/loader/src/main/resources/META-INF/sponge_plugins.json +++ b/sponge/loader/src/main/resources/META-INF/sponge_plugins.json @@ -23,7 +23,7 @@ "dependencies": [ { "id": "spongeapi", - "version": "8.0.0" + "version": "12.0.0" } ] } diff --git a/sponge/sponge-service-api8/build.gradle b/sponge/sponge-service-proxy/build.gradle similarity index 78% rename from sponge/sponge-service-api8/build.gradle rename to sponge/sponge-service-proxy/build.gradle index 27b324b0c..34ff6c369 100644 --- a/sponge/sponge-service-api8/build.gradle +++ b/sponge/sponge-service-proxy/build.gradle @@ -2,11 +2,14 @@ repositories { maven { url 'https://repo.spongepowered.org/repository/maven-public/' } } +sourceCompatibility = 17 +targetCompatibility = 21 + dependencies { implementation project(':common') implementation project(':sponge:sponge-service') - compileOnly('org.spongepowered:spongeapi:8.0.0') { + compileOnly('org.spongepowered:spongeapi:12.0.0') { exclude(module: 'configurate-core') exclude(module: 'configurate-hocon') exclude(module: 'configurate-gson') diff --git a/sponge/sponge-service-api8/src/main/java/me/lucko/luckperms/sponge/service/proxy/api8/DescriptionBuilder.java b/sponge/sponge-service-proxy/src/main/java/me/lucko/luckperms/sponge/service/proxy/DescriptionBuilder.java similarity index 99% rename from sponge/sponge-service-api8/src/main/java/me/lucko/luckperms/sponge/service/proxy/api8/DescriptionBuilder.java rename to sponge/sponge-service-proxy/src/main/java/me/lucko/luckperms/sponge/service/proxy/DescriptionBuilder.java index ce9e7ac9a..ce4b06c28 100644 --- a/sponge/sponge-service-api8/src/main/java/me/lucko/luckperms/sponge/service/proxy/api8/DescriptionBuilder.java +++ b/sponge/sponge-service-proxy/src/main/java/me/lucko/luckperms/sponge/service/proxy/DescriptionBuilder.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.sponge.service.proxy.api8; +package me.lucko.luckperms.sponge.service.proxy; import me.lucko.luckperms.common.context.ImmutableContextSetImpl; import me.lucko.luckperms.sponge.service.model.LPPermissionDescription; diff --git a/sponge/sponge-service-api8/src/main/java/me/lucko/luckperms/sponge/service/proxy/api8/PermissionDescriptionProxy.java b/sponge/sponge-service-proxy/src/main/java/me/lucko/luckperms/sponge/service/proxy/PermissionDescriptionProxy.java similarity index 97% rename from sponge/sponge-service-api8/src/main/java/me/lucko/luckperms/sponge/service/proxy/api8/PermissionDescriptionProxy.java rename to sponge/sponge-service-proxy/src/main/java/me/lucko/luckperms/sponge/service/proxy/PermissionDescriptionProxy.java index df708117e..f44f12f21 100644 --- a/sponge/sponge-service-api8/src/main/java/me/lucko/luckperms/sponge/service/proxy/api8/PermissionDescriptionProxy.java +++ b/sponge/sponge-service-proxy/src/main/java/me/lucko/luckperms/sponge/service/proxy/PermissionDescriptionProxy.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.sponge.service.proxy.api8; +package me.lucko.luckperms.sponge.service.proxy; import me.lucko.luckperms.common.util.ImmutableCollectors; import me.lucko.luckperms.sponge.service.model.LPPermissionDescription; @@ -130,6 +130,6 @@ public final class PermissionDescriptionProxy implements PermissionDescription, @Override public String toString() { - return "luckperms.api8.PermissionDescriptionProxy(handle=" + this.handle + ")"; + return "luckperms.PermissionDescriptionProxy(handle=" + this.handle + ")"; } } diff --git a/sponge/sponge-service-api8/src/main/java/me/lucko/luckperms/sponge/service/proxy/api8/PermissionServiceProxy.java b/sponge/sponge-service-proxy/src/main/java/me/lucko/luckperms/sponge/service/proxy/PermissionServiceProxy.java similarity index 98% rename from sponge/sponge-service-api8/src/main/java/me/lucko/luckperms/sponge/service/proxy/api8/PermissionServiceProxy.java rename to sponge/sponge-service-proxy/src/main/java/me/lucko/luckperms/sponge/service/proxy/PermissionServiceProxy.java index 0a161db5e..681bd8a98 100644 --- a/sponge/sponge-service-api8/src/main/java/me/lucko/luckperms/sponge/service/proxy/api8/PermissionServiceProxy.java +++ b/sponge/sponge-service-proxy/src/main/java/me/lucko/luckperms/sponge/service/proxy/PermissionServiceProxy.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.sponge.service.proxy.api8; +package me.lucko.luckperms.sponge.service.proxy; import com.google.common.collect.ImmutableSet; import me.lucko.luckperms.common.util.ImmutableCollectors; @@ -169,6 +169,6 @@ public final class PermissionServiceProxy implements PermissionAndContextService @Override public String toString() { - return "luckperms.api8.PermissionServiceProxy(handle=" + this.handle + ")"; + return "luckperms.PermissionServiceProxy(handle=" + this.handle + ")"; } } diff --git a/sponge/sponge-service-api8/src/main/java/me/lucko/luckperms/sponge/service/proxy/api8/SubjectCollectionProxy.java b/sponge/sponge-service-proxy/src/main/java/me/lucko/luckperms/sponge/service/proxy/SubjectCollectionProxy.java similarity index 95% rename from sponge/sponge-service-api8/src/main/java/me/lucko/luckperms/sponge/service/proxy/api8/SubjectCollectionProxy.java rename to sponge/sponge-service-proxy/src/main/java/me/lucko/luckperms/sponge/service/proxy/SubjectCollectionProxy.java index 5da7051f8..50fde0636 100644 --- a/sponge/sponge-service-api8/src/main/java/me/lucko/luckperms/sponge/service/proxy/api8/SubjectCollectionProxy.java +++ b/sponge/sponge-service-proxy/src/main/java/me/lucko/luckperms/sponge/service/proxy/SubjectCollectionProxy.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.sponge.service.proxy.api8; +package me.lucko.luckperms.sponge.service.proxy; import me.lucko.luckperms.common.util.ImmutableCollectors; import me.lucko.luckperms.sponge.service.model.LPProxiedServiceObject; @@ -43,7 +43,6 @@ import java.util.Set; import java.util.concurrent.CompletableFuture; import java.util.function.Predicate; -@SuppressWarnings("unchecked") public final class SubjectCollectionProxy implements SubjectCollection, LPProxiedServiceObject { private final LPSubjectCollection handle; @@ -86,7 +85,7 @@ public final class SubjectCollectionProxy implements SubjectCollection, LPProxie return this.handle.getLoadedSubjects().stream().map(LPSubject::sponge).collect(ImmutableCollectors.toSet()); } - @SuppressWarnings("rawtypes") + @SuppressWarnings({"rawtypes", "unchecked"}) @Override public @NonNull CompletableFuture> allIdentifiers() { return (CompletableFuture) this.handle.getAllIdentifiers(); @@ -102,13 +101,13 @@ public final class SubjectCollectionProxy implements SubjectCollection, LPProxie return this.handle.getService().getReferenceFactory().obtain(identifier(), subjectIdentifier); } - @SuppressWarnings("rawtypes") + @SuppressWarnings({"rawtypes", "unchecked"}) @Override public @NonNull CompletableFuture> allWithPermission(@NonNull String s) { return (CompletableFuture) this.handle.getAllWithPermission(s); } - @SuppressWarnings("rawtypes") + @SuppressWarnings({"rawtypes", "unchecked"}) @Override public @NonNull CompletableFuture> allWithPermission(@NonNull String s, @NonNull Cause cause) { return (CompletableFuture) this.handle.getAllWithPermission(this.handle.getService().getContextsForCause(cause), s); @@ -154,7 +153,7 @@ public final class SubjectCollectionProxy implements SubjectCollection, LPProxie @Override public String toString() { - return "luckperms.api8.SubjectCollectionProxy(handle=" + this.handle + ")"; + return "luckperms.SubjectCollectionProxy(handle=" + this.handle + ")"; } } diff --git a/sponge/sponge-service-api8/src/main/java/me/lucko/luckperms/sponge/service/proxy/api8/SubjectDataProxy.java b/sponge/sponge-service-proxy/src/main/java/me/lucko/luckperms/sponge/service/proxy/SubjectDataProxy.java similarity index 96% rename from sponge/sponge-service-api8/src/main/java/me/lucko/luckperms/sponge/service/proxy/api8/SubjectDataProxy.java rename to sponge/sponge-service-proxy/src/main/java/me/lucko/luckperms/sponge/service/proxy/SubjectDataProxy.java index a860eafe5..e55381b35 100644 --- a/sponge/sponge-service-api8/src/main/java/me/lucko/luckperms/sponge/service/proxy/api8/SubjectDataProxy.java +++ b/sponge/sponge-service-proxy/src/main/java/me/lucko/luckperms/sponge/service/proxy/SubjectDataProxy.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.sponge.service.proxy.api8; +package me.lucko.luckperms.sponge.service.proxy; import com.google.common.collect.ImmutableMap; import me.lucko.luckperms.common.util.CompletableFutures; @@ -49,7 +49,6 @@ import java.util.Objects; import java.util.Set; import java.util.concurrent.CompletableFuture; -@SuppressWarnings("unchecked") public final class SubjectDataProxy implements SubjectData, LPProxiedServiceObject { private final LPPermissionService service; private final LPSubjectReference ref; @@ -77,7 +76,7 @@ public final class SubjectDataProxy implements SubjectData, LPProxiedServiceObje return !this.enduring; } - @SuppressWarnings("rawtypes") + @SuppressWarnings({"rawtypes", "unchecked"}) @Override public @NonNull Map, Map> allPermissions() { return (Map) handle().thenApply(handle -> handle.getAllPermissions().entrySet().stream() @@ -148,7 +147,7 @@ public final class SubjectDataProxy implements SubjectData, LPProxiedServiceObje return handle().thenCompose(handle -> handle.clearPermissions(CompatibilityUtil.convertContexts(contexts))); } - @SuppressWarnings("rawtypes") + @SuppressWarnings({"rawtypes", "unchecked"}) @Override public @NonNull Map, List> allParents() { return (Map) handle().thenApply(handle -> handle.getAllParents().entrySet().stream() @@ -158,7 +157,7 @@ public final class SubjectDataProxy implements SubjectData, LPProxiedServiceObje ))).join(); } - @SuppressWarnings("rawtypes") + @SuppressWarnings({"rawtypes", "unchecked"}) @Override public @NonNull List parents(@NonNull Set contexts) { return (List) handle().thenApply(handle -> handle.getParents(CompatibilityUtil.convertContexts(contexts))).join(); @@ -189,7 +188,7 @@ public final class SubjectDataProxy implements SubjectData, LPProxiedServiceObje return handle().thenCompose(handle -> handle.clearParents(CompatibilityUtil.convertContexts(contexts))); } - @SuppressWarnings("rawtypes") + @SuppressWarnings({"rawtypes", "unchecked"}) @Override public @NonNull Map, Map> allOptions() { return (Map) handle().thenApply(handle -> handle.getAllOptions().entrySet().stream() @@ -253,6 +252,6 @@ public final class SubjectDataProxy implements SubjectData, LPProxiedServiceObje @Override public String toString() { - return "luckperms.api8.SubjectDataProxy(ref=" + this.ref + ", enduring=" + this.enduring + ")"; + return "luckperms.SubjectDataProxy(ref=" + this.ref + ", enduring=" + this.enduring + ")"; } } diff --git a/sponge/sponge-service-api8/src/main/java/me/lucko/luckperms/sponge/service/proxy/api8/SubjectProxy.java b/sponge/sponge-service-proxy/src/main/java/me/lucko/luckperms/sponge/service/proxy/SubjectProxy.java similarity index 97% rename from sponge/sponge-service-api8/src/main/java/me/lucko/luckperms/sponge/service/proxy/api8/SubjectProxy.java rename to sponge/sponge-service-proxy/src/main/java/me/lucko/luckperms/sponge/service/proxy/SubjectProxy.java index 843e55bdd..c0497dabe 100644 --- a/sponge/sponge-service-api8/src/main/java/me/lucko/luckperms/sponge/service/proxy/api8/SubjectProxy.java +++ b/sponge/sponge-service-proxy/src/main/java/me/lucko/luckperms/sponge/service/proxy/SubjectProxy.java @@ -23,7 +23,7 @@ * SOFTWARE. */ -package me.lucko.luckperms.sponge.service.proxy.api8; +package me.lucko.luckperms.sponge.service.proxy; import me.lucko.luckperms.sponge.service.CompatibilityUtil; import me.lucko.luckperms.sponge.service.model.LPPermissionService; @@ -49,7 +49,6 @@ import java.util.Optional; import java.util.Set; import java.util.concurrent.CompletableFuture; -@SuppressWarnings("unchecked") public final class SubjectProxy implements Subject, LPProxiedSubject, LPProxiedServiceObject { private final LPPermissionService service; private final LPSubjectReference ref; @@ -169,6 +168,6 @@ public final class SubjectProxy implements Subject, LPProxiedSubject, LPProxiedS @Override public String toString() { - return "luckperms.api8.SubjectProxy(ref=" + this.ref + ")"; + return "luckperms.SubjectProxy(ref=" + this.ref + ")"; } } diff --git a/sponge/sponge-service/build.gradle b/sponge/sponge-service/build.gradle index 4557ad3d6..ddcedeb11 100644 --- a/sponge/sponge-service/build.gradle +++ b/sponge/sponge-service/build.gradle @@ -2,15 +2,17 @@ repositories { maven { url 'https://repo.spongepowered.org/repository/maven-public/' } } +sourceCompatibility = 17 +targetCompatibility = 21 + dependencies { implementation project(':common') - compileOnly('org.spongepowered:spongeapi:8.0.0') { + compileOnly('org.spongepowered:spongeapi:12.0.0') { exclude(module: 'configurate-core') exclude(module: 'configurate-hocon') exclude(module: 'configurate-gson') exclude(module: 'configurate-yaml') } - compileOnly 'com.google.guava:guava:21.0' } diff --git a/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/CompatibilityUtil.java b/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/CompatibilityUtil.java index ae330a791..11dd09c7e 100644 --- a/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/CompatibilityUtil.java +++ b/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/CompatibilityUtil.java @@ -77,26 +77,20 @@ public final class CompatibilityUtil { public static org.spongepowered.api.util.Tristate convertTristate(Tristate tristate) { Objects.requireNonNull(tristate, "tristate"); - switch (tristate) { - case TRUE: - return org.spongepowered.api.util.Tristate.TRUE; - case FALSE: - return org.spongepowered.api.util.Tristate.FALSE; - default: - return org.spongepowered.api.util.Tristate.UNDEFINED; - } + return switch (tristate) { + case TRUE -> org.spongepowered.api.util.Tristate.TRUE; + case FALSE -> org.spongepowered.api.util.Tristate.FALSE; + default -> org.spongepowered.api.util.Tristate.UNDEFINED; + }; } public static Tristate convertTristate(org.spongepowered.api.util.Tristate tristate) { Objects.requireNonNull(tristate, "tristate"); - switch (tristate) { - case TRUE: - return Tristate.TRUE; - case FALSE: - return Tristate.FALSE; - default: - return Tristate.UNDEFINED; - } + return switch (tristate) { + case TRUE -> Tristate.TRUE; + case FALSE -> Tristate.FALSE; + default -> Tristate.UNDEFINED; + }; } } diff --git a/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/context/AbstractForwardingContextSet.java b/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/context/AbstractForwardingContextSet.java index 69c160922..18451486e 100644 --- a/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/context/AbstractForwardingContextSet.java +++ b/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/context/AbstractForwardingContextSet.java @@ -44,8 +44,7 @@ abstract class AbstractForwardingContextSet extends AbstractSet impleme @Override public boolean contains(Object o) { - if (o instanceof Context) { - Context context = (Context) o; + if (o instanceof Context context) { return !context.getKey().isEmpty() && !context.getValue().isEmpty() && delegate().contains(context.getKey(), context.getValue()); } return false; diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/listeners/SpongeConnectionListener.java b/sponge/src/main/java/me/lucko/luckperms/sponge/listeners/SpongeConnectionListener.java index a6c371533..dde18f1cb 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/listeners/SpongeConnectionListener.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/listeners/SpongeConnectionListener.java @@ -31,6 +31,7 @@ import me.lucko.luckperms.common.locale.TranslationManager; import me.lucko.luckperms.common.model.User; import me.lucko.luckperms.common.plugin.util.AbstractConnectionListener; import me.lucko.luckperms.sponge.LPSpongePlugin; +import org.spongepowered.api.entity.living.player.server.ServerPlayer; import org.spongepowered.api.event.Listener; import org.spongepowered.api.event.Order; import org.spongepowered.api.event.filter.IsCancelled; @@ -48,18 +49,6 @@ import java.util.UUID; public class SpongeConnectionListener extends AbstractConnectionListener { - // Sponge API 11 - private static final Method DISCONNECT_EVENT_PROFILE_METHOD; - static { - Method disconnectEventProfileMethod; - try { - disconnectEventProfileMethod = ServerSideConnectionEvent.Disconnect.class.getMethod("profile"); - } catch (ReflectiveOperationException e) { - disconnectEventProfileMethod = null; - } - DISCONNECT_EVENT_PROFILE_METHOD = disconnectEventProfileMethod; - } - private final LPSpongePlugin plugin; private final Set deniedAsyncLogin = Collections.synchronizedSet(new HashSet<>()); @@ -184,28 +173,8 @@ public class SpongeConnectionListener extends AbstractConnectionListener { @Listener(order = Order.POST) public void onClientLeave(ServerSideConnectionEvent.Disconnect e) { - Identifiable player = null; - - if (DISCONNECT_EVENT_PROFILE_METHOD == null) { - // sponge API < 11 - player = e.player(); - - } else { - // sponge API 11+ - try { - //noinspection unchecked - final Optional profile = (Optional) DISCONNECT_EVENT_PROFILE_METHOD.invoke(e); - if (profile.isPresent()) { - player = profile.get(); - } - } catch (ReflectiveOperationException ex) { - throw new RuntimeException(ex); - } - } - - if (player != null) { - handleDisconnect(player.uniqueId()); - } + Optional profile = e.profile(); + profile.ifPresent(p -> handleDisconnect(p.uniqueId())); } } diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/messaging/PluginMessageMessenger.java b/sponge/src/main/java/me/lucko/luckperms/sponge/messaging/PluginMessageMessenger.java index 37c3a258f..42cfba16a 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/messaging/PluginMessageMessenger.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/messaging/PluginMessageMessenger.java @@ -31,8 +31,11 @@ import me.lucko.luckperms.sponge.LPSpongePlugin; import net.luckperms.api.messenger.IncomingMessageConsumer; import net.luckperms.api.messenger.Messenger; import org.spongepowered.api.ResourceKey; +import org.spongepowered.api.Server; import org.spongepowered.api.entity.living.player.server.ServerPlayer; import org.spongepowered.api.network.EngineConnectionSide; +import org.spongepowered.api.network.EngineConnectionState; +import org.spongepowered.api.network.ServerConnectionState; import org.spongepowered.api.network.ServerSideConnection; import org.spongepowered.api.network.channel.ChannelBuf; import org.spongepowered.api.network.channel.raw.RawDataChannel; @@ -46,7 +49,7 @@ import java.util.concurrent.TimeUnit; /** * An implementation of {@link Messenger} using the plugin messaging channels. */ -public class PluginMessageMessenger extends AbstractPluginMessageMessenger implements RawPlayDataHandler { +public class PluginMessageMessenger extends AbstractPluginMessageMessenger implements RawPlayDataHandler { private static final ResourceKey CHANNEL = ResourceKey.resolve(AbstractPluginMessageMessenger.CHANNEL); private final LPSpongePlugin plugin; @@ -60,7 +63,7 @@ public class PluginMessageMessenger extends AbstractPluginMessageMessenger imple public void init() { this.channel = this.plugin.getBootstrap().getGame().channelManager().ofType(CHANNEL, RawDataChannel.class); - this.channel.play().addHandler(EngineConnectionSide.SERVER, this); + this.channel.play().addHandler(ServerConnectionState.Game.class, this); } @Override @@ -102,7 +105,7 @@ public class PluginMessageMessenger extends AbstractPluginMessageMessenger imple } @Override - public void handlePayload(ChannelBuf channelBuf, ServerSideConnection connection) { + public void handlePayload(ChannelBuf channelBuf, ServerConnectionState.Game state) { byte[] buf = channelBuf.readBytes(channelBuf.available()); handleIncomingMessage(buf); } diff --git a/sponge/src/main/java/me/lucko/luckperms/sponge/service/ProxyFactory.java b/sponge/src/main/java/me/lucko/luckperms/sponge/service/ProxyFactory.java index 5fa3dbb23..58116ba05 100644 --- a/sponge/src/main/java/me/lucko/luckperms/sponge/service/ProxyFactory.java +++ b/sponge/src/main/java/me/lucko/luckperms/sponge/service/ProxyFactory.java @@ -31,11 +31,11 @@ import me.lucko.luckperms.sponge.service.model.LPProxiedSubject; import me.lucko.luckperms.sponge.service.model.LPSubject; import me.lucko.luckperms.sponge.service.model.LPSubjectCollection; import me.lucko.luckperms.sponge.service.model.LPSubjectData; -import me.lucko.luckperms.sponge.service.proxy.api8.PermissionDescriptionProxy; -import me.lucko.luckperms.sponge.service.proxy.api8.PermissionServiceProxy; -import me.lucko.luckperms.sponge.service.proxy.api8.SubjectCollectionProxy; -import me.lucko.luckperms.sponge.service.proxy.api8.SubjectDataProxy; -import me.lucko.luckperms.sponge.service.proxy.api8.SubjectProxy; +import me.lucko.luckperms.sponge.service.proxy.PermissionDescriptionProxy; +import me.lucko.luckperms.sponge.service.proxy.PermissionServiceProxy; +import me.lucko.luckperms.sponge.service.proxy.SubjectCollectionProxy; +import me.lucko.luckperms.sponge.service.proxy.SubjectDataProxy; +import me.lucko.luckperms.sponge.service.proxy.SubjectProxy; import net.luckperms.api.model.data.DataType; import org.spongepowered.api.service.permission.PermissionDescription; import org.spongepowered.api.service.permission.SubjectCollection;