Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added PoiType Registration to WorldGen #103

Open
wants to merge 1 commit into
base: 1.20.1
Choose a base branch
from
Open

Added PoiType Registration to WorldGen #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions fabric/src/main/java/net/blay09/mods/balm/fabric/world/FabricBalmWorldGen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,14 @@
import net.blay09.mods.balm.api.world.BalmWorldGen;
import net.blay09.mods.balm.api.world.BiomePredicate;
import net.fabricmc.fabric.api.biome.v1.BiomeModifications;
import net.minecraft.core.Holder;
import net.minecraft.core.Registry;
import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.core.registries.Registries;
import net.minecraft.data.worldgen.features.FeatureUtils;
import net.minecraft.data.worldgen.placement.PlacementUtils;
import net.minecraft.resources.ResourceKey;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.entity.ai.village.poi.PoiType;
import net.minecraft.world.level.levelgen.GenerationStep;
import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
import net.minecraft.world.level.levelgen.feature.Feature;
import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration;
import net.minecraft.world.level.levelgen.placement.PlacedFeature;
import net.minecraft.world.level.levelgen.placement.PlacementModifier;
import net.minecraft.world.level.levelgen.placement.PlacementModifierType;

import java.util.function.Supplier;
Expand All @@ -41,6 +35,15 @@ public <T extends PlacementModifierType<?>> DeferredObject<T> registerPlacementM
}).resolveImmediately();
}

@Override
public <T extends PoiType> DeferredObject<T> registerPoiType(ResourceLocation identifier, Supplier<T> supplier) {
return new DeferredObject<>(identifier, () -> {
T poiType = supplier.get();
Registry.register(BuiltInRegistries.POINT_OF_INTEREST_TYPE, identifier, poiType);
return poiType;
}).resolveImmediately();
}

@Override
public void addFeatureToBiomes(BiomePredicate biomePredicate, GenerationStep.Decoration step, ResourceLocation placedFeatureIdentifier) {
BiomeModifications.addFeature(it -> biomePredicate.test(it.getBiomeKey().location(), it.getBiomeRegistryEntry()),
Expand Down
11 changes: 10 additions & 1 deletion forge/src/main/java/net/blay09/mods/balm/forge/world/ForgeBalmWorldGen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import net.minecraft.core.registries.Registries;
import net.minecraft.resources.ResourceKey;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.entity.ai.village.poi.PoiType;
import net.minecraft.world.level.biome.Biome;
import net.minecraft.world.level.levelgen.GenerationStep;
import net.minecraft.world.level.levelgen.feature.Feature;
Expand Down Expand Up @@ -50,7 +51,6 @@ public void commonSetup(FMLCommonSetupEvent event) {
});
}
}

public static final Codec<BalmBiomeModifier> BALM_BIOME_MODIFIER_CODEC = Codec.unit(BalmBiomeModifier.INSTANCE);
private final Map<String, Registrations> registrations = new ConcurrentHashMap<>();

Expand All @@ -76,6 +76,15 @@ public <T extends PlacementModifierType<?>> DeferredObject<T> registerPlacementM
return deferredObject;
}

@Override
public <T extends PoiType> DeferredObject<T> registerPoiType(ResourceLocation identifier, Supplier<T> supplier) {
return new DeferredObject<>(identifier, () -> {
T poiType = supplier.get();
Registry.register(BuiltInRegistries.POINT_OF_INTEREST_TYPE, identifier, poiType);
return poiType;
}).resolveImmediately();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PoiType is managed in ForgeRegistries so it has to be registered via DeferredRegisters similar to registerFeature.

}

private static final List<BiomeModification> biomeModifications = new ArrayList<>();

@Override
Expand Down
3 changes: 3 additions & 0 deletions shared/src/main/java/net/blay09/mods/balm/api/world/BalmWorldGen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import net.blay09.mods.balm.api.DeferredObject;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.entity.ai.village.poi.PoiType;
import net.minecraft.world.level.levelgen.GenerationStep;
import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
import net.minecraft.world.level.levelgen.feature.Feature;
Expand All @@ -17,5 +18,7 @@ public interface BalmWorldGen {

<T extends PlacementModifierType<?>> DeferredObject<T> registerPlacementModifier(ResourceLocation identifier, Supplier<T> supplier);

<T extends PoiType> DeferredObject<T> registerPoiType(ResourceLocation identifier, Supplier<T> supplier);

void addFeatureToBiomes(BiomePredicate biomePredicate, GenerationStep.Decoration step, ResourceLocation configuredFeatureIdentifier);
}