diff --git a/annotation-processor/build.gradle b/annotation-processor/build.gradle index 0cefd6df..beb7ea1b 100644 --- a/annotation-processor/build.gradle +++ b/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' diff --git a/annotations/build.gradle b/annotations/build.gradle deleted file mode 100644 index 5271e5b3..00000000 --- a/annotations/build.gradle +++ /dev/null @@ -1,6 +0,0 @@ -plugins { - id 'modernfix.common-conventions' - id 'java-library' -} - -version = '1.1.0' diff --git a/annotations/build.gradle.kts b/annotations/build.gradle.kts new file mode 100644 index 00000000..d288bdde --- /dev/null +++ b/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 +} \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 00000000..db4d21ec --- /dev/null +++ b/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 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") { + 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") { + from(embed.map { if (it.isDirectory) it else zipTree(it) }) +} + +// For the AP +tasks.withType().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") { + 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("copyJarNameConsistent") { + from(tasks.named(finalJarTask).get().outputs.files) + into(project.file("build/libs")) + rename { _ -> "modernfix-" + project.name + "-latest.jar" } +} + +tasks.register("copyJarToBin") { + from(tasks.named(finalJarTask).get().outputs.files) + into(rootProject.file("bin")) + mustRunAfter(tasks.named("copyJarNameConsistent")) +} + +tasks.named("build") { + dependsOn("copyJarToBin", "copyJarNameConsistent") +} \ No newline at end of file diff --git a/build.gradle b/build.gradle.legacy similarity index 100% rename from build.gradle rename to build.gradle.legacy diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/core/MinecraftServerMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/core/MinecraftServerMixin.java deleted file mode 100644 index b85fde40..00000000 --- a/common/src/main/java/org/embeddedt/modernfix/common/mixin/core/MinecraftServerMixin.java +++ /dev/null @@ -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(); - } -} diff --git a/common/src/main/resources/modernfix.accesswidener b/common/src/main/resources/modernfix.accesswidener deleted file mode 100644 index 3be41a44..00000000 --- a/common/src/main/resources/modernfix.accesswidener +++ /dev/null @@ -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 (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 (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 (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 (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 (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 (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 (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 diff --git a/common/src/main/resources/pack.mcmeta b/common/src/main/resources/pack.mcmeta deleted file mode 100644 index 8c732d1c..00000000 --- a/common/src/main/resources/pack.mcmeta +++ /dev/null @@ -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." - } -} diff --git a/gradle.properties b/gradle.properties index 00252722..19b9d054 100644 --- a/gradle.properties +++ b/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 diff --git a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/datagen/RuntimeDatagen.java b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/datagen/RuntimeDatagen.java deleted file mode 100644 index e93afa5c..00000000 --- a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/datagen/RuntimeDatagen.java +++ /dev/null @@ -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 mods = new HashSet<>(Arrays.stream(MODS_LIST.split(",")).collect(Collectors.toSet())); - ModernFix.LOGGER.info("Beginning runtime datagen for " + mods.size() + " mods..."); - Set existingMods = new HashSet<>(Arrays.stream(EXISTING_MODS_LIST.split(",")).collect(Collectors.toSet())); - Set existingPacks = new HashSet<>(Arrays.stream(RESOURCES_IN_DIR.split(",")).map(Paths::get).collect(Collectors.toSet())); - Path path = Paths.get(RESOURCES_OUT_DIR); - CompletableFuture 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 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()); - } - } -} diff --git a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/dynamic_resources/ModelBakerImplMixin.java b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/dynamic_resources/ModelBakerImplMixin.java deleted file mode 100644 index 3ce16067..00000000 --- a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/dynamic_resources/ModelBakerImplMixin.java +++ /dev/null @@ -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 textureGetter, Operation original) { - var lock = ((IExtendedModelBakery)this.field_40571).mfix$getLock(); - lock.lock(); - try { - return original.call(location, transform, textureGetter); - } finally { - lock.unlock(); - } - } -} diff --git a/settings.gradle b/settings.gradle deleted file mode 100644 index 7b91d7cb..00000000 --- a/settings.gradle +++ /dev/null @@ -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' diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 00000000..48801417 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,4 @@ +include("annotation-processor") +include("annotations") + +rootProject.name = "modernfix" \ No newline at end of file diff --git a/common/src/main/java/org/embeddedt/modernfix/ModernFix.java b/src/main/java/org/embeddedt/modernfix/ModernFix.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/ModernFix.java rename to src/main/java/org/embeddedt/modernfix/ModernFix.java diff --git a/common/src/main/java/org/embeddedt/modernfix/ModernFixClient.java b/src/main/java/org/embeddedt/modernfix/ModernFixClient.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/ModernFixClient.java rename to src/main/java/org/embeddedt/modernfix/ModernFixClient.java diff --git a/common/src/main/java/org/embeddedt/modernfix/api/constants/IntegrationConstants.java b/src/main/java/org/embeddedt/modernfix/api/constants/IntegrationConstants.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/api/constants/IntegrationConstants.java rename to src/main/java/org/embeddedt/modernfix/api/constants/IntegrationConstants.java diff --git a/common/src/main/java/org/embeddedt/modernfix/api/entrypoint/ModernFixClientIntegration.java b/src/main/java/org/embeddedt/modernfix/api/entrypoint/ModernFixClientIntegration.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/api/entrypoint/ModernFixClientIntegration.java rename to src/main/java/org/embeddedt/modernfix/api/entrypoint/ModernFixClientIntegration.java diff --git a/common/src/main/java/org/embeddedt/modernfix/api/helpers/ModelHelpers.java b/src/main/java/org/embeddedt/modernfix/api/helpers/ModelHelpers.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/api/helpers/ModelHelpers.java rename to src/main/java/org/embeddedt/modernfix/api/helpers/ModelHelpers.java diff --git a/common/src/main/java/org/embeddedt/modernfix/blockstate/BlockStateCacheHandler.java b/src/main/java/org/embeddedt/modernfix/blockstate/BlockStateCacheHandler.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/blockstate/BlockStateCacheHandler.java rename to src/main/java/org/embeddedt/modernfix/blockstate/BlockStateCacheHandler.java diff --git a/common/src/main/java/org/embeddedt/modernfix/blockstate/FakeStateMap.java b/src/main/java/org/embeddedt/modernfix/blockstate/FakeStateMap.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/blockstate/FakeStateMap.java rename to src/main/java/org/embeddedt/modernfix/blockstate/FakeStateMap.java diff --git a/common/src/main/java/org/embeddedt/modernfix/command/ModernFixCommands.java b/src/main/java/org/embeddedt/modernfix/command/ModernFixCommands.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/command/ModernFixCommands.java rename to src/main/java/org/embeddedt/modernfix/command/ModernFixCommands.java diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/chunk_deadlock/EntityMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/chunk_deadlock/EntityMixin.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/chunk_deadlock/EntityMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/chunk_deadlock/EntityMixin.java diff --git a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/bugfix/cofh_core_crash/FlagManagerMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/cofh_core_crash/FlagManagerMixin.java similarity index 96% rename from neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/bugfix/cofh_core_crash/FlagManagerMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/cofh_core_crash/FlagManagerMixin.java index ccbec8a2..c159f87f 100644 --- a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/bugfix/cofh_core_crash/FlagManagerMixin.java +++ b/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; diff --git a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/bugfix/ctm_resourceutil_cme/ResourceUtilMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/ctm_resourceutil_cme/ResourceUtilMixin.java similarity index 93% rename from neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/bugfix/ctm_resourceutil_cme/ResourceUtilMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/ctm_resourceutil_cme/ResourceUtilMixin.java index 868bbdb0..9d8e7212 100644 --- a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/bugfix/ctm_resourceutil_cme/ResourceUtilMixin.java +++ b/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; diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/ender_dragon_leak/EnderDragonRendererMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/ender_dragon_leak/EnderDragonRendererMixin.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/ender_dragon_leak/EnderDragonRendererMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/ender_dragon_leak/EnderDragonRendererMixin.java diff --git a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/bugfix/entity_pose_stack/LivingEntityRendererMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/entity_pose_stack/LivingEntityRendererMixin.java similarity index 95% rename from neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/bugfix/entity_pose_stack/LivingEntityRendererMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/entity_pose_stack/LivingEntityRendererMixin.java index 186934c7..cfb4503d 100644 --- a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/bugfix/entity_pose_stack/LivingEntityRendererMixin.java +++ b/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; diff --git a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/bugfix/entity_pose_stack/PlayerRendererMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/entity_pose_stack/PlayerRendererMixin.java similarity index 95% rename from neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/bugfix/entity_pose_stack/PlayerRendererMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/entity_pose_stack/PlayerRendererMixin.java index f38abc42..770b4d92 100644 --- a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/bugfix/entity_pose_stack/PlayerRendererMixin.java +++ b/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; diff --git a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/bugfix/entity_pose_stack/PoseStackAccessor.java b/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/entity_pose_stack/PoseStackAccessor.java similarity index 83% rename from neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/bugfix/entity_pose_stack/PoseStackAccessor.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/entity_pose_stack/PoseStackAccessor.java index ee018ed3..6aebaf60 100644 --- a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/bugfix/entity_pose_stack/PoseStackAccessor.java +++ b/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; diff --git a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/bugfix/extra_experimental_screen/CreateWorldScreenMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/extra_experimental_screen/CreateWorldScreenMixin.java similarity index 94% rename from neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/bugfix/extra_experimental_screen/CreateWorldScreenMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/extra_experimental_screen/CreateWorldScreenMixin.java index 5ba2646e..4f6bbc71 100644 --- a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/bugfix/extra_experimental_screen/CreateWorldScreenMixin.java +++ b/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; diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/missing_block_entities/LevelChunkMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/missing_block_entities/LevelChunkMixin.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/missing_block_entities/LevelChunkMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/missing_block_entities/LevelChunkMixin.java diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/paper_chunk_patches/SortedArraySetMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/paper_chunk_patches/SortedArraySetMixin.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/paper_chunk_patches/SortedArraySetMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/paper_chunk_patches/SortedArraySetMixin.java diff --git a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/bugfix/recipe_book_type_desync/RecipeBookSettingsMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/recipe_book_type_desync/RecipeBookSettingsMixin.java similarity index 95% rename from neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/bugfix/recipe_book_type_desync/RecipeBookSettingsMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/recipe_book_type_desync/RecipeBookSettingsMixin.java index 774c05e0..7dae11f2 100644 --- a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/bugfix/recipe_book_type_desync/RecipeBookSettingsMixin.java +++ b/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; diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/restore_old_dragon_movement/EnderDragonMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/restore_old_dragon_movement/EnderDragonMixin.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/restore_old_dragon_movement/EnderDragonMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/restore_old_dragon_movement/EnderDragonMixin.java diff --git a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/bugfix/unsafe_modded_shape_caches/ShapeCacheCyclicMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/unsafe_modded_shape_caches/ShapeCacheCyclicMixin.java similarity index 91% rename from neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/bugfix/unsafe_modded_shape_caches/ShapeCacheCyclicMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/unsafe_modded_shape_caches/ShapeCacheCyclicMixin.java index 4f50e40c..47ccb2b5 100644 --- a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/bugfix/unsafe_modded_shape_caches/ShapeCacheCyclicMixin.java +++ b/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; diff --git a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/bugfix/unsafe_modded_shape_caches/ShapeCacheRSMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/unsafe_modded_shape_caches/ShapeCacheRSMixin.java similarity index 93% rename from neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/bugfix/unsafe_modded_shape_caches/ShapeCacheRSMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/unsafe_modded_shape_caches/ShapeCacheRSMixin.java index 8adbd23a..f8150693 100644 --- a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/bugfix/unsafe_modded_shape_caches/ShapeCacheRSMixin.java +++ b/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; diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/world_leaks/MinecraftMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/world_leaks/MinecraftMixin.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/world_leaks/MinecraftMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/world_leaks/MinecraftMixin.java diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/world_screen_skipped/WorldSelectionListMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/world_screen_skipped/WorldSelectionListMixin.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/world_screen_skipped/WorldSelectionListMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/world_screen_skipped/WorldSelectionListMixin.java diff --git a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/core/BootstrapClientMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/core/BootstrapClientMixin.java similarity index 93% rename from neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/core/BootstrapClientMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/core/BootstrapClientMixin.java index 45a0167f..cc7fe407 100644 --- a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/core/BootstrapClientMixin.java +++ b/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; diff --git a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/core/BootstrapMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/core/BootstrapMixin.java similarity index 94% rename from neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/core/BootstrapMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/core/BootstrapMixin.java index ec7e849e..099e37bc 100644 --- a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/core/BootstrapMixin.java +++ b/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; diff --git a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/core/MinecraftServerMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/core/MinecraftServerMixin.java similarity index 65% rename from neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/core/MinecraftServerMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/core/MinecraftServerMixin.java index 63a8d3f6..b6350a91 100644 --- a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/core/MinecraftServerMixin.java +++ b/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 selectedIds, CallbackInfoReturnable> 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(); + } } diff --git a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/core/WorldLoaderMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/core/WorldLoaderMixin.java similarity index 95% rename from neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/core/WorldLoaderMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/core/WorldLoaderMixin.java index 7a50ca9b..53aecede 100644 --- a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/core/WorldLoaderMixin.java +++ b/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; diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/devenv/MinecraftMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/devenv/MinecraftMixin.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/devenv/MinecraftMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/devenv/MinecraftMixin.java diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/feature/blockentity_incorrect_thread/ChunkAccessMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/feature/blockentity_incorrect_thread/ChunkAccessMixin.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/feature/blockentity_incorrect_thread/ChunkAccessMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/feature/blockentity_incorrect_thread/ChunkAccessMixin.java diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/feature/blockentity_incorrect_thread/LevelThreadAccessor.java b/src/main/java/org/embeddedt/modernfix/common/mixin/feature/blockentity_incorrect_thread/LevelThreadAccessor.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/feature/blockentity_incorrect_thread/LevelThreadAccessor.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/feature/blockentity_incorrect_thread/LevelThreadAccessor.java diff --git a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/feature/branding/BrandingControlMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/feature/branding/BrandingControlMixin.java similarity index 94% rename from neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/feature/branding/BrandingControlMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/feature/branding/BrandingControlMixin.java index e6875c20..ba977ce2 100644 --- a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/feature/branding/BrandingControlMixin.java +++ b/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; diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/feature/cause_lag_by_disabling_threads/ChunkRenderDispatcherMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/feature/cause_lag_by_disabling_threads/ChunkRenderDispatcherMixin.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/feature/cause_lag_by_disabling_threads/ChunkRenderDispatcherMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/feature/cause_lag_by_disabling_threads/ChunkRenderDispatcherMixin.java diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/feature/cause_lag_by_disabling_threads/UtilMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/feature/cause_lag_by_disabling_threads/UtilMixin.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/feature/cause_lag_by_disabling_threads/UtilMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/feature/cause_lag_by_disabling_threads/UtilMixin.java diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/feature/mcfunction_profiling/ServerFunctionManagerMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/feature/mcfunction_profiling/ServerFunctionManagerMixin.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/feature/mcfunction_profiling/ServerFunctionManagerMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/feature/mcfunction_profiling/ServerFunctionManagerMixin.java diff --git a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/feature/measure_time/AddReloadListenerEventWrapperMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/feature/measure_time/AddReloadListenerEventWrapperMixin.java similarity index 90% rename from neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/feature/measure_time/AddReloadListenerEventWrapperMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/feature/measure_time/AddReloadListenerEventWrapperMixin.java index 9dd439b8..f9dbcb8c 100644 --- a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/feature/measure_time/AddReloadListenerEventWrapperMixin.java +++ b/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; diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/feature/measure_time/BootstrapMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/feature/measure_time/BootstrapMixin.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/feature/measure_time/BootstrapMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/feature/measure_time/BootstrapMixin.java diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/feature/measure_time/ConnectScreenMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/feature/measure_time/ConnectScreenMixin.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/feature/measure_time/ConnectScreenMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/feature/measure_time/ConnectScreenMixin.java diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/feature/measure_time/MinecraftMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/feature/measure_time/MinecraftMixin.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/feature/measure_time/MinecraftMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/feature/measure_time/MinecraftMixin.java diff --git a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/feature/measure_time/MinecraftMixin_Forge.java b/src/main/java/org/embeddedt/modernfix/common/mixin/feature/measure_time/MinecraftMixin_Forge.java similarity index 90% rename from neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/feature/measure_time/MinecraftMixin_Forge.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/feature/measure_time/MinecraftMixin_Forge.java index 3e2d512d..43c3f288 100644 --- a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/feature/measure_time/MinecraftMixin_Forge.java +++ b/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; diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/feature/measure_time/ProfiledReloadInstanceMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/feature/measure_time/ProfiledReloadInstanceMixin.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/feature/measure_time/ProfiledReloadInstanceMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/feature/measure_time/ProfiledReloadInstanceMixin.java diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/feature/measure_time/SimpleReloadInstanceMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/feature/measure_time/SimpleReloadInstanceMixin.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/feature/measure_time/SimpleReloadInstanceMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/feature/measure_time/SimpleReloadInstanceMixin.java diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/feature/measure_time/WorldLoaderMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/feature/measure_time/WorldLoaderMixin.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/feature/measure_time/WorldLoaderMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/feature/measure_time/WorldLoaderMixin.java diff --git a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/feature/registry_event_progress/GameDataMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/feature/registry_event_progress/GameDataMixin.java similarity index 96% rename from neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/feature/registry_event_progress/GameDataMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/feature/registry_event_progress/GameDataMixin.java index 6c110523..093cd91e 100644 --- a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/feature/registry_event_progress/GameDataMixin.java +++ b/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; diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/feature/remove_chat_signing/ChatTrustLevelMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/feature/remove_chat_signing/ChatTrustLevelMixin.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/feature/remove_chat_signing/ChatTrustLevelMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/feature/remove_chat_signing/ChatTrustLevelMixin.java diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/feature/remove_chat_signing/ProfileKeyPairManagerMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/feature/remove_chat_signing/ProfileKeyPairManagerMixin.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/feature/remove_chat_signing/ProfileKeyPairManagerMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/feature/remove_chat_signing/ProfileKeyPairManagerMixin.java diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/feature/remove_telemetry/ClientTelemetryManagerMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/feature/remove_telemetry/ClientTelemetryManagerMixin.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/feature/remove_telemetry/ClientTelemetryManagerMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/feature/remove_telemetry/ClientTelemetryManagerMixin.java diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/feature/remove_telemetry/MinecraftMixin_Telemetry.java b/src/main/java/org/embeddedt/modernfix/common/mixin/feature/remove_telemetry/MinecraftMixin_Telemetry.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/feature/remove_telemetry/MinecraftMixin_Telemetry.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/feature/remove_telemetry/MinecraftMixin_Telemetry.java diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/feature/spark_profile_world_join/MinecraftMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/feature/spark_profile_world_join/MinecraftMixin.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/feature/spark_profile_world_join/MinecraftMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/feature/spark_profile_world_join/MinecraftMixin.java diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/feature/spark_profile_world_join/WorldLoaderMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/feature/spark_profile_world_join/WorldLoaderMixin.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/feature/spark_profile_world_join/WorldLoaderMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/feature/spark_profile_world_join/WorldLoaderMixin.java diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/feature/suppress_narrator_stacktrace/GameNarratorMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/feature/suppress_narrator_stacktrace/GameNarratorMixin.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/feature/suppress_narrator_stacktrace/GameNarratorMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/feature/suppress_narrator_stacktrace/GameNarratorMixin.java diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/cache_blockstate_cache_arrays/AbstractBlockStateCacheMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/cache_blockstate_cache_arrays/AbstractBlockStateCacheMixin.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/cache_blockstate_cache_arrays/AbstractBlockStateCacheMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/perf/cache_blockstate_cache_arrays/AbstractBlockStateCacheMixin.java diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/cache_profile_texture_url/SkinManagerMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/cache_profile_texture_url/SkinManagerMixin.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/cache_profile_texture_url/SkinManagerMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/perf/cache_profile_texture_url/SkinManagerMixin.java diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/cache_strongholds/ChunkGeneratorMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/cache_strongholds/ChunkGeneratorMixin.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/cache_strongholds/ChunkGeneratorMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/perf/cache_strongholds/ChunkGeneratorMixin.java diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/cache_strongholds/ServerLevelMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/cache_strongholds/ServerLevelMixin.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/cache_strongholds/ServerLevelMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/perf/cache_strongholds/ServerLevelMixin.java diff --git a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/capability_list_compaction/CapabilityHooksMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/capability_list_compaction/CapabilityHooksMixin.java similarity index 95% rename from neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/capability_list_compaction/CapabilityHooksMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/perf/capability_list_compaction/CapabilityHooksMixin.java index 58eab441..18ad7a1a 100644 --- a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/capability_list_compaction/CapabilityHooksMixin.java +++ b/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; diff --git a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/capability_list_compaction/RegisterCapabilitiesEventMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/capability_list_compaction/RegisterCapabilitiesEventMixin.java similarity index 96% rename from neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/capability_list_compaction/RegisterCapabilitiesEventMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/perf/capability_list_compaction/RegisterCapabilitiesEventMixin.java index 57d8f2ec..1c391a4a 100644 --- a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/capability_list_compaction/RegisterCapabilitiesEventMixin.java +++ b/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; diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/chunk_meshing/RebuildTaskMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/chunk_meshing/RebuildTaskMixin.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/chunk_meshing/RebuildTaskMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/perf/chunk_meshing/RebuildTaskMixin.java diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/compact_bit_storage/PalettedContainerMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/compact_bit_storage/PalettedContainerMixin.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/compact_bit_storage/PalettedContainerMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/perf/compact_bit_storage/PalettedContainerMixin.java diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/compact_mojang_registries/BlockStateDataMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/compact_mojang_registries/BlockStateDataMixin.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/compact_mojang_registries/BlockStateDataMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/perf/compact_mojang_registries/BlockStateDataMixin.java diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/compact_mojang_registries/MappedRegistryMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/compact_mojang_registries/MappedRegistryMixin.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/compact_mojang_registries/MappedRegistryMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/perf/compact_mojang_registries/MappedRegistryMixin.java diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/compact_mojang_registries/VanillaRegistriesMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/compact_mojang_registries/VanillaRegistriesMixin.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/compact_mojang_registries/VanillaRegistriesMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/perf/compact_mojang_registries/VanillaRegistriesMixin.java diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/compress_unihex_font/UnihexProviderByteContentsMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/compress_unihex_font/UnihexProviderByteContentsMixin.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/compress_unihex_font/UnihexProviderByteContentsMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/perf/compress_unihex_font/UnihexProviderByteContentsMixin.java diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/compress_unihex_font/UnihexProviderShortContentsMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/compress_unihex_font/UnihexProviderShortContentsMixin.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/compress_unihex_font/UnihexProviderShortContentsMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/perf/compress_unihex_font/UnihexProviderShortContentsMixin.java diff --git a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/datapack_reload_exceptions/RecipeManagerMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/datapack_reload_exceptions/RecipeManagerMixin.java similarity index 90% rename from neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/datapack_reload_exceptions/RecipeManagerMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/perf/datapack_reload_exceptions/RecipeManagerMixin.java index 44da5d2f..271e46f2 100644 --- a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/datapack_reload_exceptions/RecipeManagerMixin.java +++ b/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; diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dedicated_reload_executor/CreateWorldScreenMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dedicated_reload_executor/CreateWorldScreenMixin.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dedicated_reload_executor/CreateWorldScreenMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/perf/dedicated_reload_executor/CreateWorldScreenMixin.java diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dedicated_reload_executor/MinecraftMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dedicated_reload_executor/MinecraftMixin.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dedicated_reload_executor/MinecraftMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/perf/dedicated_reload_executor/MinecraftMixin.java diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dedicated_reload_executor/MinecraftServerMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dedicated_reload_executor/MinecraftServerMixin.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dedicated_reload_executor/MinecraftServerMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/perf/dedicated_reload_executor/MinecraftServerMixin.java diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dedicated_reload_executor/WorldOpenFlowsMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dedicated_reload_executor/WorldOpenFlowsMixin.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dedicated_reload_executor/WorldOpenFlowsMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/perf/dedicated_reload_executor/WorldOpenFlowsMixin.java diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/deduplicate_wall_shapes/WallBlockMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/deduplicate_wall_shapes/WallBlockMixin.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/deduplicate_wall_shapes/WallBlockMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/perf/deduplicate_wall_shapes/WallBlockMixin.java diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_dfu/DataFixTypesMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_dfu/DataFixTypesMixin.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_dfu/DataFixTypesMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_dfu/DataFixTypesMixin.java diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_dfu/DataFixersMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_dfu/DataFixersMixin.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_dfu/DataFixersMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_dfu/DataFixersMixin.java diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/BlockModelShaperMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/BlockModelShaperMixin.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/BlockModelShaperMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/BlockModelShaperMixin.java diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/BlockStateBaseMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/BlockStateBaseMixin.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/BlockStateBaseMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/BlockStateBaseMixin.java diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/BlockStateModelLoaderMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/BlockStateModelLoaderMixin.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/BlockStateModelLoaderMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/BlockStateModelLoaderMixin.java diff --git a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/dynamic_resources/ForgeHooksClientMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/ForgeHooksClientMixin.java similarity index 97% rename from neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/dynamic_resources/ForgeHooksClientMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/ForgeHooksClientMixin.java index f66b34d0..ea090260 100644 --- a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/dynamic_resources/ForgeHooksClientMixin.java +++ b/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; diff --git a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/dynamic_resources/ItemModelMesherForgeMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/ItemModelMesherForgeMixin.java similarity index 97% rename from neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/dynamic_resources/ItemModelMesherForgeMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/ItemModelMesherForgeMixin.java index 31f58409..e96e8e7b 100644 --- a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/dynamic_resources/ItemModelMesherForgeMixin.java +++ b/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; diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/ItemModelShaperMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/ItemModelShaperMixin.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/ItemModelShaperMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/ItemModelShaperMixin.java diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/ItemRendererMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/ItemRendererMixin.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/ItemRendererMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/ItemRendererMixin.java diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/MinecraftMixin_ModelTicking.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/MinecraftMixin_ModelTicking.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/MinecraftMixin_ModelTicking.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/MinecraftMixin_ModelTicking.java diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/ModelBakerImplMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/ModelBakerImplMixin.java similarity index 63% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/ModelBakerImplMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/ModelBakerImplMixin.java index bdcc84db..9ef63719 100644 --- a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/ModelBakerImplMixin.java +++ b/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 textureGetter, Operation original) { + var lock = ((IExtendedModelBakery)this.field_40571).mfix$getLock(); + lock.lock(); + try { + return original.call(location, transform, textureGetter); + } finally { + lock.unlock(); + } + } } diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/ModelBakeryMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/ModelBakeryMixin.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/ModelBakeryMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/ModelBakeryMixin.java diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/ModelManagerMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/ModelManagerMixin.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/ModelManagerMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/ModelManagerMixin.java diff --git a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/dynamic_resources/ctm/CTMModelBakeryAccessor.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/ctm/CTMModelBakeryAccessor.java similarity index 86% rename from neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/dynamic_resources/ctm/CTMModelBakeryAccessor.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/ctm/CTMModelBakeryAccessor.java index 5fa45eef..5fad4788 100644 --- a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/dynamic_resources/ctm/CTMModelBakeryAccessor.java +++ b/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; diff --git a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/dynamic_resources/ctm/TextureMetadataHandlerMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/ctm/TextureMetadataHandlerMixin.java similarity index 98% rename from neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/dynamic_resources/ctm/TextureMetadataHandlerMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/ctm/TextureMetadataHandlerMixin.java index 56b338fa..bfd22142 100644 --- a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/dynamic_resources/ctm/TextureMetadataHandlerMixin.java +++ b/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; diff --git a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/dynamic_resources/ldlib/ClientProxyImplMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/ldlib/ClientProxyImplMixin.java similarity index 98% rename from neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/dynamic_resources/ldlib/ClientProxyImplMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/ldlib/ClientProxyImplMixin.java index 44dce277..5c8c1609 100644 --- a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/dynamic_resources/ldlib/ClientProxyImplMixin.java +++ b/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; diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_structure_manager/StructureManagerMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_structure_manager/StructureManagerMixin.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_structure_manager/StructureManagerMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_structure_manager/StructureManagerMixin.java diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/encoder_cache_leak/DataComponentsAccessor.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/encoder_cache_leak/DataComponentsAccessor.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/encoder_cache_leak/DataComponentsAccessor.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/perf/encoder_cache_leak/DataComponentsAccessor.java diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/encoder_cache_leak/EncoderCacheAccessor.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/encoder_cache_leak/EncoderCacheAccessor.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/encoder_cache_leak/EncoderCacheAccessor.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/perf/encoder_cache_leak/EncoderCacheAccessor.java diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/encoder_cache_leak/ReloadableServerResourcesMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/encoder_cache_leak/ReloadableServerResourcesMixin.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/encoder_cache_leak/ReloadableServerResourcesMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/perf/encoder_cache_leak/ReloadableServerResourcesMixin.java diff --git a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/faster_ingredients/IngredientMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/faster_ingredients/IngredientMixin.java similarity index 99% rename from neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/faster_ingredients/IngredientMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/perf/faster_ingredients/IngredientMixin.java index ab4be294..0b619714 100644 --- a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/faster_ingredients/IngredientMixin.java +++ b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/faster_ingredients/IngredientMixin.java @@ -1,4 +1,4 @@ -package org.embeddedt.modernfix.neoforge.mixin.perf.faster_ingredients; +package org.embeddedt.modernfix.common.mixin.perf.faster_ingredients; import it.unimi.dsi.fastutil.ints.IntArrayList; import it.unimi.dsi.fastutil.ints.IntComparators; diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/faster_item_rendering/GameRendererMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/faster_item_rendering/GameRendererMixin.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/faster_item_rendering/GameRendererMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/perf/faster_item_rendering/GameRendererMixin.java diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/faster_item_rendering/ItemRendererMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/faster_item_rendering/ItemRendererMixin.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/faster_item_rendering/ItemRendererMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/perf/faster_item_rendering/ItemRendererMixin.java diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/faster_texture_stitching/StitcherMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/faster_texture_stitching/StitcherMixin.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/faster_texture_stitching/StitcherMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/perf/faster_texture_stitching/StitcherMixin.java diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/fix_loop_spin_waiting/MinecraftServerMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/fix_loop_spin_waiting/MinecraftServerMixin.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/fix_loop_spin_waiting/MinecraftServerMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/perf/fix_loop_spin_waiting/MinecraftServerMixin.java diff --git a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/ingredient_item_deduplication/IngredientItemValueMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/ingredient_item_deduplication/IngredientItemValueMixin.java similarity index 91% rename from neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/ingredient_item_deduplication/IngredientItemValueMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/perf/ingredient_item_deduplication/IngredientItemValueMixin.java index 34b6debf..e214ca91 100644 --- a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/ingredient_item_deduplication/IngredientItemValueMixin.java +++ b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/ingredient_item_deduplication/IngredientItemValueMixin.java @@ -1,4 +1,4 @@ -package org.embeddedt.modernfix.neoforge.mixin.perf.ingredient_item_deduplication; +package org.embeddedt.modernfix.common.mixin.perf.ingredient_item_deduplication; import com.llamalad7.mixinextras.injector.ModifyExpressionValue; import net.minecraft.world.item.ItemStack; diff --git a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/ingredient_item_deduplication/IngredientMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/ingredient_item_deduplication/IngredientMixin.java similarity index 93% rename from neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/ingredient_item_deduplication/IngredientMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/perf/ingredient_item_deduplication/IngredientMixin.java index ee1848ac..b5b882f2 100644 --- a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/ingredient_item_deduplication/IngredientMixin.java +++ b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/ingredient_item_deduplication/IngredientMixin.java @@ -1,4 +1,4 @@ -package org.embeddedt.modernfix.neoforge.mixin.perf.ingredient_item_deduplication; +package org.embeddedt.modernfix.common.mixin.perf.ingredient_item_deduplication; import net.minecraft.world.item.crafting.Ingredient; import org.embeddedt.modernfix.neoforge.recipe.IngredientValueDeduplicator; diff --git a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/ingredient_item_deduplication/PatchedDataComponentMapAccessor.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/ingredient_item_deduplication/PatchedDataComponentMapAccessor.java similarity index 87% rename from neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/ingredient_item_deduplication/PatchedDataComponentMapAccessor.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/perf/ingredient_item_deduplication/PatchedDataComponentMapAccessor.java index d6003877..d6e4fee6 100644 --- a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/ingredient_item_deduplication/PatchedDataComponentMapAccessor.java +++ b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/ingredient_item_deduplication/PatchedDataComponentMapAccessor.java @@ -1,4 +1,4 @@ -package org.embeddedt.modernfix.neoforge.mixin.perf.ingredient_item_deduplication; +package org.embeddedt.modernfix.common.mixin.perf.ingredient_item_deduplication; import it.unimi.dsi.fastutil.objects.Reference2ObjectMap; import net.minecraft.core.component.DataComponentMap; diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/lazy_search_tree_registry/SessionSearchTreesMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/lazy_search_tree_registry/SessionSearchTreesMixin.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/lazy_search_tree_registry/SessionSearchTreesMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/perf/lazy_search_tree_registry/SessionSearchTreesMixin.java diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/memoize_creative_tab_build/CreativeModeTabMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/memoize_creative_tab_build/CreativeModeTabMixin.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/memoize_creative_tab_build/CreativeModeTabMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/perf/memoize_creative_tab_build/CreativeModeTabMixin.java diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/model_optimizations/BooleanPropertyMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/model_optimizations/BooleanPropertyMixin.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/model_optimizations/BooleanPropertyMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/perf/model_optimizations/BooleanPropertyMixin.java diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/model_optimizations/MultiVariantMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/model_optimizations/MultiVariantMixin.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/model_optimizations/MultiVariantMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/perf/model_optimizations/MultiVariantMixin.java diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/model_optimizations/PropertyMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/model_optimizations/PropertyMixin.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/model_optimizations/PropertyMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/perf/model_optimizations/PropertyMixin.java diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/model_optimizations/SelectorMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/model_optimizations/SelectorMixin.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/model_optimizations/SelectorMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/perf/model_optimizations/SelectorMixin.java diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/model_optimizations/TransformationMatrixMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/model_optimizations/TransformationMatrixMixin.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/model_optimizations/TransformationMatrixMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/perf/model_optimizations/TransformationMatrixMixin.java diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/mojang_registry_size/StateHolderMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/mojang_registry_size/StateHolderMixin.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/mojang_registry_size/StateHolderMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/perf/mojang_registry_size/StateHolderMixin.java diff --git a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/patchouli_deduplicate_books/ClientBookRegistryMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/patchouli_deduplicate_books/ClientBookRegistryMixin.java similarity index 97% rename from neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/patchouli_deduplicate_books/ClientBookRegistryMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/perf/patchouli_deduplicate_books/ClientBookRegistryMixin.java index 15c3d59b..4ce8d174 100644 --- a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/patchouli_deduplicate_books/ClientBookRegistryMixin.java +++ b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/patchouli_deduplicate_books/ClientBookRegistryMixin.java @@ -1,4 +1,4 @@ -package org.embeddedt.modernfix.neoforge.mixin.perf.patchouli_deduplicate_books; +package org.embeddedt.modernfix.common.mixin.perf.patchouli_deduplicate_books; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/reduce_blockstate_cache_rebuilds/BlockBehaviourInvoker.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/reduce_blockstate_cache_rebuilds/BlockBehaviourInvoker.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/reduce_blockstate_cache_rebuilds/BlockBehaviourInvoker.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/perf/reduce_blockstate_cache_rebuilds/BlockBehaviourInvoker.java diff --git a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/reduce_blockstate_cache_rebuilds/BlockCallbacksMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/reduce_blockstate_cache_rebuilds/BlockCallbacksMixin.java similarity index 93% rename from neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/reduce_blockstate_cache_rebuilds/BlockCallbacksMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/perf/reduce_blockstate_cache_rebuilds/BlockCallbacksMixin.java index 1aab0e44..0bb1276d 100644 --- a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/reduce_blockstate_cache_rebuilds/BlockCallbacksMixin.java +++ b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/reduce_blockstate_cache_rebuilds/BlockCallbacksMixin.java @@ -1,4 +1,4 @@ -package org.embeddedt.modernfix.neoforge.mixin.perf.reduce_blockstate_cache_rebuilds; +package org.embeddedt.modernfix.common.mixin.perf.reduce_blockstate_cache_rebuilds; import com.google.common.collect.ImmutableList; import net.minecraft.core.Registry; diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/reduce_blockstate_cache_rebuilds/BlockStateBaseMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/reduce_blockstate_cache_rebuilds/BlockStateBaseMixin.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/reduce_blockstate_cache_rebuilds/BlockStateBaseMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/perf/reduce_blockstate_cache_rebuilds/BlockStateBaseMixin.java diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/reduce_blockstate_cache_rebuilds/BlocksMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/reduce_blockstate_cache_rebuilds/BlocksMixin.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/reduce_blockstate_cache_rebuilds/BlocksMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/perf/reduce_blockstate_cache_rebuilds/BlocksMixin.java diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/remove_biome_temperature_cache/BiomeMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/remove_biome_temperature_cache/BiomeMixin.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/remove_biome_temperature_cache/BiomeMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/perf/remove_biome_temperature_cache/BiomeMixin.java diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/resourcepacks/PathPackResourcesMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/resourcepacks/PathPackResourcesMixin.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/resourcepacks/PathPackResourcesMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/perf/resourcepacks/PathPackResourcesMixin.java diff --git a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/smart_ingredient_sync/ConnectionMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/smart_ingredient_sync/ConnectionMixin.java similarity index 95% rename from neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/smart_ingredient_sync/ConnectionMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/perf/smart_ingredient_sync/ConnectionMixin.java index d4afdd55..73bb298f 100644 --- a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/smart_ingredient_sync/ConnectionMixin.java +++ b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/smart_ingredient_sync/ConnectionMixin.java @@ -1,4 +1,4 @@ -package org.embeddedt.modernfix.neoforge.mixin.perf.smart_ingredient_sync; +package org.embeddedt.modernfix.common.mixin.perf.smart_ingredient_sync; import com.llamalad7.mixinextras.injector.wrapmethod.WrapMethod; import com.llamalad7.mixinextras.injector.wrapoperation.Operation; diff --git a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/smart_ingredient_sync/IngredientMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/smart_ingredient_sync/IngredientMixin.java similarity index 97% rename from neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/smart_ingredient_sync/IngredientMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/perf/smart_ingredient_sync/IngredientMixin.java index 4952e075..065c0e89 100644 --- a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/smart_ingredient_sync/IngredientMixin.java +++ b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/smart_ingredient_sync/IngredientMixin.java @@ -1,4 +1,4 @@ -package org.embeddedt.modernfix.neoforge.mixin.perf.smart_ingredient_sync; +package org.embeddedt.modernfix.common.mixin.perf.smart_ingredient_sync; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.core.registries.Registries; diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/state_definition_construct/StateDefinitionMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/state_definition_construct/StateDefinitionMixin.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/state_definition_construct/StateDefinitionMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/perf/state_definition_construct/StateDefinitionMixin.java diff --git a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/tag_id_caching/TagEntryMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/tag_id_caching/TagEntryMixin.java similarity index 93% rename from neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/tag_id_caching/TagEntryMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/perf/tag_id_caching/TagEntryMixin.java index ccb95871..f3e6cabe 100644 --- a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/tag_id_caching/TagEntryMixin.java +++ b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/tag_id_caching/TagEntryMixin.java @@ -1,4 +1,4 @@ -package org.embeddedt.modernfix.neoforge.mixin.perf.tag_id_caching; +package org.embeddedt.modernfix.common.mixin.perf.tag_id_caching; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.TagEntry; diff --git a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/tag_id_caching/TagOrElementLocationMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/tag_id_caching/TagOrElementLocationMixin.java similarity index 92% rename from neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/tag_id_caching/TagOrElementLocationMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/perf/tag_id_caching/TagOrElementLocationMixin.java index 4180a1fd..dcb7ee48 100644 --- a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/tag_id_caching/TagOrElementLocationMixin.java +++ b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/tag_id_caching/TagOrElementLocationMixin.java @@ -1,4 +1,4 @@ -package org.embeddedt.modernfix.neoforge.mixin.perf.tag_id_caching; +package org.embeddedt.modernfix.common.mixin.perf.tag_id_caching; import net.minecraft.resources.ResourceLocation; import net.minecraft.util.ExtraCodecs; diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/thread_priorities/IntegratedServerMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/thread_priorities/IntegratedServerMixin.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/thread_priorities/IntegratedServerMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/perf/thread_priorities/IntegratedServerMixin.java diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/thread_priorities/UtilMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/thread_priorities/UtilMixin.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/thread_priorities/UtilMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/perf/thread_priorities/UtilMixin.java diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/ticking_chunk_alloc/BatMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/ticking_chunk_alloc/BatMixin.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/ticking_chunk_alloc/BatMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/perf/ticking_chunk_alloc/BatMixin.java diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/ticking_chunk_alloc/ChunkAccessMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/ticking_chunk_alloc/ChunkAccessMixin.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/ticking_chunk_alloc/ChunkAccessMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/perf/ticking_chunk_alloc/ChunkAccessMixin.java diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/worldgen_allocation/MaterialRuleListMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/worldgen_allocation/MaterialRuleListMixin.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/worldgen_allocation/MaterialRuleListMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/perf/worldgen_allocation/MaterialRuleListMixin.java diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/worldgen_allocation/NoiseChunkMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/worldgen_allocation/NoiseChunkMixin.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/worldgen_allocation/NoiseChunkMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/perf/worldgen_allocation/NoiseChunkMixin.java diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/worldgen_allocation/SequenceRuleMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/worldgen_allocation/SequenceRuleMixin.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/worldgen_allocation/SequenceRuleMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/perf/worldgen_allocation/SequenceRuleMixin.java diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/worldgen_allocation/SurfaceRulesContextMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/worldgen_allocation/SurfaceRulesContextMixin.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/worldgen_allocation/SurfaceRulesContextMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/perf/worldgen_allocation/SurfaceRulesContextMixin.java diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/worldgen_allocation/SurfaceRulesMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/worldgen_allocation/SurfaceRulesMixin.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/worldgen_allocation/SurfaceRulesMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/perf/worldgen_allocation/SurfaceRulesMixin.java diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/safety/BlockColorsMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/safety/BlockColorsMixin.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/safety/BlockColorsMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/safety/BlockColorsMixin.java diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/safety/ItemColorsMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/safety/ItemColorsMixin.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/safety/ItemColorsMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/safety/ItemColorsMixin.java diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/safety/ItemPropertiesMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/safety/ItemPropertiesMixin.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/safety/ItemPropertiesMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/safety/ItemPropertiesMixin.java diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/safety/LivingEntityRendererMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/safety/LivingEntityRendererMixin.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/common/mixin/safety/LivingEntityRendererMixin.java rename to src/main/java/org/embeddedt/modernfix/common/mixin/safety/LivingEntityRendererMixin.java diff --git a/common/src/main/java/org/embeddedt/modernfix/core/ModernFixMixinPlugin.java b/src/main/java/org/embeddedt/modernfix/core/ModernFixMixinPlugin.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/core/ModernFixMixinPlugin.java rename to src/main/java/org/embeddedt/modernfix/core/ModernFixMixinPlugin.java diff --git a/common/src/main/java/org/embeddedt/modernfix/core/config/ModernFixEarlyConfig.java b/src/main/java/org/embeddedt/modernfix/core/config/ModernFixEarlyConfig.java similarity index 99% rename from common/src/main/java/org/embeddedt/modernfix/core/config/ModernFixEarlyConfig.java rename to src/main/java/org/embeddedt/modernfix/core/config/ModernFixEarlyConfig.java index cb993a35..512af3a1 100644 --- a/common/src/main/java/org/embeddedt/modernfix/core/config/ModernFixEarlyConfig.java +++ b/src/main/java/org/embeddedt/modernfix/core/config/ModernFixEarlyConfig.java @@ -82,7 +82,7 @@ public class ModernFixEarlyConfig { } private void scanForAndBuildMixinOptions() { - List configFiles = ImmutableList.of("modernfix-common.mixins.json", "modernfix-fabric.mixins.json", "modernfix-neoforge.mixins.json"); + List configFiles = ImmutableList.of("modernfix-modernfix.mixins.json"); List mixinPaths = new ArrayList<>(); for(String configFile : configFiles) { InputStream stream = ModernFixEarlyConfig.class.getClassLoader().getResourceAsStream(configFile); diff --git a/common/src/main/java/org/embeddedt/modernfix/core/config/Option.java b/src/main/java/org/embeddedt/modernfix/core/config/Option.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/core/config/Option.java rename to src/main/java/org/embeddedt/modernfix/core/config/Option.java diff --git a/common/src/main/java/org/embeddedt/modernfix/core/config/OptionCategories.java b/src/main/java/org/embeddedt/modernfix/core/config/OptionCategories.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/core/config/OptionCategories.java rename to src/main/java/org/embeddedt/modernfix/core/config/OptionCategories.java diff --git a/common/src/main/java/org/embeddedt/modernfix/dfu/DFUBlaster.java b/src/main/java/org/embeddedt/modernfix/dfu/DFUBlaster.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/dfu/DFUBlaster.java rename to src/main/java/org/embeddedt/modernfix/dfu/DFUBlaster.java diff --git a/common/src/main/java/org/embeddedt/modernfix/duck/IBlockState.java b/src/main/java/org/embeddedt/modernfix/duck/IBlockState.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/duck/IBlockState.java rename to src/main/java/org/embeddedt/modernfix/duck/IBlockState.java diff --git a/common/src/main/java/org/embeddedt/modernfix/duck/IBlockStateModelLoader.java b/src/main/java/org/embeddedt/modernfix/duck/IBlockStateModelLoader.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/duck/IBlockStateModelLoader.java rename to src/main/java/org/embeddedt/modernfix/duck/IBlockStateModelLoader.java diff --git a/common/src/main/java/org/embeddedt/modernfix/duck/IChunkGenerator.java b/src/main/java/org/embeddedt/modernfix/duck/IChunkGenerator.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/duck/IChunkGenerator.java rename to src/main/java/org/embeddedt/modernfix/duck/IChunkGenerator.java diff --git a/common/src/main/java/org/embeddedt/modernfix/duck/IExtendedModelBakery.java b/src/main/java/org/embeddedt/modernfix/duck/IExtendedModelBakery.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/duck/IExtendedModelBakery.java rename to src/main/java/org/embeddedt/modernfix/duck/IExtendedModelBakery.java diff --git a/common/src/main/java/org/embeddedt/modernfix/duck/IExtendedModelManager.java b/src/main/java/org/embeddedt/modernfix/duck/IExtendedModelManager.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/duck/IExtendedModelManager.java rename to src/main/java/org/embeddedt/modernfix/duck/IExtendedModelManager.java diff --git a/common/src/main/java/org/embeddedt/modernfix/duck/IModelHoldingBlockState.java b/src/main/java/org/embeddedt/modernfix/duck/IModelHoldingBlockState.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/duck/IModelHoldingBlockState.java rename to src/main/java/org/embeddedt/modernfix/duck/IModelHoldingBlockState.java diff --git a/common/src/main/java/org/embeddedt/modernfix/duck/IProfilingServerFunctionManager.java b/src/main/java/org/embeddedt/modernfix/duck/IProfilingServerFunctionManager.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/duck/IProfilingServerFunctionManager.java rename to src/main/java/org/embeddedt/modernfix/duck/IProfilingServerFunctionManager.java diff --git a/common/src/main/java/org/embeddedt/modernfix/duck/IServerLevel.java b/src/main/java/org/embeddedt/modernfix/duck/IServerLevel.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/duck/IServerLevel.java rename to src/main/java/org/embeddedt/modernfix/duck/IServerLevel.java diff --git a/common/src/main/java/org/embeddedt/modernfix/duck/IStructureCheck.java b/src/main/java/org/embeddedt/modernfix/duck/IStructureCheck.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/duck/IStructureCheck.java rename to src/main/java/org/embeddedt/modernfix/duck/IStructureCheck.java diff --git a/common/src/main/java/org/embeddedt/modernfix/duck/ITimeTrackingServer.java b/src/main/java/org/embeddedt/modernfix/duck/ITimeTrackingServer.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/duck/ITimeTrackingServer.java rename to src/main/java/org/embeddedt/modernfix/duck/ITimeTrackingServer.java diff --git a/common/src/main/java/org/embeddedt/modernfix/dynamicresources/DynamicModelCache.java b/src/main/java/org/embeddedt/modernfix/dynamicresources/DynamicModelCache.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/dynamicresources/DynamicModelCache.java rename to src/main/java/org/embeddedt/modernfix/dynamicresources/DynamicModelCache.java diff --git a/common/src/main/java/org/embeddedt/modernfix/dynamicresources/DynamicModelProvider.java b/src/main/java/org/embeddedt/modernfix/dynamicresources/DynamicModelProvider.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/dynamicresources/DynamicModelProvider.java rename to src/main/java/org/embeddedt/modernfix/dynamicresources/DynamicModelProvider.java diff --git a/common/src/main/java/org/embeddedt/modernfix/dynamicresources/DynamicSoundHelpers.java b/src/main/java/org/embeddedt/modernfix/dynamicresources/DynamicSoundHelpers.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/dynamicresources/DynamicSoundHelpers.java rename to src/main/java/org/embeddedt/modernfix/dynamicresources/DynamicSoundHelpers.java diff --git a/common/src/main/java/org/embeddedt/modernfix/dynamicresources/ModelBakeryHelpers.java b/src/main/java/org/embeddedt/modernfix/dynamicresources/ModelBakeryHelpers.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/dynamicresources/ModelBakeryHelpers.java rename to src/main/java/org/embeddedt/modernfix/dynamicresources/ModelBakeryHelpers.java diff --git a/common/src/main/java/org/embeddedt/modernfix/dynamicresources/ModelLocationCache.java b/src/main/java/org/embeddedt/modernfix/dynamicresources/ModelLocationCache.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/dynamicresources/ModelLocationCache.java rename to src/main/java/org/embeddedt/modernfix/dynamicresources/ModelLocationCache.java diff --git a/common/src/main/java/org/embeddedt/modernfix/dynamicresources/ModelMissingException.java b/src/main/java/org/embeddedt/modernfix/dynamicresources/ModelMissingException.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/dynamicresources/ModelMissingException.java rename to src/main/java/org/embeddedt/modernfix/dynamicresources/ModelMissingException.java diff --git a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/ModernFixConfig.java b/src/main/java/org/embeddedt/modernfix/neoforge/ModernFixConfig.java similarity index 100% rename from neoforge/src/main/java/org/embeddedt/modernfix/neoforge/ModernFixConfig.java rename to src/main/java/org/embeddedt/modernfix/neoforge/ModernFixConfig.java diff --git a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/caps/CapProviderGetter.java b/src/main/java/org/embeddedt/modernfix/neoforge/caps/CapProviderGetter.java similarity index 100% rename from neoforge/src/main/java/org/embeddedt/modernfix/neoforge/caps/CapProviderGetter.java rename to src/main/java/org/embeddedt/modernfix/neoforge/caps/CapProviderGetter.java diff --git a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/caps/ITrackingCapEvent.java b/src/main/java/org/embeddedt/modernfix/neoforge/caps/ITrackingCapEvent.java similarity index 100% rename from neoforge/src/main/java/org/embeddedt/modernfix/neoforge/caps/ITrackingCapEvent.java rename to src/main/java/org/embeddedt/modernfix/neoforge/caps/ITrackingCapEvent.java diff --git a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/dynresources/IModelBakerImpl.java b/src/main/java/org/embeddedt/modernfix/neoforge/dynresources/IModelBakerImpl.java similarity index 100% rename from neoforge/src/main/java/org/embeddedt/modernfix/neoforge/dynresources/IModelBakerImpl.java rename to src/main/java/org/embeddedt/modernfix/neoforge/dynresources/IModelBakerImpl.java diff --git a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/dynresources/ModelBakeEventHelper.java b/src/main/java/org/embeddedt/modernfix/neoforge/dynresources/ModelBakeEventHelper.java similarity index 100% rename from neoforge/src/main/java/org/embeddedt/modernfix/neoforge/dynresources/ModelBakeEventHelper.java rename to src/main/java/org/embeddedt/modernfix/neoforge/dynresources/ModelBakeEventHelper.java diff --git a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/dynresources/ModelLocationBuilder.java b/src/main/java/org/embeddedt/modernfix/neoforge/dynresources/ModelLocationBuilder.java similarity index 100% rename from neoforge/src/main/java/org/embeddedt/modernfix/neoforge/dynresources/ModelLocationBuilder.java rename to src/main/java/org/embeddedt/modernfix/neoforge/dynresources/ModelLocationBuilder.java diff --git a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/init/ModernFixClientForge.java b/src/main/java/org/embeddedt/modernfix/neoforge/init/ModernFixClientForge.java similarity index 100% rename from neoforge/src/main/java/org/embeddedt/modernfix/neoforge/init/ModernFixClientForge.java rename to src/main/java/org/embeddedt/modernfix/neoforge/init/ModernFixClientForge.java diff --git a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/init/ModernFixForge.java b/src/main/java/org/embeddedt/modernfix/neoforge/init/ModernFixForge.java similarity index 100% rename from neoforge/src/main/java/org/embeddedt/modernfix/neoforge/init/ModernFixForge.java rename to src/main/java/org/embeddedt/modernfix/neoforge/init/ModernFixForge.java diff --git a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/load/MinecraftServerReloadTracker.java b/src/main/java/org/embeddedt/modernfix/neoforge/load/MinecraftServerReloadTracker.java similarity index 100% rename from neoforge/src/main/java/org/embeddedt/modernfix/neoforge/load/MinecraftServerReloadTracker.java rename to src/main/java/org/embeddedt/modernfix/neoforge/load/MinecraftServerReloadTracker.java diff --git a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/load/ModResourcePackPathFixer.java b/src/main/java/org/embeddedt/modernfix/neoforge/load/ModResourcePackPathFixer.java similarity index 100% rename from neoforge/src/main/java/org/embeddedt/modernfix/neoforge/load/ModResourcePackPathFixer.java rename to src/main/java/org/embeddedt/modernfix/neoforge/load/ModResourcePackPathFixer.java diff --git a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/packet/SmartIngredientSyncPayload.java b/src/main/java/org/embeddedt/modernfix/neoforge/packet/SmartIngredientSyncPayload.java similarity index 100% rename from neoforge/src/main/java/org/embeddedt/modernfix/neoforge/packet/SmartIngredientSyncPayload.java rename to src/main/java/org/embeddedt/modernfix/neoforge/packet/SmartIngredientSyncPayload.java diff --git a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/recipe/ExtendedIngredient.java b/src/main/java/org/embeddedt/modernfix/neoforge/recipe/ExtendedIngredient.java similarity index 100% rename from neoforge/src/main/java/org/embeddedt/modernfix/neoforge/recipe/ExtendedIngredient.java rename to src/main/java/org/embeddedt/modernfix/neoforge/recipe/ExtendedIngredient.java diff --git a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/recipe/IngredientItemStacksSoftReference.java b/src/main/java/org/embeddedt/modernfix/neoforge/recipe/IngredientItemStacksSoftReference.java similarity index 100% rename from neoforge/src/main/java/org/embeddedt/modernfix/neoforge/recipe/IngredientItemStacksSoftReference.java rename to src/main/java/org/embeddedt/modernfix/neoforge/recipe/IngredientItemStacksSoftReference.java diff --git a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/recipe/IngredientValueDeduplicator.java b/src/main/java/org/embeddedt/modernfix/neoforge/recipe/IngredientValueDeduplicator.java similarity index 97% rename from neoforge/src/main/java/org/embeddedt/modernfix/neoforge/recipe/IngredientValueDeduplicator.java rename to src/main/java/org/embeddedt/modernfix/neoforge/recipe/IngredientValueDeduplicator.java index 06e1e046..0a902508 100644 --- a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/recipe/IngredientValueDeduplicator.java +++ b/src/main/java/org/embeddedt/modernfix/neoforge/recipe/IngredientValueDeduplicator.java @@ -6,7 +6,7 @@ import it.unimi.dsi.fastutil.objects.ObjectOpenCustomHashSet; import it.unimi.dsi.fastutil.objects.Reference2ObjectMaps; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.crafting.Ingredient; -import org.embeddedt.modernfix.neoforge.mixin.perf.ingredient_item_deduplication.PatchedDataComponentMapAccessor; +import org.embeddedt.modernfix.common.mixin.perf.ingredient_item_deduplication.PatchedDataComponentMapAccessor; /** * @author embeddedt (original inspiration from Uncandango's AllTheLeaks mod) diff --git a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/util/AsyncLoadingScreen.java b/src/main/java/org/embeddedt/modernfix/neoforge/util/AsyncLoadingScreen.java similarity index 100% rename from neoforge/src/main/java/org/embeddedt/modernfix/neoforge/util/AsyncLoadingScreen.java rename to src/main/java/org/embeddedt/modernfix/neoforge/util/AsyncLoadingScreen.java diff --git a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/util/ModUtil.java b/src/main/java/org/embeddedt/modernfix/neoforge/util/ModUtil.java similarity index 100% rename from neoforge/src/main/java/org/embeddedt/modernfix/neoforge/util/ModUtil.java rename to src/main/java/org/embeddedt/modernfix/neoforge/util/ModUtil.java diff --git a/common/src/main/java/org/embeddedt/modernfix/platform/ModernFixPlatformHooks.java b/src/main/java/org/embeddedt/modernfix/platform/ModernFixPlatformHooks.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/platform/ModernFixPlatformHooks.java rename to src/main/java/org/embeddedt/modernfix/platform/ModernFixPlatformHooks.java diff --git a/common/src/main/java/org/embeddedt/modernfix/platform/PlatformHookLoader.java b/src/main/java/org/embeddedt/modernfix/platform/PlatformHookLoader.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/platform/PlatformHookLoader.java rename to src/main/java/org/embeddedt/modernfix/platform/PlatformHookLoader.java diff --git a/neoforge/src/main/java/org/embeddedt/modernfix/platform/neoforge/ModernFixPlatformHooksImpl.java b/src/main/java/org/embeddedt/modernfix/platform/neoforge/ModernFixPlatformHooksImpl.java similarity index 100% rename from neoforge/src/main/java/org/embeddedt/modernfix/platform/neoforge/ModernFixPlatformHooksImpl.java rename to src/main/java/org/embeddedt/modernfix/platform/neoforge/ModernFixPlatformHooksImpl.java diff --git a/common/src/main/java/org/embeddedt/modernfix/registry/LifecycleMap.java b/src/main/java/org/embeddedt/modernfix/registry/LifecycleMap.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/registry/LifecycleMap.java rename to src/main/java/org/embeddedt/modernfix/registry/LifecycleMap.java diff --git a/common/src/main/java/org/embeddedt/modernfix/render/FastItemRenderType.java b/src/main/java/org/embeddedt/modernfix/render/FastItemRenderType.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/render/FastItemRenderType.java rename to src/main/java/org/embeddedt/modernfix/render/FastItemRenderType.java diff --git a/common/src/main/java/org/embeddedt/modernfix/render/RenderState.java b/src/main/java/org/embeddedt/modernfix/render/RenderState.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/render/RenderState.java rename to src/main/java/org/embeddedt/modernfix/render/RenderState.java diff --git a/common/src/main/java/org/embeddedt/modernfix/render/SimpleItemModelView.java b/src/main/java/org/embeddedt/modernfix/render/SimpleItemModelView.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/render/SimpleItemModelView.java rename to src/main/java/org/embeddedt/modernfix/render/SimpleItemModelView.java diff --git a/common/src/main/java/org/embeddedt/modernfix/render/font/CompactUnihexContents.java b/src/main/java/org/embeddedt/modernfix/render/font/CompactUnihexContents.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/render/font/CompactUnihexContents.java rename to src/main/java/org/embeddedt/modernfix/render/font/CompactUnihexContents.java diff --git a/common/src/main/java/org/embeddedt/modernfix/resources/ICachingResourcePack.java b/src/main/java/org/embeddedt/modernfix/resources/ICachingResourcePack.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/resources/ICachingResourcePack.java rename to src/main/java/org/embeddedt/modernfix/resources/ICachingResourcePack.java diff --git a/common/src/main/java/org/embeddedt/modernfix/resources/PackResourcesCacheEngine.java b/src/main/java/org/embeddedt/modernfix/resources/PackResourcesCacheEngine.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/resources/PackResourcesCacheEngine.java rename to src/main/java/org/embeddedt/modernfix/resources/PackResourcesCacheEngine.java diff --git a/common/src/main/java/org/embeddedt/modernfix/resources/ReloadExecutor.java b/src/main/java/org/embeddedt/modernfix/resources/ReloadExecutor.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/resources/ReloadExecutor.java rename to src/main/java/org/embeddedt/modernfix/resources/ReloadExecutor.java diff --git a/common/src/main/java/org/embeddedt/modernfix/screen/ModernFixConfigScreen.java b/src/main/java/org/embeddedt/modernfix/screen/ModernFixConfigScreen.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/screen/ModernFixConfigScreen.java rename to src/main/java/org/embeddedt/modernfix/screen/ModernFixConfigScreen.java diff --git a/common/src/main/java/org/embeddedt/modernfix/screen/ModernFixOptionInfoScreen.java b/src/main/java/org/embeddedt/modernfix/screen/ModernFixOptionInfoScreen.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/screen/ModernFixOptionInfoScreen.java rename to src/main/java/org/embeddedt/modernfix/screen/ModernFixOptionInfoScreen.java diff --git a/common/src/main/java/org/embeddedt/modernfix/screen/OptionList.java b/src/main/java/org/embeddedt/modernfix/screen/OptionList.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/screen/OptionList.java rename to src/main/java/org/embeddedt/modernfix/screen/OptionList.java diff --git a/common/src/main/java/org/embeddedt/modernfix/spark/SparkLaunchProfiler.java b/src/main/java/org/embeddedt/modernfix/spark/SparkLaunchProfiler.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/spark/SparkLaunchProfiler.java rename to src/main/java/org/embeddedt/modernfix/spark/SparkLaunchProfiler.java diff --git a/common/src/main/java/org/embeddedt/modernfix/textures/StbStitcher.java b/src/main/java/org/embeddedt/modernfix/textures/StbStitcher.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/textures/StbStitcher.java rename to src/main/java/org/embeddedt/modernfix/textures/StbStitcher.java diff --git a/common/src/main/java/org/embeddedt/modernfix/util/CacheUtil.java b/src/main/java/org/embeddedt/modernfix/util/CacheUtil.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/util/CacheUtil.java rename to src/main/java/org/embeddedt/modernfix/util/CacheUtil.java diff --git a/common/src/main/java/org/embeddedt/modernfix/util/ClassInfoManager.java b/src/main/java/org/embeddedt/modernfix/util/ClassInfoManager.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/util/ClassInfoManager.java rename to src/main/java/org/embeddedt/modernfix/util/ClassInfoManager.java diff --git a/common/src/main/java/org/embeddedt/modernfix/util/CommonModUtil.java b/src/main/java/org/embeddedt/modernfix/util/CommonModUtil.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/util/CommonModUtil.java rename to src/main/java/org/embeddedt/modernfix/util/CommonModUtil.java diff --git a/common/src/main/java/org/embeddedt/modernfix/util/ConcurrencySanitizingMap.java b/src/main/java/org/embeddedt/modernfix/util/ConcurrencySanitizingMap.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/util/ConcurrencySanitizingMap.java rename to src/main/java/org/embeddedt/modernfix/util/ConcurrencySanitizingMap.java diff --git a/common/src/main/java/org/embeddedt/modernfix/util/DirectExecutorService.java b/src/main/java/org/embeddedt/modernfix/util/DirectExecutorService.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/util/DirectExecutorService.java rename to src/main/java/org/embeddedt/modernfix/util/DirectExecutorService.java diff --git a/common/src/main/java/org/embeddedt/modernfix/util/DummyList.java b/src/main/java/org/embeddedt/modernfix/util/DummyList.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/util/DummyList.java rename to src/main/java/org/embeddedt/modernfix/util/DummyList.java diff --git a/common/src/main/java/org/embeddedt/modernfix/util/DynamicInt2ObjectMap.java b/src/main/java/org/embeddedt/modernfix/util/DynamicInt2ObjectMap.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/util/DynamicInt2ObjectMap.java rename to src/main/java/org/embeddedt/modernfix/util/DynamicInt2ObjectMap.java diff --git a/common/src/main/java/org/embeddedt/modernfix/util/DynamicMap.java b/src/main/java/org/embeddedt/modernfix/util/DynamicMap.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/util/DynamicMap.java rename to src/main/java/org/embeddedt/modernfix/util/DynamicMap.java diff --git a/common/src/main/java/org/embeddedt/modernfix/util/DynamicOverridableMap.java b/src/main/java/org/embeddedt/modernfix/util/DynamicOverridableMap.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/util/DynamicOverridableMap.java rename to src/main/java/org/embeddedt/modernfix/util/DynamicOverridableMap.java diff --git a/common/src/main/java/org/embeddedt/modernfix/util/EitherUtil.java b/src/main/java/org/embeddedt/modernfix/util/EitherUtil.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/util/EitherUtil.java rename to src/main/java/org/embeddedt/modernfix/util/EitherUtil.java diff --git a/common/src/main/java/org/embeddedt/modernfix/util/FileUtil.java b/src/main/java/org/embeddedt/modernfix/util/FileUtil.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/util/FileUtil.java rename to src/main/java/org/embeddedt/modernfix/util/FileUtil.java diff --git a/common/src/main/java/org/embeddedt/modernfix/util/ForwardingInclDefaultsMap.java b/src/main/java/org/embeddedt/modernfix/util/ForwardingInclDefaultsMap.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/util/ForwardingInclDefaultsMap.java rename to src/main/java/org/embeddedt/modernfix/util/ForwardingInclDefaultsMap.java diff --git a/common/src/main/java/org/embeddedt/modernfix/util/ItemMesherMap.java b/src/main/java/org/embeddedt/modernfix/util/ItemMesherMap.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/util/ItemMesherMap.java rename to src/main/java/org/embeddedt/modernfix/util/ItemMesherMap.java diff --git a/common/src/main/java/org/embeddedt/modernfix/util/LRUMap.java b/src/main/java/org/embeddedt/modernfix/util/LRUMap.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/util/LRUMap.java rename to src/main/java/org/embeddedt/modernfix/util/LRUMap.java diff --git a/common/src/main/java/org/embeddedt/modernfix/util/LambdaMap.java b/src/main/java/org/embeddedt/modernfix/util/LambdaMap.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/util/LambdaMap.java rename to src/main/java/org/embeddedt/modernfix/util/LambdaMap.java diff --git a/common/src/main/java/org/embeddedt/modernfix/util/NamedPreparableResourceListener.java b/src/main/java/org/embeddedt/modernfix/util/NamedPreparableResourceListener.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/util/NamedPreparableResourceListener.java rename to src/main/java/org/embeddedt/modernfix/util/NamedPreparableResourceListener.java diff --git a/common/src/main/java/org/embeddedt/modernfix/util/PackTypeHelper.java b/src/main/java/org/embeddedt/modernfix/util/PackTypeHelper.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/util/PackTypeHelper.java rename to src/main/java/org/embeddedt/modernfix/util/PackTypeHelper.java diff --git a/common/src/main/java/org/embeddedt/modernfix/util/TimeFormatter.java b/src/main/java/org/embeddedt/modernfix/util/TimeFormatter.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/util/TimeFormatter.java rename to src/main/java/org/embeddedt/modernfix/util/TimeFormatter.java diff --git a/common/src/main/java/org/embeddedt/modernfix/util/blockpos/SectionBlockPosIterator.java b/src/main/java/org/embeddedt/modernfix/util/blockpos/SectionBlockPosIterator.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/util/blockpos/SectionBlockPosIterator.java rename to src/main/java/org/embeddedt/modernfix/util/blockpos/SectionBlockPosIterator.java diff --git a/common/src/main/java/org/embeddedt/modernfix/world/IntegratedWatchdog.java b/src/main/java/org/embeddedt/modernfix/world/IntegratedWatchdog.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/world/IntegratedWatchdog.java rename to src/main/java/org/embeddedt/modernfix/world/IntegratedWatchdog.java diff --git a/common/src/main/java/org/embeddedt/modernfix/world/StrongholdLocationCache.java b/src/main/java/org/embeddedt/modernfix/world/StrongholdLocationCache.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/world/StrongholdLocationCache.java rename to src/main/java/org/embeddedt/modernfix/world/StrongholdLocationCache.java diff --git a/common/src/main/java/org/embeddedt/modernfix/world/ThreadDumper.java b/src/main/java/org/embeddedt/modernfix/world/ThreadDumper.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/world/ThreadDumper.java rename to src/main/java/org/embeddedt/modernfix/world/ThreadDumper.java diff --git a/common/src/main/java/org/embeddedt/modernfix/world/gen/PositionalBiomeGetter.java b/src/main/java/org/embeddedt/modernfix/world/gen/PositionalBiomeGetter.java similarity index 100% rename from common/src/main/java/org/embeddedt/modernfix/world/gen/PositionalBiomeGetter.java rename to src/main/java/org/embeddedt/modernfix/world/gen/PositionalBiomeGetter.java diff --git a/src/main/resources/META-INF/accesstransformer.cfg b/src/main/resources/META-INF/accesstransformer.cfg new file mode 100644 index 00000000..e727b039 --- /dev/null +++ b/src/main/resources/META-INF/accesstransformer.cfg @@ -0,0 +1,55 @@ + +public net.minecraft.world.level.levelgen.SurfaceRules$Context +public net.minecraft.world.item.crafting.Ingredient$Value +public net.minecraft.client.renderer.block.model.multipart.MultiPart definition +public net.minecraft.client.resources.model.ModelBakery$ModelBakerImpl +public net.minecraft.client.resources.model.ModelBakery$ModelBakerImpl (Lnet/minecraft/client/resources/model/ModelBakery;Lnet/minecraft/client/resources/model/ModelBakery$TextureGetter;Lnet/minecraft/client/resources/model/ModelResourceLocation;)V +public net.minecraft.world.level.levelgen.SurfaceRules$SequenceRule +public net.minecraft.client.renderer.block.model.BlockModel GSON +public net.minecraft.server.packs.resources.ProfiledReloadInstance$State reloadNanos +public net.minecraft.server.packs.resources.ProfiledReloadInstance$State preparationNanos +public net.minecraft.server.MinecraftServer$ReloadableResources +public net.minecraft.resources.ResourceKey (Lnet/minecraft/resources/ResourceLocation;Lnet/minecraft/resources/ResourceLocation;)V +public net.minecraft.server.level.ServerChunkCache$MainThreadExecutor +public net.minecraft.client.renderer.texture.Stitcher$Holder +public net.minecraft.client.renderer.texture.Stitcher$Holder width +public net.minecraft.client.renderer.texture.Stitcher$Holder height +public net.minecraft.client.resources.model.ModelBakery getModel(Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/client/resources/model/UnbakedModel; +public net.minecraft.world.level.levelgen.DensityFunctions$Marker +public net.minecraft.world.level.levelgen.DensityFunctions$Marker (Lnet/minecraft/world/level/levelgen/DensityFunctions$Marker$Type;Lnet/minecraft/world/level/levelgen/DensityFunction;)V +public-f net.minecraft.client.renderer.block.model.ItemOverrides$BakedOverride model +public net.minecraft.client.multiplayer.SessionSearchTrees$Key +public net.minecraft.server.MinecraftServer resources +public net.minecraft.Util makeExecutor(Ljava/lang/String;)Ljava/util/concurrent/ExecutorService; +public net.minecraft.world.level.levelgen.SurfaceRules$Condition +public net.minecraft.world.level.levelgen.DensityFunctions$Marker$Type +public net.minecraft.client.multiplayer.ClientChunkCache$Storage +public net.minecraft.client.multiplayer.ClientChunkCache$Storage chunks +public net.minecraft.world.level.block.state.BlockBehaviour$BlockStateBase$Cache +public net.minecraft.world.level.levelgen.DensityFunctions$MulOrAdd +public net.minecraft.world.level.levelgen.DensityFunctions$MulOrAdd (Lnet/minecraft/world/level/levelgen/DensityFunctions$MulOrAdd$Type;Lnet/minecraft/world/level/levelgen/DensityFunction;DDD)V +public net.minecraft.world.level.chunk.PalettedContainer$Data +public net.minecraft.world.level.levelgen.DensityFunctions$Mapped$Type +public net.minecraft.client.renderer.block.model.BlockElementFace$Deserializer +public net.minecraft.world.level.Level blockEntityTickers +public net.minecraft.world.level.levelgen.DensityFunctions$Mapped +public net.minecraft.world.level.levelgen.DensityFunctions$Mapped (Lnet/minecraft/world/level/levelgen/DensityFunctions$Mapped$Type;Lnet/minecraft/world/level/levelgen/DensityFunction;DD)V +public net.minecraft.world.level.block.state.BlockBehaviour properties +public-f net.minecraft.client.multiplayer.ClientChunkCache lightEngine +public net.minecraft.client.multiplayer.ClientChunkCache storage +public 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; +public net.minecraft.world.level.levelgen.SurfaceRules$SurfaceRule +public net.minecraft.nbt.CompoundTag (Ljava/util/Map;)V +public net.minecraft.client.renderer.RenderType$CompositeRenderType +public net.minecraft.world.level.levelgen.SurfaceRules$LazyCondition +public net.minecraft.client.resources.model.ModelBakery$BakedCacheKey +public net.minecraft.client.resources.model.ModelBakery$BakedCacheKey (Lnet/minecraft/resources/ResourceLocation;Lcom/mojang/math/Transformation;Z)V +public net.minecraft.world.item.crafting.Ingredient$ItemValue +public-f net.minecraft.network.syncher.EntityDataAccessor id +public net.minecraft.server.level.ChunkMap$DistanceManager +public net.minecraft.server.level.ChunkMap updatingChunkMap +public net.minecraft.server.level.ChunkMap visibleChunkMap +public net.minecraft.server.level.ChunkMap pendingUnloads +public net.minecraft.world.level.levelgen.DensityFunctions$MulOrAdd$Type +public net.minecraft.client.renderer.entity.EnderDragonRenderer$DragonModel entity +public net.minecraft.client.KeyMapping ALL diff --git a/neoforge/src/main/resources/META-INF/neoforge.mods.toml b/src/main/resources/META-INF/neoforge.mods.toml similarity index 97% rename from neoforge/src/main/resources/META-INF/neoforge.mods.toml rename to src/main/resources/META-INF/neoforge.mods.toml index 4e5aa96e..59defa9c 100644 --- a/neoforge/src/main/resources/META-INF/neoforge.mods.toml +++ b/src/main/resources/META-INF/neoforge.mods.toml @@ -14,10 +14,7 @@ license = "GNU LGPL 3.0" issueTrackerURL="https://github.com/embeddedt/ModernFix/issues" #optional [[mixins]] -config="modernfix-common.mixins.json" - -[[mixins]] -config="modernfix-neoforge.mixins.json" +config="modernfix-modernfix.mixins.json" # A list of mods - how many allowed here is determined by the individual mod loader [[mods]] #mandatory diff --git a/common/src/main/resources/assets/modernfix/lang/de_de.json b/src/main/resources/assets/modernfix/lang/de_de.json similarity index 100% rename from common/src/main/resources/assets/modernfix/lang/de_de.json rename to src/main/resources/assets/modernfix/lang/de_de.json diff --git a/common/src/main/resources/assets/modernfix/lang/en_us.json b/src/main/resources/assets/modernfix/lang/en_us.json similarity index 100% rename from common/src/main/resources/assets/modernfix/lang/en_us.json rename to src/main/resources/assets/modernfix/lang/en_us.json diff --git a/common/src/main/resources/assets/modernfix/lang/es_mx.json b/src/main/resources/assets/modernfix/lang/es_mx.json similarity index 100% rename from common/src/main/resources/assets/modernfix/lang/es_mx.json rename to src/main/resources/assets/modernfix/lang/es_mx.json diff --git a/common/src/main/resources/assets/modernfix/lang/it_it.json b/src/main/resources/assets/modernfix/lang/it_it.json similarity index 100% rename from common/src/main/resources/assets/modernfix/lang/it_it.json rename to src/main/resources/assets/modernfix/lang/it_it.json diff --git a/common/src/main/resources/assets/modernfix/lang/ja_jp.json b/src/main/resources/assets/modernfix/lang/ja_jp.json similarity index 100% rename from common/src/main/resources/assets/modernfix/lang/ja_jp.json rename to src/main/resources/assets/modernfix/lang/ja_jp.json diff --git a/common/src/main/resources/assets/modernfix/lang/ru_ru.json b/src/main/resources/assets/modernfix/lang/ru_ru.json similarity index 100% rename from common/src/main/resources/assets/modernfix/lang/ru_ru.json rename to src/main/resources/assets/modernfix/lang/ru_ru.json diff --git a/common/src/main/resources/assets/modernfix/lang/vi_vn.json b/src/main/resources/assets/modernfix/lang/vi_vn.json similarity index 100% rename from common/src/main/resources/assets/modernfix/lang/vi_vn.json rename to src/main/resources/assets/modernfix/lang/vi_vn.json diff --git a/common/src/main/resources/assets/modernfix/lang/zh_cn.json b/src/main/resources/assets/modernfix/lang/zh_cn.json similarity index 100% rename from common/src/main/resources/assets/modernfix/lang/zh_cn.json rename to src/main/resources/assets/modernfix/lang/zh_cn.json diff --git a/common/src/main/resources/assets/modernfix/lang/zh_tw.json b/src/main/resources/assets/modernfix/lang/zh_tw.json similarity index 100% rename from common/src/main/resources/assets/modernfix/lang/zh_tw.json rename to src/main/resources/assets/modernfix/lang/zh_tw.json diff --git a/common/src/main/resources/icon.png b/src/main/resources/icon.png similarity index 100% rename from common/src/main/resources/icon.png rename to src/main/resources/icon.png diff --git a/common/src/main/resources/modernfix/option_categories.json b/src/main/resources/modernfix/option_categories.json similarity index 100% rename from common/src/main/resources/modernfix/option_categories.json rename to src/main/resources/modernfix/option_categories.json diff --git a/neoforge/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta similarity index 100% rename from neoforge/src/main/resources/pack.mcmeta rename to src/main/resources/pack.mcmeta