Architectury 1.20.1 Backport

build.gradle

@@ -1,6 +1,11 @@
+import groovy.json.JsonSlurper
+import groovy.json.JsonOutput
+
 plugins {
     id "architectury-plugin" version "3.4-SNAPSHOT"
-    id "dev.architectury.loom" version "1.1-SNAPSHOT" apply false
+    id "dev.architectury.loom" version "1.10-SNAPSHOT" apply false
+    id "me.shedaniel.unified-publishing" version "0.1.+" apply false
+    id 'com.github.johnrengelman.shadow' version '8.1.1' apply false
 }
 
 architectury {
@@ -12,10 +17,10 @@ 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:${rootProject.yarn_mappings}:v2"
+        mappings loom.layered {
+            it.mappings("net.fabricmc:yarn:$rootProject.yarn_mappings:v2")
+        }
     }
 }
 
@@ -36,10 +41,33 @@ allprojects {
         // for more information about repositories.
     }
 
-    tasks.withType(JavaCompile) {
+    tasks.withType(JavaCompile).configureEach {
         options.encoding = "UTF-8"
         options.release = 17
     }
+    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()
+        }
+    }
+    processResources {
+        // Minify json resources
+        doLast {
+            fileTree(dir: outputs.files.asPath, include: "**/*.json").each {
+                File file -> file.text = JsonOutput.toJson(new JsonSlurper().parse(file))
+            }
+        }
+    }
 
     java {
         withSourcesJar()

common/build.gradle

@@ -2,13 +2,11 @@ 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 {

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

@@ -0,0 +1,39 @@
+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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.swing.UIManager;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.List;
+
+import static net.minecraft.client.MinecraftClient.IS_SYSTEM_MAC;
+
+public class MidnightLib {
+    public static List<String> hiddenMods = new ArrayList<>();
+    public static final String MOD_ID = "midnightlib";
+    public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID);
+
+    @Environment(EnvType.CLIENT)
+    public static void onInitializeClient() {
+        try { if (!IS_SYSTEM_MAC) {
+            System.setProperty("java.awt.headless", "false");
+            UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+        }} catch (Exception | Error e) { LOGGER.error("Error setting system look and feel", e); }
+        MidnightLibConfig.init(MOD_ID, MidnightLibConfig.class);
+    }
+    public static void registerAutoCommand() {
+        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))
+                    new AutoCommand(field, modid);
+            }
+        });
+    }
+}

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

@@ -3,11 +3,18 @@
 import eu.midnightdust.lib.config.MidnightConfig;
 import eu.midnightdust.lib.util.PlatformFunctions;
 
+import java.util.Objects;
+
 public class MidnightLibConfig extends MidnightConfig {
-    @Entry // Enable or disable the MidnightConfig overview screen button
-    public static ConfigButton config_screen_list = PlatformFunctions.isModLoaded("modmenu") ? ConfigButton.MODMENU : ConfigButton.TRUE;
+    public static final boolean HAS_MODMENU = PlatformFunctions.isModLoaded("modmenu") || Objects.equals(PlatformFunctions.getPlatformName(), "neoforge");
+
+    @Entry public static ConfigButton config_screen_list = HAS_MODMENU ? ConfigButton.MODMENU : ConfigButton.TRUE;
 
     public enum ConfigButton {
-        TRUE,FALSE,MODMENU
+        TRUE, FALSE, MODMENU
+    }
+
+    public static boolean shouldShowButton() {
+        return config_screen_list.equals(ConfigButton.TRUE) || (config_screen_list.equals(ConfigButton.MODMENU) && !HAS_MODMENU);
     }
 }

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

@@ -1,30 +1,49 @@
 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.gui.screen.Screen;
 import net.minecraft.client.gui.screen.option.OptionsScreen;
 import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
 import org.spongepowered.asm.mixin.Mixin;
+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;
 
 import java.util.Objects;
 
+import static eu.midnightdust.core.config.MidnightLibConfig.shouldShowButton;
+
 @Mixin(OptionsScreen.class)
 public class MixinOptionsScreen extends Screen {
-    private static final Identifier MIDNIGHTLIB_ICON_TEXTURE = new Identifier("midnightlib","textures/gui/midnightlib_button.png");
+
+    @Unique private static final Identifier MIDNIGHTLIB_ICON_TEXTURE = Identifier.of("midnightlib","icon/midnightlib.png");
+
+    @Unique
+    TexturedOverlayButtonWidget midnightlib$button = 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"));
+
     protected MixinOptionsScreen(Text title) {
         super(title);
     }
 
-    @Inject(at = @At("HEAD"),method = "init")
+    @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")));
+        if (shouldShowButton()){
+            midnightlib$button.setPosition(this.width / 2 + 158, this.height / 6 - 12);
+            this.addDrawableChild(midnightlib$button);
+        }
     }
+
 }