Fix building and renames

Konicai · Konicai · commit b329db927ef9 · 2023-07-14T00:43:46.000-04:00
diff --git a/bungeecord/build.gradle.kts b/bungeecord/build.gradle.kts
@@ -4,6 +4,7 @@ plugins {
 }
 
 dependencies {
+    api(projects.common)
     compileOnly("net.md-5:bungeecord-api:1.19-R0.1-SNAPSHOT")
 }
 
diff --git a/bungeecord/src/main/java/dev/kejona/geyserblockplatform/bungeecord/GeyserBlockPlatformBungee.java b/bungeecord/src/main/java/dev/kejona/geyserblockplatform/bungeecord/GeyserBlockPlatformBungee.java
@@ -2,9 +2,9 @@
 
 import dev.kejona.geyserblockplatform.common.BlockResult;
 import dev.kejona.geyserblockplatform.common.Permissions;
-import dev.kejona.geyserblockplatform.common.platformchecker.GeyserBedrockPlatformChecker;
-import dev.kejona.geyserblockplatform.common.platformchecker.BedrockPlatformChecker;
-import dev.kejona.geyserblockplatform.common.platformchecker.FloodgateBedrockPlatformChecker;
+import dev.kejona.geyserblockplatform.common.bedrock.BaseApiHandler;
+import dev.kejona.geyserblockplatform.common.bedrock.BedrockHandler;
+import dev.kejona.geyserblockplatform.common.bedrock.FloodgateHandler;
 import dev.kejona.geyserblockplatform.common.config.Config;
 import dev.kejona.geyserblockplatform.common.config.ConfigLoader;
 import net.md_5.bungee.api.ProxyServer;
