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

Load vanilla resources if revert is required

Browse Source
This commit is contained in:
embeddedt 2023-03-18 20:31:03 -04:00
parent bc1c70bd0c
commit 55201311c7
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
2 changed files with 62 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,23 +1,51 @@
package org.embeddedt.modernfix.mixin.perf.skip_first_datapack_reload;
import com.google.common.collect.ImmutableList;
import com.mojang.datafixers.util.Pair;
import com.mojang.serialization.Lifecycle;
import it.unimi.dsi.fastutil.booleans.BooleanConsumer;
import net.minecraft.Util;
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.client.gui.screens.worldselection.WorldGenSettingsComponent;
import net.minecraft.core.RegistryAccess;
import net.minecraft.network.chat.Component;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.WorldLoader;
import net.minecraft.server.packs.PackType;
import net.minecraft.server.packs.repository.PackRepository;
import net.minecraft.server.packs.repository.ServerPacksSource;
import net.minecraft.world.level.DataPackConfig;
import net.minecraft.world.level.levelgen.WorldGenSettings;
import net.minecraft.world.level.levelgen.presets.WorldPresets;
import org.embeddedt.modernfix.ModernFix;
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.ModifyArg;
import org.spongepowered.asm.mixin.injection.Redirect;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.Executor;
@Mixin(CreateWorldScreen.class)
public class CreateWorldScreenMixin {
public abstract class CreateWorldScreenMixin extends Screen {
@Shadow protected static WorldLoader.InitConfig createDefaultLoadConfig(PackRepository arg, DataPackConfig arg2) {
throw new AssertionError();
}
@Shadow protected DataPackConfig dataPacks;
@Shadow @Final public WorldGenSettingsComponent worldGenSettingsComponent;
@Shadow protected abstract void openDataPackSelectionScreen();
protected CreateWorldScreenMixin(Component arg) {
super(arg);
}
@Redirect(method = "openFresh", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/WorldLoader;load(Lnet/minecraft/server/WorldLoader$InitConfig;Lnet/minecraft/server/WorldLoader$WorldDataSupplier;Lnet/minecraft/server/WorldLoader$ResultFactory;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;"))
private static CompletableFuture<WorldCreationContext> doLoad(WorldLoader.InitConfig config, WorldLoader.WorldDataSupplier<WorldGenSettings> supplier, WorldLoader.ResultFactory<WorldGenSettings, WorldCreationContext> factory, Executor backgroundExecutor, Executor mainExecutor) {
ModernFix.LOGGER.warn("Skipping first datapack reload");
@ -29,4 +57,36 @@ public class CreateWorldScreenMixin {
WorldCreationContext context = new WorldCreationContext(settings, Lifecycle.stable(), creationPair.getSecond(), null);
return CompletableFuture.completedFuture(context);
}
@ModifyArg(method = "*", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screens/ConfirmScreen;<init>(Lit/unimi/dsi/fastutil/booleans/BooleanConsumer;Lnet/minecraft/network/chat/Component;Lnet/minecraft/network/chat/Component;Lnet/minecraft/network/chat/Component;Lnet/minecraft/network/chat/Component;)V"), index = 0)
private BooleanConsumer replaceConsumer(BooleanConsumer consumer) {
return bl -> {
if(bl) {
// just open the selection screen again
this.openDataPackSelectionScreen();
} else {
this.dataPacks = new DataPackConfig(ImmutableList.of("vanilla"), ImmutableList.of());
this.mfix$loadVanillaResources();
this.minecraft.setScreen(this);
}
};
}
private void mfix$loadVanillaResources() {
ModernFix.LOGGER.warn("Loading vanilla resources");
// We now need to perform the reload that was skipped above
PackRepository packrepository = new PackRepository(PackType.SERVER_DATA, new ServerPacksSource());
WorldLoader.InitConfig vanillaConfig = createDefaultLoadConfig(packrepository, new DataPackConfig(ImmutableList.of("vanilla"), ImmutableList.of()));
CompletableFuture<WorldCreationContext> completablefuture = WorldLoader.load(vanillaConfig, (argx, arg2x) -> {
RegistryAccess.Frozen registryaccess$frozen = RegistryAccess.builtinCopy().freeze();
WorldGenSettings worldgensettings = WorldPresets.createNormalWorldFromPreset(registryaccess$frozen);
return Pair.of(worldgensettings, registryaccess$frozen);
}, (argx, arg2x, arg3, arg4) -> {
argx.close();
return new WorldCreationContext(arg4, Lifecycle.stable(), arg3, arg2x);
}, Util.backgroundExecutor(), this.minecraft);
this.minecraft.managedBlock(completablefuture::isDone);
this.worldGenSettingsComponent.updateSettings(completablefuture.join());
this.rebuildWidgets();
}
}

1
src/main/resources/META-INF/accesstransformer.cfg
View File

@ -12,3 +12,4 @@ public net.minecraft.client.Minecraft f_90999_ # progressListener
public-f net.minecraft.network.syncher.EntityDataAccessor f_135010_ # id
public-f net.minecraft.network.syncher.SynchedEntityData f_135345_ # itemsById
public-f net.minecraft.network.syncher.SynchedEntityData f_135346_ # lock
public net.minecraft.client.gui.screens.worldselection.WorldGenSettingsComponent m_233042_(Lnet/minecraft/client/gui/screens/worldselection/WorldCreationContext;)V # updateSettings