fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improved logging and slight refactor.

Browse Source
This commit is contained in:
Sebastian Hartte
2020-09-05 19:22:05 +02:00
parent 689bf6e8d9
commit e1cd3bba25
1 changed files with 33 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/core/AppEngBootstrap.java
+33 -29
View File
@@ -1,16 +1,9 @@
package appeng.core; package appeng.core;
import appeng.api.features.AEFeature; import java.util.HashSet;
import appeng.mixins.feature.ConfiguredFeaturesAccessor; import java.util.Map;
import appeng.mixins.structure.ConfiguredStructureFeaturesAccessor; import java.util.Set;
import appeng.mixins.structure.StructureFeatureAccessor;
import appeng.spatial.SpatialStorageChunkGenerator;
import appeng.spatial.SpatialStorageDimensionIds;
import appeng.worldgen.BiomeModifier;
import appeng.worldgen.ChargedQuartzOreConfig;
import appeng.worldgen.ChargedQuartzOreFeature;
import appeng.worldgen.meteorite.MeteoriteStructure;
import appeng.worldgen.meteorite.MeteoriteStructurePiece;
import net.fabricmc.fabric.api.event.registry.RegistryEntryAddedCallback; import net.fabricmc.fabric.api.event.registry.RegistryEntryAddedCallback;
import net.fabricmc.loader.api.FabricLoader; import net.fabricmc.loader.api.FabricLoader;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;
@@ -27,9 +20,17 @@ import net.minecraft.world.gen.feature.ConfiguredFeature;
import net.minecraft.world.gen.feature.Feature; import net.minecraft.world.gen.feature.Feature;
import net.minecraft.world.gen.feature.OreFeatureConfig; import net.minecraft.world.gen.feature.OreFeatureConfig;
import java.util.HashSet; import appeng.api.features.AEFeature;
import java.util.Map; import appeng.mixins.feature.ConfiguredFeaturesAccessor;
import java.util.Set; import appeng.mixins.structure.ConfiguredStructureFeaturesAccessor;
import appeng.mixins.structure.StructureFeatureAccessor;
import appeng.spatial.SpatialStorageChunkGenerator;
import appeng.spatial.SpatialStorageDimensionIds;
import appeng.worldgen.BiomeModifier;
import appeng.worldgen.ChargedQuartzOreConfig;
import appeng.worldgen.ChargedQuartzOreFeature;
import appeng.worldgen.meteorite.MeteoriteStructure;
import appeng.worldgen.meteorite.MeteoriteStructurePiece;
/** /**
* Hooks into the very early bootstrapping phase to register things before the * Hooks into the very early bootstrapping phase to register things before the
@@ -67,22 +68,14 @@ public final class AppEngBootstrap {
for (Map.Entry<RegistryKey<Biome>, Biome> entry : BuiltinRegistries.BIOME.getEntries()) { for (Map.Entry<RegistryKey<Biome>, Biome> entry : BuiltinRegistries.BIOME.getEntries()) {
Identifier id = entry.getKey().getValue(); Identifier id = entry.getKey().getValue();
Biome b = entry.getValue(); Biome b = entry.getValue();
if (!meteoriteBiomeBlacklist.contains(id.toString())) { addMeteoriteWorldGen(id, b, meteoriteBiomeBlacklist);
addMeteoriteWorldGen(id, b); addQuartzWorldGen(id, b, quartzOreFeature, chargedQuartzOreFeature, quartzOreBiomeBlacklist);
}
if (!quartzOreBiomeBlacklist.contains(id.toString())) {
addQuartzWorldGen(id, b, quartzOreFeature, chargedQuartzOreFeature);
}
} }
// Listen to added biomes for post-processing // Listen to added biomes for post-processing
RegistryEntryAddedCallback.event(BuiltinRegistries.BIOME).register((i, id, biome) -> { RegistryEntryAddedCallback.event(BuiltinRegistries.BIOME).register((i, id, biome) -> {
if (!meteoriteBiomeBlacklist.contains(id.toString())) { addMeteoriteWorldGen(id, biome, meteoriteBiomeBlacklist);
addMeteoriteWorldGen(id, biome); addQuartzWorldGen(id, biome, quartzOreFeature, chargedQuartzOreFeature, quartzOreBiomeBlacklist);
}
if (!quartzOreBiomeBlacklist.contains(id.toString())) {
addQuartzWorldGen(id, biome, quartzOreFeature, chargedQuartzOreFeature);
}
}); });
registerDimension(); registerDimension();
@@ -102,12 +95,19 @@ public final class AppEngBootstrap {
MeteoriteStructure.CONFIGURED_INSTANCE); MeteoriteStructure.CONFIGURED_INSTANCE);
} }
private static void addMeteoriteWorldGen(Identifier id, Biome b) { private static void addMeteoriteWorldGen(Identifier id, Biome b, Set<String> biomeBlacklist) {
if (!AEConfig.instance().isFeatureEnabled(AEFeature.METEORITE_WORLD_GEN)) { if (!AEConfig.instance().isFeatureEnabled(AEFeature.METEORITE_WORLD_GEN)) {
AELog.debug("Not generating meteorites in %s because the feature is disabled", id);
return; return;
} }
if (b.getCategory() == Biome.Category.THEEND || b.getCategory() == Biome.Category.NETHER) { if (b.getCategory() == Biome.Category.THEEND || b.getCategory() == Biome.Category.NETHER) {
AELog.debug("Not generating meteorites in %s because it's of category %s", id, b.getCategory());
return;
}
if (biomeBlacklist.contains(id.toString())) {
AELog.debug("Not generating meteorites in %s because the biome is blacklisted in the config", id);
return; return;
} }
@@ -116,7 +116,7 @@ public final class AppEngBootstrap {
} }
private static void addQuartzWorldGen(Identifier id, Biome b, ConfiguredFeature<?, ?> quartzOre, private static void addQuartzWorldGen(Identifier id, Biome b, ConfiguredFeature<?, ?> quartzOre,
ConfiguredFeature<?, ?> chargedQuartz) { ConfiguredFeature<?, ?> chargedQuartz, Set<String> biomeBlacklist) {
if (!AEConfig.instance().isFeatureEnabled(AEFeature.CERTUS_QUARTZ_WORLD_GEN)) { if (!AEConfig.instance().isFeatureEnabled(AEFeature.CERTUS_QUARTZ_WORLD_GEN)) {
AELog.debug("Not generating quartz-ore in %s because the feature is disabled", id); AELog.debug("Not generating quartz-ore in %s because the feature is disabled", id);
return; return;
@@ -127,8 +127,12 @@ public final class AppEngBootstrap {
return; return;
} }
BiomeModifier modifier = new BiomeModifier(b); if (biomeBlacklist.contains(id.toString())) {
AELog.debug("Not generating quartz-ore in %s because the biome is blacklisted in the config", id);
return;
}
BiomeModifier modifier = new BiomeModifier(b);
modifier.addFeature(GenerationStep.Feature.UNDERGROUND_ORES, quartzOre); modifier.addFeature(GenerationStep.Feature.UNDERGROUND_ORES, quartzOre);
if (AEConfig.instance().isFeatureEnabled(AEFeature.CHARGED_CERTUS_ORE)) { if (AEConfig.instance().isFeatureEnabled(AEFeature.CHARGED_CERTUS_ORE)) {