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

Merge branch 'architectury-1.21.1' into temp/1.21-backport

Browse Source
This commit is contained in:
Martin Prokoph
2025-07-14 18:49:51 +02:00
committed by GitHub
parent 9602736335 a4d801ddf7
commit fefbaa1947
3 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
common/src/main/java/eu/midnightdust/core/mixin/MixinOptionsScreen.java
View File

@@ -37,11 +37,14 @@ public abstract class MixinOptionsScreen extends Screen {
} }
} }
@Inject(at = @At("TAIL"), method = "refreshWidgetPositions")
@Inject(at = @At("TAIL"), method = "initTabNavigation")
public void midnightlib$onResize(CallbackInfo ci) { public void midnightlib$onResize(CallbackInfo ci) {
if (shouldShowButton()) this.midnightlib$setButtonPos(); if (shouldShowButton()) this.midnightlib$setButtonPos();
} }
@Unique @Unique
public void midnightlib$setButtonPos() { public void midnightlib$setButtonPos() {
midnightlib$button.setPosition(layout.getWidth() / 2 + 158, layout.getY() + layout.getFooterHeight() - 4); midnightlib$button.setPosition(layout.getWidth() / 2 + 158, layout.getY() + layout.getFooterHeight() - 4);

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

@@ -293,9 +293,9 @@ public abstract class MidnightConfig {
super.tick(); super.tick();
if (prevTab != null && prevTab != tabManager.getCurrentTab()) { if (prevTab != null && prevTab != tabManager.getCurrentTab()) {
prevTab = tabManager.getCurrentTab(); prevTab = tabManager.getCurrentTab();
updateList(); list.setScrollY(0); updateList(); list.setScrollAmount(0);
} }
scrollProgress = list.getScrollY(); scrollProgress = list.getScrollAmount();
for (EntryInfo info : entries.values()) info.updateFieldValue(); for (EntryInfo info : entries.values()) info.updateFieldValue();
updateButtons(); updateButtons();
if (reloadScreen) { updateList(); reloadScreen = false; } if (reloadScreen) { updateList(); reloadScreen = false; }
@@ -439,7 +439,7 @@ public abstract class MidnightConfig {
if (!info.conditionsMet) widgets.forEach(w -> w.active = false); if (!info.conditionsMet) widgets.forEach(w -> w.active = false);
this.list.addButton(widgets, name, info); this.list.addButton(widgets, name, info);
} else this.list.addButton(List.of(), name, info); } else this.list.addButton(List.of(), name, info);
} list.setScrollY(scrollProgress); } list.setScrollAmount(scrollProgress);
updateButtons(); updateButtons();
} }
} }
@@ -459,7 +459,9 @@ public abstract class MidnightConfig {
@Override @Override
protected void drawHeaderAndFooterSeparators(DrawContext context) { protected void drawHeaderAndFooterSeparators(DrawContext context) {
if (renderHeaderSeparator) super.drawHeaderAndFooterSeparators(context); if (renderHeaderSeparator) super.drawHeaderAndFooterSeparators(context);
else context.drawTexture(RenderPipelines.GUI_TEXTURED, this.client.world == null ? Screen.FOOTER_SEPARATOR_TEXTURE : Screen.INWORLD_FOOTER_SEPARATOR_TEXTURE, this.getX(), this.getBottom(), 0, 0, this.getWidth(), 2, 32, 2); else { RenderSystem.enableBlend();
context.drawTexture(this.client.world == null ? Screen.FOOTER_SEPARATOR_TEXTURE : Screen.INWORLD_FOOTER_SEPARATOR_TEXTURE, this.getX(), this.getBottom(), 0.0F, 0.0F, this.getWidth(), 2, 32, 2);
RenderSystem.disableBlend(); }
} }
public void addButton(List<ClickableWidget> buttons, Text text, EntryInfo info) { this.addEntry(new ButtonEntry(buttons, text, info)); } public void addButton(List<ClickableWidget> buttons, Text text, EntryInfo info) { this.addEntry(new ButtonEntry(buttons, text, info)); }
public void clear() { this.clearEntries(); } public void clear() { this.clearEntries(); }

12
gradle.properties
View File

@@ -1,8 +1,8 @@
org.gradle.jvmargs=-Xmx4096M org.gradle.jvmargs=-Xmx4096M
minecraft_version=1.21.6 minecraft_version=1.21
supported_versions= supported_versions=1.21.1
yarn_mappings=1.21.6+build.1 yarn_mappings=1.21+build.1
enabled_platforms=fabric,neoforge enabled_platforms=fabric,neoforge
archives_base_name=midnightlib archives_base_name=midnightlib
@@ -12,10 +12,10 @@ release_type=release
curseforge_id=488090 curseforge_id=488090
modrinth_id=codAaoxh modrinth_id=codAaoxh
fabric_loader_version=0.16.14 fabric_loader_version=0.16.10
fabric_api_version=0.127.0+1.21.6 fabric_api_version=0.115.0+1.21.1
neoforge_version=21.6.0-beta neoforge_version=21.0.167
yarn_mappings_patch_neoforge_version = 1.21+build.4 yarn_mappings_patch_neoforge_version = 1.21+build.4
mod_menu_version = 9.0.0 mod_menu_version = 9.0.0