Merge pull request #107 from TeamMidnightDust/temp/1.21-backport

backport: v1.7.5 for 1.21.1

build.gradle

@@ -3,7 +3,7 @@ import groovy.json.JsonOutput
 
 plugins {
     id "architectury-plugin" version "3.4-SNAPSHOT"
-    id "dev.architectury.loom" version "1.7-SNAPSHOT" apply false
+    id "dev.architectury.loom" version "1.10-SNAPSHOT" apply false
     id "me.shedaniel.unified-publishing" version "0.1.+" apply false
     id 'com.github.johnrengelman.shadow' version '8.1.1' apply false
 }

common/src/main/java/eu/midnightdust/core/mixin/MixinOptionsScreen.java

@@ -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) {
         if (shouldShowButton()) this.midnightlib$setButtonPos();
     }
 
+
     @Unique
     public void midnightlib$setButtonPos() {
         midnightlib$button.setPosition(layout.getWidth() / 2  + 158, layout.getY() + layout.getFooterHeight() - 4);

common/src/main/java/eu/midnightdust/core/screen/MidnightConfigOverviewScreen.java

@@ -45,6 +45,6 @@ public class MidnightConfigOverviewScreen extends Screen {
     public void render(DrawContext context, int mouseX, int mouseY, float delta) {
         super.render(context, mouseX, mouseY, delta);
         this.list.render(context, mouseX, mouseY, delta);
-        context.drawCenteredTextWithShadow(textRenderer, title, width / 2, 10, 0xFFFFFF);
+        context.drawCenteredTextWithShadow(textRenderer, title, width / 2, 10, 0xFFFFFFFF);
     }
 }

common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java

@@ -2,14 +2,15 @@ package eu.midnightdust.lib.config;
 
 import com.google.common.collect.Lists;
 import com.google.gson.*; import com.google.gson.stream.*;
+import com.mojang.blaze3d.systems.RenderSystem;
 import eu.midnightdust.lib.util.PlatformFunctions;
 import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment;
-import net.minecraft.client.MinecraftClient; import net.minecraft.client.font.TextRenderer; import net.minecraft.client.gui.DrawContext;
+import net.minecraft.client.MinecraftClient; import net.minecraft.client.font.TextRenderer;
+import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.Element; import net.minecraft.client.gui.Selectable;
 import net.minecraft.client.gui.screen.ConfirmLinkScreen; 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.tooltip.Tooltip; import net.minecraft.client.gui.widget.*;
-import net.minecraft.client.render.RenderLayer;
 import net.minecraft.client.resource.language.I18n;
 import net.minecraft.registry.Registries;
 import net.minecraft.screen.ScreenTexts;
@@ -21,7 +22,6 @@ import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*; import javax.swing.filechooser.FileNameExtensionFilter;
 import java.awt.Color;
-import java.io.IOException;
 import java.lang.annotation.*;
 import java.lang.reflect.Field; import java.lang.reflect.Modifier; import java.lang.reflect.ParameterizedType;
 import java.nio.file.Files; import java.nio.file.Path;
@@ -120,10 +120,7 @@ public abstract class MidnightConfig {
     private static final Gson gson = new GsonBuilder()
             .excludeFieldsWithModifiers(Modifier.TRANSIENT).excludeFieldsWithModifiers(Modifier.PRIVATE)
             .addSerializationExclusionStrategy(new NonEntryExclusionStrategy())
-            .registerTypeAdapter(Identifier.class, new TypeAdapter<Identifier>() {
-                public void write(JsonWriter out, Identifier id) throws IOException { out.value(id.toString()); }
-                public Identifier read(JsonReader in) throws IOException { return Identifier.of(in.nextString()); }
-            }).setPrettyPrinting().create();
+            .registerTypeAdapter(Identifier.class, new Identifier.Serializer()).setPrettyPrinting().create();
 
     public static void loadValuesFromJson(String modid) {
         try { gson.fromJson(Files.newBufferedReader(path), configClass.get(modid)); }
@@ -187,11 +184,9 @@ public abstract class MidnightConfig {
     }
 
     private static Text getEnumTranslatableText(Object value, String modid, EntryInfo info) {
-        if (value instanceof TranslatableOption translatableOption) {
-            return translatableOption.getText();
-        }
+        if (value instanceof TranslatableOption translatableOption) return translatableOption.getText();
 
-        String translationKey = modid + ".midnightconfig.enum." + info.dataType.getSimpleName() + "." + info.toTemporaryValue();
+        String translationKey = "%s.midnightconfig.enum.%s.%s".formatted(modid, info.dataType.getSimpleName(), info.toTemporaryValue());
         return I18n.hasTranslation(translationKey) ? Text.translatable(translationKey) : Text.literal(info.toTemporaryValue());
     }
 
@@ -257,7 +252,7 @@ public abstract class MidnightConfig {
     @Environment(EnvType.CLIENT)
     public static class MidnightConfigScreen extends Screen {
         protected MidnightConfigScreen(Screen parent, String modid) {
-            super(Text.translatable(modid + ".midnightconfig." + "title"));
+            super(Text.translatable(modid + ".midnightconfig.title"));
             this.parent = parent; this.modid = modid;
             this.translationPrefix = modid + ".midnightconfig.";
             loadValuesFromJson(modid);
@@ -294,9 +289,9 @@ public abstract class MidnightConfig {
             super.tick();
             if (prevTab != null && 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();
             updateButtons();
             if (reloadScreen) { updateList(); reloadScreen = false; }
@@ -440,7 +435,7 @@ public abstract class MidnightConfig {
                         if (!info.conditionsMet) widgets.forEach(w -> w.active = false);
                         this.list.addButton(widgets, name, info);
                     } else this.list.addButton(List.of(), name, info);
-                } list.setScrollY(scrollProgress);
+                } list.setScrollAmount(scrollProgress);
                 updateButtons();
             }
         }
@@ -448,7 +443,7 @@ public abstract class MidnightConfig {
         public void render(DrawContext context, int mouseX, int mouseY, float delta) {
             super.render(context, mouseX, mouseY, delta);
             this.list.render(context, mouseX, mouseY, delta);
-            if (tabs.size() < 2) context.drawCenteredTextWithShadow(textRenderer, title, width / 2, 10, 0xFFFFFF);
+            if (tabs.size() < 2) context.drawCenteredTextWithShadow(textRenderer, title, width / 2, 10, 0xFFFFFFFF);
         }
     }
     @Environment(EnvType.CLIENT)
@@ -460,7 +455,9 @@ public abstract class MidnightConfig {
         @Override
         protected void drawHeaderAndFooterSeparators(DrawContext context) {
             if (renderHeaderSeparator) super.drawHeaderAndFooterSeparators(context);
-            else context.drawTexture(RenderLayer::getGuiTextured, 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 clear() { this.clearEntries(); }
@@ -480,17 +477,17 @@ public abstract class MidnightConfig {
             int scaledWidth = MinecraftClient.getInstance().getWindow().getScaledWidth();
 
             if (text != null && (!text.getString().contains("spacer") || !buttons.isEmpty())) {
-                title = new MultilineTextWidget((centered) ? (scaledWidth / 2 - (textRenderer.getWidth(text) / 2)) : 12, 0, Text.of(text), textRenderer);
+                title = new MultilineTextWidget((centered) ? (scaledWidth / 2 - (textRenderer.getWidth(text) / 2)) : 12, 0, text, textRenderer);
+                title.setCentered(centered);
                 if (info != null) title.setTooltip(info.getTooltip(false));
-                title.setMaxWidth(buttons.size() > 1 ? buttons.get(1).getX() - 24 : scaledWidth - 24);
+                title.setMaxWidth(!buttons.isEmpty() ? buttons.get(buttons.size() > 2 ? buttons.size()-1 : 0).getX() - 16 : scaledWidth - 24);
             }
         }
         public void render(DrawContext context, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta) {
             buttons.forEach(b -> { b.setY(y); b.render(context, mouseX, mouseY, tickDelta);});
             if (title != null) {
                 title.setY(y+5);
-                title.renderWidget(context, mouseX, mouseY, tickDelta);
-
+                title.render(context, mouseX, mouseY, tickDelta);
                 boolean tooltipVisible = mouseX >= title.getX() && mouseX < title.getWidth() + title.getX() && mouseY >= title.getY() && mouseY < title.getHeight() + title.getY();
                 if (tooltipVisible && title.getTooltip() != null) context.drawOrderedTooltip(textRenderer, title.getTooltip().getLines(MinecraftClient.getInstance()), mouseX, mouseY);
 

gradle.properties

@@ -1,21 +1,21 @@
 org.gradle.jvmargs=-Xmx4096M
 
-minecraft_version=1.21.4
-supported_versions=1.21.5
-yarn_mappings=1.21.4+build.1
+minecraft_version=1.21.1
+supported_versions=1.21
+yarn_mappings=1.21.1+build.3
 enabled_platforms=fabric,neoforge
 
 archives_base_name=midnightlib
-mod_version=1.7.2
+mod_version=1.7.5
 maven_group=eu.midnightdust
 release_type=release
 curseforge_id=488090
 modrinth_id=codAaoxh
 
-fabric_loader_version=0.16.9
-fabric_api_version=0.110.5+1.21.4
+fabric_loader_version=0.16.14
+fabric_api_version=0.116.4+1.21.1
 
-neoforge_version=21.4.3-beta
+neoforge_version=21.1.192
 yarn_mappings_patch_neoforge_version = 1.21+build.4
 
 mod_menu_version = 9.0.0

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

neoforge/src/main/java/eu/midnightdust/neoforge/MidnightLibNeoForge.java

@@ -26,7 +26,7 @@ public class MidnightLibNeoForge {
         if (FMLEnvironment.dist == Dist.CLIENT) MidnightLib.onInitializeClient();
     }
 
-    @EventBusSubscriber(modid = "midnightlib", bus = EventBusSubscriber.Bus.MOD, value = Dist.CLIENT)
+    @EventBusSubscriber(modid = "midnightlib", value = Dist.CLIENT)
     public static class MidnightLibBusEvents {
         @SubscribeEvent
         public static void onPostInit(FMLClientSetupEvent event) {

test-fabric/src/main/java/eu/midnightdust/fabric/example/config/MidnightConfigExample.java

@@ -40,35 +40,6 @@ public class MidnightConfigExample extends MidnightConfig {
         QUILT, FABRIC, FORGE, NEOFORGE, VANILLA
     }
     @Entry(category = TEXT) public static GraphicsSteps graphicsSteps = GraphicsSteps.FABULOUS;   // Example for an enum option with TranslatableOption
-    public enum GraphicsSteps implements TranslatableOption {
-        FAST(0, "options.graphics.fast"),
-        FANCY(1, "options.graphics.fancy"),
-        FABULOUS(2, "options.graphics.fabulous");
-
-        private final int id;
-        private final String translationKey;
-
-        GraphicsSteps(int id, String translationKey) {
-            this.id = id;
-            this.translationKey = translationKey;
-        }
-
-        @Override
-        public Text getText() {
-            MutableText mutableText = Text.translatable(this.getTranslationKey());
-            return this == GraphicsSteps.FABULOUS ? mutableText.formatted(Formatting.ITALIC).formatted(Formatting.AQUA) : mutableText;
-        }
-
-        @Override
-        public int getId() {
-            return this.id;
-        }
-
-        @Override
-        public String getTranslationKey() {
-            return this.translationKey;
-        }
-    }
 
     @Comment(category = TEXT, name = "§nMidnightLib Wiki", centered = true, url = "https://www.midnightdust.eu/wiki/midnightlib/") public static Comment wiki; // Example for a comment with a url
 
@@ -155,6 +126,36 @@ public class MidnightConfigExample extends MidnightConfig {
 
     public static int imposter = 16777215; // - Entries without an @Entry or @Comment annotation are ignored
 
+    public enum GraphicsSteps implements TranslatableOption {
+        FAST(0, "options.graphics.fast"),
+        FANCY(1, "options.graphics.fancy"),
+        FABULOUS(2, "options.graphics.fabulous");
+
+        private final int id;
+        private final String translationKey;
+
+        GraphicsSteps(int id, String translationKey) {
+            this.id = id;
+            this.translationKey = translationKey;
+        }
+
+        @Override
+        public Text getText() {
+            MutableText mutableText = Text.translatable(this.getTranslationKey());
+            return this == GraphicsSteps.FABULOUS ? mutableText.formatted(Formatting.ITALIC).formatted(Formatting.AQUA) : mutableText;
+        }
+
+        @Override
+        public int getId() {
+            return this.id;
+        }
+
+        @Override
+        public String getTranslationKey() {
+            return this.translationKey;
+        }
+    }
+
     @Condition(requiredModId = "thismoddoesnotexist")
     @Comment(category = EXTRAS) public static Comment iAmJustADummy; // We only have this to initialize an empty tab for the keybinds below