Merge pull request #59 from Mccandycube6623/patch-1

Create zh_cn.json

.gitignore

@@ -16,4 +16,5 @@ classes/
 .metadata
 .vscode
 .settings
-*.launch
+*.launch
+.architectury-transformer/debug.log

README.md

@@ -1,3 +1,3 @@
 # MidnightLib
-Common Library for Team MidnightDust's mods.  
-Provides a config api, common utils, and cosmetics.
+Lightweight Common Library for Minecraft mods.  
+Provides a config api with a nice GUI and common utilities, all in a very small file.

build.gradle

@@ -1,6 +1,8 @@
 plugins {
     id "architectury-plugin" version "3.4-SNAPSHOT"
-    id "dev.architectury.loom" version "1.0-SNAPSHOT" apply false
+    id "dev.architectury.loom" version "1.6-SNAPSHOT" apply false
+    id "me.shedaniel.unified-publishing" version "0.1.+" apply false
+    id 'com.github.johnrengelman.shadow' version '8.1.1' apply false
 }
 
 architectury {
@@ -12,10 +14,11 @@ subprojects {
 
     dependencies {
         minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
-        // 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 loom.layered {
+            it.mappings("net.fabricmc:yarn:$rootProject.yarn_mappings:v2")
+            it.mappings("dev.architectury:yarn-mappings-patch-neoforge:$rootProject.yarn_mappings_patch_neoforge_version")
+        }
     }
 }
 
@@ -38,7 +41,22 @@ allprojects {
 
     tasks.withType(JavaCompile) {
         options.encoding = "UTF-8"
-        options.release = 17
+        options.release = 21
+    }
+    ext {
+        releaseChangelog = {
+            def changes = new StringBuilder()
+            changes << "## MidnightLib v$project.version for $project.minecraft_version\n[View the changelog](https://www.github.com/TeamMidnightDust/MidnightLib/commits/)"
+            def proc = "git log --max-count=1 --pretty=format:%s".execute()
+            proc.in.eachLine { line ->
+                def processedLine = line.toString()
+                if (!processedLine.contains("New translations") && !processedLine.contains("Merge") && !processedLine.contains("branch")) {
+                    changes << "\n- ${processedLine.capitalize()}"
+                }
+            }
+            proc.waitFor()
+            return changes.toString()
+        }
     }
 
     java {

common/build.gradle

@@ -2,9 +2,6 @@ architectury {
     common(rootProject.enabled_platforms.split(","))
 }
 
-loom {
-}
-
 dependencies {
     // We depend on fabric loader here to use the fabric @Environment annotations and get the mixin dependencies
     // Do NOT use other classes from fabric loader

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

@@ -1,12 +1,23 @@
 package eu.midnightdust.core;
 
+import eu.midnightdust.core.config.MidnightLibConfig;
 import eu.midnightdust.lib.config.AutoCommand;
 import eu.midnightdust.lib.config.MidnightConfig;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
 
 import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.List;
 
-public class MidnightLibServer {
+public class MidnightLib {
+    public static List<String> hiddenMods = new ArrayList<>();
 
+    @Environment(EnvType.CLIENT)
+    public static void onInitializeClient() {
+        MidnightLibConfig.init("midnightlib", MidnightLibConfig.class);
+    }
+    @Environment(EnvType.SERVER)
     public static void onInitializeServer() {
         MidnightConfig.configClass.forEach((modid, config) -> {
             for (Field field : config.getFields()) {

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

@@ -1,21 +0,0 @@
-package eu.midnightdust.core;
-
-import eu.midnightdust.core.config.MidnightLibConfig;
-import eu.midnightdust.hats.web.HatLoader;
-import eu.midnightdust.lib.config.MidnightConfig;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class MidnightLibClient {
-    public static List<String> hiddenMods = new ArrayList<>();
-
-    public static final String MOD_ID = "midnightlib";
-
-    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/config/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", isColor = true) public static String titleColor = "#ffffff";      // The isColor property adds a preview box for a hexadecimal color
+    @Entry(category = "text") public static List<String> arrayList = Lists.newArrayList();      // Array String Lists are also supported
+    @Entry(isSlider = true, min = 0, max = 100) public static int intSlider = 35;               // Int fields can also be displayed as a Slider
+    @Entry(isSlider = true, min = 0f, max = 1f) 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");
+    }
+    */
+}

common/src/main/java/eu/midnightdust/core/config/MidnightLibConfig.java

@@ -4,12 +4,8 @@ import eu.midnightdust.lib.config.MidnightConfig;
 import eu.midnightdust.lib.util.PlatformFunctions;
 
 public class MidnightLibConfig extends MidnightConfig {
-    @Comment(centered = true) public static Comment midnightlib_description;
-    @Entry // Enable or disable the MidnightConfig overview screen button
+    @Entry
     public static ConfigButton config_screen_list = PlatformFunctions.isModLoaded("modmenu") ? ConfigButton.MODMENU : ConfigButton.TRUE;
-    @Comment(centered = true) public static Comment midnighthats_description;
-    @Entry // Enable or disable hats for contributors, friends and donors.
-    public static boolean special_hats = true;
 
     public enum ConfigButton {
         TRUE,FALSE,MODMENU

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

@@ -3,12 +3,17 @@ package eu.midnightdust.core.mixin;
 import eu.midnightdust.core.config.MidnightLibConfig;
 import eu.midnightdust.core.screen.MidnightConfigOverviewScreen;
 import eu.midnightdust.lib.util.PlatformFunctions;
-import eu.midnightdust.lib.util.screen.TexturedOverlayButtonWidget;
+import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.screen.option.OptionsScreen;
+import net.minecraft.client.gui.widget.TextIconButtonWidget;
+import net.minecraft.client.gui.widget.ThreePartsLayoutWidget;
 import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
+import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@@ -17,14 +22,28 @@ import java.util.Objects;
 
 @Mixin(OptionsScreen.class)
 public class MixinOptionsScreen extends Screen {
-    private static final Identifier MIDNIGHTLIB_ICON_TEXTURE = new Identifier("midnightlib","textures/gui/midnightlib_button.png");
-    protected MixinOptionsScreen(Text title) {
-        super(title);
+    @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();
+    @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);}
+    @Inject(at = @At("HEAD"), method = "init")
+    public void midnightlib$onInit(CallbackInfo ci) {
+        if (shouldShowButton) {
+            this.midnightlib$setupButton();
+            this.addDrawableChild(button);
+        }
     }
 
-    @Inject(at = @At("HEAD"),method = "init")
-    private void midnightlib$init(CallbackInfo ci) {
-        if (MidnightLibConfig.config_screen_list.equals(MidnightLibConfig.ConfigButton.TRUE) || (MidnightLibConfig.config_screen_list.equals(MidnightLibConfig.ConfigButton.MODMENU) && !PlatformFunctions.isModLoaded("modmenu")))
-            this.addDrawableChild(new TexturedOverlayButtonWidget(this.width / 2 + 158, this.height / 6 - 12, 20, 20, 0, 0, 20, MIDNIGHTLIB_ICON_TEXTURE, 32, 64, (buttonWidget) -> Objects.requireNonNull(client).setScreen(new MidnightConfigOverviewScreen(this)), Text.translatable("midnightlib.overview.title")));
+    @Override
+    public void resize(MinecraftClient client, int width, int height) {
+        super.resize(client, width, height);
+        if (shouldShowButton) this.midnightlib$setupButton();
     }
-}
+    @Unique
+    public void midnightlib$setupButton() {
+        button.setPosition(layout.getWidth() / 2  + 158, layout.getY() + layout.getFooterHeight() - 4);
+    }
+}

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

@@ -1,24 +0,0 @@
-package eu.midnightdust.core.mixin;
-
-import eu.midnightdust.hats.witch.WitchHatFeatureRenderer;
-import net.minecraft.client.network.AbstractClientPlayerEntity;
-import net.minecraft.client.render.entity.EntityRendererFactory;
-import net.minecraft.client.render.entity.LivingEntityRenderer;
-import net.minecraft.client.render.entity.PlayerEntityRenderer;
-import net.minecraft.client.render.entity.model.PlayerEntityModel;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-@Mixin(PlayerEntityRenderer.class)
-public abstract class MixinPlayerEntityRenderer extends LivingEntityRenderer<AbstractClientPlayerEntity, PlayerEntityModel<AbstractClientPlayerEntity>> {
-    public MixinPlayerEntityRenderer(EntityRendererFactory.Context ctx, PlayerEntityModel<AbstractClientPlayerEntity> model, float shadowSize) {
-        super(ctx, model, shadowSize);
-    }
-
-    @Inject(at = @At("TAIL"), method = "<init>")
-    public void addFeatures(EntityRendererFactory.Context ctx, boolean slim, CallbackInfo ci) {
-        this.addFeature(new WitchHatFeatureRenderer<>(this, ctx.getModelLoader()));
-    }
-}

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

@@ -1,19 +1,15 @@
 package eu.midnightdust.core.screen;
 
-import eu.midnightdust.core.MidnightLibClient;
-import eu.midnightdust.core.config.MidnightLibConfig;
+import eu.midnightdust.core.MidnightLib;
 import eu.midnightdust.lib.config.MidnightConfig;
 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.Element;
-import net.minecraft.client.gui.Selectable;
+import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.widget.*;
-import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.screen.ScreenTexts;
 import net.minecraft.text.*;
+
 import java.util.*;
 
 @Environment(EnvType.CLIENT)
@@ -24,64 +20,29 @@ public class MidnightConfigOverviewScreen extends Screen {
         this.parent = parent;
     }
     private final Screen parent;
-    private MidnightOverviewListWidget list;
+    private MidnightConfig.MidnightConfigListWidget list;
 
     @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 - 26, 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);
+        this.list = new MidnightConfig.MidnightConfigListWidget(this.client, this.width, this.height - 57, 24, 25);
         this.addSelectableChild(this.list);
         List<String> sortedMods = new ArrayList<>(MidnightConfig.configClass.keySet());
         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))));
+            if (!MidnightLib.hiddenMods.contains(modid)) {
+                list.addButton(List.of(ButtonWidget.builder(Text.translatable(modid +".midnightconfig.title"), (button) ->
+                        Objects.requireNonNull(client).setScreen(MidnightConfig.getScreen(this,modid))).dimensions(this.width / 2 - 125, this.height - 28, 250, 20).build()), null, null);
             }
         });
         super.init();
     }
     @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);
