basic Feature API

2026-04-03 06:16:10 +00:00 · 2021-07-17 19:30:07 -07:00
parent 3c4c8c62b2
commit fc2ce229ed
17 changed files with 34 additions and 16 deletions
--- a/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/command/biome/BiomeInfoCommand.java
+++ b/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/command/biome/BiomeInfoCommand.java
@@ -9,11 +9,8 @@ import com.dfsek.terra.api.command.annotation.Argument;
 import com.dfsek.terra.api.command.annotation.Command;
 import com.dfsek.terra.api.command.annotation.inject.ArgumentTarget;
 import com.dfsek.terra.api.entity.CommandSender;
-import com.dfsek.terra.api.structure.ConfiguredStructure;
 import com.dfsek.terra.api.world.biome.TerraBiome;

-import java.util.List;
-
@Command(
        arguments = {
                @Argument(
--- a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/BiomeStructures.java
+++ b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/BiomeStructures.java
@@ -1,7 +1,7 @@
 package com.dfsek.terra.addons.structure;

 import com.dfsek.terra.api.properties.Properties;
-import com.dfsek.terra.api.structure.ConfiguredStructure;
+import com.dfsek.terra.api.structure.configured.ConfiguredStructure;

 import java.util.Set;

--- a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/BiomeStructuresTemplate.java
+++ b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/BiomeStructuresTemplate.java
@@ -3,7 +3,7 @@ package com.dfsek.terra.addons.structure;
 import com.dfsek.tectonic.annotations.Default;
 import com.dfsek.tectonic.annotations.Value;
 import com.dfsek.tectonic.loading.object.ObjectTemplate;
-import com.dfsek.terra.api.structure.ConfiguredStructure;
+import com.dfsek.terra.api.structure.configured.ConfiguredStructure;

 import java.util.Collections;
 import java.util.Set;
--- a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/StructureAddon.java
+++ b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/StructureAddon.java
@@ -8,7 +8,7 @@ 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.structure.ConfiguredStructure;
+import com.dfsek.terra.api.structure.configured.ConfiguredStructure;

@Addon("config-structure")
@Version("1.0.0")
--- a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/StructureFactory.java
+++ b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/StructureFactory.java
@@ -2,7 +2,7 @@ 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.api.structure.configured.ConfiguredStructure;

 public class StructureFactory implements ConfigFactory<StructureTemplate, ConfiguredStructure> {
    @Override
--- a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/StructurePopulator.java
+++ b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/StructurePopulator.java
@@ -3,7 +3,7 @@ package com.dfsek.terra.addons.structure;
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.config.WorldConfig;
 import com.dfsek.terra.api.profiler.ProfileFrame;
-import com.dfsek.terra.api.structure.ConfiguredStructure;
+import com.dfsek.terra.api.structure.configured.ConfiguredStructure;
 import com.dfsek.terra.api.structure.rotation.Rotation;
 import com.dfsek.terra.api.util.PopulationUtil;
 import com.dfsek.terra.api.vector.Vector3;
--- a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/TerraStructure.java
+++ b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/TerraStructure.java
@@ -1,6 +1,6 @@
 package com.dfsek.terra.addons.structure;

-import com.dfsek.terra.api.structure.ConfiguredStructure;
+import com.dfsek.terra.api.structure.configured.ConfiguredStructure;
 import com.dfsek.terra.api.structure.Structure;
 import com.dfsek.terra.api.structure.StructureSpawn;
 import com.dfsek.terra.api.util.Range;
--- a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/AsyncStructureFinder.java
+++ b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/AsyncStructureFinder.java
@@ -1,7 +1,7 @@
 package com.dfsek.terra.addons.structure.command;

 import com.dfsek.terra.api.TerraPlugin;
-import com.dfsek.terra.api.structure.ConfiguredStructure;
+import com.dfsek.terra.api.structure.configured.ConfiguredStructure;
 import com.dfsek.terra.api.vector.Vector3;
 import com.dfsek.terra.api.world.World;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
--- a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/structure/StructureLocateCommand.java
+++ b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/structure/StructureLocateCommand.java
@@ -16,7 +16,7 @@ import com.dfsek.terra.api.command.arg.IntegerArgumentParser;
 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.ConfiguredStructure;
+import com.dfsek.terra.api.structure.configured.ConfiguredStructure;
 import com.dfsek.terra.api.vector.Vector3;

 import java.util.Locale;
--- a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/structure/argument/StructureArgumentParser.java
+++ b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/structure/argument/StructureArgumentParser.java
@@ -5,7 +5,7 @@ import com.dfsek.terra.api.command.arg.ArgumentParser;
 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.ConfiguredStructure;
+import com.dfsek.terra.api.structure.configured.ConfiguredStructure;

 public class StructureArgumentParser implements ArgumentParser<ConfiguredStructure> {
    @Inject
--- a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/structure/completer/StructureCompleter.java
+++ b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/structure/completer/StructureCompleter.java
@@ -5,7 +5,7 @@ import com.dfsek.terra.api.command.tab.TabCompleter;
 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.ConfiguredStructure;
+import com.dfsek.terra.api.structure.configured.ConfiguredStructure;

 import java.util.ArrayList;
 import java.util.List;
--- a/common/api/src/main/java/com/dfsek/terra/api/structure/configured/ConfiguredStructure.java
+++ b/common/api/src/main/java/com/dfsek/terra/api/structure/configured/ConfiguredStructure.java
@@ -1,5 +1,7 @@
-package com.dfsek.terra.api.structure;
+package com.dfsek.terra.api.structure.configured;

+import com.dfsek.terra.api.structure.Structure;
+import com.dfsek.terra.api.structure.StructureSpawn;
 import com.dfsek.terra.api.util.Range;
 import com.dfsek.terra.api.util.collection.ProbabilityCollection;

--- a/common/api/src/main/java/com/dfsek/terra/api/structure/feature/Distributor.java
+++ b/common/api/src/main/java/com/dfsek/terra/api/structure/feature/Distributor.java
@@ -0,0 +1,4 @@
+package com.dfsek.terra.api.structure.feature;
+
+public interface Distributor {
+}
--- a/common/api/src/main/java/com/dfsek/terra/api/structure/feature/Feature.java
+++ b/common/api/src/main/java/com/dfsek/terra/api/structure/feature/Feature.java
@@ -0,0 +1,11 @@
+package com.dfsek.terra.api.structure.feature;
+
+import com.dfsek.terra.api.structure.Structure;
+
+public interface Feature {
+    Structure getStructure(double x, double y, double z);
+
+    Distributor getDistributor();
+
+    Locator getLocator();
+}
--- a/common/api/src/main/java/com/dfsek/terra/api/structure/feature/Locator.java
+++ b/common/api/src/main/java/com/dfsek/terra/api/structure/feature/Locator.java
@@ -0,0 +1,4 @@
+package com.dfsek.terra.api.structure.feature;
+
+public interface Locator {
+}
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/PaperListener.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/PaperListener.java
@@ -1,7 +1,7 @@
 package com.dfsek.terra.bukkit.listeners;

 import com.dfsek.terra.api.TerraPlugin;
-import com.dfsek.terra.api.structure.ConfiguredStructure;
+import com.dfsek.terra.api.structure.configured.ConfiguredStructure;
 import com.dfsek.terra.api.world.TerraWorld;
 import com.dfsek.terra.api.world.locate.AsyncStructureFinder;
 import com.dfsek.terra.bukkit.world.BukkitAdapter;
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/SpigotListener.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/SpigotListener.java
@@ -1,7 +1,7 @@
 package com.dfsek.terra.bukkit.listeners;

 import com.dfsek.terra.api.TerraPlugin;
-import com.dfsek.terra.api.structure.ConfiguredStructure;
+import com.dfsek.terra.api.structure.configured.ConfiguredStructure;
 import com.dfsek.terra.api.world.TerraWorld;
 import com.dfsek.terra.api.world.locate.AsyncStructureFinder;
 import com.dfsek.terra.bukkit.world.BukkitAdapter;