diff --git a/common/src/main/java/eu/midnightdust/core/mixin/MixinOptionsScreen.java b/common/src/main/java/eu/midnightdust/core/mixin/MixinOptionsScreen.java index 6ce5b88..5080819 100644 --- a/common/src/main/java/eu/midnightdust/core/mixin/MixinOptionsScreen.java +++ b/common/src/main/java/eu/midnightdust/core/mixin/MixinOptionsScreen.java @@ -25,7 +25,7 @@ public class MixinOptionsScreen extends Screen { @Shadow @Final private ThreePartsLayoutWidget layout; @Unique TextIconButtonWidget button = TextIconButtonWidget.builder(Text.translatable("midnightlib.overview.title"), ( buttonWidget) -> Objects.requireNonNull(client).setScreen(new MidnightConfigOverviewScreen(this)), true) - .texture(new Identifier("midnightlib","icon/midnightlib"), 16, 16).dimension(20, 20).build(); + .texture(Identifier.of("midnightlib","icon/midnightlib"), 16, 16).dimension(20, 20).build(); @Unique boolean shouldShowButton = MidnightLibConfig.config_screen_list.equals(MidnightLibConfig.ConfigButton.TRUE) || (MidnightLibConfig.config_screen_list.equals(MidnightLibConfig.ConfigButton.MODMENU) && !PlatformFunctions.isModLoaded("modmenu")); protected MixinOptionsScreen(Text title) {super(title);} 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 048ca30..38c2bac 100755 --- a/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java +++ b/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java @@ -287,7 +287,10 @@ public abstract class MidnightConfig { super.init(); tabNavigation.setWidth(this.width); tabNavigation.init(); - if (tabs.size() > 1) this.addDrawableChild(tabNavigation); + if (tabs.size() > 1) { + this.addDrawableChild(tabNavigation); + list.renderHeaderSeparator = false; + } this.addDrawableChild(ButtonWidget.builder(ScreenTexts.CANCEL, button -> { loadValues(); @@ -320,7 +323,7 @@ public abstract class MidnightConfig { info.index = 0; list.clear(); fillList(); - }), true).texture(new Identifier("midnightlib","icon/reset"), 12, 12).dimension(40, 20).build(); + }), true).texture(Identifier.of("midnightlib","icon/reset"), 12, 12).dimension(40, 20).build(); resetButton.setPosition(width - 205, 0); if (info.widget instanceof Map.Entry) { @@ -386,12 +389,11 @@ public abstract class MidnightConfig { if (tabs.size() < 2) context.drawCenteredTextWithShadow(textRenderer, title, width / 2, 10, 0xFFFFFF); - list.renderHeaderSeperator = tabs.size() < 2; } } @Environment(EnvType.CLIENT) public static class MidnightConfigListWidget extends ElementListWidget { - boolean renderHeaderSeperator = true; + boolean renderHeaderSeparator = true; public MidnightConfigListWidget(MinecraftClient client, int width, int height, int y, int itemHeight) { super(client, width, height, y, itemHeight); } @@ -400,7 +402,7 @@ public abstract class MidnightConfig { @Override protected void drawHeaderAndFooterSeparators(DrawContext context) { - if (renderHeaderSeperator) super.drawHeaderAndFooterSeparators(context); + if (renderHeaderSeparator) super.drawHeaderAndFooterSeparators(context); 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); diff --git a/fabric/build.gradle b/fabric/build.gradle index d301610..932970e 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -66,7 +66,7 @@ components.java { unifiedPublishing { project { - displayName = "MidnightLib v$project.version - Fabric $project.minecraft_version" + displayName = "MidnightLib $project.version - Fabric $project.minecraft_version" releaseType = "$project.release_type" changelog = releaseChangelog() gameVersions = [] diff --git a/gradle.properties b/gradle.properties index 742f48b..5c5ec71 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,18 +1,18 @@ org.gradle.jvmargs=-Xmx4096M -minecraft_version=1.20.6 -yarn_mappings=1.20.6+build.1 -enabled_platforms=fabric,neoforge +minecraft_version=1.21-pre4 +yarn_mappings=1.21-pre4+build.3 +enabled_platforms=fabric archives_base_name=midnightlib -mod_version=1.5.5 +mod_version=1.5.6 maven_group=eu.midnightdust release_type=release curseforge_id=488090 modrinth_id=codAaoxh fabric_loader_version=0.15.11 -fabric_api_version=0.97.8+1.20.6 +fabric_api_version=0.100.0+1.21 neoforge_version=20.6.63-beta yarn_mappings_patch_neoforge_version = 1.20.5+build.3 diff --git a/neoforge/build.gradle b/neoforge/build.gradle index ccbd89c..ebedf83 100644 --- a/neoforge/build.gradle +++ b/neoforge/build.gradle @@ -75,7 +75,7 @@ components.java { unifiedPublishing { project { - displayName = "MidnightLib v$project.version - NeoForge $project.minecraft_version" + displayName = "MidnightLib $project.version - NeoForge $project.minecraft_version" releaseType = "$project.release_type" changelog = releaseChangelog() gameVersions = [] diff --git a/settings.gradle b/settings.gradle index d64842c..f865b79 100644 --- a/settings.gradle +++ b/settings.gradle @@ -11,6 +11,6 @@ include("common") include("fabric-like") include("fabric") //include("quilt") -include("neoforge") +//include("neoforge") rootProject.name = "midnightlib"