Migrate 1.21.1 to MDG + unified source folder

annotation-processor/build.gradle

@@ -1,7 +1,6 @@
 plugins {
-    id 'com.github.johnrengelman.shadow'
+    id 'com.gradleup.shadow' version '8.3.9'
     id 'java-library'
-    id 'com.diffplug.spotless'
 }
 
 repositories {
@@ -52,9 +51,4 @@ shadowJar {
     include {it.getName() == 'EnvType.class'}
 }
 
-spotless {
-    java {
-        removeUnusedImports()
-    }
-}
 version = '1.1.4'

annotations/build.gradle

@@ -1,6 +0,0 @@
-plugins {
-    id 'modernfix.common-conventions'
-    id 'java-library'
-}
-
-version = '1.1.0'

annotations/build.gradle.kts

@@ -0,0 +1,10 @@
+plugins {
+    id("java")
+}
+
+version = "1.1.0"
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}

build.gradle.kts

@@ -0,0 +1,201 @@
+plugins {
+    id("net.neoforged.moddev") version("2.0.134")
+    id("org.ajoberstar.grgit") version("5.2.0")
+    id("com.palantir.git-version") version("1.0.0")
+}
+
+val minecraft_version = rootProject.properties["minecraft_version"].toString()
+
+group = "org.embeddedt"
+
+val versionDetails: groovy.lang.Closure<com.palantir.gradle.gitversion.VersionDetails> by extra
+// extract base version from tag, generate other metadata ourselves
+val details = versionDetails()
+
+var plusIndex = details.lastTag.indexOf("+")
+if (plusIndex == -1) {
+    plusIndex = details.lastTag.length
+}
+
+var baseVersion = details.lastTag.substring(0, plusIndex)
+
+val dirtyMarker = if (grgit.status().isClean) "" else ".dirty"
+
+val commitHashMarker =
+    if (details.commitDistance > 0)
+        "." + details.gitHash.substring(0, minOf(4, details.gitHash.length))
+    else
+        ""
+
+var preMarker =
+    if (details.commitDistance > 0 || !details.isCleanTag)
+        "-beta.${details.commitDistance}"
+    else
+        ""
+
+if (preMarker.isNotEmpty()) {
+    // bump to next patch release
+    val versionParts = baseVersion.split(".")
+    baseVersion =
+        "${versionParts[0]}.${versionParts[1]}.${versionParts[2].toInt() + 1}"
+}
+
+val versionString =
+    "${baseVersion}${preMarker}+mc${minecraft_version}${commitHashMarker}${dirtyMarker}"
+
+version = versionString
+
+base.archivesName = "modernfix-forge"
+
+neoForge {
+    enable {
+        version = rootProject.properties["forge_version"].toString()
+        isDisableRecompilation = System.getenv("CI") == "true"
+    }
+
+    rootProject.properties["parchment_version"]?.let { parchmentVer ->
+        parchment {
+            minecraftVersion = minecraft_version
+            mappingsVersion = parchmentVer.toString()
+        }
+    }
+
+    runs {
+        create("client") {
+            client()
+        }
+        create("server") {
+            server()
+        }
+    }
+
+    mods {
+        create("modernfix") {
+            sourceSet(sourceSets.main.get())
+        }
+    }
+}
+
+tasks.named<Jar>("jar") {
+    manifest.attributes(mapOf(
+        "Specification-Version" to "1",
+        "Implementation-Title" to project.name,
+        "Implementation-Version" to version
+    ))
+}
+
+// We must force the Java 21 compiler to be used because our AP requires Java 21
+
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(21)
+    }
+    val curSourceCompatLevel = JavaVersion.VERSION_21
+    sourceCompatibility = curSourceCompatLevel
+    targetCompatibility = curSourceCompatLevel
+}
+
+repositories {
+    exclusiveContent {
+        forRepository {
+            maven {
+                // location of the maven that hosts JEI files
+                name = "Progwml6 maven"
+                url = uri("https://dvs1.progwml6.com/files/maven/")
+            }
+        }
+        forRepository {
+            maven {
+                name = "ModMaven"
+                url = uri("https://modmaven.dev")
+            }
+        }
+        filter {
+            includeGroup("mezz.jei")
+        }
+    }
+    exclusiveContent {
+        forRepository {
+            maven("https://cursemaven.com")
+        }
+        filter {
+            includeGroup("curse.maven")
+        }
+    }
+}
+
+val embed by configurations.creating {
+    isCanBeConsumed = false
+    isCanBeResolved = true
+    isTransitive = true
+}
+
+dependencies {
+    implementation(project(":annotations"))
+    embed(project(":annotations"))
+    "additionalRuntimeClasspath"(project(":annotations"))
+    annotationProcessor(project(path = ":annotation-processor", configuration = "shadow"))
+
+    val jei_version = rootProject.properties["jei_version"].toString()
+    compileOnly("mezz.jei:jei-${minecraft_version}-neoforge:${jei_version}")
+    compileOnly("curse.maven:spark-361579:${rootProject.properties["spark_version"].toString()}")
+    compileOnly("curse.maven:ctm-267602:${rootProject.properties["ctm_version"].toString()}")
+    compileOnly("curse.maven:ldlib-626676:${rootProject.properties["ldlib_version"].toString()}")
+    compileOnly("curse.maven:supermartijncore-454372:4455391")
+    compileOnly("curse.maven:patchouli-306770:6164575")
+    compileOnly("curse.maven:cofhcore-69162:5374122")
+    compileOnly("curse.maven:resourcefullib-570073:5659871")
+    compileOnly("curse.maven:kubejs-238086:5853326")
+}
+
+tasks.named<Jar>("jar") {
+    from(embed.map { if (it.isDirectory) it else zipTree(it) })
+}
+
+// For the AP
+tasks.withType<JavaCompile>().configureEach {
+    if (!name.lowercase().contains("test")) {
+        options.compilerArgs.addAll(
+            listOf(
+                "-ArootProject.name=${rootProject.name}",
+                "-Aproject.name=${project.name}"
+            )
+        )
+    }
+}
+
+sourceSets {
+    main {
+        resources.srcDir(
+            layout.buildDirectory.dir("generated/sources/annotationProcessor/java/main/resources")
+        )
+    }
+}
+
+tasks.named<ProcessResources>("processResources") {
+    dependsOn(tasks.named("compileJava"))
+
+    inputs.property("version", project.version)
+
+    filesMatching("META-INF/neoforge.mods.toml") {
+        expand("version" to project.version)
+    }
+}
+
+val finalJarTask = "jar"
+
+tasks.register<Copy>("copyJarNameConsistent") {
+    from(tasks.named<Jar>(finalJarTask).get().outputs.files)
+    into(project.file("build/libs"))
+    rename { _ -> "modernfix-" + project.name + "-latest.jar" }
+}
+
+tasks.register<Copy>("copyJarToBin") {
+    from(tasks.named<Jar>(finalJarTask).get().outputs.files)
+    into(rootProject.file("bin"))
+    mustRunAfter(tasks.named("copyJarNameConsistent"))
+}
+
+tasks.named("build") {
+    dependsOn("copyJarToBin", "copyJarNameConsistent")
+}

