Updated to Minecraft 1.18.2

pom.xml

@@ -4,15 +4,15 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>me.itsnathang</groupId>
-    <artifactId>PictureLogin</artifactId>
-    <version>1.6</version>
+    <groupId>me.nickv</groupId>
+    <artifactId>PictureLogin-Continued</artifactId>
+    <version>1.0.6</version>
     <packaging>jar</packaging>
 
     <name>Picture Login</name>
 
     <properties>
-        <author>NathanG</author>
+        <author>NathanG, _NickV</author>
         <mainClass>me.itsnathang.picturelogin.PictureLogin</mainClass>
     </properties>
 
@@ -23,7 +23,7 @@
         </repository>
         <repository>
             <id>placeholderapi</id>
-            <url>http://repo.extendedclip.com/content/repositories/placeholderapi/</url>
+            <url>https://repo.extendedclip.com/content/repositories/placeholderapi/</url>
         </repository>
         <repository>
             <id>CodeMC</id>
@@ -33,6 +33,10 @@
             <id>minedown-repo</id>
             <url>https://repo.minebench.de/</url>
         </repository>
+        <repository> <!-- for development builds -->
+            <id>sonatype-oss-snapshots1</id>
+            <url>https://s01.oss.sonatype.org/content/repositories/snapshots/</url>
+        </repository>
     </repositories>
 
     <dependencies>
@@ -45,7 +49,7 @@
         <dependency>
             <groupId>org.bstats</groupId>
             <artifactId>bstats-bukkit</artifactId>
-            <version>1.7</version>
+            <version>3.0.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -66,10 +70,16 @@
             <version>1.6.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>net.kyori</groupId>
+            <artifactId>adventure-text-minimessage</artifactId>
+            <version>4.10.1</version>
+        </dependency>
     </dependencies>
 
     <build>
-        <sourceDirectory>src/main/java</sourceDirectory>
+        <directory>${dir}</directory>
+        <!--        <sourceDirectory>src/main/java</sourceDirectory>-->
         <defaultGoal>clean install</defaultGoal>
         <resources>
             <resource>
@@ -79,11 +89,12 @@
         </resources>
         <plugins>
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.1</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <source>16</source>
+                    <target>16</target>
                 </configuration>
             </plugin>
             <plugin>
@@ -94,7 +105,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.1.0</version>
+                <version>3.3.0</version>
                 <configuration>
                     <relocations>
                         <relocation>
@@ -130,5 +141,5 @@
             </plugin>
         </plugins>
     </build>
-    
+
 </project>

readme.md

