stuff

Author: sinender

.vscode/launch.json

@@ -0,0 +1,31 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "type": "java",
+      "name": "Minecraft Client",
+      "request": "launch",
+      "cwd": "${workspaceFolder}/run",
+      "console": "internalConsole",
+      "stopOnEntry": false,
+      "mainClass": "net.fabricmc.devlaunchinjector.Main",
+      "vmArgs": "\"-Dfabric.dli.config\u003dC:\\Users\\griff\\Desktop\\Plugin@@0020Dev\\Github\\Hysentials-java\\.gradle\\loom-cache\\launch.cfg\" \"-Dfabric.dli.env\u003dclient\" \"-Dfabric.dli.main\u003dnet.minecraft.launchwrapper.Launch\"",
+      "args": "",
+      "env": {},
+      "projectName": ""
+    },
+    {
+      "type": "java",
+      "name": "Minecraft Server",
+      "request": "launch",
+      "cwd": "${workspaceFolder}/run",
+      "console": "internalConsole",
+      "stopOnEntry": false,
+      "mainClass": "net.fabricmc.devlaunchinjector.Main",
+      "vmArgs": "\"-Dfabric.dli.config\u003dC:\\Users\\griff\\Desktop\\Plugin@@0020Dev\\Github\\Hysentials-java\\.gradle\\loom-cache\\launch.cfg\" \"-Dfabric.dli.env\u003dserver\" \"-Dfabric.dli.main\u003dnet.minecraft.launchwrapper.Launch\"",
+      "args": "\"nogui\"",
+      "env": {},
+      "projectName": ""
+    }
+  ]
+}

build.gradle

@@ -3,12 +3,12 @@
 
 
 plugins {
-    id "dev.architectury.architectury-pack200" version "0.1.3"
-    id 'org.jetbrains.kotlin.jvm' version '1.6.10'
+//    id "dev.architectury.architectury-pack200" version "0.1.3"
+    id 'org.jetbrains.kotlin.jvm' version '1.8.21'
+    id 'org.jetbrains.kotlin.plugin.serialization' version '1.8.21'
     id "cc.polyfrost.loom" version "0.10.0.5"
-    id "net.kyori.blossom" version "1.3.0"
+    id "net.kyori.blossom" version "1.3.1"
     id "java"
-    id 'org.jetbrains.kotlin.plugin.serialization' version '1.6.10'
     id 'maven-publish'
 }
 
@@ -23,6 +23,8 @@ blossom {
     replaceToken("@VER@", project.version, className)
     replaceToken("@NAME@", mod_name, className)
     replaceToken("@ID@", mod_id, className)
+
+    System.out.println("Replaced tokens: " + getTokenReplacementsByFile())
 }
 
 sourceCompatibility = targetCompatibility = JavaVersion.VERSION_1_8
@@ -68,7 +70,7 @@ dependencies {
     mappings("de.oceanlabs.mcp:mcp_stable:22-1.8.9")
     forge("net.minecraftforge:forge:1.8.9-11.15.1.2318-1.8.9")
 
-    compileOnly('cc.polyfrost:oneconfig-1.8.9-forge:0.2.0-alpha+')
+    compileOnly('cc.polyfrost:oneconfig-1.8.9-forge:0.2.1-alpha184')
     include('cc.polyfrost:oneconfig-wrapper-launchwrapper:1.0.0-beta+')
     include("org.java-websocket:Java-WebSocket:1.5.3")
     include('org.reflections:reflections:0.10.2')
@@ -112,6 +114,13 @@ sourceSets {
     }
 }
 
+tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
+    kotlinOptions {
+        jvmTarget = "1.8"
+        // other options...
+    }
+}
+
 jar {
     dependsOn configurations.include
     from(configurations.include.collect { it.isDirectory() ? it : zipTree(it) }) {
@@ -139,13 +148,6 @@ remapJar {
     destinationDirectory = file("C:\\Users\\griff\\Desktop\\games\\MultiMC\\instances\\1.8.9\\.minecraft\\mods")
 }
 
-compileKotlin {
-    kotlinOptions {
-        jvmTarget = "1.8"
-        freeCompilerArgs = ['-Xjvm-default=compatibility']
-    }
-}
-
 publishing {
     repositories {
         if (dev) {

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/dummy/java/org/polyfrost/chatting/chat/ChatTab.java

@@ -28,11 +28,11 @@ public void initialize() {
         throw new RuntimeException();
     }
 
-    public void setMessages(List<String> message) {
+    public void setMessages(List<Object> message) {
         throw new RuntimeException();
     }
 
-    public List<String> getMessages() {
+    public List<Object> getMessages() {
         throw new RuntimeException();
     }
 

src/main/java/llc/redstone/hysentials/Hysentials.java

@@ -23,6 +23,7 @@
 import llc.redstone.hysentials.guis.club.ClubDashboardHandler;
 import llc.redstone.hysentials.guis.container.ContainerHandler;
 import llc.redstone.hysentials.handlers.chat.modules.misc.Limit256;
+import llc.redstone.hysentials.handlers.groupchats.GlobalChat;
 import llc.redstone.hysentials.handlers.groupchats.GroupChat;
 import llc.redstone.hysentials.handlers.guis.GuiScreenPost;
 import llc.redstone.hysentials.handlers.htsl.*;
@@ -187,7 +188,6 @@ public void init(FMLInitializationEvent event) {
         Socket.init();
         Socket.createSocket();
 
-        CommandManager.INSTANCE.registerCommand(new GroupChatCommand());
         commands = new ArrayList<>();
         commands.add(new HysentialsCommand());
         commands.add(new GlobalChatCommand());
@@ -206,6 +206,8 @@ public void init(FMLInitializationEvent event) {
         commands.add(new SetTextureCommand());
         commands.add(new HymojiCommand());
         commands.add(new ClaimCommand());
+        commands.add(new GroupChatCommand());
+
         for (ICommand command : commands) {
             ClientCommandHandler.instance.registerCommand(command);
         }
@@ -304,6 +306,7 @@ private void registerImages() {
         new ImageIcon("from", new ResourceLocation("textures/icons/from.png"));
         new ImageIcon("team", new ResourceLocation("textures/icons/team.png"));
         new ImageIcon("friend", new ResourceLocation("textures/icons/friend.png"));
+        new ImageIcon("sys_error", new ResourceLocation("textures/icons/sys_error.png"));
 
         new ImageIcon("common", new ResourceLocation("textures/icons/common.png"));
         new ImageIcon("rare", new ResourceLocation("textures/icons/rare.png"));
@@ -402,6 +405,7 @@ private void registerHandlers() {
             try {
                 if (isChatting) {
                     eventBus.register(new GroupChat());
+                    eventBus.register(new GlobalChat());
                 }
             } catch (Exception e) {
                 e.printStackTrace();
@@ -456,7 +460,7 @@ private void registerHandlers() {
 
             EventManager.INSTANCE.register(new BwRanks());
 
-            HysentialsUtilsKt.init();
+            HysentialsUtilsKt.init(VERSION);
 
 //        Runtime.getRuntime().addShutdownHook(new Thread(() -> {
 //            JSONArray array = new JSONArray();

src/main/java/llc/redstone/hysentials/command/ClubCommand.java

@@ -6,6 +6,7 @@
 import llc.redstone.hysentials.HysentialsUtilsKt;
 import llc.redstone.hysentials.schema.HysentialsSchema;
 import llc.redstone.hysentials.util.BlockWAPIUtils;
+import llc.redstone.hysentials.util.DuoVariable;
 import llc.redstone.hysentials.util.MUtils;
 import cc.polyfrost.oneconfig.utils.Multithreading;
 import cc.polyfrost.oneconfig.utils.NetworkUtils;
@@ -55,10 +56,10 @@
         "&e/club list &7- &bList all players in your club.",
         "&e/club house <index> help &7- &bManage your club houses.",
         "§9&m                                                        "
-    })
+    }, aliases = {"clubs"})
 public class ClubCommand {
     @SubCommand(aliases = {"create"}, description = "Create a club")
-    public void create(String name) {
+    public void create(@Greedy String name) {
         if (!Socket.linked) {
             UChat.chat("&cYou must be linked to a discord account to use this feature.");
             return;
@@ -99,6 +100,16 @@ public void join(String name) {
             "uuid", Minecraft.getMinecraft().getSession().getProfile().getId(),
             "serverId", Socket.serverId
         ).toString());
+        Socket.awaiting.add(
+            new DuoVariable<>("clubAccept", (json) -> {
+                if (json.getBoolean("success")) {
+                    MUtils.chat(HysentialsConfig.chatPrefix + " &aSuccessfully joined " + name + "!");
+                } else {
+                    MUtils.chat(HysentialsConfig.chatPrefix + " &cFailed to join " + name + "!");
+                    MUtils.chat("   - &c" + json.getString("message"));
+                }
+            })
+        );
     }
 
     @SubCommand(aliases = {"house"})