common/src/main/java/org/embeddedt/modernfix/common/mixin/core/MinecraftServerMixin.java

@@ -1,24 +0,0 @@
-package org.embeddedt.modernfix.common.mixin.core;
-
-import net.minecraft.Util;
-import net.minecraft.server.MinecraftServer;
-import org.embeddedt.modernfix.duck.ITimeTrackingServer;
-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(MinecraftServer.class)
-public class MinecraftServerMixin implements ITimeTrackingServer {
-    private long mfix$lastTickStartTime = -1L;
-
-    @Override
-    public long mfix$getLastTickStartTime() {
-        return mfix$lastTickStartTime;
-    }
-
-    @Inject(method = "runServer", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/MinecraftServer;tickServer(Ljava/util/function/BooleanSupplier;)V"))
-    private void trackTickTime(CallbackInfo ci) {
-        mfix$lastTickStartTime = Util.getMillis();
-    }
-}

common/src/main/resources/modernfix.accesswidener

@@ -1,66 +0,0 @@
-accessWidener   v2  named
-
-accessible field net/minecraft/client/multiplayer/ClientChunkCache storage Lnet/minecraft/client/multiplayer/ClientChunkCache$Storage;
-accessible field net/minecraft/client/multiplayer/ClientChunkCache lightEngine Lnet/minecraft/world/level/lighting/LevelLightEngine;
-mutable field net/minecraft/client/multiplayer/ClientChunkCache lightEngine Lnet/minecraft/world/level/lighting/LevelLightEngine;
-accessible class net/minecraft/client/multiplayer/ClientChunkCache$Storage
-accessible field net/minecraft/client/multiplayer/ClientChunkCache$Storage chunks Ljava/util/concurrent/atomic/AtomicReferenceArray;
-
-accessible field net/minecraft/world/level/Level blockEntityTickers Ljava/util/List;
-
-accessible class net/minecraft/client/renderer/RenderType$CompositeRenderType
-accessible method net/minecraft/nbt/CompoundTag <init> (Ljava/util/Map;)V
-
-accessible class net/minecraft/world/level/levelgen/SurfaceRules$Condition
-accessible class net/minecraft/world/level/levelgen/SurfaceRules$LazyCondition
-accessible class net/minecraft/world/level/levelgen/SurfaceRules$SequenceRule
-accessible class net/minecraft/world/level/levelgen/SurfaceRules$SurfaceRule
-accessible class net/minecraft/world/level/levelgen/SurfaceRules$Context
-accessible class net/minecraft/world/level/levelgen/DensityFunctions$Marker
-accessible class net/minecraft/world/level/levelgen/DensityFunctions$Marker$Type
-accessible method net/minecraft/world/level/levelgen/DensityFunctions$Marker <init> (Lnet/minecraft/world/level/levelgen/DensityFunctions$Marker$Type;Lnet/minecraft/world/level/levelgen/DensityFunction;)V
-accessible class net/minecraft/world/level/levelgen/DensityFunctions$Mapped
-accessible class net/minecraft/world/level/levelgen/DensityFunctions$Mapped$Type
-accessible method net/minecraft/world/level/levelgen/DensityFunctions$Mapped <init> (Lnet/minecraft/world/level/levelgen/DensityFunctions$Mapped$Type;Lnet/minecraft/world/level/levelgen/DensityFunction;DD)V
-accessible class net/minecraft/world/level/levelgen/DensityFunctions$MulOrAdd
-accessible class net/minecraft/world/level/levelgen/DensityFunctions$MulOrAdd$Type
-accessible method net/minecraft/world/level/levelgen/DensityFunctions$MulOrAdd <init> (Lnet/minecraft/world/level/levelgen/DensityFunctions$MulOrAdd$Type;Lnet/minecraft/world/level/levelgen/DensityFunction;DDD)V
-
-accessible class net/minecraft/world/level/block/state/BlockBehaviour$BlockStateBase$Cache
-accessible class net/minecraft/server/level/ServerChunkCache$MainThreadExecutor
-accessible field net/minecraft/world/level/block/state/BlockBehaviour properties Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;
-accessible class net/minecraft/client/renderer/block/model/BlockElementFace$Deserializer
-accessible class net/minecraft/client/renderer/texture/Stitcher$Holder
-accessible field net/minecraft/client/renderer/texture/Stitcher$Holder width I
-accessible field net/minecraft/client/renderer/texture/Stitcher$Holder height I
-accessible field net/minecraft/network/syncher/EntityDataAccessor id I
-mutable field net/minecraft/network/syncher/EntityDataAccessor id I
-accessible method net/minecraft/Util makeExecutor (Ljava/lang/String;)Ljava/util/concurrent/ExecutorService;
-accessible field net/minecraft/server/level/ChunkMap updatingChunkMap Lit/unimi/dsi/fastutil/longs/Long2ObjectLinkedOpenHashMap;
-accessible field net/minecraft/server/level/ChunkMap visibleChunkMap Lit/unimi/dsi/fastutil/longs/Long2ObjectLinkedOpenHashMap;
-accessible field net/minecraft/server/level/ChunkMap pendingUnloads Lit/unimi/dsi/fastutil/longs/Long2ObjectLinkedOpenHashMap;
-accessible method net/minecraft/resources/ResourceKey <init> (Lnet/minecraft/resources/ResourceLocation;Lnet/minecraft/resources/ResourceLocation;)V
-accessible field net/minecraft/client/renderer/block/model/BlockModel GSON Lcom/google/gson/Gson;
-accessible class net/minecraft/server/level/ChunkMap$DistanceManager
-accessible class net/minecraft/client/resources/model/ModelBakery$BakedCacheKey
-accessible method net/minecraft/client/resources/model/ModelBakery$BakedCacheKey <init> (Lnet/minecraft/resources/ResourceLocation;Lcom/mojang/math/Transformation;Z)V
-accessible class net/minecraft/client/resources/model/ModelBakery$ModelBakerImpl
-accessible method net/minecraft/client/resources/model/ModelBakery$ModelBakerImpl <init> (Lnet/minecraft/client/resources/model/ModelBakery;Lnet/minecraft/client/resources/model/ModelBakery$TextureGetter;Lnet/minecraft/client/resources/model/ModelResourceLocation;)V
-accessible method net/minecraft/client/resources/model/ModelBakery getModel (Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/client/resources/model/UnbakedModel;
-accessible class net/minecraft/world/level/chunk/PalettedContainer$Data
-accessible field net/minecraft/server/MinecraftServer resources Lnet/minecraft/server/MinecraftServer$ReloadableResources;
-accessible class net/minecraft/server/MinecraftServer$ReloadableResources
-accessible method net/minecraft/client/gui/screens/Screen addRenderableWidget (Lnet/minecraft/client/gui/components/events/GuiEventListener;)Lnet/minecraft/client/gui/components/events/GuiEventListener;
-accessible field net/minecraft/client/KeyMapping ALL Ljava/util/Map;
-accessible field net/minecraft/client/renderer/block/model/multipart/MultiPart definition Lnet/minecraft/world/level/block/state/StateDefinition;
-accessible field net/minecraft/client/renderer/block/model/ItemOverrides$BakedOverride model Lnet/minecraft/client/resources/model/BakedModel;
-mutable field net/minecraft/client/renderer/block/model/ItemOverrides$BakedOverride model Lnet/minecraft/client/resources/model/BakedModel;
-accessible field net/minecraft/client/renderer/entity/EnderDragonRenderer$DragonModel entity Lnet/minecraft/world/entity/boss/enderdragon/EnderDragon;
-accessible method net/minecraft/world/level/block/state/StateDefinition appendPropertyCodec (Lcom/mojang/serialization/MapCodec;Ljava/util/function/Supplier;Ljava/lang/String;Lnet/minecraft/world/level/block/state/properties/Property;)Lcom/mojang/serialization/MapCodec;
-accessible class net/minecraft/client/multiplayer/SessionSearchTrees$Key
-
-accessible field net/minecraft/server/packs/resources/ProfiledReloadInstance$State preparationNanos Ljava/util/concurrent/atomic/AtomicLong;
-accessible field net/minecraft/server/packs/resources/ProfiledReloadInstance$State reloadNanos Ljava/util/concurrent/atomic/AtomicLong;
-
-accessible class net/minecraft/world/item/crafting/Ingredient$Value
-accessible class net/minecraft/world/item/crafting/Ingredient$ItemValue

common/src/main/resources/pack.mcmeta

@@ -1,7 +0,0 @@
-{
-  "pack": {
-    "description": "modernfix resources",
-    "pack_format": 6,
-    "_comment": "A pack_format of 6 requires json lang files and some texture changes from 1.16.2. Note: we require v6 pack meta for all mods."
-  }
-}

gradle.properties

@@ -6,12 +6,12 @@ mixinextras_version=0.4.1
 
 mod_id=modernfix
 minecraft_version=1.21.1
-enabled_platforms=fabric,neoforge
+enabled_platforms=neoforge
 forge_version=21.1.111
-parchment_version=2024.07.07
-parchment_mc_version=1.21
+parchment_version=2024.11.17
+parchment_mc_version=1.21.1
 refined_storage_version=4392788
-jei_version=19.0.0.9
+jei_version=19.21.2.313
 rei_version=13.0.678
 ctm_version=5587515
 ldlib_version=5782845

neoforge/src/main/java/org/embeddedt/modernfix/neoforge/datagen/RuntimeDatagen.java

@@ -1,85 +0,0 @@
-package org.embeddedt.modernfix.neoforge.datagen;
-
-import net.minecraft.Util;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.components.Button;
-import net.minecraft.client.gui.screens.TitleScreen;
-import net.minecraft.core.HolderLookup;
-import net.minecraft.data.registries.VanillaRegistries;
-import net.minecraft.network.chat.Component;
-import net.minecraft.server.packs.PackResources;
-import net.minecraft.server.packs.PackType;
-import net.minecraft.server.packs.resources.MultiPackResourceManager;
-import net.neoforged.api.distmarker.Dist;
-import net.neoforged.bus.api.SubscribeEvent;
-import net.neoforged.fml.ModLoader;
-import net.neoforged.fml.common.EventBusSubscriber;
-import net.neoforged.fml.util.ObfuscationReflectionHelper;
-import net.neoforged.neoforge.client.event.ScreenEvent;
-import net.neoforged.neoforge.common.data.ExistingFileHelper;
-import net.neoforged.neoforge.data.event.GatherDataEvent;
-import net.neoforged.neoforge.data.loading.DatagenModLoader;
-import org.embeddedt.modernfix.ModernFix;
-
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.*;
-import java.util.concurrent.CompletableFuture;
-import java.util.stream.Collectors;
-
-@EventBusSubscriber(value = Dist.CLIENT)
-public class RuntimeDatagen {
-    private static final String RESOURCES_OUT_DIR = getPropertyOrBlank("modernfix.datagen.output");
-    private static final String RESOURCES_IN_DIR = getPropertyOrBlank("modernfix.datagen.existing");
-    private static final String MODS_LIST = getPropertyOrBlank("modernfix.datagen.mods");
-    private static final String EXISTING_MODS_LIST = getPropertyOrBlank("modernfix.datagen.existing_mods");
-    private static final boolean IS_FLAT = Boolean.getBoolean("modernfix.datagen.flat");
-
-    private static String getPropertyOrBlank(String name) {
-        String val = System.getProperty(name);
-        if(val == null || val.length() == 0)
-            return "";
-        else
-            return val;
-    }
-
-    public static boolean isDatagenAvailable() {
-        return RESOURCES_OUT_DIR.length() > 0;
-    }
-
-    public static void runRuntimeDatagen() {
-        ObfuscationReflectionHelper.setPrivateValue(DatagenModLoader.class, null, true, "runningDataGen");
-        Set<String> mods = new HashSet<>(Arrays.stream(MODS_LIST.split(",")).collect(Collectors.toSet()));
-        ModernFix.LOGGER.info("Beginning runtime datagen for " + mods.size() + " mods...");
-        Set<String> existingMods = new HashSet<>(Arrays.stream(EXISTING_MODS_LIST.split(",")).collect(Collectors.toSet()));
-        Set<Path> existingPacks = new HashSet<>(Arrays.stream(RESOURCES_IN_DIR.split(",")).map(Paths::get).collect(Collectors.toSet()));
-        Path path = Paths.get(RESOURCES_OUT_DIR);
-        CompletableFuture<HolderLookup.Provider> lookupProvider = CompletableFuture.supplyAsync(VanillaRegistries::createLookup, Util.backgroundExecutor());
-        GatherDataEvent.DataGeneratorConfig dataGeneratorConfig = new GatherDataEvent.DataGeneratorConfig(mods, path, Collections.emptyList(),
-                lookupProvider, true, true, true, true, true, mods.isEmpty() || IS_FLAT);
-        if (!mods.contains("forge")) {
-            //If we aren't generating data for forge, automatically add forge as an existing so mods can access forge's data
-            existingMods.add("forge");
-        }
-        ExistingFileHelper existingFileHelper = new ExistingFileHelper(existingPacks, existingMods, true, null, null);
-        /* Inject the client pack resources from us */
-        MultiPackResourceManager manager = ObfuscationReflectionHelper.getPrivateValue(ExistingFileHelper.class, existingFileHelper, "clientResources");
-        List<PackResources> oldPacks = new ArrayList<>(manager.listPacks().collect(Collectors.toList()));
-        oldPacks.add(Minecraft.getInstance().getVanillaPackResources());
-        ObfuscationReflectionHelper.setPrivateValue(ExistingFileHelper.class, existingFileHelper, new MultiPackResourceManager(PackType.CLIENT_RESOURCES, oldPacks), "clientResources");
-        ModLoader.runEventGenerator(mc->new GatherDataEvent(mc, dataGeneratorConfig.makeGenerator(p->dataGeneratorConfig.isFlat() ? p : p.resolve(mc.getModId()), dataGeneratorConfig.getMods().contains(mc.getModId())), dataGeneratorConfig, existingFileHelper));
-        dataGeneratorConfig.runAll();
-        ObfuscationReflectionHelper.setPrivateValue(DatagenModLoader.class, null, false, "runningDataGen");
-        ModernFix.LOGGER.info("Finished runtime datagen.");
-    }
-
-    @SubscribeEvent
-    public static void onInitTitleScreen(ScreenEvent.Init.Post event) {
-        if(isDatagenAvailable() && event.getScreen() instanceof TitleScreen) {
-            TitleScreen screen = (TitleScreen)event.getScreen();
-            screen.addRenderableWidget(Button.builder(Component.literal("DG"), (arg) -> {
-                runRuntimeDatagen();
-            }).pos(screen.width / 2 - 100 - 50, screen.height / 4 + 48).size(50, 20).build());
-        }
-    }
-}

neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/dynamic_resources/ModelBakerImplMixin.java

@@ -1,48 +0,0 @@
-package org.embeddedt.modernfix.neoforge.mixin.perf.dynamic_resources;
-
-import com.llamalad7.mixinextras.injector.wrapmethod.WrapMethod;
-import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
-import net.minecraft.client.renderer.texture.TextureAtlasSprite;
-import net.minecraft.client.resources.model.BakedModel;
-import net.minecraft.client.resources.model.Material;
-import net.minecraft.client.resources.model.ModelBakery;
-import net.minecraft.client.resources.model.ModelResourceLocation;
-import net.minecraft.client.resources.model.ModelState;
-import net.minecraft.client.resources.model.UnbakedModel;
-import net.minecraft.resources.ResourceLocation;
-import org.embeddedt.modernfix.annotation.ClientOnlyMixin;
-import org.embeddedt.modernfix.duck.IExtendedModelBakery;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Overwrite;
-import org.spongepowered.asm.mixin.Shadow;
-
-import java.util.function.Function;
-
-@Mixin(ModelBakery.ModelBakerImpl.class)
-@ClientOnlyMixin
-public class ModelBakerImplMixin {
-    @Shadow @Final private ModelBakery field_40571;
-
-    /**
-     * @author embeddedt
-     * @reason Handle dynamic model loading
-     */
-    @Overwrite(remap = false)
-    public UnbakedModel getTopLevelModel(ModelResourceLocation location) {
-        IExtendedModelBakery bakery = (IExtendedModelBakery)this.field_40571;
-        UnbakedModel model = bakery.mfix$loadUnbakedModelDynamic(location);
-        return model == bakery.mfix$getMissingModel() ? null : model;
-    }
-
-    @WrapMethod(method = "bake(Lnet/minecraft/resources/ResourceLocation;Lnet/minecraft/client/resources/model/ModelState;Ljava/util/function/Function;)Lnet/minecraft/client/resources/model/BakedModel;", remap = false)
-    private BakedModel mfix$lockWhenBaking(ResourceLocation location, ModelState transform, Function<Material, TextureAtlasSprite> textureGetter, Operation<BakedModel> original) {
-        var lock = ((IExtendedModelBakery)this.field_40571).mfix$getLock();
-        lock.lock();
-        try {
-            return original.call(location, transform, textureGetter);
-        } finally {
-            lock.unlock();
-        }
-    }
-}

settings.gradle

@@ -1,34 +0,0 @@
-pluginManagement {
-    repositories {
-        gradlePluginPortal()
-        maven { url "https://maven.fabricmc.net/" }
-        maven { url "https://maven.architectury.dev/" }
-        maven { url "https://maven.minecraftforge.net/" }
-    }
-    resolutionStrategy {
-            eachPlugin {
-                if (requested.id.id == "com.github.johnrengelman.shadow") {
-                    useModule("gradle.plugin.com.github.johnrengelman:shadow:${shadow_version}")
-                }
-            }
-    }
-}
-
-include("annotation-processor")
-include("annotations")
-include("test_agent")
-include("common")
-
-def current_platforms = getProperty("enabled_platforms").tokenize(',')
-current_platforms.each { it ->
-    def platform_name = it.trim()
-    include(platform_name)
-    if(hasProperty("modernfix.testmod.enable")) {
-        def testmodFolder = new File(platform_name + "/" + "testmod")
-        if (testmodFolder.isDirectory()) {
-            include(platform_name + ":testmod")
-        }
-    }
-}
-
-rootProject.name = 'modernfix'

settings.gradle.kts

@@ -0,0 +1,4 @@
+include("annotation-processor")
+include("annotations")
+
+rootProject.name = "modernfix"

src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/cofh_core_crash/FlagManagerMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.neoforge.mixin.bugfix.cofh_core_crash;
+package org.embeddedt.modernfix.common.mixin.bugfix.cofh_core_crash;
 
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
 import org.embeddedt.modernfix.annotation.RequiresMod;

src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/ctm_resourceutil_cme/ResourceUtilMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.neoforge.mixin.bugfix.ctm_resourceutil_cme;
+package org.embeddedt.modernfix.common.mixin.bugfix.ctm_resourceutil_cme;
 
 import org.embeddedt.modernfix.annotation.ClientOnlyMixin;
 import org.embeddedt.modernfix.annotation.RequiresMod;

src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/entity_pose_stack/LivingEntityRendererMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.neoforge.mixin.bugfix.entity_pose_stack;
+package org.embeddedt.modernfix.common.mixin.bugfix.entity_pose_stack;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.renderer.entity.LivingEntityRenderer;

src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/entity_pose_stack/PlayerRendererMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.neoforge.mixin.bugfix.entity_pose_stack;
+package org.embeddedt.modernfix.common.mixin.bugfix.entity_pose_stack;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.renderer.entity.player.PlayerRenderer;

src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/entity_pose_stack/PoseStackAccessor.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.neoforge.mixin.bugfix.entity_pose_stack;
+package org.embeddedt.modernfix.common.mixin.bugfix.entity_pose_stack;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import org.embeddedt.modernfix.annotation.ClientOnlyMixin;

src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/extra_experimental_screen/CreateWorldScreenMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.neoforge.mixin.bugfix.extra_experimental_screen;
+package org.embeddedt.modernfix.common.mixin.bugfix.extra_experimental_screen;
 
 import com.mojang.serialization.Lifecycle;
 import net.minecraft.client.gui.screens.worldselection.CreateWorldScreen;

src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/recipe_book_type_desync/RecipeBookSettingsMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.neoforge.mixin.bugfix.recipe_book_type_desync;
+package org.embeddedt.modernfix.common.mixin.bugfix.recipe_book_type_desync;
 
 import net.minecraft.stats.RecipeBookSettings;
 import net.minecraft.world.inventory.RecipeBookType;

src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/unsafe_modded_shape_caches/ShapeCacheCyclicMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.neoforge.mixin.bugfix.unsafe_modded_shape_caches;
+package org.embeddedt.modernfix.common.mixin.bugfix.unsafe_modded_shape_caches;
 
 import org.embeddedt.modernfix.ModernFix;
 import org.embeddedt.modernfix.annotation.RequiresMod;

src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/unsafe_modded_shape_caches/ShapeCacheRSMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.neoforge.mixin.bugfix.unsafe_modded_shape_caches;
+package org.embeddedt.modernfix.common.mixin.bugfix.unsafe_modded_shape_caches;
 
 import org.embeddedt.modernfix.ModernFix;
 import org.embeddedt.modernfix.annotation.RequiresMod;

src/main/java/org/embeddedt/modernfix/common/mixin/core/BootstrapClientMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.neoforge.mixin.core;
+package org.embeddedt.modernfix.common.mixin.core;
 
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.server.Bootstrap;

src/main/java/org/embeddedt/modernfix/common/mixin/core/BootstrapMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.neoforge.mixin.core;
+package org.embeddedt.modernfix.common.mixin.core;
 
 import net.minecraft.server.Bootstrap;
 import org.embeddedt.modernfix.util.TimeFormatter;

src/main/java/org/embeddedt/modernfix/common/mixin/core/MinecraftServerMixin.java

@@ -1,11 +1,14 @@
-package org.embeddedt.modernfix.neoforge.mixin.core;
+package org.embeddedt.modernfix.common.mixin.core;
 
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
+import net.minecraft.Util;
 import net.minecraft.server.MinecraftServer;
+import org.embeddedt.modernfix.duck.ITimeTrackingServer;
 import org.embeddedt.modernfix.neoforge.load.MinecraftServerReloadTracker;
 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;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 import java.util.Collection;
@@ -13,7 +16,7 @@ import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Executor;
 
 @Mixin(MinecraftServer.class)
-public class MinecraftServerMixin {
+public class MinecraftServerMixin implements ITimeTrackingServer {
     @Inject(method = "reloadResources", at = @At("HEAD"))
     private void startReloadTrack(Collection<String> selectedIds, CallbackInfoReturnable<CompletableFuture<Void>> cir) {
         MinecraftServerReloadTracker.ACTIVE_RELOADS++;
@@ -25,4 +28,16 @@ public class MinecraftServerMixin {
             MinecraftServerReloadTracker.ACTIVE_RELOADS--;
         }, (Executor)this);
     }
+
+    private long mfix$lastTickStartTime = -1L;
+
+    @Override
+    public long mfix$getLastTickStartTime() {
+        return mfix$lastTickStartTime;
+    }
+
+    @Inject(method = "runServer", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/MinecraftServer;tickServer(Ljava/util/function/BooleanSupplier;)V"))
+    private void trackTickTime(CallbackInfo ci) {
+        mfix$lastTickStartTime = Util.getMillis();
+    }
 }

src/main/java/org/embeddedt/modernfix/common/mixin/core/WorldLoaderMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.neoforge.mixin.core;
+package org.embeddedt.modernfix.common.mixin.core;
 
 import com.llamalad7.mixinextras.injector.ModifyReturnValue;
 import com.llamalad7.mixinextras.sugar.Local;

src/main/java/org/embeddedt/modernfix/common/mixin/feature/branding/BrandingControlMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.neoforge.mixin.feature.branding;
+package org.embeddedt.modernfix.common.mixin.feature.branding;
 
 import com.google.common.collect.ImmutableList;
 import net.neoforged.fml.ModContainer;

src/main/java/org/embeddedt/modernfix/common/mixin/feature/measure_time/AddReloadListenerEventWrapperMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.neoforge.mixin.feature.measure_time;
+package org.embeddedt.modernfix.common.mixin.feature.measure_time;
 
 import net.minecraft.server.packs.resources.PreparableReloadListener;
 import org.spongepowered.asm.mixin.Final;

src/main/java/org/embeddedt/modernfix/common/mixin/feature/measure_time/MinecraftMixin_Forge.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.neoforge.mixin.feature.measure_time;
+package org.embeddedt.modernfix.common.mixin.feature.measure_time;
 
 import net.minecraft.client.Minecraft;
 import org.embeddedt.modernfix.ModernFixClient;

src/main/java/org/embeddedt/modernfix/common/mixin/feature/registry_event_progress/GameDataMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.neoforge.mixin.feature.registry_event_progress;
+package org.embeddedt.modernfix.common.mixin.feature.registry_event_progress;
 
 import net.neoforged.bus.api.Event;
 import net.neoforged.bus.api.EventPriority;

src/main/java/org/embeddedt/modernfix/common/mixin/perf/capability_list_compaction/CapabilityHooksMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.neoforge.mixin.perf.capability_list_compaction;
+package org.embeddedt.modernfix.common.mixin.perf.capability_list_compaction;
 
 import com.llamalad7.mixinextras.sugar.Local;
 import net.neoforged.neoforge.capabilities.BaseCapability;

src/main/java/org/embeddedt/modernfix/common/mixin/perf/capability_list_compaction/RegisterCapabilitiesEventMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.neoforge.mixin.perf.capability_list_compaction;
+package org.embeddedt.modernfix.common.mixin.perf.capability_list_compaction;
 
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.level.ItemLike;

src/main/java/org/embeddedt/modernfix/common/mixin/perf/datapack_reload_exceptions/RecipeManagerMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.neoforge.mixin.perf.datapack_reload_exceptions;
+package org.embeddedt.modernfix.common.mixin.perf.datapack_reload_exceptions;
 
 import net.minecraft.world.item.crafting.RecipeManager;
 import org.slf4j.Logger;

src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/ForgeHooksClientMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.neoforge.mixin.perf.dynamic_resources;
+package org.embeddedt.modernfix.common.mixin.perf.dynamic_resources;
 
 import com.google.common.base.Stopwatch;
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;

src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/ItemModelMesherForgeMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.neoforge.mixin.perf.dynamic_resources;
+package org.embeddedt.modernfix.common.mixin.perf.dynamic_resources;
 
 import net.minecraft.client.renderer.ItemModelShaper;
 import net.minecraft.client.resources.model.BakedModel;

src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/ModelBakerImplMixin.java

@@ -3,8 +3,11 @@ package org.embeddedt.modernfix.common.mixin.perf.dynamic_resources;
 import com.llamalad7.mixinextras.injector.ModifyReturnValue;
 import com.llamalad7.mixinextras.injector.wrapmethod.WrapMethod;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.client.resources.model.BakedModel;
+import net.minecraft.client.resources.model.Material;
 import net.minecraft.client.resources.model.ModelBakery;
+import net.minecraft.client.resources.model.ModelResourceLocation;
 import net.minecraft.client.resources.model.ModelState;
 import net.minecraft.client.resources.model.UnbakedModel;
 import net.minecraft.resources.ResourceLocation;
@@ -13,10 +16,13 @@ import org.embeddedt.modernfix.annotation.ClientOnlyMixin;
 import org.embeddedt.modernfix.duck.IExtendedModelBakery;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Overwrite;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 
+import java.util.function.Function;
+
 @Mixin(ModelBakery.ModelBakerImpl.class)
 @ClientOnlyMixin
 public abstract class ModelBakerImplMixin {
@@ -54,4 +60,26 @@ public abstract class ModelBakerImplMixin {
             lock.unlock();
         }
     }
+
+    /**
+     * @author embeddedt
+     * @reason Handle dynamic model loading
+     */
+    @Overwrite(remap = false)
+    public UnbakedModel getTopLevelModel(ModelResourceLocation location) {
+        IExtendedModelBakery bakery = (IExtendedModelBakery)this.field_40571;
+        UnbakedModel model = bakery.mfix$loadUnbakedModelDynamic(location);
+        return model == bakery.mfix$getMissingModel() ? null : model;
+    }
+
+    @WrapMethod(method = "bake(Lnet/minecraft/resources/ResourceLocation;Lnet/minecraft/client/resources/model/ModelState;Ljava/util/function/Function;)Lnet/minecraft/client/resources/model/BakedModel;", remap = false)
+    private BakedModel mfix$lockWhenBaking(ResourceLocation location, ModelState transform, Function<Material, TextureAtlasSprite> textureGetter, Operation<BakedModel> original) {
+        var lock = ((IExtendedModelBakery)this.field_40571).mfix$getLock();
+        lock.lock();
+        try {
+            return original.call(location, transform, textureGetter);
+        } finally {
+            lock.unlock();
+        }
+    }
 }

src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/ctm/CTMModelBakeryAccessor.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.neoforge.mixin.perf.dynamic_resources.ctm;
+package org.embeddedt.modernfix.common.mixin.perf.dynamic_resources.ctm;
 
 import net.minecraft.client.resources.model.BakedModel;
 import net.minecraft.client.resources.model.ModelBakery;

src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/ctm/TextureMetadataHandlerMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.neoforge.mixin.perf.dynamic_resources.ctm;
+package org.embeddedt.modernfix.common.mixin.perf.dynamic_resources.ctm;
 
 import com.google.common.collect.Multimap;
 import com.google.common.collect.Sets;

src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/ldlib/ClientProxyImplMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.neoforge.mixin.perf.dynamic_resources.ldlib;
+package org.embeddedt.modernfix.common.mixin.perf.dynamic_resources.ldlib;
 
 import com.lowdragmc.lowdraglib.LDLib;
 import com.lowdragmc.lowdraglib.client.ClientProxy;