mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2026-04-23 16:49:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

clean up biome and structure things

Browse Source
This commit is contained in:
dfsek
2021-07-08 06:18:16 -07:00
parent e1abc67989
commit 6ca9ba029b
11 changed files with 26 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/StructureFactory.java
View File

@@ -3,7 +3,6 @@ package com.dfsek.terra.addons.structure;
import com.dfsek.terra.api.TerraPlugin;
import com.dfsek.terra.api.config.ConfigFactory;
import com.dfsek.terra.api.structure.ConfiguredStructure;
import com.dfsek.terra.config.templates.StructureTemplate;
public class StructureFactory implements ConfigFactory<StructureTemplate, ConfiguredStructure> {
@Override

5
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/StructurePopulator.java
View File

@@ -10,7 +10,6 @@ import com.dfsek.terra.api.vector.Vector3;
import com.dfsek.terra.api.world.Chunk;
import com.dfsek.terra.api.world.TerraWorld;
import com.dfsek.terra.api.world.World;
import com.dfsek.terra.api.world.biome.UserDefinedBiome;
import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
import com.dfsek.terra.api.world.generator.Chunkified;
import com.dfsek.terra.api.world.generator.TerraBlockPopulator;
@@ -41,8 +40,8 @@ public class StructurePopulator implements TerraBlockPopulator, Chunkified {
for(ConfiguredStructure conf : config.getRegistry(TerraStructure.class).entries()) {
Vector3 spawn = conf.getSpawn().getNearestSpawn(cx + 8, cz + 8, world.getSeed());
if(!((UserDefinedBiome) provider.getBiome(spawn)).getConfig().getStructures().contains(conf))
continue;
//if(!((UserDefinedBiome) provider.getBiome(spawn)).getConfig().getStructures().contains(conf))
// continue;
Random random = new Random(PopulationUtil.getCarverChunkSeed(FastMath.floorDiv(spawn.getBlockX(), 16), FastMath.floorDiv(spawn.getBlockZ(), 16), world.getSeed()));
conf.getStructure().get(random).generate(spawn.setY(conf.getSpawnStart().get(random)), world, chunk, random, Rotation.fromDegrees(90 * random.nextInt(4)));
}

7
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/StructureTemplate.java
View File

@@ -1,18 +1,13 @@
package com.dfsek.terra.addons.structure;
import com.dfsek.tectonic.annotations.Abstractable;
import com.dfsek.tectonic.annotations.Default;
import com.dfsek.tectonic.annotations.Value;
import com.dfsek.tectonic.config.ConfigTemplate;
import com.dfsek.terra.api.config.AbstractableTemplate;
import com.dfsek.terra.api.structure.Structure;
import com.dfsek.terra.api.structure.StructureSpawn;
import com.dfsek.terra.api.util.GlueList;
import com.dfsek.terra.api.util.collection.ProbabilityCollection;
import com.dfsek.terra.api.util.Range;
import java.util.ArrayList;
import java.util.List;
import com.dfsek.terra.api.util.collection.ProbabilityCollection;
@SuppressWarnings({"unused", "FieldMayBeFinal"})
public class StructureTemplate implements AbstractableTemplate, ConfigTemplate {

5
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/TerraStructure.java
View File

@@ -31,4 +31,9 @@ public class TerraStructure implements ConfiguredStructure {
public StructureSpawn getSpawn() {
return spawn;
}
@Override
public String getID() {
return null;
}
}

1
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/command/structure/StructureCommand.java
View File

@@ -4,7 +4,6 @@ import com.dfsek.terra.api.command.CommandTemplate;
import com.dfsek.terra.api.command.annotation.Command;
import com.dfsek.terra.api.command.annotation.Subcommand;
import com.dfsek.terra.api.entity.CommandSender;
import com.dfsek.terra.config.lang.LangUtil;
@Command(
subcommands = {

1
common/addons/structure/src/main/java/com/dfsek/terra/addons/structure/command/structure/argument/ScriptArgumentParser.java
View File

@@ -6,7 +6,6 @@ import com.dfsek.terra.api.entity.CommandSender;
import com.dfsek.terra.api.entity.Player;
import com.dfsek.terra.api.injection.annotations.Inject;
import com.dfsek.terra.api.structure.Structure;
import com.dfsek.terra.addons.structure.structures.script.StructureScript;
public class ScriptArgumentParser implements ArgumentParser<Structure> {
@Inject