-        super.render(matrices, mouseX, mouseY, delta);
-    }
-    @Environment(EnvType.CLIENT)
-    public static class MidnightOverviewListWidget extends ElementListWidget<OverviewButtonEntry> {
-        TextRenderer textRenderer;
+    public void render(DrawContext context, int mouseX, int mouseY, float delta) {
+        super.render(context, mouseX, mouseY, delta);
+        this.list.render(context, mouseX, mouseY, delta);
 
-        public MidnightOverviewListWidget(MinecraftClient minecraftClient, int i, int j, int k, int l, int m) {
-            super(minecraftClient, i, j, k, l, m);
-            this.centerListVertically = false;
-            textRenderer = minecraftClient.textRenderer;
-        }
-        @Override
-        public int getScrollbarPositionX() {return this.width -7;}
-
-        public void addButton(ClickableWidget button) {
-            this.addEntry(OverviewButtonEntry.create(button));
-        }
-        @Override
-        public int getRowWidth() { return 400; }
-    }
-    public static class OverviewButtonEntry extends ElementListWidget.Entry<OverviewButtonEntry> {
-        private final ClickableWidget button;
-        private final List<ClickableWidget> buttonList = new ArrayList<>();
-
-        private OverviewButtonEntry(ClickableWidget button) {
-            this.button = button;
-            this.buttonList.add(button);
-        }
-        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.render(matrices, mouseX, mouseY, tickDelta);
-        }
-        public List<? extends Element> children() {return buttonList;}
-        public List<? extends Selectable> selectableChildren() {return buttonList;}
+        context.drawCenteredTextWithShadow(textRenderer, title, width / 2, 10, 0xFFFFFF);
     }
 }

common/src/main/java/eu/midnightdust/hats/web/HatLoader.java

@@ -1,49 +0,0 @@
-package eu.midnightdust.hats.web;
-
-import com.google.common.reflect.TypeToken;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import net.minecraft.client.MinecraftClient;
-
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.lang.reflect.Type;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Collections;
-import java.util.Map;
-import java.util.UUID;
-import java.util.concurrent.CompletableFuture;
-
-@SuppressWarnings("UnstableApiUsage")
-public class HatLoader {
-    public static final System.Logger logger = System.getLogger("MidnightLib");
-    private final static String HATS_URL = "https://raw.githubusercontent.com/TeamMidnightDust/MidnightHats/master/hats.json";
-    public static final Type HAT_TYPE = new TypeToken<Map<UUID, PlayerHatData>>(){}.getType();
-    public static Map<UUID, PlayerHatData> PLAYER_HATS;
-    private static final Gson GSON = new GsonBuilder().create();
-
-
-    public static void init() {
-        CompletableFuture.supplyAsync(() -> {
-            try (Reader reader = new InputStreamReader(new URL(HATS_URL).openStream())) {
-                return GSON.<Map<UUID, PlayerHatData>>fromJson(reader, HAT_TYPE);
-            } catch (MalformedURLException error) {
-                logger.log(System.Logger.Level.ERROR, "Unable to load player hats because of connection problems: " + error.getMessage());
-            } catch (IOException error) {
-                logger.log(System.Logger.Level.ERROR, "Unable to load player hats because of an I/O Exception: " + error.getMessage());
-            }
-
-            return null;
-        }).thenAcceptAsync(playerData -> {
-            if (playerData != null) {
-                PLAYER_HATS = playerData;
-                System.out.println("(MidnightLib) Player hats successfully loaded!");
-            } else {
-                PLAYER_HATS = Collections.emptyMap();
-                logger.log(System.Logger.Level.WARNING, "A problem with the database occurred, the hats could not be initialized.");
-            }
-        }, MinecraftClient.getInstance());
-    }
-}

common/src/main/java/eu/midnightdust/hats/web/PlayerHatData.java

@@ -1,13 +0,0 @@
-package eu.midnightdust.hats.web;
-
-public class PlayerHatData {
-    private final String hat;
-
-    public PlayerHatData(String hat) {
-        this.hat = hat;
-    }
-
-    public String getHatType() {
-        return hat;
-    }
-}

common/src/main/java/eu/midnightdust/hats/witch/WitchHatFeatureRenderer.java

@@ -1,82 +0,0 @@
-package eu.midnightdust.hats.witch;
-
-import eu.midnightdust.hats.web.HatLoader;
-import eu.midnightdust.lib.util.MidnightColorUtil;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.model.TexturedModelData;
-import net.minecraft.client.render.*;
-import net.minecraft.client.render.entity.feature.FeatureRenderer;
-import net.minecraft.client.render.entity.feature.FeatureRendererContext;
-import net.minecraft.client.render.entity.model.EntityModel;
-import net.minecraft.client.render.entity.model.EntityModelLayer;
-import net.minecraft.client.render.entity.model.EntityModelLoader;
-import net.minecraft.client.render.entity.model.ModelWithHead;
-import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.entity.LivingEntity;
-import net.minecraft.util.Identifier;
-
-import java.awt.*;
-import java.util.UUID;
-
-import static eu.midnightdust.core.MidnightLibClient.MOD_ID;
-
-@Environment(EnvType.CLIENT)
-public class WitchHatFeatureRenderer<T extends LivingEntity, M extends EntityModel<T>> extends FeatureRenderer<T, M> {
-    public static final EntityModelLayer WITCH_HAT_MODEL_LAYER = new EntityModelLayer(new Identifier("midnight-hats","witch_hat"), "main");
-    private static final UUID MOTSCHEN = UUID.fromString("a44c2660-630f-478f-946a-e518669fcf0c");
-
-    private static final Identifier WITCH = new Identifier("textures/entity/witch.png");
-    private static final Identifier OVERLAY = new Identifier(MOD_ID,"textures/hats/overlay.png");
-    private static final Color MOTSCHEN_COLOR = MidnightColorUtil.radialRainbow(1,1);
-    private static final Color ADOPTER_COLOR = MidnightColorUtil.hex2Rgb("ffffff");
-    private static final Color MODDER_COLOR = MidnightColorUtil.hex2Rgb("7825b4");
-    private static final Color FRIEND_COLOR = MidnightColorUtil.hex2Rgb("ff0234");
-    private static final Color DONOR_COLOR = MidnightColorUtil.hex2Rgb("ff6c00");
-    private static final Color SOCIAL_COLOR = MidnightColorUtil.hex2Rgb("238a9d");
-    private final WitchHatModel<T> witchHat;
-    private final MinecraftClient client = MinecraftClient.getInstance();
-
-    public WitchHatFeatureRenderer(FeatureRendererContext<T, M> featureRendererContext, EntityModelLoader entityModelLoader) {
-        super(featureRendererContext);
-        this.witchHat = new WitchHatModel<>(entityModelLoader.getModelPart(WITCH_HAT_MODEL_LAYER));
-    }
-
-    public static TexturedModelData getTexturedModelData() {
-        return TexturedModelData.of(WitchHatModel.getModelData(), 64, 128);
-    }
-
-    public void render(MatrixStack matrixStack, VertexConsumerProvider vertexConsumerProvider, int i, T livingEntity, float f, float g, float h, float j, float k, float l) {
-        Color hat_type = getHat(livingEntity.getUuid());
-
-        if (hat_type != null && !livingEntity.isInvisibleTo(client.player)) {
-            if (hat_type == MOTSCHEN_COLOR) hat_type = MidnightColorUtil.radialRainbow(1,1);
-            matrixStack.push();
-
-            ((ModelWithHead) this.getContextModel()).getHead().rotate(matrixStack);
-            VertexConsumer vertexConsumer = vertexConsumerProvider.getBuffer(RenderLayer.getEntityCutoutNoCull(WITCH));
-            this.witchHat.render(matrixStack, vertexConsumer, i, OverlayTexture.DEFAULT_UV,1f,1f,1f,1);
-            VertexConsumer glow = vertexConsumerProvider.getBuffer(RenderLayer.getBeaconBeam(OVERLAY,true));
-            matrixStack.translate(0,0,-0.001f);
-            this.witchHat.render(matrixStack, glow, 230, OverlayTexture.DEFAULT_UV, hat_type.getRed() / 255f, hat_type.getGreen() / 255f, hat_type.getBlue() / 255f, 1.0F);
-
-            matrixStack.pop();
-        }
-    }
-    private Color getHat(UUID uuid) {
-        if (uuid.equals(MOTSCHEN)) {
-            return MOTSCHEN_COLOR;
-        } else if (HatLoader.PLAYER_HATS != null && HatLoader.PLAYER_HATS.containsKey(uuid)) {
-            return switch (HatLoader.PLAYER_HATS.get(uuid).getHatType()) {
-                case "adopter" -> ADOPTER_COLOR;
-                case "contributer", "modder" -> MODDER_COLOR;
-                case "friend" -> FRIEND_COLOR;
-                case "donator", "donor" -> DONOR_COLOR;
-                case "social" -> SOCIAL_COLOR;
-                default -> MidnightColorUtil.hex2Rgb(HatLoader.PLAYER_HATS.get(uuid).getHatType());
-            };
-        }
-        return null;
-    }
-}

