Skip to content

Fix oreveins #4415

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

Closed
jurrejelle wants to merge 2 commits into from
Closed

Fix oreveins #4415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
33fcadb
Fix first few bugs with veins, still getting a nullPointerException tho
jurrejelle Jan 2, 2026
bf27a13
Undo some unneeded null checks
jurrejelle Jan 5, 2026
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
13 changes: 9 additions & 4 deletions src/main/java/com/gregtechceu/gtceu/common/data/loader/PostRegistryListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import com.gregtechceu.gtceu.integration.map.cache.server.ServerCache;

import net.minecraft.core.Registry;
import net.minecraft.core.registries.Registries;
import net.minecraft.server.packs.resources.PreparableReloadListener;
import net.minecraft.server.packs.resources.ResourceManager;
import net.minecraft.util.profiling.ProfilerFiller;
Expand All @@ -25,11 +26,15 @@ public class PostRegistryListener extends ContextAwareReloadListener implements
private PostRegistryListener() {}

protected void apply() {
var registry = GTRegistries.builtinRegistry().registryOrThrow(GTRegistries.ORE_VEIN_REGISTRY);
// Apply and validate stuff that requires registry access that isn't finished yet during the Registry event
var biomeLookup = GTRegistries.builtinRegistry().lookupOrThrow(Registries.BIOME);

buildVeinGenerators(registry);
GTOreVeins.updateLargestVeinSize(registry);
ServerCache.instance.oreVeinDefinitionsChanged(registry);
var oreVeinRegistry = GTRegistries.builtinRegistry().registryOrThrow(GTRegistries.ORE_VEIN_REGISTRY);
oreVeinRegistry.holders().forEach(holder -> holder.value().biomeLookup(biomeLookup));

buildVeinGenerators(oreVeinRegistry);
GTOreVeins.updateLargestVeinSize(oreVeinRegistry);
ServerCache.instance.oreVeinDefinitionsChanged(oreVeinRegistry);
WorldGeneratorUtils.invalidateOreVeinCache();
}

Expand Down
9 changes: 5 additions & 4 deletions ...ava/com/gregtechceu/gtceu/integration/kjs/builders/worldgen/OreVeinDefinitionBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import com.mojang.datafixers.util.Pair;
import dev.latvian.mods.kubejs.registry.BuilderBase;
import dev.latvian.mods.kubejs.util.RegistryAccessContainer;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
import lombok.Setter;
import lombok.experimental.Accessors;
import lombok.experimental.Tolerate;
Expand All @@ -42,7 +43,7 @@ public class OreVeinDefinitionBuilder extends BuilderBase<OreVeinDefinition> {
private int weight;
private IWorldGenLayer layer = WorldGenLayers.STONE;
@Setter
private Set<ResourceKey<Level>> dimensionFilter;
private Set<ResourceKey<Level>> dimensionFilter = new HashSet<>();
@Setter
private HeightRangePlacement heightRange;
@Setter
Expand All @@ -51,13 +52,13 @@ public class OreVeinDefinitionBuilder extends BuilderBase<OreVeinDefinition> {
@Nullable
private HolderSet<Biome> biomes;
@Setter
private BiomeWeightModifier biomeWeightModifier;
private BiomeWeightModifier biomeWeightModifier = BiomeWeightModifier.EMPTY;

@Setter
@Nullable
private VeinGenerator veinGenerator;
@Setter
private List<IndicatorGenerator> indicatorGenerators;
private List<IndicatorGenerator> indicatorGenerators = new ObjectArrayList<>();

public OreVeinDefinitionBuilder(ResourceLocation id) {
super(id);
Expand Down Expand Up @@ -216,6 +217,6 @@ public OreVeinDefinition createObject() {
return new OreVeinDefinition(clusterSize, density, weight, layer,
Set.copyOf(dimensionFilter), heightRange, discardChanceOnAirExposure,
biomes, biomeWeightModifier, veinGenerator, indicatorGenerators,
RegistryAccessContainer.current.access().lookupOrThrow(Registries.BIOME));
RegistryAccessContainer.current.access().lookup(Registries.BIOME).orElse(null));
}
}
Loading