Bedrock Capabilities

Author: 9R3A

pom.xml

@@ -34,6 +34,7 @@
             <id>central</id>
             <url>https://repo.maven.apache.org/maven2</url>
         </repository>
+
     </repositories>
 
     <dependencies>
@@ -72,13 +73,12 @@
             <version>0.4</version>
         </dependency>
 
-        <!-- Geyser-Floodgate API for Bedrock support -->
-        <dependency>
-            <groupId>org.geysermc.floodgate</groupId>
-            <artifactId>floodgate-api</artifactId>
-            <version>2.2.0-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
+        <!-- 
+            Note: For Bedrock support, install Floodgate on your server.
+            Download from: https://ci.opencollab.dev/job/GeyserMC/job/Floodgate/job/master/
+            and place in the server's plugins folder.
+            Bedrock support will be automatically enabled if Floodgate is present.
+        -->
     </dependencies>
 
     <build>

src/main/java/com/lightlogin/listener/PlayerListener.java

@@ -13,7 +13,7 @@
 import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.event.inventory.InventoryOpenEvent;
 import org.bukkit.event.player.*;
-import org.geysermc.floodgate.api.FloodgateApi;
+// Floodgate API is optional - checked at runtime using reflection
 
 import java.util.HashSet;
 import java.util.Set;
