From cadd7545c5bce8f07791a2c6363e6cc3e613bc43 Mon Sep 17 00:00:00 2001 From: Luck Date: Sun, 16 Jul 2017 21:16:08 +0100 Subject: [PATCH] Use saner class naming --- ...y.java => PermissionDescriptionProxy.java} | 4 ++-- ...Proxy.java => PermissionServiceProxy.java} | 4 ++-- ...der.java => SimpleDescriptionBuilder.java} | 2 +- ...Proxy.java => SubjectCollectionProxy.java} | 8 +++---- ...tData6Proxy.java => SubjectDataProxy.java} | 9 +++---- .../{Subject6Proxy.java => SubjectProxy.java} | 10 ++++---- ...y.java => PermissionDescriptionProxy.java} | 4 ++-- ...Proxy.java => PermissionServiceProxy.java} | 4 ++-- ...der.java => SimpleDescriptionBuilder.java} | 2 +- ...Proxy.java => SubjectCollectionProxy.java} | 2 +- ...tData7Proxy.java => SubjectDataProxy.java} | 5 +--- .../{Subject7Proxy.java => SubjectProxy.java} | 6 ++--- .../model/LPPermissionDescription.java | 3 +++ .../service/model/LPPermissionService.java | 2 +- .../sponge/service/model/LPSubject.java | 2 +- .../service/model/LPSubjectCollection.java | 2 +- .../sponge/service/model/LPSubjectData.java | 2 +- .../sponge/service/ProxyFactory.java | 24 +++++++++---------- 18 files changed, 46 insertions(+), 49 deletions(-) rename sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/{PermissionDescription6Proxy.java => PermissionDescriptionProxy.java} (94%) rename sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/{PermissionService6Proxy.java => PermissionServiceProxy.java} (96%) rename sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/{SimpleDescription6Builder.java => SimpleDescriptionBuilder.java} (97%) rename sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/{SubjectCollection6Proxy.java => SubjectCollectionProxy.java} (92%) rename sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/{SubjectData6Proxy.java => SubjectDataProxy.java} (96%) rename sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/{Subject6Proxy.java => SubjectProxy.java} (95%) rename sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/{PermissionDescription7Proxy.java => PermissionDescriptionProxy.java} (94%) rename sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/{PermissionService7Proxy.java => PermissionServiceProxy.java} (97%) rename sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/{SimpleDescription7Builder.java => SimpleDescriptionBuilder.java} (97%) rename sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/{SubjectCollection7Proxy.java => SubjectCollectionProxy.java} (98%) rename sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/{SubjectData7Proxy.java => SubjectDataProxy.java} (98%) rename sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/{Subject7Proxy.java => SubjectProxy.java} (97%) diff --git a/sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/PermissionDescription6Proxy.java b/sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/PermissionDescriptionProxy.java similarity index 94% rename from sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/PermissionDescription6Proxy.java rename to sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/PermissionDescriptionProxy.java index b6b77fb5c..d2b387647 100644 --- a/sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/PermissionDescription6Proxy.java +++ b/sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/PermissionDescriptionProxy.java @@ -40,7 +40,7 @@ import org.spongepowered.api.text.Text; import java.util.Map; @RequiredArgsConstructor -public class PermissionDescription6Proxy implements PermissionDescription { +public class PermissionDescriptionProxy implements PermissionDescription { private final LPPermissionService service; private final LPPermissionDescription handle; @@ -63,7 +63,7 @@ public class PermissionDescription6Proxy implements PermissionDescription { public Map getAssignedSubjects(String s) { return handle.getAssignedSubjects(s).entrySet().stream() .collect(ImmutableCollectors.toImmutableMap( - e -> new Subject6Proxy(service, e.getKey().toReference()), + e -> new SubjectProxy(service, e.getKey().toReference()), Map.Entry::getValue )); } diff --git a/sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/PermissionService6Proxy.java b/sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/PermissionServiceProxy.java similarity index 96% rename from sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/PermissionService6Proxy.java rename to sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/PermissionServiceProxy.java index f764d7e1f..14b63b65f 100644 --- a/sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/PermissionService6Proxy.java +++ b/sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/PermissionServiceProxy.java @@ -44,7 +44,7 @@ import java.util.Map; import java.util.Optional; @RequiredArgsConstructor -public class PermissionService6Proxy implements PermissionService { +public class PermissionServiceProxy implements PermissionService { private final LPPermissionService handle; @Override @@ -83,7 +83,7 @@ public class PermissionService6Proxy implements PermissionService { throw new IllegalArgumentException("Couldn't find a plugin container for " + o.getClass().getSimpleName()); } - return Optional.of(new SimpleDescription6Builder(handle, container.get())); + return Optional.of(new SimpleDescriptionBuilder(handle, container.get())); } @Override diff --git a/sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/SimpleDescription6Builder.java b/sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/SimpleDescriptionBuilder.java similarity index 97% rename from sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/SimpleDescription6Builder.java rename to sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/SimpleDescriptionBuilder.java index 7f31e49ce..a29f16f6f 100644 --- a/sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/SimpleDescription6Builder.java +++ b/sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/SimpleDescriptionBuilder.java @@ -48,7 +48,7 @@ import java.util.Map; @ToString(of = {"container", "roles", "id", "description"}) @EqualsAndHashCode(of = {"container", "roles", "id", "description"}) @RequiredArgsConstructor -public final class SimpleDescription6Builder implements PermissionDescription.Builder { +public final class SimpleDescriptionBuilder implements PermissionDescription.Builder { private final LPPermissionService service; private final PluginContainer container; private final Map roles = new HashMap<>(); diff --git a/sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/SubjectCollection6Proxy.java b/sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/SubjectCollectionProxy.java similarity index 92% rename from sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/SubjectCollection6Proxy.java rename to sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/SubjectCollectionProxy.java index de0a976aa..a36288885 100644 --- a/sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/SubjectCollection6Proxy.java +++ b/sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/SubjectCollectionProxy.java @@ -43,7 +43,7 @@ import java.util.Set; @SuppressWarnings("unchecked") @RequiredArgsConstructor -public class SubjectCollection6Proxy implements SubjectCollection { +public class SubjectCollectionProxy implements SubjectCollection { private final LPPermissionService service; private final LPSubjectCollection handle; @@ -71,7 +71,7 @@ public class SubjectCollection6Proxy implements SubjectCollection { // this behaviour should be replaced when CompletableFutures are added to Sponge return (List) handle.getAllIdentifiers() .thenApply(ids -> ids.stream() - .map(s -> new Subject6Proxy(service, service.newSubjectReference(getIdentifier(), s))) + .map(s -> new SubjectProxy(service, service.newSubjectReference(getIdentifier(), s))) .collect(ImmutableCollectors.toImmutableList()) ).join(); } @@ -82,7 +82,7 @@ public class SubjectCollection6Proxy implements SubjectCollection { return (Map) handle.getAllWithPermission(s).thenApply(map -> { return map.entrySet().stream() .collect(ImmutableCollectors.toImmutableMap( - e -> new Subject6Proxy(service, e.getKey()), + e -> new SubjectProxy(service, e.getKey()), Map.Entry::getValue )); }).join(); @@ -93,7 +93,7 @@ public class SubjectCollection6Proxy implements SubjectCollection { return (Map) handle.getAllWithPermission(CompatibilityUtil.convertContexts(set), s) .thenApply(map -> map.entrySet().stream() .collect(ImmutableCollectors.toImmutableMap( - e -> new Subject6Proxy(service, e.getKey()), + e -> new SubjectProxy(service, e.getKey()), Map.Entry::getValue )) ).join(); diff --git a/sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/SubjectData6Proxy.java b/sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/SubjectDataProxy.java similarity index 96% rename from sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/SubjectData6Proxy.java rename to sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/SubjectDataProxy.java index 4ce9ee18a..1c7dd89f5 100644 --- a/sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/SubjectData6Proxy.java +++ b/sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/SubjectDataProxy.java @@ -44,12 +44,9 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.CompletableFuture; -/** - * Proxies a LuckPerms Subject to implement {@link SubjectData}. - */ @SuppressWarnings("unchecked") @RequiredArgsConstructor -public class SubjectData6Proxy implements SubjectData { +public class SubjectDataProxy implements SubjectData { private final LPPermissionService service; private final SubjectReference ref; private final boolean enduring; @@ -105,7 +102,7 @@ public class SubjectData6Proxy implements SubjectData { .collect(ImmutableCollectors.toImmutableMap( e -> CompatibilityUtil.convertContexts(e.getKey()), e -> e.getValue().stream() - .map(s -> new Subject6Proxy(service, s)) + .map(s -> new SubjectProxy(service, s)) .collect(ImmutableCollectors.toImmutableList()) ) ); @@ -116,7 +113,7 @@ public class SubjectData6Proxy implements SubjectData { public List getParents(Set contexts) { return (List) getHandle().thenApply(handle -> { return handle.getParents(CompatibilityUtil.convertContexts(contexts)).stream() - .map(s -> new Subject6Proxy(service, s)) + .map(s -> new SubjectProxy(service, s)) .collect(ImmutableCollectors.toImmutableList()); }).join(); } diff --git a/sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/Subject6Proxy.java b/sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/SubjectProxy.java similarity index 95% rename from sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/Subject6Proxy.java rename to sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/SubjectProxy.java index 04f22846a..c411c0180 100644 --- a/sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/Subject6Proxy.java +++ b/sponge/sponge-service-api6/src/main/java/me/lucko/luckperms/sponge/service/proxy/api6/SubjectProxy.java @@ -48,7 +48,7 @@ import java.util.concurrent.CompletableFuture; @SuppressWarnings("unchecked") @RequiredArgsConstructor -public class Subject6Proxy implements Subject { +public class SubjectProxy implements Subject { private final LPPermissionService service; private final SubjectReference ref; @@ -68,12 +68,12 @@ public class Subject6Proxy implements Subject { @Override public SubjectData getSubjectData() { - return new SubjectData6Proxy(service, ref, true); + return new SubjectDataProxy(service, ref, true); } @Override public SubjectData getTransientSubjectData() { - return new SubjectData6Proxy(service, ref, false); + return new SubjectDataProxy(service, ref, false); } @Override @@ -127,7 +127,7 @@ public class Subject6Proxy implements Subject { public List getParents() { return (List) getHandle().thenApply(handle -> { return handle.getParents(ImmutableContextSet.empty()).stream() - .map(s -> new Subject6Proxy(service, s)) + .map(s -> new SubjectProxy(service, s)) .collect(ImmutableCollectors.toImmutableList()); }).join(); } @@ -136,7 +136,7 @@ public class Subject6Proxy implements Subject { public List getParents(Set contexts) { return (List) getHandle().thenApply(handle -> { return handle.getParents(CompatibilityUtil.convertContexts(contexts)).stream() - .map(s -> new Subject6Proxy(service, s)) + .map(s -> new SubjectProxy(service, s)) .collect(ImmutableCollectors.toImmutableList()); }).join(); } diff --git a/sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/PermissionDescription7Proxy.java b/sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/PermissionDescriptionProxy.java similarity index 94% rename from sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/PermissionDescription7Proxy.java rename to sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/PermissionDescriptionProxy.java index 75ed2fa9b..14822ad81 100644 --- a/sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/PermissionDescription7Proxy.java +++ b/sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/PermissionDescriptionProxy.java @@ -42,7 +42,7 @@ import java.util.Optional; import java.util.concurrent.CompletableFuture; @RequiredArgsConstructor -public class PermissionDescription7Proxy implements PermissionDescription { +public class PermissionDescriptionProxy implements PermissionDescription { private final LPPermissionService service; private final LPPermissionDescription handle; @@ -65,7 +65,7 @@ public class PermissionDescription7Proxy implements PermissionDescription { public Map getAssignedSubjects(String s) { return handle.getAssignedSubjects(s).entrySet().stream() .collect(ImmutableCollectors.toImmutableMap( - e -> new Subject7Proxy(service, e.getKey().toReference()), + e -> new SubjectProxy(service, e.getKey().toReference()), Map.Entry::getValue )); } diff --git a/sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/PermissionService7Proxy.java b/sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/PermissionServiceProxy.java similarity index 97% rename from sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/PermissionService7Proxy.java rename to sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/PermissionServiceProxy.java index 56c05d187..e669a0e6e 100644 --- a/sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/PermissionService7Proxy.java +++ b/sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/PermissionServiceProxy.java @@ -51,7 +51,7 @@ import java.util.concurrent.CompletableFuture; import java.util.function.Predicate; @RequiredArgsConstructor -public class PermissionService7Proxy implements PermissionService { +public class PermissionServiceProxy implements PermissionService { private final LPPermissionService handle; @Override @@ -115,7 +115,7 @@ public class PermissionService7Proxy implements PermissionService { throw new IllegalArgumentException("Couldn't find a plugin container for " + o.getClass().getSimpleName()); } - return new SimpleDescription7Builder(handle, container.get()); + return new SimpleDescriptionBuilder(handle, container.get()); } @Override diff --git a/sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/SimpleDescription7Builder.java b/sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/SimpleDescriptionBuilder.java similarity index 97% rename from sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/SimpleDescription7Builder.java rename to sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/SimpleDescriptionBuilder.java index 15c953730..ad4ca39e8 100644 --- a/sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/SimpleDescription7Builder.java +++ b/sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/SimpleDescriptionBuilder.java @@ -48,7 +48,7 @@ import java.util.Map; @ToString(of = {"container", "roles", "id", "description"}) @EqualsAndHashCode(of = {"container", "roles", "id", "description"}) @RequiredArgsConstructor -public final class SimpleDescription7Builder implements PermissionDescription.Builder { +public final class SimpleDescriptionBuilder implements PermissionDescription.Builder { private final LPPermissionService service; private final PluginContainer container; private final Map roles = new HashMap<>(); diff --git a/sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/SubjectCollection7Proxy.java b/sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/SubjectCollectionProxy.java similarity index 98% rename from sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/SubjectCollection7Proxy.java rename to sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/SubjectCollectionProxy.java index 5e3114aa5..8aa3d67f2 100644 --- a/sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/SubjectCollection7Proxy.java +++ b/sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/SubjectCollectionProxy.java @@ -46,7 +46,7 @@ import java.util.function.Predicate; @SuppressWarnings("unchecked") @RequiredArgsConstructor -public class SubjectCollection7Proxy implements SubjectCollection { +public class SubjectCollectionProxy implements SubjectCollection { private final LPSubjectCollection handle; @Override diff --git a/sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/SubjectData7Proxy.java b/sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/SubjectDataProxy.java similarity index 98% rename from sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/SubjectData7Proxy.java rename to sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/SubjectDataProxy.java index d97979861..39c06e203 100644 --- a/sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/SubjectData7Proxy.java +++ b/sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/SubjectDataProxy.java @@ -45,12 +45,9 @@ import java.util.concurrent.CompletableFuture; import javax.annotation.Nullable; -/** - * Proxies a LuckPerms Subject to implement {@link SubjectData}. - */ @SuppressWarnings("unchecked") @RequiredArgsConstructor -public class SubjectData7Proxy implements SubjectData { +public class SubjectDataProxy implements SubjectData { private final LPPermissionService service; private final SubjectReference ref; private final boolean enduring; diff --git a/sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/Subject7Proxy.java b/sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/SubjectProxy.java similarity index 97% rename from sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/Subject7Proxy.java rename to sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/SubjectProxy.java index 1436100c9..3e4eb76a9 100644 --- a/sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/Subject7Proxy.java +++ b/sponge/sponge-service-api7/src/main/java/me/lucko/luckperms/sponge/service/proxy/api7/SubjectProxy.java @@ -47,7 +47,7 @@ import java.util.concurrent.CompletableFuture; @SuppressWarnings("unchecked") @RequiredArgsConstructor -public class Subject7Proxy implements Subject { +public class SubjectProxy implements Subject { private final LPPermissionService service; private final SubjectReference ref; @@ -77,12 +77,12 @@ public class Subject7Proxy implements Subject { @Override public SubjectData getSubjectData() { - return new SubjectData7Proxy(service, ref, true); + return new SubjectDataProxy(service, ref, true); } @Override public SubjectData getTransientSubjectData() { - return new SubjectData7Proxy(service, ref, false); + return new SubjectDataProxy(service, ref, false); } @Override diff --git a/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/model/LPPermissionDescription.java b/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/model/LPPermissionDescription.java index 6178e01eb..6603e6caa 100644 --- a/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/model/LPPermissionDescription.java +++ b/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/model/LPPermissionDescription.java @@ -33,6 +33,9 @@ import java.util.Map; import java.util.Optional; import java.util.concurrent.CompletableFuture; +/** + * LuckPerms model for the Sponge {@link PermissionDescription} + */ public interface LPPermissionDescription { PermissionDescription sponge(); diff --git a/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/model/LPPermissionService.java b/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/model/LPPermissionService.java index 2c8e42fa3..e8df144b5 100644 --- a/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/model/LPPermissionService.java +++ b/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/model/LPPermissionService.java @@ -44,7 +44,7 @@ import java.util.Optional; import java.util.function.Predicate; /** - * LuckPerms model for the Sponge PermissionService + * LuckPerms model for the Sponge {@link PermissionService} */ public interface LPPermissionService { diff --git a/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/model/LPSubject.java b/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/model/LPSubject.java index 3c48188a6..1b3832057 100644 --- a/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/model/LPSubject.java +++ b/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/model/LPSubject.java @@ -36,7 +36,7 @@ import org.spongepowered.api.service.permission.Subject; import java.util.Optional; /** - * LuckPerms model for the Sponge Subject + * LuckPerms model for the Sponge {@link Subject} */ public interface LPSubject { diff --git a/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/model/LPSubjectCollection.java b/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/model/LPSubjectCollection.java index ccb604393..3a53c2079 100644 --- a/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/model/LPSubjectCollection.java +++ b/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/model/LPSubjectCollection.java @@ -39,7 +39,7 @@ import java.util.concurrent.CompletableFuture; import java.util.function.Predicate; /** - * LuckPerms model for the Sponge SubjectCollection + * LuckPerms model for the Sponge {@link SubjectCollection} */ public interface LPSubjectCollection { diff --git a/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/model/LPSubjectData.java b/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/model/LPSubjectData.java index d37a0ca55..39f5b706b 100644 --- a/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/model/LPSubjectData.java +++ b/sponge/sponge-service/src/main/java/me/lucko/luckperms/sponge/service/model/LPSubjectData.java @@ -34,7 +34,7 @@ import me.lucko.luckperms.api.context.ImmutableContextSet; import java.util.concurrent.CompletableFuture; /** - * LuckPerms model for the Sponge SubjectData + * LuckPerms model for the Sponge {@link org.spongepowered.api.service.permission.SubjectData} */ public interface LPSubjectData { 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 4fae6527b..8fa08d78d 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,14 +31,6 @@ import me.lucko.luckperms.sponge.service.model.LPPermissionDescription; import me.lucko.luckperms.sponge.service.model.LPPermissionService; import me.lucko.luckperms.sponge.service.model.LPSubject; import me.lucko.luckperms.sponge.service.model.LPSubjectCollection; -import me.lucko.luckperms.sponge.service.proxy.api6.PermissionDescription6Proxy; -import me.lucko.luckperms.sponge.service.proxy.api6.PermissionService6Proxy; -import me.lucko.luckperms.sponge.service.proxy.api6.Subject6Proxy; -import me.lucko.luckperms.sponge.service.proxy.api6.SubjectCollection6Proxy; -import me.lucko.luckperms.sponge.service.proxy.api7.PermissionDescription7Proxy; -import me.lucko.luckperms.sponge.service.proxy.api7.PermissionService7Proxy; -import me.lucko.luckperms.sponge.service.proxy.api7.Subject7Proxy; -import me.lucko.luckperms.sponge.service.proxy.api7.SubjectCollection7Proxy; import org.spongepowered.api.service.permission.PermissionDescription; import org.spongepowered.api.service.permission.PermissionService; @@ -61,19 +53,27 @@ public class ProxyFactory { } public static PermissionService toSponge(LPPermissionService luckPerms) { - return IS_API_7 ? new PermissionService7Proxy(luckPerms) : new PermissionService6Proxy(luckPerms); + return IS_API_7 ? + new me.lucko.luckperms.sponge.service.proxy.api7.PermissionServiceProxy(luckPerms) : + new me.lucko.luckperms.sponge.service.proxy.api6.PermissionServiceProxy(luckPerms); } public static SubjectCollection toSponge(LPSubjectCollection luckPerms) { - return IS_API_7 ? new SubjectCollection7Proxy(luckPerms) : new SubjectCollection6Proxy(luckPerms.getService(), luckPerms); + return IS_API_7 ? + new me.lucko.luckperms.sponge.service.proxy.api7.SubjectCollectionProxy(luckPerms) : + new me.lucko.luckperms.sponge.service.proxy.api6.SubjectCollectionProxy(luckPerms.getService(), luckPerms); } public static Subject toSponge(LPSubject luckPerms) { - return IS_API_7 ? new Subject7Proxy(luckPerms.getService(), luckPerms.toReference()) : new Subject6Proxy(luckPerms.getService(), luckPerms.toReference()); + return IS_API_7 ? + new me.lucko.luckperms.sponge.service.proxy.api7.SubjectProxy(luckPerms.getService(), luckPerms.toReference()) : + new me.lucko.luckperms.sponge.service.proxy.api6.SubjectProxy(luckPerms.getService(), luckPerms.toReference()); } public static PermissionDescription toSponge(LPPermissionDescription luckPerms) { - return IS_API_7 ? new PermissionDescription7Proxy(luckPerms.getService(), luckPerms) : new PermissionDescription6Proxy(luckPerms.getService(), luckPerms); + return IS_API_7 ? + new me.lucko.luckperms.sponge.service.proxy.api7.PermissionDescriptionProxy(luckPerms.getService(), luckPerms) : + new me.lucko.luckperms.sponge.service.proxy.api6.PermissionDescriptionProxy(luckPerms.getService(), luckPerms); } }