Skip to content

Add in optional priority to surface rules, fixes #51 #59

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

Open
wants to merge 2 commits into
base: 1.21
Choose a base branch
from
Open

Add in optional priority to surface rules, fixes #51 #59

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
91f6e9a
Add in optional priority to surface rules, fixes #51
voidsong-dragonfly Jun 4, 2025
bf659e2
Actually fix sorting
voidsong-dragonfly Jun 5, 2025
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
6 changes: 4 additions & 2 deletions ...on/src/main/java/dev/worldgen/lithostitched/worldgen/modifier/AddSurfaceRuleModifier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package dev.worldgen.lithostitched.worldgen.modifier;

import com.mojang.serialization.Codec;
import com.mojang.serialization.MapCodec;
import com.mojang.serialization.codecs.RecordCodecBuilder;
import net.minecraft.core.registries.Registries;
Expand All @@ -15,10 +16,11 @@
*
* @author Apollo
*/
public record AddSurfaceRuleModifier(List<ResourceKey<LevelStem>> levels, SurfaceRules.RuleSource surfaceRule) implements Modifier {
public record AddSurfaceRuleModifier(List<ResourceKey<LevelStem>> levels, SurfaceRules.RuleSource surfaceRule, int priority) implements Modifier {
public static final MapCodec<AddSurfaceRuleModifier> CODEC = RecordCodecBuilder.mapCodec(instance -> instance.group(
ResourceKey.codec(Registries.LEVEL_STEM).listOf().fieldOf("levels").forGetter(AddSurfaceRuleModifier::levels),
SurfaceRules.RuleSource.CODEC.fieldOf("surface_rule").forGetter(AddSurfaceRuleModifier::surfaceRule)
SurfaceRules.RuleSource.CODEC.fieldOf("surface_rule").forGetter(AddSurfaceRuleModifier::surfaceRule),
Codec.INT.fieldOf("priority").orElse(0).forGetter(AddSurfaceRuleModifier::priority)
).apply(instance, AddSurfaceRuleModifier::new));

@Override
Expand Down
7 changes: 3 additions & 4 deletions common/src/main/java/dev/worldgen/lithostitched/worldgen/surface/SurfaceRuleManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,7 @@
import net.minecraft.world.level.levelgen.NoiseGeneratorSettings;
import net.minecraft.world.level.levelgen.SurfaceRules;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;

/**
Expand Down Expand Up @@ -78,6 +75,8 @@ public static void applySurfaceRules(MinecraftServer server) {
private static SurfaceRules.RuleSource buildModdedSurfaceRules(ArrayList<Pair<ResourceLocation, AddSurfaceRuleModifier>> moddedSourceList, SurfaceRules.RuleSource originalSource) {
// TODO: Implement caching
List<SurfaceRules.RuleSource> newRuleSourceList = new ArrayList<>();
Comparator<Pair<ResourceLocation, AddSurfaceRuleModifier>> comp = Comparator.comparingInt(pair -> pair.getSecond().priority());
moddedSourceList.sort(comp.reversed());
moddedSourceList.forEach((pair) -> newRuleSourceList.add(pair.getSecond().surfaceRule()));

newRuleSourceList.add(originalSource);
Expand Down