diff --git a/common/addons/config-tree/README.md b/common/addons/config-tree/README.md deleted file mode 100644 index a4244540e..000000000 --- a/common/addons/config-tree/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# config-tree - -Registers the default configuration for Terra Trees, `TREE`. \ No newline at end of file diff --git a/common/addons/config-tree/build.gradle.kts b/common/addons/config-tree/build.gradle.kts deleted file mode 100644 index 07542d899..000000000 --- a/common/addons/config-tree/build.gradle.kts +++ /dev/null @@ -1,45 +0,0 @@ -import com.dfsek.terra.configureCompilation -import com.dfsek.terra.configureDependencies - -plugins { - `java-library` - `maven-publish` - idea -} - -configureCompilation() -configureDependencies() - -group = "com.dfsek.terra.common" - -dependencies { - "shadedApi"(project(":common:api")) - "compileOnly"("com.google.guava:guava:30.0-jre") - - "testImplementation"("com.google.guava:guava:30.0-jre") -} - -publishing { - publications { - create("mavenJava") { - artifact(tasks["sourcesJar"]) - artifact(tasks["jar"]) - } - } - - repositories { - val mavenUrl = "https://repo.codemc.io/repository/maven-releases/" - val mavenSnapshotUrl = "https://repo.codemc.io/repository/maven-snapshots/" - - maven(mavenUrl) { - val mavenUsername: String? by project - val mavenPassword: String? by project - if (mavenUsername != null && mavenPassword != null) { - credentials { - username = mavenUsername - password = mavenPassword - } - } - } - } -} \ No newline at end of file diff --git a/common/addons/config-tree/src/main/java/com/dfsek/terra/addons/tree/TreeAddon.java b/common/addons/config-tree/src/main/java/com/dfsek/terra/addons/tree/TreeAddon.java deleted file mode 100644 index 053f07cfc..000000000 --- a/common/addons/config-tree/src/main/java/com/dfsek/terra/addons/tree/TreeAddon.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.dfsek.terra.addons.tree; - -import com.dfsek.terra.api.TerraPlugin; -import com.dfsek.terra.api.addon.TerraAddon; -import com.dfsek.terra.api.addon.annotations.Addon; -import com.dfsek.terra.api.addon.annotations.Author; -import com.dfsek.terra.api.addon.annotations.Version; -import com.dfsek.terra.api.event.EventListener; -import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent; -import com.dfsek.terra.api.injection.annotations.Inject; -import com.dfsek.terra.api.registry.exception.DuplicateEntryException; - -@Addon("config-tree") -@Author("Terra") -@Version("1.0.0") -public class TreeAddon extends TerraAddon implements EventListener { - @Inject - private TerraPlugin main; - - @Override - public void initialize() { - main.getEventManager().registerListener(this, this); - } - - public void onPackLoad(ConfigPackPreLoadEvent event) throws DuplicateEntryException { - event.getPack().registerConfigType(new TreeConfigType(), "TREE", 2); - } -} diff --git a/common/addons/config-tree/src/main/java/com/dfsek/terra/addons/tree/TreeConfigType.java b/common/addons/config-tree/src/main/java/com/dfsek/terra/addons/tree/TreeConfigType.java deleted file mode 100644 index 179463470..000000000 --- a/common/addons/config-tree/src/main/java/com/dfsek/terra/addons/tree/TreeConfigType.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.dfsek.terra.addons.tree; - -import com.dfsek.terra.api.TerraPlugin; -import com.dfsek.terra.api.config.ConfigFactory; -import com.dfsek.terra.api.config.ConfigPack; -import com.dfsek.terra.api.config.ConfigType; -import com.dfsek.terra.api.registry.OpenRegistry; -import com.dfsek.terra.api.util.reflection.TypeKey; -import com.dfsek.terra.api.world.Tree; - -import java.util.function.Supplier; - -public class TreeConfigType implements ConfigType { - private final TreeFactory factory = new TreeFactory(); - - public static final TypeKey TREE_TYPE_TOKEN = new TypeKey<>(){}; - - @Override - public TreeTemplate getTemplate(ConfigPack pack, TerraPlugin main) { - return new TreeTemplate(); - } - - @Override - public ConfigFactory getFactory() { - return factory; - } - - @Override - public TypeKey getTypeClass() { - return TREE_TYPE_TOKEN; - } - - @Override - public Supplier> registrySupplier(ConfigPack pack) { - return pack.getRegistryFactory()::create; - } -} diff --git a/common/addons/config-tree/src/main/java/com/dfsek/terra/addons/tree/TreeFactory.java b/common/addons/config-tree/src/main/java/com/dfsek/terra/addons/tree/TreeFactory.java deleted file mode 100644 index e41d765a8..000000000 --- a/common/addons/config-tree/src/main/java/com/dfsek/terra/addons/tree/TreeFactory.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.dfsek.terra.addons.tree; - -import com.dfsek.terra.addons.tree.tree.TerraTree; -import com.dfsek.terra.api.TerraPlugin; -import com.dfsek.terra.api.config.ConfigFactory; -import com.dfsek.terra.api.world.Tree; - -public class TreeFactory implements ConfigFactory { - @Override - public Tree build(TreeTemplate config, TerraPlugin main) { - return new TerraTree(config.getSpawnable(), config.getyOffset(), config.getStructures()); - } -} diff --git a/common/addons/config-tree/src/main/java/com/dfsek/terra/addons/tree/TreeTemplate.java b/common/addons/config-tree/src/main/java/com/dfsek/terra/addons/tree/TreeTemplate.java deleted file mode 100644 index e10aedd46..000000000 --- a/common/addons/config-tree/src/main/java/com/dfsek/terra/addons/tree/TreeTemplate.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.dfsek.terra.addons.tree; - -import com.dfsek.tectonic.annotations.Default; -import com.dfsek.tectonic.annotations.Final; -import com.dfsek.tectonic.annotations.Value; -import com.dfsek.terra.api.config.AbstractableTemplate; -import com.dfsek.terra.api.structure.Structure; -import com.dfsek.terra.api.util.collection.MaterialSet; -import com.dfsek.terra.api.util.collection.ProbabilityCollection; - -@SuppressWarnings({"unused", "FieldMayBeFinal"}) -public class TreeTemplate implements AbstractableTemplate { - @Value("scripts") - private ProbabilityCollection structure; - - @Value("id") - @Final - private String id; - - @Value("y-offset") - @Default - private int yOffset = 0; - - @Value("spawnable") - private MaterialSet spawnable; - - public ProbabilityCollection getStructures() { - return structure; - } - - public String getID() { - return id; - } - - public int getyOffset() { - return yOffset; - } - - public MaterialSet getSpawnable() { - return spawnable; - } -} diff --git a/common/addons/config-tree/src/main/java/com/dfsek/terra/addons/tree/tree/TerraTree.java b/common/addons/config-tree/src/main/java/com/dfsek/terra/addons/tree/tree/TerraTree.java deleted file mode 100644 index b73210c4a..000000000 --- a/common/addons/config-tree/src/main/java/com/dfsek/terra/addons/tree/tree/TerraTree.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.dfsek.terra.addons.tree.tree; - -import com.dfsek.terra.api.structure.Structure; -import com.dfsek.terra.api.structure.rotation.Rotation; -import com.dfsek.terra.api.util.collection.MaterialSet; -import com.dfsek.terra.api.util.collection.ProbabilityCollection; -import com.dfsek.terra.api.vector.Vector3; -import com.dfsek.terra.api.world.Tree; -import com.dfsek.terra.api.world.World; - -import java.util.Random; - -public class TerraTree implements Tree { - private final MaterialSet spawnable; - private final int yOffset; - private final ProbabilityCollection structure; - - public TerraTree(MaterialSet spawnable, int yOffset, ProbabilityCollection structure) { - this.spawnable = spawnable; - this.yOffset = yOffset; - this.structure = structure; - } - - @Override - public synchronized boolean plant(Vector3 location, World world, Random random) { - return structure.get(random).generateDirect(location.clone().add(0, yOffset, 0), world, random, Rotation.fromDegrees(90 * random.nextInt(4))); - } - - @Override - public MaterialSet getSpawnable() { - return spawnable; - } -}