common/src/main/java/eu/midnightdust/hats/witch/WitchHatModel.java

@@ -1,59 +0,0 @@
-package eu.midnightdust.hats.witch;
-
-import net.minecraft.client.model.*;
-import net.minecraft.client.render.VertexConsumer;
-import net.minecraft.client.render.entity.model.SinglePartEntityModel;
-import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.entity.LivingEntity;
-
-public class WitchHatModel<T extends LivingEntity> extends SinglePartEntityModel<T> {
-    private final ModelPart headwear;
-
-    public WitchHatModel(ModelPart root) {
-        headwear = root;
-        root.setPivot(5.0F, -9.0F, -5.0F);
-
-        ModelPart bone = headwear.getChild("bone");
-        bone.setPivot(-8.5F, -0.1F, 1.5F);
-        setRotationAngle(bone, -0.0524F, 0.0F, 0.0349F);
-
-        ModelPart bone2 = bone.getChild("bone2");
-        bone2.setPivot(1.5F, -4.0F, 1.5F);
-        setRotationAngle(bone2, -0.1222F, 0.0F, 0.0698F);
-
-        ModelPart bone3 = bone2.getChild("bone3");
-        bone3.setPivot(1.5F, -4.0F, 1.5F);
-        setRotationAngle(bone3, -0.2618F, 0.0F, 0.1047F);
-    }
-
-    public static ModelData getModelData(){
-        ModelData modelData = new ModelData();
-        ModelPartData modelPartData = modelData.getRoot();
-        modelPartData.addChild("headwear", ModelPartBuilder.create().uv(0, 64).cuboid(-10.0F, -0.1F, 0.0F, 10.0F, 2.0F, 10.0F), ModelTransform.NONE);
-        ModelPartData modelPartData2 = modelPartData.addChild("bone", ModelPartBuilder.create().uv(0, 76).cuboid(0.0F, -4.0F, 0.0F, 7.0F, 4.0F, 7.0F), ModelTransform.rotation(-0.0524F, 0.0F, 0.0349F));
-        ModelPartData modelPartData3 = modelPartData2.addChild("bone2", ModelPartBuilder.create().uv(0, 87).cuboid(0.0F, -4.0F, 0.0F, 4.0F, 4.0F, 4.0F), ModelTransform.rotation(-0.1222F, 0.0F, 0.0698F));
-        modelPartData3.addChild("bone3", ModelPartBuilder.create().uv(0, 95).cuboid(0.0F, -2.0F, 0.0F, 1.0F, 2.0F, 1.0F), ModelTransform.rotation(-0.2618F, 0.0F, 0.1047F));
-
-        return modelData;
-    }
-
-    @Override
-    public void setAngles(T entity, float limbAngle, float limbDistance, float animationProgress, float headYaw, float headPitch) {
-    }
-
-    @Override
-    public void render(MatrixStack matrixStack, VertexConsumer buffer, int packedLight, int packedOverlay, float red, float green, float blue, float alpha){
-        headwear.render(matrixStack, buffer, packedLight, packedOverlay, red, green, blue, alpha);
-    }
-
-    @Override
-    public ModelPart getPart() {
-        return headwear;
-    }
-
-    public void setRotationAngle(ModelPart bone, float x, float y, float z) {
-        bone.pitch = x;
-        bone.yaw = y;
-        bone.roll = z;
-    }
-}

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

@@ -1,6 +1,7 @@
 package eu.midnightdust.lib.config;
 
 import com.mojang.brigadier.arguments.DoubleArgumentType;
+import com.mojang.brigadier.arguments.FloatArgumentType;
 import com.mojang.brigadier.arguments.IntegerArgumentType;
 import com.mojang.brigadier.arguments.StringArgumentType;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
@@ -14,9 +15,9 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
+@SuppressWarnings("unchecked")
 public class AutoCommand {
     public static List<LiteralArgumentBuilder<ServerCommandSource>> commands = new ArrayList<>();
-    private LiteralArgumentBuilder<ServerCommandSource> command;
     final Field entry;
     final String modid;
 
@@ -26,14 +27,7 @@ public class AutoCommand {
     }
 
     public void register() {
-        command = CommandManager.literal(modid);
-        command();
-        LiteralArgumentBuilder<ServerCommandSource> finalized = CommandManager.literal("midnightconfig").requires(source -> source.hasPermissionLevel(2)).then(command);
-
-        PlatformFunctions.registerCommand(finalized); commands.add(finalized);
-    }
-
-    private void command() {
+        LiteralArgumentBuilder<ServerCommandSource> command = CommandManager.literal(modid);
         if (entry.getType() == int.class)
             command = command.then(CommandManager.literal(this.entry.getName()).executes(ctx -> getValue(ctx.getSource())).then(
                     CommandManager.argument("value", IntegerArgumentType.integer((int) entry.getAnnotation(MidnightConfig.Entry.class).min(),(int) entry.getAnnotation(MidnightConfig.Entry.class).max()))
@@ -44,15 +38,18 @@ public class AutoCommand {
                     CommandManager.argument("value", DoubleArgumentType.doubleArg(entry.getAnnotation(MidnightConfig.Entry.class).min(),entry.getAnnotation(MidnightConfig.Entry.class).max()))
                             .executes(ctx -> this.setValue(ctx.getSource(), DoubleArgumentType.getDouble(ctx, "value")))
             ));
+        else if (entry.getType() == float.class)
+            command = command.then(CommandManager.literal(this.entry.getName()).executes(ctx -> getValue(ctx.getSource())).then(
+                    CommandManager.argument("value", FloatArgumentType.floatArg((float) entry.getAnnotation(MidnightConfig.Entry.class).min(), (float) entry.getAnnotation(MidnightConfig.Entry.class).max()))
+                            .executes(ctx -> this.setValue(ctx.getSource(), FloatArgumentType.getFloat(ctx, "value")))
+            ));
         else if (entry.getType() == boolean.class) {
-            command = command.then(CommandManager.literal(this.entry.getName()).executes(ctx -> getValue(ctx.getSource())).then(
-                    CommandManager.literal("true")
-                            .executes(ctx -> this.setValue(ctx.getSource(), true))
-            ));
-            command = command.then(CommandManager.literal(this.entry.getName()).executes(ctx -> getValue(ctx.getSource())).then(
-                    CommandManager.literal("false")
-                            .executes(ctx -> this.setValue(ctx.getSource(), false))
-            ));
+            for (int i = 0; i < 2; i++) {
+                command = command.then(CommandManager.literal(this.entry.getName()).executes(ctx -> getValue(ctx.getSource())).then(
+                        CommandManager.literal(i==0 ? "true":"false")
+                                .executes(ctx -> this.setValue(ctx.getSource(), ctx.getInput().endsWith("true")))
+                ));
+            }
         }
         else if (entry.getType().isEnum()) {
             for (int i = 0; i < entry.getType().getEnumConstants().length; ++i) {
@@ -63,16 +60,28 @@ public class AutoCommand {
                 ));
             }
         }
-        else
+        else if (entry.getType() == List.class) {
+            for (int i = 0; i < 2; i++) {
+                int finalI = i;
+                command = command.then(CommandManager.literal(this.entry.getName()).executes(ctx -> getValue(ctx.getSource())).then(CommandManager.literal(i==0 ? "add":"remove").then(
+                        CommandManager.argument("value", StringArgumentType.string())
+                                .executes(ctx -> this.setList(ctx.getSource(), StringArgumentType.getString(ctx, "value"), finalI==0))
+                )));
+            }
+        }
+        else {
             command = command.then(CommandManager.literal(this.entry.getName()).executes(ctx -> getValue(ctx.getSource())).then(
                     CommandManager.argument("value", StringArgumentType.string())
                             .executes(ctx -> this.setValue(ctx.getSource(), StringArgumentType.getString(ctx, "value")))
             ));
-    }
+        }
+        LiteralArgumentBuilder<ServerCommandSource> finalized = CommandManager.literal("midnightconfig").requires(source -> source.hasPermissionLevel(2)).then(command);
 
+        PlatformFunctions.registerCommand(finalized); commands.add(finalized);
+    }
     private int setValue(ServerCommandSource source, Object value) {
         try {
-            entry.set(null,value);
+            if (entry.getType() != List.class) entry.set(null,value);
             MidnightConfig.write(modid);
         }
         catch (Exception e) {
@@ -80,15 +89,29 @@ public class AutoCommand {
             return 0;
         }
 
-        source.sendFeedback(Text.literal("Successfully set " + entry.getName()+" to "+value), true);
+        source.sendFeedback(() -> Text.literal("Successfully set " + entry.getName()+" to "+value), true);
+        return 1;
+    }
+    private int setList(ServerCommandSource source, String value, boolean add) {
+        try {
+            List<String> e = (List<String>)entry.get(null);
+            if (add) e.add(value);
+            else if (!e.contains(value)) throw new IllegalArgumentException("List does not contain this string!");
+            else e.remove(value);
+            MidnightConfig.write(modid);
+        }
+        catch (Exception e) {
+            source.sendError(Text.literal((add ? "Could not add "+value+" to " : "Could not remove "+value+" from ")+entry.getName() +": " + e));
+            return 0;
+        }
+        source.sendFeedback(() -> Text.literal((add ? "Successfully added " +value+" to " : "Successfully removed " +value+" from ") +entry.getName()), true);
         return 1;
     }
     private int getValue(ServerCommandSource source) {
-        try {
-            source.sendFeedback(Text.literal("The value of "+entry.getName()+" is "+entry.get(null)), false);
-            return 1;
-        }
-        catch (IllegalAccessException ignored) {}
+        source.sendFeedback(() -> {
+            try {return Text.literal("The value of "+entry.getName()+" is "+entry.get(null));
+            } catch (IllegalAccessException e) {throw new RuntimeException(e);}
+            }, true);
         return 0;
     }
 }

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

