Formatting Fixes

This commit is contained in:
Sebastian Hartte
2020-08-01 17:24:48 +02:00
parent 1b31185cdb
commit a6fb17b008
24 changed files with 137 additions and 113 deletions
@@ -1,18 +1,20 @@
package appeng.worldgen;
import appeng.mixins.BiomeAccessor;
import appeng.mixins.GenerationSettingsAccessor;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.function.Supplier;
import com.google.common.collect.Lists;
import net.minecraft.world.biome.Biome;
import net.minecraft.world.gen.GenerationStep;
import net.minecraft.world.gen.feature.ConfiguredFeature;
import net.minecraft.world.gen.feature.ConfiguredStructureFeature;
import net.minecraft.world.gen.feature.StructureFeature;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.function.Supplier;
import appeng.mixins.BiomeAccessor;
import appeng.mixins.GenerationSettingsAccessor;
public final class BiomeModifier {
@@ -29,7 +31,8 @@ public final class BiomeModifier {
public void addFeature(GenerationStep.Feature step, ConfiguredFeature<?, ?> feature) {
int stepIndex = step.ordinal();
List<List<Supplier<ConfiguredFeature<?, ?>>>> featuresByStep = new ArrayList<>(generationSettingsAccessor.getFeatures());
List<List<Supplier<ConfiguredFeature<?, ?>>>> featuresByStep = new ArrayList<>(
generationSettingsAccessor.getFeatures());
while (featuresByStep.size() <= stepIndex) {
featuresByStep.add(Lists.newArrayList());
@@ -44,7 +47,8 @@ public final class BiomeModifier {
}
public void addStructureFeature(ConfiguredStructureFeature<?, ?> structure) {
List<Supplier<ConfiguredStructureFeature<?, ?>>> features = new ArrayList<>(generationSettingsAccessor.getStructureFeatures());
List<Supplier<ConfiguredStructureFeature<?, ?>>> features = new ArrayList<>(
generationSettingsAccessor.getStructureFeatures());
features.add(() -> structure);
generationSettingsAccessor.setStructureFeatures(features);
@@ -3,6 +3,7 @@ package appeng.worldgen;
import java.util.Random;
import com.mojang.serialization.Codec;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.ChunkPos;
import net.minecraft.world.Heightmap;
@@ -25,7 +26,8 @@ public class ChargedQuartzOreFeature extends Feature<ChargedQuartzOreConfig> {
}
@Override
public boolean generate(StructureWorldAccess worldIn, ChunkGenerator generator, Random rand, BlockPos pos, ChargedQuartzOreConfig config) {
public boolean generate(StructureWorldAccess worldIn, ChunkGenerator generator, Random rand, BlockPos pos,
ChargedQuartzOreConfig config) {
ChunkPos chunkPos = new ChunkPos(pos);
BlockPos.Mutable bpos = new BlockPos.Mutable();
@@ -85,8 +85,8 @@ public class MeteoriteStructurePiece extends StructurePiece {
}
@Override
public boolean generate(StructureWorldAccess world, StructureAccessor structureAccessor, ChunkGenerator chunkGenerator,
Random random, BlockBox bounds, ChunkPos chunkPos, BlockPos blockPos) {
public boolean generate(StructureWorldAccess world, StructureAccessor structureAccessor,
ChunkGenerator chunkGenerator, Random random, BlockBox bounds, ChunkPos chunkPos, BlockPos blockPos) {
MeteoritePlacer placer = new MeteoritePlacer(world, settings, bounds);
placer.place();
@@ -37,7 +37,9 @@ public class MeteoriteStructureStart extends StructureStart<DefaultFeatureConfig
}
@Override
public void init(DynamicRegistryManager dynamicRegistryManager, ChunkGenerator generator, StructureManager structureManager, int chunkX, int chunkZ, Biome biome, DefaultFeatureConfig featureConfig) {
public void init(DynamicRegistryManager dynamicRegistryManager, ChunkGenerator generator,
StructureManager structureManager, int chunkX, int chunkZ, Biome biome,
DefaultFeatureConfig featureConfig) {
final int centerX = chunkX * 16 + this.random.nextInt(16);
final int centerZ = chunkZ * 16 + this.random.nextInt(16);
final float meteoriteRadius = (this.random.nextFloat() * 6.0f) + 2;
@@ -75,7 +77,8 @@ public class MeteoriteStructureStart extends StructureStart<DefaultFeatureConfig
boolean craterLake = this.locateWaterAroundTheCrater(generator, actualPos, meteoriteRadius);
CraterType craterType = this.determineCraterType(spawnBiome);
boolean pureCrater = this.random.nextFloat() > .9f;
FalloutMode fallout = getFalloutFromBaseBlock(spawnBiome.getGenerationSettings().getSurfaceConfig().getTopMaterial());
FalloutMode fallout = getFalloutFromBaseBlock(
spawnBiome.getGenerationSettings().getSurfaceConfig().getTopMaterial());
children.add(
new MeteoriteStructurePiece(actualPos, meteoriteRadius, craterType, fallout, pureCrater, craterLake));