Merge pull request #2 from 3944Realms/develop

Merge remote-tracking branch 'main/develop' into develop

Author: 3944Realms

.gitattributes

@@ -42,3 +42,4 @@ bin/
 .DS_Store
 
 /output/
+/sc/

.gitignore

@@ -9,6 +9,7 @@ buildscript {
 }
 plugins {
     id 'java'
+    id 'maven-publish'
     id 'com.github.johnrengelman.shadow' version '8.1.1'
 }
 
@@ -25,20 +26,28 @@ dependencies {
     implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.17.0'
     implementation group: 'com.google.guava', name: 'guava', version: '33.3.0-jre'
     implementation group: 'io.netty', name: 'netty-all', version: '4.1.109.Final'
-    implementation 'io.netty:netty-codec-http:4.1.109.Final'
-    implementation 'io.netty:netty-transport:4.1.109.Final'
-    implementation 'io.netty:netty-common:4.1.117.Final'
     implementation group: 'com.google.code.gson', name: 'gson', version: '2.10.1'
     testImplementation platform('org.junit:junit-bom:5.10.0')
     testImplementation 'org.junit.jupiter:junit-jupiter'
     implementation group: 'org.slf4j', name: 'slf4j-api', version: '2.0.16'
 }
 shadowJar {
     destinationDirectory = file('output')
+    relocate 'io.netty', 'com.r3944realms.shadow.netty'
+    relocate 'com.google', 'com.r3944realms.shadow.google'
+    relocate 'org.apache.commons', 'com.r3944realms.shadow.apache.commons'
+    relocate 'org.slf4j', 'com.r3944realms.shadow.slf4j'
+    // 关键：合并服务文件并重写模块描述符
+    mergeServiceFiles()
 }
 test {
     useJUnitPlatform()
 }
+jar {
+    manifest.attributes([
+            "FMLModType": "GAMELIBRARY"
+    ])
+}
 tasks.register('proguard', proguard.gradle.ProGuardTask) {
     dependsOn shadowJar  // 确保先构建 Shadow JAR 再混淆‌:ml-citation{ref="2,3" data="citationList"}
     configuration files('proguard.pro')
@@ -62,3 +71,51 @@ tasks.register('proguard', proguard.gradle.ProGuardTask) {
 
     outjars(layout.buildDirectory.file("libs/${project.name}-obfused.jar"))
 }
+// 打包sourcesJar任务
+tasks.register('sourcesJar', Jar) {
+    dependsOn classes
+
+    from sourceSets.main.allSource
+}
+
+// 打包javadocJar任务
+tasks.register('javadocJar', Jar) {
+    dependsOn javadoc
+
+    from javadoc.destinationDir
+}
+
+// 解决javadoc打包乱码
+javadoc {
+    options {
+        encoding "UTF-8"
+        charSet 'UTF-8'
+        author true
+        version true
+        title "DG_LAB"
+    }
+}
+
+publishing {
+    publications {
+        mavenJava(MavenPublication) {
+            groupId project.group
+            artifactId project.name
+            version project.version
+            from components.java
+            artifact sourcesJar
+            artifact javadocJar
+        }
+    }
+
+    repositories {
+        maven {
+            name "xqsw"
+            url "https://maven.xiaobuawa.top/"
+            credentials {
+                 username project.findProperty("MAVEN_REPO_USER") ?: "" // 仓库发布用户名
+                 password project.findProperty("MAVEN_REPO_PASS") ?: "" // 仓库发布用户密码
+             }
+        }
+    }
+}

.idea/intellij-javadocs-4.0.1.xml

@@ -1,3 +1,3 @@
 
 project_group ='com.r3944realms.dg_lab'
-project_version=2.0.0.5
+project_version=2.0.1.7

build.gradle

@@ -0,0 +1,2 @@
+MAVEN_REPO_USER=xiaobuawa
+MAVEN_REPO_PASS=xiaobuawa

gradle.properties

@@ -3,10 +3,18 @@
 import io.netty.handler.logging.LogLevel;
 import io.netty.handler.logging.LoggingHandler;
 
+/**
+ * The type Dg lab.
+ */
 public class DgLab {
+    /**
+     * The constant LOGGING_HANDLER.
+     */
     public static LoggingHandler LOGGING_HANDLER = new LoggingHandler(LogLevel.DEBUG);
 
     /**
+     * Instantiates a new Dg lab.
+     *
      * @param level Netty日志级别()
      */
     public DgLab(LogLevel level) {

sc/gradle.properties

@@ -2,11 +2,33 @@
 
 import com.r3944realms.dg_lab.websocket.message.data.type.PowerBoxDataType;
 
+/**
+ * The type Power box commands.
+ */
 public final class PowerBoxCommands {
+    /**
+     * The constant STRENGTH.
+     */
     public static final String STRENGTH = "strength";
+    /**
+     * The constant PULSE.
+     */
     public static final String PULSE = "pulse";
+    /**
+     * The constant CLEAR.
+     */
     public static final String CLEAR = "clear";
+    /**
+     * The constant FEEDBACK.
+     */
     public static final String FEEDBACK = "feedback";
+
+    /**
+     * Gets command type.
+     *
+     * @param commandPrefix the command prefix
+     * @return the command type
+     */
     static String getCommandType(PowerBoxDataType commandPrefix) {
         return switch (commandPrefix) {
             case STRENGTH -> STRENGTH;