Readme.md

@@ -18,9 +18,8 @@ that are detailed in their respective Readme file (if any).
 - `pandalib-players` A library to handle classes representing online or offline players;
 - `pandalib-players-permissible` An extension of `pandalib-players` with support for the permission system `pandalib-permissions`;
 - `pandalib-netapi` A poorly designed, but working TCP network library;
-- `pandalib-config` Utility and helper classes to handle configuration related files and folders;
 - `pandalib-commands` An abstract command manager working on top of [Brigadier](https://github.com/Mojang/brigadier);
-- `pandalib-cli` Utility and helper classes for a standalone CLI Java application;
+- `pandalib-cli` Utility and helper classes for a standalone CLI Java application.
 - `pandalib-core` A catch-all module for some helper classes that didn't have their own module yet;
 
 ### Use in your projects

pandalib-bungee-chat/src/main/java/fr/pandacube/lib/bungee/chat/ChatBungee.java

@@ -71,7 +71,4 @@ public class ChatBungee {
         BaseComponent[] arr = toBungeeArray(component);
         return arr.length == 1 ? arr[0] : new net.md_5.bungee.api.chat.TextComponent(arr);
     }
-
-
-    private ChatBungee() {}
 }

pandalib-cli/pom.xml

@@ -15,6 +15,11 @@
     <packaging>jar</packaging>
     
 	<repositories>
+		<repository>
+			<id>minecraft-libraries</id>
+			<name>Minecraft Libraries</name>
+			<url>https://libraries.minecraft.net</url>
+		</repository>
         <repository>
             <id>bungeecord-repo</id>
             <url>https://oss.sonatype.org/content/repositories/snapshots</url>
@@ -37,16 +42,17 @@
           <artifactId>pandalib-commands</artifactId>
           <version>${project.version}</version>
       </dependency>
-        <dependency>
-            <groupId>fr.pandacube.lib</groupId>
-            <artifactId>pandalib-config</artifactId>
-            <version>${project.version}</version>
-        </dependency>
+
         <dependency>
             <groupId>net.md-5</groupId>
             <artifactId>bungeecord-log</artifactId>
             <version>${bungeecord.version}</version>
         </dependency>
+        <dependency>
+            <groupId>net.md-5</groupId>
+            <artifactId>bungeecord-config</artifactId>
+            <version>${bungeecord.version}</version>
+        </dependency>
 
   </dependencies>
 

pandalib-config/pom.xml

@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>pandalib-parent</artifactId>
-        <groupId>fr.pandacube.lib</groupId>
-        <version>1.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>pandalib-config</artifactId>
-    <packaging>jar</packaging>
-
-    <repositories>
-        <repository>
-            <id>bungeecord-repo</id>
-            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-        </repository>
-    </repositories>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>net.md-5</groupId>
-            <artifactId>bungeecord-config</artifactId>
-            <version>${bungeecord.version}</version>
-        </dependency>
-
-    </dependencies>
-
-</project>

pandalib-core/src/main/java/fr/pandacube/lib/core/config/AbstractConfig.java

@@ -1,4 +1,7 @@
-package fr.pandacube.lib.config;
+package fr.pandacube.lib.core.config;
+
+import fr.pandacube.lib.chat.ChatColorUtil;
+import fr.pandacube.lib.util.log.Log;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -53,7 +56,7 @@ public abstract class AbstractConfig {
 		while ((line = reader.readLine()) != null) {
 			String trimmedLine = line.trim();
 			
-			if (ignoreEmpty && trimmedLine.isEmpty())
+			if (ignoreEmpty && trimmedLine.equals(""))
 				continue;
 			
 			if (ignoreHashtagComment && trimmedLine.startsWith("#"))
@@ -111,6 +114,25 @@ public abstract class AbstractConfig {
 	}
 
 
+	/**
+	 * Utility method to that translate the {@code '&'} formatted string to the legacy format.
+	 * @param string the string to convert.
+	 * @return a legacy formatted string (using {@code '§'}).
+	 */
+	public static String getTranslatedColorCode(String string) {
+		return ChatColorUtil.translateAlternateColorCodes('&', string);
+	}
+
+
+	/**
+	 * Logs the message as a warning into console, prefixed with the context of this config.
+	 * @param message the message to log.
+	 */
+	protected void warning(String message) {
+		Log.warning("Error in configuration '"+configFile.getName()+"': " + message);
+	}
+
+
 	/**
 	 * The type of config.
 	 */

pandalib-core/src/main/java/fr/pandacube/lib/core/config/AbstractConfigManager.java

@@ -1,4 +1,4 @@
-package fr.pandacube.lib.config;
+package fr.pandacube.lib.core.config;
 
 import java.io.File;
 import java.io.IOException;

pandalib-reflect/src/main/java/fr/pandacube/lib/reflect/ReflectionWrapperBypass.java

@@ -16,27 +16,15 @@ public class ReflectionWrapperBypass {
 
     private static final AtomicBoolean enabled = new AtomicBoolean(false);
 
-    /**
-     * Enables bypassing the eventual translation of the class names when using {@link Class#forName(String)}.
-     */
     public static void enable() {
         enabled.set(true);
     }
 
-    /**
-     * Disables bypassing the eventual translation of the class names when using {@link Class#forName(String)}.
-     */
     public static void disable() {
         enabled.set(false);
     }
 
-    /**
-     * Calls {@link Class#forName(String)}, but detects if the returned class has been translated and if so, uses
-     * reflection to call {@link Class#forName(String)} (some sort of reflection-ception).
-     * @param className the binary name of the class or the string representing an array type.
-     * @return the {@link Class} object for the class with the specified name.
-     * @throws ClassNotFoundException if the class cannot be located.
-     */
+
     public static Class<?> getClass(String className) throws ClassNotFoundException {
         if (!enabled.get()) {
             return Class.forName(className);
@@ -63,8 +51,4 @@ public class ReflectionWrapperBypass {
     }
 
 
-
-    private ReflectionWrapperBypass() {}
-
-
 }

pom.xml

@@ -69,7 +69,6 @@
         <module>pandalib-chat</module>
         <module>pandalib-cli</module>
         <module>pandalib-commands</module>
-        <module>pandalib-config</module>
         <module>pandalib-core</module>
         <module>pandalib-db</module>
         <module>pandalib-netapi</module>