Fix world upgrade for pre flattening worlds

Author: aromaa

src/main/java/org/spongepowered/common/bridge/world/level/storage/DimensionDataStorageBridge.java

@@ -0,0 +1,35 @@
+/*
+ * This file is part of Sponge, licensed under the MIT License (MIT).
+ *
+ * Copyright (c) SpongePowered <https://www.spongepowered.org>
+ * Copyright (c) contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package org.spongepowered.common.bridge.world.level.storage;
+
+import net.minecraft.resources.ResourceLocation;
+import org.checkerframework.checker.nullness.qual.Nullable;
+
+public interface DimensionDataStorageBridge {
+
+    void bridge$dimensionKey(@Nullable ResourceLocation dimensionKey);
+
+    @Nullable ResourceLocation bridge$dimensionKey();
+}

src/main/java/org/spongepowered/common/hooks/PlatformHooks.java

@@ -51,7 +51,6 @@ public final class PlatformHooks {
     private DimensionHooks dimensionHooks = new DimensionHooks() {};
     private EventHooks eventHooks = new EventHooks() {};
     private GeneralHooks generalHooks = new GeneralHooks() {};
-    private WorldGenerationHooks worldGenerationHooks = new WorldGenerationHooks() {};
     private InventoryHooks inventoryHooks = new InventoryHooks() {};
     private WorldHooks worldHooks = new WorldHooks() {};
     private ItemHooks itemHooks = new ItemHooks() {};
@@ -82,14 +81,6 @@ public void setGeneralHooks(final GeneralHooks generalHooks) {
         this.generalHooks = Objects.requireNonNull(generalHooks);
     }
 
-    public WorldGenerationHooks getWorldGenerationHooks() {
-        return this.worldGenerationHooks;
-    }
-
-    public void setWorldGenerationHooks(final WorldGenerationHooks worldGenerationHooks) {
-        this.worldGenerationHooks = Objects.requireNonNull(worldGenerationHooks);
-    }
-
     public InventoryHooks getInventoryHooks() {
         return this.inventoryHooks;
     }

src/main/java/org/spongepowered/common/hooks/WorldGenerationHooks.java

@@ -59,6 +59,7 @@
 import net.minecraft.world.level.entity.PersistentEntitySectionManager;
 import net.minecraft.world.level.gameevent.GameEvent;
 import net.minecraft.world.level.material.Fluid;
+import net.minecraft.world.level.storage.DimensionDataStorage;
 import net.minecraft.world.level.storage.LevelData;
 import net.minecraft.world.level.storage.LevelStorageSource;
 import net.minecraft.world.level.storage.ServerLevelData;
@@ -104,6 +105,7 @@
 import org.spongepowered.common.bridge.world.level.border.WorldBorderBridge;
 import org.spongepowered.common.bridge.world.level.chunk.LevelChunkBridge;
 import org.spongepowered.common.bridge.world.level.dimension.DimensionTypeBridge;
+import org.spongepowered.common.bridge.world.level.storage.DimensionDataStorageBridge;
 import org.spongepowered.common.bridge.world.level.storage.ServerLevelDataBridge;
 import org.spongepowered.common.bridge.world.ticks.LevelTicksBridge;
 import org.spongepowered.common.config.SpongeGameConfigs;
@@ -141,7 +143,7 @@ public abstract class ServerLevelMixin extends LevelMixin implements ServerLevel
 
     @Shadow public abstract void levelEvent(@Nullable Player $$0, int $$1, BlockPos $$2, int $$3);
     @Shadow @Nullable private EndDragonFight dragonFight;
-
+    @Shadow public abstract DimensionDataStorage shadow$getDataStorage();
     // @formatter:on
 
 
@@ -227,6 +229,9 @@ public abstract class ServerLevelMixin extends LevelMixin implements ServerLevel
 
         super.bridge$adjustDimensionLogic(dimensionType);
 
+        ((DimensionDataStorageBridge) this.shadow$getDataStorage()).bridge$dimensionKey(
+            this.registryAccess().registryOrThrow(Registries.DIMENSION_TYPE).getKey(dimensionType));
+
         // TODO Minecraft 1.16.2 - Rebuild level stems, get generator from type, set generator
         // TODO ...or cache generator on type?
 

src/mixins/java/org/spongepowered/common/mixin/core/server/level/ServerLevelMixin.java

@@ -24,24 +24,26 @@
  */
 package org.spongepowered.common.mixin.core.world.level.levelgen.structure;
 
