hooray

KessokuTeaTime · Feb 23, 2024 · 6ce18cb · 6ce18cb
1 parent 7f452f4
commit 6ce18cb
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 11 deletions.
diff --git a/...va/net/krlite/reicollapsibleentries/config/modmenu/REICollapsibleEntriesConfigScreen.java b/...va/net/krlite/reicollapsibleentries/config/modmenu/REICollapsibleEntriesConfigScreen.java
@@ -0,0 +1,42 @@
+package net.krlite.reicollapsibleentries.config.modmenu;
+
+import me.shedaniel.clothconfig2.api.ConfigBuilder;
+import me.shedaniel.clothconfig2.api.ConfigCategory;
+import me.shedaniel.clothconfig2.api.ConfigEntryBuilder;
+import net.krlite.reicollapsibleentries.REICollapsibleEntries;
+import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.text.Text;
+
+import java.util.ArrayList;
+
+public class REICollapsibleEntriesConfigScreen {
+    private final ConfigBuilder configBuilder = ConfigBuilder.create()
+            .setTitle(Text.translatable("screen.reicollapsibleentries.config.title"))
+            .transparentBackground()
+            .setShouldListSmoothScroll(true)
+            .setSavingRunnable(REICollapsibleEntries.CONFIG_HOLDER::save);
+    private final ConfigEntryBuilder entryBuilder = configBuilder.entryBuilder();
+
+    public REICollapsibleEntriesConfigScreen(Screen parent) {
+        configBuilder.setParentScreen(parent);
+
+        initEntries();
+    }
+
+    public Screen build() {
+        return configBuilder.build();
+    }
+
+    private void initEntries() {
+        ConfigCategory category = configBuilder.getOrCreateCategory(Text.empty());
+
+        category.addEntry(entryBuilder.startStrList(
+                                Text.translatable("config.reicollapsibleentries.custom_tags"),
+                                REICollapsibleEntries.CONFIG.customTags
+                        )
+                        .setExpanded(true)
+                        .setSaveConsumer(value -> REICollapsibleEntries.CONFIG.customTags = new ArrayList<>(value))
+                        .build()
+        );
+    }
+}
diff --git a/...CollapsibleEntriesModMenuIntegration.java → ...CollapsibleEntriesModMenuIntegration.java b/...CollapsibleEntriesModMenuIntegration.java → ...CollapsibleEntriesModMenuIntegration.java
@@ -1,12 +1,13 @@
-package net.krlite.reicollapsibleentries.config;
+package net.krlite.reicollapsibleentries.config.modmenu;
 
 import com.terraformersmc.modmenu.api.ConfigScreenFactory;
 import com.terraformersmc.modmenu.api.ModMenuApi;
 import me.shedaniel.autoconfig.AutoConfig;
+import net.krlite.reicollapsibleentries.config.REICollapsibleEntriesConfig;
 
 public class REICollapsibleEntriesModMenuIntegration implements ModMenuApi {
     @Override
     public ConfigScreenFactory<?> getModConfigScreenFactory() {
-        return parent -> AutoConfig.getConfigScreen(REICollapsibleEntriesConfig.class, parent).get();
+        return parent -> new REICollapsibleEntriesConfigScreen(parent).build();
     }
 }
diff --git a/src/main/resources/assets/reicollapsibleentries/lang/en_us.json b/src/main/resources/assets/reicollapsibleentries/lang/en_us.json
@@ -1,7 +1,8 @@
 {
-  "text.autoconfig.reicollapsibleentries.title": "REI Collapsible Entries",
+  "screen.reicollapsibleentries.config.title": "REI Collapsible Entries",
 
-  "text.autoconfig.reicollapsibleentries.option.customTags": "Custom Tags",
+  "config.reicollapsibleentries.custom_tags"        : "Custom Tags",
+  "config.reicollapsibleentries.custom_tags.invalid": "Invalid tag!",
 
   "comment_tag": "Tags",
 
@@ -238,7 +239,7 @@
 
 
   "command.reicollapsibleentries.tags.click" : "Click to show more",
-  "command.reicollapsibleentries.tags.add"   : "Add to Custom Tags",
-  "command.reicollapsibleentries.tags.remove": "Remove from Custom Tags",
+  "command.reicollapsibleentries.tags.add"   : "§aAdd to Custom Tags",
+  "command.reicollapsibleentries.tags.remove": "§cRemove from Custom Tags",
   "command.reicollapsibleentries.tags.title" : "Confirm Tag"
 }
diff --git a/src/main/resources/assets/reicollapsibleentries/lang/zh_cn.json b/src/main/resources/assets/reicollapsibleentries/lang/zh_cn.json
@@ -2,9 +2,10 @@
   "modmenu.nameTranslation.reicollapsibleentries"       : "REI折叠物品条目",
   "modmenu.descriptionTranslation.reicollapsibleentries": "向REI的物品搜索界面中添加了折叠条目，支持来自原版和许多模组的物品。",
 
-  "text.autoconfig.reicollapsibleentries.title": "REI折叠物品条目",
+  "screen.reicollapsibleentries.config.title": "REI折叠物品条目",
 
-  "text.autoconfig.reicollapsibleentries.option.customTags": "自定义标签",
+  "config.reicollapsibleentries.custom_tags"        : "自定义标签",
+  "config.reicollapsibleentries.custom_tags.invalid": "不合法标签！",
 
   "comment_tag": "标签",
 
@@ -240,7 +241,7 @@
 
 
   "command.reicollapsibleentries.tags.click" : "点击显示更多",
-  "command.reicollapsibleentries.tags.add"   : "加入自定义标签",
-  "command.reicollapsibleentries.tags.remove": "从自定义标签中移除",
+  "command.reicollapsibleentries.tags.add"   : "§a加入自定义标签",
+  "command.reicollapsibleentries.tags.remove": "§c从自定义标签中移除",
   "command.reicollapsibleentries.tags.title" : "确认标签"
 }
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -26,7 +26,7 @@
       "net.krlite.reicollapsibleentries.REIClientPlugin"
     ],
     "modmenu": [
-      "net.krlite.reicollapsibleentries.config.REICollapsibleEntriesModMenuIntegration"
+      "net.krlite.reicollapsibleentries.config.modmenu.REICollapsibleEntriesModMenuIntegration"
     ]
   },
   "mixins": [