Bump version

Tatar Translation for MidnightLib

MidnightConfigExample.java

@@ -0,0 +1,67 @@
+package eu.midnightdust.core.config;
+
+import com.google.common.collect.Lists;
+import eu.midnightdust.lib.config.MidnightConfig;
+
+import java.util.List;
+
+/** MidnightConfig documentation & examples:
+ * Thanks for choosing MidnightConfig - the fancy, tiny and lightweight config library.
+ * If you want to use the lib in your mod, here are some examples and hints:
+ * Every option in a MidnightConfig class has to be public and static, so we can access it from other classes.
+ * The config class also has to extend MidnightConfig*/
+
+public class MidnightConfigExample extends MidnightConfig {
+
+    @Comment(category = "text") public static Comment text1;                       // Comments are rendered like an option without a button and are excluded from the config file
+    @Comment(category = "text", centered = true) public static Comment text2;      // Centered comments are the same as normal ones - just centered!
+    @Comment(category = "text") public static Comment spacer1;                     // Comments containing the word "spacer" will just appear as a blank line
+    @Entry(category = "text") public static boolean showInfo = true;               // Example for a boolean option
+    @Entry(category = "text") public static String name = "Hello World!";          // Example for a string option, which is in a category!
+    @Entry(category = "text") public static TestEnum testEnum = TestEnum.FABRIC;   // Example for an enum option
+    public enum TestEnum {                               // Enums allow the user to cycle through predefined options
+        QUILT, FABRIC, FORGE
+    }
+    @Entry(category = "numbers") public static int fabric = 16777215;                 // Example for an int option
+    @Entry(category = "numbers") public static double world = 1.4D;                   // Example for a double option
+    @Entry(category = "numbers", min=69,max=420) public static int hello = 420;   // - The entered number has to be larger than 69 and smaller than 420
+    @Entry(category = "text", width = 7, min = 7, isColor = true, name = "I am a color!") public static String titleColor = "#ffffff"; // The isColor property adds a preview box for a hexadecimal color
+    @Entry(category = "text", name = "I am an array list!") public static List<String> arrayList = Lists.newArrayList("String1", "String2"); // Array String Lists are also supported
+    @Entry(category = "sliders", name = "I am an int slider.",isSlider = true, min = 0, max = 100) public static int intSlider = 35; // Int fields can also be displayed as a Slider
+    @Entry(category = "sliders", name = "I am a float slider!", isSlider = true, min = 0f, max = 1f, precision = 1000) public static float floatSlider = 0.24f; // And so can floats! Precision defines the amount of decimal places
+    // The name field can be used to specify a custom translation string or plain text
+
+    public static int imposter = 16777215; // - Entries without an @Entry or @Comment annotation are ignored
+
+    /*
+    The .json language file for your config class could look similar to this:
+    {
+	    "modid.midnightconfig.title":"I am a title",        // "*.midnightconfig.title" defines the title of the screen
+	    "modid.midnightconfig.text1":"I am a comment *u*",  // Translation for the comment "text1" defined in the example config
+	    "modid.midnightconfig.text2":"I am a centered comment (╯°□°）╯︵ ┻━┻",
+	    "modid.midnightconfig.name":"I am a string!",             // Translation for the field "name" defined in the example config
+	    "modid.midnightconfig.name.tooltip":"I am a tooltip uwu \nI am a new line",
+	    // When hovering over the option "showInfo",
+	    // this text will appear as a tooltip.
+	    // "\n" inserts a line break.
+	    "modid.midnightconfig.fabric":"I am an int",
+	    "modid.midnightconfig.world":"I am a double",
+	    "modid.midnightconfig.showInfo":"I am a boolean",
+	    "modid.midnightconfig.hello":"I am a limited int!",
+	    "modid.midnightconfig.testEnum":"I am an enum!",
+	    "modid.midnightconfig.enum.TestEnum.FORGE":"Slow",
+	    "modid.midnightconfig.enum.TestEnum.FABRIC":"Fancy",
+	    "modid.midnightconfig.enum.TestEnum.QUILT":"Fabulous",
+	    "modid.midnightconfig.category.numbers": "Numbers",
+	    "modid.midnightconfig.category.text": "Text",
+	    "modid.midnightconfig.category.sliders": "Sliders"
+    }
+    To initialize the config you have to call "MidnightConfig.init("modid", MidnightConfigExample.class)" in your ModInitializer
+    To get an instance of the config screen you have to call "MidnightConfig.getScreen(parent, "modid");"
+    If you don't use the whole library and therefore not the automatic ModMenu integration, the code in your ModMenu integration class would look something like this:
+    @Override
+    public ConfigScreenFactory<?> getModConfigScreenFactory() {
+        return parent -> MidnightConfig.getScreen(parent, "modid");
+    }
+    */
+}

build.gradle

@@ -15,7 +15,7 @@ subprojects {
         // The following line declares the mojmap mappings, you may use other mappings as well
         //mappings loom.officialMojangMappings()
         // The following line declares the yarn mappings you may select this one as well.
-        mappings "net.fabricmc:yarn:1.19.2+build.3:v2"
+        mappings "net.fabricmc:yarn:${rootProject.yarn_mappings}:v2"
     }
 }
 

common/src/main/java/eu/midnightdust/core/MidnightLibClient.java

