Initial refactoring

build.gradle

@@ -1,7 +1,6 @@
 plugins {
     id 'fabric-loom' version '0.8-SNAPSHOT'
     id 'maven-publish'
-    id 'com.github.johnrengelman.shadow' version '7.0.0'
 }
 
 sourceCompatibility = JavaVersion.VERSION_16
@@ -32,10 +31,8 @@ dependencies {
 
     modImplementation "com.github.DarkKronicle:AdvancedChatCore:${project.advancedchat_version}"
 
-    shadow 'com.google.code.findbugs:jsr305:3.0.0'
-
-    shadow 'com.google.code.gson:gson:2.8.6'
 }
+
 processResources {
     inputs.property "version", project.version
 
@@ -47,8 +44,15 @@ processResources {
 // ensure that the encoding is set to UTF-8, no matter what the system default is
 // this fixes some edge cases with special characters not displaying correctly
 // see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
-tasks.withType(JavaCompile) {
-    options.encoding = "UTF-8"
+tasks.withType(JavaCompile).configureEach {
+    // ensure that the encoding is set to UTF-8, no matter what the system default is
+    // this fixes some edge cases with special characters not displaying correctly
+    // see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
+    // If Javadoc is generated, this must be specified in that task too.
+    it.options.encoding = "UTF-8"
+
+    // Minecraft 1.17 (21w19a) upwards uses Java 16.
+    it.options.release = 16
 }
 
 // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task

gradle.properties

@@ -13,4 +13,4 @@ archives_base_name=ACModuleTemplate
 # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
 fabric_api_version=0.37.2+1.17
 malilib_version = 0.10.0-dev.22+beta.1
-advancedchat_version=v1.0.1-beta4
+advancedchat_version=v1.1.0-beta1

src/main/java/io/github/darkkronicle/advancedchathud/AdvancedChatHud.java

@@ -1,4 +1,4 @@
-package io.github.darkkronicle.acmoduletemplate;
+package io.github.darkkronicle.advancedchathud;
 
 import fi.dy.masa.malilib.event.InitializationHandler;
 import net.fabricmc.api.ClientModInitializer;
@@ -6,14 +6,14 @@ import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 
 @Environment(EnvType.CLIENT)
-public class ACModuleTemplate implements ClientModInitializer {
+public class AdvancedChatHud implements ClientModInitializer {
 
-    public static final String MOD_ID = "acmoduletemplate";
+    public static final String MOD_ID = "advancedchathud";
 
     @Override
     public void onInitializeClient() {
         // This will run after AdvancedChatCore's because of load order
-        InitializationHandler.getInstance().registerInitializationHandler(new ModuleInitHandler());
+        InitializationHandler.getInstance().registerInitializationHandler(new HudInitHandler());
     }
 
 }

src/main/java/io/github/darkkronicle/advancedchathud/HudInitHandler.java

@@ -1,28 +1,28 @@
-package io.github.darkkronicle.acmoduletemplate;
+package io.github.darkkronicle.advancedchathud;
 
 import fi.dy.masa.malilib.config.ConfigManager;
 import fi.dy.masa.malilib.interfaces.IInitializationHandler;
 import fi.dy.masa.malilib.util.StringUtils;
-import io.github.darkkronicle.acmoduletemplate.config.ModuleConfigStorage;
+import io.github.darkkronicle.advancedchathud.config.HudConfigStorage;
 import io.github.darkkronicle.advancedchatcore.chat.ChatHistory;
 import io.github.darkkronicle.advancedchatcore.config.gui.GuiConfigHandler;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 
 @Environment(EnvType.CLIENT)
-public class ModuleInitHandler implements IInitializationHandler {
+public class HudInitHandler implements IInitializationHandler {
 
     @Override
     public void registerModHandlers() {
-        ConfigManager.getInstance().registerConfigHandler(ACModuleTemplate.MOD_ID, new ModuleConfigStorage());
+        ConfigManager.getInstance().registerConfigHandler(AdvancedChatHud.MOD_ID, new HudConfigStorage());
         GuiConfigHandler.getInstance().addGuiSection(GuiConfigHandler.createGuiConfigSection(
-                StringUtils.translate("acmoduletemplate.tab.general"), ModuleConfigStorage.General.OPTIONS
+                StringUtils.translate("advancedchathud.tab.general"), HudConfigStorage.General.OPTIONS
         ));
 
         // Register on new message
         ChatHistory.getInstance().addOnMessage(chatMessage -> System.out.println("Chat message happened!"));
         // Register on the clear
-        ChatHistory.getInstance().addOnClear(() -> System.out.println(ModuleConfigStorage.General.STRING_STUFF.config.getStringValue()));
+        ChatHistory.getInstance().addOnClear(() -> System.out.println(HudConfigStorage.General.STRING_STUFF.config.getStringValue()));
     }
 
 }

src/main/java/io/github/darkkronicle/advancedchathud/config/HudConfigStorage.java

@@ -1,4 +1,4 @@
-package io.github.darkkronicle.acmoduletemplate.config;
+package io.github.darkkronicle.advancedchathud.config;
 
 import com.google.common.collect.ImmutableList;
 import com.google.gson.JsonElement;
@@ -11,7 +11,7 @@ import fi.dy.masa.malilib.config.options.ConfigString;
 import fi.dy.masa.malilib.util.FileUtils;
 import fi.dy.masa.malilib.util.JsonUtils;
 import fi.dy.masa.malilib.util.StringUtils;
-import io.github.darkkronicle.acmoduletemplate.ACModuleTemplate;
+import io.github.darkkronicle.advancedchathud.AdvancedChatHud;
 import io.github.darkkronicle.advancedchatcore.config.ConfigStorage;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
@@ -21,9 +21,9 @@ import java.util.List;
 
 
 @Environment(EnvType.CLIENT)
-public class ModuleConfigStorage implements IConfigHandler {
+public class HudConfigStorage implements IConfigHandler {
 
-    public static final String CONFIG_FILE_NAME = ACModuleTemplate.MOD_ID + ".json";
+    public static final String CONFIG_FILE_NAME = AdvancedChatHud.MOD_ID + ".json";
     private static final int CONFIG_VERSION = 1;
 
     public static class General {

src/main/resources/advancedchathud.mixins.json

@@ -1,6 +1,6 @@
 {
   "required": true,
-  "package": "io.github.darkkronicle.acmoduletemplate.mixin",
+  "package": "io.github.darkkronicle.advancedchathud.mixin",
   "compatibilityLevel": "JAVA_16",
   "mixins": [
   ],

src/main/resources/fabric.mod.json

@@ -1,26 +1,26 @@
 {
   "schemaVersion": 1,
-  "id": "acmoduletemplate",
+  "id": "advancedchathud",
   "version": "${version}",
-  "name": "AdvancedChatModuleTemplate",
-  "description": "A template for an AdvancedChat Module",
+  "name": "AdvancedChatHUD",
+  "description": "A chat HUD overhaul with chat tabs",
   "authors": [
     "DarkKronicle"
   ],
   "contact": {
-    "sources": "https://github.com/DarkKronicle/AdvancedChat",
+    "sources": "https://github.com/DarkKronicle/AdvancedChatHUD",
     "discord": "https://discord.gg/WnaE3uZxDA"
   },
   "license": "MPL-v2",
-  "icon": "assets/acmoduletemplate/icon.png",
+  "icon": "assets/advancedchathud/icon.png",
   "environment": "*",
   "entrypoints": {
     "client": [
-      "io.github.darkkronicle.acmoduletemplate.ACModuleTemplate"
+      "io.github.darkkronicle.advancedchathud.AdvancedChatHud"
     ]
   },
   "mixins": [
-    "acmoduletemplate.mixins.json"
+    "advancedchathud.mixins.json"
   ],
   "depends": {
     "fabricloader": ">=0.8.9+build.204",