diff --git a/TODO.txt b/TODO.txt index 144f01e4..a4458dd6 100644 --- a/TODO.txt +++ b/TODO.txt @@ -1 +1,9 @@ -写Config文档 \ No newline at end of file +写Config文档 + +优化config json + +添加关于功能 + +添加admin功能 + +增加英文翻译 \ No newline at end of file diff --git a/build.gradle b/build.gradle index fdea1055..0516937a 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '0.9.9' + id 'fabric-loom' version '0.9.31' } sourceCompatibility = JavaVersion.VERSION_16 @@ -35,7 +35,6 @@ dependencies { include "org.apache.commons:commons-collections4:+" include "org.apache.httpcomponents:httpclient:+" include "org.jetbrains:annotations:+" - //include "org.slf4j:slf4j-api:+" include "com.neovisionaries:nv-websocket-client:+" include "com.fasterxml.jackson.core:jackson-annotations:+" include "com.fasterxml.jackson.core:jackson-core:+" diff --git a/gradle.properties b/gradle.properties index a727fe08..eb6a7f6c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,14 +1,14 @@ # Done to increase the memory available to gradle. -org.gradle.jvmargs=-Xmx1G +org.gradle.jvmargs=-Xmx2G # Fabric Properties # check these on https://fabricmc.net/use -minecraft_version=1.17 -yarn_mappings=1.17+build.9 +minecraft_version=1.17.1 +yarn_mappings=1.17.1+build.23 loader_version=0.11.6 # Mod Properties -mod_version=1.17-1.6.0 +mod_version=1.17-1.7.1 maven_group=top.xujiayao archives_base_name=MCDiscordChat # Dependencies # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api -fabric_version=0.36.0+1.17 +fabric_version=0.37.0+1.17 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 69a97150..05679dc3 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/java/top/xujiayao/mcdiscordchat/utils/ConfigManager.java b/src/main/java/top/xujiayao/mcdiscordchat/utils/ConfigManager.java index c90f7c98..794306ab 100644 --- a/src/main/java/top/xujiayao/mcdiscordchat/utils/ConfigManager.java +++ b/src/main/java/top/xujiayao/mcdiscordchat/utils/ConfigManager.java @@ -32,11 +32,11 @@ public class ConfigManager { System.err.println("--------------------"); System.err.println("错误:找不到配置文件或配置文件为空!"); - System.err.println("Error: The config file cannot be found / is empty!"); - System.err.println(""); + System.err.println("Error: The config file cannot be found or is empty!"); + System.err.println(); System.err.println("请在重新启动服务器前编辑 /config/mcdiscordchat.json 以配置 MCDiscordChat!"); System.err.println("Please edit /config/mcdiscordchat.json to configure MCDiscordChat before restarting the server!"); - System.err.println(""); + System.err.println(); System.err.println("正在停止服务器..."); System.err.println("Stopping the server..."); System.err.println("--------------------"); @@ -56,7 +56,7 @@ public class ConfigManager { String temp; StringBuilder jsonString = new StringBuilder(); - while ((temp = reader.readLine())!= null) { + while ((temp = reader.readLine()) != null) { jsonString.append(temp); } diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index ff856561..4f82a9ac 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -1,31 +1,31 @@ { - "schemaVersion": 1, - "id": "mcdiscordchat", - "version": "${version}", - "name": "MCDiscordChat", - "description": "A Discord <-> Minecraft chat bridge.", - "authors": [ - "Xujiayao" - ], - "contact": { - "homepage": "https://blog.xujiayao.top/", - "issues": "https://github.com/Xujiayao/MCDiscordChat/issues", - "sources": "https://github.com/Xujiayao/MCDiscordChat" - }, - "license": "MIT", - "environment": "server", - "entrypoints": { - "server": [ - "top.xujiayao.mcdiscordchat.Main" - ] - }, - "mixins": [ - "mcdiscordchat.mixins.json" - ], - "depends": { - "fabricloader": ">=0.11.6", - "fabric": "*", - "minecraft": "1.17.x", - "java": ">=16" - } + "schemaVersion": 1, + "id": "mcdiscordchat", + "version": "${version}", + "name": "MCDiscordChat", + "description": "A Discord <-> Minecraft chat bridge.", + "authors": [ + "Xujiayao" + ], + "contact": { + "homepage": "https://blog.xujiayao.top/", + "issues": "https://github.com/Xujiayao/MCDiscordChat/issues", + "sources": "https://github.com/Xujiayao/MCDiscordChat" + }, + "license": "MIT", + "environment": "server", + "entrypoints": { + "server": [ + "top.xujiayao.mcdiscordchat.Main" + ] + }, + "mixins": [ + "mcdiscordchat.mixins.json" + ], + "depends": { + "fabricloader": ">=0.11.6", + "fabric": "*", + "minecraft": "1.17.x", + "java": ">=16" + } } diff --git a/src/main/resources/mcdiscordchat.mixins.json b/src/main/resources/mcdiscordchat.mixins.json index f319830f..6d8e503e 100644 --- a/src/main/resources/mcdiscordchat.mixins.json +++ b/src/main/resources/mcdiscordchat.mixins.json @@ -1,14 +1,14 @@ { - "required": true, - "package": "top.xujiayao.mcdiscordchat.mixins", - "compatibilityLevel": "JAVA_16", - "mixins": [ - "MixinPlayerAdvancementTracker", - "MixinPlayerManager", - "MixinServerPlayerEntity", - "MixinServerPlayNetworkHandler" - ], - "injectors": { - "defaultRequire": 1 - } + "required": true, + "package": "top.xujiayao.mcdiscordchat.mixins", + "compatibilityLevel": "JAVA_16", + "mixins": [ + "MixinPlayerAdvancementTracker", + "MixinPlayerManager", + "MixinServerPlayerEntity", + "MixinServerPlayNetworkHandler" + ], + "injectors": { + "defaultRequire": 1 + } }