+import net.minecraft.core.registries.Registries;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.levelgen.structure.LegacyStructureDataHandler;
 import net.minecraft.world.level.storage.DimensionDataStorage;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Overwrite;
-import org.spongepowered.common.hooks.PlatformHooks;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.ModifyVariable;
+import org.spongepowered.common.bridge.world.level.storage.DimensionDataStorageBridge;
+
+import java.util.Optional;
 
 @Mixin(LegacyStructureDataHandler.class)
 public abstract class LegacyStructureDataHandlerMixin {
 
-    /**
-     * @author zidane - November, 26th 2020 - Minecraft 1.15.2
-     * @reason Allow the platform to determine how to create the legacy structure data updater
-     */
-    @Overwrite
-    public static LegacyStructureDataHandler getLegacyStructureHandler(final ResourceKey<Level> dimension, final @Nullable DimensionDataStorage savedData) {
-        return PlatformHooks.INSTANCE.getWorldGenerationHooks().createLegacyStructureDataUtil(dimension, savedData);
+    @ModifyVariable(method = "getLegacyStructureHandler", at = @At("HEAD"), argsOnly = true)
+    private static ResourceKey<Level> impl$fixupLevelDimension(final ResourceKey<Level> dimension, final ResourceKey<Level> $$0, final @Nullable DimensionDataStorage $$1) {
+        return Optional.ofNullable(((DimensionDataStorageBridge) $$1).bridge$dimensionKey())
+            .map(k -> ResourceKey.create(Registries.DIMENSION, k))
+            .orElse(dimension);
     }
 }

src/mixins/java/org/spongepowered/common/mixin/core/world/level/levelgen/structure/LegacyStructureDataHandlerMixin.java

@@ -26,22 +26,29 @@
 
 import net.minecraft.core.HolderLookup;
 import net.minecraft.nbt.CompoundTag;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.datafix.DataFixTypes;
 import net.minecraft.world.level.saveddata.SavedData;
 import net.minecraft.world.level.storage.DimensionDataStorage;
+import org.checkerframework.checker.nullness.qual.Nullable;
 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.CallbackInfoReturnable;
 import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
 import org.spongepowered.common.bridge.data.DataCompoundHolder;
+import org.spongepowered.common.bridge.world.level.storage.DimensionDataStorageBridge;
 import org.spongepowered.common.data.DataUtil;
 
 import java.io.File;
 import java.util.function.BiFunction;
 
 @Mixin(DimensionDataStorage.class)
-public abstract class DimensionDataStorageMixin {
+public abstract class DimensionDataStorageMixin implements DimensionDataStorageBridge {
+
+    // @formatter:off
+    private @Nullable ResourceLocation impl$dimensionKey;
+    // @formatter:on
 
     @Inject(method = "readSavedData", at = @At(value = "RETURN", ordinal = 0), locals = LocalCapture.CAPTURE_FAILHARD)
     public void readSpongeMapData(BiFunction<CompoundTag, HolderLookup.Provider, SavedData> var1, DataFixTypes $$1, String var2,
@@ -54,4 +61,14 @@ public void readSpongeMapData(BiFunction<CompoundTag, HolderLookup.Provider, Sav
             ((DataCompoundHolder) savedData).data$setCompound(null);
         }
     }
+
+    @Override
+    public void bridge$dimensionKey(final @Nullable ResourceLocation dimensionKey) {
+        this.impl$dimensionKey = dimensionKey;
+    }
+
+    @Override
+    public @Nullable ResourceLocation bridge$dimensionKey() {
+        return this.impl$dimensionKey;
+    }
 }