@@ -1,25 +1,32 @@
 package eu.midnightdust.lib.config;
 
+import com.google.common.collect.Lists;
 import com.google.gson.ExclusionStrategy;
 import com.google.gson.FieldAttributes;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+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.DrawableHelper;
+import net.minecraft.client.gui.DrawContext;
 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;
 import net.minecraft.screen.ScreenTexts;
+import net.minecraft.text.OrderedText;
 import net.minecraft.text.Style;
 import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;
+import net.minecraft.util.Identifier;
 
 import java.awt.Color;
 import java.lang.annotation.ElementType;
@@ -37,27 +44,25 @@ import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
 
-/** MidnightConfig v2.3.0 by TeamMidnightDust & Motschen
+/** MidnightConfig v2.5.1 by TeamMidnightDust & Motschen
  *  Single class config library - feel free to copy!
-
- *  Based on https://github.com/Minenash/TinyConfig
+ *  Based on <a href="https://github.com/Minenash/TinyConfig">...</a>
  *  Credits to Minenash */
 
 @SuppressWarnings("unchecked")
 public abstract class MidnightConfig {
     private static final Pattern INTEGER_ONLY = Pattern.compile("(-?[0-9]*)");
-    private static final Pattern DECIMAL_ONLY = Pattern.compile("-?([\\d]+\\.?[\\d]*|[\\d]*\\.?[\\d]+|\\.)");
+    private static final Pattern DECIMAL_ONLY = Pattern.compile("-?(\\d+\\.?\\d*|\\d*\\.?\\d+|\\.)");
     private static final Pattern HEXADECIMAL_ONLY = Pattern.compile("(-?[#0-9a-fA-F]*)");
 
     private static final List<EntryInfo> entries = new ArrayList<>();
 
-    protected static class EntryInfo {
+    public static class EntryInfo {
         Field field;
         Object widget;
         int width;
-        int max;
         boolean centered;
-        Map.Entry<TextFieldWidget,Text> error;
+        Text error;
         Object defaultValue;
         Object value;
         String tempValue;
@@ -66,21 +71,22 @@ public abstract class MidnightConfig {
         Text name;
         int index;
         ClickableWidget colorButton;
+        Tab tab;
     }
 
-    public static final Map<String,Class<?>> configClass = new HashMap<>();
+    public static final Map<String, Class<? extends MidnightConfig>> configClass = new HashMap<>();
     private static Path path;
 
     private static final Gson gson = new GsonBuilder().excludeFieldsWithModifiers(Modifier.TRANSIENT).excludeFieldsWithModifiers(Modifier.PRIVATE).addSerializationExclusionStrategy(new HiddenAnnotationExclusionStrategy()).setPrettyPrinting().create();
 
-    public static void init(String modid, Class<?> config) {
+    public static void init(String modid, Class<? extends MidnightConfig> config) {
         path = PlatformFunctions.getConfigDirectory().resolve(modid + ".json");
         configClass.put(modid, config);
 
         for (Field field : config.getFields()) {
             EntryInfo info = new EntryInfo();
-            if ((field.isAnnotationPresent(Entry.class) || field.isAnnotationPresent(Comment.class)) && !field.isAnnotationPresent(Server.class) && !field.isAnnotationPresent(Hidden.class))
-                if (PlatformFunctions.isClientEnv()) initClient(modid, field, info);
+            if ((field.isAnnotationPresent(Entry.class) || field.isAnnotationPresent(Comment.class)) && !field.isAnnotationPresent(Server.class) && !field.isAnnotationPresent(Hidden.class) && PlatformFunctions.isClientEnv())
+                initClient(modid, field, info);
             if (field.isAnnotationPresent(Comment.class)) info.centered = field.getAnnotation(Comment.class).centered();
             if (field.isAnnotationPresent(Entry.class))
                 try {
@@ -107,14 +113,12 @@ public abstract class MidnightConfig {
         info.id = modid;
 
         if (e != null) {
-            if (!e.name().equals("")) info.name = Text.translatable(e.name());
+            if (!e.name().isEmpty()) info.name = Text.translatable(e.name());
             if (type == int.class) textField(info, Integer::parseInt, INTEGER_ONLY, (int) e.min(), (int) e.max(), true);
             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) {
+            else if (type == String.class || type == List.class) 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);
                 info.widget = new AbstractMap.SimpleEntry<ButtonWidget.PressAction, Function<Object, Text>>(button -> {
                     info.value = !(Boolean) info.value;
@@ -132,6 +136,10 @@ public abstract class MidnightConfig {
         }
         entries.add(info);
     }
+    public static Tooltip getTooltip(EntryInfo info) {
+        String key = info.id + ".midnightconfig."+info.field.getName()+".tooltip";
+        return Tooltip.of(info.error != null ? info.error : I18n.hasTranslation(key) ? Text.translatable(key) : Text.empty());
+    }
 
     private static void textField(EntryInfo info, Function<String,Number> f, Pattern pattern, double min, double max, boolean cast) {
         boolean isNumber = pattern != null;
@@ -145,9 +153,10 @@ 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);
+                t.setTooltip(getTooltip(info));
             }
 
             info.tempValue = s;
@@ -159,7 +168,7 @@ public abstract class MidnightConfig {
                 info.value = isNumber? value : s;
             else if (inLimits) {
                 if (((List<String>) info.value).size() == info.index) ((List<String>) info.value).add("");
-                ((List<String>) info.value).set(info.index, Arrays.stream(info.tempValue.replace("[", "").replace("]", "").split(", ")).toList().get(0));
+                ((List<String>) info.value).set(info.index, Arrays.stream(info.tempValue.replace("[", "").replace("]", "").split(", ")).toList().getFirst());
             }
 
             if (info.field.getAnnotation(Entry.class).isColor()) {
@@ -172,14 +181,20 @@ public abstract class MidnightConfig {
             return true;
         };
     }
-
+    public static MidnightConfig getClass(String modid) {
+        try { return configClass.get(modid).getDeclaredConstructor().newInstance(); } catch (Exception e) {throw new RuntimeException(e);}
+    }
     public static void write(String modid) {
+        getClass(modid).writeChanges(modid);
+    }
+
+    public void writeChanges(String modid) {
         path = PlatformFunctions.getConfigDirectory().resolve(modid + ".json");
         try {
             if (!Files.exists(path)) Files.createFile(path);
-            Files.write(path, gson.toJson(configClass.get(modid).getDeclaredConstructor().newInstance()).getBytes());
+            Files.write(path, gson.toJson(getClass(modid)).getBytes());
         } catch (Exception e) {
-            e.printStackTrace();
+            e.fillInStackTrace();
         }
     }
     @Environment(EnvType.CLIENT)
@@ -193,17 +208,49 @@ public abstract class MidnightConfig {
             this.parent = parent;
             this.modid = modid;
             this.translationPrefix = modid + ".midnightconfig.";
+            loadValues();
+
+            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";
+                    if (!tabs.containsKey(name)) {
+                        Tab tab = new GridScreenTab(Text.translatable(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();
+            tabNavigation.selectTab(0, false);
+            tabNavigation.init();
+            prevTab = tabManager.getCurrentTab();
         }
         public final String translationPrefix;
         public final Screen parent;
         public final String modid;
         public MidnightConfigListWidget list;
         public boolean reload = false;
+        public TabManager tabManager = new TabManager(a -> {}, a -> {});
+        public Map<String, Tab> tabs = new HashMap<>();
+        public Tab prevTab;
+        public TabNavigationWidget tabNavigation;
+        public ButtonWidget done;
+        public double scrollProgress = 0d;
 
         // 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);
+            }
+            scrollProgress = list.getScrollAmount();
             for (EntryInfo info : entries) {
                 try {info.field.set(null, info.value);} catch (IllegalAccessException ignored) {}
             }
@@ -231,16 +278,22 @@ 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);
+        }
+        @Override
         public void init() {
             super.init();
-            if (!reload) loadValues();
+            tabNavigation.setWidth(this.width);
+            tabNavigation.init();
+            if (tabs.size() > 1) this.addDrawableChild(tabNavigation);
 
-            this.addDrawableChild(new ButtonWidget(this.width / 2 - 154, this.height - 28, 150, 20, ScreenTexts.CANCEL, button -> {
+            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 - 26, 150, 20).build());
+            done = this.addDrawableChild(ButtonWidget.builder(ScreenTexts.DONE, (button) -> {
                 for (EntryInfo info : entries)
                     if (info.id.equals(modid)) {
                         try {
@@ -249,155 +302,147 @@ public abstract class MidnightConfig {
                     }
                 write(modid);
                 Objects.requireNonNull(client).setScreen(parent);
-            }));
+            }).dimensions(this.width / 2 + 4, this.height - 26, 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.list = new MidnightConfigListWidget(this.client, this.width, this.height - 57, 24, 25);
             this.addSelectableChild(this.list);
+
+            fillList();
+            reload = true;
+        }
+        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 -> {
+                    TextIconButtonWidget resetButton = TextIconButtonWidget.builder(Text.translatable("controls.reset"), (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);
-                    }));
+                        list.clear();
+                        fillList();
+                    }), true).texture(new Identifier("midnightlib","icon/reset"), 12, 12).dimension(40, 20).build();
+                    resetButton.setPosition(width - 205, 0);
 
                     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;
+                            list.clear();
+                            fillList();
+                        })).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);
                     }
                 }
+                list.setScrollAmount(scrollProgress);
                 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);
