Skip to content

Commit

Permalink
debug issue Bernasss12#64
Browse files Browse the repository at this point in the history
  • Loading branch information
Fourmisain committed Mar 27, 2024
1 parent b78ff03 commit 6484247
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ public void onInitializeClient() {
* enchantment registry should be done.
*/
public static void onTitleScreenLoaded(){
BetterEnchantedBooks.LOGGER.info("onTitleScreenLoaded(), ModConfig.configsFirstLoaded = {}", ModConfig.configsFirstLoaded);

if (!ModConfig.configsFirstLoaded) {
//TooltipDrawerHelper.populateEnchantmentIconList();
ModConfig.loadAndPopulateConfig();
Expand Down
17 changes: 16 additions & 1 deletion src/main/java/dev/bernasss12/bebooks/client/gui/ModConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,8 @@ public static void loadConfigDefaults() {
tooltipSetting = DEFAULT_TOOLTIP_SETTING;
// Enchantment Glint
glintSetting = DEFAULT_GLINT_SETTING;

BetterEnchantedBooks.LOGGER.info("loadConfigDefaults(), sortingSetting = {}", sortingSetting);
}

private static void loadEnchantmentData() {
Expand Down Expand Up @@ -115,12 +117,16 @@ public static void saveEnchantmentData() {
}

public static void loadAndPopulateConfig() {
BetterEnchantedBooks.LOGGER.info("loadAndPopulateConfig()");

Path path = CONFIG_DIR.resolve("config.properties");

loadConfigDefaults();

// Try to read and parse config file
if (Files.exists(path)) {
BetterEnchantedBooks.LOGGER.info("found config {}", path);

try (BufferedReader reader = Files.newBufferedReader(path)) {
Properties properties = new Properties();
properties.load(reader);
Expand All @@ -131,6 +137,8 @@ public static void loadAndPopulateConfig() {
version = Integer.parseInt(properties.getProperty("version"));
}

BetterEnchantedBooks.LOGGER.info("read config version {}", version);

// Sorting Settings
if (version == 0) {
if (Boolean.parseBoolean(properties.getProperty("sort"))) {
Expand All @@ -143,8 +151,12 @@ public static void loadAndPopulateConfig() {
sortingSetting = SortingSetting.DISABLED;
}
} else {
BetterEnchantedBooks.LOGGER.info("read sorting setting {}", properties.getProperty("sorting_mode"));
sortingSetting = SortingSetting.fromString(properties.getProperty("sorting_mode"));
}

BetterEnchantedBooks.LOGGER.info("got sorting setting {}", sortingSetting);

doKeepCursesBelow = Boolean.parseBoolean(properties.getProperty("keep_curses_below"));

// Coloring Settings
Expand Down Expand Up @@ -227,7 +239,10 @@ public static ConfigBuilder getConfigScreen() {
// Sorting settings page
builder.setDefaultBackgroundTexture(new Identifier("minecraft:textures/block/spruce_planks.png"));
ConfigEntryBuilder entryBuilder = builder.entryBuilder();
sortingCategory.addEntry(entryBuilder.startEnumSelector(Text.translatable("entry.bebooks.sorting_settings.sorting_mode"), SortingSetting.class, sortingSetting).setDefaultValue(DEFAULT_SORTING_SETTING).setSaveConsumer(setting -> sortingSetting = setting).build());
sortingCategory.addEntry(entryBuilder.startEnumSelector(Text.translatable("entry.bebooks.sorting_settings.sorting_mode"), SortingSetting.class, sortingSetting).setDefaultValue(DEFAULT_SORTING_SETTING).setSaveConsumer(setting -> {
sortingSetting = setting;
BetterEnchantedBooks.LOGGER.info("set sorting setting {}", sortingSetting);
}).build());
sortingCategory.addEntry(entryBuilder.startBooleanToggle(Text.translatable("entry.bebooks.sorting_settings.keep_curses_at_bottom"), doKeepCursesBelow).setSaveConsumer((doKeepCursesBelowInput) -> doKeepCursesBelow = doKeepCursesBelowInput).build());

// Coloring settings page
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ public abstract class ItemStackMixin {
@ModifyVariable(method = "appendEnchantments", argsOnly = true, at = @At("HEAD"))
private static NbtList appendEnchantmentsHead(NbtList tag, List<Text> tooltip, NbtList enchantments) {
if (MinecraftClient.getInstance().currentScreen instanceof HandledScreen) {
BetterEnchantedBooks.LOGGER.info("before crash: ModConfig.sortingSetting = {}", ModConfig.sortingSetting);
return NBTUtils.toListTag(NBTUtils.sorted(enchantments, ModConfig.sortingSetting, ModConfig.doKeepCursesBelow));
}
return tag;
Expand Down

0 comments on commit 6484247

Please sign in to comment.