diff --git a/forge/build.gradle b/forge/build.gradle index c2332fca..9f4e09f4 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -44,7 +44,7 @@ dependencies { modCompileOnly("mezz.jei:jei-${minecraft_version}-forge:${jei_version}") modCompileOnly("curse.maven:jeresources-240630:3951643") - modCompileOnly "me.shedaniel:RoughlyEnoughItems-forge:${rei_version}" + modCompileOnly("me.shedaniel:RoughlyEnoughItems-forge:${rei_version}") { transitive false } modCompileOnly("dev.latvian.mods:kubejs-forge:${kubejs_version}") modRuntimeOnly("curse.maven:ferritecore-429235:4441949") modCompileOnly("team.chisel.ctm:CTM:${ctm_version}") diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/skip_first_datapack_reload/CreateWorldScreenMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/skip_first_datapack_reload/CreateWorldScreenMixin.java deleted file mode 100644 index 5655dc2e..00000000 --- a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/skip_first_datapack_reload/CreateWorldScreenMixin.java +++ /dev/null @@ -1,36 +0,0 @@ -package org.embeddedt.modernfix.forge.mixin.perf.skip_first_datapack_reload; - -import net.minecraft.client.gui.screens.Screen; -import net.minecraft.client.gui.screens.worldselection.CreateWorldScreen; -import net.minecraft.client.gui.screens.worldselection.WorldCreationContext; -import net.minecraft.network.chat.Component; -import net.minecraft.server.packs.repository.PackRepository; -import net.minecraft.world.level.WorldDataConfiguration; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.ModifyArg; -import org.spongepowered.asm.mixin.injection.Redirect; - -import java.util.function.Consumer; - -@Mixin(CreateWorldScreen.class) -public abstract class CreateWorldScreenMixin extends Screen { - protected CreateWorldScreenMixin(Component arg) { - super(arg); - } - // TODO: incorporate https://github.com/MinecraftForge/MinecraftForge/pull/9454 - @ModifyArg(method = "openFresh", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screens/worldselection/CreateWorldScreen;createDefaultLoadConfig(Lnet/minecraft/server/packs/repository/PackRepository;Lnet/minecraft/world/level/WorldDataConfiguration;)Lnet/minecraft/server/WorldLoader$InitConfig;"), index = 1) - private static WorldDataConfiguration useDefaultConfiguration(WorldDataConfiguration config) { - return WorldDataConfiguration.DEFAULT; - } - - @Redirect(method = "openFresh", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screens/worldselection/WorldCreationContext;withDataConfiguration(Lnet/minecraft/world/level/WorldDataConfiguration;)Lnet/minecraft/client/gui/screens/worldselection/WorldCreationContext;")) - private static WorldCreationContext sameDataConfiguration(WorldCreationContext context, WorldDataConfiguration config) { - return context; - } - - @Redirect(method = "openFresh", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screens/worldselection/CreateWorldScreen;tryApplyNewDataPacks(Lnet/minecraft/server/packs/repository/PackRepository;ZLjava/util/function/Consumer;)V")) - private static void skipReapply(CreateWorldScreen screen, PackRepository repository, boolean bl, Consumer consumer) { - /* no-op */ - } -} diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml index 5dc798cb..29a2c07a 100644 --- a/forge/src/main/resources/META-INF/mods.toml +++ b/forge/src/main/resources/META-INF/mods.toml @@ -40,7 +40,7 @@ modId = "forge" #mandatory # Does this dependency have to exist - if not, ordering below must be specified mandatory = true #mandatory # The version range of the dependency -versionRange = "[45,)" #mandatory +versionRange = "[45.0.63,)" #mandatory # An ordering relationship for the dependency - BEFORE or AFTER required if the relationship is not mandatory ordering = "NONE" # Side this dependency is applied on - BOTH, CLIENT or SERVER diff --git a/gradle.properties b/gradle.properties index a5b11c62..418bceda 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ org.gradle.jvmargs=-Xmx2G mod_id=modernfix minecraft_version=1.19.4 enabled_platforms=fabric,forge -forge_version=1.19.4-45.0.22 +forge_version=1.19.4-45.0.63 parchment_version=2023.03.12 refined_storage_version=4392788 jei_version=13.1.0.2