Fixes to event priority and jar-in-jar shading

Author: Thatsmusic99

common/build.gradle

@@ -1,6 +1,11 @@
 plugins {
     id "java"
     id "java-library"
+    id "maven-publish"
+}
+
+compileJava {
+    options.compilerArgs += "-g"
 }
 
 dependencies {
@@ -34,3 +39,15 @@ shadowJar {
 
     minimize()
 }
+
+publishing {
+    publications {
+        maven(MavenPublication) {
+            groupId = 'com.cssbham'
+            artifactId = 'common'
+            version = '1.0.0'
+
+            from components.java
+        }
+    }
+}

common/src/main/java/com/cssbham/cssminecraft/common/command/handler/MakeGreenCommandHandler.java

@@ -45,13 +45,20 @@ public void handle(CommandSender sender, CommandContext context) {
         if (discordClientService.getDiscordClient().isMember(arg)) {
             sender.sendMessage(Component.text("Making you green...").color(NamedTextColor.GRAY));
             try {
-                permissionPluginService.grantMemberRole(sender.getUuid()).get();
-            } catch (InterruptedException | ExecutionException e) {
+                permissionPluginService.grantMemberRole(sender.getUuid()).whenComplete((v, err) -> {
+                    if (err != null) {
+                        sender.sendMessage(Component.text("There was a problem making you green. Try again later.")
+                                .color(NamedTextColor.RED));
+                        throw new RuntimeException(err);
+                    }
+
+                    sender.sendMessage(Component.text("Congratulations, you are now green!").color(NamedTextColor.GREEN));
+                });
+            } catch (Exception e) {
                 sender.sendMessage(Component.text("There was a problem making you green. Try again later.")
                         .color(NamedTextColor.RED));
                 throw new RuntimeException(e);
             }
-            sender.sendMessage(Component.text("Congratulations, you are now green!").color(NamedTextColor.GREEN));
         } else {
             sender.sendMessage(Component.text("You don't appear to be a ").color(NamedTextColor.RED).append(
                             Component.text("Member").color(NamedTextColor.GREEN)

common/src/main/java/com/cssbham/cssminecraft/common/permission/LuckPermsPermissionPluginService.java

@@ -20,7 +20,14 @@ public CompletableFuture<Void> grantMemberRole(UUID player) {
                     user.data().add(Node.builder("group.member").build());
                     user.data().remove(Node.builder("group.guest").build());
                 }
-        );
+        ).whenCompleteAsync((v, err) -> {
+            if (err != null) {
+                err.printStackTrace();
+                return;
+            }
+
+            System.out.println("Success");
+        });
     }
 
     @Override

neoforge/build.gradle

@@ -18,6 +18,8 @@ base {
 
 java.toolchain.languageVersion = JavaLanguageVersion.of(21)
 
+jarJar.enabled = true
+
 neoForge {
     // Specify the version of NeoForge to use.
     version = project.neo_version
@@ -87,13 +89,17 @@ neoForge {
         // but multi mod projects should define one per mod
         "${mod_id}" {
             sourceSet(sourceSets.main)
+            sourceSet(project(":common").sourceSets.main)
         }
     }
 }
 
 // Include resources generated by data generators.
 sourceSets.main.resources { srcDir 'src/generated/resources' }
 
+compileJava {
+    options.compilerArgs += "-g"
+}
 
 dependencies {
     // Example mod dependency with JEI
@@ -119,30 +125,60 @@ dependencies {
 
     // implementation "net.neoforged:neoforge:${neo_version}"
 
-    implementation(jarJar("net.kyori:adventure-api:4.17.0")) {
+    /* compileOnly(jarJar("net.kyori:adventure-api:4.17.0")) {
         exclude(module: "adventure-bom")
         exclude(module: "annotations")
     }
-    implementation(jarJar("net.kyori:adventure-text-serializer-gson:4.17.0")) {
+    compileOnly(jarJar("net.kyori:adventure-text-serializer-gson:4.17.0")) {
         exclude(module: "adventure-bom")
         exclude(module: "adventure-api")
         exclude(module: "annotations")
         exclude(module: "auto-service-annotations")
         exclude(module: "gson")
-    }
-
-    implementation(jarJar("net.kyori:adventure-platform-neoforge:6.0.0"))
+    } */
 
-    implementation(jarJar(project(path: ":common", configuration: "shadow")))
-
-
-
-    // additionalRuntimeClasspath("com.cssbham:common:.*")
-    additionalRuntimeClasspath("net.kyori:adventure-api:4.17.0")
-    additionalRuntimeClasspath("net.kyori:adventure-text-serializer-gson:4.17.0")
+    jarJar(implementation(group: "net.kyori", name: "adventure-platform-neoforge", version: "6.0.0") {
+        exclude(module: "annotations")
+        exclude(module: "auto-service-annotations")
+        exclude(module: "gson")
+    })
+    jarJar(implementation ("net.dv8tion:JDA:5.0.2") {
+        exclude(module: "opus-java")
+        exclude(module: "annotations")
+        exclude(module: "slf4j-api")
+    })
+    jarJar(implementation ("club.minnced:discord-webhooks:0.8.4") {
+        exclude(module: "slf4j-api")
+    })
+    jarJar(implementation("org.yaml:snakeyaml:2.2"))
+    jarJar(implementation("com.neovisionaries:nv-websocket-client:2.14"))
+    jarJar(implementation("com.squareup.okhttp3:okhttp:4.12.0"))
+    jarJar(implementation("org.apache.commons:commons-collections4:4.4"))
+    jarJar(implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10"))
+    jarJar(implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.10"))
+    jarJar(implementation("org.jetbrains.kotlin:kotlin-stdlib-common:1.9.10"))
+    jarJar(implementation("org.jetbrains.kotlin:kotlin-stdlib:1.9.10"))
+    jarJar(implementation("com.squareup.okio:okio:3.6.0"))
+    jarJar(implementation("net.sf.trove4j:core:3.1.0"))
+    jarJar(implementation("com.fasterxml.jackson.core:jackson-core:2.17.2"))
+    jarJar(implementation("com.fasterxml.jackson:jackson-bom:2.17.2"))
+    jarJar(implementation("com.fasterxml.jackson.core:jackson-annotations:2.17.2"))
+    jarJar(implementation("com.fasterxml.jackson.core:jackson-databind:2.17.2"))
+    jarJar(implementation("org.json:json:20230618"))
+
+    shadow(compileOnly(project(path: ":common"))) {
+        transitive(false)
+    }
+    // additionalRuntimeClasspath("org.yaml:snakeyaml:2.2")
+    // additionalRuntimeClasspath("net.dv8tion:JDA:5.0.2")
+    // additionalRuntimeClasspath("club.minnced:discord-webhooks:0.8.4")
+    // additionalRuntimeClasspath("com.cssbham:common:1.0.0")
+    // additionalRuntimeClasspath("net.kyori:adventure-api:4.17.0")
+    // additionalRuntimeClasspath("net.kyori:adventure-platform-neoforge:6.0.0")
+    // additionalRuntimeClasspath("net.kyori:adventure-text-serializer-gson:4.17.0")
 }
 
-tasks.shadowJar.enabled = false
+// tasks.shadowJar.enabled = false
 
 // This block of code expands all declared replace properties in the specified resource targets.
 // A missing property will result in an error. Properties are expanded using ${} Groovy notation.
@@ -179,3 +215,52 @@ idea {
         downloadJavadoc = true
     }
 }
+/*
+tasks.shadowJar {
+    configurations = [project.configurations.shadow]
+
+    dependencies {
+        exclude(dependency("net.kyori:adventure-platform-neoforge:6.0.0"))
+    }
+
+    doLast {
+        copy {
+            from("build/generated/jarjar/META-INF/jarjar")
+            into("META-INF/jarjar")
+        }
+    }
+
+    // exclude("net/**")
+    // exclude("META-INF/services/*")
+    // minimize()
+
+    archiveFileName = "cssminecraft-neoforge-${project.version}.jar"
+}
+
+ */
+
+tasks.shadowJar.enabled = false
+/*
+tasks.register("shadeCommon") {
+    copy {
+        from("../common/build/classes/main/com/cssbham/cssminecraft/common")
+        into("build/classes/")
+    }
+} */
+
+tasks.jar {
+    from("../common/build/classes/java/main/com/cssbham/cssminecraft/common") {
+          into("com/cssbham/cssminecraft/common")
+    }
+}
+/*
+tasks.register("copyJarJar") {
+    copy {
+        from ("build/generated/jarjar/META-INF/jarjar")
+        into("META-INF/jarjar")
+    }
+}
+
+tasks.copyJarJar.dependsOn(jarJar)
+*/
+

neoforge/src/main/java/com/cssbham/cssminecraft/neoforge/listener/ForgeEventAdapter.java

@@ -10,6 +10,7 @@
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.entity.player.Player;
+import net.neoforged.bus.api.EventPriority;
 import net.neoforged.bus.api.SubscribeEvent;
 import net.neoforged.neoforge.common.NeoForge;
 import net.neoforged.neoforge.event.ServerChatEvent;
@@ -42,7 +43,7 @@ private void dispatchEvent(Event event) {
         executor.doAsync(() -> eventBus.dispatch(event));
     }
 
-    @SubscribeEvent
+    @SubscribeEvent(priority = EventPriority.HIGH)
     public void onChat(ServerChatEvent event) {
         ServerPlayer player = event.getPlayer();
         String name = event.getUsername();

neoforge/src/main/templates/META-INF/neoforge.mods.toml

@@ -4,7 +4,7 @@ loaderVersion="${loader_version_range}" #mandatory
 license="${mod_license}"
 
 [[mods]] #mandatory
-modId="${mod_id}"
+modId="cssminecraft"
 version="${mod_version}"
 displayName="${mod_name}"
 logoFile="logo.png"
@@ -13,23 +13,23 @@ description='''
   CSS' Minecraft plugin
   '''
 
-[[dependencies."${mod_id}"]]
+[[dependencies.cssminecraft]]
 modId="neoforge"
 type="required"
 versionRange="${neo_version_range}"
 ordering="NONE"
 side="BOTH"
 
-[[dependencies."${mod_id}"]]
+[[dependencies.cssminecraft]]
 modId="minecraft"
 type="required"
 versionRange="${minecraft_version_range}"
 ordering="NONE"
 side="BOTH"
 
-[[dependencies."${mod_id}"]]
+[[dependencies.cssminecraft]]
 modId="luckperms"
-type="optional"
+type="required"
 versionRange="*"
-ordering="AFTER"
+ordering="BEFORE"
 side="SERVER"