R3944Realms/ModernFix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bump required Forge version, drop datapack reload patch

Browse Source 
https://github.com/MinecraftForge/MinecraftForge/pull/9454 has been
merged upstream
This commit is contained in:
embeddedt 2023-05-15 19:43:31 -04:00
parent b1fb365f22
commit d2d5f81782
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
4 changed files with 3 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
forge/build.gradle
View File

@ -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}")

36
forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/skip_first_datapack_reload/CreateWorldScreenMixin.java
View File

@ -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<WorldDataConfiguration> consumer) {
/* no-op */
}
}

2
forge/src/main/resources/META-INF/mods.toml
View File

@ -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

2
gradle.properties
View File

@ -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