diff --git a/.gitignore b/.gitignore index ccb0c56..7f9474b 100644 --- a/.gitignore +++ b/.gitignore @@ -16,4 +16,5 @@ classes/ .metadata .vscode .settings -*.launch \ No newline at end of file +*.launch +.architectury-transformer/debug.log diff --git a/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java b/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java index 607b536..e62e529 100755 --- a/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java +++ b/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java @@ -214,7 +214,6 @@ public abstract class MidnightConfig { } } 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(); @@ -276,6 +275,9 @@ public abstract class MidnightConfig { @Override public void init() { super.init(); + tabNavigation.setWidth(this.width); + tabNavigation.init(); + if (tabs.size() > 1) this.addDrawableChild(tabNavigation); this.addDrawableChild(ButtonWidget.builder(ScreenTexts.CANCEL, button -> { loadValues(); diff --git a/gradle.properties b/gradle.properties index d543a43..3afe1a9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,18 +1,18 @@ org.gradle.jvmargs=-Xmx4096M -minecraft_version=1.20-pre4 -yarn_mappings=1.20-pre4+build.4 -enabled_platforms=fabric +minecraft_version=1.20 +yarn_mappings=1.20+build.1 +enabled_platforms=quilt,fabric,forge archives_base_name=midnightlib -mod_version=1.4.0 +mod_version=1.4.1 maven_group=eu.midnightdust -fabric_loader_version=0.14.19 -fabric_api_version=0.81.2+1.20 +fabric_loader_version=0.14.21 +fabric_api_version=0.83.0+1.20 -forge_version=1.19.4-45.0.40 +forge_version=1.20-46.0.2 -quilt_loader_version=0.19.0-beta.13 -quilt_fabric_api_version=6.0.0-beta.2+0.76.0-1.19.4 -mod_menu_version = 5.0.2 \ No newline at end of file +quilt_loader_version=0.19.0-beta.18 +quilt_fabric_api_version=7.0.1+0.83.0-1.20 +mod_menu_version = 7.0.1 \ No newline at end of file diff --git a/quilt/src/main/resources/quilt.mod.json b/quilt/src/main/resources/quilt.mod.json index ddddd16..7954ae7 100644 --- a/quilt/src/main/resources/quilt.mod.json +++ b/quilt/src/main/resources/quilt.mod.json @@ -32,7 +32,7 @@ ], "metadata": { "name": "MidnightLib (Quilt)", - "description": "Common Library for Team MidnightDust's mods.\nProvides a config api, automatic integration with other mods, common utils, and cosmetics.", + "description": "Common Library for Team MidnightDust's mods. Provides a config api, automatic integration with other mods, common utils, and cosmetics.", "license": "MIT", "environment": "*", "contributors": { diff --git a/settings.gradle b/settings.gradle index f83aad5..c86c020 100644 --- a/settings.gradle +++ b/settings.gradle @@ -10,7 +10,7 @@ pluginManagement { include("common") include("fabric-like") include("fabric") -//include("quilt") -//include("forge") +include("quilt") +include("forge") rootProject.name = "midnightlib"