From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Apehum Date: Thu, 9 Dec 2021 02:18:17 +0800 Subject: [PATCH] Feature Secure Seed diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java index ebfaa8d5de5b905bd2dd7778728b8c9939d01252..2bbbc973ddf2b67bdaa142bde67eb493049f8ebc 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServerProperties.java @@ -121,7 +121,7 @@ public class DedicatedServerProperties extends Settings { + this.worldGenProperties = new DedicatedServerProperties.WorldGenProperties(this.get("level-seed", ""), this.get("feature-level-seed", ""), (JsonObject) this.get("generator-settings", (s) -> { return GsonHelper.parse(!s.isEmpty() ? s : "{}"); }, new JsonObject()), this.get("generate-structures", true), (String) this.get("level-type", (s) -> { return s.toLowerCase(Locale.ROOT); @@ -154,8 +154,8 @@ public class DedicatedServerProperties extends Settings biomeRegistry; // CraftBukkit end + // Matter start + public boolean isSlimeChunk() { + if (!hasComputedSlimeChunk) { + hasComputedSlimeChunk = true; + slimeChunk = WorldgenCryptoRandom.seedSlimeChunk(chunkPos.x, chunkPos.z).nextInt(10) == 0; + } + + return slimeChunk; + } + // Matter end + private static void replaceMissingSections(LevelHeightAccessor world, Registry biome, LevelChunkSection[] sectionArray) { for (int i = 0; i < sectionArray.length; ++i) { if (sectionArray[i] == null) { diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java index daff5a9dd98e791b3f1dc898a082ff3e08adc92e..9effd4157b8765c7adccc84569d830d36002842c 100644 --- a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java +++ b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java @@ -86,6 +86,8 @@ import net.minecraft.world.level.levelgen.structure.placement.StructurePlacement import net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager; import org.apache.commons.lang3.mutable.MutableBoolean; import org.slf4j.Logger; +import su.plo.matter.Globals; +import su.plo.matter.WorldgenCryptoRandom; public abstract class ChunkGenerator implements BiomeManager.NoiseBiomeSource { @@ -229,15 +231,9 @@ public abstract class ChunkGenerator implements BiomeManager.NoiseBiomeSource { int i = concentricringsstructureplacement.distance(); int j = concentricringsstructureplacement.count(); int k = concentricringsstructureplacement.spread(); - Random random = new Random(); + // Matter + Random random = new WorldgenCryptoRandom(0, 0, Globals.Salt.STRONGHOLDS, 0); - // Paper start - if (this.conf.strongholdSeed != null && this.structureSets.getResourceKey(holder).orElse(null) == net.minecraft.world.level.levelgen.structure.BuiltinStructureSets.STRONGHOLDS) { - random.setSeed(this.conf.strongholdSeed); - } else { - // Paper end - random.setSeed(this.ringPlacementSeed); - } // Paper double d0 = random.nextDouble() * 3.141592653589793D * 2.0D; int l = 0; int i1 = 0; @@ -511,8 +507,12 @@ public abstract class ChunkGenerator implements BiomeManager.NoiseBiomeSource { return structurefeature.feature.step().ordinal(); })); List list = this.biomeSource.featuresPerStep(); - WorldgenRandom seededrandom = new WorldgenRandom(new XoroshiroRandomSource(RandomSupport.seedUniquifier())); + // Matter start + WorldgenRandom seededrandom = new WorldgenCryptoRandom( + blockposition.getX(), blockposition.getZ(), Globals.Salt.UNDEFINED, 0 + ); long i = seededrandom.setDecorationSeed(generatoraccessseed.getSeed(), blockposition.getX(), blockposition.getZ()); + // Matter end Set set = new ObjectArraySet(); if (this instanceof FlatLevelSource) { @@ -786,9 +786,11 @@ public abstract class ChunkGenerator implements BiomeManager.NoiseBiomeSource { ArrayList arraylist = new ArrayList(list.size()); arraylist.addAll(list); - WorldgenRandom seededrandom = new WorldgenRandom(new LegacyRandomSource(0L)); - - seededrandom.setLargeFeatureSeed(worldSeed, chunkcoordintpair.x, chunkcoordintpair.z); + // Matter start + WorldgenRandom seededrandom = new WorldgenCryptoRandom( + chunkcoordintpair.x, chunkcoordintpair.z, Globals.Salt.GENERATE_FEATURE, 0 + ); + // Matter end int j = 0; StructureSet.StructureSelectionEntry structureset_a1; diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkStatus.java b/src/main/java/net/minecraft/world/level/chunk/ChunkStatus.java index 954e141e5617d6d52e2f3008c25fe9e2fe2f0f9a..3d097782a9d0f99f6dabc0a3603e1ef2207aec7d 100644 --- a/src/main/java/net/minecraft/world/level/chunk/ChunkStatus.java +++ b/src/main/java/net/minecraft/world/level/chunk/ChunkStatus.java @@ -26,6 +26,7 @@ import net.minecraft.world.level.levelgen.GenerationStep; import net.minecraft.world.level.levelgen.Heightmap; import net.minecraft.world.level.levelgen.blending.Blender; import net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager; +import su.plo.matter.Globals; public class ChunkStatus { @@ -268,6 +269,8 @@ public class ChunkStatus { } public CompletableFuture> generate(Executor executor, ServerLevel world, ChunkGenerator generator, StructureManager structureManager, ThreadedLevelLightEngine lightingProvider, Function>> fullChunkConverter, List chunks, boolean flag) { + // Matter + Globals.setupGlobals(world); ChunkAccess ichunkaccess = (ChunkAccess) chunks.get(chunks.size() / 2); ProfiledDuration profiledduration = JvmProfiler.INSTANCE.onChunkGenerate(ichunkaccess.getPos(), world.dimension(), this.name); CompletableFuture> completablefuture = this.generationTask.doWork(this, executor, world, generator, structureManager, lightingProvider, fullChunkConverter, chunks, ichunkaccess, flag); diff --git a/src/main/java/net/minecraft/world/level/levelgen/WorldGenSettings.java b/src/main/java/net/minecraft/world/level/levelgen/WorldGenSettings.java index 61dc7d594c4ee15f99fd531d1b2cbaffc63c372d..f13e3eaa2aab15a983679359d40285a22dab61a2 100644 --- a/src/main/java/net/minecraft/world/level/levelgen/WorldGenSettings.java +++ b/src/main/java/net/minecraft/world/level/levelgen/WorldGenSettings.java @@ -16,6 +16,8 @@ import java.util.Optional; import java.util.OptionalLong; import java.util.Random; import java.util.function.Function; +import java.util.stream.LongStream; + import net.minecraft.core.Holder; import net.minecraft.core.MappedRegistry; import net.minecraft.core.Registry; @@ -36,16 +38,24 @@ import net.minecraft.world.level.levelgen.structure.StructureSet; import net.minecraft.world.level.levelgen.synth.NormalNoise; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; +import su.plo.matter.Globals; public class WorldGenSettings { - - public static final Codec CODEC = RecordCodecBuilder.create((instance) -> { // CraftBukkit - decompile error - return instance.group(Codec.LONG.fieldOf("seed").stable().forGetter(WorldGenSettings::seed), Codec.BOOL.fieldOf("generate_features").orElse(true).stable().forGetter(WorldGenSettings::generateFeatures), Codec.BOOL.fieldOf("bonus_chest").orElse(false).stable().forGetter(WorldGenSettings::generateBonusChest), RegistryCodecs.dataPackAwareCodec(Registry.LEVEL_STEM_REGISTRY, Lifecycle.stable(), LevelStem.CODEC).xmap(LevelStem::sortMap, Function.identity()).fieldOf("dimensions").forGetter(WorldGenSettings::dimensions), Codec.STRING.optionalFieldOf("legacy_custom_options").stable().forGetter((generatorsettings) -> { - return generatorsettings.legacyCustomOptions; + public static final Codec CODEC = RecordCodecBuilder.create((instance) -> { + return instance.group(Codec.LONG.fieldOf("seed").stable().forGetter(WorldGenSettings::seed), + Codec.LONG_STREAM.fieldOf("feature_seed").stable().forGetter((settings) -> LongStream.of(settings.featureSeed())), // Matter + Codec.BOOL.fieldOf("generate_features").orElse(true).stable().forGetter(WorldGenSettings::generateFeatures), + Codec.BOOL.fieldOf("bonus_chest").orElse(false).stable().forGetter(WorldGenSettings::generateBonusChest), + RegistryCodecs.dataPackAwareCodec(Registry.LEVEL_STEM_REGISTRY, Lifecycle.stable(), LevelStem.CODEC).xmap(LevelStem::sortMap, Function.identity()).fieldOf("dimensions").forGetter(WorldGenSettings::dimensions), + Codec.STRING.optionalFieldOf("legacy_custom_options").stable().forGetter((WorldGenSettings worldGenSettings) -> { + return worldGenSettings.legacyCustomOptions; })).apply(instance, instance.stable(WorldGenSettings::new)); }).comapFlatMap(WorldGenSettings::guardExperimental, Function.identity()); + private static final Logger LOGGER = LogUtils.getLogger(); private final long seed; + // Matter + private final long[] featureSeed; private final boolean generateFeatures; private final boolean generateBonusChest; private final Registry dimensions; @@ -61,33 +71,38 @@ public class WorldGenSettings { return LevelStem.stable(this.seed, this.dimensions); } - public WorldGenSettings(long seed, boolean generateStructures, boolean bonusChest, Registry options) { - this(seed, generateStructures, bonusChest, options, Optional.empty()); - LevelStem worlddimension = (LevelStem) options.get(LevelStem.OVERWORLD); - - if (worlddimension == null) { + public WorldGenSettings(long seed, long[] featureSeed, boolean generateStructures, boolean bonusChest, Registry options) { + this(seed, featureSeed, generateStructures, bonusChest, options, Optional.empty()); + LevelStem levelStem = options.get(LevelStem.OVERWORLD); + if (levelStem == null) { throw new IllegalStateException("Overworld settings missing"); } } - private WorldGenSettings(long seed, boolean generateStructures, boolean bonusChest, Registry options, Optional legacyCustomOptions) { + private WorldGenSettings(long seed, LongStream featureSeed, boolean generateStructures, boolean bonusChest, Registry options, Optional legacyCustomOptions) { + this(seed, featureSeed.toArray(), generateStructures, bonusChest, options, legacyCustomOptions); + } + + private WorldGenSettings(long seed, long[] featureSeed, boolean generateStructures, boolean bonusChest, Registry options, Optional legacyCustomOptions) { this.seed = seed; + this.featureSeed = featureSeed; this.generateFeatures = generateStructures; this.generateBonusChest = bonusChest; this.dimensions = options; this.legacyCustomOptions = legacyCustomOptions; } + // Matter end public static WorldGenSettings demoSettings(RegistryAccess registryManager) { int i = "North Carolina".hashCode(); - - return new WorldGenSettings((long) i, true, true, WorldGenSettings.withOverworld(registryManager.registryOrThrow(Registry.DIMENSION_TYPE_REGISTRY), DimensionType.defaultDimensions(registryManager, (long) i), WorldGenSettings.makeDefaultOverworld(registryManager, (long) i))); + // Matter + return new WorldGenSettings((long) i, Globals.parseSeed("North Carolina").get(), true, true, WorldGenSettings.withOverworld(registryManager.registryOrThrow(Registry.DIMENSION_TYPE_REGISTRY), DimensionType.defaultDimensions(registryManager, (long) i), WorldGenSettings.makeDefaultOverworld(registryManager, (long) i))); } public static WorldGenSettings makeDefault(RegistryAccess registryManager) { long i = (new Random()).nextLong(); - - return new WorldGenSettings(i, true, false, WorldGenSettings.withOverworld(registryManager.registryOrThrow(Registry.DIMENSION_TYPE_REGISTRY), DimensionType.defaultDimensions(registryManager, i), WorldGenSettings.makeDefaultOverworld(registryManager, i))); + // Matter + return new WorldGenSettings(i, Globals.createRandomWorldSeed(), true, false, WorldGenSettings.withOverworld(registryManager.registryOrThrow(Registry.DIMENSION_TYPE_REGISTRY), DimensionType.defaultDimensions(registryManager, i), WorldGenSettings.makeDefaultOverworld(registryManager, i))); } public static NoiseBasedChunkGenerator makeDefaultOverworld(RegistryAccess registryManager, long seed) { @@ -115,6 +130,12 @@ public class WorldGenSettings { return this.seed; } + // Matter start + public long[] featureSeed() { + return this.featureSeed; + } + // Matter end + public boolean generateFeatures() { return this.generateFeatures; } @@ -187,18 +208,23 @@ public class WorldGenSettings { } public WorldGenSettings withBonusChest() { - return new WorldGenSettings(this.seed, this.generateFeatures, true, this.dimensions, this.legacyCustomOptions); + // Matter + return new WorldGenSettings(this.seed, this.featureSeed, this.generateFeatures, true, this.dimensions, this.legacyCustomOptions); } public WorldGenSettings withFeaturesToggled() { - return new WorldGenSettings(this.seed, !this.generateFeatures, this.generateBonusChest, this.dimensions); + // Matter + return new WorldGenSettings(this.seed, this.featureSeed, !this.generateFeatures, this.generateBonusChest, this.dimensions); } public WorldGenSettings withBonusChestToggled() { - return new WorldGenSettings(this.seed, this.generateFeatures, !this.generateBonusChest, this.dimensions); + // Matter + return new WorldGenSettings(this.seed, this.featureSeed, this.generateFeatures, !this.generateBonusChest, this.dimensions); } public static WorldGenSettings create(RegistryAccess registryManager, DedicatedServerProperties.WorldGenProperties worldGenProperties) { + // Matter + long[] featureSeed = Globals.parseSeed(worldGenProperties.featureSeed()).orElse(Globals.createRandomWorldSeed()); long i = WorldGenSettings.parseSeed(worldGenProperties.levelSeed()).orElse((new Random()).nextLong()); Registry iregistry = registryManager.registryOrThrow(Registry.DIMENSION_TYPE_REGISTRY); Registry iregistry1 = registryManager.registryOrThrow(Registry.BIOME_REGISTRY); @@ -237,24 +263,30 @@ public class WorldGenSettings { Logger logger = WorldGenSettings.LOGGER; Objects.requireNonNull(logger); - return new WorldGenSettings(i, flag, false, WorldGenSettings.withOverworld(iregistry, iregistry3, new FlatLevelSource(iregistry2, (FlatLevelGeneratorSettings) dataresult.resultOrPartial(s1 -> logger.error(String.valueOf(s1))).orElseGet(() -> { // CraftBukkit - decompile error + // Matter + return new WorldGenSettings(i, featureSeed, flag, false, WorldGenSettings.withOverworld(iregistry, iregistry3, new FlatLevelSource(iregistry2, (FlatLevelGeneratorSettings) dataresult.resultOrPartial(s1 -> logger.error(String.valueOf(s1))).orElseGet(() -> { // CraftBukkit - decompile error return FlatLevelGeneratorSettings.getDefault(iregistry1, iregistry2); })))); case 1: - return new WorldGenSettings(i, worldGenProperties.generateStructures(), false, WorldGenSettings.withOverworld(iregistry, iregistry3, new DebugLevelSource(iregistry2, iregistry1))); + // Matter + return new WorldGenSettings(i, featureSeed, worldGenProperties.generateStructures(), false, WorldGenSettings.withOverworld(iregistry, iregistry3, new DebugLevelSource(iregistry2, iregistry1))); case 2: - return new WorldGenSettings(i, worldGenProperties.generateStructures(), false, WorldGenSettings.withOverworld(iregistry, iregistry3, WorldGenSettings.makeOverworld(registryManager, i, NoiseGeneratorSettings.AMPLIFIED))); + // Matter + return new WorldGenSettings(i, featureSeed, worldGenProperties.generateStructures(), false, WorldGenSettings.withOverworld(iregistry, iregistry3, WorldGenSettings.makeOverworld(registryManager, i, NoiseGeneratorSettings.AMPLIFIED))); case 3: - return new WorldGenSettings(i, worldGenProperties.generateStructures(), false, WorldGenSettings.withOverworld(iregistry, iregistry3, WorldGenSettings.makeOverworld(registryManager, i, NoiseGeneratorSettings.LARGE_BIOMES))); + // Matter + return new WorldGenSettings(i, featureSeed, worldGenProperties.generateStructures(), false, WorldGenSettings.withOverworld(iregistry, iregistry3, WorldGenSettings.makeOverworld(registryManager, i, NoiseGeneratorSettings.LARGE_BIOMES))); default: - return new WorldGenSettings(i, worldGenProperties.generateStructures(), false, WorldGenSettings.withOverworld(iregistry, iregistry3, WorldGenSettings.makeDefaultOverworld(registryManager, i))); + // Matter + return new WorldGenSettings(i, featureSeed, worldGenProperties.generateStructures(), false, WorldGenSettings.withOverworld(iregistry, iregistry3, WorldGenSettings.makeDefaultOverworld(registryManager, i))); } } public WorldGenSettings withSeed(boolean hardcore, OptionalLong seed) { long i = seed.orElse(this.seed); Object object; - + // Matter + long[] featureSeed = Globals.createRandomWorldSeed(); if (seed.isPresent()) { WritableRegistry iregistrywritable = new MappedRegistry<>(Registry.LEVEL_STEM_REGISTRY, Lifecycle.experimental(), (Function) null); long j = seed.getAsLong(); @@ -275,9 +307,9 @@ public class WorldGenSettings { WorldGenSettings generatorsettings; if (this.isDebug()) { - generatorsettings = new WorldGenSettings(i, false, false, (Registry) object); + generatorsettings = new WorldGenSettings(i, featureSeed, false, false, (Registry) object); } else { - generatorsettings = new WorldGenSettings(i, this.generateFeatures(), this.generateBonusChest() && !hardcore, (Registry) object); + generatorsettings = new WorldGenSettings(i, featureSeed, this.generateFeatures(), this.generateBonusChest() && !hardcore, (Registry) object); } return generatorsettings; diff --git a/src/main/java/net/minecraft/world/level/levelgen/feature/BastionFeature.java b/src/main/java/net/minecraft/world/level/levelgen/feature/BastionFeature.java index 8204b39496e26baf9454b117f7a5d80735956d3e..415898770c08e30dc1b0ee26119d199991432740 100644 --- a/src/main/java/net/minecraft/world/level/levelgen/feature/BastionFeature.java +++ b/src/main/java/net/minecraft/world/level/levelgen/feature/BastionFeature.java @@ -1,14 +1,25 @@ package net.minecraft.world.level.levelgen.feature; import com.mojang.serialization.Codec; +import net.minecraft.world.level.levelgen.WorldgenRandom; import net.minecraft.world.level.levelgen.feature.configurations.JigsawConfiguration; +import net.minecraft.world.level.levelgen.structure.pieces.PieceGeneratorSupplier; +import su.plo.matter.Globals; +import su.plo.matter.WorldgenCryptoRandom; public class BastionFeature extends JigsawFeature { private static final int BASTION_SPAWN_HEIGHT = 33; public BastionFeature(Codec configCodec) { - super(configCodec, 33, false, false, (context) -> { - return true; - }); + super(configCodec, 33, false, false, BastionFeature::checkLocation); // Matter } + + // Matter start + private static boolean checkLocation(PieceGeneratorSupplier.Context context) { + WorldgenRandom worldgenRandom = new WorldgenCryptoRandom( + context.chunkPos().x, context.chunkPos().z, Globals.Salt.NETHER_FORTRESS_FEATURE, 0 + ); + return worldgenRandom.nextInt(5) >= 2; + } + // Matter end } diff --git a/src/main/java/net/minecraft/world/level/levelgen/feature/BuriedTreasureFeature.java b/src/main/java/net/minecraft/world/level/levelgen/feature/BuriedTreasureFeature.java index ff58437d0ccc4901c84b3df9afb245940fbffef1..0a5b43bbf5fbc3034a0f87da3f024ba2e12eeddc 100644 --- a/src/main/java/net/minecraft/world/level/levelgen/feature/BuriedTreasureFeature.java +++ b/src/main/java/net/minecraft/world/level/levelgen/feature/BuriedTreasureFeature.java @@ -3,13 +3,14 @@ package net.minecraft.world.level.levelgen.feature; import com.mojang.serialization.Codec; import net.minecraft.core.BlockPos; import net.minecraft.world.level.levelgen.Heightmap; -import net.minecraft.world.level.levelgen.LegacyRandomSource; import net.minecraft.world.level.levelgen.WorldgenRandom; import net.minecraft.world.level.levelgen.feature.configurations.ProbabilityFeatureConfiguration; import net.minecraft.world.level.levelgen.structure.BuriedTreasurePieces; import net.minecraft.world.level.levelgen.structure.pieces.PieceGenerator; import net.minecraft.world.level.levelgen.structure.pieces.PieceGeneratorSupplier; import net.minecraft.world.level.levelgen.structure.pieces.StructurePiecesBuilder; +import su.plo.matter.Globals; +import su.plo.matter.WorldgenCryptoRandom; public class BuriedTreasureFeature extends StructureFeature { private static final int RANDOM_SALT = 10387320; @@ -19,8 +20,11 @@ public class BuriedTreasureFeature extends StructureFeature context) { - WorldgenRandom worldgenRandom = new WorldgenRandom(new LegacyRandomSource(0L)); - worldgenRandom.setLargeFeatureWithSalt(context.seed(), context.chunkPos().x, context.chunkPos().z, 10387320); + // Matter start + WorldgenRandom worldgenRandom = new WorldgenCryptoRandom( + context.chunkPos().x, context.chunkPos().z, Globals.Salt.BURIED_TREASURE_FEATURE, 0 + ); + // Matter end return worldgenRandom.nextFloat() < (context.config()).probability && context.validBiomeOnTop(Heightmap.Types.OCEAN_FLOOR_WG); } diff --git a/src/main/java/net/minecraft/world/level/levelgen/feature/ConfiguredStructureFeature.java b/src/main/java/net/minecraft/world/level/levelgen/feature/ConfiguredStructureFeature.java index 473a54963fbe08beeff26a828827f9f72d8a29b8..29edf50911e47153affd33a6435d543a7620d1bc 100644 --- a/src/main/java/net/minecraft/world/level/levelgen/feature/ConfiguredStructureFeature.java +++ b/src/main/java/net/minecraft/world/level/levelgen/feature/ConfiguredStructureFeature.java @@ -26,6 +26,8 @@ import net.minecraft.world.level.levelgen.structure.pieces.PieceGenerator; import net.minecraft.world.level.levelgen.structure.pieces.PieceGeneratorSupplier; import net.minecraft.world.level.levelgen.structure.pieces.StructurePiecesBuilder; import net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager; +import su.plo.matter.Globals; +import su.plo.matter.WorldgenCryptoRandom; public class ConfiguredStructureFeature> { public static final Codec> DIRECT_CODEC = Registry.STRUCTURE_FEATURE.byNameCodec().dispatch((configuredStructureFeature) -> { @@ -52,8 +54,11 @@ public class ConfiguredStructureFeature> optional = this.feature.pieceGeneratorSupplier().createGenerator(new PieceGeneratorSupplier.Context<>(chunkGenerator, biomeSource, worldSeed, chunkPos, this.config, world, biomePredicate, structureManager, registryManager)); if (optional.isPresent()) { StructurePiecesBuilder structurePiecesBuilder = new StructurePiecesBuilder(); - WorldgenRandom worldgenRandom = new WorldgenRandom(new LegacyRandomSource(0L)); - worldgenRandom.setLargeFeatureSeed(worldSeed, chunkPos.x, chunkPos.z); + // Matter start + WorldgenRandom worldgenRandom = new WorldgenCryptoRandom( + chunkPos.x, chunkPos.z, Globals.Salt.GENERATE_FEATURE, 0 + ); + // Matter end optional.get().generatePieces(structurePiecesBuilder, new PieceGenerator.Context<>(this.config, chunkGenerator, structureManager, chunkPos, world, worldgenRandom, worldSeed)); StructureStart structureStart = new StructureStart(this, chunkPos, structureReferences, structurePiecesBuilder.build()); if (structureStart.isValid()) { diff --git a/src/main/java/net/minecraft/world/level/levelgen/feature/GeodeFeature.java b/src/main/java/net/minecraft/world/level/levelgen/feature/GeodeFeature.java index 24110d4d412b5bd0a6c17215b889ea6c02558a2c..afb23e32ed7ec4f389be09afdce758b3b967f3f3 100644 --- a/src/main/java/net/minecraft/world/level/levelgen/feature/GeodeFeature.java +++ b/src/main/java/net/minecraft/world/level/levelgen/feature/GeodeFeature.java @@ -24,6 +24,8 @@ import net.minecraft.world.level.levelgen.WorldgenRandom; import net.minecraft.world.level.levelgen.feature.configurations.GeodeConfiguration; import net.minecraft.world.level.levelgen.synth.NormalNoise; import net.minecraft.world.level.material.FluidState; +import su.plo.matter.Globals; +import su.plo.matter.WorldgenCryptoRandom; public class GeodeFeature extends Feature { private static final Direction[] DIRECTIONS = Direction.values(); @@ -42,7 +44,8 @@ public class GeodeFeature extends Feature { int j = geodeConfiguration.maxGenOffset; List> list = Lists.newLinkedList(); int k = geodeConfiguration.distributionPoints.sample(random); - WorldgenRandom worldgenRandom = new WorldgenRandom(new LegacyRandomSource(worldGenLevel.getSeed())); + // Matter + WorldgenRandom worldgenRandom = new WorldgenCryptoRandom(0, 0, Globals.Salt.GEODE_FEATURE, 0); NormalNoise normalNoise = NormalNoise.create(worldgenRandom, -4, 1.0D); List list2 = Lists.newLinkedList(); double d = (double)k / (double)geodeConfiguration.outerWallDistance.getMaxValue(); diff --git a/src/main/java/net/minecraft/world/level/levelgen/feature/MineshaftFeature.java b/src/main/java/net/minecraft/world/level/levelgen/feature/MineshaftFeature.java index 45f11284bf65081b3b2e8da85114efbe5efd5b42..6f9bd5820acf6185fdef57c6b446c1c4c2e8cb05 100644 --- a/src/main/java/net/minecraft/world/level/levelgen/feature/MineshaftFeature.java +++ b/src/main/java/net/minecraft/world/level/levelgen/feature/MineshaftFeature.java @@ -1,9 +1,6 @@ package net.minecraft.world.level.levelgen.feature; import com.mojang.serialization.Codec; -import java.util.Arrays; -import java.util.Map; -import java.util.stream.Collectors; import net.minecraft.core.BlockPos; import net.minecraft.core.QuartPos; import net.minecraft.util.Mth; @@ -12,13 +9,18 @@ import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.levelgen.Heightmap; -import net.minecraft.world.level.levelgen.LegacyRandomSource; import net.minecraft.world.level.levelgen.WorldgenRandom; import net.minecraft.world.level.levelgen.feature.configurations.MineshaftConfiguration; import net.minecraft.world.level.levelgen.structure.MineShaftPieces; import net.minecraft.world.level.levelgen.structure.pieces.PieceGenerator; import net.minecraft.world.level.levelgen.structure.pieces.PieceGeneratorSupplier; import net.minecraft.world.level.levelgen.structure.pieces.StructurePiecesBuilder; +import su.plo.matter.Globals; +import su.plo.matter.WorldgenCryptoRandom; + +import java.util.Arrays; +import java.util.Map; +import java.util.stream.Collectors; public class MineshaftFeature extends StructureFeature { public MineshaftFeature(Codec configCodec) { @@ -26,8 +28,11 @@ public class MineshaftFeature extends StructureFeature { } private static boolean checkLocation(PieceGeneratorSupplier.Context context) { - WorldgenRandom worldgenRandom = new WorldgenRandom(new LegacyRandomSource(0L)); - worldgenRandom.setLargeFeatureSeed(context.seed(), context.chunkPos().x, context.chunkPos().z); + // Matter start + WorldgenRandom worldgenRandom = new WorldgenCryptoRandom( + context.chunkPos().x, context.chunkPos().z, Globals.Salt.MINESHAFT_FEATURE, 0 + ); + // Matter end double d = (double)(context.config()).probability; return worldgenRandom.nextDouble() >= d ? false : context.validBiome().test(context.chunkGenerator().getNoiseBiome(QuartPos.fromBlock(context.chunkPos().getMiddleBlockX()), QuartPos.fromBlock(50), QuartPos.fromBlock(context.chunkPos().getMiddleBlockZ()))); } diff --git a/src/main/java/net/minecraft/world/level/levelgen/feature/NetherFortressFeature.java b/src/main/java/net/minecraft/world/level/levelgen/feature/NetherFortressFeature.java index 8c92b50a5aaad7d70b6e4c793b9746d29d41afa4..778029daa9b2b050f2b5f35d04f7065a69cdf151 100644 --- a/src/main/java/net/minecraft/world/level/levelgen/feature/NetherFortressFeature.java +++ b/src/main/java/net/minecraft/world/level/levelgen/feature/NetherFortressFeature.java @@ -6,12 +6,15 @@ import net.minecraft.core.QuartPos; import net.minecraft.util.random.WeightedRandomList; import net.minecraft.world.entity.EntityType; import net.minecraft.world.level.biome.MobSpawnSettings; +import net.minecraft.world.level.levelgen.WorldgenRandom; import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration; import net.minecraft.world.level.levelgen.structure.NetherBridgePieces; import net.minecraft.world.level.levelgen.structure.StructurePiece; import net.minecraft.world.level.levelgen.structure.pieces.PieceGenerator; import net.minecraft.world.level.levelgen.structure.pieces.PieceGeneratorSupplier; import net.minecraft.world.level.levelgen.structure.pieces.StructurePiecesBuilder; +import su.plo.matter.Globals; +import su.plo.matter.WorldgenCryptoRandom; public class NetherFortressFeature extends StructureFeature { public static final WeightedRandomList FORTRESS_ENEMIES = WeightedRandomList.create(new MobSpawnSettings.SpawnerData(EntityType.BLAZE, 10, 2, 3), new MobSpawnSettings.SpawnerData(EntityType.ZOMBIFIED_PIGLIN, 5, 4, 4), new MobSpawnSettings.SpawnerData(EntityType.WITHER_SKELETON, 8, 5, 5), new MobSpawnSettings.SpawnerData(EntityType.SKELETON, 2, 5, 5), new MobSpawnSettings.SpawnerData(EntityType.MAGMA_CUBE, 3, 4, 4)); @@ -21,7 +24,12 @@ public class NetherFortressFeature extends StructureFeature context) { - return context.validBiome().test(context.chunkGenerator().getNoiseBiome(QuartPos.fromBlock(context.chunkPos().getMiddleBlockX()), QuartPos.fromBlock(64), QuartPos.fromBlock(context.chunkPos().getMiddleBlockZ()))); + // Matter start + WorldgenRandom worldgenRandom = new WorldgenCryptoRandom( + context.chunkPos().x, context.chunkPos().z, Globals.Salt.NETHER_FORTRESS_FEATURE, 0 + ); + return worldgenRandom.nextInt(5) >= 2 ? false : context.validBiome().test(context.chunkGenerator().getNoiseBiome(QuartPos.fromBlock(context.chunkPos().getMiddleBlockX()), QuartPos.fromBlock(64), QuartPos.fromBlock(context.chunkPos().getMiddleBlockZ()))); + // Matter end } private static void generatePieces(StructurePiecesBuilder collector, PieceGenerator.Context context) { diff --git a/src/main/java/net/minecraft/world/level/levelgen/feature/OceanMonumentFeature.java b/src/main/java/net/minecraft/world/level/levelgen/feature/OceanMonumentFeature.java index 3e5a6afa03e659c14105d95194e2e4fa52feb841..41b35e4d63471ad8bdffdae71d0d4038f2ac6139 100644 --- a/src/main/java/net/minecraft/world/level/levelgen/feature/OceanMonumentFeature.java +++ b/src/main/java/net/minecraft/world/level/levelgen/feature/OceanMonumentFeature.java @@ -1,14 +1,11 @@ package net.minecraft.world.level.levelgen.feature; import com.mojang.serialization.Codec; -import java.util.Objects; import net.minecraft.core.Direction; import net.minecraft.core.Holder; import net.minecraft.world.level.ChunkPos; import net.minecraft.world.level.biome.Biome; import net.minecraft.world.level.levelgen.Heightmap; -import net.minecraft.world.level.levelgen.LegacyRandomSource; -import net.minecraft.world.level.levelgen.RandomSupport; import net.minecraft.world.level.levelgen.WorldgenRandom; import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration; import net.minecraft.world.level.levelgen.structure.BoundingBox; @@ -18,6 +15,10 @@ import net.minecraft.world.level.levelgen.structure.pieces.PieceGenerator; import net.minecraft.world.level.levelgen.structure.pieces.PieceGeneratorSupplier; import net.minecraft.world.level.levelgen.structure.pieces.PiecesContainer; import net.minecraft.world.level.levelgen.structure.pieces.StructurePiecesBuilder; +import su.plo.matter.Globals; +import su.plo.matter.WorldgenCryptoRandom; + +import java.util.Objects; public class OceanMonumentFeature extends StructureFeature { public OceanMonumentFeature(Codec configCodec) { @@ -52,7 +53,11 @@ public class OceanMonumentFeature extends StructureFeature configCodec) { @@ -17,8 +18,11 @@ public class PillagerOutpostFeature extends JigsawFeature { ChunkPos chunkPos = context.chunkPos(); int i = chunkPos.x >> 4; int j = chunkPos.z >> 4; - WorldgenRandom worldgenRandom = new WorldgenRandom(new LegacyRandomSource(0L)); - worldgenRandom.setSeed((long)(i ^ j << 4) ^ context.seed()); + // Matter + WorldgenRandom worldgenRandom = new WorldgenCryptoRandom( + i, j, Globals.Salt.PILLAGER_OUTPOST_FEATURE, 0 + ); + // Matter end worldgenRandom.nextInt(); if (worldgenRandom.nextInt(5) != 0) { return false; diff --git a/src/main/java/net/minecraft/world/level/levelgen/feature/RuinedPortalFeature.java b/src/main/java/net/minecraft/world/level/levelgen/feature/RuinedPortalFeature.java index 75e6ee90137e17ffc25fcf987df93ccba14add02..b6f178f4aa9317b5826a06ad0a42b63eb67bd2cc 100644 --- a/src/main/java/net/minecraft/world/level/levelgen/feature/RuinedPortalFeature.java +++ b/src/main/java/net/minecraft/world/level/levelgen/feature/RuinedPortalFeature.java @@ -2,12 +2,6 @@ package net.minecraft.world.level.levelgen.feature; import com.google.common.collect.ImmutableList; import com.mojang.serialization.Codec; -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Random; -import java.util.stream.Collectors; import net.minecraft.Util; import net.minecraft.core.BlockPos; import net.minecraft.core.Holder; @@ -23,7 +17,6 @@ import net.minecraft.world.level.block.Rotation; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.chunk.ChunkGenerator; import net.minecraft.world.level.levelgen.Heightmap; -import net.minecraft.world.level.levelgen.LegacyRandomSource; import net.minecraft.world.level.levelgen.WorldgenRandom; import net.minecraft.world.level.levelgen.feature.configurations.RuinedPortalConfiguration; import net.minecraft.world.level.levelgen.structure.BoundingBox; @@ -31,6 +24,11 @@ import net.minecraft.world.level.levelgen.structure.RuinedPortalPiece; import net.minecraft.world.level.levelgen.structure.pieces.PieceGenerator; import net.minecraft.world.level.levelgen.structure.pieces.PieceGeneratorSupplier; import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate; +import su.plo.matter.Globals; +import su.plo.matter.WorldgenCryptoRandom; + +import java.util.*; +import java.util.stream.Collectors; public class RuinedPortalFeature extends StructureFeature { private static final String[] STRUCTURE_LOCATION_PORTALS = new String[]{"ruined_portal/portal_1", "ruined_portal/portal_2", "ruined_portal/portal_3", "ruined_portal/portal_4", "ruined_portal/portal_5", "ruined_portal/portal_6", "ruined_portal/portal_7", "ruined_portal/portal_8", "ruined_portal/portal_9", "ruined_portal/portal_10"}; @@ -50,8 +48,11 @@ public class RuinedPortalFeature extends StructureFeature> pieceGeneratorSupplier(PieceGeneratorSupplier.Context context) { RuinedPortalPiece.Properties properties = new RuinedPortalPiece.Properties(); RuinedPortalConfiguration ruinedPortalConfiguration = context.config(); - WorldgenRandom worldgenRandom = new WorldgenRandom(new LegacyRandomSource(0L)); - worldgenRandom.setLargeFeatureSeed(context.seed(), context.chunkPos().x, context.chunkPos().z); + // Matter start + WorldgenRandom worldgenRandom = new WorldgenCryptoRandom( + context.chunkPos().x, context.chunkPos().z, Globals.Salt.RUINED_PORTAL_FEATURE, 0 + ); + // Matter end RuinedPortalPiece.VerticalPlacement verticalPlacement; if (ruinedPortalConfiguration.portalType == RuinedPortalFeature.Type.DESERT) { verticalPlacement = RuinedPortalPiece.VerticalPlacement.PARTLY_BURIED; diff --git a/src/main/java/net/minecraft/world/level/levelgen/feature/WoodlandMansionFeature.java b/src/main/java/net/minecraft/world/level/levelgen/feature/WoodlandMansionFeature.java index 3607b5b63b28591e2bfb6ee760df29bf8dab0ae8..0470afa1cfd2191f64698c19967ae53dd2117461 100644 --- a/src/main/java/net/minecraft/world/level/levelgen/feature/WoodlandMansionFeature.java +++ b/src/main/java/net/minecraft/world/level/levelgen/feature/WoodlandMansionFeature.java @@ -2,9 +2,6 @@ package net.minecraft.world.level.levelgen.feature; import com.google.common.collect.Lists; import com.mojang.serialization.Codec; -import java.util.List; -import java.util.Optional; -import java.util.Random; import net.minecraft.core.BlockPos; import net.minecraft.core.QuartPos; import net.minecraft.world.level.ChunkPos; @@ -13,7 +10,6 @@ import net.minecraft.world.level.WorldGenLevel; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.Rotation; import net.minecraft.world.level.chunk.ChunkGenerator; -import net.minecraft.world.level.levelgen.LegacyRandomSource; import net.minecraft.world.level.levelgen.WorldgenRandom; import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration; import net.minecraft.world.level.levelgen.structure.BoundingBox; @@ -21,6 +17,12 @@ import net.minecraft.world.level.levelgen.structure.WoodlandMansionPieces; import net.minecraft.world.level.levelgen.structure.pieces.PieceGenerator; import net.minecraft.world.level.levelgen.structure.pieces.PieceGeneratorSupplier; import net.minecraft.world.level.levelgen.structure.pieces.PiecesContainer; +import su.plo.matter.Globals; +import su.plo.matter.WorldgenCryptoRandom; + +import java.util.List; +import java.util.Optional; +import java.util.Random; public class WoodlandMansionFeature extends StructureFeature { public WoodlandMansionFeature(Codec configCodec) { @@ -28,8 +30,11 @@ public class WoodlandMansionFeature extends StructureFeature> pieceGeneratorSupplier(PieceGeneratorSupplier.Context context) { - WorldgenRandom worldgenRandom = new WorldgenRandom(new LegacyRandomSource(0L)); - worldgenRandom.setLargeFeatureSeed(context.seed(), context.chunkPos().x, context.chunkPos().z); + // Matter start + WorldgenRandom worldgenRandom = new WorldgenCryptoRandom( + context.chunkPos().x, context.chunkPos().z, Globals.Salt.WOODLAND_MANSION_FEATURE, 0 + ); + // Matter end Rotation rotation = Rotation.getRandom(worldgenRandom); int i = 5; int j = 5; diff --git a/src/main/java/net/minecraft/world/level/levelgen/structure/NetherFossilFeature.java b/src/main/java/net/minecraft/world/level/levelgen/structure/NetherFossilFeature.java index fc6ea073dda463a0d0fcdc2c40b1b6ef2339c6af..0fc9e49f314c963556474eda9d153b238bb9729a 100644 --- a/src/main/java/net/minecraft/world/level/levelgen/structure/NetherFossilFeature.java +++ b/src/main/java/net/minecraft/world/level/levelgen/structure/NetherFossilFeature.java @@ -16,6 +16,8 @@ import net.minecraft.world.level.levelgen.feature.StructureFeature; import net.minecraft.world.level.levelgen.feature.configurations.RangeConfiguration; import net.minecraft.world.level.levelgen.structure.pieces.PieceGenerator; import net.minecraft.world.level.levelgen.structure.pieces.PieceGeneratorSupplier; +import su.plo.matter.Globals; +import su.plo.matter.WorldgenCryptoRandom; public class NetherFossilFeature extends StructureFeature { public NetherFossilFeature(Codec configCodec) { @@ -23,8 +25,11 @@ public class NetherFossilFeature extends StructureFeature { } private static Optional> pieceGeneratorSupplier(PieceGeneratorSupplier.Context context) { - WorldgenRandom worldgenRandom = new WorldgenRandom(new LegacyRandomSource(0L)); - worldgenRandom.setLargeFeatureSeed(context.seed(), context.chunkPos().x, context.chunkPos().z); + // Matter start + WorldgenRandom worldgenRandom = new WorldgenCryptoRandom( + context.chunkPos().x, context.chunkPos().z, Globals.Salt.NETHER_FOSSIL_FEATURE, 0 + ); + // Matter end int i = context.chunkPos().getMinBlockX() + worldgenRandom.nextInt(16); int j = context.chunkPos().getMinBlockZ() + worldgenRandom.nextInt(16); int k = context.chunkGenerator().getSeaLevel(); diff --git a/src/main/java/net/minecraft/world/level/levelgen/structure/placement/RandomSpreadStructurePlacement.java b/src/main/java/net/minecraft/world/level/levelgen/structure/placement/RandomSpreadStructurePlacement.java index 42152827c5b1393c9b7efa88017435716eb585c0..5c528eb1ecaa7c21a131f8c5258c142b06d83bc7 100644 --- a/src/main/java/net/minecraft/world/level/levelgen/structure/placement/RandomSpreadStructurePlacement.java +++ b/src/main/java/net/minecraft/world/level/levelgen/structure/placement/RandomSpreadStructurePlacement.java @@ -9,9 +9,12 @@ import net.minecraft.world.level.ChunkPos; import net.minecraft.world.level.chunk.ChunkGenerator; import net.minecraft.world.level.levelgen.LegacyRandomSource; import net.minecraft.world.level.levelgen.WorldgenRandom; +import su.plo.matter.Globals; +import su.plo.matter.WorldgenCryptoRandom; public record RandomSpreadStructurePlacement(int spacing, int separation, RandomSpreadType spreadType, int salt, Vec3i locateOffset) implements StructurePlacement { - public static final Codec CODEC = RecordCodecBuilder.mapCodec((instance) -> { + // Matter - compile fix + public static final Codec CODEC = RecordCodecBuilder.mapCodec((instance) -> { return instance.group(Codec.intRange(0, 4096).fieldOf("spacing").forGetter(RandomSpreadStructurePlacement::spacing), Codec.intRange(0, 4096).fieldOf("separation").forGetter(RandomSpreadStructurePlacement::separation), RandomSpreadType.CODEC.optionalFieldOf("spread_type", RandomSpreadType.LINEAR).forGetter(RandomSpreadStructurePlacement::spreadType), ExtraCodecs.NON_NEGATIVE_INT.fieldOf("salt").forGetter(RandomSpreadStructurePlacement::salt), Vec3i.offsetCodec(16).optionalFieldOf("locate_offset", Vec3i.ZERO).forGetter(RandomSpreadStructurePlacement::locateOffset)).apply(instance, RandomSpreadStructurePlacement::new); }).flatXmap((placement) -> { return placement.spacing <= placement.separation ? DataResult.error("Spacing has to be larger than separation") : DataResult.success(placement); @@ -26,8 +29,11 @@ public record RandomSpreadStructurePlacement(int spacing, int separation, Random int j = this.separation(); int k = Math.floorDiv(x, i); int l = Math.floorDiv(z, i); - WorldgenRandom worldgenRandom = new WorldgenRandom(new LegacyRandomSource(0L)); - worldgenRandom.setLargeFeatureWithSalt(seed, k, l, this.salt()); + // Matter start + WorldgenRandom worldgenRandom = new WorldgenCryptoRandom( + k, l, Globals.Salt.POTENTIONAL_FEATURE, this.salt + ); + // Matter end int m = i - j; int n = this.spreadType().evaluate(worldgenRandom, m); int o = this.spreadType().evaluate(worldgenRandom, m); diff --git a/src/main/java/net/minecraft/world/level/levelgen/structure/pools/JigsawPlacement.java b/src/main/java/net/minecraft/world/level/levelgen/structure/pools/JigsawPlacement.java index 67a5481a203bb27e1b4236facda4fb30abc2daf7..4c011c9f2ddd8e6b9cf697dd4b23181199065927 100644 --- a/src/main/java/net/minecraft/world/level/levelgen/structure/pools/JigsawPlacement.java +++ b/src/main/java/net/minecraft/world/level/levelgen/structure/pools/JigsawPlacement.java @@ -39,13 +39,18 @@ import net.minecraft.world.phys.shapes.Shapes; import net.minecraft.world.phys.shapes.VoxelShape; import org.apache.commons.lang3.mutable.MutableObject; import org.slf4j.Logger; +import su.plo.matter.Globals; +import su.plo.matter.WorldgenCryptoRandom; public class JigsawPlacement { static final Logger LOGGER = LogUtils.getLogger(); public static Optional> addPieces(PieceGeneratorSupplier.Context context, JigsawPlacement.PieceFactory pieceFactory, BlockPos pos, boolean bl, boolean bl2) { - WorldgenRandom worldgenRandom = new WorldgenRandom(new LegacyRandomSource(0L)); - worldgenRandom.setLargeFeatureSeed(context.seed(), context.chunkPos().x, context.chunkPos().z); + // Matter start + WorldgenRandom worldgenRandom = new WorldgenCryptoRandom( + context.chunkPos().x, context.chunkPos().z, Globals.Salt.JIGSAW_PLACEMENT, 0 + ); + // Matter end RegistryAccess registryAccess = context.registryAccess(); JigsawConfiguration jigsawConfiguration = context.config(); ChunkGenerator chunkGenerator = context.chunkGenerator(); @@ -200,18 +205,20 @@ public class JigsawPlacement { if (!boundingBox2.isInside(structureBlockInfox.pos.relative(JigsawBlock.getFrontFacing(structureBlockInfox.state)))) { return 0; } else { - ResourceLocation resourceLocation = new ResourceLocation(structureBlockInfox.nbt.getString("pool")); - Optional optional = this.pools.getOptional(resourceLocation); - Optional optional2 = optional.flatMap((pool) -> { + // Mater start - compile fix + ResourceLocation poolLocation = new ResourceLocation(structureBlockInfox.nbt.getString("pool")); + Optional pool1 = this.pools.getOptional(poolLocation); + Optional pool2 = pool1.flatMap((pool) -> { return this.pools.getOptional(pool.getFallback()); }); - int i = optional.map((pool) -> { + int i1 = pool1.map((pool) -> { return pool.getMaxSize(this.structureManager); }).orElse(0); - int j = optional2.map((pool) -> { + int j1 = pool2.map((pool) -> { return pool.getMaxSize(this.structureManager); }).orElse(0); - return Math.max(i, j); + // Mater end - compile fix + return Math.max(i1, j1); } }).max().orElse(0); } else { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java index 403aba29347c779da75337531c3723632120e7c9..e4a468003744e6299d4a5c17af9d7fa39cd31745 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java @@ -206,7 +206,7 @@ public class CraftChunk implements Chunk { @Override public boolean isSlimeChunk() { // 987234911L is deterimined in EntitySlime when seeing if a slime can spawn in a chunk - return this.worldServer.paperConfig.allChunksAreSlimeChunks || WorldgenRandom.seedSlimeChunk(this.getX(), this.getZ(), this.getWorld().getSeed(), worldServer.spigotConfig.slimeSeed).nextInt(10) == 0; // Paper + return worldServer.getChunk(this.getX(), this.getZ()).isSlimeChunk(); // Matter } @Override diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java index f4a82b1f2dc26f938d3dcb23ec32f135a1bfd163..07f082514a28118c5ab49ca68560f7e838abf3ea 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -244,6 +244,7 @@ import org.yaml.snakeyaml.constructor.SafeConstructor; import org.yaml.snakeyaml.error.MarkedYAMLException; import net.md_5.bungee.api.chat.BaseComponent; // Spigot +import su.plo.matter.Globals; import javax.annotation.Nullable; // Paper import javax.annotation.Nonnull; // Paper @@ -1193,7 +1194,8 @@ public final class CraftServer implements Server { LevelSettings worldSettings; // See MinecraftServer.a(String, String, long, WorldType, JsonElement) if (worlddata == null) { - DedicatedServerProperties.WorldGenProperties properties = new DedicatedServerProperties.WorldGenProperties(Objects.toString(creator.seed()), GsonHelper.parse((creator.generatorSettings().isEmpty()) ? "{}" : creator.generatorSettings()), creator.generateStructures(), creator.type().name().toLowerCase(Locale.ROOT)); + // Matter + DedicatedServerProperties.WorldGenProperties properties = new DedicatedServerProperties.WorldGenProperties(Objects.toString(creator.seed()), Globals.seedToString(Globals.createRandomWorldSeed()), GsonHelper.parse((creator.generatorSettings().isEmpty()) ? "{}" : creator.generatorSettings()), creator.generateStructures(), creator.type().name().toLowerCase(Locale.ROOT)); WorldGenSettings generatorsettings = WorldGenSettings.create(this.console.registryAccess(), properties); worldSettings = new LevelSettings(name, GameType.byId(this.getDefaultGameMode().getValue()), hardcore, Difficulty.EASY, false, new GameRules(), console.datapackconfiguration); diff --git a/src/main/java/su/plo/matter/Globals.java b/src/main/java/su/plo/matter/Globals.java new file mode 100644 index 0000000000000000000000000000000000000000..c8f77c791ce10bb85244c55682c743a7bd65f8d6 --- /dev/null +++ b/src/main/java/su/plo/matter/Globals.java @@ -0,0 +1,87 @@ +package su.plo.matter; + +import com.google.common.collect.Iterables; +import net.minecraft.server.level.ServerLevel; + +import java.math.BigInteger; +import java.security.SecureRandom; +import java.util.Optional; + +public class Globals { + public static final int WORLD_SEED_LONGS = 16; + public static final int WORLD_SEED_BITS = WORLD_SEED_LONGS * 64; + + public static final long[] worldSeed = new long[WORLD_SEED_LONGS]; + public static final ThreadLocal dimension = ThreadLocal.withInitial(() -> 0); + + public enum Salt { + UNDEFINED, + BASTION_FEATURE, + WOODLAND_MANSION_FEATURE, + MINESHAFT_FEATURE, + BURIED_TREASURE_FEATURE, + NETHER_FORTRESS_FEATURE, + PILLAGER_OUTPOST_FEATURE, + GEODE_FEATURE, + NETHER_FOSSIL_FEATURE, + OCEAN_MONUMENT_FEATURE, + RUINED_PORTAL_FEATURE, + POTENTIONAL_FEATURE, + GENERATE_FEATURE, + JIGSAW_PLACEMENT, + STRONGHOLDS, + POPULATION, + DECORATION, + SLIME_CHUNK + } + + public static void setupGlobals(ServerLevel world) { + long[] seed = world.getServer().getWorldData().worldGenSettings().featureSeed(); + System.arraycopy(seed, 0, worldSeed, 0, WORLD_SEED_LONGS); + int worldIndex = Iterables.indexOf(world.getServer().levelKeys(), it -> it == world.dimension()); + if (worldIndex == -1) worldIndex = world.getServer().levelKeys().size(); // if we are in world construction it may not have been added to the map yet + dimension.set(worldIndex); + } + + public static long[] createRandomWorldSeed() { + long[] seed = new long[WORLD_SEED_LONGS]; + SecureRandom rand = new SecureRandom(); + for (int i = 0; i < WORLD_SEED_LONGS; i++) { + seed[i] = rand.nextLong(); + } + return seed; + } + + public static Optional parseSeed(String seedStr) { + if (seedStr.isEmpty()) return Optional.empty(); + + try { + long[] seed = new long[WORLD_SEED_LONGS]; + BigInteger seedBigInt = new BigInteger(seedStr); + if (seedBigInt.signum() < 0) { + seedBigInt = seedBigInt.and(BigInteger.ONE.shiftLeft(WORLD_SEED_BITS).subtract(BigInteger.ONE)); + } + for (int i = 0; i < WORLD_SEED_LONGS; i++) { + BigInteger[] divRem = seedBigInt.divideAndRemainder(BigInteger.ONE.shiftLeft(64)); + seed[i] = divRem[1].longValue(); + seedBigInt = divRem[0]; + } + return Optional.of(seed); + } catch (NumberFormatException ignored) { + return Optional.empty(); + } + } + + public static String seedToString(long[] seed) { + BigInteger seedBigInt = BigInteger.ZERO; + for (int i = WORLD_SEED_LONGS - 1; i >= 0; i--) { + BigInteger val = BigInteger.valueOf(seed[i]); + if (val.signum() < 0) { + val = val.add(BigInteger.ONE.shiftLeft(64)); + } + seedBigInt = seedBigInt.shiftLeft(64).add(val); + } + + return seedBigInt.toString(); + } +} diff --git a/src/main/java/su/plo/matter/Hashing.java b/src/main/java/su/plo/matter/Hashing.java new file mode 100644 index 0000000000000000000000000000000000000000..d18b15ca0b6585f08b30b019c8c17a0f641c8be0 --- /dev/null +++ b/src/main/java/su/plo/matter/Hashing.java @@ -0,0 +1,74 @@ +package su.plo.matter; + +public class Hashing { + // https://en.wikipedia.org/wiki/BLAKE_(hash_function) + // https://github.com/bcgit/bc-java/blob/master/core/src/main/java/org/bouncycastle/crypto/digests/Blake2bDigest.java + + private final static long[] blake2b_IV = { + 0x6a09e667f3bcc908L, 0xbb67ae8584caa73bL, 0x3c6ef372fe94f82bL, + 0xa54ff53a5f1d36f1L, 0x510e527fade682d1L, 0x9b05688c2b3e6c1fL, + 0x1f83d9abfb41bd6bL, 0x5be0cd19137e2179L + }; + + private final static byte[][] blake2b_sigma = { + {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15}, + {14, 10, 4, 8, 9, 15, 13, 6, 1, 12, 0, 2, 11, 7, 5, 3}, + {11, 8, 12, 0, 5, 2, 15, 13, 10, 14, 3, 6, 7, 1, 9, 4}, + {7, 9, 3, 1, 13, 12, 11, 14, 2, 6, 5, 10, 4, 0, 15, 8}, + {9, 0, 5, 7, 2, 4, 10, 15, 14, 1, 11, 12, 6, 8, 3, 13}, + {2, 12, 6, 10, 0, 11, 8, 3, 4, 13, 7, 5, 15, 14, 1, 9}, + {12, 5, 1, 15, 14, 13, 4, 10, 0, 7, 6, 3, 9, 2, 8, 11}, + {13, 11, 7, 14, 12, 1, 3, 9, 5, 0, 15, 4, 8, 6, 2, 10}, + {6, 15, 14, 9, 11, 3, 0, 8, 12, 2, 13, 7, 1, 4, 10, 5}, + {10, 2, 8, 4, 7, 6, 1, 5, 15, 11, 9, 14, 3, 12, 13, 0}, + {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15}, + {14, 10, 4, 8, 9, 15, 13, 6, 1, 12, 0, 2, 11, 7, 5, 3} + }; + + public static long[] hashWorldSeed(long[] worldSeed) { + long[] result = blake2b_IV.clone(); + result[0] ^= 0x01010040; + hash(worldSeed, result, new long[16], 0, false); + return result; + } + + public static void hash(long[] message, long[] chainValue, long[] internalState, long messageOffset, boolean isFinal) { + assert message.length == 16; + assert chainValue.length == 8; + assert internalState.length == 16; + + System.arraycopy(chainValue, 0, internalState, 0, chainValue.length); + System.arraycopy(blake2b_IV, 0, internalState, chainValue.length, 4); + internalState[12] = messageOffset ^ blake2b_IV[4]; + internalState[13] = blake2b_IV[5]; + if (isFinal) internalState[14] = ~blake2b_IV[6]; + internalState[15] = blake2b_IV[7]; + + for (int round = 0; round < 12; round++) { + G(message[blake2b_sigma[round][0]], message[blake2b_sigma[round][1]], 0, 4, 8, 12, internalState); + G(message[blake2b_sigma[round][2]], message[blake2b_sigma[round][3]], 1, 5, 9, 13, internalState); + G(message[blake2b_sigma[round][4]], message[blake2b_sigma[round][5]], 2, 6, 10, 14, internalState); + G(message[blake2b_sigma[round][6]], message[blake2b_sigma[round][7]], 3, 7, 11, 15, internalState); + G(message[blake2b_sigma[round][8]], message[blake2b_sigma[round][9]], 0, 5, 10, 15, internalState); + G(message[blake2b_sigma[round][10]], message[blake2b_sigma[round][11]], 1, 6, 11, 12, internalState); + G(message[blake2b_sigma[round][12]], message[blake2b_sigma[round][13]], 2, 7, 8, 13, internalState); + G(message[blake2b_sigma[round][14]], message[blake2b_sigma[round][15]], 3, 4, 9, 14, internalState); + } + + for (int i = 0; i < 8; i++) { + chainValue[i] ^= internalState[i] ^ internalState[i + 8]; + } + } + + private static void G(long m1, long m2, int posA, int posB, int posC, int posD, long[] internalState) + { + internalState[posA] = internalState[posA] + internalState[posB] + m1; + internalState[posD] = Long.rotateRight(internalState[posD] ^ internalState[posA], 32); + internalState[posC] = internalState[posC] + internalState[posD]; + internalState[posB] = Long.rotateRight(internalState[posB] ^ internalState[posC], 24); // replaces 25 of BLAKE + internalState[posA] = internalState[posA] + internalState[posB] + m2; + internalState[posD] = Long.rotateRight(internalState[posD] ^ internalState[posA], 16); + internalState[posC] = internalState[posC] + internalState[posD]; + internalState[posB] = Long.rotateRight(internalState[posB] ^ internalState[posC], 63); // replaces 11 of BLAKE + } +} diff --git a/src/main/java/su/plo/matter/WorldgenCryptoRandom.java b/src/main/java/su/plo/matter/WorldgenCryptoRandom.java new file mode 100644 index 0000000000000000000000000000000000000000..56a1dccabd29543199fb0eca772fd3ad3ef7104a --- /dev/null +++ b/src/main/java/su/plo/matter/WorldgenCryptoRandom.java @@ -0,0 +1,142 @@ +package su.plo.matter; + +import net.minecraft.util.Mth; +import net.minecraft.world.level.levelgen.LegacyRandomSource; +import net.minecraft.world.level.levelgen.PositionalRandomFactory; +import net.minecraft.world.level.levelgen.RandomSource; +import net.minecraft.world.level.levelgen.WorldgenRandom; + +import java.util.Arrays; +import java.util.Random; + +public class WorldgenCryptoRandom extends WorldgenRandom { + // hash the world seed to guard against badly chosen world seeds + private static final long[] HASHED_ZERO_SEED = Hashing.hashWorldSeed(new long[Globals.WORLD_SEED_LONGS]); + private static final ThreadLocal LAST_SEEN_WORLD_SEED = ThreadLocal.withInitial(() -> new long[Globals.WORLD_SEED_LONGS]); + private static final ThreadLocal HASHED_WORLD_SEED = ThreadLocal.withInitial(() -> HASHED_ZERO_SEED); + + private final long[] worldSeed = new long[Globals.WORLD_SEED_LONGS]; + private final long[] randomBits = new long[8]; + private int randomBitIndex; + private static final int MAX_RANDOM_BIT_INDEX = 64 * 8; + private static final int LOG2_MAX_RANDOM_BIT_INDEX = 9; + private long counter; + private final long[] message = new long[16]; + private final long[] cachedInternalState = new long[16]; + + public WorldgenCryptoRandom(int x, int z, Globals.Salt typeSalt, long salt) { + super(new LegacyRandomSource(0L)); + this.setSecureSeed(x, z, typeSalt, salt); + } + + public void setSecureSeed(int x, int z, Globals.Salt typeSalt, long salt) { + System.arraycopy(Globals.worldSeed, 0, this.worldSeed, 0, Globals.WORLD_SEED_LONGS); + message[0] = ((long) x << 32) | ((long) z & 0xffffffffL); + message[1] = ((long) Globals.dimension.get() << 32) | ((long) salt & 0xffffffffL); + message[2] = typeSalt.ordinal(); + message[3] = counter = 0; + randomBitIndex = MAX_RANDOM_BIT_INDEX; + } + + private long[] getHashedWorldSeed() { + if (!Arrays.equals(worldSeed, LAST_SEEN_WORLD_SEED.get())) { + HASHED_WORLD_SEED.set(Hashing.hashWorldSeed(worldSeed)); + System.arraycopy(worldSeed, 0, LAST_SEEN_WORLD_SEED.get(), 0, Globals.WORLD_SEED_LONGS); + } + return HASHED_WORLD_SEED.get(); + } + + private void moreRandomBits() { + message[3] = counter++; + System.arraycopy(getHashedWorldSeed(), 0, randomBits, 0, 8); + Hashing.hash(message, randomBits, cachedInternalState, 64, true); + } + + private long getBits(int count) { + if (randomBitIndex >= MAX_RANDOM_BIT_INDEX) { + moreRandomBits(); + randomBitIndex -= MAX_RANDOM_BIT_INDEX; + } + + int alignment = randomBitIndex & 63; + if ((randomBitIndex >>> 6) == ((randomBitIndex + count) >>> 6)) { + long result = (randomBits[randomBitIndex >>> 6] >>> alignment) & ((1L << count) - 1); + randomBitIndex += count; + return result; + } else { + long result = (randomBits[randomBitIndex >>> 6] >>> alignment) & ((1L << (64 - alignment)) - 1); + randomBitIndex += count; + if (randomBitIndex >= MAX_RANDOM_BIT_INDEX) { + moreRandomBits(); + randomBitIndex -= MAX_RANDOM_BIT_INDEX; + } + alignment = randomBitIndex & 63; + result <<= alignment; + result |= (randomBits[randomBitIndex >>> 6] >>> (64 - alignment)) & ((1L << alignment) - 1); + + return result; + } + } + + @Override + public int next(int bits) { + return (int) getBits(bits); + } + + @Override + public void consumeCount(int count) { + randomBitIndex += count; + if (randomBitIndex >= MAX_RANDOM_BIT_INDEX * 2) { + randomBitIndex -= MAX_RANDOM_BIT_INDEX; + counter += randomBitIndex >>> LOG2_MAX_RANDOM_BIT_INDEX; + randomBitIndex &= MAX_RANDOM_BIT_INDEX - 1; + randomBitIndex += MAX_RANDOM_BIT_INDEX; + } + } + + @Override + public int nextInt(int bound) { + int bits = Mth.ceillog2(bound); + int result; + do { + result = (int) getBits(bits); + } while (result >= bound); + + return result; + } + + @Override + public long nextLong() { + return getBits(64); + } + + @Override + public double nextDouble() { + return getBits(53) * 0x1.0p-53; + } + + @Override + public long setDecorationSeed(long worldSeed, int blockX, int blockZ) { + setSecureSeed(blockX, blockZ, Globals.Salt.POPULATION, 0); + return ((long) blockX << 32) | ((long) blockZ & 0xffffffffL); + } + + @Override + public void setFeatureSeed(long populationSeed, int index, int step) { + setSecureSeed((int) (populationSeed >> 32), (int) populationSeed, Globals.Salt.DECORATION, index + 10000L * step); + } + + @Override + public void setLargeFeatureSeed(long worldSeed, int chunkX, int chunkZ) { + super.setLargeFeatureSeed(worldSeed, chunkX, chunkZ); + } + + @Override + public void setLargeFeatureWithSalt(long worldSeed, int regionX, int regionZ, int salt) { + super.setLargeFeatureWithSalt(worldSeed, regionX, regionZ, salt); + } + + public static Random seedSlimeChunk(int chunkX, int chunkZ) { + return new WorldgenCryptoRandom(chunkX, chunkZ, Globals.Salt.SLIME_CHUNK, 0); + } +}