@@ -48,8 +48,31 @@ public void onPlayerJoin(PlayerJoinEvent event) {
 
     private boolean isBedrockPlayer(Player player) {
         try {
-            return Bukkit.getPluginManager().getPlugin("floodgate") != null && 
-                   FloodgateApi.getInstance().isFloodgatePlayer(player.getUniqueId());
+            // Check if Floodgate plugin is installed and loaded
+            if (Bukkit.getPluginManager().getPlugin("floodgate") == null) {
+                return false;
+            }
+            
+            // Use reflection to check if player is from Bedrock
+            try {
+                // Get Floodgate API class
+                Class<?> floodgateApiClass = Class.forName("org.geysermc.floodgate.api.FloodgateApi");
+                // Get getInstance() method
+                java.lang.reflect.Method getInstanceMethod = floodgateApiClass.getMethod("getInstance");
+                // Invoke getInstance()
+                Object floodgateApi = getInstanceMethod.invoke(null);
+                // Get isFloodgatePlayer method
+                java.lang.reflect.Method isFloodgatePlayerMethod = floodgateApiClass.getMethod("isFloodgatePlayer", java.util.UUID.class);
+                // Call isFloodgatePlayer with player's UUID
+                return (boolean) isFloodgatePlayerMethod.invoke(floodgateApi, player.getUniqueId());
+            } catch (ClassNotFoundException e) {
+                plugin.getLogger().info("Floodgate API not found. Bedrock support disabled.");
+                plugin.getLogger().info("To enable Bedrock support, install Floodgate on your server.");
+                return false;
+            } catch (Exception e) {
+                plugin.getLogger().warning("Error checking Bedrock player status: " + e.getMessage());
+                return false;
+            }
         } catch (Exception e) {
             plugin.getLogger().warning("Error checking if player is from Bedrock: " + e.getMessage());
             return false;
@@ -61,7 +84,7 @@ private void handleBedrockPlayer(Player player, UUID uuid, String ipAddress) {
         if (!databaseManager.isPlayerRegistered(uuid)) {
             // Generate a random secure password for the Bedrock player
             String password = generateRandomPassword();
-            if (databaseManager.registerPlayer(uuid, player.getName(), password, ipAddress)) {
+            if (databaseManager.registerPlayer(player, password)) {
                 player.sendMessage(plugin.getConfig().getString(
                     "messages.bedrock-auto-register", 
                     "§aWelcome Bedrock player! You've been automatically registered."));

src/main/resources/config.yml

@@ -1,138 +1,138 @@
-
-
-# 
-#  ▄█        ▄█     ▄██████▄     ▄█    █▄        ███       ▄█        ▄██████▄     ▄██████▄   ▄█  ███▄▄▄▄   
-# ███       ███    ███    ███   ███    ███   ▀█████████▄  ███       ███    ███   ███    ███ ███  ███▀▀▀██▄ 
-# ███       ███▌   ███    █▀    ███    ███      ▀███▀▀██  ███       ███    ███   ███    █▀  ███▌ ███   ███ 
-# ███       ███▌  ▄███         ▄███▄▄▄▄███▄▄     ███   ▀  ███       ███    ███  ▄███        ███▌ ███   ███ 
-# ███       ███▌ ▀▀███ ████▄  ▀▀███▀▀▀▀███▀      ███      ███       ███    ███ ▀▀███ ████▄  ███▌ ███   ███ 
-# ███       ███    ███    ███   ███    ███       ███      ███       ███    ███   ███    ███ ███  ███   ███ 
-# ███▌    ▄ ███    ███    ███   ███    ███       ███      ███▌    ▄ ███    ███   ███    ███ ███  ███   ███ 
-# █████▄▄██ █▀     ████████▀    ███    █▀       ▄████▀    █████▄▄██  ▀██████▀    ████████▀  █▀    ▀█   █▀                                                                                                  
-#                
-                    # Copyright 2025 itz_intellij
 # LightLogin Configuration
 
-# Placeholders
-
-# %prefix% - Plugin Prefix
-# %server% - Server Name
-# %version% - Plugin Version     
-# %date% - Current Date
-# %player% - Player Name
-# %op% - OP Name
-# %uuid% - Player UUID
-# %discord% - Player Discord ID
-# %ip% - Player IP
-# %port% - Player Port
-# %world% - Player World
-
 # Database settings
 database:
-  # H2 database file will be stored in plugins/LightLogin/data.mv.db
+  # Database type (H2, MySQL, etc.)
   type: H2
-  # MySQL configuration (uncomment and configure if using MySQL)
-  # type: MYSQL
-  # host: localhost
-  # database: minecraft
-  # username: user
-  # password: password
+  # Database file name (for H2) or connection URL
+  file: LightLogin
+  # Only needed for MySQL
+  mysql:
+    host: localhost
+    port: 3306
+    database: lightlogin
+    username: root
+    password: ''
+    use-ssl: false
 
-# Session settings
+# Session management
 session:
+  # Enable session management
+  enabled: true
+  # Session duration in minutes (0 = until server restart)
+  duration: 1440  # 24 hours
+  # Check IP address for session validation
+  check-ip: true
+
+# Auto-login settings
+auto-login:
+  # Enable auto-login for returning players
   enabled: true
-  duration: 2592000  # 30 days in seconds
-  check-ip: false    # If true, session is only valid from the same IP
+  # Require IP address to match for auto-login
+  require-same-ip: false
+
+# Bedrock Edition settings
+bedrock:
+  # Enable Bedrock (Geyser/Floodgate) support
+  enabled: true
+  # Auto-register Bedrock players
+  auto-register: true
+  # Auto-login Bedrock players
+  auto-login: true
+  # Kick Bedrock players if Floodgate is not installed
+  kick-if-no-floodgate: false
+
+# Password requirements
+password:
+  # Minimum password length
+  min-length: 6
+  # Require at least one number
+  require-number: true
+  # Require at least one uppercase letter
+  require-uppercase: true
+  # Require at least one special character
+  require-special-char: true
+
+# Messages
+messages:
+  # General messages
+  prefix: "&8[&bLightLogin&8] &7"
+  no-permission: "&cYou don't have permission to use this command!"
+  player-only: "&cThis command can only be used by players!"
+  
+  # Registration messages
+  register-prompt: "&aWelcome! Please register using /register <password> <confirmPassword>"
+  register-success: "&aRegistration successful! You are now logged in."
+  register-error: "&cAn error occurred during registration. Please try again."
+  register-password-mismatch: "&cPasswords do not match!"
+  register-already-registered: "&cYou are already registered!"
+  register-password-weak: "&cPassword is too weak! It must be at least %min_length% characters long and contain %requirements%"
+  
+  # Login messages
+  login-required: "&aWelcome back! Please login using /login <password>"
+  login-success: "&aSuccessfully logged in!"
+  login-error: "&cIncorrect password!"
+  login-already: "&cYou are already logged in!"
+  
+  # Logout messages
+  logout-success: "&aSuccessfully logged out!"
+  
+  # Session messages
+  auto-login: "&aAutomatically logged in!"
+  session-expired: "&cYour session has expired. Please log in again."
+  
+  # Bedrock messages
+  bedrock-auto-register: "&aWelcome Bedrock player! You've been automatically registered."
+  bedrock-auto-login: "&aWelcome back, Bedrock player! You've been automatically logged in."
+  bedrock-not-supported: "&cBedrock players are not supported on this server!"
+  
+  # Error messages
+  error-occurred: "&cAn error occurred. Please contact an administrator."
+  player-not-found: "&cPlayer not found!"
+  registration-error: "&cFailed to register your account. Please contact an administrator."
 
 # Discord integration
 discord:
-  enabled: false
-  # Bot token from Discord Developer Portal
+  # Enable Discord bot
+  enabled: true
+  # Discord bot token
   token: "YOUR_DISCORD_BOT_TOKEN"
-  # Your Discord server ID (right-click server name -> Copy Server ID)
-  guild-id: "YOUR_DISCORD_SERVER_ID"
-  # Channel where verification messages will be sent
-  verification-channel: "verification"
-  # Role to assign after successful verification
-  verified-role: "Verified"
-  # Whether to require verification to join the server
-  require-verification: true
-  # Command prefix for Discord bot commands (e.g., !verify)
+  # Discord server ID where the bot should operate
+  guild-id: "YOUR_DISCORD_GUILD_ID"
+  # Discord bot command prefix
   command-prefix: "!"
+  # Channel ID for logging (leave empty to disable)
+  log-channel: ""
 
-# Messages
-messages:
-  prefix: "&8[&aLightLogin&8] &7"
-  not-logged-in: "&cYou must be logged in to do that!"
-  already-logged-in: "&aYou are already logged in!"
-  login-required: "&cPlease login first using /login <password>"
-  register-required: "&cPlease register first using /register <password> <confirmPassword>"
-  login-success: "&aSuccessfully logged in!"
-  login-failed: "&cIncorrect password!"
-  register-success: "&aSuccessfully registered and logged in!"
-  register-failed: "&cFailed to register. Please try again later."
-  password-mismatch: "&cPasswords do not match!"
-  password-too-short: "&cPassword must be at least 6 characters long!"
-  # Discord related messages
-  discord-linked: "&aSuccessfully linked your Discord account!"
-  discord-link-failed: "&cFailed to link Discord account. Please try again."
-  discord-unlinked: "&aSuccessfully unlinked your Discord account!"
-  discord-not-linked: "&cYour account is not linked to Discord!"
-  discord-verification-sent: "&aVerification code sent to your DMs! Check your Discord messages."
-  discord-verification-failed: "&cFailed to send verification code. Please try again."
-  discord-invalid-username: "&cInvalid Discord username format. Please use: Username#1234"
-  discord-already-linked: "&cThis Discord account is already linked to another Minecraft account."
-  discord-verify-instructions: "&aTo verify your account, join our Discord server and use the command: &e/verify <code>&a\n&7Your verification code is: &e%code%"
-  discord-verify-success: "&aYour Discord account has been successfully verified!"
-  discord-verify-failed: "&cVerification failed. The code is invalid or has expired."
-  password-reset-requested: "&aA password reset code has been sent to your Discord DMs. Check your messages!"
-  password-reset-dm: "**\u26A1 Password Reset Request**\n\nYour password reset code is: `%code%`\n\nUse this command in-game to reset your password:\n`/pf %code% <newpassword>`\n\nThis code will expire in 10 minutes."
-  password-reset-dm-failed: "\u274C Could not send you a DM. Please enable DMs from server members and try again."
-  password-reset-success: "&aYour password has been successfully reset!"
-  password-reset-invalid-code: "&cInvalid or expired reset code. Please request a new one."
-  password-reset-not-linked: "&cYour Minecraft account is not linked to a Discord account."
-  password-reset-usage: "&cUsage: /pf <code> <newpassword>"
-  password-reset-channel-notice: "%user% Please enable DMs from server members to receive your password reset code."
+# Logging
+logging:
+  # Enable logging to file
+  enabled: true
+  # Log file name
+  file: "LightLogin.log"
+  # Log level (SEVERE, WARNING, INFO, CONFIG, FINE, FINER, FINEST)
+  level: "INFO"
 
 # Protection settings
 protection:
+  # Prevent movement before login
   prevent-movement: true
-  prevent-chat: true
-  prevent-commands: true
+  # Prevent interaction with blocks/entities
+  prevent-interaction: true
+  # Prevent damage before login
   prevent-damage: true
-  prevent-block-break: true
-  prevent-block-place: true
+  # Prevent dropping items before login
   prevent-item-drop: true
+  # Prevent picking up items before login
   prevent-item-pickup: true
-  prevent-inventory-interaction: true
-
-# Auto-login settings
-auto-login:
-  enabled: true
-  # Time in seconds before auto-kick if not logged in
-  login-timeout: 120
-  # Allow auto-login from the same IP
-  allow-ip-auto-login: true
-  # Require re-login after server restart
-  persist-across-restart: true
-
-# Security settings
-security:
-  # Force players to use strong passwords (requires at least one number and one special character)
-  strong-passwords: true
-  # Maximum login attempts before kicking the player
-  max-login-attempts: 5
-  # Time in minutes to block login attempts after reaching max attempts
-  login-attempts-timeout: 15
-  # Log failed login attempts to console
-  log-failed-attempts: true
-
-# Update checker
-update-checker:
-  enabled: true
-  # Check for updates on plugin enable
-  check-on-enable: true
-  # Notify OPs about updates
-  notify-ops: true
-  # Download updates automatically (requires proper permissions)
-  auto-download: false
+  # Prevent opening inventories before login
+  prevent-inventory-open: true
+  # Prevent using commands before login (except /login, /register, etc.)
+  prevent-commands: true
+  # List of commands that are always allowed (without the /)
+  allowed-commands:
+    - login
+    - register
+    - l
+    - reg
+    - help