From 1ccb1af517661525e9c875c918efc13dc3e7a2b5 Mon Sep 17 00:00:00 2001 From: Frank Date: Fri, 28 Oct 2022 16:01:35 +0200 Subject: [PATCH] Removed WorldPreset Preload --- .../together/levelgen/WorldGenUtil.java | 91 ------------------- .../WorldGenSettingsComponentMixin.java | 2 - .../together/world/event/WorldBootstrap.java | 2 - 3 files changed, 95 deletions(-) diff --git a/src/main/java/org/betterx/worlds/together/levelgen/WorldGenUtil.java b/src/main/java/org/betterx/worlds/together/levelgen/WorldGenUtil.java index 5229938b..0c82377a 100644 --- a/src/main/java/org/betterx/worlds/together/levelgen/WorldGenUtil.java +++ b/src/main/java/org/betterx/worlds/together/levelgen/WorldGenUtil.java @@ -78,97 +78,6 @@ public class WorldGenUtil { ); } -// @ApiStatus.Internal - //TODO: 1.19.3 Disabled for now -// public static Pair defaultWorldDataSupplier( -// RegistryOps loaderOps, -// RegistryAccess.Frozen frozen -// ) { -// WorldDimensions defaultGen = createDefaultWorldFromPreset(frozen); -// RegistryOps registryOps = RegistryOps.create(JsonOps.INSTANCE, frozen); -// -// WorldDimensions worldGenSettings = WorldDimensions.CODEC -// .codec().parse(registryOps, defaultGen) -// .flatMap(json -> WorldDimensions.CODEC.codec().parse( -// loaderOps, -// json -// )) -// .getOrThrow( -// false, -// Util.prefix( -// "Error parsing worldgen settings after loading data packs: ", -// WorldsTogether.LOGGER::error -// ) -// ); -//// WorldGenSettings worldGenSettings = createDefaultWorldFromPreset(frozen); -// return Pair.of(worldGenSettings, frozen); -// } - -// private static final Map, Map, LevelStem>> WORLD_PRESET_MAP = new HashMap<>(); -// -// @ApiStatus.Internal -// public static Map, LevelStem> getDimensionsWithModData(ResourceKey preset) { -// var data = WORLD_PRESET_MAP.get(preset); -// if (data == null) return new HashMap<>(); -// return data; -// } - - @ApiStatus.Internal - public static Holder reloadWithModData(Holder preset) { -// if (preset.value() instanceof WorldPresetAccessor acc) { -// var data = WORLD_PRESET_MAP.get(preset.unwrapKey().orElseThrow()); -// if (data != null) { -// acc.bcl_setDimensions(data); -// } -// } - return preset; - } - - public static void clearPreloadedWorldPresets() { -// WORLD_PRESET_MAP.clear(); - } - -// public static void preloadWorldPresets(ResourceManager resourceManager, RegistryAccess.Writable writable) { -// clearPreloadedWorldPresets(); -// Registry registry = writable.registryOrThrow(Registry.WORLD_PRESET_REGISTRY); -// //for (ResourceKey key : registry.registryKeySet()) -// ResourceKey key = net.minecraft.world.level.levelgen.presets.WorldPresets.NORMAL; -// { -// RegistryOps loaderOps = RegistryOps.createAndLoad( -// JsonOps.INSTANCE, writable, resourceManager -// ); -// Holder in = registry.getHolderOrThrow(key); -// if (in.unwrapKey().isPresent()) { -// RegistryOps registryOps = RegistryOps.create(JsonOps.INSTANCE, writable); -// WorldGenSettings settings = WorldGenUtil.createWorldFromPreset( -// in.unwrapKey().orElseThrow(), -// writable, -// RandomSource.create().nextLong(), -// true, -// false -// ); -// WorldGenSettings worldGenSettings = WorldGenSettings.CODEC -// .encodeStart(registryOps, settings) -// .flatMap(json -> WorldGenSettings.CODEC.parse( -// loaderOps, -// json -// )) -// .getOrThrow( -// false, -// Util.prefix( -// "Error parsing world preset settings after loading data packs: ", -// WorldsTogether.LOGGER::error -// ) -// ); -// ImmutableMap.Builder, LevelStem> map = ImmutableMap.builder(); -// for (Map.Entry, LevelStem> entry : worldGenSettings.dimensions().entrySet()) { -// map.put(entry.getKey(), entry.getValue()); -// } -// WORLD_PRESET_MAP.put(key, map.build()); -// } -// } -// } - public static WorldDimensions createDefaultWorldFromPreset(RegistryAccess registryAccess, long seed) { return createDefaultWorldFromPreset(registryAccess, seed, true, false); } diff --git a/src/main/java/org/betterx/worlds/together/mixin/client/WorldGenSettingsComponentMixin.java b/src/main/java/org/betterx/worlds/together/mixin/client/WorldGenSettingsComponentMixin.java index f8d41848..a539204e 100644 --- a/src/main/java/org/betterx/worlds/together/mixin/client/WorldGenSettingsComponentMixin.java +++ b/src/main/java/org/betterx/worlds/together/mixin/client/WorldGenSettingsComponentMixin.java @@ -1,6 +1,5 @@ package org.betterx.worlds.together.mixin.client; -import org.betterx.worlds.together.levelgen.WorldGenUtil; import org.betterx.worlds.together.worldPreset.WorldGenSettingsComponentAccessor; import net.minecraft.client.gui.screens.worldselection.WorldCreationContext; @@ -72,7 +71,6 @@ public abstract class WorldGenSettingsComponentMixin implements WorldGenSettings custom.addAll(list .stream() .filter(vanilla) - .map(WorldGenUtil::reloadWithModData) .toList()); return custom; diff --git a/src/main/java/org/betterx/worlds/together/world/event/WorldBootstrap.java b/src/main/java/org/betterx/worlds/together/world/event/WorldBootstrap.java index 75b891e7..839ccb26 100644 --- a/src/main/java/org/betterx/worlds/together/world/event/WorldBootstrap.java +++ b/src/main/java/org/betterx/worlds/together/world/event/WorldBootstrap.java @@ -219,7 +219,6 @@ public class WorldBootstrap { String levelID, LevelStorageSource levelSource ) { - WorldGenUtil.clearPreloadedWorldPresets(); try { var levelStorageAccess = levelSource.createAccess(levelID); WorldBootstrap.setupWorld( @@ -299,7 +298,6 @@ public class WorldBootstrap { public static void finishedWorldLoad() { WorldEventsImpl.ON_WORLD_LOAD.emit(OnWorldLoad::onLoad); - WorldGenUtil.clearPreloadedWorldPresets(); } public static void finalizeWorldGenSettings(Registry dimensionRegistry) {