Skip to content

Commit 73829e6

Browse files
ProspectorProspector
committed
reformat
1 parent ea135e4 commit 73829e6

46 files changed

Lines changed: 981 additions & 472 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.editorconfig‎

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,8 @@ charset = utf-8
55
end_of_line = lf
66
insert_final_newline = true
77
tab_width = 4
8-
9-
[*.gradle]
10-
indent_style = tab
11-
12-
[*.java]
138
indent_style = tab
149

1510
[*.json]
1611
indent_style = space
17-
indent_size = 2
18-
19-
[*.properties]
20-
indent_style = space
21-
indent_size = 2
22-
23-
[.editorconfig]
24-
indent_style = space
25-
indent_size = 4
12+
indent_size = 2

‎src/main/java/com/terraformersmc/modmenu/ModMenu.java‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,10 @@ public class ModMenu implements ClientModInitializer {
3939
public static final Gson GSON_MINIFIED;
4040

4141
static {
42-
GsonBuilder builder = new GsonBuilder()
43-
.registerTypeHierarchyAdapter(Enum.class, new EnumToLowerCaseJsonConverter())
44-
.setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES);
42+
GsonBuilder builder = new GsonBuilder().registerTypeHierarchyAdapter(Enum.class,
43+
new EnumToLowerCaseJsonConverter()
44+
)
45+
.setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES);
4546
GSON = builder.setPrettyPrinting().create();
4647
GSON_MINIFIED = builder.create();
4748
}
@@ -191,11 +192,7 @@ public static String getDisplayedModCount() {
191192
if (!includeLibraries && isLibrary) {
192193
return false;
193194
}
194-
if (!includeHidden && mod.isHidden()) {
195-
return false;
196-
}
197-
198-
return true;
195+
return includeHidden || !mod.isHidden();
199196
}).count());
200197
}
201198
return NumberFormat.getInstance().format(cachedDisplayedModCount);
@@ -204,10 +201,12 @@ public static String getDisplayedModCount() {
204201
public static Text createModsButtonText(boolean title) {
205202
var titleStyle = ModMenuConfig.MODS_BUTTON_STYLE.getValue();
206203
var gameMenuStyle = ModMenuConfig.GAME_MENU_BUTTON_STYLE.getValue();
207-
var isIcon = title ? titleStyle == ModMenuConfig.TitleMenuButtonStyle.ICON : gameMenuStyle ==
208-
ModMenuConfig.GameMenuButtonStyle.ICON;
209-
var isShort = title ? titleStyle == ModMenuConfig.TitleMenuButtonStyle.SHRINK : gameMenuStyle ==
210-
ModMenuConfig.GameMenuButtonStyle.REPLACE_BUGS;
204+
var isIcon = title ?
205+
titleStyle == ModMenuConfig.TitleMenuButtonStyle.ICON :
206+
gameMenuStyle == ModMenuConfig.GameMenuButtonStyle.ICON;
207+
var isShort = title ?
208+
titleStyle == ModMenuConfig.TitleMenuButtonStyle.SHRINK :
209+
gameMenuStyle == ModMenuConfig.GameMenuButtonStyle.REPLACE_BUGS;
211210
MutableText modsText = ModMenuScreenTexts.TITLE.copy();
212211
if (ModMenuConfig.MOD_COUNT_LOCATION.getValue().isOnModsButton() && !isIcon) {
213212
String count = ModMenu.getDisplayedModCount();

‎src/main/java/com/terraformersmc/modmenu/ModMenuModMenuCompat.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import com.terraformersmc.modmenu.gui.ModMenuOptionsScreen;
77
import com.terraformersmc.modmenu.util.mod.fabric.FabricLoaderUpdateChecker;
88
import com.terraformersmc.modmenu.util.mod.quilt.QuiltLoaderUpdateChecker;
9-
109
import net.minecraft.client.MinecraftClient;
1110
import net.minecraft.client.gui.screen.option.OptionsScreen;
1211

‎src/main/java/com/terraformersmc/modmenu/api/ModMenuApi.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,5 @@ default Map<String, UpdateChecker> getProvidedUpdateCheckers() {
8686
* provided by a modpack.
8787
*/
8888
default void attachModpackBadges(Consumer<String> consumer) {
89-
return;
9089
}
9190
}

‎src/main/java/com/terraformersmc/modmenu/api/UpdateChannel.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66
* Supported update channels, in ascending order by stability.
77
*/
88
public enum UpdateChannel {
9-
ALPHA,
10-
BETA,
11-
RELEASE;
9+
ALPHA, BETA, RELEASE;
1210

1311
/**
1412
* @return the user's preferred update channel.

‎src/main/java/com/terraformersmc/modmenu/config/FileOnlyConfig.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,4 @@
77

88
@Retention(RetentionPolicy.RUNTIME)
99
@Target(ElementType.FIELD)
10-
public @interface FileOnlyConfig {
11-
}
10+
public @interface FileOnlyConfig { }

‎src/main/java/com/terraformersmc/modmenu/config/ModMenuConfig.java‎

Lines changed: 32 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,18 @@ public class ModMenuConfig {
2020
public static final BooleanConfigOption COUNT_LIBRARIES = new BooleanConfigOption("count_libraries", true);
2121
public static final BooleanConfigOption COMPACT_LIST = new BooleanConfigOption("compact_list", false);
2222
public static final BooleanConfigOption COUNT_CHILDREN = new BooleanConfigOption("count_children", true);
23-
public static final EnumConfigOption<TitleMenuButtonStyle> MODS_BUTTON_STYLE = new EnumConfigOption<>("mods_button_style",
24-
TitleMenuButtonStyle.CLASSIC
23+
public static final EnumConfigOption<TitleMenuButtonStyle> MODS_BUTTON_STYLE = new EnumConfigOption<>(
24+
"mods_button_style",
25+
TitleMenuButtonStyle.CLASSIC
2526
);
26-
public static final EnumConfigOption<GameMenuButtonStyle> GAME_MENU_BUTTON_STYLE = new EnumConfigOption<>("game_menu_button_style",
27-
GameMenuButtonStyle.REPLACE_BUGS
27+
public static final EnumConfigOption<GameMenuButtonStyle> GAME_MENU_BUTTON_STYLE = new EnumConfigOption<>(
28+
"game_menu_button_style",
29+
GameMenuButtonStyle.REPLACE_BUGS
2830
);
2931
public static final BooleanConfigOption COUNT_HIDDEN_MODS = new BooleanConfigOption("count_hidden_mods", true);
30-
public static final EnumConfigOption<ModCountLocation> MOD_COUNT_LOCATION = new EnumConfigOption<>("mod_count_location",
31-
ModCountLocation.TITLE_SCREEN
32+
public static final EnumConfigOption<ModCountLocation> MOD_COUNT_LOCATION = new EnumConfigOption<>(
33+
"mod_count_location",
34+
ModCountLocation.TITLE_SCREEN
3235
);
3336
public static final BooleanConfigOption HIDE_MOD_LINKS = new BooleanConfigOption("hide_mod_links", false);
3437
public static final BooleanConfigOption SHOW_LIBRARIES = new BooleanConfigOption("show_libraries", false);
@@ -38,10 +41,14 @@ public class ModMenuConfig {
3841
public static final BooleanConfigOption EASTER_EGGS = new BooleanConfigOption("easter_eggs", true);
3942
public static final BooleanConfigOption RANDOM_JAVA_COLORS = new BooleanConfigOption("random_java_colors", false);
4043
public static final BooleanConfigOption TRANSLATE_NAMES = new BooleanConfigOption("translate_names", true);
41-
public static final BooleanConfigOption TRANSLATE_DESCRIPTIONS = new BooleanConfigOption("translate_descriptions", true);
44+
public static final BooleanConfigOption TRANSLATE_DESCRIPTIONS = new BooleanConfigOption("translate_descriptions",
45+
true
46+
);
4247
public static final BooleanConfigOption UPDATE_CHECKER = new BooleanConfigOption("update_checker", true);
4348
public static final BooleanConfigOption BUTTON_UPDATE_BADGE = new BooleanConfigOption("button_update_badge", true);
44-
public static final EnumConfigOption<UpdateChannel> UPDATE_CHANNEL = new EnumConfigOption<>("update_channel", UpdateChannel.RELEASE);
49+
public static final EnumConfigOption<UpdateChannel> UPDATE_CHANNEL = new EnumConfigOption<>("update_channel",
50+
UpdateChannel.RELEASE
51+
);
4552
public static final BooleanConfigOption QUICK_CONFIGURE = new BooleanConfigOption("quick_configure", true);
4653

4754
@FileOnlyConfig
@@ -53,13 +60,20 @@ public class ModMenuConfig {
5360
@FileOnlyConfig
5461
public static final BooleanConfigOption CONFIG_MODE = new BooleanConfigOption("config_mode", false);
5562
@FileOnlyConfig
56-
public static final BooleanConfigOption DISABLE_DRAG_AND_DROP = new BooleanConfigOption("disable_drag_and_drop", false);
63+
public static final BooleanConfigOption DISABLE_DRAG_AND_DROP = new BooleanConfigOption("disable_drag_and_drop",
64+
false
65+
);
5766
@FileOnlyConfig
5867
public static final StringSetConfigOption HIDDEN_MODS = new StringSetConfigOption("hidden_mods", new HashSet<>());
5968
@FileOnlyConfig
60-
public static final StringSetConfigOption HIDDEN_CONFIGS = new StringSetConfigOption("hidden_configs", new HashSet<>());
69+
public static final StringSetConfigOption HIDDEN_CONFIGS = new StringSetConfigOption("hidden_configs",
70+
new HashSet<>()
71+
);
6172
@FileOnlyConfig
62-
public static final StringSetConfigOption DISABLE_UPDATE_CHECKER = new StringSetConfigOption("disable_update_checker", new HashSet<>());
73+
public static final StringSetConfigOption DISABLE_UPDATE_CHECKER = new StringSetConfigOption(
74+
"disable_update_checker",
75+
new HashSet<>()
76+
);
6377

6478
public static SimpleOption<?>[] asOptions() {
6579
ArrayList<SimpleOption<?>> options = new ArrayList<>();
@@ -77,8 +91,8 @@ public static SimpleOption<?>[] asOptions() {
7791
}
7892

7993
public enum Sorting {
80-
ASCENDING(Comparator.comparing(mod -> mod.getTranslatedName().toLowerCase(Locale.ROOT))),
81-
DESCENDING(ASCENDING.getComparator().reversed());
94+
ASCENDING(Comparator.comparing(mod -> mod.getTranslatedName()
95+
.toLowerCase(Locale.ROOT))), DESCENDING(ASCENDING.getComparator().reversed());
8296

8397
private final Comparator<Mod> comparator;
8498

@@ -92,10 +106,9 @@ public Comparator<Mod> getComparator() {
92106
}
93107

94108
public enum ModCountLocation {
95-
TITLE_SCREEN(true, false),
96-
MODS_BUTTON(false, true),
97-
TITLE_SCREEN_AND_MODS_BUTTON(true, true),
98-
NONE(false, false);
109+
TITLE_SCREEN(true, false), MODS_BUTTON(false, true), TITLE_SCREEN_AND_MODS_BUTTON(true, true), NONE(false,
110+
false
111+
);
99112

100113
private final boolean titleScreen, modsButton;
101114

@@ -114,15 +127,10 @@ public boolean isOnModsButton() {
114127
}
115128

116129
public enum TitleMenuButtonStyle {
117-
CLASSIC(),
118-
REPLACE_REALMS(),
119-
SHRINK(),
120-
ICON();
130+
CLASSIC(), REPLACE_REALMS(), SHRINK(), ICON()
121131
}
122132

123133
public enum GameMenuButtonStyle {
124-
REPLACE_BUGS,
125-
BELOW_BUGS,
126-
ICON;
134+
REPLACE_BUGS, BELOW_BUGS, ICON
127135
}
128136
}

‎src/main/java/com/terraformersmc/modmenu/config/ModMenuConfigManager.java‎

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@
99
import com.terraformersmc.modmenu.config.option.StringSetConfigOption;
1010
import net.fabricmc.loader.api.FabricLoader;
1111

12-
import java.io.*;
12+
import java.io.BufferedReader;
13+
import java.io.BufferedWriter;
14+
import java.io.IOException;
1315
import java.lang.reflect.Field;
1416
import java.lang.reflect.Modifier;
1517
import java.lang.reflect.ParameterizedType;
@@ -51,16 +53,24 @@ private static void load() {
5153
JsonArray jsonArray = json.getAsJsonArray(field.getName().toLowerCase(Locale.ROOT));
5254
if (jsonArray != null) {
5355
StringSetConfigOption option = (StringSetConfigOption) field.get(null);
54-
ConfigOptionStorage.setStringSet(option.getKey(), Sets.newHashSet(jsonArray).stream().map(JsonElement::getAsString).collect(Collectors.toSet()));
56+
ConfigOptionStorage.setStringSet(
57+
option.getKey(),
58+
Sets.newHashSet(jsonArray)
59+
.stream()
60+
.map(JsonElement::getAsString)
61+
.collect(Collectors.toSet())
62+
);
5563
}
5664
} else if (BooleanConfigOption.class.isAssignableFrom(field.getType())) {
57-
JsonPrimitive jsonPrimitive = json.getAsJsonPrimitive(field.getName().toLowerCase(Locale.ROOT));
65+
JsonPrimitive jsonPrimitive = json.getAsJsonPrimitive(field.getName()
66+
.toLowerCase(Locale.ROOT));
5867
if (jsonPrimitive != null && jsonPrimitive.isBoolean()) {
5968
BooleanConfigOption option = (BooleanConfigOption) field.get(null);
6069
ConfigOptionStorage.setBoolean(option.getKey(), jsonPrimitive.getAsBoolean());
6170
}
6271
} else if (EnumConfigOption.class.isAssignableFrom(field.getType()) && field.getGenericType() instanceof ParameterizedType) {
63-
JsonPrimitive jsonPrimitive = json.getAsJsonPrimitive(field.getName().toLowerCase(Locale.ROOT));
72+
JsonPrimitive jsonPrimitive = json.getAsJsonPrimitive(field.getName()
73+
.toLowerCase(Locale.ROOT));
6474
if (jsonPrimitive != null && jsonPrimitive.isString()) {
6575
Type generic = ((ParameterizedType) field.getGenericType()).getActualTypeArguments()[0];
6676
if (generic instanceof Class<?>) {
@@ -99,7 +109,9 @@ public static void save() {
99109
if (Modifier.isStatic(field.getModifiers()) && Modifier.isFinal(field.getModifiers())) {
100110
if (BooleanConfigOption.class.isAssignableFrom(field.getType())) {
101111
BooleanConfigOption option = (BooleanConfigOption) field.get(null);
102-
config.addProperty(field.getName().toLowerCase(Locale.ROOT), ConfigOptionStorage.getBoolean(option.getKey()));
112+
config.addProperty(field.getName().toLowerCase(Locale.ROOT),
113+
ConfigOptionStorage.getBoolean(option.getKey())
114+
);
103115
} else if (StringSetConfigOption.class.isAssignableFrom(field.getType())) {
104116
StringSetConfigOption option = (StringSetConfigOption) field.get(null);
105117
JsonArray array = new JsonArray();
@@ -109,7 +121,11 @@ public static void save() {
109121
Type generic = ((ParameterizedType) field.getGenericType()).getActualTypeArguments()[0];
110122
if (generic instanceof Class<?>) {
111123
EnumConfigOption<?> option = (EnumConfigOption<?>) field.get(null);
112-
config.addProperty(field.getName().toLowerCase(Locale.ROOT), ConfigOptionStorage.getEnumTypeless(option.getKey(), (Class<Enum<?>>) generic).name().toLowerCase(Locale.ROOT));
124+
config.addProperty(field.getName().toLowerCase(Locale.ROOT),
125+
ConfigOptionStorage.getEnumTypeless(option.getKey(), (Class<Enum<?>>) generic)
126+
.name()
127+
.toLowerCase(Locale.ROOT)
128+
);
113129
}
114130
}
115131
}

‎src/main/java/com/terraformersmc/modmenu/config/option/BooleanConfigOption.java‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,16 +45,25 @@ public boolean getDefaultValue() {
4545
}
4646

4747
public Text getButtonText() {
48-
return ScreenTexts.composeGenericOptionText(Text.translatable(translationKey), getValue() ? enabledText : disabledText);
48+
return ScreenTexts.composeGenericOptionText(Text.translatable(translationKey),
49+
getValue() ? enabledText : disabledText
50+
);
4951
}
5052

5153
@Override
5254
public SimpleOption<Boolean> asOption() {
5355
if (enabledText != null && disabledText != null) {
54-
return new SimpleOption<>(translationKey, SimpleOption.emptyTooltip(),
55-
(text, value) -> value ? enabledText : disabledText, SimpleOption.BOOLEAN, getValue(),
56-
newValue -> ConfigOptionStorage.setBoolean(key, newValue));
56+
return new SimpleOption<>(translationKey,
57+
SimpleOption.emptyTooltip(),
58+
(text, value) -> value ? enabledText : disabledText,
59+
SimpleOption.BOOLEAN,
60+
getValue(),
61+
newValue -> ConfigOptionStorage.setBoolean(key, newValue)
62+
);
5763
}
58-
return SimpleOption.ofBoolean(translationKey, getValue(), (value) -> ConfigOptionStorage.setBoolean(key, value));
64+
return SimpleOption.ofBoolean(translationKey,
65+
getValue(),
66+
(value) -> ConfigOptionStorage.setBoolean(key, value)
67+
);
5968
}
6069
}

‎src/main/java/com/terraformersmc/modmenu/config/option/EnumConfigOption.java‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,17 @@ public Text getButtonText() {
5656

5757
@Override
5858
public SimpleOption<E> asOption() {
59-
return new SimpleOption<>(translationKey, SimpleOption.emptyTooltip(),
60-
(text, value) -> getValueText(this, value),
61-
new SimpleOption.PotentialValuesBasedCallbacks<>(Arrays.asList(enumClass.getEnumConstants()),
62-
Codec.STRING.xmap(
63-
string -> Arrays.stream(enumClass.getEnumConstants()).filter(e -> e.name().toLowerCase().equals(string)).findAny().orElse(null),
64-
newValue -> newValue.name().toLowerCase()
65-
)),
66-
getValue(), value -> ConfigOptionStorage.setEnum(key, value));
59+
return new SimpleOption<>(translationKey,
60+
SimpleOption.emptyTooltip(),
61+
(text, value) -> getValueText(this, value),
62+
new SimpleOption.PotentialValuesBasedCallbacks<>(Arrays.asList(enumClass.getEnumConstants()),
63+
Codec.STRING.xmap(string -> Arrays.stream(enumClass.getEnumConstants())
64+
.filter(e -> e.name().toLowerCase().equals(string))
65+
.findAny()
66+
.orElse(null), newValue -> newValue.name().toLowerCase())
67+
),
68+
getValue(),
69+
value -> ConfigOptionStorage.setEnum(key, value)
70+
);
6771
}
6872
}

0 commit comments

Comments
 (0)