From 05c5014829dfecf4acaa9b7780c7ef4c5e978483 Mon Sep 17 00:00:00 2001 From: 3944Realms Date: Mon, 20 Apr 2026 23:26:41 +0800 Subject: [PATCH] =?UTF-8?q?2026-04-20-1=20project=5Fversion=3D4.4.14.19=20?= =?UTF-8?q?*=20=E4=BF=AE=E5=A4=8Dclear=E6=8C=87=E4=BB=A4=E6=9E=84=E5=BB=BA?= =?UTF-8?q?=E5=91=BD=E4=BB=A4=E6=97=B6=E6=8A=9B=E5=87=BA=E8=BD=AC=E5=9E=8B?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E5=AF=BC=E8=87=B4=E6=97=A0=E6=B3=95=E6=AD=A3?= =?UTF-8?q?=E7=A1=AE=E5=8F=91=E9=80=81=E6=8C=87=E4=BB=A4=20*=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8DChangePolicy=E5=A2=9E=E5=8A=A0=E5=92=8C=E5=87=8F?= =?UTF-8?q?=E5=B0=8Findex=E5=86=99=E5=8F=8D=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-and-release.yml | 1 + Common/build.gradle | 30 +++++++++++++++---- .../ServerDLPBHandlerContextWrapper.java | 2 +- CommonApi/build.gradle | 23 ++++++++++++++ .../api/message/argType/ChangePolicy.java | 10 +++---- build.gradle | 26 ++++++++++++++-- gradle.properties | 8 ++--- versionlog.txt | 5 ++++ 8 files changed, 88 insertions(+), 17 deletions(-) diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml index 1c662fc..f9ad125 100644 --- a/.github/workflows/build-and-release.yml +++ b/.github/workflows/build-and-release.yml @@ -41,6 +41,7 @@ jobs: release: needs: build runs-on: ubuntu-latest + if: github.ref_name == 'rebuild-release' # 仅在 release 分支执行 release job steps: # 下载构建产物 diff --git a/Common/build.gradle b/Common/build.gradle index 7c45839..c31cb8a 100644 --- a/Common/build.gradle +++ b/Common/build.gradle @@ -21,6 +21,13 @@ base { repositories { mavenCentral() } +javadoc { + options.encoding = 'UTF-8' + options.charSet = 'UTF-8' + // 添加以下选项以减少警告 + options.addBooleanOption('Xdoclint:none', true) + options.addStringOption('Xmaxwarns', '10') +} dependencies { // Common 依赖 CommonApi @@ -28,13 +35,13 @@ dependencies { } // Sources JAR -task sourcesJar(type: Jar) { +tasks.register('sourcesJar', Jar) { from sourceSets.main.allSource archiveClassifier = 'sources' } // Javadoc JAR -task javadocJar(type: Jar) { +tasks.register('javadocJar', Jar) { dependsOn javadoc from javadoc.destinationDir archiveClassifier = 'javadoc' @@ -69,9 +76,22 @@ publishing { artifact shadowJar artifact sourcesJar artifact javadocJar - groupId = project.group.toString() - artifactId = base.archivesName.get() - version = project.version.toString() + pom { + name = "${project_name}" + description = "${project_name}" + url = "https://github.com/3944Realms/DG_LAB_DEVELOP" + + licenses { + license { + name = 'Apache License 2.0' + url = 'https://www.apache.org/licenses/LICENSE-2.0.html' + } + } + issueManagement { + system = 'GitHub Issues' + url = 'https://github.com/3944Realms/DG_LAB_DEVELOP/issues' + } + } } } } diff --git a/Common/src/main/java/com/r3944realms/dg_lab/websocket/handler/server/ServerDLPBHandlerContextWrapper.java b/Common/src/main/java/com/r3944realms/dg_lab/websocket/handler/server/ServerDLPBHandlerContextWrapper.java index ef4b53c..846fab0 100644 --- a/Common/src/main/java/com/r3944realms/dg_lab/websocket/handler/server/ServerDLPBHandlerContextWrapper.java +++ b/Common/src/main/java/com/r3944realms/dg_lab/websocket/handler/server/ServerDLPBHandlerContextWrapper.java @@ -299,7 +299,7 @@ public class ServerDLPBHandlerContextWrapper extends AbstractDgLabPowerBoxHandle case CLEAR -> { if (Connections().containsKey(targetId)) { ChannelHandlerContext client = Connections().get(targetId); - String Channel = ((String[])argsArray)[0]; + Integer Channel = ((Integer[])argsArray)[0]; String messageCommand = "clear-" + Channel; PowerBoxMessage strengthUpdate = PowerBoxMessage.createPowerBoxMessage("msg", clientId, targetId, messageCommand, role, new WebSocketApplicationRole("Ap" + targetId)); TryCatch(n -> ((ServerOperation)operation).ClearMessageHandler(strengthUpdate)); diff --git a/CommonApi/build.gradle b/CommonApi/build.gradle index 06d96df..37b1ed7 100644 --- a/CommonApi/build.gradle +++ b/CommonApi/build.gradle @@ -34,6 +34,14 @@ sourceSets { dependencies { } +javadoc { + options.encoding = 'UTF-8' + options.charSet = 'UTF-8' + // 添加以下选项以减少警告 + options.addBooleanOption('Xdoclint:none', true) + options.addStringOption('Xmaxwarns', '10') +} + tasks.register('sourcesJar', Jar) { archiveClassifier.set('sources') @@ -71,6 +79,21 @@ publishing { from components.java artifact(tasks.named("sourcesJar")) artifact(tasks.named("javadocJar")) + pom { + name = "${project_name}" + description = "The API for ${project_name}" + url = "https://github.com/3944Realms/DG_LAB_DEVELOP" + licenses { + license { + name = 'Apache License 2.0' + url = 'https://www.apache.org/licenses/LICENSE-2.0.html' + } + } + issueManagement { + system = 'GitHub Issues' + url = 'https://github.com/3944Realms/DG_LAB_DEVELOP/issues' + } + } } } } \ No newline at end of file diff --git a/CommonApi/src/main/java/com/r3944realms/dg_lab/api/message/argType/ChangePolicy.java b/CommonApi/src/main/java/com/r3944realms/dg_lab/api/message/argType/ChangePolicy.java index caaff8b..4af6efa 100644 --- a/CommonApi/src/main/java/com/r3944realms/dg_lab/api/message/argType/ChangePolicy.java +++ b/CommonApi/src/main/java/com/r3944realms/dg_lab/api/message/argType/ChangePolicy.java @@ -20,14 +20,14 @@ package com.r3944realms.dg_lab.api.message.argType; * 修改策略 */ public enum ChangePolicy { - /** - * 增加 - */ - INCREASE(0), /** * 减少 */ - DECREASE(1), + DECREASE(0), + /** + * 增加 + */ + INCREASE(1), /** * 转变 */ diff --git a/build.gradle b/build.gradle index 5453421..44abf0f 100644 --- a/build.gradle +++ b/build.gradle @@ -4,8 +4,8 @@ plugins { id("maven-publish") } -group = "top.r3944realms.superleadrope" -version = "1.0-SNAPSHOT" +group = "${project_version}" +version = "${project_version}" allprojects { repositories { @@ -16,6 +16,7 @@ allprojects { subprojects { apply { plugin('java') + plugin("maven-publish") } java { @@ -42,4 +43,25 @@ subprojects { tasks.test { useJUnitPlatform() } + + tasks.withType(PublishToMavenRepository) { + dependsOn assemble + } + + publishing { + repositories { + maven { + name = "local" + url = layout.buildDirectory.dir("repo") + } + maven { + name = 'LTDNexus' + url = 'https://nexus.bot.leisuretimedock.top/repository/maven-releases/' + credentials { + username = System.getenv('LTDNexusUsername') ?: '' + password = System.getenv('LTDNexusPassword') ?: '' + } + } + } + } } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 053730b..b9761af 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,13 +1,13 @@ # Gradle settings org.gradle.jvmargs=-Xmx3G -org.gradle.daemon=true +org.gradle.daemon=false org.gradle.configureondemand=true -org.gradle.caching=true -org.gradle.configuration-cache=true +org.gradle.caching=false +org.gradle.configuration-cache=false org.gradle.configuration-cache.problems=warn # ROOT project_name=DgLab -project_version=4.4.14.18 +project_version=4.4.14.19 project_group=top.r3944realms.dg_lab # API diff --git a/versionlog.txt b/versionlog.txt index 1c762b6..9eb1966 100644 --- a/versionlog.txt +++ b/versionlog.txt @@ -2,6 +2,11 @@ 统一用4位版本，对于测试性更新统一在其后加-Beta。 修复问题更新为加0.0.0.1，添加/移除新特性加0.0.1.0，小部分重构更新加0.1.0.0，大量重构加1.0.0.0 +2026-04-20-1 +project_version=4.4.14.19 +* 修复clear指令构建命令时抛出转型异常导致无法正确发送指令 +* 修复ChangePolicy增加和减小index写反的问题 + 2025-09-29-1 project_version=4.4.14.18 * 提取Server/Client接口