From 3f4427ff8ccfd8f99bc09f9965edf96842c0bd48 Mon Sep 17 00:00:00 2001 From: Coloryr <402067010@qq.com> Date: Mon, 20 May 2024 10:31:55 +0800 Subject: [PATCH] up --- core/AllMusic.java | 4 ++-- core/objs/config/ConfigObj.java | 1 + fabric_1_16_5/gradle.properties | 2 +- fabric_1_18_2/gradle.properties | 2 +- fabric_1_19_2/gradle.properties | 2 +- fabric_1_19_3/gradle.properties | 2 +- fabric_1_20/gradle.properties | 2 +- fabric_1_20_2/gradle.properties | 2 +- fabric_1_20_6/gradle.properties | 2 +- folia/build.gradle | 2 +- folia/src/main/resources/plugin.yml | 2 +- forge_1_12_2/build.gradle | 2 +- forge_1_12_2/src/main/resources/mcmod.info | 2 +- forge_1_16_5/build.gradle | 2 +- forge_1_16_5/src/main/resources/META-INF/mods.toml | 2 +- forge_1_18_2/build.gradle | 2 +- forge_1_19_2/build.gradle | 2 +- forge_1_19_2/src/main/resources/META-INF/mods.toml | 2 +- forge_1_19_3/build.gradle | 2 +- forge_1_19_3/src/main/resources/META-INF/mods.toml | 2 +- forge_1_20/gradle.properties | 2 +- neoforge_1_20_4/gradle.properties | 2 +- neoforge_1_20_5/gradle.properties | 2 +- server/src/main/resources/plugin.yml | 2 +- server_top/build.gradle | 2 +- server_top/src/main/resources/bungee.yml | 2 +- 26 files changed, 27 insertions(+), 26 deletions(-) diff --git a/core/AllMusic.java b/core/AllMusic.java index 09887e49..53a59a6d 100644 --- a/core/AllMusic.java +++ b/core/AllMusic.java @@ -35,7 +35,7 @@ public class AllMusic { /** * 插件版本号 */ - public static final String version = "3.1.1"; + public static final String version = "3.1.2"; /** * 配置文件版本号 */ @@ -421,7 +421,7 @@ public class AllMusic { cookie = new Gson().fromJson(bf, CookieObj.class); bf.close(); reader.close(); - if (cookie == null) { + if (cookie == null || cookie.cookieStore == null) { cookie = new CookieObj(); saveCookie(); } diff --git a/core/objs/config/ConfigObj.java b/core/objs/config/ConfigObj.java index 1894dc8a..42283acf 100644 --- a/core/objs/config/ConfigObj.java +++ b/core/objs/config/ConfigObj.java @@ -225,6 +225,7 @@ public class ConfigObj { limit = LimitObj.make(); economy = EconomyObj.make(); funConfig = FunConfigObj.make(); + cost = CostObj.make(); ktvMode = true; ktvLyricDelay = 0; lyricDelay = 0; diff --git a/fabric_1_16_5/gradle.properties b/fabric_1_16_5/gradle.properties index 8bd3a28a..dd4a2800 100644 --- a/fabric_1_16_5/gradle.properties +++ b/fabric_1_16_5/gradle.properties @@ -10,7 +10,7 @@ loader_version=0.15.11 fabric_kotlin_version=1.10.19+kotlin.1.9.23 # Mod Properties -mod_version = 3.1.1 +mod_version = 3.1.2 maven_group = com.coloryr.allmusic.server archives_base_name =[fabric-1.16.5]AllMusic_Server diff --git a/fabric_1_18_2/gradle.properties b/fabric_1_18_2/gradle.properties index 1a330ef0..60ee741d 100644 --- a/fabric_1_18_2/gradle.properties +++ b/fabric_1_18_2/gradle.properties @@ -10,7 +10,7 @@ loader_version=0.15.11 fabric_kotlin_version=1.10.19+kotlin.1.9.23 # Mod Properties -mod_version=3.1.1 +mod_version=3.1.2 maven_group=com.coloryr.allmusic.server archives_base_name=[fabric-1.18.2]AllMusic_Server diff --git a/fabric_1_19_2/gradle.properties b/fabric_1_19_2/gradle.properties index 215059a1..610cffc7 100644 --- a/fabric_1_19_2/gradle.properties +++ b/fabric_1_19_2/gradle.properties @@ -10,7 +10,7 @@ loader_version=0.15.11 fabric_kotlin_version=1.10.19+kotlin.1.9.23 # Mod Properties -mod_version = 3.1.1 +mod_version = 3.1.2 maven_group = com.coloryr.allmusic.server archives_base_name =[fabric-1.19.2]AllMusic_Server diff --git a/fabric_1_19_3/gradle.properties b/fabric_1_19_3/gradle.properties index cc1671a7..5ecb652f 100644 --- a/fabric_1_19_3/gradle.properties +++ b/fabric_1_19_3/gradle.properties @@ -10,7 +10,7 @@ loader_version=0.15.11 fabric_kotlin_version=1.10.19+kotlin.1.9.23 # Mod Properties -mod_version = 3.1.1 +mod_version = 3.1.2 maven_group = com.coloryr.allmusic.server archives_base_name =[fabric-1.19.3]AllMusic_Server diff --git a/fabric_1_20/gradle.properties b/fabric_1_20/gradle.properties index 34e72301..db314a00 100644 --- a/fabric_1_20/gradle.properties +++ b/fabric_1_20/gradle.properties @@ -10,7 +10,7 @@ loader_version=0.15.11 fabric_kotlin_version=1.10.19+kotlin.1.9.23 # Mod Properties -mod_version = 3.1.1 +mod_version = 3.1.2 maven_group = com.coloryr.allmusic.server archives_base_name =[fabric-1.20]AllMusic_Server diff --git a/fabric_1_20_2/gradle.properties b/fabric_1_20_2/gradle.properties index 6d6ef5be..28def413 100644 --- a/fabric_1_20_2/gradle.properties +++ b/fabric_1_20_2/gradle.properties @@ -10,7 +10,7 @@ loader_version=0.15.11 fabric_kotlin_version=1.10.19+kotlin.1.9.23 # Mod Properties -mod_version = 3.1.1 +mod_version = 3.1.2 maven_group = com.coloryr.allmusic.server archives_base_name =[fabric-1.20.2]AllMusic_Server diff --git a/fabric_1_20_6/gradle.properties b/fabric_1_20_6/gradle.properties index d4a6030e..6000031c 100644 --- a/fabric_1_20_6/gradle.properties +++ b/fabric_1_20_6/gradle.properties @@ -10,7 +10,7 @@ loader_version=0.15.11 fabric_kotlin_version=1.10.19+kotlin.1.9.23 # Mod Properties -mod_version = 3.1.1 +mod_version = 3.1.2 maven_group = com.coloryr.allmusic.server archives_base_name =[fabric-1.20.6]AllMusic_Server diff --git a/folia/build.gradle b/folia/build.gradle index 202a77f1..26551119 100644 --- a/folia/build.gradle +++ b/folia/build.gradle @@ -3,7 +3,7 @@ plugins { id 'maven-publish' id 'com.github.johnrengelman.shadow' version '7.1.2' } -version = "3.1.0" +version = "3.1.2" archivesBaseName = "[folia]AllMusic_Server" diff --git a/folia/src/main/resources/plugin.yml b/folia/src/main/resources/plugin.yml index 82b72dd9..8890c72d 100644 --- a/folia/src/main/resources/plugin.yml +++ b/folia/src/main/resources/plugin.yml @@ -1,7 +1,7 @@ name: AllMusic3 main: com.coloryr.allmusic.server.AllMusicFolia author: Color_yr -version: 3.1.1 +version: 3.1.2 folia-supported: true softdepend: [PlaceholderAPI, Vault, Essentials, CMI] api-version: 1.19 diff --git a/forge_1_12_2/build.gradle b/forge_1_12_2/build.gradle index 329c89d8..4225180e 100644 --- a/forge_1_12_2/build.gradle +++ b/forge_1_12_2/build.gradle @@ -16,7 +16,7 @@ plugins { apply plugin: 'net.minecraftforge.gradle' //Only edit below this line, the above code adds and enables the necessary things for Forge to be setup. -version = '3.1.1' +version = '3.1.2' group = "com.coloryr.allmusic.server" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "[forge-1.12.2]AllMusic_Server" diff --git a/forge_1_12_2/src/main/resources/mcmod.info b/forge_1_12_2/src/main/resources/mcmod.info index 03983d8a..7f51c1d0 100644 --- a/forge_1_12_2/src/main/resources/mcmod.info +++ b/forge_1_12_2/src/main/resources/mcmod.info @@ -3,7 +3,7 @@ "modid": "allmusic_server", "name": "AllMusic Server", "description": "AllMusic Server Mod", - "version": "3.1.1", + "version": "3.1.2", "mcversion": "1.12.2", "url": "https://github.com/Coloryr/AllMusic_Server", "updateUrl": "", diff --git a/forge_1_16_5/build.gradle b/forge_1_16_5/build.gradle index d1c2d284..d8af6342 100644 --- a/forge_1_16_5/build.gradle +++ b/forge_1_16_5/build.gradle @@ -19,7 +19,7 @@ apply plugin: 'eclipse' apply plugin: 'maven-publish' apply plugin: 'kotlin' -version = '3.1.1' +version = '3.1.2' group = 'com.coloryr.allmusic.server' // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = '[forge-1.16.5]AllMusic_Server' diff --git a/forge_1_16_5/src/main/resources/META-INF/mods.toml b/forge_1_16_5/src/main/resources/META-INF/mods.toml index fe93a57c..070a2561 100644 --- a/forge_1_16_5/src/main/resources/META-INF/mods.toml +++ b/forge_1_16_5/src/main/resources/META-INF/mods.toml @@ -20,7 +20,7 @@ modId="allmusic_server" #mandatory # The version number of the mod - there's a few well known ${} variables useable here or just hardcode it # ${file.jarVersion} will substitute the value of the Implementation-Version as read from the mod's JAR file metadata # see the associated build.gradle script for how to populate this completely automatically during a build -version="3.1.1" #mandatory +version="3.1.2" #mandatory # A display name for the mod displayName="AllMusic Server" #mandatory # A URL to query for updates for this mod. See the JSON update specification https://mcforge.readthedocs.io/en/latest/gettingstarted/autoupdate/ diff --git a/forge_1_18_2/build.gradle b/forge_1_18_2/build.gradle index fa3bc731..ed9f1486 100644 --- a/forge_1_18_2/build.gradle +++ b/forge_1_18_2/build.gradle @@ -19,7 +19,7 @@ plugins { apply plugin: 'net.minecraftforge.gradle' -version = '3.1.1' +version = '3.1.2' group = 'com.coloryr.allmusic.server' // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = '[forge-1.18.2]AllMusic_Server' diff --git a/forge_1_19_2/build.gradle b/forge_1_19_2/build.gradle index 461ceb86..78a5c876 100644 --- a/forge_1_19_2/build.gradle +++ b/forge_1_19_2/build.gradle @@ -7,7 +7,7 @@ plugins { id 'org.jetbrains.kotlin.plugin.serialization' version '1.8.21' } -version = '3.1.1' +version = '3.1.2' group = 'com.coloryr.allmusic.server' // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = '[forge-1.19.2]AllMusic_Server' diff --git a/forge_1_19_2/src/main/resources/META-INF/mods.toml b/forge_1_19_2/src/main/resources/META-INF/mods.toml index 8980a0a9..29601c2e 100644 --- a/forge_1_19_2/src/main/resources/META-INF/mods.toml +++ b/forge_1_19_2/src/main/resources/META-INF/mods.toml @@ -19,7 +19,7 @@ modId="allmusic_server" #mandatory # The version number of the mod - there's a few well known ${} variables useable here or just hardcode it # ${file.jarVersion} will substitute the value of the Implementation-Version as read from the mod's JAR file metadata # see the associated build.gradle script for how to populate this completely automatically during a build -version="3.1.1" #mandatory +version="3.1.2" #mandatory # A display name for the mod displayName="AllMusic Server" #mandatory # A URL to query for updates for this mod. See the JSON update specification https://mcforge.readthedocs.io/en/latest/gettingstarted/autoupdate/ diff --git a/forge_1_19_3/build.gradle b/forge_1_19_3/build.gradle index c9af9136..7df3c7a2 100644 --- a/forge_1_19_3/build.gradle +++ b/forge_1_19_3/build.gradle @@ -7,7 +7,7 @@ plugins { id 'org.jetbrains.kotlin.plugin.serialization' version '1.9.0' } -version = '3.1.1' +version = '3.1.2' group = 'com.coloryr.allmusic.server' // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = '[forge-1.19.3]AllMusic_Server' diff --git a/forge_1_19_3/src/main/resources/META-INF/mods.toml b/forge_1_19_3/src/main/resources/META-INF/mods.toml index b63650a2..9e863a90 100644 --- a/forge_1_19_3/src/main/resources/META-INF/mods.toml +++ b/forge_1_19_3/src/main/resources/META-INF/mods.toml @@ -17,7 +17,7 @@ license="GPL-3.0" # The modid of the mod modId="allmusic_server" #mandatory # The version number of the mod -version="3.1.1" #mandatory +version="3.1.2" #mandatory # A display name for the mod displayName="AllMusic Server" #mandatory # A URL to query for updates for this mod. See the JSON update specification https://docs.minecraftforge.net/en/latest/misc/updatechecker/ diff --git a/forge_1_20/gradle.properties b/forge_1_20/gradle.properties index e9ab4483..889b7a19 100644 --- a/forge_1_20/gradle.properties +++ b/forge_1_20/gradle.properties @@ -48,7 +48,7 @@ mod_name=AllMusic Server # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default. mod_license=GPL-3.0 # The mod version. See https://semver.org/ -mod_version=3.1.1 +mod_version=3.1.2 # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository. # This should match the base package used for the mod sources. # See https://maven.apache.org/guides/mini/guide-naming-conventions.html diff --git a/neoforge_1_20_4/gradle.properties b/neoforge_1_20_4/gradle.properties index 07e59ef2..332918b7 100644 --- a/neoforge_1_20_4/gradle.properties +++ b/neoforge_1_20_4/gradle.properties @@ -34,7 +34,7 @@ mod_name=AllMusic Server # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default. mod_license=GPL-3.0 # The mod version. See https://semver.org/ -mod_version=3.1.1 +mod_version=3.1.2 # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository. # This should match the base package used for the mod sources. # See https://maven.apache.org/guides/mini/guide-naming-conventions.html diff --git a/neoforge_1_20_5/gradle.properties b/neoforge_1_20_5/gradle.properties index f9a67ae1..c835bf3d 100644 --- a/neoforge_1_20_5/gradle.properties +++ b/neoforge_1_20_5/gradle.properties @@ -34,7 +34,7 @@ mod_name=AllMusic Server # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default. mod_license=GPL-3.0 # The mod version. See https://semver.org/ -mod_version=3.1.1 +mod_version=3.1.2 # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository. # This should match the base package used for the mod sources. # See https://maven.apache.org/guides/mini/guide-naming-conventions.html diff --git a/server/src/main/resources/plugin.yml b/server/src/main/resources/plugin.yml index 64002202..fd058283 100644 --- a/server/src/main/resources/plugin.yml +++ b/server/src/main/resources/plugin.yml @@ -1,7 +1,7 @@ name: AllMusic3 main: com.coloryr.allmusic.server.AllMusicBukkit author: Color_yr -version: 3.1.1 +version: 3.1.2 softdepend: [PlaceholderAPI, Vault, Essentials, CMI] api-version: 1.13 diff --git a/server_top/build.gradle b/server_top/build.gradle index 6c03cb23..9cea6de8 100644 --- a/server_top/build.gradle +++ b/server_top/build.gradle @@ -3,7 +3,7 @@ plugins { id 'maven-publish' id 'com.github.johnrengelman.shadow' version '6.1.0' } -version = "3.1.1" +version = "3.1.2" archivesBaseName = "[bungeecord_velocity]AllMusic_Server" diff --git a/server_top/src/main/resources/bungee.yml b/server_top/src/main/resources/bungee.yml index 585ec131..657b2cd0 100644 --- a/server_top/src/main/resources/bungee.yml +++ b/server_top/src/main/resources/bungee.yml @@ -1,4 +1,4 @@ name: AllMusic3 main: com.coloryr.allmusic.server.AllMusicBC author: Color_yr -version: 3.1.1 +version: 3.1.2