MinecraftMods/BCLib
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse source
This commit is contained in:
paulevsGitch 2021-12-21 18:44:24 +03:00
commit 1150816af2
2 changed files with 30 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gradle.properties
View file

@ -11,7 +11,7 @@ loader_version= 0.12.12
fabric_version = 0.44.0+1.18 fabric_version = 0.44.0+1.18
# Mod Properties # Mod Properties
mod_version = 1.1.4 mod_version = 1.1.5
maven_group = ru.bclib maven_group = ru.bclib
archives_base_name = bclib archives_base_name = bclib

35
src/main/java/ru/bclib/api/biomes/BiomeAPI.java
View file

@ -73,6 +73,7 @@ import ru.bclib.world.structures.BCLStructureFeature;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
@ -183,6 +184,7 @@ public class BiomeAPI {
public static void prepareWorldData(){ public static void prepareWorldData(){
structureStarts.clear(); structureStarts.clear();
worldSources.clear(); worldSources.clear();
knownNoiseGenerators.clear();
} }
/** /**
@ -609,6 +611,14 @@ public class BiomeAPI {
.collect(Collectors.toSet()); .collect(Collectors.toSet());
return getRuleSourcesFromIDs(biomeIDs); return getRuleSourcesFromIDs(biomeIDs);
} }
private static List<SurfaceRules.RuleSource> getAllRuleSources() {
List<SurfaceRules.RuleSource> rules = Lists.newArrayList();
SURFACE_RULES.forEach((biomeID, rule) -> {
rules.add(rule);
});
return rules;
}
private static List<SurfaceRules.RuleSource> getRuleSourcesFromIDs(Set<ResourceLocation> biomeIDs) { private static List<SurfaceRules.RuleSource> getRuleSourcesFromIDs(Set<ResourceLocation> biomeIDs) {
List<SurfaceRules.RuleSource> rules = Lists.newArrayList(); List<SurfaceRules.RuleSource> rules = Lists.newArrayList();
@ -788,6 +798,7 @@ public class BiomeAPI {
*/ */
public static void addSurfaceRule(ResourceLocation biomeID, SurfaceRules.RuleSource source) { public static void addSurfaceRule(ResourceLocation biomeID, SurfaceRules.RuleSource source) {
SURFACE_RULES.put(biomeID, source); SURFACE_RULES.put(biomeID, source);
knownNoiseGenerators.forEach(BiomeAPI::changeSurfaceRulesForGenerator);
} }
/** /**
@ -907,7 +918,11 @@ public class BiomeAPI {
} }
private final static Map<StructureID, BiConsumer<Map<StructureFeature<?>, Multimap<ConfiguredStructureFeature<?, ?>, ResourceKey<Biome>>>, Map<StructureFeature<?>, StructureFeatureConfiguration>>> structureStarts = new HashMap<>(); private final static Map<StructureID, BiConsumer<Map<StructureFeature<?>, Multimap<ConfiguredStructureFeature<?, ?>, ResourceKey<Biome>>>, Map<StructureFeature<?>, StructureFeatureConfiguration>>> structureStarts = new HashMap<>();
private static void registerNoiseGeneratorAndChangeSurfaceRules(NoiseGeneratorSettings settings){
knownNoiseGenerators.add(settings);
changeSurfaceRulesForGenerator(settings);
}
public static void registerStructureEvents(){ public static void registerStructureEvents(){
DynamicRegistrySetupCallback.EVENT.register(registryManager -> { DynamicRegistrySetupCallback.EVENT.register(registryManager -> {
Optional<? extends Registry<NoiseGeneratorSettings>> oGeneratorRegistry = registryManager.registry(Registry.NOISE_GENERATOR_SETTINGS_REGISTRY); Optional<? extends Registry<NoiseGeneratorSettings>> oGeneratorRegistry = registryManager.registry(Registry.NOISE_GENERATOR_SETTINGS_REGISTRY);
@ -915,6 +930,7 @@ public class BiomeAPI {
if (oGeneratorRegistry.isPresent()) { if (oGeneratorRegistry.isPresent()) {
oGeneratorRegistry.get().forEach(BiomeAPI::registerNoiseGeneratorAndChangeSurfaceRules);
RegistryEntryAddedCallback RegistryEntryAddedCallback
.event(oGeneratorRegistry.get()) .event(oGeneratorRegistry.get())
.register((rawId, id, settings) -> { .register((rawId, id, settings) -> {
@ -925,17 +941,24 @@ public class BiomeAPI {
structureStarts.entrySet().forEach(entry -> changeStructureStarts(a, entry.getValue())); structureStarts.entrySet().forEach(entry -> changeStructureStarts(a, entry.getValue()));
//add surface rules //add surface rules
if (biomeRegistry!=null) { registerNoiseGeneratorAndChangeSurfaceRules(settings);
List<SurfaceRules.RuleSource> rules = getRuleSourcesFromIDs(biomeRegistry.keySet());
SurfaceRuleProvider provider = SurfaceRuleProvider.class.cast(settings);
changeSurfaceRules(rules, provider);
}
}); });
} }
}); });
} }
private static final Set<NoiseGeneratorSettings> knownNoiseGenerators = new HashSet<>();
private static void changeSurfaceRulesForGenerator(NoiseGeneratorSettings settings){
List<SurfaceRules.RuleSource> rules;
if (biomeRegistry!=null) {
rules = getRuleSourcesFromIDs(biomeRegistry.keySet());
} else {
rules = getAllRuleSources();
}
SurfaceRuleProvider provider = SurfaceRuleProvider.class.cast(settings);
changeSurfaceRules(rules, provider);
}
private static void changeSurfaceRules(List<RuleSource> rules, SurfaceRuleProvider provider) { private static void changeSurfaceRules(List<RuleSource> rules, SurfaceRuleProvider provider) {
if (rules.size() > 0) { if (rules.size() > 0) {