+        public void render(DrawContext context, int mouseX, int mouseY, float delta) {
+            super.render(context,mouseX,mouseY,delta);
+            this.list.render(context, mouseX, mouseY, delta);
 
-            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);
-                        }
-                    }
-                }
-            }
-            super.render(matrices,mouseX,mouseY,delta);
+            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<ButtonEntry> {
-        TextRenderer textRenderer;
-
-        public MidnightConfigListWidget(MinecraftClient minecraftClient, int i, int j, int k, int l, int m) {
-            super(minecraftClient, i, j, k, l, m);
-            this.centerListVertically = false;
-            textRenderer = minecraftClient.textRenderer;
+        boolean renderHeaderSeperator = true;
+        public MidnightConfigListWidget(MinecraftClient client, int width, int height, int y, int itemHeight) {
+            super(client, width, height, y, itemHeight);
         }
         @Override
-        public int getScrollbarPositionX() { return this.width -7; }
+        public int getScrollbarX() { return this.width -7; }
+
+        @Override
+        protected void drawHeaderAndFooterSeparators(DrawContext context) {
+            if (renderHeaderSeperator) 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);
+                RenderSystem.disableBlend();
+            }
+        }
 
         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;
         public final List<ClickableWidget> buttons;
         private final Text text;
         public final EntryInfo info;
-        private final List<ClickableWidget> children = new ArrayList<>();
+        public boolean centered = false;
         public static final Map<ClickableWidget, Text> buttonsWithText = new HashMap<>();
 
-        private ButtonEntry(List<ClickableWidget> buttons, Text text, EntryInfo info) {
-            if (!buttons.isEmpty()) buttonsWithText.put(buttons.get(0),text);
+        public ButtonEntry(List<ClickableWidget> buttons, Text text, EntryInfo info) {
+            if (!buttons.isEmpty()) buttonsWithText.put(buttons.getFirst(),text);
             this.buttons = buttons;
             this.text = text;
             this.info = info;
-            children.addAll(buttons);
+            if (info != null) this.centered = info.centered;
         }
-        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); });
+        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 (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);
+                int wrappedY = y;
+                for(Iterator<OrderedText> textIterator = textRenderer.wrapLines(text, (buttons.size() > 1 ? buttons.get(1).getX()-24 : MinecraftClient.getInstance().getWindow().getScaledWidth() - 24)).iterator(); textIterator.hasNext(); wrappedY += 9) {
+                    context.drawTextWithShadow(textRenderer, textIterator.next(), (centered) ? (MinecraftClient.getInstance().getWindow().getScaledWidth() / 2 - (textRenderer.getWidth(text) / 2)) : 12, wrappedY + 5, 0xFFFFFF);
+                }
             }
         }
-        public List<? extends Element> children() {return children;}
-        public List<? extends Selectable> selectableChildren() {return children;}
+        public List<? extends Element> children() {return Lists.newArrayList(buttons);}
+        public List<? extends Selectable> selectableChildren() {return Lists.newArrayList(buttons);}
     }
