Fix #16 using the suggested fix

Thanks @MasterToster

.gitignore

@@ -1,25 +1,19 @@
-# gradle
-
-.gradle/
-out/
-classes/
 build/
-
-# idea
-
-.idea/
-*.iml
 *.ipr
+run/
 *.iws
-
-# vscode
-
-.settings/
-.vscode/
+out/
+*.iml
+.gradle/
+output/
 bin/
+libs/
+
 .classpath
 .project
-
-# fabric
-
-run/
+.idea/
+classes/
+.metadata
+.vscode
+.settings
+*.launch

build.gradle

@@ -1,82 +1,47 @@
 plugins {
-	id 'fabric-loom' version '0.11-SNAPSHOT'
-	id 'maven-publish'
+    id "architectury-plugin" version "3.4-SNAPSHOT"
+    id "dev.architectury.loom" version "1.0-SNAPSHOT" apply false
 }
 
-sourceCompatibility = JavaVersion.VERSION_17
-targetCompatibility = JavaVersion.VERSION_17
-
-archivesBaseName = project.archives_base_name
-version = project.mod_version
-group = project.maven_group
-
-repositories {
-	maven { url "https://maven.terraformersmc.com/releases" }
-	maven { url "https://jitpack.io" }
+architectury {
+    minecraft = rootProject.minecraft_version
 }
 
-dependencies {
-	//to change the versions see the gradle.properties file
-	minecraft "com.mojang:minecraft:${project.minecraft_version}"
-	mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
-	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
+subprojects {
+    apply plugin: "dev.architectury.loom"
 
-	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
-	
-	modImplementation ("com.terraformersmc:modmenu:${project.mod_menu_version}")
+    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"
+    }
 }
 
-processResources {
-	inputs.property "version", project.version
+allprojects {
+    apply plugin: "java"
+    apply plugin: "architectury-plugin"
+    apply plugin: "maven-publish"
 
-	filesMatching("fabric.mod.json") {
-		expand "version": project.version
-	}
-}
-
-tasks.withType(JavaCompile).configureEach {
-	// ensure that the encoding is set to UTF-8, no matter what the system default is
-	// this fixes some edge cases with special characters not displaying correctly
-	// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
-	// If Javadoc is generated, this must be specified in that task too.
-	it.options.encoding = "UTF-8"
-
-	// Minecraft 1.17 (21w19a) upwards uses Java 16.
-	it.options.release = 17
-}
-
-java {
-	// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
-	// if it is present.
-	// If you remove this line, sources will not be generated.
-	withSourcesJar()
-}
-
-jar {
-	from("LICENSE") {
-		rename { "${it}_${project.archivesBaseName}"}
-	}
-}
-
-// configure the maven publication
-publishing {
-	publications {
-		mavenJava(MavenPublication) {
-			// add all the jars that should be included when publishing to maven
-			artifact(remapJar) {
-				builtBy remapJar
-			}
-			artifact(sourcesJar) {
-				builtBy remapSourcesJar
-			}
-		}
-	}
-
-	// 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.
-		// Notice: This block does NOT have the same function as the block in the top level.
-		// The repositories here will be used for publishing your artifact, not for
-		// retrieving dependencies.
-	}
+    archivesBaseName = rootProject.archives_base_name
+    version = rootProject.mod_version
+    group = rootProject.maven_group
+
+    repositories {
+        // Add repositories to retrieve artifacts from in here.
+        // You should only use this when depending on other mods because
+        // Loom adds the essential maven repositories to download Minecraft and libraries from automatically.
+        // See https://docs.gradle.org/current/userguide/declaring_repositories.html
+        // for more information about repositories.
+    }
+
+    tasks.withType(JavaCompile) {
+        options.encoding = "UTF-8"
+        options.release = 17
+    }
+
+    java {
+        withSourcesJar()
+    }
 }

common/build.gradle

@@ -0,0 +1,26 @@
+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
+    modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
+}
+
+publishing {
+    publications {
+        mavenCommon(MavenPublication) {
+            artifactId = rootProject.archives_base_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.
+    }
+}

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

@@ -0,0 +1,21 @@
+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/MidnightLibServer.java

@@ -2,14 +2,12 @@ package eu.midnightdust.core;
 
 import eu.midnightdust.lib.config.AutoCommand;
 import eu.midnightdust.lib.config.MidnightConfig;
-import net.fabricmc.api.DedicatedServerModInitializer;
 
 import java.lang.reflect.Field;
 
-public class MidnightLibServer implements DedicatedServerModInitializer {
+public class MidnightLibServer {
 
-    @Override
-    public void onInitializeServer() {
+    public static void onInitializeServer() {
         MidnightConfig.configClass.forEach((modid, config) -> {
             for (Field field : config.getFields()) {
                 if (field.isAnnotationPresent(MidnightConfig.Entry.class) && !field.isAnnotationPresent(MidnightConfig.Client.class) && !field.isAnnotationPresent(MidnightConfig.Hidden.class))

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

@@ -1,12 +1,12 @@
 package eu.midnightdust.core.config;
 
 import eu.midnightdust.lib.config.MidnightConfig;
-import net.fabricmc.loader.api.FabricLoader;
+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
-    public static ConfigButton config_screen_list = FabricLoader.getInstance().isModLoaded("modmenu") ? ConfigButton.MODMENU : ConfigButton.TRUE;
+    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;

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

@@ -2,8 +2,8 @@ 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.fabricmc.loader.api.FabricLoader;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.screen.option.OptionsScreen;
 import net.minecraft.text.Text;
@@ -24,7 +24,7 @@ public class MixinOptionsScreen extends Screen {
 
     @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) && !FabricLoader.getInstance().isModLoaded("modmenu")))
+        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")));
     }
 }

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

@@ -11,7 +11,9 @@ import java.io.Reader;
 import java.lang.reflect.Type;
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.util.*;
+import java.util.Collections;
+import java.util.Map;
+import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 
 @SuppressWarnings("UnstableApiUsage")

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

@@ -7,7 +7,7 @@ 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;
+    private final ModelPart headwear;
 
     public WitchHatModel(ModelPart root) {
         headwear = root;
@@ -37,13 +37,13 @@ public class WitchHatModel<T extends LivingEntity> extends SinglePartEntityModel
         return modelData;
     }
 
-	@Override
-	public void setAngles(T entity, float limbAngle, float limbDistance, float animationProgress, float headYaw, float headPitch) {
-	}
+    @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 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
@@ -51,9 +51,9 @@ public class WitchHatModel<T extends LivingEntity> extends SinglePartEntityModel
         return headwear;
     }
 
-	public void setRotationAngle(ModelPart bone, float x, float y, float z) {
-		bone.pitch = x;
-		bone.yaw = y;
-		bone.roll = z;
+    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

@@ -4,15 +4,18 @@ import com.mojang.brigadier.arguments.DoubleArgumentType;
 import com.mojang.brigadier.arguments.IntegerArgumentType;
 import com.mojang.brigadier.arguments.StringArgumentType;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
-import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
+import eu.midnightdust.lib.util.PlatformFunctions;
 import net.minecraft.server.command.CommandManager;
 import net.minecraft.server.command.ServerCommandSource;
 import net.minecraft.text.Text;
 
 import java.lang.reflect.Field;
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.List;
 
 public class AutoCommand {
+    public static List<LiteralArgumentBuilder<ServerCommandSource>> commands = new ArrayList<>();
     private LiteralArgumentBuilder<ServerCommandSource> command;
     final Field entry;
     final String modid;
@@ -27,7 +30,7 @@ public class AutoCommand {
         command();
         LiteralArgumentBuilder<ServerCommandSource> finalized = CommandManager.literal("midnightconfig").requires(source -> source.hasPermissionLevel(2)).then(command);
 
-        CommandRegistrationCallback.EVENT.register((dispatcher, dedicated, registrationEnvironment) -> dispatcher.register(finalized));
+        PlatformFunctions.registerCommand(finalized); commands.add(finalized);
     }
 
     private void command() {
@@ -61,10 +64,10 @@ public class AutoCommand {
             }
         }
         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")))
-        ));
+            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")))
+            ));
     }
 
     private int setValue(ServerCommandSource source, Object value) {

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

@@ -4,19 +4,16 @@ import com.google.gson.ExclusionStrategy;
 import com.google.gson.FieldAttributes;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import eu.midnightdust.lib.util.PlatformFunctions;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
-import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.DrawableHelper;
 import net.minecraft.client.gui.Element;
 import net.minecraft.client.gui.Selectable;
 import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.widget.ButtonWidget;
-import net.minecraft.client.gui.widget.ClickableWidget;
-import net.minecraft.client.gui.widget.ElementListWidget;
-import net.minecraft.client.gui.widget.TextFieldWidget;
+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;
@@ -40,9 +37,9 @@ import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
 
-/** MidnightConfig v2.2.0 by TeamMidnightDust & Motschen
+/** MidnightConfig v2.3.0 by TeamMidnightDust & Motschen
  *  Single class config library - feel free to copy!
- *
+
  *  Based on https://github.com/Minenash/TinyConfig
  *  Credits to Minenash */
 
@@ -77,13 +74,13 @@ public abstract class MidnightConfig {
     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) {
-        path = FabricLoader.getInstance().getConfigDir().resolve(modid + ".json");
+        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 (FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT) initClient(modid, field, info);
+                if (PlatformFunctions.isClientEnv()) initClient(modid, field, info);
             if (field.isAnnotationPresent(Comment.class)) info.centered = field.getAnnotation(Comment.class).centered();
             if (field.isAnnotationPresent(Entry.class))
                 try {
@@ -146,7 +143,7 @@ public abstract class MidnightConfig {
             boolean inLimits = false;
             info.error = null;
             if (!(isNumber && s.isEmpty()) && !s.equals("-") && !s.equals(".")) {
-                value = f.apply(s);
+                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 ?
                         "§cMinimum " + (isNumber? "value" : "length") + (cast? " is " + (int)min : " is " + min) :
@@ -177,7 +174,7 @@ public abstract class MidnightConfig {
     }
 
     public static void write(String modid) {
-        path = FabricLoader.getInstance().getConfigDir().resolve(modid + ".json");
+        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());
@@ -260,7 +257,7 @@ public abstract class MidnightConfig {
             for (EntryInfo info : entries) {
                 if (info.id.equals(modid)) {
                     Text name = Objects.requireNonNullElseGet(info.name, () -> Text.translatable(translationPrefix + info.field.getName()));
-                    ButtonWidget resetButton = new ButtonWidget(width - 205, 0, 40, 20, Text.translatable("Reset").formatted(Formatting.RED), (button -> {
+                    ButtonWidget resetButton = new ButtonWidget(width - 205, 0, 40, 20, Text.literal("Reset").formatted(Formatting.RED), (button -> {
                         info.value = info.defaultValue;
                         info.tempValue = info.defaultValue.toString();
                         info.index = 0;
@@ -276,10 +273,9 @@ public abstract class MidnightConfig {
                         this.list.addButton(List.of(new ButtonWidget(width - 160, 0,150, 20, widget.getValue().apply(info.value), widget.getKey()),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, null);
+                        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))));
-                        else widget.setText("");
                         Predicate<String> processor = ((BiFunction<TextFieldWidget, ButtonWidget, Predicate<String>>) info.widget).apply(widget, done);
                         widget.setTextPredicate(processor);
                         resetButton.setWidth(20);
@@ -295,12 +291,17 @@ public abstract class MidnightConfig {
                         }));
                         this.list.addButton(List.of(widget, resetButton, cycleButton), name, info);
                     } else if (info.widget != null) {
-                        TextFieldWidget widget = new TextFieldWidget(textRenderer, width - 160, 0, 150, 20, null);
-                        widget.setMaxLength(info.width);
-                        widget.setText(info.tempValue);
-                        Predicate<String> processor = ((BiFunction<TextFieldWidget, ButtonWidget, Predicate<String>>) info.widget).apply(widget, done);
-                        widget.setTextPredicate(processor);
-                        if (info.field.getAnnotation(Entry.class).isColor()) {
+                        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 (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);
+                        }
+                        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 -> {}));
@@ -358,7 +359,7 @@ public abstract class MidnightConfig {
         public int getScrollbarPositionX() { return this.width -7; }
 
         public void addButton(List<ClickableWidget> buttons, Text text, EntryInfo info) {
-            this.addEntry(ButtonEntry.create(buttons, text, info));
+            this.addEntry(new ButtonEntry(buttons, text, info));
         }
         @Override
         public int getRowWidth() { return 10000; }
@@ -386,9 +387,6 @@ public abstract class MidnightConfig {
             this.info = info;
             children.addAll(buttons);
         }
-        public static ButtonEntry create(List<ClickableWidget> buttons, Text text, EntryInfo info) {
-            return new ButtonEntry(buttons, text, info);
-        }
         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); });
             if (text != null && (!text.getString().contains("spacer") || !buttons.isEmpty())) {
@@ -399,12 +397,35 @@ public abstract class MidnightConfig {
         public List<? extends Element> children() {return children;}
         public List<? extends Selectable> selectableChildren() {return children;}
     }
+    private 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);
+            this.e = info.field.getAnnotation(Entry.class);
+            this.info = info;
+        }
+
+        @Override
+        protected void updateMessage() {
+            this.setMessage(Text.of(info.tempValue));
+        }
+
+        @Override
+        protected void applyValue() {
+            if (info.field.getType() == int.class) info.value = ((Number) (e.min() + value * (e.max() - e.min()))).intValue();
+            else if (info.field.getType() == double.class) info.value = Math.round((e.min() + value * (e.max() - e.min())) * (double) e.precision()) / (double) e.precision();
+            else if (info.field.getType() == float.class) info.value = Math.round((e.min() + value * (e.max() - e.min())) * (float) e.precision()) / (float) e.precision();
+            info.tempValue = String.valueOf(info.value);
+        }
+    }
     @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) public @interface Entry {
         int width() default 100;
         double min() default Double.MIN_NORMAL;
         double max() default Double.MAX_VALUE;
         String name() default "";
         boolean isColor() default false;
+        boolean isSlider() default false;
+        int precision() default 100;
     }
     @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) public @interface Client {}
     @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) public @interface Server {}

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

@@ -0,0 +1,30 @@
+package eu.midnightdust.lib.util;
+
+import com.mojang.brigadier.builder.LiteralArgumentBuilder;
+import dev.architectury.injectables.annotations.ExpectPlatform;
+import net.minecraft.server.command.ServerCommandSource;
+
+import java.nio.file.Path;
+
+public class PlatformFunctions {
+    @ExpectPlatform
+    public static Path getConfigDirectory() {
+        // Just throw an error, the content should get replaced at runtime.
+        throw new AssertionError();
+    }
+    @ExpectPlatform
+    public static boolean isClientEnv() {
+        // Just throw an error, the content should get replaced at runtime.
+        throw new AssertionError();
+    }
+    @ExpectPlatform
+    public static boolean isModLoaded(String modid) {
+        // Just throw an error, the content should get replaced at runtime.
+        throw new AssertionError();
+    }
+    @ExpectPlatform
+    public static void registerCommand(LiteralArgumentBuilder<ServerCommandSource> command) {
+        // Just throw an error, the content should get replaced at runtime.
+        throw new AssertionError();
+    }
+}

common/src/main/resources/architectury.common.json

@@ -0,0 +1 @@
+{}

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

@@ -3,8 +3,8 @@
 	"midnightlib.midnightconfig.title":"MidnightLib Config",
 	"midnightlib.midnightconfig.midnightlib_description":"§nMidnightLib",
 	"midnightlib.midnightconfig.config_screen_list":"Enable Config Screen List",
-	"midnightlib.midnightconfig.enum.ConfigButton.TRUE":"§aTrue",
-	"midnightlib.midnightconfig.enum.ConfigButton.FALSE":"§cFalse",
+	"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",

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

@@ -0,0 +1,17 @@
+{
+	"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.summaryTranslation.midnightlib": "Biblioteca comum para mods do Team MidnightDust."
+}

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

@@ -1,7 +1,8 @@
 {
   "required": true,
+  "minVersion": "0.8",
   "package": "eu.midnightdust.core.mixin",
-  "compatibilityLevel": "JAVA_16",
+  "compatibilityLevel": "JAVA_17",
   "client": [
     "MixinOptionsScreen",
     "MixinPlayerEntityRenderer"

fabric-like/build.gradle

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

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

@@ -19,9 +19,9 @@ 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))
-                        map.put(modid, parent -> MidnightConfig.getScreen(parent, modid));
-                }
+            if (!MidnightLibClient.hiddenMods.contains(modid))
+                map.put(modid, parent -> MidnightConfig.getScreen(parent, modid));
+            }
         );
         return map;
     }

