Skip to content

Commit

Permalink
WorldDiff: structure starts comparison
Browse files Browse the repository at this point in the history
  • Loading branch information
@ishland
ishland committed Mar 5, 2022
1 parent d1abe96 commit ed07b5e
Show file tree
Hide file tree
Showing 3 changed files with 90 additions and 20 deletions.
88 changes: 68 additions & 20 deletions tests/world-diff/src/main/java/com/ishland/c2me/tests/worlddiff/ComparisonSession.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import com.google.common.collect.ImmutableSet;
import com.ibm.asyncutil.locks.AsyncSemaphore;
import com.ibm.asyncutil.locks.FairAsyncSemaphore;
import com.ishland.c2me.tests.worlddiff.mixin.IChunkSerializer;
import com.ishland.c2me.tests.worlddiff.mixin.IStorageIoWorker;
import com.ishland.c2me.tests.worlddiff.mixin.IWorldUpdater;
import com.mojang.datafixers.util.Pair;
Expand All @@ -18,13 +19,17 @@
import net.minecraft.nbt.NbtOps;
import net.minecraft.resource.DataPackSettings;
import net.minecraft.resource.FileResourcePackProvider;
import net.minecraft.resource.ResourceManager;
import net.minecraft.resource.ResourcePackManager;
import net.minecraft.resource.ResourcePackSource;
import net.minecraft.resource.ResourceType;
import net.minecraft.resource.VanillaDataPackProvider;
import net.minecraft.server.SaveLoader;
import net.minecraft.server.command.CommandManager;
import net.minecraft.state.property.Property;
import net.minecraft.structure.StructureContext;
import net.minecraft.structure.StructureManager;
import net.minecraft.structure.StructureStart;
import net.minecraft.util.Identifier;
import net.minecraft.util.Util;
import net.minecraft.util.WorldSavePath;
Expand All @@ -43,6 +48,7 @@
import net.minecraft.world.chunk.ChunkSection;
import net.minecraft.world.chunk.ChunkStatus;
import net.minecraft.world.chunk.PalettedContainer;
import net.minecraft.world.gen.feature.ConfiguredStructureFeature;
import net.minecraft.world.level.storage.LevelStorage;
import net.minecraft.world.storage.StorageIoWorker;
import net.minecraft.world.updater.WorldUpdater;
Expand Down Expand Up @@ -95,6 +101,14 @@ public void compareChunks() {
final int totalChunks = chunks.size();
final StorageIoWorker regionBaseIo = baseWorld.regionIoWorkers.get(world);
final StorageIoWorker regionTargetIo = targetWorld.regionIoWorkers.get(world);
final StructureContext baseStructureContext = new StructureContext(baseWorld.resourceManager, baseWorld.dynamicRegistryManager, baseWorld.structureManager);
final StructureContext targetStructureContext = new StructureContext(targetWorld.resourceManager, targetWorld.dynamicRegistryManager, targetWorld.structureManager);
// final Function<ConfiguredStructureFeature<?, ?>, ConcurrentHashMap<ChunkPos, ArrayList<StructureStart>>> newConcurrentHashMap = k -> new ConcurrentHashMap<>();
// final Function<ChunkPos, ArrayList<StructureStart>> newArrayList = k -> new ArrayList<>();
// ConcurrentHashMap<ConfiguredStructureFeature<?, ?>, ConcurrentHashMap<ChunkPos, ArrayList<StructureStart>>> baseStructureStarts = new ConcurrentHashMap<>();
// ConcurrentHashMap<ConfiguredStructureFeature<?, ?>, ConcurrentHashMap<ChunkPos, ArrayList<StructureStart>>> targetStructureStarts = new ConcurrentHashMap<>();
final Registry<ConfiguredStructureFeature<?, ?>> baseStructureFeatureRegistry = baseWorld.dynamicRegistryManager.get(Registry.CONFIGURED_STRUCTURE_FEATURE_KEY);
final Registry<ConfiguredStructureFeature<?, ?>> targetStructureFeatureRegistry = targetWorld.dynamicRegistryManager.get(Registry.CONFIGURED_STRUCTURE_FEATURE_KEY);
AtomicLong completedChunks = new AtomicLong();
AtomicLong completedBlocks = new AtomicLong();
AtomicLong differenceBlocks = new AtomicLong();
Expand All @@ -106,6 +120,23 @@ public void compareChunks() {
if (ChunkSerializer.getChunkType(chunkDataBase) == ChunkStatus.ChunkType.PROTOCHUNK
|| ChunkSerializer.getChunkType(chunkDataBase) == ChunkStatus.ChunkType.PROTOCHUNK)
return null;

final Map<ConfiguredStructureFeature<?, ?>, StructureStart> baseStructures = IChunkSerializer.invokeReadStructureStarts(baseStructureContext, chunkDataBase.getCompound("structures"), baseWorld.saveProperties.getGeneratorOptions().getSeed());
// .forEach((configuredStructureFeature, structureStart) -> baseStructureStarts.computeIfAbsent(configuredStructureFeature, newConcurrentHashMap).computeIfAbsent(structureStart.getPos(), newArrayList).add(structureStart));
final Map<ConfiguredStructureFeature<?, ?>, StructureStart> targetStructures = IChunkSerializer.invokeReadStructureStarts(targetStructureContext, chunkDataTarget.getCompound("structures"), targetWorld.saveProperties.getGeneratorOptions().getSeed());
// .forEach((configuredStructureFeature, structureStart) -> targetStructureStarts.computeIfAbsent(configuredStructureFeature, newConcurrentHashMap).computeIfAbsent(structureStart.getPos(), newArrayList).add(structureStart));

baseStructures.forEach((configuredStructureFeature, baseStructureStart) -> {
final Identifier id = baseStructureFeatureRegistry.getId(configuredStructureFeature);
final StructureStart targetStructureStart = targetStructures.get(targetStructureFeatureRegistry.get(id));
if (targetStructureStart == null) System.out.printf("%s not found in target world in chunk %s\n", id, pos);
});
targetStructures.forEach((configuredStructureFeature, targetStructureStart) -> {
final Identifier id = targetStructureFeatureRegistry.getId(configuredStructureFeature);
final StructureStart baseStructureStart = baseStructures.get(baseStructureFeatureRegistry.get(id));
if (baseStructureStart == null) System.out.printf("%s not found in base world in chunk %s\n", id, pos);
});

final Map<ChunkSectionPos, ChunkSection> sectionsBase = readSections(pos, chunkDataBase, baseWorld.dynamicRegistryManager.get(Registry.BIOME_KEY));
final Map<ChunkSectionPos, ChunkSection> sectionsTarget = readSections(pos, chunkDataTarget, baseWorld.dynamicRegistryManager.get(Registry.BIOME_KEY));
sectionsBase.forEach((chunkSectionPos, chunkSectionBase) -> {
Expand Down Expand Up @@ -149,6 +180,9 @@ public void compareChunks() {
} catch (InterruptedException ignored) {
}
}



System.err.printf("Comparison completed for %s: block state differences: %d / %d (%.4f%%)\n",
world, differenceBlocks.get(), completedBlocks.get(), differenceBlocks.get() / completedBlocks.floatValue() * 100.0);
System.err.print(blockDifference + "\n");
Expand Down Expand Up @@ -215,15 +249,15 @@ private static WorldHandle getWorldHandle(File worldFolder, String description)
new FileResourcePackProvider(session.getDirectory(WorldSavePath.DATAPACKS).toFile(), ResourcePackSource.PACK_SOURCE_WORLD)
);

SaveLoader lv2;
SaveLoader saveLoader;
try {
SaveLoader.FunctionLoaderConfig lv = new SaveLoader.FunctionLoaderConfig(
resourcePackManager,
CommandManager.RegistrationEnvironment.DEDICATED,
2,
false
);
lv2 = SaveLoader.ofLoaded(
saveLoader = SaveLoader.ofLoaded(
lv,
() -> {
DataPackSettings dataPackSettings = session.getDataPackSettings();
Expand Down Expand Up @@ -253,10 +287,10 @@ private static WorldHandle getWorldHandle(File worldFolder, String description)
throw new RuntimeException(var38);
}

lv2.refresh();
DynamicRegistryManager.Immutable lv = lv2.dynamicRegistryManager();
// serverPropertiesLoader.getPropertiesHandler().getGeneratorOptions(lv);
SaveProperties saveProperties = lv2.saveProperties();
saveLoader.refresh();
DynamicRegistryManager.Immutable registryManager = saveLoader.dynamicRegistryManager();
// serverPropertiesLoader.getPropertiesHandler().getGeneratorOptions(registryManager);
SaveProperties saveProperties = saveLoader.saveProperties();
if (saveProperties == null) {
resourcePackManager.close();
throw new FileNotFoundException();
Expand All @@ -277,26 +311,40 @@ private static WorldHandle getWorldHandle(File worldFolder, String description)
poiIoWorkers.put(world, new StorageIoWorker(session.getWorldDirectory(world).resolve("poi"), true, "poi") {
});
}
return new WorldHandle(chunkPosesMap, regionIoWorkers, poiIoWorkers, lv, () -> {
System.out.println("Shutting down IOWorkers...");
Stream.concat(regionIoWorkers.values().stream(), poiIoWorkers.values().stream()).forEach(storageIoWorker -> {
storageIoWorker.completeAll(true).join();
try {
storageIoWorker.close();
} catch (IOException e) {
e.printStackTrace();
return new WorldHandle(
chunkPosesMap,
regionIoWorkers,
poiIoWorkers,
saveProperties,
new StructureManager(saveLoader.resourceManager(), session, Schemas.getFixer()),
saveLoader.resourceManager(),
resourcePackManager,
registryManager,
() -> {
System.out.println("Shutting down IOWorkers...");
Stream.concat(regionIoWorkers.values().stream(), poiIoWorkers.values().stream()).forEach(storageIoWorker -> {
storageIoWorker.completeAll(true).join();
try {
storageIoWorker.close();
} catch (IOException e) {
e.printStackTrace();
}
});
System.out.println("Closing world");
resourcePackManager.close();
session.close();
System.out.println("World closed");
}
});
System.out.println("Closing world");
resourcePackManager.close();
session.close();
System.out.println("World closed");
});
);
}

public record WorldHandle(HashMap<RegistryKey<World>, List<ChunkPos>> chunkPosesMap,
HashMap<RegistryKey<World>, StorageIoWorker> regionIoWorkers,
HashMap<RegistryKey<World>, StorageIoWorker> poiIoWorkers,
SaveProperties saveProperties,
StructureManager structureManager,
ResourceManager resourceManager,
ResourcePackManager resourcePackManager,
DynamicRegistryManager dynamicRegistryManager,
Closeable handle) {
}
Expand Down
21 changes: 21 additions & 0 deletions tests/world-diff/src/main/java/com/ishland/c2me/tests/worlddiff/mixin/IChunkSerializer.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package com.ishland.c2me.tests.worlddiff.mixin;

import net.minecraft.nbt.NbtCompound;
import net.minecraft.structure.StructureContext;
import net.minecraft.structure.StructureStart;
import net.minecraft.world.ChunkSerializer;
import net.minecraft.world.gen.feature.ConfiguredStructureFeature;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Invoker;

import java.util.Map;

@Mixin(ChunkSerializer.class)
public interface IChunkSerializer {

@Invoker
static Map<ConfiguredStructureFeature<?, ?>, StructureStart> invokeReadStructureStarts(StructureContext context, NbtCompound nbt, long worldSeed) {
throw new AbstractMethodError();
}

}
1 change: 1 addition & 0 deletions tests/world-diff/src/main/resources/c2meworlddiff.mixins.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"compatibilityLevel": "JAVA_16",
"mixinPriority": 1100,
"mixins": [
"IChunkSerializer",
"IDynamicRegistryManager",
"IStorageIoWorker",
"IWorldUpdater",
Expand Down

0 comments on commit ed07b5e

Please sign in to comment.