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

Merge pull request #83 from maloryware/architectury-1.21.x

Browse Source 
Backport of recent changes to MC 1.21.1
This commit is contained in:
Martin Prokoph
2025-01-27 18:16:36 +01:00
committed by GitHub
parent e938682e51 26d7948590
commit c067d135ed
3 changed files with 15 additions and 13 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);

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

@@ -9,7 +9,6 @@ import net.minecraft.client.MinecraftClient; import net.minecraft.client.font.Te
import net.minecraft.client.gui.Element; import net.minecraft.client.gui.Selectable; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.Element; import net.minecraft.client.gui.Selectable; import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.gui.tab.GridScreenTab; import net.minecraft.client.gui.tab.Tab; import net.minecraft.client.gui.tab.TabManager; import net.minecraft.client.gui.tab.GridScreenTab; import net.minecraft.client.gui.tab.Tab; import net.minecraft.client.gui.tab.TabManager;
import net.minecraft.client.gui.tooltip.Tooltip; import net.minecraft.client.gui.widget.*; import net.minecraft.client.gui.tooltip.Tooltip; import net.minecraft.client.gui.widget.*;
import net.minecraft.client.render.RenderLayer;
import net.minecraft.client.resource.language.I18n; import net.minecraft.client.resource.language.I18n;
import net.minecraft.registry.Registries; import net.minecraft.registry.Registries;
import net.minecraft.screen.ScreenTexts; import net.minecraft.screen.ScreenTexts;
@@ -251,9 +250,9 @@ public abstract class MidnightConfig {
if (prevTab != null && prevTab != tabManager.getCurrentTab()) { if (prevTab != null && prevTab != tabManager.getCurrentTab()) {
prevTab = tabManager.getCurrentTab(); prevTab = tabManager.getCurrentTab();
this.list.clear(); fillList(); this.list.clear(); fillList();
list.setScrollY(0); list.setScrollAmount(0);
} }
scrollProgress = list.getScrollY(); scrollProgress = list.getScrollAmount();
for (EntryInfo info : entries) try {info.field.set(null, info.value);} catch (IllegalAccessException ignored) {} for (EntryInfo info : entries) try {info.field.set(null, info.value);} catch (IllegalAccessException ignored) {}
updateButtons(); updateButtons();
} }
@@ -395,7 +394,7 @@ public abstract class MidnightConfig {
} }
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();
} }
} }
@@ -423,7 +422,7 @@ public abstract class MidnightConfig {
protected void drawHeaderAndFooterSeparators(DrawContext context) { protected void drawHeaderAndFooterSeparators(DrawContext context) {
if (renderHeaderSeparator) super.drawHeaderAndFooterSeparators(context); if (renderHeaderSeparator) super.drawHeaderAndFooterSeparators(context);
else { RenderSystem.enableBlend(); else { RenderSystem.enableBlend();
context.drawTexture(RenderLayer::getGuiTextured, 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); 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(); } 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)); }

14
gradle.properties
View File

@@ -1,21 +1,21 @@
org.gradle.jvmargs=-Xmx4096M org.gradle.jvmargs=-Xmx4096M
minecraft_version=1.21.4 minecraft_version=1.21
supported_versions= supported_versions=1.21.1
yarn_mappings=1.21.4+build.1 yarn_mappings=1.21+build.1
enabled_platforms=fabric,neoforge enabled_platforms=fabric,neoforge
archives_base_name=midnightlib archives_base_name=midnightlib
mod_version=1.6.7 mod_version=1.6.7+1.21.1
maven_group=eu.midnightdust maven_group=eu.midnightdust
release_type=release release_type=release
curseforge_id=488090 curseforge_id=488090
modrinth_id=codAaoxh modrinth_id=codAaoxh
fabric_loader_version=0.16.9 fabric_loader_version=0.16.10
fabric_api_version=0.110.5+1.21.4 fabric_api_version=0.115.0+1.21.1
neoforge_version=21.4.3-beta neoforge_version=21.0.167
yarn_mappings_patch_neoforge_version = 1.21+build.4 yarn_mappings_patch_neoforge_version = 1.21+build.4
quilt_loader_version=0.19.0-beta.18 quilt_loader_version=0.19.0-beta.18