mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-17 02:55:17 +00:00
Fix crash when reloading a world that uses custom placed features. Closes #9979
This commit is contained in:
1 parent
7c36115e3d
commit
95b49bedbc
8 files changed
+236
-1
No files matched your search
+1
-1
@@ -214,6 +214,7 @@ patcher {
|
||||
}
|
||||
|
||||
forge_data_test {
|
||||
source sourceSets.test
|
||||
args '--launchTarget', 'forge_dev_data',
|
||||
'--mod', '.+',
|
||||
'--all',
|
||||
@@ -224,7 +225,6 @@ patcher {
|
||||
'--assetsDir', downloadAssets.output,
|
||||
'--assetIndex', "{asset_index}"
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,27 @@
|
||||
--- a/net/minecraft/world/level/chunk/ChunkGenerator.java
|
||||
+++ b/net/minecraft/world/level/chunk/ChunkGenerator.java
|
||||
@@ -81,7 +_,7 @@
|
||||
public abstract class ChunkGenerator {
|
||||
public static final Codec<ChunkGenerator> CODEC = BuiltInRegistries.CHUNK_GENERATOR.byNameCodec().dispatchStable(ChunkGenerator::codec, Function.identity());
|
||||
protected final BiomeSource biomeSource;
|
||||
- private final Supplier<List<FeatureSorter.StepFeatureData>> featuresPerStep;
|
||||
+ private final net.minecraftforge.common.util.ClearableLazy<List<FeatureSorter.StepFeatureData>> featuresPerStep;
|
||||
private final Function<Holder<Biome>, BiomeGenerationSettings> generationSettingsGetter;
|
||||
|
||||
public ChunkGenerator(BiomeSource p_256133_) {
|
||||
@@ -91,9 +_,14 @@
|
||||
public ChunkGenerator(BiomeSource p_255838_, Function<Holder<Biome>, BiomeGenerationSettings> p_256216_) {
|
||||
this.biomeSource = p_255838_;
|
||||
this.generationSettingsGetter = p_256216_;
|
||||
- this.featuresPerStep = Suppliers.memoize(
|
||||
+ this.featuresPerStep = net.minecraftforge.common.util.ClearableLazy.concurrentOf(
|
||||
() -> FeatureSorter.buildFeaturesPerStep(List.copyOf(p_255838_.possibleBiomes()), p_223216_ -> p_256216_.apply(p_223216_).features(), true)
|
||||
);
|
||||
+ }
|
||||
+
|
||||
+ @org.jetbrains.annotations.ApiStatus.Internal
|
||||
+ public void refreshFeaturesPerStep() {
|
||||
+ featuresPerStep.invalidate();
|
||||
}
|
||||
|
||||
public void validate() {
|
||||
@@ -0,0 +1,88 @@
|
||||
package net.minecraftforge.common.util;
|
||||
|
||||
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import java.util.function.Supplier;
|
||||
|
||||
public interface ClearableLazy<T> extends Lazy<T> {
|
||||
void invalidate();
|
||||
|
||||
/**
|
||||
* Constructs a lazy-initialized object
|
||||
* @param supplier The supplier for the value, to be called the first time the value is needed.
|
||||
*/
|
||||
static <T> ClearableLazy<T> of(@NotNull Supplier<T> supplier) {
|
||||
return new ClearableLazy.Fast<T>(supplier);
|
||||
}
|
||||
|
||||
/**
|
||||
* Constructs a thread-safe lazy-initialized object
|
||||
* @param supplier The supplier for the value, to be called the first time the value is needed.
|
||||
*/
|
||||
static <T> ClearableLazy<T> concurrentOf(@NotNull Supplier<T> supplier) {
|
||||
return new ClearableLazy.Concurrent<>(supplier);
|
||||
}
|
||||
|
||||
/**
|
||||
* Non-thread-safe implementation.
|
||||
*/
|
||||
final class Fast<T> implements ClearableLazy<T> {
|
||||
private final Supplier<T> supplier;
|
||||
private T instance;
|
||||
|
||||
private Fast(Supplier<T> supplier) {
|
||||
this.supplier = supplier;
|
||||
}
|
||||
|
||||
@Nullable
|
||||
@Override
|
||||
public final T get() {
|
||||
if (instance == null) {
|
||||
instance = supplier.get();
|
||||
}
|
||||
return instance;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void invalidate() {
|
||||
this.instance = null;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Thread-safe implementation.
|
||||
*/
|
||||
final class Concurrent<T> implements ClearableLazy<T> {
|
||||
private final Object lock = new Object();
|
||||
private final Supplier<T> supplier;
|
||||
private volatile T instance;
|
||||
|
||||
private Concurrent(Supplier<T> supplier) {
|
||||
this.supplier = supplier;
|
||||
}
|
||||
|
||||
@Nullable
|
||||
@Override
|
||||
public final T get()
|
||||
{
|
||||
var ret = instance;
|
||||
if (ret == null) {
|
||||
synchronized (lock) {
|
||||
if (instance == null) {
|
||||
return instance = supplier.get();
|
||||
}
|
||||
}
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void invalidate() {
|
||||
synchronized (lock) {
|
||||
this.instance = null;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -132,6 +132,10 @@ public class ServerLifecycleHooks {
|
||||
registries.registryOrThrow(Registries.BIOME).holders().forEach(biomeHolder ->
|
||||
biomeHolder.value().modifiableBiomeInfo().applyBiomeModifiers(biomeHolder, biomeModifiers)
|
||||
);
|
||||
// Rebuild the indexed feature list
|
||||
registries.registryOrThrow(Registries.LEVEL_STEM).forEach(levelStem -> {
|
||||
levelStem.generator().refreshFeaturesPerStep();
|
||||
});
|
||||
// Apply sorted structure modifiers to each structure.
|
||||
registries.registryOrThrow(Registries.STRUCTURE).holders().forEach(structureHolder ->
|
||||
structureHolder.value().modifiableStructureInfo().applyStructureModifiers(structureHolder, structureModifiers)
|
||||
|
||||
+6
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"type": "forge:add_features",
|
||||
"biomes": "#minecraft:is_overworld",
|
||||
"features": "biome_test_mod:overworld_netherite_block_ore_placed",
|
||||
"step": "underground_ores"
|
||||
}
|
||||
+18
@@ -0,0 +1,18 @@
|
||||
{
|
||||
"type": "minecraft:replace_single_block",
|
||||
"config": {
|
||||
"targets": [
|
||||
{
|
||||
"state": {
|
||||
"Name": "minecraft:netherite_block"
|
||||
},
|
||||
"target": {
|
||||
"block_state": {
|
||||
"Name": "minecraft:air"
|
||||
},
|
||||
"predicate_type": "minecraft:blockstate_match"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
+15
@@ -0,0 +1,15 @@
|
||||
{
|
||||
"feature": "biome_test_mod:overworld_netherite_block_ore",
|
||||
"placement": [
|
||||
{
|
||||
"type": "minecraft:count",
|
||||
"count": 1
|
||||
},
|
||||
{
|
||||
"type": "minecraft:height_range",
|
||||
"height": {
|
||||
"absolute": 100
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -0,0 +1,77 @@
|
||||
package net.minecraftforge.debug.gameplay.biome;
|
||||
|
||||
import net.minecraft.core.HolderLookup;
|
||||
import net.minecraft.core.HolderSet;
|
||||
import net.minecraft.core.RegistrySetBuilder;
|
||||
import net.minecraft.core.registries.Registries;
|
||||
import net.minecraft.data.PackOutput;
|
||||
import net.minecraft.resources.ResourceKey;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
import net.minecraft.tags.BiomeTags;
|
||||
import net.minecraft.world.level.block.Blocks;
|
||||
import net.minecraft.world.level.levelgen.GenerationStep;
|
||||
import net.minecraft.world.level.levelgen.VerticalAnchor;
|
||||
import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
|
||||
import net.minecraft.world.level.levelgen.feature.Feature;
|
||||
import net.minecraft.world.level.levelgen.feature.configurations.ReplaceBlockConfiguration;
|
||||
import net.minecraft.world.level.levelgen.heightproviders.ConstantHeight;
|
||||
import net.minecraft.world.level.levelgen.placement.CountPlacement;
|
||||
import net.minecraft.world.level.levelgen.placement.HeightRangePlacement;
|
||||
import net.minecraft.world.level.levelgen.placement.PlacedFeature;
|
||||
import net.minecraftforge.common.data.DatapackBuiltinEntriesProvider;
|
||||
import net.minecraftforge.common.world.BiomeModifier;
|
||||
import net.minecraftforge.common.world.ForgeBiomeModifiers;
|
||||
import net.minecraftforge.data.event.GatherDataEvent;
|
||||
import net.minecraftforge.fml.common.Mod;
|
||||
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
|
||||
import net.minecraftforge.registries.ForgeRegistries;
|
||||
import net.minecraftforge.test.BaseTestMod;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
import java.util.concurrent.CompletableFuture;
|
||||
|
||||
|
||||
@Mod(BiomeTestMod.MOD_ID)
|
||||
public class BiomeTestMod extends BaseTestMod {
|
||||
public static final String MOD_ID = "biome_test_mod";
|
||||
|
||||
private static final ResourceKey<PlacedFeature> OVERWORLD_NETHERITE_BLOCK_ORE_PLACED_KEY = ResourceKey.create(Registries.PLACED_FEATURE, new ResourceLocation(BiomeTestMod.MOD_ID, "overworld_netherite_block_ore_placed"));
|
||||
private static final ResourceKey<BiomeModifier> ADD_OVERWORLD_NETHERITE_BLOCK_ORE = ResourceKey.create(ForgeRegistries.Keys.BIOME_MODIFIERS, new ResourceLocation(BiomeTestMod.MOD_ID, "add_overworld_netherite_block_ore"));
|
||||
private static final ResourceKey<ConfiguredFeature<?, ?>> OVERWORLD_NETHERITE_BLOCK_ORE = ResourceKey.create(Registries.CONFIGURED_FEATURE, new ResourceLocation(BiomeTestMod.MOD_ID, "overworld_netherite_block_ore"));
|
||||
|
||||
public BiomeTestMod() {
|
||||
var modBus = FMLJavaModLoadingContext.get().getModEventBus();
|
||||
modBus.addListener(BiomeTestMod::onDataGen);
|
||||
}
|
||||
|
||||
private static void onDataGen(GatherDataEvent event) {
|
||||
event.getGenerator().addProvider(event.includeServer(), new ModWorldGenProvider(event.getGenerator().getPackOutput(), event.getLookupProvider()));
|
||||
}
|
||||
|
||||
private static class ModWorldGenProvider extends DatapackBuiltinEntriesProvider {
|
||||
public static final RegistrySetBuilder BUILDER = new RegistrySetBuilder()
|
||||
.add(Registries.CONFIGURED_FEATURE, context -> {
|
||||
context.register(OVERWORLD_NETHERITE_BLOCK_ORE, new ConfiguredFeature<>(
|
||||
Feature.REPLACE_SINGLE_BLOCK,
|
||||
new ReplaceBlockConfiguration(Blocks.AIR.defaultBlockState(), Blocks.NETHERITE_BLOCK.defaultBlockState())
|
||||
));
|
||||
})
|
||||
.add(Registries.PLACED_FEATURE, context -> {
|
||||
context.register(OVERWORLD_NETHERITE_BLOCK_ORE_PLACED_KEY, new PlacedFeature(
|
||||
context.lookup(Registries.CONFIGURED_FEATURE).getOrThrow(OVERWORLD_NETHERITE_BLOCK_ORE),
|
||||
List.of(CountPlacement.of(1), HeightRangePlacement.of(ConstantHeight.of(VerticalAnchor.absolute(100))))
|
||||
));
|
||||
})
|
||||
.add(ForgeRegistries.Keys.BIOME_MODIFIERS, context -> {
|
||||
context.register(ADD_OVERWORLD_NETHERITE_BLOCK_ORE, new ForgeBiomeModifiers.AddFeaturesBiomeModifier(
|
||||
context.lookup(Registries.BIOME).getOrThrow(BiomeTags.IS_OVERWORLD),
|
||||
HolderSet.direct(context.lookup(Registries.PLACED_FEATURE).getOrThrow(OVERWORLD_NETHERITE_BLOCK_ORE_PLACED_KEY)),
|
||||
GenerationStep.Decoration.UNDERGROUND_ORES
|
||||
));
|
||||
});
|
||||
|
||||
public ModWorldGenProvider(PackOutput output, CompletableFuture<HolderLookup.Provider> registries) {
|
||||
super(output, registries, BUILDER, Set.of(BiomeTestMod.MOD_ID));
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user