Dark Theme Improvements & Better Config

5 files changed, 29 insertions, 15 deletions

diff --git a/src/main/java/me/shedaniel/rei/gui/renderers/EmptyRenderer.java b/src/main/java/me/shedaniel/rei/gui/renderers/EmptyRenderer.java
index 99c1da024..f5c9faa0d 100644
--- a/src/main/java/me/shedaniel/rei/gui/renderers/EmptyRenderer.java
+++ b/src/main/java/me/shedaniel/rei/gui/renderers/EmptyRenderer.java
@@ -11,6 +11,10 @@ public class EmptyRenderer extends Renderer {
     
     public static final EmptyRenderer INSTANCE = new EmptyRenderer();
     
+    private EmptyRenderer() {
+    
+    }
+    
     @Override
     public void render(int x, int y, double mouseX, double mouseY, float delta) {
 
diff --git a/src/main/java/me/shedaniel/rei/gui/widget/RecipeChoosePageWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/RecipeChoosePageWidget.java
index 269ec5664..152185f10 100644
--- a/src/main/java/me/shedaniel/rei/gui/widget/RecipeChoosePageWidget.java
+++ b/src/main/java/me/shedaniel/rei/gui/widget/RecipeChoosePageWidget.java
@@ -10,6 +10,7 @@ import com.mojang.blaze3d.platform.GlStateManager;
 import me.shedaniel.rei.RoughlyEnoughItemsCore;
 import me.shedaniel.rei.api.ConfigManager;
 import me.shedaniel.rei.client.ConfigObject;
+import me.shedaniel.rei.client.ScreenHelper;
 import me.shedaniel.rei.gui.RecipeViewingScreen;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.render.GuiLighting;
@@ -95,10 +96,10 @@ public class RecipeChoosePageWidget extends DraggableWidget {
             
             @Override
             public void render(int i, int i1, float v) {
-                font.draw(I18n.translate("text.rei.choose_page"), bounds.x + 5, bounds.y + 5, 4210752);
+                font.draw(I18n.translate("text.rei.choose_page"), bounds.x + 5, bounds.y + 5, ScreenHelper.isDarkModeEnabled() ? 0xFFBBBBBB : 0xFF404040);
                 String endString = String.format(" /%d", maxPage);
                 int width = font.getStringWidth(endString);
-                font.draw(endString, bounds.x + bounds.width - 5 - width, bounds.y + 22, 4210752);
+                font.draw(endString, bounds.x + bounds.width - 5 - width, bounds.y + 22, ScreenHelper.isDarkModeEnabled() ? 0xFFBBBBBB : 0xFF404040);
             }
         });
         String endString = String.format(" /%d", maxPage);
diff --git a/src/main/java/me/shedaniel/rei/plugin/campfire/DefaultCampfireCategory.java b/src/main/java/me/shedaniel/rei/plugin/campfire/DefaultCampfireCategory.java
index 3053b7136..c2c35da94 100644
--- a/src/main/java/me/shedaniel/rei/plugin/campfire/DefaultCampfireCategory.java
+++ b/src/main/java/me/shedaniel/rei/plugin/campfire/DefaultCampfireCategory.java
@@ -8,6 +8,7 @@ package me.shedaniel.rei.plugin.campfire;
 import com.mojang.blaze3d.platform.GlStateManager;
 import me.shedaniel.rei.api.RecipeCategory;
 import me.shedaniel.rei.api.Renderer;
+import me.shedaniel.rei.client.ScreenHelper;
 import me.shedaniel.rei.gui.widget.RecipeBaseWidget;
 import me.shedaniel.rei.gui.widget.SlotWidget;
 import me.shedaniel.rei.gui.widget.Widget;
@@ -60,7 +61,7 @@ public class DefaultCampfireCategory implements RecipeCategory<DefaultCampfireDi
                 blit(startPoint.x + 24, startPoint.y + 18, 82, 91, width, 17);
                 String text = I18n.translate("category.rei.campfire.time", MathHelper.floor(recipeDisplaySupplier.get().getCookTime() / 20d));
                 int length = MinecraftClient.getInstance().textRenderer.getStringWidth(text);
-                MinecraftClient.getInstance().textRenderer.draw(text, bounds.x + bounds.width - length - 5, startPoint.y + 54 - 8, 4210752);
+                MinecraftClient.getInstance().textRenderer.draw(text, bounds.x + bounds.width - length - 5, startPoint.y + 54 - 8, ScreenHelper.isDarkModeEnabled() ? 0xFFBBBBBB : 0xFF404040);
             }
         }));
         widgets.add(new SlotWidget(startPoint.x + 1, startPoint.y + 11, recipeDisplaySupplier.get().getInput().get(0), true, true, true));