@@ -1,16 +1,27 @@
-Picture Login ![GitHub release (latest by date)](https://img.shields.io/github/v/release/ItsNathanG/PictureLogin?style=flat-square)
+PictureLogin-Continued [![Version](https://img.shields.io/badge/version-1.0.4-blue)](https://www.spigotmc.org/resources/picturelogin-continued.101216/)
 ===
 
-Picture Login provides a much nicer login message by displaying a picture of the player's head inside of chat.
+This is a popular plugin for Minecraft servers (over 50,000 downloads) that has sadly been unsupported for a while; I've updated it to Minecraft 1.18 and will be supporting future versions! (Now confirmed working on Minecraft 1.21.1)
 
-<div align="center">
-  <img src="https://i.imgur.com/kNW94py.png">
+PictureLogin creates a fancy login message by displaying a picture of the player's head inside of chat.
 
-  <img src="https://bstats.org/signatures/bukkit/PictureLogin.svg">
-</div>
+![demo](https://user-images.githubusercontent.com/60233722/163606833-27671a07-1187-424f-abf7-f5a5d35abda8.PNG)
 
-It is a plugin for [Spigot](http://www.spigotmc.org/) and you can find further information [here, on it's plugin page](http://www.spigotmc.org/resources/picture-login.4514/).
+Obtaining the plugin
+---
+You can download the plugin over on Spigot: https://www.spigotmc.org/resources/picturelogin-continued.101216/
+
+Credit to...
+---
+
+- The original plugin author, ItsNathanG
+- bobacadodl for his Image Message Library
+- Crafatar for their avatar service
+
+Support [![Discord](https://img.shields.io/badge/discord-Nick's%20Place-orange)](https://discord.gg/fGzb73sPmV)
+---
+You can reach out to me on the Spigot forums or here on GitHub, although the best way to reach me is on Discord.
 
-License
+License [![License](https://img.shields.io/github/license/Nicholas-Vo/PictureLogin-Continued)](https://github.com/Nicholas-Vo/PictureLogin-Continued/blob/master/LICENSE)
 ---
-This plugin is licensed under the MIT License. For more information please refer to LICENSE.
+This plugin is licensed under the MIT License. For more information please refer to LICENSE.

src/main/java/com/bobacadodl/imgmessage/ImageChar.java

@@ -10,7 +10,7 @@ public enum ImageChar {
     DARK_SHADE('\u2593'),
     MEDIUM_SHADE('\u2592'),
     LIGHT_SHADE('\u2591');
-    private char c;
+    private final char c;
 
     ImageChar(char c) {
         this.c = c;

src/main/java/com/bobacadodl/imgmessage/ImageMessage.java

@@ -1,10 +1,10 @@
 package com.bobacadodl.imgmessage;
 
-import org.bukkit.ChatColor;
+import net.md_5.bungee.api.ChatColor;
 import org.bukkit.entity.Player;
 import org.bukkit.util.ChatPaginator;
 
-import java.awt.*;
+import java.awt.Color;
 import java.awt.geom.AffineTransform;
 import java.awt.image.AffineTransformOp;
 import java.awt.image.BufferedImage;
@@ -17,25 +17,6 @@
 public class ImageMessage {
     private final static char TRANSPARENT_CHAR = ' ';
 
-    private final Color[] colors = {
-            new Color(0, 0, 0),
-            new Color(0, 0, 170),
-            new Color(0, 170, 0),
-            new Color(0, 170, 170),
-            new Color(170, 0, 0),
-            new Color(170, 0, 170),
-            new Color(255, 170, 0),
-            new Color(170, 170, 170),
-            new Color(85, 85, 85),
-            new Color(85, 85, 255),
-            new Color(85, 255, 85),
-            new Color(85, 255, 255),
-            new Color(255, 85, 85),
-            new Color(255, 85, 255),
-            new Color(255, 255, 85),
-            new Color(255, 255, 255),
-    };
-
     private String[] lines;
 
     public ImageMessage(BufferedImage image, int height, char imgChar) {
@@ -92,12 +73,12 @@ private ChatColor[][] toChatColorArray(BufferedImage image, int height) {
     private String[] toImgMessage(ChatColor[][] colors, char imgchar) {
         lines = new String[colors[0].length];
         for (int y = 0; y < colors[0].length; y++) {
-            String line = "";
-            for (int x = 0; x < colors.length; x++) {
-                ChatColor color = colors[x][y];
-                line += (color != null) ? colors[x][y].toString() + imgchar : TRANSPARENT_CHAR;
+            StringBuilder line = new StringBuilder();
+            for (ChatColor[] chatColors : colors) {
+                ChatColor color = chatColors[y];
+                line.append((color != null) ? chatColors[y].toString() + imgchar : TRANSPARENT_CHAR);
             }
-            lines[y] = line + ChatColor.RESET;
+            lines[y] = line.toString() + ChatColor.RESET;
         }
         return lines;
     }
@@ -127,31 +108,11 @@ private boolean areIdentical(Color c1, Color c2) {
         return Math.abs(c1.getRed() - c2.getRed()) <= 5 &&
                 Math.abs(c1.getGreen() - c2.getGreen()) <= 5 &&
                 Math.abs(c1.getBlue() - c2.getBlue()) <= 5;
-
     }
 
     private ChatColor getClosestChatColor(Color color) {
         if (color.getAlpha() < 128) return null;
-
-        int index = 0;
-        double best = -1;
-
-        for (int i = 0; i < colors.length; i++) {
-            if (areIdentical(colors[i], color)) {
-                return ChatColor.values()[i];
-            }
-        }
-
-        for (int i = 0; i < colors.length; i++) {
-            double distance = getDistance(color, colors[i]);
-            if (distance < best || best == -1) {
-                best = distance;
-                index = i;
-            }
-        }
-
-        // Minecraft has 15 colors
-        return ChatColor.values()[index];
+        return ChatColor.of(color);
     }
 
     private String center(String s, int length) {
@@ -161,11 +122,7 @@ private String center(String s, int length) {
             return s;
         } else {
             int leftPadding = (length - s.length()) / 2;
-            StringBuilder leftBuilder = new StringBuilder();
-            for (int i = 0; i < leftPadding; i++) {
-                leftBuilder.append(" ");
-            }
-            return leftBuilder.toString() + s;
+            return " ".repeat(leftPadding) + s;
         }
     }
 

src/main/java/me/itsnathang/picturelogin/PictureLogin.java

@@ -1,56 +1,60 @@
 package me.itsnathang.picturelogin;
 
-import me.itsnathang.picturelogin.listeners.JoinListener;
-import me.itsnathang.picturelogin.listeners.QuitListener;
 import me.itsnathang.picturelogin.commands.BaseCommand;
 import me.itsnathang.picturelogin.config.ConfigManager;
+import me.itsnathang.picturelogin.listeners.JoinListener;
+import me.itsnathang.picturelogin.listeners.QuitListener;
 import me.itsnathang.picturelogin.util.Hooks;
 import me.itsnathang.picturelogin.util.PictureUtil;
-
 import me.itsnathang.picturelogin.util.Updater;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.plugin.java.JavaPlugin;
 import org.bstats.bukkit.Metrics;
+import org.bukkit.plugin.java.JavaPlugin;
 
+/*
+Updated to work with Minecraft 1.18.2 by _NickV on 4/7/2022
+ */
 public class PictureLogin extends JavaPlugin {
-	private ConfigManager configManager;
-	private PictureUtil pictureUtil;
+    private ConfigManager configManager;
+    private PictureUtil pictureUtil;
 
-	@Override
-	public void onEnable() {
-		// load config & languages file
-		configManager = new ConfigManager(this);
+    @Override
+    public void onEnable() {
+        // load config & languages file
+        configManager = new ConfigManager(this);
 
-		// Register Plugin Hooks
-		new Hooks(getServer().getPluginManager(), configManager, getLogger());
+        // Register Plugin Hooks
+        new Hooks(getServer().getPluginManager(), configManager, getLogger());
 
-		// Initialize Picture Utility
-		pictureUtil = new PictureUtil(this);
+        // Initialize Picture Utility
+        pictureUtil = new PictureUtil(this);
 
-		// register Listeners
-		getServer().getPluginManager().registerEvents(new JoinListener(this), this);
+        // register Listeners
+        getServer().getPluginManager().registerEvents(new JoinListener(this), this);
 
-		// (only register leave listener if enabled in config)
-		if (configManager.getBoolean("show-leave-message", false))
-			getServer().getPluginManager().registerEvents(new QuitListener(this), this);
+        // (only register leave listener if enabled in config)
+        if (configManager.getBoolean("show-leave-message", false)) {
+            getServer().getPluginManager().registerEvents(new QuitListener(this), this);
+        }
 
-		// register /picturelogin command
-		getCommand("picturelogin").setExecutor(new BaseCommand(this));
+        // register /picturelogin command
+        getCommand("picturelogin").setExecutor(new BaseCommand(this));
 
-		// Update Checker
-		if (configManager.getBoolean("update-check", true))
-			new Updater(getLogger(), getDescription().getVersion());
+        // Update Checker
+        if (configManager.getBoolean("update-check", true)) {
+            new Updater(getLogger(), getDescription().getVersion());
+        }
 
-		// bStats integration
-		if (configManager.getBoolean("metrics", true))
-			new Metrics(this, 2225);
-	}
+        // bStats integration
+        if (configManager.getBoolean("metrics", true)) {
+            new Metrics(this, 14892); // 2225 is the bStats plugin ID for PictureLogin
+        }
+    }
 
-	public ConfigManager getConfigManager() {
-		return configManager;
-	}
+    public ConfigManager getConfigManager() {
+        return configManager;
+    }
 
-	public PictureUtil getPictureUtil() {
-		return pictureUtil;
-	}
+    public PictureUtil getPictureUtil() {
+        return pictureUtil;
+    }
 }