fabric/build.gradle

@@ -0,0 +1,81 @@
+plugins {
+    id "com.github.johnrengelman.shadow" version "7.1.2"
+}
+
+architectury {
+    platformSetupLoomIde()
+    fabric()
+}
+
+loom {
+}
+
+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
+    developmentFabric.extendsFrom common
+}
+
+dependencies {
+    modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
+    modApi "net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_api_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 {
+    inputs.property "version", project.version
+
+    filesMatching("fabric.mod.json") {
+        expand "version": project.version
+    }
+}
+
+shadowJar {
+    exclude "architectury.common.json"
+
+    configurations = [project.configurations.shadowCommon]
+    classifier "dev-shadow"
+}
+
+remapJar {
+    injectAccessWidener = true
+    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 {
+        mavenFabric(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.
+    }
+}

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

@@ -1,29 +1,17 @@
-package eu.midnightdust.core;
+package eu.midnightdust.fabric.core;
 
-import eu.midnightdust.core.config.MidnightLibConfig;
-import eu.midnightdust.hats.web.HatLoader;
+import eu.midnightdust.core.MidnightLibClient;
 import eu.midnightdust.hats.witch.WitchHatFeatureRenderer;
-import eu.midnightdust.lib.config.MidnightConfig;
 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;
 
-import java.util.ArrayList;
-import java.util.List;
-
-public class MidnightLibClient implements ClientModInitializer {
-    public static List<String> hiddenMods = new ArrayList<>();
-
-    public static final String MOD_ID = "midnightlib";
-
+public class MidnightLibClientFabric implements ClientModInitializer {
     @Override
     public void onInitializeClient() {
-        MidnightConfig.init("midnightlib", MidnightLibConfig.class);
-        hiddenMods.add("puzzle");
-
         EntityModelLayerRegistry.registerModelLayer(WitchHatFeatureRenderer.WITCH_HAT_MODEL_LAYER, WitchHatFeatureRenderer::getTexturedModelData);
-        if (MidnightLibConfig.special_hats) HatLoader.init();
+        MidnightLibClient.onInitializeClient();
         ClientTickEvents.END_CLIENT_TICK.register(
                 client -> MidnightColorUtil.tick()
         );

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

@@ -0,0 +1,11 @@
+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/util/fabric/PlatformFunctionsImpl.java

@@ -0,0 +1,28 @@
+package eu.midnightdust.lib.util.fabric;
+
+import com.mojang.brigadier.builder.LiteralArgumentBuilder;
+import eu.midnightdust.lib.util.PlatformFunctions;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
+import net.fabricmc.loader.api.FabricLoader;
+import net.minecraft.server.command.ServerCommandSource;
+
+import java.nio.file.Path;
+
+public class PlatformFunctionsImpl {
+    /**
+     * This is our actual method to {@link PlatformFunctions#getConfigDirectory()}.
+     */
+    public static Path getConfigDirectory() {
+        return FabricLoader.getInstance().getConfigDir();
+    }
+    public static boolean isClientEnv() {
+        return FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT;
+    }
+    public static boolean isModLoaded(String modid) {
+        return FabricLoader.getInstance().isModLoaded(modid);
+    }
+    public static void registerCommand(LiteralArgumentBuilder<ServerCommandSource> command) {
+        CommandRegistrationCallback.EVENT.register((dispatcher, dedicated, registrationEnvironment) -> dispatcher.register(command));
+    }
+}

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

@@ -21,10 +21,10 @@
   "environment": "*",
   "entrypoints": {
     "client": [
-      "eu.midnightdust.core.MidnightLibClient"
+      "eu.midnightdust.fabric.core.MidnightLibClientFabric"
     ],
     "server": [
-      "eu.midnightdust.core.MidnightLibServer"
+      "eu.midnightdust.fabric.core.MidnightLibServerFabric"
     ],
     "modmenu": [
       "eu.midnightdust.lib.config.AutoModMenu"

forge/build.gradle

@@ -0,0 +1,81 @@
+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

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

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

@@ -0,0 +1,25 @@
+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

@@ -0,0 +1,39 @@
+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

@@ -0,0 +1,23 @@
+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/java/eu/midnightdust/lib/util/forge/PlatformFunctionsImpl.java

@@ -0,0 +1,28 @@
+package eu.midnightdust.lib.util.forge;
+
+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 java.nio.file.Path;
+
+public class PlatformFunctionsImpl {
+    /**
+     * This is our actual method to {@link PlatformFunctions#getConfigDirectory()}.
+     */
+    public static Path getConfigDirectory() {
+        return FMLPaths.CONFIGDIR.get();
+    }
+    public static boolean isClientEnv() {
+        return FMLEnvironment.dist.isClient();
+    }
+    public static boolean isModLoaded(String modid) {
+        return ModList.get().isLoaded(modid);
+    }
+    public static void registerCommand(LiteralArgumentBuilder<ServerCommandSource> command) {
+        // Ignored here, see MidnightLibEvents#registerCommands
+    }
+}

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

@@ -0,0 +1,29 @@
+modLoader = "javafml"
+loaderVersion = "[43,)"
+#issueTrackerURL = ""
+license = "MIT License"
+
+[[mods]]
+modId = "midnightlib"
+version = "${version}"
+displayName = "MidnightLib"
+logoFile = "midnightlib.png"
+authors = "TeamMidnightDust, Motschen"
+description = '''
+Common Library for Team MidnightDust's mods.
+'''
+#logoFile = ""
+
+[[dependencies.midnightlib]]
+modId = "forge"
+mandatory = true
+versionRange = "[43,)"
+ordering = "NONE"
+side = "BOTH"
+
+[[dependencies.midnightlib]]
+modId = "minecraft"
+mandatory = true
+versionRange = "[1.19.2,)"
+ordering = "NONE"
+side = "BOTH"

forge/src/main/resources/pack.mcmeta

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

gradle.properties

@@ -1,18 +1,19 @@
-# Done to increase the memory available to gradle.
-org.gradle.jvmargs=-Xmx1G
+org.gradle.jvmargs=-Xmx4096M
 
-# Fabric Properties
-	# check these on https://fabricmc.net/use
-	minecraft_version=1.19-rc2
-	yarn_mappings=1.19-rc2+build.1
-	loader_version=0.14.6
+minecraft_version=1.19.2
+enabled_platforms=quilt,fabric,forge
 
-# Mod Properties
-	mod_version = 0.6.1
-	maven_group = eu.midnightdust
-	archives_base_name = midnightlib
+archives_base_name=midnightlib
+mod_version=1.0.0
+maven_group=eu.midnightdust
 
-# Dependencies
-	# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
-	fabric_version=0.55.1+1.19
-	mod_menu_version = 4.0.0-beta.4
+architectury_version=6.2.43
+
+fabric_loader_version=0.14.9
+fabric_api_version=0.59.0+1.19.2
+
+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

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -205,6 +205,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew.bat

@@ -1,89 +1,91 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

quilt/build.gradle

@@ -0,0 +1,88 @@
+plugins {
+    id "com.github.johnrengelman.shadow" version "7.1.2"
+}
+
+repositories {
+    maven { url "https://maven.quiltmc.org/repository/release/" }
+}
+
+architectury {
+    platformSetupLoomIde()
+    loader("quilt")
+}
+
+loom {
+}
+
+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
+    developmentQuilt.extendsFrom common
+}
+
+dependencies {
+    modImplementation "org.quiltmc:quilt-loader:${rootProject.quilt_loader_version}"
+    modApi "org.quiltmc.quilted-fabric-api:quilted-fabric-api:${rootProject.quilt_fabric_api_version}"
+    // Remove the next few lines if you don't want to depend on the API
+
+    common(project(path: ":common", configuration: "namedElements")) { transitive false }
+    shadowCommon(project(path: ":common", configuration: "transformProductionQuilt")) { transitive false }
+    common(project(path: ":fabric-like", configuration: "namedElements")) { transitive false }
+    shadowCommon(project(path: ":fabric-like", configuration: "transformProductionQuilt")) { transitive false }
+}
+
+processResources {
+    inputs.property "group", rootProject.maven_group
+    inputs.property "version", project.version
+
+    filesMatching("quilt.mod.json") {
+        expand "group": rootProject.maven_group,
+                "version": project.version
+    }
+}
+
+shadowJar {
+    exclude "architectury.common.json"
+
+    configurations = [project.configurations.shadowCommon]
+    classifier "dev-shadow"
+}
+
+remapJar {
+    injectAccessWidener = true
+    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 {
+        mavenQuilt(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.
+    }
+}

quilt/gradle.properties

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

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

@@ -0,0 +1,29 @@
+package eu.midnightdust.lib.util.fabric;
+
+import com.mojang.brigadier.builder.LiteralArgumentBuilder;
+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.qsl.command.api.CommandRegistrationCallback;
+
+import java.nio.file.Path;
+
+public class PlatformFunctionsImpl {
+    /**
+     * This is our actual method to {@link PlatformFunctions#getConfigDirectory()}.
+     */
+    public static Path getConfigDirectory() {
+        return QuiltLoader.getConfigDir();
+    }
+    public static boolean isClientEnv() {
+        return QuiltLoaderImpl.INSTANCE.getEnvironmentType() == EnvType.CLIENT;
+    }
+    public static boolean isModLoaded(String modid) {
+        return QuiltLoader.isModLoaded(modid);
+    }
+    public static void registerCommand(LiteralArgumentBuilder<ServerCommandSource> command) {
+        CommandRegistrationCallback.EVENT.register((dispatcher, dedicated, registrationEnvironment) -> dispatcher.register(command));
+    }
+}

quilt/src/main/java/eu/midnightdust/quilt/core/MidnightLibClientQuilt.java

@@ -0,0 +1,20 @@
+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;
+
+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/java/eu/midnightdust/quilt/core/MidnightLibServerQuilt.java

@@ -0,0 +1,12 @@
+package eu.midnightdust.quilt.core;
+
+import eu.midnightdust.core.MidnightLibServer;
+import org.quiltmc.loader.api.ModContainer;
+import org.quiltmc.qsl.base.api.entrypoint.server.DedicatedServerModInitializer;
+
+public class MidnightLibServerQuilt implements DedicatedServerModInitializer {
+    @Override
+    public void onInitializeServer(ModContainer mod) {
+        MidnightLibServer.onInitializeServer();
+    }
+}

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

@@ -0,0 +1,56 @@
+{
+  "schema_version": 1,
+  "quilt_loader": {
+    "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"
+      ],
+      "server_init": [
+        "eu.midnightdust.quilt.core.MidnightLibServerQuilt"
+      ],
+      "modmenu": [
+        "eu.midnightdust.lib.config.AutoModMenu"
+      ]
+    },
+    "mixin": [
+      "midnightlib.mixins.json"
+    ],
+    "depends": [
+      {
+        "id": "quilt_loader",
+        "version": "*"
+      },
+      {
+        "id": "quilt_base",
+        "version": "*"
+      }
+    ],
+    "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" ]
+      }
+    }
+  }
+}

settings.gradle

@@ -1,10 +1,16 @@
 pluginManagement {
     repositories {
-        jcenter()
-        maven {
-            name = 'Fabric'
-            url = 'https://maven.fabricmc.net/'
-        }
+        maven { url "https://maven.fabricmc.net/" }
+        maven { url "https://maven.architectury.dev/" }
+        maven { url "https://maven.minecraftforge.net/" }
         gradlePluginPortal()
     }
 }
+
+include("common")
+include("fabric-like")
+include("fabric")
+include("quilt")
+include("forge")
+
+rootProject.name = "midnightlib"

src/main/java/eu/midnightdust/lib/config/MidnightConfigExample.java

@@ -1,59 +0,0 @@
-package eu.midnightdust.lib.config;
-
-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 public static Comment text1;                       // Comments are rendered like an option without a button and are excluded from the config file
-    @Entry public static int fabric = 16777215;                 // Example for a int option
-    @Entry public static double world = 1.4D;                   // Example for a double option
-    @Entry public static boolean showInfo = true;               // Example for a boolean option
-    @Entry public static String name = "Hello World!";                    // Example for a string option
-    @Entry public static TestEnum testEnum = TestEnum.FABRIC;   // Example for a enum option
-    public enum TestEnum {                               // Enums allow the user to cycle through predefined options
-        QUILT, FABRIC
-    }
-    @Entry(min=69,max=420) public static int hello = 420;   // - The entered number has to be larger than 69 and smaller than 420
-    @Entry(width = 7, min = 7, isColor = true, name = "I am a color!") public static String titleColor = "#ffffff"; // The isColor property adds a preview box for a hexadecimal color
-    @Entry(name = "I am an array list!") public static List<String> arrayList = List.of("String1", "String2"); // Array String Lists are also supported
-    // 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.name":"I am a string!",             // Translation for the field "name" defined in the example config
-
-	    "modid.midnightconfig.name.tooltip":"uwu \n I 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.FABRIC":"Fancy",
-	    "modid.midnightconfig.enum.TestEnum.QUILT":"Fabulous"
-    }
-    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");"
-
-    The code in your ModMenu integration class would look something like this:
-    @Override
-    public ConfigScreenFactory<?> getModConfigScreenFactory() {
-        return parent -> MidnightConfig.getScreen(parent, "modid");
-    }
-    */
-}