@@ -14,7 +14,6 @@ public class MidnightLibClient {
 
     public static void onInitializeClient() {
         MidnightConfig.init("midnightlib", MidnightLibConfig.class);
-        hiddenMods.add("puzzle");
 
         if (MidnightLibConfig.special_hats) HatLoader.init();
     }

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

@@ -1,7 +1,6 @@
 package eu.midnightdust.core.screen;
 
 import eu.midnightdust.core.MidnightLibClient;
-import eu.midnightdust.core.config.MidnightLibConfig;
 import eu.midnightdust.lib.config.MidnightConfig;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
@@ -28,7 +27,7 @@ public class MidnightConfigOverviewScreen extends Screen {
 
     @Override
     protected void init() {
-        this.addDrawableChild(new ButtonWidget(this.width / 2 - 100, this.height - 28, 200, 20, ScreenTexts.DONE, (button) -> Objects.requireNonNull(client).setScreen(parent)));
+        this.addDrawableChild(ButtonWidget.builder(ScreenTexts.DONE, (button) -> Objects.requireNonNull(client).setScreen(parent)).dimensions(this.width / 2 - 100, this.height - 28, 200, 20).build());
 
         this.list = new MidnightOverviewListWidget(this.client, this.width, this.height, 32, this.height - 32, 25);
         if (this.client != null && this.client.world != null) this.list.setRenderBackground(false);
@@ -37,8 +36,8 @@ public class MidnightConfigOverviewScreen extends Screen {
         Collections.sort(sortedMods);
         sortedMods.forEach((modid) -> {
             if (!MidnightLibClient.hiddenMods.contains(modid)) {
-                list.addButton(new ButtonWidget(this.width / 2 - 100, this.height - 28, 200, 20, Text.translatable(modid +".midnightconfig.title"), (button) ->
-                        Objects.requireNonNull(client).setScreen(MidnightConfig.getScreen(this,modid))));
+                list.addButton(ButtonWidget.builder(Text.translatable(modid +".midnightconfig.title"), (button) ->
+                        Objects.requireNonNull(client).setScreen(MidnightConfig.getScreen(this,modid))).dimensions(this.width / 2 - 100, this.height - 28, 200, 20).build());
             }
         });
         super.init();
@@ -47,7 +46,7 @@ public class MidnightConfigOverviewScreen extends Screen {
     public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) {
         this.renderBackground(matrices);
         this.list.render(matrices, mouseX, mouseY, delta);
-        drawCenteredText(matrices, textRenderer, title, width / 2, 15, 0xFFFFFF);
+        drawCenteredTextWithShadow(matrices, textRenderer, title, width / 2, 15, 0xFFFFFF);
         super.render(matrices, mouseX, mouseY, delta);
     }
     @Environment(EnvType.CLIENT)
@@ -78,7 +77,7 @@ public class MidnightConfigOverviewScreen extends Screen {
         }
         public static OverviewButtonEntry create(ClickableWidget button) {return new OverviewButtonEntry(button);}
         public void render(MatrixStack matrices, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta) {
-            button.y = y;
+            button.setY(y);
             button.render(matrices, mouseX, mouseY, tickDelta);
         }
         public List<? extends Element> children() {return buttonList;}

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

@@ -13,6 +13,10 @@ import net.minecraft.client.gui.DrawableHelper;
 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.tooltip.Tooltip;
 import net.minecraft.client.gui.widget.*;
 import net.minecraft.client.resource.language.I18n;
 import net.minecraft.client.util.math.MatrixStack;
@@ -37,7 +41,7 @@ import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
 
-/** MidnightConfig v2.3.0 by TeamMidnightDust & Motschen
+/** MidnightConfig v2.4.0 by TeamMidnightDust & Motschen
  *  Single class config library - feel free to copy!
 
  *  Based on https://github.com/Minenash/TinyConfig
@@ -55,9 +59,8 @@ public abstract class MidnightConfig {
         Field field;
         Object widget;
         int width;
-        int max;
         boolean centered;
-        Map.Entry<TextFieldWidget,Text> error;
+        Text error;
         Object defaultValue;
         Object value;
         String tempValue;
@@ -66,6 +69,7 @@ public abstract class MidnightConfig {
         Text name;
         int index;
         ClickableWidget colorButton;
+        Tab tab;
     }
 
     public static final Map<String,Class<?>> configClass = new HashMap<>();
@@ -112,7 +116,6 @@ public abstract class MidnightConfig {
             else if (type == float.class) textField(info, Float::parseFloat, DECIMAL_ONLY, (float) e.min(), (float) e.max(), false);
             else if (type == double.class) textField(info, Double::parseDouble, DECIMAL_ONLY, e.min(), e.max(), false);
             else if (type == String.class || type == List.class) {
-                info.max = e.max() == Double.MAX_VALUE ? Integer.MAX_VALUE : (int) e.max();
                 textField(info, String::length, null, Math.min(e.min(), 0), Math.max(e.max(), 1), true);
             } else if (type == boolean.class) {
                 Function<Object, Text> func = value -> Text.translatable((Boolean) value ? "gui.yes" : "gui.no").formatted((Boolean) value ? Formatting.GREEN : Formatting.RED);
@@ -145,9 +148,9 @@ public abstract class MidnightConfig {
             if (!(isNumber && s.isEmpty()) && !s.equals("-") && !s.equals(".")) {
                 try { value = f.apply(s); } catch(NumberFormatException e){ return false; }
                 inLimits = value.doubleValue() >= min && value.doubleValue() <= max;
-                info.error = inLimits? null : new AbstractMap.SimpleEntry<>(t, Text.literal(value.doubleValue() < min ?
+                info.error = inLimits? null : Text.literal(value.doubleValue() < min ?
                         "§cMinimum " + (isNumber? "value" : "length") + (cast? " is " + (int)min : " is " + min) :
-                        "§cMaximum " + (isNumber? "value" : "length") + (cast? " is " + (int)max : " is " + max)));
+                        "§cMaximum " + (isNumber? "value" : "length") + (cast? " is " + (int)max : " is " + max)).formatted(Formatting.RED);
             }
 
             info.tempValue = s;
@@ -199,11 +202,21 @@ public abstract class MidnightConfig {
         public final String modid;
         public MidnightConfigListWidget list;
         public boolean reload = false;
+        public TabManager tabManager = new TabManager(a -> {}, a -> {});
+        public Tab prevTab;
+        public TabNavigationWidget tabNavigation;
+        public ButtonWidget done;
 
         // Real Time config update //
         @Override
         public void tick() {
             super.tick();
+            if (prevTab != null && prevTab != tabManager.getCurrentTab()) {
+                prevTab = tabManager.getCurrentTab();
+                this.list.clear();
+                fillList();
+                list.setScrollAmount(0);
+            }
             for (EntryInfo info : entries) {
                 try {info.field.set(null, info.value);} catch (IllegalAccessException ignored) {}
             }
@@ -231,16 +244,49 @@ public abstract class MidnightConfig {
             }
         }
         @Override
+        public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
+            if (this.tabNavigation.trySwitchTabsWithKey(keyCode)) return true;
+            return super.keyPressed(keyCode, scanCode, modifiers);
+        }
+        public Tooltip getTooltip(EntryInfo info) {
+            return Tooltip.of(info.error != null ? info.error : I18n.hasTranslation(translationPrefix+info.field.getName()+".tooltip") ? Text.translatable(translationPrefix+info.field.getName()+".tooltip") : Text.empty());
+        }
+        public void refresh() {
+            double scrollAmount = list.getScrollAmount();
+            list.clear();
+            fillList();
+            list.setScrollAmount(scrollAmount);
+        }
+        @Override
         public void init() {
             super.init();
-            if (!reload) loadValues();
+            loadValues();
 
-            this.addDrawableChild(new ButtonWidget(this.width / 2 - 154, this.height - 28, 150, 20, ScreenTexts.CANCEL, button -> {
+            Map<String, Tab> tabs = new HashMap<>();
+            for (EntryInfo e : entries) {
+                if (e.id.equals(modid)) {
+                    String tabId = e.field.isAnnotationPresent(Entry.class) ? e.field.getAnnotation(Entry.class).category() : e.field.getAnnotation(Comment.class).category();
+                    String name = translationPrefix + "category." + tabId;
+                    if (!I18n.hasTranslation(name) && tabId.equals("default"))
+                        name = translationPrefix + "title";
+                    Tab tab = new GridScreenTab(Text.translatable(name));
+                    if (!tabs.containsKey(name)) {
+                        e.tab = tab;
+                        tabs.put(name, tab);
+                    } else e.tab = tabs.get(name);
+                }
+            }
+            tabNavigation = TabNavigationWidget.builder(tabManager, this.width).tabs(tabs.values().toArray(new Tab[0])).build();
+            if (tabs.size() > 1) this.addDrawableChild(tabNavigation);
+            if (!reload) tabNavigation.selectTab(0, false);
+            tabNavigation.init();
+            prevTab = tabManager.getCurrentTab();
+
+            this.addDrawableChild(ButtonWidget.builder(ScreenTexts.CANCEL, button -> {
                 loadValues();
                 Objects.requireNonNull(client).setScreen(parent);
-            }));
-
-            ButtonWidget done = this.addDrawableChild(new ButtonWidget(this.width / 2 + 4, this.height - 28, 150, 20, ScreenTexts.DONE, (button) -> {
+            }).dimensions(this.width / 2 - 154, this.height - 28, 150, 20).build());
+            done = this.addDrawableChild(ButtonWidget.builder(ScreenTexts.DONE, (button) -> {
                 for (EntryInfo info : entries)
                     if (info.id.equals(modid)) {
                         try {
@@ -249,100 +295,90 @@ public abstract class MidnightConfig {
                     }
                 write(modid);
                 Objects.requireNonNull(client).setScreen(parent);
-            }));
+            }).dimensions(this.width / 2 + 4, this.height - 28, 150, 20).build());
 
             this.list = new MidnightConfigListWidget(this.client, this.width, this.height, 32, this.height - 32, 25);
             if (this.client != null && this.client.world != null) this.list.setRenderBackground(false);
             this.addSelectableChild(this.list);
+
+            fillList();
+        }
+        public void fillList() {
             for (EntryInfo info : entries) {
-                if (info.id.equals(modid)) {
+                if (info.id.equals(modid) && (info.tab == null || info.tab == tabManager.getCurrentTab())) {
                     Text name = Objects.requireNonNullElseGet(info.name, () -> Text.translatable(translationPrefix + info.field.getName()));
-                    ButtonWidget resetButton = new ButtonWidget(width - 205, 0, 40, 20, Text.literal("Reset").formatted(Formatting.RED), (button -> {
+                    ButtonWidget resetButton = ButtonWidget.builder(Text.literal("Reset").formatted(Formatting.RED), (button -> {
                         info.value = info.defaultValue;
                         info.tempValue = info.defaultValue.toString();
                         info.index = 0;
-                        double scrollAmount = list.getScrollAmount();
-                        this.reload = true;
-                        Objects.requireNonNull(client).setScreen(this);
-                        list.setScrollAmount(scrollAmount);
-                    }));
+                        this.refresh();
+                    })).dimensions(width - 205, 0, 40, 20).build();
 
                     if (info.widget instanceof Map.Entry) {
                         Map.Entry<ButtonWidget.PressAction, Function<Object, Text>> widget = (Map.Entry<ButtonWidget.PressAction, Function<Object, Text>>) info.widget;
-                        if (info.field.getType().isEnum()) widget.setValue(value -> Text.translatable(translationPrefix + "enum." + info.field.getType().getSimpleName() + "." + info.value.toString()));
-                        this.list.addButton(List.of(new ButtonWidget(width - 160, 0,150, 20, widget.getValue().apply(info.value), widget.getKey()),resetButton), name, info);
+                        if (info.field.getType().isEnum())
+                            widget.setValue(value -> Text.translatable(translationPrefix + "enum." + info.field.getType().getSimpleName() + "." + info.value.toString()));
+                        this.list.addButton(List.of(ButtonWidget.builder(widget.getValue().apply(info.value), widget.getKey()).dimensions(width - 160, 0, 150, 20).tooltip(getTooltip(info)).build(), resetButton), name, info);
                     } else if (info.field.getType() == List.class) {
                         if (!reload) info.index = 0;
                         TextFieldWidget widget = new TextFieldWidget(textRenderer, width - 160, 0, 150, 20, Text.empty());
                         widget.setMaxLength(info.width);
-                        if (info.index < ((List<String>)info.value).size()) widget.setText((String.valueOf(((List<String>)info.value).get(info.index))));
+                        if (info.index < ((List<String>) info.value).size())
+                            widget.setText((String.valueOf(((List<String>) info.value).get(info.index))));
                         Predicate<String> processor = ((BiFunction<TextFieldWidget, ButtonWidget, Predicate<String>>) info.widget).apply(widget, done);
                         widget.setTextPredicate(processor);
                         resetButton.setWidth(20);
                         resetButton.setMessage(Text.literal("R").formatted(Formatting.RED));
-                        ButtonWidget cycleButton = new ButtonWidget(width - 185, 0, 20, 20, Text.literal(String.valueOf(info.index)).formatted(Formatting.GOLD), (button -> {
-                            ((List<String>)info.value).remove("");
-                            double scrollAmount = list.getScrollAmount();
-                            this.reload = true;
+                        ButtonWidget cycleButton = ButtonWidget.builder(Text.literal(String.valueOf(info.index)).formatted(Formatting.GOLD), (button -> {
+                            if (((List<?>) info.value).contains("")) ((List<String>) info.value).remove("");
                             info.index = info.index + 1;
-                            if (info.index > ((List<String>)info.value).size()) info.index = 0;
-                            Objects.requireNonNull(client).setScreen(this);
-                            list.setScrollAmount(scrollAmount);
-                        }));
+                            if (info.index > ((List<String>) info.value).size()) info.index = 0;
+                            this.reload = true;
+                            refresh();
+                            this.reload = false;
+                        })).dimensions(width - 185, 0, 20, 20).build();
+                        widget.setTooltip(getTooltip(info));
                         this.list.addButton(List.of(widget, resetButton, cycleButton), name, info);
                     } else if (info.widget != null) {
                         ClickableWidget widget;
                         Entry e = info.field.getAnnotation(Entry.class);
-                        if (e.isSlider()) widget = new MidnightSliderWidget(width - 160, 0, 150, 20, Text.of(info.tempValue), (Double.parseDouble(info.tempValue)-e.min()) / (e.max() - e.min()), info);
-                        else widget = new TextFieldWidget(textRenderer, width - 160, 0, 150, 20, null, Text.of(info.tempValue));
+                        if (e.isSlider())
+                            widget = new MidnightSliderWidget(width - 160, 0, 150, 20, Text.of(info.tempValue), (Double.parseDouble(info.tempValue) - e.min()) / (e.max() - e.min()), info);
+                        else
+                            widget = new TextFieldWidget(textRenderer, width - 160, 0, 150, 20, null, Text.of(info.tempValue));
                         if (widget instanceof TextFieldWidget textField) {
                             textField.setMaxLength(info.width);
                             textField.setText(info.tempValue);
                             Predicate<String> processor = ((BiFunction<TextFieldWidget, ButtonWidget, Predicate<String>>) info.widget).apply(textField, done);
                             textField.setTextPredicate(processor);
                         }
+                        widget.setTooltip(getTooltip(info));
                         if (e.isColor()) {
                             resetButton.setWidth(20);
                             resetButton.setMessage(Text.literal("R").formatted(Formatting.RED));
-                            ButtonWidget colorButton = new ButtonWidget(width - 185, 0, 20, 20, Text.literal("⬛"), (button -> {}));
-                            try {colorButton.setMessage(Text.literal("⬛").setStyle(Style.EMPTY.withColor(Color.decode(info.tempValue).getRGB())));} catch (Exception ignored) {}
+                            ButtonWidget colorButton = ButtonWidget.builder(Text.literal("⬛"), (button -> {
+                            })).dimensions(width - 185, 0, 20, 20).build();
+                            try {
+                                colorButton.setMessage(Text.literal("⬛").setStyle(Style.EMPTY.withColor(Color.decode(info.tempValue).getRGB())));
+                            } catch (Exception ignored) {
+                            }
                             info.colorButton = colorButton;
                             colorButton.active = false;
                             this.list.addButton(List.of(widget, resetButton, colorButton), name, info);
-                        }
-                        else this.list.addButton(List.of(widget, resetButton), name, info);
+                        } else this.list.addButton(List.of(widget, resetButton), name, info);
                     } else {
-                        this.list.addButton(List.of(),name, info);
+                        this.list.addButton(List.of(), name, info);
                     }
                 }
                 updateResetButtons();
             }
-
         }
         @Override
         public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) {
             this.renderBackground(matrices);
             this.list.render(matrices, mouseX, mouseY, delta);
-            drawCenteredText(matrices, textRenderer, title, width / 2, 15, 0xFFFFFF);
 
-            for (EntryInfo info : entries) {
-                if (info.id.equals(modid)) {
-                    if (list.getHoveredButton(mouseX,mouseY).isPresent()) {
-                        ClickableWidget buttonWidget = list.getHoveredButton(mouseX,mouseY).get();
-                        Text text = ButtonEntry.buttonsWithText.get(buttonWidget);
-                        Text name = Text.translatable(this.translationPrefix + info.field.getName());
-                        String key = translationPrefix + info.field.getName() + ".tooltip";
-
-                        if (info.error != null && text.equals(name)) renderTooltip(matrices, info.error.getValue(), mouseX, mouseY);
-                        else if (I18n.hasTranslation(key) && text.equals(name)) {
-                            List<Text> list = new ArrayList<>();
-                            for (String str : I18n.translate(key).split("\n"))
-                                list.add(Text.literal(str));
-                            renderTooltip(matrices, list, mouseX, mouseY);
-                        }
-                    }
-                }
-            }
+            drawCenteredTextWithShadow(matrices, textRenderer, title, width / 2, 15, 0xFFFFFF);
             super.render(matrices,mouseX,mouseY,delta);
         }
     }
@@ -361,16 +397,11 @@ public abstract class MidnightConfig {
         public void addButton(List<ClickableWidget> buttons, Text text, EntryInfo info) {
             this.addEntry(new ButtonEntry(buttons, text, info));
         }
+        public void clear() {
+            this.clearEntries();
+        }
         @Override
         public int getRowWidth() { return 10000; }
-        public Optional<ClickableWidget> getHoveredButton(double mouseX, double mouseY) {
-            for (ButtonEntry buttonEntry : this.children()) {
-                if (!buttonEntry.buttons.isEmpty() && buttonEntry.buttons.get(0).isMouseOver(mouseX, mouseY)) {
-                    return Optional.of(buttonEntry.buttons.get(0));
-                }
-            }
-            return Optional.empty();
-        }
     }
     public static class ButtonEntry extends ElementListWidget.Entry<ButtonEntry> {
         private static final TextRenderer textRenderer = MinecraftClient.getInstance().textRenderer;
@@ -388,7 +419,7 @@ public abstract class MidnightConfig {
             children.addAll(buttons);
         }
         public void render(MatrixStack matrices, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta) {
-            buttons.forEach(b -> { b.y = y; b.render(matrices, mouseX, mouseY, tickDelta); });
+            buttons.forEach(b -> { b.setY(y); b.render(matrices, mouseX, mouseY, tickDelta); });
             if (text != null && (!text.getString().contains("spacer") || !buttons.isEmpty())) {
                 if (info.centered) textRenderer.drawWithShadow(matrices, text, MinecraftClient.getInstance().getWindow().getScaledWidth() / 2f - (textRenderer.getWidth(text) / 2f), y + 5, 0xFFFFFF);
                 else DrawableHelper.drawTextWithShadow(matrices, textRenderer, text, 12, y + 5, 0xFFFFFF);
@@ -426,12 +457,14 @@ public abstract class MidnightConfig {
         boolean isColor() default false;
         boolean isSlider() default false;
         int precision() default 100;
+        String category() default "default";
     }
     @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) public @interface Client {}
     @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) public @interface Server {}
     @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) public @interface Hidden {}
     @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) public @interface Comment {
         boolean centered() default false;
+        String category() default "default";
     }
 
     public static class HiddenAnnotationExclusionStrategy implements ExclusionStrategy {

common/src/main/java/eu/midnightdust/lib/util/screen/TexturedOverlayButtonWidget.java

@@ -8,9 +8,15 @@ import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
 
 public class TexturedOverlayButtonWidget extends TexturedButtonWidget {
+
     public TexturedOverlayButtonWidget(int x, int y, int width, int height, int u, int v, Identifier texture, PressAction pressAction) {
         super(x, y, width, height, u, v, texture, pressAction);
     }
+
+    public TexturedOverlayButtonWidget(int x, int y, int width, int height, int u, int v, int hoveredVOffset, Identifier texture, PressAction pressAction) {
+        super(x, y, width, height, u, v, hoveredVOffset, texture, pressAction);
+    }
+
     public TexturedOverlayButtonWidget(int x, int y, int width, int height, int u, int v, int hoveredVOffset, Identifier texture, int textureWidth, int textureHeight, PressAction pressAction) {
         super(x, y, width, height, u, v, hoveredVOffset, texture, textureWidth, textureHeight, pressAction);
     }
@@ -19,21 +25,21 @@ public class TexturedOverlayButtonWidget extends TexturedButtonWidget {
         super(x, y, width, height, u, v, hoveredVOffset, texture, textureWidth, textureHeight, pressAction, text);
     }
 
-    public TexturedOverlayButtonWidget(int x, int y, int width, int height, int u, int v, int hoveredVOffset, Identifier texture, int textureWidth, int textureHeight, PressAction pressAction, TooltipSupplier tooltipSupplier, Text text) {
-        super(x,y,width,height, u,v,hoveredVOffset,texture,textureWidth,textureHeight,pressAction,tooltipSupplier,text);
-    }
-
     @Override
     public void renderButton(MatrixStack matrices, int mouseX, int mouseY, float delta) {
-        RenderSystem.setShader(GameRenderer::getPositionTexShader);
+        int i = 66;
+        if (!this.isNarratable()) {
+            i += hoveredVOffset * 2;
+        } else if (this.isSelected()) {
+            i += hoveredVOffset;
+        }
+        RenderSystem.setShader(GameRenderer::getPositionTexProgram);
         RenderSystem.setShaderTexture(0, WIDGETS_TEXTURE);
         RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, this.alpha);
-        int i = this.getYImage(this.isHovered());
         RenderSystem.enableBlend();
         RenderSystem.defaultBlendFunc();
         RenderSystem.enableDepthTest();
-        this.drawTexture(matrices, this.x, this.y, 0, 46 + i * 20, this.width / 2, this.height);
-        this.drawTexture(matrices, this.x + this.width / 2, this.y, 200 - this.width / 2, 46 + i * 20, this.width / 2, this.height);
+        drawNineSlicedTexture(matrices, this.getX(), this.getY(), this.width, this.height, 4, 200, 20, 0, i);
 
         super.renderButton(matrices, mouseX, mouseY, delta);
     }

common/src/main/resources/assets/midnightlib/lang/fr_fr.json

@@ -0,0 +1,17 @@
+{
+	"midnightlib.overview.title":"Vue d'ensemble de MidnightConfig",
+	"midnightlib.midnightconfig.title":"Configuration de MidnightLib",
+	"midnightlib.midnightconfig.midnightlib_description":"§nMidnightLib",
+	"midnightlib.midnightconfig.config_screen_list":"Activer la liste de l'écran de configuration",
+	"midnightlib.midnightconfig.enum.ConfigButton.TRUE":"§aOui",
+	"midnightlib.midnightconfig.enum.ConfigButton.FALSE":"§cNon",
+	"midnightlib.midnightconfig.enum.ConfigButton.MODMENU":"§bModMenu",
+	"midnightlib.midnightconfig.background_texture":"Texture d'arrière-plan de l'écran de configuration",
+	"midnightlib.midnightconfig.midnighthats_description":"§nMidnightHats",
+	"midnightlib.midnightconfig.special_hats":"Activer les chapeaux de fan",
+	"midnightlib.modrinth":"Modrinth",
+	"midnightlib.curseforge":"CurseForge",
+	"midnightlib.wiki":"Wiki",
+	"modmenu.descriptionTranslation.midnightlib": "Bibliothèque commune pour les mods de la Team MidnightDust.\nFournit une API de configuration, une intégration automatique avec d'autres mods, des utilitaires courants et des cosmétiques.",
+	"modmenu.summaryTranslation.midnightlib": "Bibliothèque commune pour les mods de la Team MidnightDust."
+}

common/src/main/resources/assets/midnightlib/lang/tt_ru.json

@@ -0,0 +1,17 @@
+{
+	"midnightlib.overview.title":"MidnightConfig күзәтү",
+	"midnightlib.midnightconfig.title":"MidnightLib көйләүләре",
+	"midnightlib.midnightconfig.midnightlib_description":"§nMidnightLib",
+	"midnightlib.midnightconfig.config_screen_list":"Көйләүләр экранының исемлеген кушу",
+	"midnightlib.midnightconfig.enum.ConfigButton.TRUE":"§aӘйе",
+	"midnightlib.midnightconfig.enum.ConfigButton.FALSE":"§cЮк",
+	"midnightlib.midnightconfig.enum.ConfigButton.MODMENU":"§bModMenu",
+	"midnightlib.midnightconfig.background_texture":"Көйләүләр экранының фонының текстурасы",
+	"midnightlib.midnightconfig.midnighthats_description":"§nMidnightHats",
+	"midnightlib.midnightconfig.special_hats":"Ярдәмченең эшләпәсен кушу",
+	"midnightlib.modrinth":"Modrinth",
+	"midnightlib.curseforge":"CurseForge",
+	"midnightlib.wiki":"Вики",
+	"modmenu.descriptionTranslation.midnightlib": "MidnightDust төркеменең модлары өчен гомуми китапханә.\nКөйләүләр API-ын, башка модлар белән автоматик интеграцияне, гомуми хезмәти программаларны һәм бизәнүләрне тәэмин ителә.",
+	"modmenu.summaryTranslation.midnightlib": "MidnightDust төркеменең модлары өчен гомуми китапханә."
+}

fabric-like/build.gradle

@@ -11,8 +11,6 @@ loom {
 dependencies {
     modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
     modApi "net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_api_version}"
-    // Remove the next line if you don't want to depend on the API
-    modApi "dev.architectury:architectury-fabric:${rootProject.architectury_version}"
     modImplementation ("com.terraformersmc:modmenu:${rootProject.mod_menu_version}")
 
     compileClasspath(project(path: ":common", configuration: "namedElements")) { transitive false }

fabric/build.gradle

@@ -16,6 +16,7 @@ configurations {
     compileClasspath.extendsFrom common
     runtimeClasspath.extendsFrom common
     developmentFabric.extendsFrom common
+    archivesBaseName = rootProject.archives_base_name + "-fabric"
 }
 
 dependencies {
@@ -44,7 +45,6 @@ shadowJar {
 }
 
 remapJar {
-    injectAccessWidener = true
     input.set shadowJar.archiveFile
     dependsOn shadowJar
     classifier null

fabric/src/main/resources/fabric.mod.json

@@ -30,6 +30,11 @@
       "eu.midnightdust.lib.config.AutoModMenu"
     ]
   },
+  "depends": {
+    "fabric-models-v0": "*",
+    "fabric-resource-loader-v0": "*",
+    "minecraft": ">=1.19.4-rc.1"
+  },
 
   "mixins": [
     "midnightlib.mixins.json"

forge/build.gradle

@@ -19,6 +19,7 @@ configurations {
     compileClasspath.extendsFrom common
     runtimeClasspath.extendsFrom common
     developmentForge.extendsFrom common
+    archivesBaseName = rootProject.archives_base_name + "-forge"
 }
 
 dependencies {

forge/src/main/java/eu/midnightdust/forge/MidnightLibClientEvents.java

@@ -1,16 +1,16 @@
 package eu.midnightdust.forge;
 
-import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import eu.midnightdust.hats.witch.WitchHatFeatureRenderer;
-import eu.midnightdust.lib.config.AutoCommand;
+import eu.midnightdust.lib.config.MidnightConfig;
 import eu.midnightdust.lib.util.MidnightColorUtil;
-import net.minecraft.server.command.ServerCommandSource;
 import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.client.ConfigScreenHandler;
 import net.minecraftforge.client.event.EntityRenderersEvent;
-import net.minecraftforge.event.RegisterCommandsEvent;
 import net.minecraftforge.event.TickEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
+import net.minecraftforge.fml.ModList;
 import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.fml.event.lifecycle.FMLLoadCompleteEvent;
 
 @Mod.EventBusSubscriber(modid = "midnightlib", bus = Mod.EventBusSubscriber.Bus.MOD, value = Dist.CLIENT)
 public class MidnightLibClientEvents {
@@ -22,4 +22,14 @@ public class MidnightLibClientEvents {
     public void registerClientTick(TickEvent.ClientTickEvent event) {
         MidnightColorUtil.tick();
     }
+    @SubscribeEvent
+    public void onPostInit(FMLLoadCompleteEvent event) {
+        ModList.get().applyForEachModContainer(modContainer -> {
+            if (MidnightConfig.configClass.containsKey(modContainer.getModId())) {
+                modContainer.registerExtensionPoint(ConfigScreenHandler.ConfigScreenFactory.class, () ->
+                        new ConfigScreenHandler.ConfigScreenFactory((client, parent) -> MidnightConfig.getScreen(parent, modContainer.getModId())));
+            }
+            return true;
+        });
+    }
 }

forge/src/main/java/eu/midnightdust/forge/MidnightLibForge.java

@@ -8,7 +8,6 @@ import net.minecraftforge.client.ConfigScreenHandler;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.fml.DistExecutor;
 import net.minecraftforge.fml.IExtensionPoint;
-import net.minecraftforge.fml.ModList;
 import net.minecraftforge.fml.ModLoadingContext;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.network.NetworkConstants;
@@ -16,21 +15,9 @@ import net.minecraftforge.network.NetworkConstants;
 @Mod("midnightlib")
 public class MidnightLibForge {
     public MidnightLibForge() {
-        // Submit our event bus to let architectury register our content on the right time
-        //EventBuses.registerModEventBus("midnightlib", FMLJavaModLoadingContext.get().getModEventBus());
         ModLoadingContext.get().registerExtensionPoint(IExtensionPoint.DisplayTest.class, () -> new IExtensionPoint.DisplayTest(() -> NetworkConstants.IGNORESERVERONLY, (remote, server) -> true));
         DistExecutor.safeRunWhenOn(Dist.CLIENT, () -> MidnightLibClient::onInitializeClient);
         DistExecutor.safeRunWhenOn(Dist.DEDICATED_SERVER, () -> MidnightLibServer::onInitializeServer);
-        ModList.get().applyForEachModContainer(modContainer -> {
-            if (MidnightConfig.configClass.containsKey(modContainer.getModId())) {
-                ModLoadingContext.get().registerExtensionPoint(ConfigScreenHandler.ConfigScreenFactory.class, () ->
-                        new ConfigScreenHandler.ConfigScreenFactory((client, parent) -> MidnightConfig.getScreen(parent, modContainer.getModId())));
-            }
-            System.out.println(modContainer.getModId());
-            System.out.println("motschen");
-            return true;
-        }
-        );
         ModLoadingContext.get().registerExtensionPoint(ConfigScreenHandler.ConfigScreenFactory.class, () ->
                 new ConfigScreenHandler.ConfigScreenFactory((client, parent) -> MidnightConfig.getScreen(parent, "midnightlib")));
         MinecraftForge.EVENT_BUS.register(new MidnightLibClientEvents());

forge/src/main/java/eu/midnightdust/forge/MidnightLibServerEvents.java

@@ -1,14 +1,10 @@
 package eu.midnightdust.forge;
 
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
-import eu.midnightdust.hats.witch.WitchHatFeatureRenderer;
 import eu.midnightdust.lib.config.AutoCommand;
-import eu.midnightdust.lib.util.MidnightColorUtil;
 import net.minecraft.server.command.ServerCommandSource;
 import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.client.event.EntityRenderersEvent;
 import net.minecraftforge.event.RegisterCommandsEvent;
-import net.minecraftforge.event.TickEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
 

forge/src/main/java/eu/midnightdust/lib/util/forge/PlatformFunctionsImpl.java

@@ -23,6 +23,6 @@ public class PlatformFunctionsImpl {
         return ModList.get().isLoaded(modid);
     }
     public static void registerCommand(LiteralArgumentBuilder<ServerCommandSource> command) {
-        // Ignored here, see MidnightLibEvents#registerCommands
+        // Ignored here, see MidnightLibServerEvents#registerCommands
     }
 }

gradle.properties

@@ -1,19 +1,18 @@
 org.gradle.jvmargs=-Xmx4096M
 
-minecraft_version=1.19.2
-enabled_platforms=quilt,fabric,forge
+minecraft_version=1.19.4-pre4
+yarn_mappings=1.19.4-pre4+build.1
+enabled_platforms=fabric
 
 archives_base_name=midnightlib
-mod_version=1.0.0
+mod_version=1.2.1
 maven_group=eu.midnightdust
 
-architectury_version=6.2.43
+fabric_loader_version=0.14.17
+fabric_api_version=0.75.3+1.19.4
 
-fabric_loader_version=0.14.9
-fabric_api_version=0.59.0+1.19.2
+forge_version=1.19.3-44.0.18
 
-forge_version=1.19.2-43.0.8
-
-quilt_loader_version=0.17.2-beta.3
-quilt_fabric_api_version=4.0.0-beta.7+0.59.0-1.19.2
-mod_menu_version = 4.0.6
+quilt_loader_version=0.18.1-beta.75
+quilt_fabric_api_version=5.0.0-beta.2+0.68.1-1.19.3
+mod_menu_version = 5.0.2

quilt/build.gradle

@@ -20,6 +20,7 @@ configurations {
     compileClasspath.extendsFrom common
     runtimeClasspath.extendsFrom common
     developmentQuilt.extendsFrom common
+    archivesBaseName = rootProject.archives_base_name + "-quilt"
 }
 
 dependencies {
@@ -51,7 +52,6 @@ shadowJar {
 }
 
 remapJar {
-    injectAccessWidener = true
     input.set shadowJar.archiveFile
     dependsOn shadowJar
     classifier null

quilt/src/main/java/eu/midnightdust/lib/util/fabric/PlatformFunctionsImpl.java

@@ -5,7 +5,7 @@ import eu.midnightdust.lib.util.PlatformFunctions;
 import net.fabricmc.api.EnvType;
 import net.minecraft.server.command.ServerCommandSource;
 import org.quiltmc.loader.api.QuiltLoader;
-import org.quiltmc.loader.impl.QuiltLoaderImpl;
+import org.quiltmc.loader.api.minecraft.MinecraftQuiltLoader;
 import org.quiltmc.qsl.command.api.CommandRegistrationCallback;
 
 import java.nio.file.Path;
@@ -18,7 +18,7 @@ public class PlatformFunctionsImpl {
         return QuiltLoader.getConfigDir();
     }
     public static boolean isClientEnv() {
-        return QuiltLoaderImpl.INSTANCE.getEnvironmentType() == EnvType.CLIENT;
+        return MinecraftQuiltLoader.getEnvironmentType() == EnvType.CLIENT;
     }
     public static boolean isModLoaded(String modid) {
         return QuiltLoader.isModLoaded(modid);

quilt/src/main/resources/quilt.mod.json

@@ -6,13 +6,16 @@
     "version": "${version}",
     "name": "MidnightLib",
     "description": "Common Library for Team MidnightDust's mods.",
-    "authors": ["TeamMidnightDust","Motschen"],
+    "authors": [
+      "TeamMidnightDust",
+      "Motschen"
+    ],
     "contact": {
       "homepage": "https://www.midnightdust.eu/",
       "sources": "https://github.com/TeamMidnightDust/MidnightLib",
       "issues": "https://github.com/TeamMidnightDust/MidnightLib/issues"
     },
-    "license": "MIT License",
+    "license": "MIT",
     "icon": "assets/midnightlib/icon.png",
     "intermediate_mappings": "net.fabricmc:intermediary",
     "environment": "*",
@@ -27,9 +30,6 @@
         "eu.midnightdust.lib.config.AutoModMenu"
       ]
     },
-    "mixin": [
-      "midnightlib.mixins.json"
-    ],
     "depends": [
       {
         "id": "quilt_loader",
@@ -40,7 +40,25 @@
         "version": "*"
       }
     ],
-    "custom": {
+    "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.",
+      "contributors": {
+        "Motschen": "Author",
+        "TeamMidnightDust": "Mascot"
+      },
+      "contact": {
+        "email": "mail@midnightdust.eu",
+        "homepage": "https://modrinth.com/mod/midnightlib",
+        "issues":  "https://github.com/TeamMidnightDust/MidnightLib/issues",
+        "sources": "https://github.com/TeamMidnightDust/MidnightLib"
+      },
+      "icon": "assets/midnightlib/icon.png"
+    }
+  },
+  "mixin": [
+    "midnightlib.mixins.json"
+  ],
   "modmenu": {
     "links": {
       "modmenu.discord": "https://discord.midnightdust.eu/",
@@ -51,6 +69,4 @@
     },
     "badges": [ "library" ]
   }
-    }
-  }
 }

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"