Motschen/MidnightLib
1
0
Fork 0
mirror of https://github.com/TeamMidnightDust/MidnightLib.git synced 2025-12-15 17:05:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Previous commit had a typo, it's 1.20 ;)

Browse Source 
This commit fixes unsaved options resetting when resizing the game window
This commit is contained in:
Motschen
2023-05-22 12:20:35 +02:00
parent 8109eeb74e
commit 9074abc331
2 changed files with 34 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java
View File

@@ -198,6 +198,26 @@ public abstract class MidnightConfig {
this.parent = parent; this.parent = parent;
this.modid = modid; this.modid = modid;
this.translationPrefix = modid + ".midnightconfig."; this.translationPrefix = modid + ".midnightconfig.";
loadValues();
for (EntryInfo e : entries) {
if (e.id.equals(modid)) {
String tabId = e.field.isAnnotationPresent(Entry.class) ? e.field.getAnnotation(Entry.class).category() : e.field.getAnnotation(Comment.class).category();
String name = translationPrefix + "category." + tabId;
if (!I18n.hasTranslation(name) && tabId.equals("default"))
name = translationPrefix + "title";
if (!tabs.containsKey(name)) {
Tab tab = new GridScreenTab(Text.translatable(name));
e.tab = tab;
tabs.put(name, tab);
} else e.tab = tabs.get(name);
}
}
tabNavigation = TabNavigationWidget.builder(tabManager, this.width).tabs(tabs.values().toArray(new Tab[0])).build();
if (tabs.size() > 1) this.addDrawableChild(tabNavigation);
tabNavigation.selectTab(0, false);
tabNavigation.init();
prevTab = tabManager.getCurrentTab();
} }
public final String translationPrefix; public final String translationPrefix;
public final Screen parent; public final Screen parent;
@@ -205,9 +225,11 @@ public abstract class MidnightConfig {
public MidnightConfigListWidget list; public MidnightConfigListWidget list;
public boolean reload = false; public boolean reload = false;
public TabManager tabManager = new TabManager(a -> {}, a -> {}); public TabManager tabManager = new TabManager(a -> {}, a -> {});
public Map<String, Tab> tabs = new HashMap<>();
public Tab prevTab; public Tab prevTab;
public TabNavigationWidget tabNavigation; public TabNavigationWidget tabNavigation;
public ButtonWidget done; public ButtonWidget done;
public double scrollProgress = 0d;
// Real Time config update // // Real Time config update //
@Override @Override
@@ -219,6 +241,7 @@ public abstract class MidnightConfig {
fillList(); fillList();
list.setScrollAmount(0); list.setScrollAmount(0);
} }
scrollProgress = list.getScrollAmount();
for (EntryInfo info : entries) { for (EntryInfo info : entries) {
try {info.field.set(null, info.value);} catch (IllegalAccessException ignored) {} try {info.field.set(null, info.value);} catch (IllegalAccessException ignored) {}
} }
@@ -250,36 +273,9 @@ public abstract class MidnightConfig {
if (this.tabNavigation.trySwitchTabsWithKey(keyCode)) return true; if (this.tabNavigation.trySwitchTabsWithKey(keyCode)) return true;
return super.keyPressed(keyCode, scanCode, modifiers); return super.keyPressed(keyCode, scanCode, modifiers);
} }
public void refresh() {
double scrollAmount = list.getScrollAmount();
list.clear();
fillList();
list.setScrollAmount(scrollAmount);
}
@Override @Override
public void init() { public void init() {
super.init(); super.init();
loadValues();
Map<String, Tab> tabs = new HashMap<>();
for (EntryInfo e : entries) {
if (e.id.equals(modid)) {
String tabId = e.field.isAnnotationPresent(Entry.class) ? e.field.getAnnotation(Entry.class).category() : e.field.getAnnotation(Comment.class).category();
String name = translationPrefix + "category." + tabId;
if (!I18n.hasTranslation(name) && tabId.equals("default"))
name = translationPrefix + "title";
if (!tabs.containsKey(name)) {
Tab tab = new GridScreenTab(Text.translatable(name));
e.tab = tab;
tabs.put(name, tab);
} else e.tab = tabs.get(name);
}
}
tabNavigation = TabNavigationWidget.builder(tabManager, this.width).tabs(tabs.values().toArray(new Tab[0])).build();
if (tabs.size() > 1) this.addDrawableChild(tabNavigation);
if (!reload) tabNavigation.selectTab(0, false);
tabNavigation.init();
prevTab = tabManager.getCurrentTab();
this.addDrawableChild(ButtonWidget.builder(ScreenTexts.CANCEL, button -> { this.addDrawableChild(ButtonWidget.builder(ScreenTexts.CANCEL, button -> {
loadValues(); loadValues();
@@ -301,6 +297,7 @@ public abstract class MidnightConfig {
this.addSelectableChild(this.list); this.addSelectableChild(this.list);
fillList(); fillList();
reload = true;
} }
public void fillList() { public void fillList() {
for (EntryInfo info : entries) { for (EntryInfo info : entries) {
@@ -310,7 +307,8 @@ public abstract class MidnightConfig {
info.value = info.defaultValue; info.value = info.defaultValue;
info.tempValue = info.defaultValue.toString(); info.tempValue = info.defaultValue.toString();
info.index = 0; info.index = 0;
this.refresh(); list.clear();
fillList();
})).dimensions(width - 205, 0, 40, 20).build(); })).dimensions(width - 205, 0, 40, 20).build();
if (info.widget instanceof Map.Entry) { if (info.widget instanceof Map.Entry) {
@@ -332,9 +330,8 @@ public abstract class MidnightConfig {
if (((List<?>) info.value).contains("")) ((List<String>) info.value).remove(""); if (((List<?>) info.value).contains("")) ((List<String>) info.value).remove("");
info.index = info.index + 1; info.index = info.index + 1;
if (info.index > ((List<String>) info.value).size()) info.index = 0; if (info.index > ((List<String>) info.value).size()) info.index = 0;
this.reload = true; list.clear();
refresh(); fillList();
this.reload = false;
})).dimensions(width - 185, 0, 20, 20).build(); })).dimensions(width - 185, 0, 20, 20).build();
widget.setTooltip(getTooltip(info)); widget.setTooltip(getTooltip(info));
this.list.addButton(List.of(widget, resetButton, cycleButton), name, info); this.list.addButton(List.of(widget, resetButton, cycleButton), name, info);
@@ -369,6 +366,7 @@ public abstract class MidnightConfig {
this.list.addButton(List.of(), name, info); this.list.addButton(List.of(), name, info);
} }
} }
list.setScrollAmount(scrollProgress);
updateResetButtons(); updateResetButtons();
} }
} }
@@ -377,7 +375,7 @@ public abstract class MidnightConfig {
this.renderBackground(context); this.renderBackground(context);
this.list.render(context, mouseX, mouseY, delta); this.list.render(context, mouseX, mouseY, delta);
context.drawCenteredTextWithShadow(textRenderer, title, width / 2, 15, 0xFFFFFF); if (tabs.size() < 2) context.drawCenteredTextWithShadow(textRenderer, title, width / 2, 15, 0xFFFFFF);
super.render(context,mouseX,mouseY,delta); super.render(context,mouseX,mouseY,delta);
} }
} }
@@ -433,7 +431,7 @@ public abstract class MidnightConfig {
public List<? extends Element> children() {return children;} public List<? extends Element> children() {return children;}
public List<? extends Selectable> selectableChildren() {return children;} public List<? extends Selectable> selectableChildren() {return children;}
} }
private static class MidnightSliderWidget extends SliderWidget { public static class MidnightSliderWidget extends SliderWidget {
private final EntryInfo info; private final Entry e; private final EntryInfo info; private final Entry e;
public MidnightSliderWidget(int x, int y, int width, int height, Text text, double value, EntryInfo info) { public MidnightSliderWidget(int x, int y, int width, int height, Text text, double value, EntryInfo info) {
super(x, y, width, height, text, value); super(x, y, width, height, text, value);

6
gradle.properties
View File

@@ -1,11 +1,11 @@
org.gradle.jvmargs=-Xmx4096M org.gradle.jvmargs=-Xmx4096M
minecraft_version=1.20-pre2 minecraft_version=1.20-pre4
yarn_mappings=1.20-pre2+build.2 yarn_mappings=1.20-pre4+build.4
enabled_platforms=fabric enabled_platforms=fabric
archives_base_name=midnightlib archives_base_name=midnightlib
mod_version=1.3.1 mod_version=1.4.0
maven_group=eu.midnightdust maven_group=eu.midnightdust
fabric_loader_version=0.14.19 fabric_loader_version=0.14.19