diff --git a/src/main/java/me/shedaniel/rei/utils/ClothScreenRegistry.java b/src/main/java/me/shedaniel/rei/utils/ClothScreenRegistry.java
index f14dd0714..e153f49b5 100644
--- a/src/main/java/me/shedaniel/rei/utils/ClothScreenRegistry.java
+++ b/src/main/java/me/shedaniel/rei/utils/ClothScreenRegistry.java
@@ -58,10 +58,11 @@ public class ClothScreenRegistry {
                 })
                 .build());
         ConfigCategory appearance = builder.getOrCreateCategory("text.rei.config.appearance");
-        appearance.addEntry(eb.startBooleanToggle("text.rei.config.dark_theme", ScreenHelper.isDarkModeEnabled())
+        appearance.addEntry(eb.startBooleanToggle("text.rei.config.appearance_theme", ScreenHelper.isDarkModeEnabled())
                 .setDefaultValue(false)
                 .setSaveConsumer(bool -> configManager.getConfig().darkTheme = bool)
-                .setTooltip(getConfigTooltip("dark_theme"))
+                .setYesNoTextSupplier(bool -> I18n.translate("text.rei.config.appearance_theme." + bool))
+                .setTooltip(getConfigTooltip("appearance_theme"))
                 .build());
         appearance.addEntry(eb.startEnumSelector("text.rei.config.recipe_screen_type", RecipeScreenType.class, configManager.getConfig().screenType)
                 .setDefaultValue(RecipeScreenType.UNSET)
@@ -129,20 +130,23 @@ public class ClothScreenRegistry {
                 .setTooltip(getConfigTooltip("weather_command"))
                 .build());
         ConfigCategory modules = builder.getOrCreateCategory("text.rei.config.modules");
-        modules.addEntry(eb.startBooleanToggle("text.rei.config.enable_craftable_only", configManager.getConfig().enableCraftableOnlyButton)
+        modules.addEntry(eb.startBooleanToggle("text.rei.config.craftable_only", configManager.getConfig().enableCraftableOnlyButton)
                 .setDefaultValue(false)
                 .setSaveConsumer(bool -> configManager.getConfig().enableCraftableOnlyButton = bool)
-                .setTooltip(getConfigTooltip("enable_craftable_only"))
+                .setYesNoTextSupplier(bool -> I18n.translate("text.rei.config.text." + bool))
+                .setTooltip(getConfigTooltip("craftable_only"))
                 .build());
-        modules.addEntry(eb.startBooleanToggle("text.rei.config.enable_util_buttons", configManager.getConfig().showUtilsButtons)
+        modules.addEntry(eb.startBooleanToggle("text.rei.config.util_buttons", configManager.getConfig().showUtilsButtons)
                 .setDefaultValue(false)
                 .setSaveConsumer(bool -> configManager.getConfig().showUtilsButtons = bool)
-                .setTooltip(getConfigTooltip("enable_util_buttons"))
+                .setYesNoTextSupplier(bool -> I18n.translate("text.rei.config.text." + bool))
+                .setTooltip(getConfigTooltip("util_buttons"))
                 .build());
-        modules.addEntry(eb.startBooleanToggle("text.rei.config.disable_recipe_book", configManager.getConfig().disableRecipeBook)
+        modules.addEntry(eb.startBooleanToggle("text.rei.config.vanilla_recipe_book", configManager.getConfig().disableRecipeBook)
                 .setDefaultValue(false)
                 .setSaveConsumer(bool -> configManager.getConfig().disableRecipeBook = bool)
-                .setTooltip(getConfigTooltip("disable_recipe_book"))
+                .setYesNoTextSupplier(bool -> I18n.translate("text.rei.config.text." + !bool))
+                .setTooltip(getConfigTooltip("vanilla_recipe_book"))
                 .build());
         return builder.setAfterInitConsumer(screen -> {
             ButtonWidget w = new ButtonWidget(6, 6, 60, 20, I18n.translate("text.rei.credits"), widget -> MinecraftClient.getInstance().openScreen(new CreditsScreen(MinecraftClient.getInstance().currentScreen)));
diff --git a/src/main/resources/assets/roughlyenoughitems/lang/en_us.json b/src/main/resources/assets/roughlyenoughitems/lang/en_us.json
index f00881a1f..031398220 100755
--- a/src/main/resources/assets/roughlyenoughitems/lang/en_us.json
+++ b/src/main/resources/assets/roughlyenoughitems/lang/en_us.json
@@ -48,7 +48,9 @@
   "ordering.rei.item_groups": "Item Groups",
   "text.auto_craft.failed_move_items": "§cCan't move items!",
   "text.auto_craft.move_items": "Move Items",
-  "text.rei.config.enable_craftable_only": "Enable Craftable Filter: ",
+  "text.rei.config.craftable_only": "Craftable Filter: ",
+  "text.rei.config.text.true": "Enabled",
+  "text.rei.config.text.false": "Disabled",
   "text.rei.showing_craftable": "Showing Craftable",
   "text.rei.showing_all": "Showing All",
   "text.rei.delete_items": "§cDelete Item",
@@ -68,10 +70,10 @@
   "text.rei.config.appearance": "Appearance",
   "text.rei.config.modules": "Modules",
   "text.rei.config.advanced": "Advanced",
-  "text.rei.config.disable_recipe_book": "Disable Recipe Book:",
+  "text.rei.config.vanilla_recipe_book": "Vanilla Recipe Book:",
   "text.rei.choose_page": "Choose Page",
   "text.rei.config.max_recipes_per_page": "Maximum Recipes Each Page:",
-  "text.rei.config.enable_util_buttons": "Enable Utils Buttons:",
+  "text.rei.config.util_buttons": "Utils Buttons:",
   "text.rei.gamemode_button.tooltip": "Switch Game Mode\n§7Switch to %s mode.\n\n§7Shift-Click to switch in a reverse cycle.",
   "text.rei.weather_button.tooltip": "Switch Weather\n§7Switch to %s.",
   "text.rei.enabled": "Yes",
@@ -92,7 +94,9 @@
   "text.rei.config.enable_legacy_speedcraft_support": "Enable Legacy Plugin Support: ",
   "text.rei.config.april_fools": "April Fools",
   "text.rei.config.april_fools.2019": "Force 2019 REI April Fools' joke: ",
-  "text.rei.config.dark_theme": "Dark Mode:",
+  "text.rei.config.appearance_theme": "Appearance Theme:",
+  "text.rei.config.appearance_theme.true": "Dark Theme",
+  "text.rei.config.appearance_theme.false": "Light Theme",
   "text.rei.config.villager_screen_permanent_scroll_bar": "Recipe Screen Scroll Bar:",
   "text.rei.config.item_cheating_mode": "Item Cheating Amount:",
   "text.rei.config.item_cheating_mode.rei_like": "Normal",