-    private static class MidnightSliderWidget extends SliderWidget {
+    public static class MidnightSliderWidget extends SliderWidget {
         private final EntryInfo info; private final Entry e;
         public MidnightSliderWidget(int x, int y, int width, int height, Text text, double value, EntryInfo info) {
             super(x, y, width, height, text, value);
@@ -426,12 +471,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/MidnightColorUtil.java

@@ -3,12 +3,6 @@ package eu.midnightdust.lib.util;
 import java.awt.Color;
 
 public class MidnightColorUtil {
-    public static float hue;
-    public static void tick() {
-        if (hue > 1) hue = 0f;
-        hue = hue + 0.01f;
-    }
-
     /**
      * @param colorStr e.g. "FFFFFF" or "#FFFFFF"
      * @return Color as RGB
@@ -19,8 +13,4 @@ public class MidnightColorUtil {
         } catch (Exception ignored) {}
         return Color.BLACK;
     }
-
-    public static Color radialRainbow(float saturation, float brightness) {
-        return Color.getHSBColor(hue, saturation, brightness);
-    }
 }

common/src/main/java/eu/midnightdust/lib/util/MidnightMathUtil.java

@@ -1,7 +0,0 @@
-package eu.midnightdust.lib.util;
-
-public class MidnightMathUtil {
-    public static boolean isEven(int i) {
-        return (i | 1) > i;
-    }
-}

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

@@ -1,40 +0,0 @@
-package eu.midnightdust.lib.util.screen;
-
-import com.mojang.blaze3d.systems.RenderSystem;
-import net.minecraft.client.gui.widget.TexturedButtonWidget;
-import net.minecraft.client.render.GameRenderer;
-import net.minecraft.client.util.math.MatrixStack;
-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, int textureWidth, int textureHeight, PressAction pressAction) {
-        super(x, y, width, height, u, v, hoveredVOffset, texture, textureWidth, textureHeight, 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, Text text) {
-        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);
-        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);
-
-        super.renderButton(matrices, mouseX, mouseY, delta);
-    }
-}

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

@@ -1,11 +1,7 @@
 {
 	"midnightlib.overview.title":"MidnightConfig Übersicht",
 	"midnightlib.midnightconfig.title":"MidnightLib Konfiguration",
-	"midnightlib.midnightconfig.midnightlib_description":"§nMidnightLib",
 	"midnightlib.midnightconfig.config_screen_list":"Konfigurationsübersicht",
-	"midnightlib.midnightconfig.background_texture":"Textur der Konfigurationsbildschirme",
-	"midnightlib.midnightconfig.midnighthats_description":"§nMidnightHats",
-	"midnightlib.midnightconfig.special_hats":"Unterstützer-Hüte",
-	"modmenu.descriptionTranslation.midnightlib": "Code-Bibliothek für Mods von MidnightDust.\nStellt eine Konfigurationsschnittstelle, automatische Kompatibilität, oft genutzten Code und Hüte für Unterstützer bereit.",
-	"modmenu.summaryTranslation.midnightlib": "Code-Bibliothek für Mods von MidnightDust."
+	"modmenu.descriptionTranslation.midnightlib": "Code-Bibliothek für einfache Konfiguration.\nStellt eine Konfigurationsschnittstelle, automatische Kompatibilität und oft genutzten Code bereit.",
+	"modmenu.summaryTranslation.midnightlib": "Code-Bibliothek für einfache Konfiguration."
 }

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

@@ -1,17 +1,13 @@
 {
 	"midnightlib.overview.title":"MidnightConfig Overview",
 	"midnightlib.midnightconfig.title":"MidnightLib Config",
-	"midnightlib.midnightconfig.midnightlib_description":"§nMidnightLib",
 	"midnightlib.midnightconfig.config_screen_list":"Enable Config Screen List",
 	"midnightlib.midnightconfig.enum.ConfigButton.TRUE":"§aYes",
 	"midnightlib.midnightconfig.enum.ConfigButton.FALSE":"§cNo",
 	"midnightlib.midnightconfig.enum.ConfigButton.MODMENU":"§bModMenu",
-	"midnightlib.midnightconfig.background_texture":"Texture of config screen backgrounds",
-	"midnightlib.midnightconfig.midnighthats_description":"§nMidnightHats",
-	"midnightlib.midnightconfig.special_hats":"Enable Supporter Hats",
 	"midnightlib.modrinth":"Modrinth",
 	"midnightlib.curseforge":"CurseForge",
 	"midnightlib.wiki":"Wiki",
-	"modmenu.descriptionTranslation.midnightlib": "Common Library for Team MidnightDust's mods.\nProvides a config api, automatic integration with other mods, common utils, and cosmetics.",
-	"modmenu.summaryTranslation.midnightlib": "Common Library for Team MidnightDust's mods."
+	"modmenu.descriptionTranslation.midnightlib": "Common Library for easy configuration.\nProvides a config api, automatic integration with other mods and common utils.",
+	"modmenu.summaryTranslation.midnightlib": "Common Library for easy configuration."
 }

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

@@ -0,0 +1,9 @@
+{
+	"midnightlib.overview.title":"Vue d'ensemble de MidnightConfig",
+	"midnightlib.midnightconfig.title":"Configuration de MidnightLib",
+	"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",
+	"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 et des utilitaires courants.",
+	"modmenu.summaryTranslation.midnightlib": "Bibliothèque commune pour les mods de la Team MidnightDust."
+}

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

@@ -1,17 +1,9 @@
 {
 	"midnightlib.overview.title":"Visão geral do MidnightConfig",
 	"midnightlib.midnightconfig.title":"Configuração MidnightLib",
-	"midnightlib.midnightconfig.midnightlib_description":"§nMidnightLib",
 	"midnightlib.midnightconfig.config_screen_list":"Ativar lista de telas de configuração",
 	"midnightlib.midnightconfig.enum.ConfigButton.TRUE":"§aVerdadeiro",
 	"midnightlib.midnightconfig.enum.ConfigButton.FALSE":"§cFalso",
-	"midnightlib.midnightconfig.enum.ConfigButton.MODMENU":"§bModMenu",
-	"midnightlib.midnightconfig.background_texture":"Textura dos fundos da tela de configuração",
-	"midnightlib.midnightconfig.midnighthats_description":"§nMidnightHats",
-	"midnightlib.midnightconfig.special_hats":"Ativar chapéus de torcedor",
-	"midnightlib.modrinth":"Modrinth",
-	"midnightlib.curseforge":"CurseForge",
-	"midnightlib.wiki":"Wiki",
-	"modmenu.descriptionTranslation.midnightlib": "Biblioteca comum para mods do Team MidnightDust.\nFornece uma API de configuração, integração automática com outros mods, utilitários comuns e cosméticos.",
+	"modmenu.descriptionTranslation.midnightlib": "Biblioteca comum para mods do Team MidnightDust.\nFornece uma API de configuração, integração automática com outros mods e utilitários comuns.",
 	"modmenu.summaryTranslation.midnightlib": "Biblioteca comum para mods do Team MidnightDust."
 }

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

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

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

@@ -1,16 +1,7 @@
 {
 	"midnightlib.overview.title":"Огляд MidnightConfig",
 	"midnightlib.midnightconfig.title":"Конфігурація MidnightLib",
-	"midnightlib.midnightconfig.midnightlib_description":"§nMidnightLib",
 	"midnightlib.midnightconfig.config_screen_list":"Увімкнути список екрана конфігурації",
-	"midnightlib.midnightconfig.enum.ConfigButton.TRUE":"§aTrue",
-	"midnightlib.midnightconfig.enum.ConfigButton.FALSE":"§cFalse",
-	"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."

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

@@ -0,0 +1,11 @@
+{
+	"midnightlib.overview.title":"MidnightConfig 概述",
+	"midnightlib.midnightconfig.title":"MidnightLib 设定",
+	"midnightlib.midnightconfig.config_screen_list":"启用设定画面列表",
+	"midnightlib.midnightconfig.enum.ConfigButton.TRUE":"§a是",
+	"midnightlib.midnightconfig.enum.ConfigButton.FALSE":"§c否",
+	"midnightlib.midnightconfig.enum.ConfigButton.MODMENU":"§b模組菜单",
+	"midnightlib.wiki":"维基",
+	"modmenu.descriptionTranslation.midnightlib": "MidnightDust 团队的常用库模组。 n提供设定 API、与其他模块自动整合、常用工具和美观。",
+	"modmenu.summaryTranslation.midnightlib": "MidnightDust 团队的常用库模组。"
+}

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

@@ -0,0 +1,11 @@
+{
+	"midnightlib.overview.title":"MidnightConfig 概述",
+	"midnightlib.midnightconfig.title":"MidnightLib 設定",
+	"midnightlib.midnightconfig.config_screen_list":"啟用設定畫面列表",
+	"midnightlib.midnightconfig.enum.ConfigButton.TRUE":"§a是",
+	"midnightlib.midnightconfig.enum.ConfigButton.FALSE":"§c否",
+	"midnightlib.midnightconfig.enum.ConfigButton.MODMENU":"§b模組選單",
+	"midnightlib.wiki":"維基",
+	"modmenu.descriptionTranslation.midnightlib": "MidnightDust 團隊的常用程式庫模組。\n提供設定 API、與其他模組自動整合、常用工具和美觀。",
+	"modmenu.summaryTranslation.midnightlib": "MidnightDust 團隊的常用程式庫模組。"
+}

common/src/main/resources/midnightlib.mixins.json

@@ -1,13 +1 @@
-{
-  "required": true,
-  "minVersion": "0.8",
-  "package": "eu.midnightdust.core.mixin",
-  "compatibilityLevel": "JAVA_17",
-  "client": [
-    "MixinOptionsScreen",
-    "MixinPlayerEntityRenderer"
-  ],
-  "injectors": {
-    "defaultRequire": 1
-  }
-}
+{"required": true,"minVersion": "0.8","package": "eu.midnightdust.core.mixin","compatibilityLevel": "JAVA_17","client": ["MixinOptionsScreen"],"injectors": {"defaultRequire": 1}}

fabric-like/build.gradle

@@ -11,9 +11,7 @@ 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 }
-}
+    compileOnly(project(path: ":common", configuration: "namedElements")) { transitive false }
+}

fabric-like/src/main/java/eu/midnightdust/lib/config/AutoModMenu.java

@@ -2,7 +2,7 @@ package eu.midnightdust.lib.config;
 
 import com.terraformersmc.modmenu.api.ConfigScreenFactory;
 import com.terraformersmc.modmenu.api.ModMenuApi;
-import eu.midnightdust.core.MidnightLibClient;
+import eu.midnightdust.core.MidnightLib;
 import eu.midnightdust.core.config.MidnightLibConfig;
 
 import java.util.HashMap;
@@ -19,7 +19,7 @@ public class AutoModMenu implements ModMenuApi {
     public Map<String, ConfigScreenFactory<?>> getProvidedConfigScreenFactories() {
         HashMap<String, ConfigScreenFactory<?>> map = new HashMap<>();
         MidnightConfig.configClass.forEach((modid, cClass) -> {
-            if (!MidnightLibClient.hiddenMods.contains(modid))
+            if (!MidnightLib.hiddenMods.contains(modid))
                 map.put(modid, parent -> MidnightConfig.getScreen(parent, modid));
             }
         );

fabric/build.gradle

@@ -1,5 +1,9 @@
 plugins {
-    id "com.github.johnrengelman.shadow" version "7.1.2"
+    id 'com.github.johnrengelman.shadow'
+    id "me.shedaniel.unified-publishing"
+}
+repositories {
+    maven { url "https://maven.terraformersmc.com/releases" }
 }
 
 architectury {
@@ -12,20 +16,20 @@ loom {
 
 configurations {
     common
-    shadowCommon // Don't use shadow from the shadow plugin because we don't want IDEA to index this.
+    shadowCommon // Don't use shadow from the shadow plugin since it *excludes* files.
     compileClasspath.extendsFrom common
     runtimeClasspath.extendsFrom common
     developmentFabric.extendsFrom common
+    archivesBaseName = rootProject.archives_base_name + "-fabric"
 }
 
 dependencies {
     modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
     modApi "net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_api_version}"
+    modCompileOnly ("com.terraformersmc:modmenu:${rootProject.mod_menu_version}")
 
     common(project(path: ":common", configuration: "namedElements")) { transitive false }
     shadowCommon(project(path: ":common", configuration: "transformProductionFabric")) { transitive false }
-    common(project(path: ":fabric-like", configuration: "namedElements")) { transitive false }
-    shadowCommon(project(path: ":fabric-like", configuration: "transformProductionFabric")) { transitive false }
 }
 
 processResources {
@@ -40,18 +44,12 @@ shadowJar {
     exclude "architectury.common.json"
 
     configurations = [project.configurations.shadowCommon]
-    classifier "dev-shadow"
+    archiveClassifier = "dev-shadow"
 }
 
 remapJar {
-    injectAccessWidener = true
     input.set shadowJar.archiveFile
     dependsOn shadowJar
-    classifier null
-}
-
-jar {
-    classifier "dev"
 }
 
 sourcesJar {
@@ -66,16 +64,38 @@ components.java {
     }
 }
 
-publishing {
-    publications {
-        mavenFabric(MavenPublication) {
-            artifactId = rootProject.archives_base_name + "-" + project.name
-            from components.java
+unifiedPublishing {
+    project {
+        displayName = "MidnightLib v$project.version - Fabric $project.minecraft_version"
+        releaseType = "$project.release_type"
+        changelog = releaseChangelog()
+        gameVersions = []
+        gameLoaders = ["fabric","quilt"]
+        mainPublication remapJar
+        relations {
+            depends {
+                curseforge = "fabric-api"
+                modrinth = "fabric-api"
+            }
+        }
+
+        var CURSEFORGE_TOKEN = project.findProperty("CURSEFORGE_TOKEN") ?: System.getenv("CURSEFORGE_TOKEN")
+        if (CURSEFORGE_TOKEN != null) {
+            curseforge {
+                token = CURSEFORGE_TOKEN
+                id = rootProject.curseforge_id
+                gameVersions.addAll "Java 21", project.minecraft_version
+            }
+        }
+
+        var MODRINTH_TOKEN = project.findProperty("MODRINTH_TOKEN") ?: System.getenv("MODRINTH_TOKEN")
+        if (MODRINTH_TOKEN != null) {
+            modrinth {
+                token = MODRINTH_TOKEN
+                id = rootProject.modrinth_id
+                version = "$project.version-$project.name"
+                gameVersions.addAll project.minecraft_version
+            }
         }
     }
-
-    // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
-    repositories {
-        // Add repositories to publish to here.
-    }
-}
+}

fabric/src/main/java/eu/midnightdust/fabric/core/MidnightLibClientFabric.java

@@ -1,19 +0,0 @@
-package eu.midnightdust.fabric.core;
-
-import eu.midnightdust.core.MidnightLibClient;
-import eu.midnightdust.hats.witch.WitchHatFeatureRenderer;
-import eu.midnightdust.lib.util.MidnightColorUtil;
-import net.fabricmc.api.ClientModInitializer;
-import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
-import net.fabricmc.fabric.api.client.rendering.v1.EntityModelLayerRegistry;
-
-public class MidnightLibClientFabric implements ClientModInitializer {
-    @Override
-    public void onInitializeClient() {
-        EntityModelLayerRegistry.registerModelLayer(WitchHatFeatureRenderer.WITCH_HAT_MODEL_LAYER, WitchHatFeatureRenderer::getTexturedModelData);
-        MidnightLibClient.onInitializeClient();
-        ClientTickEvents.END_CLIENT_TICK.register(
-                client -> MidnightColorUtil.tick()
-        );
-    }
-}

fabric/src/main/java/eu/midnightdust/fabric/core/MidnightLibFabric.java

@@ -0,0 +1,14 @@
+package eu.midnightdust.fabric.core;
+
+import eu.midnightdust.core.MidnightLib;
+import net.fabricmc.api.ClientModInitializer;
+import net.fabricmc.api.DedicatedServerModInitializer;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
+
+public class MidnightLibFabric implements ClientModInitializer, DedicatedServerModInitializer {
+    @Override @Environment(EnvType.CLIENT)
+    public void onInitializeClient() {MidnightLib.onInitializeClient();}
+    @Override @Environment(EnvType.SERVER)
+    public void onInitializeServer() {MidnightLib.onInitializeServer();}
+}

fabric/src/main/java/eu/midnightdust/fabric/core/MidnightLibServerFabric.java

@@ -1,11 +0,0 @@
-package eu.midnightdust.fabric.core;
-
-import eu.midnightdust.core.MidnightLibServer;
-import net.fabricmc.api.DedicatedServerModInitializer;
-
-public class MidnightLibServerFabric implements DedicatedServerModInitializer {
-    @Override
-    public void onInitializeServer() {
-        MidnightLibServer.onInitializeServer();
-    }
-}

fabric/src/main/java/eu/midnightdust/lib/config/AutoModMenu.java

@@ -0,0 +1,28 @@
+package eu.midnightdust.lib.config;
+
+import com.terraformersmc.modmenu.api.ConfigScreenFactory;
+import com.terraformersmc.modmenu.api.ModMenuApi;
+import eu.midnightdust.core.MidnightLib;
+import eu.midnightdust.core.config.MidnightLibConfig;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class AutoModMenu implements ModMenuApi {
+
+    @Override
+    public ConfigScreenFactory<?> getModConfigScreenFactory() {
+        return parent -> MidnightLibConfig.getScreen(parent,"midnightlib");
+    }
+
+    @Override
+    public Map<String, ConfigScreenFactory<?>> getProvidedConfigScreenFactories() {
+        HashMap<String, ConfigScreenFactory<?>> map = new HashMap<>();
+        MidnightConfig.configClass.forEach((modid, cClass) -> {
+            if (!MidnightLib.hiddenMods.contains(modid))
+                map.put(modid, parent -> MidnightConfig.getScreen(parent, modid));
+            }
+        );
+        return map;
+    }
+}

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

@@ -21,15 +21,19 @@
   "environment": "*",
   "entrypoints": {
     "client": [
-      "eu.midnightdust.fabric.core.MidnightLibClientFabric"
+      "eu.midnightdust.fabric.core.MidnightLibFabric"
     ],
     "server": [
-      "eu.midnightdust.fabric.core.MidnightLibServerFabric"
+      "eu.midnightdust.fabric.core.MidnightLibFabric"
     ],
     "modmenu": [
       "eu.midnightdust.lib.config.AutoModMenu"
     ]
   },
+  "depends": {
+    "fabric-resource-loader-v0": "*",
+    "minecraft": ">=1.20.4"
+  },
 
   "mixins": [
     "midnightlib.mixins.json"

forge/build.gradle

@@ -1,81 +0,0 @@
-plugins {
-    id "com.github.johnrengelman.shadow" version "7.1.2"
-}
-
-architectury {
-    platformSetupLoomIde()
-    forge()
-}
-
-loom {
-    forge {
-        mixinConfig  "midnightlib.mixins.json"
-    }
-}
-
-configurations {
-    common
-    shadowCommon // Don't use shadow from the shadow plugin because we don't want IDEA to index this.
-    compileClasspath.extendsFrom common
-    runtimeClasspath.extendsFrom common
-    developmentForge.extendsFrom common
-}
-
-dependencies {
-    forge "net.minecraftforge:forge:${rootProject.forge_version}"
-
-    common(project(path: ":common", configuration: "namedElements")) { transitive false }
-    shadowCommon(project(path: ":common", configuration: "transformProductionForge")) { transitive = false }
-}
-
-processResources {
-    inputs.property "version", project.version
-
-    filesMatching("META-INF/mods.toml") {
-        expand "version": project.version
-    }
-}
-
-shadowJar {
-    exclude "fabric.mod.json"
-    exclude "architectury.common.json"
-
-    configurations = [project.configurations.shadowCommon]
-    classifier "dev-shadow"
-}
-
-remapJar {
-    input.set shadowJar.archiveFile
-    dependsOn shadowJar
-    classifier null
-}
-
-jar {
-    classifier "dev"
-}
-
-sourcesJar {
-    def commonSources = project(":common").sourcesJar
-    dependsOn commonSources
-    from commonSources.archiveFile.map { zipTree(it) }
-}
-
-components.java {
-    withVariantsFromConfiguration(project.configurations.shadowRuntimeElements) {
-        skip()
-    }
-}
-
-publishing {
-    publications {
-        mavenForge(MavenPublication) {
-            artifactId = rootProject.archives_base_name + "-" + project.name
-            from components.java
-        }
-    }
-
-    // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
-    repositories {
-        // Add repositories to publish to here.
-    }
-}

forge/gradle.properties

@@ -1 +0,0 @@
-loom.platform=forge

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

@@ -1,25 +0,0 @@
-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;
-
-@Mod.EventBusSubscriber(modid = "midnightlib", bus = Mod.EventBusSubscriber.Bus.MOD, value = Dist.CLIENT)
-public class MidnightLibClientEvents {
-    @SubscribeEvent
-    public static void registerLayerDefinition(EntityRenderersEvent.RegisterLayerDefinitions event) {
-        event.registerLayerDefinition(WitchHatFeatureRenderer.WITCH_HAT_MODEL_LAYER, WitchHatFeatureRenderer::getTexturedModelData);
-    }
-    @SubscribeEvent
-    public void registerClientTick(TickEvent.ClientTickEvent event) {
-        MidnightColorUtil.tick();
-    }
-}

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

@@ -1,39 +0,0 @@
-package eu.midnightdust.forge;
-
-import eu.midnightdust.core.MidnightLibClient;
-import eu.midnightdust.core.MidnightLibServer;
-import eu.midnightdust.lib.config.MidnightConfig;
-import net.minecraftforge.api.distmarker.Dist;
-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;
-
-@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());
-        MinecraftForge.EVENT_BUS.register(new MidnightLibServerEvents());
-    }
-}

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

@@ -1,23 +0,0 @@
-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;
-
-@Mod.EventBusSubscriber(modid = "midnightlib", bus = Mod.EventBusSubscriber.Bus.MOD, value = Dist.DEDICATED_SERVER)
-public class MidnightLibServerEvents {
-    @SubscribeEvent
-    public void registerCommands(RegisterCommandsEvent event) {
-        for (LiteralArgumentBuilder<ServerCommandSource> command : AutoCommand.commands){
-            event.getDispatcher().register(command);
-        }
-    }
-}

forge/src/main/resources/pack.mcmeta

@@ -1,6 +0,0 @@
-{
-  "pack": {
-    "description": "MidnightLib",
-    "pack_format": 9
-  }
-}

gradle.properties

@@ -1,19 +1,22 @@
 org.gradle.jvmargs=-Xmx4096M
 
-minecraft_version=1.19.2
-enabled_platforms=quilt,fabric,forge
+minecraft_version=1.20.6
+yarn_mappings=1.20.6+build.1
+enabled_platforms=fabric,neoforge
 
 archives_base_name=midnightlib
-mod_version=1.0.0
+mod_version=1.5.5
 maven_group=eu.midnightdust
+release_type=release
+curseforge_id=488090
+modrinth_id=codAaoxh
 
-architectury_version=6.2.43
+fabric_loader_version=0.15.11
+fabric_api_version=0.97.8+1.20.6
 
-fabric_loader_version=0.14.9
-fabric_api_version=0.59.0+1.19.2
+neoforge_version=20.6.63-beta
+yarn_mappings_patch_neoforge_version = 1.20.5+build.3
 
-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.19.0-beta.18
+quilt_fabric_api_version=7.0.1+0.83.0-1.20
+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-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

neoforge/build.gradle

@@ -0,0 +1,104 @@
+plugins {
+    id 'com.github.johnrengelman.shadow'
+    id "me.shedaniel.unified-publishing"
+}
+
+repositories {
+    maven {
+        name = 'NeoForged'
+        url = 'https://maven.neoforged.net/releases'
+    }
+}
+
+
+architectury {
+    platformSetupLoomIde()
+    neoForge()
+}
+
+loom {
+    accessWidenerPath = project(":common").loom.accessWidenerPath
+}
+
+configurations {
+    common {
+        canBeResolved = true
+        canBeConsumed = false
+    }
+    compileClasspath.extendsFrom common
+    runtimeClasspath.extendsFrom common
+    developmentNeoForge.extendsFrom common
+
+    // Files in this configuration will be bundled into your mod using the Shadow plugin.
+    // Don't use the `shadow` configuration from the plugin itself as it's meant for excluding files.
+    shadowBundle {
+        canBeResolved = true
+        canBeConsumed = false
+    }
+}
+
+dependencies {
+    neoForge "net.neoforged:neoforge:$rootProject.neoforge_version"
+
+    common(project(path: ':common', configuration: 'namedElements')) { transitive false }
+    shadowBundle project(path: ':common', configuration: 'transformProductionNeoForge')
+}
+
+processResources {
+    inputs.property 'version', project.version
+
+    filesMatching('META-INF/neoforge.mods.toml') {
+        expand version: project.version
+    }
+}
+
+shadowJar {
+    configurations = [project.configurations.shadowBundle]
+    archiveClassifier = 'dev-shadow'
+}
+
+remapJar {
+    input.set shadowJar.archiveFile
+}
+
+sourcesJar {
+    def commonSources = project(":common").sourcesJar
+    dependsOn commonSources
+    from commonSources.archiveFile.map { zipTree(it) }
+}
+
+components.java {
+    withVariantsFromConfiguration(project.configurations.shadowRuntimeElements) {
+        skip()
+    }
+}
+
+unifiedPublishing {
+    project {
+        displayName = "MidnightLib v$project.version - NeoForge $project.minecraft_version"
+        releaseType = "$project.release_type"
+        changelog = releaseChangelog()
+        gameVersions = []
+        gameLoaders = ["neoforge"]
+        mainPublication remapJar
+
+        var CURSEFORGE_TOKEN = project.findProperty("CURSEFORGE_TOKEN") ?: System.getenv("CURSEFORGE_TOKEN")
+        if (CURSEFORGE_TOKEN != null) {
+            curseforge {
+                token = CURSEFORGE_TOKEN
+                id = rootProject.curseforge_id
+                gameVersions.addAll "Java 21", project.minecraft_version
+            }
+        }
+
+        var MODRINTH_TOKEN = project.findProperty("MODRINTH_TOKEN") ?: System.getenv("MODRINTH_TOKEN")
+        if (MODRINTH_TOKEN != null) {
+            modrinth {
+                token = MODRINTH_TOKEN
+                id = rootProject.modrinth_id
+                version = "$project.version-$project.name"
+                gameVersions.addAll project.minecraft_version
+            }
+        }
+    }
+}

neoforge/gradle.properties

@@ -0,0 +1 @@
+loom.platform=neoforge

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

@@ -1,11 +1,11 @@
-package eu.midnightdust.lib.util.forge;
+package eu.midnightdust.lib.util.neoforge;
 
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import eu.midnightdust.lib.util.PlatformFunctions;
 import net.minecraft.server.command.ServerCommandSource;
-import net.minecraftforge.fml.ModList;
-import net.minecraftforge.fml.loading.FMLEnvironment;
-import net.minecraftforge.fml.loading.FMLPaths;
+import net.neoforged.fml.ModList;
+import net.neoforged.fml.loading.FMLEnvironment;
+import net.neoforged.fml.loading.FMLPaths;
 
 import java.nio.file.Path;
 
@@ -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 MidnightLibNeoForge#registerCommands
     }
 }

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

@@ -0,0 +1,46 @@
+package eu.midnightdust.neoforge;
+
+import com.mojang.brigadier.builder.LiteralArgumentBuilder;
+import eu.midnightdust.core.MidnightLib;
+import eu.midnightdust.lib.config.AutoCommand;
+import eu.midnightdust.lib.config.MidnightConfig;
+import net.minecraft.server.command.ServerCommandSource;
+import net.neoforged.api.distmarker.Dist;
+import net.neoforged.bus.api.SubscribeEvent;
+import net.neoforged.fml.ModList;
+import net.neoforged.fml.common.EventBusSubscriber;
+import net.neoforged.fml.common.Mod;
+import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent;
+import net.neoforged.fml.loading.FMLEnvironment;
+import net.neoforged.neoforge.client.gui.IConfigScreenFactory;
+import net.neoforged.neoforge.event.RegisterCommandsEvent;
+
+@Mod("midnightlib")
+public class MidnightLibNeoForge {
+    public MidnightLibNeoForge() {
+        if (FMLEnvironment.dist == Dist.CLIENT) MidnightLib.onInitializeClient();
+        else MidnightLib.onInitializeServer();
+    }
+
+    @EventBusSubscriber(modid = "midnightlib", bus = EventBusSubscriber.Bus.MOD, value = Dist.CLIENT)
+    public static class MidnightLibBusEvents {
+        @SubscribeEvent
+        public static void onPostInit(FMLClientSetupEvent event) {
+            ModList.get().forEachModContainer((modid, modContainer) -> {
+                if (MidnightConfig.configClass.containsKey(modid)) {
+                    modContainer.registerExtensionPoint(IConfigScreenFactory.class, (minecraftClient, screen) -> MidnightConfig.getScreen(screen, modid));
+                }
+            });
+        }
+    }
+
+    @EventBusSubscriber(modid = "midnightlib", value = Dist.DEDICATED_SERVER)
+    public static class MidnightLibServerEvents {
+        @SubscribeEvent
+        public static void registerCommands(RegisterCommandsEvent event) {
+            for (LiteralArgumentBuilder<ServerCommandSource> command : AutoCommand.commands) {
+                event.getDispatcher().register(command);
+            }
+        }
+    }
+}

neoforge/src/main/resources/META-INF/neoforge.mods.toml

@@ -1,5 +1,5 @@
 modLoader = "javafml"
-loaderVersion = "[43,)"
+loaderVersion = "[2,)"
 #issueTrackerURL = ""
 license = "MIT License"
 
@@ -15,15 +15,15 @@ Common Library for Team MidnightDust's mods.
 #logoFile = ""
 
 [[dependencies.midnightlib]]
-modId = "forge"
+modId = "neoforge"
 mandatory = true
-versionRange = "[43,)"
+versionRange = "[20.5,)"
 ordering = "NONE"
 side = "BOTH"
 
 [[dependencies.midnightlib]]
 modId = "minecraft"
 mandatory = true
-versionRange = "[1.19.2,)"
+versionRange = "[1.20.5,)"
 ordering = "NONE"
 side = "BOTH"

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/java/eu/midnightdust/quilt/core/MidnightLibClientQuilt.java

@@ -1,9 +1,7 @@
 package eu.midnightdust.quilt.core;
 
 import eu.midnightdust.core.MidnightLibClient;
-import eu.midnightdust.hats.witch.WitchHatFeatureRenderer;
 import eu.midnightdust.lib.util.MidnightColorUtil;
-import net.fabricmc.fabric.api.client.rendering.v1.EntityModelLayerRegistry;
 import org.quiltmc.loader.api.ModContainer;
 import org.quiltmc.qsl.base.api.entrypoint.client.ClientModInitializer;
 import org.quiltmc.qsl.lifecycle.api.client.event.ClientTickEvents;
@@ -11,10 +9,6 @@ import org.quiltmc.qsl.lifecycle.api.client.event.ClientTickEvents;
 public class MidnightLibClientQuilt implements ClientModInitializer {
     @Override
     public void onInitializeClient(ModContainer mod) {
-        EntityModelLayerRegistry.registerModelLayer(WitchHatFeatureRenderer.WITCH_HAT_MODEL_LAYER, WitchHatFeatureRenderer::getTexturedModelData);
         MidnightLibClient.onInitializeClient();
-        ClientTickEvents.END.register(
-                client -> MidnightColorUtil.tick()
-        );
     }
 }

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

@@ -4,18 +4,7 @@
     "group": "${group}",
     "id": "midnightlib",
     "version": "${version}",
-    "name": "MidnightLib",
-    "description": "Common Library for Team MidnightDust's mods.",
-    "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",
-    "icon": "assets/midnightlib/icon.png",
     "intermediate_mappings": "net.fabricmc:intermediary",
-    "environment": "*",
     "entrypoints": {
       "client_init": [
         "eu.midnightdust.quilt.core.MidnightLibClientQuilt"
@@ -27,9 +16,6 @@
         "eu.midnightdust.lib.config.AutoModMenu"
       ]
     },
-    "mixin": [
-      "midnightlib.mixins.json"
-    ],
     "depends": [
       {
         "id": "quilt_loader",
@@ -38,19 +24,41 @@
       {
         "id": "quilt_base",
         "version": "*"
+      },
+      {
+        "id": "minecraft",
+        "version": ">=1.19.4"
       }
     ],
-    "custom": {
-      "modmenu": {
-        "links": {
-          "modmenu.discord": "https://discord.midnightdust.eu/",
-          "modmenu.website": "https://www.midnightdust.eu/",
-          "midnightlib.curseforge": "https://www.curseforge.com/minecraft/mc-mods/midnightlib",
-          "midnightlib.modrinth": "https://modrinth.com/mod/midnightlib",
-          "midnightlib.wiki": "https://github.com/TeamMidnightDust/MidnightLib/wiki"
-        },
-        "badges": [ "library" ]
-      }
+    "metadata": {
+      "name": "MidnightLib (Quilt)",
+      "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": {
+        "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/",
+      "modmenu.website": "https://www.midnightdust.eu/",
+      "midnightlib.curseforge": "https://www.curseforge.com/minecraft/mc-mods/midnightlib",
+      "midnightlib.modrinth": "https://modrinth.com/mod/midnightlib",
+      "midnightlib.wiki": "https://github.com/TeamMidnightDust/MidnightLib/wiki"
+    },
+    "badges": [ "library" ]
   }
 }

settings.gradle

@@ -2,7 +2,7 @@ pluginManagement {
     repositories {
         maven { url "https://maven.fabricmc.net/" }
         maven { url "https://maven.architectury.dev/" }
-        maven { url "https://maven.minecraftforge.net/" }
+        maven { url "https://maven.neoforged.net/releases" }
         gradlePluginPortal()
     }
 }
@@ -10,7 +10,7 @@ pluginManagement {
 include("common")
 include("fabric-like")
 include("fabric")
-include("quilt")
-include("forge")
+//include("quilt")
+include("neoforge")
 
 rootProject.name = "midnightlib"