@@ -20,16 +20,16 @@
 import java.io.IOException;
 
 public final class GeyserBlockPlatformBungee extends Plugin implements Listener {
-    private BedrockPlatformChecker handler;
+    private BedrockHandler handler;
     private Config config;
 
     @Override
     public void onEnable() {
         PluginManager pluginManager = getProxy().getPluginManager();
         if (pluginManager.getPlugin("floodgate") != null) {
-            handler = new FloodgateBedrockPlatformChecker();
+            handler = new FloodgateHandler();
         } else if (pluginManager.getPlugin("Geyser-Bungeecord") != null) {
-            handler = new GeyserBedrockPlatformChecker();
+            handler = new BaseApiHandler();
         } else {
             getLogger().warning("There is no Geyser or Floodgate plugin detected! Disabling...");
             onDisable();
@@ -53,7 +53,7 @@ public void onPostLogin(PostLoginEvent event) {
         }
 
         BlockResult result = config.computeResult(player.getUniqueId(), handler);
-        if (!result.isAllowed()) {
+        if (!result.allowed()) {
             BlockResult.Denied deniedResult = (BlockResult.Denied) result;
             player.disconnect(TextComponent.fromLegacyText(deniedResult.message()));
         } else {
diff --git a/common/src/main/java/dev/kejona/geyserblockplatform/common/BlockResult.java b/common/src/main/java/dev/kejona/geyserblockplatform/common/BlockResult.java
@@ -14,13 +14,13 @@ public class BlockResult {
 
     private static final BlockResult ACCEPTED = new BlockResult(true, null);
 
-    private final boolean isAllowed;
+    private final boolean allowed;
 
     @NonNull
     private final List<String> warnings;
 
-    private BlockResult(boolean isAllowed, @Nullable List<String> warnings) {
-        this.isAllowed = isAllowed;
+    private BlockResult(boolean allowed, @Nullable List<String> warnings) {
+        this.allowed = allowed;
 
         if (warnings == null) {
             this.warnings = Collections.emptyList();
@@ -29,7 +29,7 @@ private BlockResult(boolean isAllowed, @Nullable List<String> warnings) {
         }
     }
 
-    public static BlockResult allowed() {
+    public static BlockResult allowedResult() {
         return ACCEPTED;
     }
 
diff --git a/common/src/main/java/dev/kejona/geyserblockplatform/common/bedrock/BaseApiHandler.java b/common/src/main/java/dev/kejona/geyserblockplatform/common/bedrock/BaseApiHandler.java
@@ -1,6 +1,5 @@
-package dev.kejona.geyserblockplatform.common.platformchecker;
+package dev.kejona.geyserblockplatform.common.bedrock;
 
-import dev.kejona.geyserblockplatform.common.Profile;
 import org.geysermc.api.Geyser;
 import org.geysermc.api.GeyserApiBase;
 import org.geysermc.api.connection.Connection;
@@ -11,7 +10,7 @@
 import java.util.Objects;
 import java.util.UUID;
 
-public class GeyserBedrockPlatformChecker implements BedrockPlatformChecker {
+public class BaseApiHandler implements BedrockHandler {
     private final GeyserApiBase api = Objects.requireNonNull(Geyser.api(), "geyser base-api");
 
     @Override
diff --git a/common/src/main/java/dev/kejona/geyserblockplatform/common/bedrock/BedrockHandler.java b/common/src/main/java/dev/kejona/geyserblockplatform/common/bedrock/BedrockHandler.java
@@ -0,0 +1,8 @@
+package dev.kejona.geyserblockplatform.common.bedrock;
+
+import java.util.UUID;
+
+public interface BedrockHandler {
+    boolean isBedrockPlayer(UUID uuid);
+    Profile profile(UUID uuid);
+}
diff --git a/common/src/main/java/dev/kejona/geyserblockplatform/common/bedrock/FloodgateHandler.java b/common/src/main/java/dev/kejona/geyserblockplatform/common/bedrock/FloodgateHandler.java
@@ -1,13 +1,12 @@
-package dev.kejona.geyserblockplatform.common.platformchecker;
+package dev.kejona.geyserblockplatform.common.bedrock;
 
-import dev.kejona.geyserblockplatform.common.Profile;
 import org.geysermc.floodgate.api.FloodgateApi;
 import org.geysermc.floodgate.api.player.FloodgatePlayer;
 
 import java.util.Objects;
 import java.util.UUID;
 
-public class FloodgateBedrockPlatformChecker implements BedrockPlatformChecker {
+public class FloodgateHandler implements BedrockHandler {
     private final FloodgateApi api = Objects.requireNonNull(FloodgateApi.getInstance(), "floodgate api");
 
     @Override
diff --git a/common/src/main/java/dev/kejona/geyserblockplatform/common/bedrock/Profile.java b/common/src/main/java/dev/kejona/geyserblockplatform/common/bedrock/Profile.java
@@ -1,6 +1,7 @@
-package dev.kejona.geyserblockplatform.common;
+package dev.kejona.geyserblockplatform.common.bedrock;
 
 import lombok.Data;
+import lombok.experimental.Accessors;
 import org.geysermc.floodgate.util.DeviceOs;
 import org.geysermc.floodgate.util.InputMode;
 import org.geysermc.floodgate.util.UiProfile;
@@ -9,6 +10,7 @@
  * The data here still uses the geyser-common classes because the current Floodgate release doesn't implement the geyser
  * base-api yet. Once it does, the classes from the base-api will be used.
  */
+@Accessors(fluent = true)
 @Data
 public class Profile {
     private final DeviceOs platform;
diff --git a/common/src/main/java/dev/kejona/geyserblockplatform/common/config/Config.java b/common/src/main/java/dev/kejona/geyserblockplatform/common/config/Config.java
@@ -2,8 +2,8 @@
 
 
 import dev.kejona.geyserblockplatform.common.BlockResult;
-import dev.kejona.geyserblockplatform.common.platformchecker.BedrockPlatformChecker;
-import dev.kejona.geyserblockplatform.common.Profile;
+import dev.kejona.geyserblockplatform.common.bedrock.BedrockHandler;
+import dev.kejona.geyserblockplatform.common.bedrock.Profile;
 import org.geysermc.floodgate.util.DeviceOs;
 import org.geysermc.floodgate.util.InputMode;
 import org.geysermc.floodgate.util.UiProfile;
@@ -29,9 +29,9 @@ public class Config {
     private String inputMessage = "Invalid input mode:§4 %s";
     private String profileMessage = "Invalid UI profile:§4 %s";
 
-    public BlockResult computeResult(UUID player, BedrockPlatformChecker handler) {
+    public BlockResult computeResult(UUID player, BedrockHandler handler) {
         if (!handler.isBedrockPlayer(player)) {
-            return BlockResult.allowed();
+            return BlockResult.allowedResult();
         }
         Profile data = handler.profile(player);
 
@@ -73,7 +73,7 @@ public BlockResult computeResult(UUID player, BedrockPlatformChecker handler) {
         if (!warnings.isEmpty()) {
             return BlockResult.warn(warnings);
         }
-        return BlockResult.allowed();
+        return BlockResult.allowedResult();
     }
 
     @ConfigSerializable
diff --git a/common/src/main/java/dev/kejona/geyserblockplatform/common/lombok.config b/common/src/main/java/dev/kejona/geyserblockplatform/common/lombok.config
diff --git a/common/src/main/java/dev/kejona/geyserblockplatform/common/platformchecker/BedrockPlatformChecker.java b/common/src/main/java/dev/kejona/geyserblockplatform/common/platformchecker/BedrockPlatformChecker.java
diff --git a/spigot/src/main/java/dev/kejona/geyserblockplatform/spigot/GeyserBlockPlatformSpigot.java b/spigot/src/main/java/dev/kejona/geyserblockplatform/spigot/GeyserBlockPlatformSpigot.java
@@ -2,9 +2,9 @@
 
 import dev.kejona.geyserblockplatform.common.BlockResult;
 import dev.kejona.geyserblockplatform.common.Permissions;
-import dev.kejona.geyserblockplatform.common.platformchecker.GeyserBedrockPlatformChecker;
-import dev.kejona.geyserblockplatform.common.platformchecker.BedrockPlatformChecker;
-import dev.kejona.geyserblockplatform.common.platformchecker.FloodgateBedrockPlatformChecker;
+import dev.kejona.geyserblockplatform.common.bedrock.BaseApiHandler;
+import dev.kejona.geyserblockplatform.common.bedrock.BedrockHandler;
+import dev.kejona.geyserblockplatform.common.bedrock.FloodgateHandler;
 import dev.kejona.geyserblockplatform.common.config.Config;
 import dev.kejona.geyserblockplatform.common.config.ConfigLoader;
 import org.bukkit.Bukkit;
@@ -19,16 +19,16 @@
 import java.io.IOException;
 
 public final class GeyserBlockPlatformSpigot extends JavaPlugin implements Listener {
-    private BedrockPlatformChecker handler;
+    private BedrockHandler handler;
     private Config config;
 
     @Override
     public void onEnable() {
         PluginManager pluginManager = Bukkit.getPluginManager();
         if (pluginManager.getPlugin("floodgate") != null) {
-            handler = new FloodgateBedrockPlatformChecker();
+            handler = new FloodgateHandler();
         } else if (pluginManager.getPlugin("Geyser-Spigot") != null) {
-            handler = new GeyserBedrockPlatformChecker();
+            handler = new BaseApiHandler();
         } else {
             getLogger().warning("There is no Geyser or Floodgate plugin detected! Disabling...");
             Bukkit.getPluginManager().disablePlugin(this);
@@ -56,7 +56,7 @@ public void onPlayerLogin(PlayerLoginEvent event) {
 
         BlockResult result = config.computeResult(player.getUniqueId(), handler);
 
-        if (!result.isAllowed()) {
+        if (!result.allowed()) {
             BlockResult.Denied deniedResult = (BlockResult.Denied) result;
             event.setResult(PlayerLoginEvent.Result.KICK_OTHER);
             event.setKickMessage(deniedResult.message());
diff --git a/velocity/build.gradle.kts b/velocity/build.gradle.kts
@@ -10,6 +10,7 @@ java {
 }
 
 dependencies {
+    api(projects.common)
     annotationProcessor("com.velocitypowered:velocity-api:3.1.1")
     compileOnly("com.velocitypowered:velocity-api:3.1.1")
 }
diff --git a/velocity/src/main/java/dev/kejona/geyserblockplatform/velocity/GeyserBlockPlatformVelocity.java b/velocity/src/main/java/dev/kejona/geyserblockplatform/velocity/GeyserBlockPlatformVelocity.java
@@ -4,9 +4,9 @@
 import dev.kejona.geyserblockplatform.common.Permissions;
 import dev.kejona.geyserblockplatform.common.config.Config;
 import dev.kejona.geyserblockplatform.common.config.ConfigLoader;
-import dev.kejona.geyserblockplatform.common.platformchecker.BedrockPlatformChecker;
-import dev.kejona.geyserblockplatform.common.platformchecker.FloodgateBedrockPlatformChecker;
-import dev.kejona.geyserblockplatform.common.platformchecker.GeyserBedrockPlatformChecker;
+import dev.kejona.geyserblockplatform.common.bedrock.BedrockHandler;
+import dev.kejona.geyserblockplatform.common.bedrock.FloodgateHandler;
+import dev.kejona.geyserblockplatform.common.bedrock.BaseApiHandler;
 import com.google.inject.Inject;
 import com.velocitypowered.api.event.PostOrder;
 import com.velocitypowered.api.event.ResultedEvent;
@@ -31,7 +31,7 @@ public class GeyserBlockPlatformVelocity {
     private final ProxyServer server;
     private final Path dataDirectory;
 
-    private BedrockPlatformChecker handler;
+    private BedrockHandler handler;
     private Config config;
 
     @Inject
@@ -44,9 +44,9 @@ public GeyserBlockPlatformVelocity(ProxyServer server, @DataDirectory Path folde
     public void onProxyInitialization(ProxyInitializeEvent event) throws IOException {
         PluginManager pluginManager = server.getPluginManager();
         if (pluginManager.isLoaded("floodgate")) {
-            handler = new FloodgateBedrockPlatformChecker();
+            handler = new FloodgateHandler();
         } else if (pluginManager.isLoaded("Geyser-Velocity")) {
-            handler = new GeyserBedrockPlatformChecker();
+            handler = new BaseApiHandler();
         } else {
             throw new IllegalStateException("There is no Geyser or Floodgate plugin detected!");
         }
@@ -66,7 +66,7 @@ public void onLoginEvent(LoginEvent event) {
         }
 
         BlockResult result = config.computeResult(player.getUniqueId(), handler);
-        if (!result.isAllowed()) {
+        if (!result.allowed()) {
             BlockResult.Denied deniedResult = (BlockResult.Denied) result;
             event.setResult(ResultedEvent.ComponentResult.denied(LEGACY_SERIALIZER.deserialize(deniedResult.message())));
         } else {

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ plugins {`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`dependencies {`
	`7`	`+ api(projects.common)`
`7`	`8`	`compileOnly("net.md-5:bungeecord-api:1.19-R0.1-SNAPSHOT")`
`8`	`9`	`}`
`9`	`10`
Original file line number	Diff line number	Diff line change
`@@ -14,13 +14,13 @@ public class BlockResult {`
`14`	`14`
`15`	`15`	`private static final BlockResult ACCEPTED = new BlockResult(true, null);`
`16`	`16`
`17`		`- private final boolean isAllowed;`
	`17`	`+ private final boolean allowed;`
`18`	`18`
`19`	`19`	`@NonNull`
`20`	`20`	`private final List<String> warnings;`
`21`	`21`
`22`		`- private BlockResult(boolean isAllowed, @Nullable List<String> warnings) {`
`23`		`- this.isAllowed = isAllowed;`
	`22`	`+ private BlockResult(boolean allowed, @Nullable List<String> warnings) {`
	`23`	`+ this.allowed = allowed;`
`24`	`24`
`25`	`25`	`if (warnings == null) {`
`26`	`26`	`this.warnings = Collections.emptyList();`
`@@ -29,7 +29,7 @@ private BlockResult(boolean isAllowed, @Nullable List<String> warnings) {`
`29`	`29`	`}`
`30`	`30`	`}`
`31`	`31`
`32`		`- public static BlockResult allowed() {`
	`32`	`+ public static BlockResult allowedResult() {`
`33`	`33`	`return ACCEPTED;`
`34`	`34`	`}`
`35`	`35`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ java {`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`dependencies {`
	`13`	`+ api(projects.common)`
`13`	`14`	`annotationProcessor("com.velocitypowered:velocity-api:3.1.1")`
`14`	`15`	`compileOnly("com.velocitypowered:velocity-api:3.1.1")`
`15`	`16`	`}`