Merge remote-tracking branch 'origin/master'

README.md

@@ -5,6 +5,7 @@ MCBBS Link: [Click Here](https://www.mcbbs.net/forum.php?mod=viewthread&tid=1471
 <p align="center">
   <img src="https://img.shields.io/github/languages/code-size/HaHaWTH/AuthMeReReloaded.svg" alt="Code size"/>
   <img src="https://img.shields.io/github/repo-size/HaHaWTH/AuthMeReReloaded.svg" alt="GitHub repo size"/>
+  <img src="https://www.codefactor.io/repository/github/hahawth/authmerereloaded/badge" alt="CodeFactor" />
 </p>
 
 **Detailed Changes:**
@@ -24,10 +25,13 @@ MCBBS Link: [Click Here](https://www.mcbbs.net/forum.php?mod=viewthread&tid=1471
  13. Offhand Menu compatibility(Thats amazing)
  14. Automatically fix portal stuck issue
  15. Automatically login for Bedrock players(configurable)
- 16. More......
+ 16. Fix shulker box crash bug on legacy versions(MC 1.13-)
+ 17. More......
 
 **Download links:**
 [Releases](https://github.com/HaHaWTH/AuthMeReReloaded/releases/latest)
 [Actions(Dev builds, use at your own risk!)](https://github.com/HaHaWTH/AuthMeReReloaded/actions/workflows/maven.yml)
 
+TODO: Implement HAProxy ip forward(Useful for Frp)
+
 **Pull Requests and suggestions are welcome!**

pom.xml

@@ -444,6 +444,14 @@
                             <pattern>com.google.protobuf</pattern>
                             <shadedPattern>fr.xephi.authme.libs.com.google.protobuf</shadedPattern>
                         </relocation>
+                        <relocation>
+                            <pattern>io.netty</pattern>
+                            <shadedPattern>fr.xephi.authme.libs.io.netty</shadedPattern>
+                        </relocation>
+                        <relocation>
+                            <pattern>org.apache.commons.validator</pattern>
+                            <shadedPattern>fr.xephi.authme.libs.org.apache.commons.validator</shadedPattern>
+                        </relocation>
                     </relocations>
 
                     <filters>
@@ -511,6 +519,15 @@
     </build>
 
     <repositories>
+        <repository>
+            <id>opencollab-snapshot-main</id>
+            <url>https://repo.opencollab.dev/main/</url>
+        </repository>
+        <repository>
+            <id>opencollab-maven-snapshots</id>
+            <url>https://repo.opencollab.dev/maven-snapshots/</url>
+        </repository>
+
         <!-- Apache snapshots repo -->
         <repository>
             <id>apache-snapshots</id>
@@ -629,10 +646,6 @@
                 <enabled>false</enabled>
             </snapshots>
         </repository>
-        <repository>
-            <id>opencollab-snapshot-main</id>
-            <url>https://repo.opencollab.dev/main/</url>
-        </repository>
     </repositories>
 
     <dependencies>
@@ -869,13 +882,19 @@
             </exclusions>
         </dependency>
 
-        <!--        &lt;!&ndash; XSeries &ndash;&gt;-->
+        <!-- dependencies used by HAProxy feature -->
         <!--        <dependency>-->
-        <!--            <groupId>com.github.cryptomorin</groupId>-->
-        <!--            <artifactId>XSeries</artifactId>-->
-        <!--            <version>9.8.0</version>-->
+        <!--            <groupId>io.netty</groupId>-->
+        <!--            <artifactId>netty-codec-haproxy</artifactId>-->
+        <!--            <version>4.1.104.Final</version>-->
         <!--            <scope>compile</scope>-->
         <!--        </dependency>-->
+        <!--        <dependency>-->
+        <!--            <groupId>commons-validator</groupId>-->
+        <!--            <artifactId>commons-validator</artifactId>-->
+        <!--            <version>1.8.0</version>-->
+        <!--            <scope>provided</scope>-->
+        <!--        </dependency>-->
 
         <!-- zPermissions plugin -->
         <dependency>

src/main/java/fr/xephi/authme/AuthMe.java

@@ -11,6 +11,7 @@ import fr.xephi.authme.initialization.OnShutdownPlayerSaver;
 import fr.xephi.authme.initialization.OnStartupTasks;
 import fr.xephi.authme.initialization.SettingsProvider;
 import fr.xephi.authme.initialization.TaskCloser;
+import fr.xephi.authme.listener.AdvancedShulkerFixListener;
 import fr.xephi.authme.listener.BedrockAutoLoginListener;
 import fr.xephi.authme.listener.BlockListener;
 import fr.xephi.authme.listener.DoubleLoginFixListener;
@@ -74,7 +75,7 @@ public class AuthMe extends JavaPlugin {
     // Version and build number values
     private static String pluginVersion = "5.6.0-Fork";
     private static final String pluginBuild = "b";
-    private static String pluginBuildNumber = "39";
+    private static String pluginBuildNumber = "40";
     // Private instances
     private EmailService emailService;
     private CommandHandler commandHandler;
@@ -189,15 +190,6 @@ public class AuthMe extends JavaPlugin {
         // Set up Metrics
         OnStartupTasks.sendMetrics(this, settings);
         if (settings.getProperty(SecuritySettings.SHOW_STARTUP_BANNER)) {
-            String loadColorConfig = settings.getProperty(SecuritySettings.STARTUP_BANNER_COLOR);
-            if (loadColorConfig.startsWith("§") && !loadColorConfig.endsWith("§") && (loadColorConfig.length() % 2 == 0)) {
-                logger.info("\n" + loadColorConfig + "    ___         __  __    __  ___   \n" +
-                    loadColorConfig + "   /   | __  __/ /_/ /_  /  |/  /__ \n" +
-                    loadColorConfig + "  / /| |/ / / / __/ __ \\/ /|_/ / _ \\\n" +
-                    loadColorConfig + " / ___ / /_/ / /_/ / / / /  / /  __/\n" +
-                    loadColorConfig + "/_/  |_\\__,_/\\__/_/ /_/_/  /_/\\___/ \n" +
-                    loadColorConfig + "                                    ");
-            } else {
             logger.info("\n" + "    ___         __  __    __  ___   \n" +
                 "   /   | __  __/ /_/ /_  /  |/  /__ \n" +
                 "  / /| |/ / / / __/ __ \\/ /|_/ / _ \\\n" +
@@ -205,7 +197,6 @@ public class AuthMe extends JavaPlugin {
                 "/_/  |_\\__,_/\\__/_/ /_/_/  /_/\\___/ \n" +
                 "                                    ");
         }
-        }
         // Successful message
         //detect server brand with classloader
         checkServerType();
@@ -359,6 +350,11 @@ public class AuthMe extends JavaPlugin {
         if (settings.getProperty(SecuritySettings.ANTI_GHOST_PLAYERS)) {
             pluginManager.registerEvents(injector.getSingleton(DoubleLoginFixListener.class), this);
         }
+        if (settings.getProperty(SecuritySettings.ADVANCED_SHULKER_FIX) && !isClassLoaded("org.bukkit.event.player.PlayerCommandSendEvent")) {
+            pluginManager.registerEvents(injector.getSingleton(AdvancedShulkerFixListener.class), this);
+        } else if (settings.getProperty(SecuritySettings.ADVANCED_SHULKER_FIX) && isClassLoaded("org.bukkit.event.player.PlayerCommandSendEvent")) {
+            logger.warning("You are running an 1.13+ minecraft server, advancedShulkerFix won't enable.");
+        }
     }
 
     /**
@@ -426,7 +422,7 @@ public class AuthMe extends JavaPlugin {
                 if (isUpdateAvailable(latestVersion)) {
                     String message = "New version available! Latest:" + latestVersion + " Current:" + pluginBuild + pluginBuildNumber;
                     getLogger().log(Level.WARNING, message);
-                    getLogger().log(Level.WARNING, "Download from here: github.com/HaHaWTH/AuthMeReReloaded/releases/latest");
+                    getLogger().log(Level.WARNING, "Download from here: https://github.com/HaHaWTH/AuthMeReReloaded/releases/latest");
                 } else {
                     getLogger().log(Level.INFO, "You are running the latest version.");
                 }

src/main/java/fr/xephi/authme/listener/AdvancedShulkerFixListener.java

@@ -0,0 +1,26 @@
+package fr.xephi.authme.listener;
+
+import org.bukkit.Material;
+import org.bukkit.block.Block;
+import org.bukkit.block.BlockFace;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.block.BlockDispenseEvent;
+
+//This fix is only for Minecraft 1.13-
+public class AdvancedShulkerFixListener implements Listener {
+
+    @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
+    public void onDispenserActivate(BlockDispenseEvent event) {
+        Block block = event.getBlock();
+
+        if (block.getRelative(BlockFace.DOWN).getType().equals(Material.AIR) && block.getY() == 0) {
+            event.setCancelled(true);
+            return;
+        }
+        if (block.getRelative(BlockFace.UP).getType().equals(Material.AIR) && block.getY() == block.getWorld().getMaxHeight() - 1) {
+            event.setCancelled(true);
+        }
+    }
+}

src/main/java/fr/xephi/authme/listener/LoginLocationFixListener.java

@@ -35,8 +35,7 @@ public class LoginLocationFixListener implements Listener {
 
     private static Material materialPortal = Material.matchMaterial("PORTAL");
 
-    private boolean isChecked = false;
-    private boolean isGetMinHeight = false;
+    private static boolean isAvailable; // false: unchecked/method not available   true: method is available
     private final boolean isSmartAsyncTeleport = AuthMe.settings.getProperty(SecuritySettings.SMART_ASYNC_TELEPORT);
     private final boolean isFixPortalStuck = AuthMe.settings.getProperty(SecuritySettings.LOGIN_LOC_FIX_SUB_PORTAL);
     private final boolean isFixGroundStuck = AuthMe.settings.getProperty(SecuritySettings.LOGIN_LOC_FIX_SUB_UNDERGROUND);
@@ -49,26 +48,21 @@ public class LoginLocationFixListener implements Listener {
                 materialPortal = Material.matchMaterial("NETHER_PORTAL");
             }
         }
+        try {
+            Method getMinHeightMethod = World.class.getMethod("getMinHeight");
+            isAvailable = true;
+        } catch (NoSuchMethodException e) {
+            isAvailable = false;
+        }
     }
 
     private int getMinHeight(World world) {
         //This keeps compatibility of 1.16.x and lower
-        try {
-            if (!isChecked) {
-                Method getMinHeightMethod = World.class.getMethod("getMinHeight");
-                getMinHeightMethod.setAccessible(true);
-                isChecked = true;
-                isGetMinHeight = true;
-                return world.getMinHeight();
-            } else if (isGetMinHeight) {
+        if (isAvailable) {
             return world.getMinHeight();
         } else {
             return 0;
         }
-        } catch (NoSuchMethodException e) {
-            isChecked = true;
-            return 0;
-        }
     }
 
 
@@ -103,10 +97,11 @@ public class LoginLocationFixListener implements Listener {
             Material UpType = JoinLocation.getBlock().getRelative(BlockFace.UP).getType();
             World world = player.getWorld();
             int MaxHeight = world.getMaxHeight();
+            int MinHeight = getMinHeight(world);
             if (!UpType.isOccluding() && !UpType.equals(Material.LAVA)) {
                 return;
             }
-            for (int i = getMinHeight(world); i <= MaxHeight; i++) {
+            for (int i = MinHeight; i <= MaxHeight; i++) {
                 JoinLocation.setY(i);
                 Block JoinBlock = JoinLocation.getBlock();
                 if ((JoinBlock.getRelative(BlockFace.DOWN).getType().isBlock())

src/main/java/fr/xephi/authme/listener/PlayerListenerHigherThan18.java

@@ -29,12 +29,8 @@ public class PlayerListenerHigherThan18 implements Listener {
     @EventHandler(priority = EventPriority.LOWEST)
     public void onSwitchHand(PlayerSwapHandItemsEvent event) {
         Player player = event.getPlayer();
-        if ((!player.isSneaking() || !player.hasPermission("keybindings.use")) &&
-            settings.getProperty(PluginSettings.MENU_UNREGISTER_COMPATIBILITY)) {
-            return;
-        }
+        if (player.isSneaking() && player.hasPermission("keybindings.use") && settings.getProperty(PluginSettings.MENU_UNREGISTER_COMPATIBILITY)) {
             event.setCancelled(true);
-        if (settings.getProperty(PluginSettings.MENU_UNREGISTER_COMPATIBILITY)) {
             Bukkit.dispatchCommand(event.getPlayer(), "help");
         }
     }

src/main/java/fr/xephi/authme/settings/properties/PluginSettings.java

@@ -14,7 +14,7 @@ public final class PluginSettings implements SettingsHolder {
         "If you are using TrMenu, don't enable this because TrMenu already implemented this."
     })
     public static final Property<Boolean> MENU_UNREGISTER_COMPATIBILITY =
-        newProperty("3rdPartyFeature.compatibility.menuPlugins", true);
+        newProperty("3rdPartyFeature.compatibility.menuPlugins", false);
 
     @Comment({
         "Do you want to enable the session feature?",

src/main/java/fr/xephi/authme/settings/properties/SecuritySettings.java

@@ -35,6 +35,11 @@ public final class SecuritySettings implements SettingsHolder {
     public static final Property<Boolean> ANTI_GHOST_PLAYERS =
         newProperty("3rdPartyFeature.fixes.antiGhostPlayer", false);
 
+    @Comment({"(MC1.13- only)",
+        "Should we fix the shulker crash bug with advanced method?"})
+    public static final Property<Boolean> ADVANCED_SHULKER_FIX =
+        newProperty("3rdPartyFeature.fixes.advancedShulkerFix", false);
+
     @Comment({"Choose the best teleport method by server brand?",
         "(Enable this if you are using Paper)"})
     public static final Property<Boolean> SMART_ASYNC_TELEPORT =
@@ -95,10 +100,6 @@ public final class SecuritySettings implements SettingsHolder {
     public static final Property<Boolean> SHOW_STARTUP_BANNER =
         newProperty("Plugin.banners.showBanners", true);
 
-    @Comment("Change the banner colors here (Default: §r)")
-    public static final Property<String> STARTUP_BANNER_COLOR =
-        newProperty("Plugin.banners.bannerColor", "§r");
-
     @Comment("Max allowed tries before a captcha is required")
     public static final Property<Integer> MAX_LOGIN_TRIES_BEFORE_CAPTCHA =
         newProperty("Security.captcha.maxLoginTry", 8);

src/main/resources/plugin.yml

@@ -3,7 +3,7 @@ authors: [${pluginDescription.authors}]
 website: http://github.com/HaHaWTH/AuthMeReReloaded/
 description: A fork of AuthMeReloaded that contains bug fixes
 main: ${pluginDescription.main}
-version: 5.6.0-FORK-b39
+version: 5.6.0-FORK-b40
 api-version: 1.13
 softdepend:
     - Vault