[fix]configの修正

nova-27 · Dec 30, 2021 · 6d7b12b · 6d7b12b
1 parent e846d38
commit 6d7b12b
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 17 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,14 +1,10 @@
-/*
- * This file was generated by the Gradle 'init' task.
- */
-
 plugins {
     id 'java'
     id 'com.github.johnrengelman.shadow' version '7.0.0'
 }
 
 repositories {
-    mavenCentral() // for transitive dependencies
+    mavenCentral()
     maven {
         name 'm2-dv8tion'
         url 'https://m2.dv8tion.net/releases'
@@ -19,7 +15,6 @@ repositories {
 }
 
 dependencies {
-    // implementation 'org.slf4j:slf4j-jdk14:1.7.30'
     compileOnly('net.md-5:bungeecord-api:1.18-R0.1-SNAPSHOT')
     implementation("net.dv8tion:JDA:5.0.0-alpha.3") {
         exclude module: 'opus-java'
@@ -33,13 +28,18 @@ dependencies {
     compileOnly(files('libs/LunaChat.jar'))
 }
 
+processResources {
+    filesMatching('bungee.yml') {
+        expand 'pluginVersion': version
+    }
+}
+
 shadowJar {
     relocate 'org.bstats', 'work.novablog.mcplugin.discordconnect.util'
 }
 
 group = 'work.novablog.mcplugin'
 version = '2.4'
-description = 'DiscordConnect'
 java.sourceCompatibility = JavaVersion.VERSION_1_8
 
 tasks.withType(JavaCompile) {

diff --git a/settings.gradle b/settings.gradle
@@ -1,5 +1 @@
-/*
- * This file was generated by the Gradle 'init' task.
- */
-
-rootProject.name = 'discordconnect'
+rootProject.name = 'DiscordConnect'
diff --git a/src/main/java/work/novablog/mcplugin/discordconnect/DiscordConnect.java b/src/main/java/work/novablog/mcplugin/discordconnect/DiscordConnect.java
@@ -26,7 +26,7 @@
 import java.util.Properties;
 
 public final class DiscordConnect extends Plugin {
-    private static final int CONFIG_LATEST = 3;
+    private static final int CONFIG_LATEST = 4;
     private static final String pluginDownloadLink = "https://github.com/nova-27/DiscordConnect/releases";
 
     private static DiscordConnect instance;

diff --git a/src/main/resources/bungee.yml b/src/main/resources/bungee.yml
@@ -1,5 +1,5 @@
 name: DiscordConnect
-version: "2.4"
+version: ${pluginVersion}
 author: nova27
 main: work.novablog.mcplugin.discordconnect.DiscordConnect
 description: "Mutual chat transmission between Discord and Minecraft."

diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
@@ -5,11 +5,11 @@ playingGameName: サーバー稼働中！（{players}/{max}人）
 
 prefix: "!"
 toMinecraftFormat: "§9[Discord§7({channel_name})§9] §f<{name}>"
-toDiscordFormat: "*({server})* **{sender}** : {message}"
+toDiscordFormat: "*({server})* **{sender}** : {original}"
 updateCheck: true
 
 # LunaChat使用時にのみ有効 (Only when using the LunaChat plugin)
-japanizeFormat: "*({server})* **{sender}** __JP__: {japanized}"
+japanizeFormat: "*({server})* **{sender}** : {original} ({japanized})"
 
 # この値は変更しないでください！ (Don't change the value!)
-configVersion: 3
+configVersion: 4