6.0.1

KessokuTeaTime · Feb 23, 2024 · b63ab97 · b63ab97
1 parent 212eb05
commit b63ab97
Show file tree

Hide file tree

Showing 4 changed files with 148 additions and 113 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
 maven-group = "band.kessokuteatime"
 archives-name = "splasher"
-mod = "6.0.0"
+mod = "6.0.1"
 
 minecraft = "1.20"
 yarn = "1.20+build.1"

diff --git a/src/main/java/band/kessokuteatime/splasher/config/SplasherConfig.java b/src/main/java/band/kessokuteatime/splasher/config/SplasherConfig.java
@@ -1,8 +1,11 @@
 package band.kessokuteatime.splasher.config;
 
+import band.kessokuteatime.splasher.Splasher;
 import me.shedaniel.autoconfig.ConfigData;
 import me.shedaniel.autoconfig.annotation.Config;
 import me.shedaniel.autoconfig.annotation.ConfigEntry;
+import me.shedaniel.clothconfig2.gui.entries.SelectionListEntry;
+import org.jetbrains.annotations.NotNull;
 
 @Config(name = "splasher")
 public class SplasherConfig implements ConfigData {
@@ -24,9 +27,9 @@ public class SplasherConfig implements ConfigData {
 
 	@ConfigEntry.Category("texts")
 	@ConfigEntry.Gui.EnumHandler(option = ConfigEntry.Gui.EnumHandler.EnumDisplayOption.BUTTON)
-	public Source source = Source.VANILLA;
+	public Source source = Source.VANILLA_AND_CUSTOM;
 
-	public enum RandomRate {
+	public enum RandomRate implements SelectionListEntry.Translatable {
 		NEVER(false, false),
 		ON_RELOAD(true, false),
 		ON_CLICK(false, true),
@@ -47,13 +50,18 @@ public boolean onReload() {
 		public boolean onClick() {
 			return click;
 		}
+
+		@Override
+		public @NotNull String getKey() {
+			return "config." + Splasher.ID + ".texts.random_rate." + toString().toLowerCase();
+		}
 	}
 
-	public enum Source {
+	public enum Source implements SelectionListEntry.Translatable {
 		VANILLA(true, false),
 		CUSTOM(false, true),
 		VANILLA_AND_CUSTOM(true, true),
-		DEFAULT(false, false);
+		NONE(false, false);
 
 		private final boolean vanilla;
 		private final boolean custom;
@@ -69,5 +77,10 @@ public boolean vanilla() {
 		public boolean custom() {
 			return custom;
 		}
+
+		@Override
+		public @NotNull String getKey() {
+			return "config." + Splasher.ID + ".texts.source." + toString().toLowerCase();
+		}
 	}
 }
diff --git a/src/main/resources/assets/splasher/lang/en_us.json b/src/main/resources/assets/splasher/lang/en_us.json
@@ -1,13 +1,24 @@
 {
-	"text.autoconfig.splasher.title": "Splasher!",
+	"config.splasher.texts.random_rate.never"              : "Never",
+	"config.splasher.texts.random_rate.on_reload"          : "On Reload",
+	"config.splasher.texts.random_rate.on_click"           : "On Click",
+	"config.splasher.texts.random_rate.on_reload_and_click": "On Reload and Click",
+	"config.splasher.texts.random_rate.jeb"                : "Jens Bergensten",
+
+	"config.splasher.texts.source.vanilla"           : "Vanilla",
+	"config.splasher.texts.source.custom"            : "Custom",
+	"config.splasher.texts.source.vanilla_and_custom": "Vanilla and Custom",
+	"config.splasher.texts.source.none"              : "None",
+
+	"text.autoconfig.splasher.title"           : "Splasher!",
 	"text.autoconfig.splasher.category.default": "General",
-	"text.autoconfig.splasher.category.texts": "Texts",
+	"text.autoconfig.splasher.category.texts"  : "Texts",
 
 	"text.autoconfig.splasher.option.splashTextsEnabled": "Splash Texts Enabled",
 
 	"text.autoconfig.splasher.option.festivalsEnabled": "Festivals Enabled",
 
-	"text.autoconfig.splasher.option.followsClientLanguage": "Follows Client Language",
+	"text.autoconfig.splasher.option.followsClientLanguage"         : "Follows Client Language",
 	"text.autoconfig.splasher.option.followsClientLanguage.@Tooltip": "Make splash texts localizable, otherwise they will always be English except for the greetings",
 
 	"text.autoconfig.splasher.option.debugInfoEnabled": "Print Debug Info",
@@ -20,111 +31,111 @@
 
 	"text.autoconfig.splasher.option.source": "Splash Texts Source",
 
-	"festival.splasher.x_mas": "Merry X-mas!",
-	"festival.splasher.new_year": "Happy new year!",
+	"festival.splasher.x_mas"    : "Merry X-mas!",
+	"festival.splasher.new_year" : "Happy new year!",
 	"festival.splasher.halloween": "OOoooOOOOooo! Spooky!",
-	"festival.splasher.is_you": "%s IS YOU",
+	"festival.splasher.is_you"   : "%s IS YOU",
 
-	"splash.minecraft.0": "As seen on TV!",
-	"splash.minecraft.1": "Awesome!",
-	"splash.minecraft.2": "100% pure!",
-	"splash.minecraft.3": "May contain nuts!",
-	"splash.minecraft.4": "More polygons!",
-	"splash.minecraft.5": "Moderately attractive!",
-	"splash.minecraft.6": "Limited edition!",
-	"splash.minecraft.7": "Flashing letters!",
-	"splash.minecraft.8": "It's here!",
-	"splash.minecraft.9": "Best in class!",
-	"splash.minecraft.10": "It's finished!",
-	"splash.minecraft.11": "Kind of dragon free!",
-	"splash.minecraft.12": "Excitement!",
-	"splash.minecraft.13": "More than 500 sold!",
-	"splash.minecraft.14": "One of a kind!",
-	"splash.minecraft.15": "Heaps of hits on YouTube!",
-	"splash.minecraft.16": "Indev!",
-	"splash.minecraft.17": "Spiders everywhere!",
-	"splash.minecraft.18": "Check it out!",
-	"splash.minecraft.19": "Holy cow, man!",
-	"splash.minecraft.20": "It's a game!",
-	"splash.minecraft.21": "Made in Sweden!",
-	"splash.minecraft.22": "Uses LWJGL!",
-	"splash.minecraft.23": "Reticulating splines!",
-	"splash.minecraft.24": "Minecraft!",
-	"splash.minecraft.25": "Yaaay!",
-	"splash.minecraft.26": "Singleplayer!",
-	"splash.minecraft.27": "Keyboard compatible!",
-	"splash.minecraft.28": "Ingots!",
-	"splash.minecraft.29": "Exploding creepers!",
-	"splash.minecraft.30": "That's no moon!",
-	"splash.minecraft.31": "l33t!",
-	"splash.minecraft.32": "Create!",
-	"splash.minecraft.33": "Survive!",
-	"splash.minecraft.34": "Dungeon!",
-	"splash.minecraft.35": "Exclusive!",
-	"splash.minecraft.36": "The bee's knees!",
-	"splash.minecraft.37": "Closed source!",
-	"splash.minecraft.38": "Classy!",
-	"splash.minecraft.39": "Wow!",
-	"splash.minecraft.40": "Not on steam!",
-	"splash.minecraft.41": "Oh man!",
-	"splash.minecraft.42": "Awesome community!",
-	"splash.minecraft.43": "Pixels!",
-	"splash.minecraft.44": "Teetsuuuuoooo!",
-	"splash.minecraft.45": "Kaaneeeedaaaa!",
-	"splash.minecraft.46": "Now with difficulty!",
-	"splash.minecraft.47": "Enhanced!",
-	"splash.minecraft.48": "90% bug free!",
-	"splash.minecraft.49": "Pretty!",
-	"splash.minecraft.50": "12 herbs and spices!",
-	"splash.minecraft.51": "Fat free!",
-	"splash.minecraft.52": "Absolutely no memes!",
-	"splash.minecraft.53": "Free dental!",
-	"splash.minecraft.54": "Ask your doctor!",
-	"splash.minecraft.55": "Minors welcome!",
-	"splash.minecraft.56": "Cloud computing!",
-	"splash.minecraft.57": "Legal in Finland!",
-	"splash.minecraft.58": "Hard to label!",
-	"splash.minecraft.59": "Technically good!",
-	"splash.minecraft.60": "Bringing home the bacon!",
-	"splash.minecraft.61": "Indie!",
-	"splash.minecraft.62": "GOTY!",
-	"splash.minecraft.63": "Ceci n'est pas une title screen!",
-	"splash.minecraft.64": "Euclidian!",
-	"splash.minecraft.65": "Now in 3D!",
-	"splash.minecraft.66": "Inspirational!",
-	"splash.minecraft.67": "Herregud!",
-	"splash.minecraft.68": "Complex cellular automata!",
-	"splash.minecraft.69": "Yes, sir!",
-	"splash.minecraft.70": "Played by cowboys!",
-	"splash.minecraft.71": "Now on OpenGL 3.2 core profile!",
-	"splash.minecraft.72": "Thousands of colors!",
-	"splash.minecraft.73": "Try it!",
-	"splash.minecraft.74": "Age of Wonders is better!",
-	"splash.minecraft.75": "Try the mushroom stew!",
-	"splash.minecraft.76": "Sensational!",
-	"splash.minecraft.77": "Hot tamale, hot hot tamale!",
-	"splash.minecraft.78": "Play him off, keyboard cat!",
-	"splash.minecraft.79": "Guaranteed!",
-	"splash.minecraft.80": "Macroscopic!",
-	"splash.minecraft.81": "Bring it on!",
-	"splash.minecraft.82": "Random splash!",
-	"splash.minecraft.83": "Call your mother!",
-	"splash.minecraft.84": "Monster infighting!",
-	"splash.minecraft.85": "Loved by millions!",
-	"splash.minecraft.86": "Ultimate edition!",
-	"splash.minecraft.87": "Freaky!",
-	"splash.minecraft.88": "You've got a brand new key!",
-	"splash.minecraft.89": "Water proof!",
-	"splash.minecraft.90": "Uninflammable!",
-	"splash.minecraft.91": "Whoa, dude!",
-	"splash.minecraft.92": "All inclusive!",
-	"splash.minecraft.93": "Tell your friends!",
-	"splash.minecraft.94": "NP is not in P!",
-	"splash.minecraft.95": "Music by C418!",
-	"splash.minecraft.96": "Livestreamed!",
-	"splash.minecraft.97": "Haunted!",
-	"splash.minecraft.98": "Polynomial!",
-	"splash.minecraft.99": "Terrestrial!",
+	"splash.minecraft.0"  : "As seen on TV!",
+	"splash.minecraft.1"  : "Awesome!",
+	"splash.minecraft.2"  : "100% pure!",
+	"splash.minecraft.3"  : "May contain nuts!",
+	"splash.minecraft.4"  : "More polygons!",
+	"splash.minecraft.5"  : "Moderately attractive!",
+	"splash.minecraft.6"  : "Limited edition!",
+	"splash.minecraft.7"  : "Flashing letters!",
+	"splash.minecraft.8"  : "It's here!",
+	"splash.minecraft.9"  : "Best in class!",
+	"splash.minecraft.10" : "It's finished!",
+	"splash.minecraft.11" : "Kind of dragon free!",
+	"splash.minecraft.12" : "Excitement!",
+	"splash.minecraft.13" : "More than 500 sold!",
+	"splash.minecraft.14" : "One of a kind!",
+	"splash.minecraft.15" : "Heaps of hits on YouTube!",
+	"splash.minecraft.16" : "Indev!",
+	"splash.minecraft.17" : "Spiders everywhere!",
+	"splash.minecraft.18" : "Check it out!",
+	"splash.minecraft.19" : "Holy cow, man!",
+	"splash.minecraft.20" : "It's a game!",
+	"splash.minecraft.21" : "Made in Sweden!",
+	"splash.minecraft.22" : "Uses LWJGL!",
+	"splash.minecraft.23" : "Reticulating splines!",
+	"splash.minecraft.24" : "Minecraft!",
+	"splash.minecraft.25" : "Yaaay!",
+	"splash.minecraft.26" : "Singleplayer!",
+	"splash.minecraft.27" : "Keyboard compatible!",
+	"splash.minecraft.28" : "Ingots!",
+	"splash.minecraft.29" : "Exploding creepers!",
+	"splash.minecraft.30" : "That's no moon!",
+	"splash.minecraft.31" : "l33t!",
+	"splash.minecraft.32" : "Create!",
+	"splash.minecraft.33" : "Survive!",
+	"splash.minecraft.34" : "Dungeon!",
+	"splash.minecraft.35" : "Exclusive!",
+	"splash.minecraft.36" : "The bee's knees!",
+	"splash.minecraft.37" : "Closed source!",
+	"splash.minecraft.38" : "Classy!",
+	"splash.minecraft.39" : "Wow!",
+	"splash.minecraft.40" : "Not on steam!",
+	"splash.minecraft.41" : "Oh man!",
+	"splash.minecraft.42" : "Awesome community!",
+	"splash.minecraft.43" : "Pixels!",
+	"splash.minecraft.44" : "Teetsuuuuoooo!",
+	"splash.minecraft.45" : "Kaaneeeedaaaa!",
+	"splash.minecraft.46" : "Now with difficulty!",
+	"splash.minecraft.47" : "Enhanced!",
+	"splash.minecraft.48" : "90% bug free!",
+	"splash.minecraft.49" : "Pretty!",
+	"splash.minecraft.50" : "12 herbs and spices!",
+	"splash.minecraft.51" : "Fat free!",
+	"splash.minecraft.52" : "Absolutely no memes!",
+	"splash.minecraft.53" : "Free dental!",
+	"splash.minecraft.54" : "Ask your doctor!",
+	"splash.minecraft.55" : "Minors welcome!",
+	"splash.minecraft.56" : "Cloud computing!",
+	"splash.minecraft.57" : "Legal in Finland!",
+	"splash.minecraft.58" : "Hard to label!",
+	"splash.minecraft.59" : "Technically good!",
+	"splash.minecraft.60" : "Bringing home the bacon!",
+	"splash.minecraft.61" : "Indie!",
+	"splash.minecraft.62" : "GOTY!",
+	"splash.minecraft.63" : "Ceci n'est pas une title screen!",
+	"splash.minecraft.64" : "Euclidian!",
+	"splash.minecraft.65" : "Now in 3D!",
+	"splash.minecraft.66" : "Inspirational!",
+	"splash.minecraft.67" : "Herregud!",
+	"splash.minecraft.68" : "Complex cellular automata!",
+	"splash.minecraft.69" : "Yes, sir!",
+	"splash.minecraft.70" : "Played by cowboys!",
+	"splash.minecraft.71" : "Now on OpenGL 3.2 core profile!",
+	"splash.minecraft.72" : "Thousands of colors!",
+	"splash.minecraft.73" : "Try it!",
+	"splash.minecraft.74" : "Age of Wonders is better!",
+	"splash.minecraft.75" : "Try the mushroom stew!",
+	"splash.minecraft.76" : "Sensational!",
+	"splash.minecraft.77" : "Hot tamale, hot hot tamale!",
+	"splash.minecraft.78" : "Play him off, keyboard cat!",
+	"splash.minecraft.79" : "Guaranteed!",
+	"splash.minecraft.80" : "Macroscopic!",
+	"splash.minecraft.81" : "Bring it on!",
+	"splash.minecraft.82" : "Random splash!",
+	"splash.minecraft.83" : "Call your mother!",
+	"splash.minecraft.84" : "Monster infighting!",
+	"splash.minecraft.85" : "Loved by millions!",
+	"splash.minecraft.86" : "Ultimate edition!",
+	"splash.minecraft.87" : "Freaky!",
+	"splash.minecraft.88" : "You've got a brand new key!",
+	"splash.minecraft.89" : "Water proof!",
+	"splash.minecraft.90" : "Uninflammable!",
+	"splash.minecraft.91" : "Whoa, dude!",
+	"splash.minecraft.92" : "All inclusive!",
+	"splash.minecraft.93" : "Tell your friends!",
+	"splash.minecraft.94" : "NP is not in P!",
+	"splash.minecraft.95" : "Music by C418!",
+	"splash.minecraft.96" : "Livestreamed!",
+	"splash.minecraft.97" : "Haunted!",
+	"splash.minecraft.98" : "Polynomial!",
+	"splash.minecraft.99" : "Terrestrial!",
 	"splash.minecraft.100": "All is full of love!",
 	"splash.minecraft.101": "Full of stars!",
 	"splash.minecraft.102": "Scientific!",

diff --git a/src/main/resources/assets/splasher/lang/zh_cn.json b/src/main/resources/assets/splasher/lang/zh_cn.json
@@ -1,12 +1,23 @@
 {
+	"config.splasher.texts.random_rate.never"              : "从不",
+	"config.splasher.texts.random_rate.on_reload"          : "重新加载页面时",
+	"config.splasher.texts.random_rate.on_click"           : "点击时",
+	"config.splasher.texts.random_rate.on_reload_and_click": "重新加载页面和点击时",
+	"config.splasher.texts.random_rate.jeb"                : "Jens Bergensten",
+
+	"config.splasher.texts.source.vanilla"           : "仅原版",
+	"config.splasher.texts.source.custom"            : "仅自定义",
+	"config.splasher.texts.source.vanilla_and_custom": "原版和自定义",
+	"config.splasher.texts.source.none"              : "无",
+
 	"text.autoconfig.splasher.category.default": "通用",
-	"text.autoconfig.splasher.category.texts": "文字",
+	"text.autoconfig.splasher.category.texts"  : "文字",
 
 	"text.autoconfig.splasher.option.splashTextsEnabled": "启用闪烁文本",
 
 	"text.autoconfig.splasher.option.festivalsEnabled": "启用节假日文本",
 
-	"text.autoconfig.splasher.option.followsClientLanguage": "跟随客户端语言",
+	"text.autoconfig.splasher.option.followsClientLanguage"         : "跟随客户端语言",
 	"text.autoconfig.splasher.option.followsClientLanguage.@Tooltip": "让闪烁文本本地化，否则除各语言的欢迎文本外所有闪烁文本都将为英文",
 
 	"text.autoconfig.splasher.option.debugInfoEnabled": "打印调试信息",