aboutsummaryrefslogtreecommitdiff
path: root/runtime/src
diff options
context:
space:
mode:
authorshedaniel <daniel@shedaniel.me>2023-09-02 00:39:22 +0800
committershedaniel <daniel@shedaniel.me>2024-04-16 00:38:18 +0900
commit15d945b7dfc1667965fb07823cb37b5a5062bb75 (patch)
tree1400e4bf262b51c4dcdbf8973df1f031426e1afa /runtime/src
parentc5705ad9e7195ae679bcebee5d0e876eec7c216d (diff)
downloadRoughlyEnoughItems-15d945b7dfc1667965fb07823cb37b5a5062bb75.tar.gz
RoughlyEnoughItems-15d945b7dfc1667965fb07823cb37b5a5062bb75.tar.bz2
RoughlyEnoughItems-15d945b7dfc1667965fb07823cb37b5a5062bb75.zip
Add flags and reset
Diffstat (limited to 'runtime/src')
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/impl/client/config/ConfigManagerImpl.java2
-rw-r--r--runtime/src/main/java/me/shedaniel/rei/impl/client/gui/config/options/AllREIConfigCategories.java6
-rwxr-xr-xruntime/src/main/resources/assets/roughlyenoughitems/lang/en_us.json3
-rw-r--r--runtime/src/main/resources/assets/roughlyenoughitems/textures/gui/config/flags.pngbin0 -> 174 bytes
-rw-r--r--runtime/src/main/resources/assets/roughlyenoughitems/textures/gui/config/reset.pngbin0 -> 183 bytes
5 files changed, 8 insertions, 3 deletions
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/config/ConfigManagerImpl.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/config/ConfigManagerImpl.java
index 16dcfcd3d..cb162fba4 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/config/ConfigManagerImpl.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/config/ConfigManagerImpl.java
@@ -358,7 +358,7 @@ public class ConfigManagerImpl implements ConfigManager {
@SuppressWarnings("deprecation")
@Override
public Screen getConfigScreen(Screen parent) {
- if (true) return new REIConfigScreen(parent);
+ if (Screen.hasShiftDown()) return new REIConfigScreen(parent);
class EmptyEntry extends AbstractConfigListEntry<Object> {
private final int height;
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/config/options/AllREIConfigCategories.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/config/options/AllREIConfigCategories.java
index dcba86395..1e9d03e9c 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/config/options/AllREIConfigCategories.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/config/options/AllREIConfigCategories.java
@@ -48,6 +48,8 @@ public interface AllREIConfigCategories {
OptionCategory FILTERING = make("filtering");
OptionCategory LIST = make("list");
OptionCategory DEBUG = make("debug");
+ OptionCategory FLAGS = make("flags");
+ OptionCategory RESET = make("reset");
List<OptionCategory> CATEGORIES = ImmutableList.of(
APPEARANCE,
KEYBINDS,
@@ -59,6 +61,8 @@ public interface AllREIConfigCategories {
SEARCH,
FILTERING,
LIST,
- DEBUG
+ DEBUG,
+ FLAGS,
+ RESET
);
}
diff --git a/runtime/src/main/resources/assets/roughlyenoughitems/lang/en_us.json b/runtime/src/main/resources/assets/roughlyenoughitems/lang/en_us.json
index 7487dab04..97ac6e6b2 100755
--- a/runtime/src/main/resources/assets/roughlyenoughitems/lang/en_us.json
+++ b/runtime/src/main/resources/assets/roughlyenoughitems/lang/en_us.json
@@ -88,7 +88,7 @@
"text.rei.input.methods.default": "Default",
"text.rei.input.methods.default.description": "The default input method. This does not transform the search term.",
"text.rei.input.methods.jyutping": "Jyutping (Cantonese)",
- "text.rei.input.methods.jyutping.description": "The input method for matching Chinese characters with Jyutping (Cantonese).",
+ "text.rei.input.methods.jyutping.description": "The input method for matching Chinese characters with Jyutping (Cantonese).",
"text.rei.input.methods.pinyin": "Pinyin (Mandarin)",
"text.rei.input.methods.pinyin.description": "The input method for matching Chinese characters with Pinyin (Mandarin).",
"text.rei.input.methods.pinyin.fuzzy.matching": "Fuzzy Matching...",
@@ -241,6 +241,7 @@
"config.rei.categories.filtering": "Filtering",
"config.rei.categories.list": "List",
"config.rei.categories.debug": "Debug",
+ "config.rei.categories.flags": "Feature Flags",
"config.rei.categories.reset": "Reload & Reset",
"config.rei.options.cheating_mode": "Cheating Mode",
"config.rei.options.favorites": "Favorites",
diff --git a/runtime/src/main/resources/assets/roughlyenoughitems/textures/gui/config/flags.png b/runtime/src/main/resources/assets/roughlyenoughitems/textures/gui/config/flags.png
new file mode 100644
index 000000000..c102f5784
--- /dev/null
+++ b/runtime/src/main/resources/assets/roughlyenoughitems/textures/gui/config/flags.png
Binary files differ
diff --git a/runtime/src/main/resources/assets/roughlyenoughitems/textures/gui/config/reset.png b/runtime/src/main/resources/assets/roughlyenoughitems/textures/gui/config/reset.png
new file mode 100644
index 000000000..26c80b43e
--- /dev/null
+++ b/runtime/src/main/resources/assets/roughlyenoughitems/textures/gui/config/reset.png
Binary files differ