bukkit pass 2

common/api/src/main/java/com/dfsek/terra/api/config/ConfigPack.java

@@ -38,4 +38,6 @@ public interface ConfigPack extends LoaderRegistrar {
     Map<String, String> getLocatable();
 
     boolean doBetaCarvers();
+
+    boolean vanillaFlora();
 }

common/api/src/main/java/com/dfsek/terra/api/config/WorldConfig.java

@@ -1,10 +1,12 @@
 package com.dfsek.terra.api.config;
 
 import com.dfsek.terra.api.registry.Registry;
+import com.dfsek.terra.api.util.ProbabilityCollection;
 import com.dfsek.terra.api.world.TerraWorld;
 import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
 import com.dfsek.terra.api.world.generator.SamplerCache;
 
+import java.util.Map;
 import java.util.Set;
 
 public interface WorldConfig {
@@ -34,4 +36,8 @@ public interface WorldConfig {
     String getAuthor();
 
     String getVersion();
+
+    Map<String, String> getLocatable();
+
+    boolean isDisableSaplings();
 }

common/api/src/main/java/com/dfsek/terra/api/entity/Entity.java

@@ -2,12 +2,15 @@ package com.dfsek.terra.api.entity;
 
 import com.dfsek.terra.api.vector.Location;
 import com.dfsek.terra.api.Handle;
+import com.dfsek.terra.api.vector.Vector3;
 import com.dfsek.terra.api.world.World;
 
 public interface Entity extends Handle, CommandSender {
-    Location getLocation();
+    Vector3 position();
 
-    void setLocation(Location location);
+    void position(Vector3 position);
 
-    World getWorld();
+    void world(World world);
+
+    World world();
 }

common/api/src/main/java/com/dfsek/terra/api/event/events/world/generation/EntitySpawnEvent.java

@@ -4,6 +4,7 @@ import com.dfsek.terra.api.config.ConfigPack;
 import com.dfsek.terra.api.event.events.PackEvent;
 import com.dfsek.terra.api.entity.Entity;
 import com.dfsek.terra.api.vector.Location;
+import com.dfsek.terra.api.vector.Vector3;
 
 /**
  * Called when an entity is spawned.
@@ -11,12 +12,10 @@ import com.dfsek.terra.api.vector.Location;
 public class EntitySpawnEvent implements PackEvent {
     private final ConfigPack pack;
     private final Entity entity;
-    private final Location location;
 
-    public EntitySpawnEvent(ConfigPack pack, Entity entity, Location location) {
+    public EntitySpawnEvent(ConfigPack pack, Entity entity) {
         this.pack = pack;
         this.entity = entity;
-        this.location = location;
     }
 
     @Override
@@ -32,13 +31,4 @@ public class EntitySpawnEvent implements PackEvent {
     public Entity getEntity() {
         return entity;
     }
-
-    /**
-     * Get the location of the entity.
-     *
-     * @return Location of the entity.
-     */
-    public Location getLocation() {
-        return location;
-    }
 }

common/implementation/src/main/java/com/dfsek/terra/api/command/TerraCommandManager.java

@@ -64,7 +64,7 @@ public class TerraCommandManager implements CommandManager {
             return;
         }
 
-        if(commandClass.isAnnotationPresent(WorldCommand.class) && (!(sender instanceof Player) || !(((Player) sender).getWorld()).isTerraWorld())) {
+        if(commandClass.isAnnotationPresent(WorldCommand.class) && (!(sender instanceof Player) || !(((Player) sender).world()).isTerraWorld())) {
             sender.sendMessage("Command must be executed in a Terra world.");
             return;
         }

common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/items/BufferedEntity.java

@@ -4,7 +4,6 @@ import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.event.events.world.generation.EntitySpawnEvent;
 import com.dfsek.terra.api.structure.buffer.BufferedItem;
 import com.dfsek.terra.api.vector.Location;
-import com.dfsek.terra.vector.LocationImpl;
 import com.dfsek.terra.api.entity.Entity;
 import com.dfsek.terra.api.entity.EntityType;
 
@@ -21,6 +20,6 @@ public class BufferedEntity implements BufferedItem {
     @Override
     public void paste(Location origin) {
         Entity entity = origin.clone().add(0.5, 0, 0.5).getWorld().spawnEntity(origin, type);
-        main.getEventManager().callEvent(new EntitySpawnEvent(entity.getWorld().getTerraGenerator().getConfigPack(), entity, entity.getLocation()));
+        main.getEventManager().callEvent(new EntitySpawnEvent(entity.world().getTerraGenerator().getConfigPack(), entity));
     }
 }

common/implementation/src/main/java/com/dfsek/terra/commands/GetBlockCommand.java

@@ -23,6 +23,6 @@ public class GetBlockCommand implements CommandTemplate {
     @Override
     public void execute(CommandSender sender) {
         Player player = (Player) sender;
-        sender.sendMessage("Block: " + main.getWorld(player.getWorld()).getUngeneratedBlock(player.getLocation()).getAsString());
+        sender.sendMessage("Block: " + main.getWorld(player.world()).getUngeneratedBlock(player.position()).getAsString());
     }
 }

common/implementation/src/main/java/com/dfsek/terra/commands/biome/BiomeCommand.java

@@ -38,8 +38,8 @@ public class BiomeCommand implements CommandTemplate {
     public void execute(CommandSender sender) {
         Player player = (Player) sender;
 
-        BiomeProvider provider = main.getWorld(player.getWorld()).getBiomeProvider();
+        BiomeProvider provider = main.getWorld(player.world()).getBiomeProvider();
-        UserDefinedBiome biome = (UserDefinedBiome) provider.getBiome(player.getLocation());
+        UserDefinedBiome biome = (UserDefinedBiome) provider.getBiome(player.position());
         LangUtil.send("command.biome.in", sender, biome.getID());
     }
 }

common/implementation/src/main/java/com/dfsek/terra/commands/biome/BiomeLocateCommand.java

@@ -65,11 +65,11 @@ public class BiomeLocateCommand implements CommandTemplate {
 
         Player player = (Player) sender;
 
-        new Thread(new AsyncBiomeFinder(main.getWorld(player.getWorld()).getBiomeProvider(), biome, player.getLocation().clone().multiply((1D / main.getTerraConfig().getBiomeSearchResolution())), 0, radius, location -> {
+        new Thread(new AsyncBiomeFinder(main.getWorld(player.world()).getBiomeProvider(), biome, player.position().clone().multiply((1D / main.getTerraConfig().getBiomeSearchResolution())).toLocation(player.world()), 0, radius, location -> {
             if(location != null) {
-                sender.sendMessage(String.format("The nearest %s is at [%d, ~, %d] (%.1f blocks away)", biome.getID().toLowerCase(Locale.ROOT), location.getBlockX(), location.getBlockZ(), location.add(new Vector3Impl(0, player.getLocation().getY(), 0)).distance(player.getLocation().toVector())));
+                sender.sendMessage(String.format("The nearest %s is at [%d, ~, %d] (%.1f blocks away)", biome.getID().toLowerCase(Locale.ROOT), location.getBlockX(), location.getBlockZ(), location.add(new Vector3Impl(0, player.position().getY(), 0)).distance(player.position())));
                 if(teleport) {
-                    main.runPossiblyUnsafeTask(() -> player.setLocation(new LocationImpl(player.getWorld(), location.getX(), player.getLocation().getY(), location.getZ())));
+                    main.runPossiblyUnsafeTask(() -> player.position(new Vector3Impl(location.getX(), player.position().getY(), location.getZ())));
                 }
             } else LangUtil.send("command.biome.unable-to-locate", sender);
         }, main), "Biome Location Thread").start();

common/implementation/src/main/java/com/dfsek/terra/commands/biome/arg/BiomeArgumentParser.java

@@ -14,6 +14,6 @@ public class BiomeArgumentParser implements ArgumentParser<TerraBiome> {
     @Override
     public TerraBiome parse(CommandSender sender, String arg) {
         Player player = (Player) sender;
-        return main.getWorld(player.getWorld()).getConfig().getRegistry(TerraBiome.class).get(arg);
+        return main.getWorld(player.world()).getConfig().getRegistry(TerraBiome.class).get(arg);
     }
 }

common/implementation/src/main/java/com/dfsek/terra/commands/biome/tab/BiomeTabCompleter.java

@@ -17,6 +17,6 @@ public class BiomeTabCompleter implements TabCompleter {
     @Override
     public List<String> complete(CommandSender sender) {
         Player player = (Player) sender;
-        return main.getWorld(player.getWorld()).getConfig().getRegistry(TerraBiome.class).entries().stream().map(TerraBiome::getID).collect(Collectors.toList());
+        return main.getWorld(player.world()).getConfig().getRegistry(TerraBiome.class).entries().stream().map(TerraBiome::getID).collect(Collectors.toList());
     }
 }

common/implementation/src/main/java/com/dfsek/terra/commands/structure/SpawnCommand.java

@@ -8,6 +8,7 @@ import com.dfsek.terra.api.command.annotation.type.PlayerCommand;
 import com.dfsek.terra.api.command.annotation.type.WorldCommand;
 import com.dfsek.terra.api.injection.annotations.Inject;
 import com.dfsek.terra.api.vector.Location;
+import com.dfsek.terra.api.vector.Vector3;
 import com.dfsek.terra.vector.LocationImpl;
 import com.dfsek.terra.api.entity.CommandSender;
 import com.dfsek.terra.api.entity.Player;
@@ -34,14 +35,14 @@ public class SpawnCommand implements CommandTemplate {
     @Override
     public void execute(CommandSender sender) {
         Player player = (Player) sender;
-        Location p = player.getLocation();
+        Vector3 p = player.position();
         int x = p.getBlockX();
         int y = p.getBlockY();
         int z = p.getBlockZ();
         Position dummy = new Position(0, 0);
 
         String check = new CheckFunction(main, new NumericConstant(0, dummy), new NumericConstant(0, dummy), new NumericConstant(0, dummy), dummy).apply(new TerraImplementationArguments(new StructureBuffer(
-                new LocationImpl(player.getWorld(), x, y, z)
+                new LocationImpl(player.world(), x, y, z)
         ), Rotation.NONE, new FastRandom(), 0), new HashMap<>());
 
         sender.sendMessage("Found: " + check);

common/implementation/src/main/java/com/dfsek/terra/commands/structure/StructureLoadCommand.java

@@ -79,9 +79,9 @@ public class StructureLoadCommand implements CommandTemplate {
             return;
         }
         if(this.chunk) {
-            script.generate(player.getLocation(), player.getWorld().getChunkAt(player.getLocation()), random, r);
+            script.generate(player.position().toLocation(player.world()), player.world().getChunkAt(player.position().toLocation(player.world())), random, r);
         } else {
-            script.generate(player.getLocation(), random, r);
+            script.generate(player.position().toLocation(player.world()), random, r);
         }
         long l = System.nanoTime() - t;
 

common/implementation/src/main/java/com/dfsek/terra/commands/structure/StructureLocateCommand.java

@@ -63,11 +63,11 @@ public class StructureLocateCommand implements CommandTemplate {
     public void execute(CommandSender sender) {
         Player player = (Player) sender;
 
-        new Thread(new AsyncStructureFinder(main.getWorld(player.getWorld()).getBiomeProvider(), structure, player.getLocation().clone().multiply((1D / main.getTerraConfig().getBiomeSearchResolution())), 0, radius, location -> {
+        new Thread(new AsyncStructureFinder(main.getWorld(player.world()).getBiomeProvider(), structure, player.position().clone().multiply((1D / main.getTerraConfig().getBiomeSearchResolution())).toLocation(player.world()), 0, radius, location -> {
             if(location != null) {
-                sender.sendMessage(String.format("The nearest %s is at [%d, ~, %d] (%.1f blocks away)", structure.getTemplate().getID().toLowerCase(Locale.ROOT), location.getBlockX(), location.getBlockZ(), location.add(new Vector3Impl(0, player.getLocation().getY(), 0)).distance(player.getLocation().toVector())));
+                sender.sendMessage(String.format("The nearest %s is at [%d, ~, %d] (%.1f blocks away)", structure.getTemplate().getID().toLowerCase(Locale.ROOT), location.getBlockX(), location.getBlockZ(), location.add(new Vector3Impl(0, player.position().getY(), 0)).distance(player.position())));
                 if(teleport) {
-                    main.runPossiblyUnsafeTask(() -> player.setLocation(new LocationImpl(player.getWorld(), location.getX(), player.getLocation().getY(), location.getZ())));
+                    main.runPossiblyUnsafeTask(() -> player.position(new Vector3Impl(location.getX(), player.position().getY(), location.getZ())));
                 }
             } else LangUtil.send("command.biome.unable-to-locate", sender);
         }, main), "Biome Location Thread").start();

common/implementation/src/main/java/com/dfsek/terra/commands/structure/argument/ScriptArgumentParser.java

@@ -14,6 +14,6 @@ public class ScriptArgumentParser implements ArgumentParser<Structure> {
 
     @Override
     public Structure parse(CommandSender sender, String arg) {
-        return main.getWorld(((Player) sender).getWorld()).getConfig().getRegistry(StructureScript.class).get(arg);
+        return main.getWorld(((Player) sender).world()).getConfig().getRegistry(StructureScript.class).get(arg);
     }
 }

common/implementation/src/main/java/com/dfsek/terra/commands/structure/argument/StructureArgumentParser.java

@@ -13,6 +13,6 @@ public class StructureArgumentParser implements ArgumentParser<TerraStructure> {
 
     @Override
     public TerraStructure parse(CommandSender sender, String arg) {
-        return main.getWorld(((Player) sender).getWorld()).getConfig().getRegistry(TerraStructure.class).get(arg);
+        return main.getWorld(((Player) sender).world()).getConfig().getRegistry(TerraStructure.class).get(arg);
     }
 }

common/implementation/src/main/java/com/dfsek/terra/commands/structure/completer/ScriptCompleter.java

@@ -17,6 +17,6 @@ public class ScriptCompleter implements TabCompleter {
 
     @Override
     public List<String> complete(CommandSender sender) {
-        return main.getWorld(((Player) sender).getWorld()).getConfig().getRegistry(StructureScript.class).entries().stream().map(Structure::getId).collect(Collectors.toList());
+        return main.getWorld(((Player) sender).world()).getConfig().getRegistry(StructureScript.class).entries().stream().map(Structure::getId).collect(Collectors.toList());
     }
 }

common/implementation/src/main/java/com/dfsek/terra/commands/structure/completer/StructureCompleter.java

@@ -17,6 +17,6 @@ public class StructureCompleter implements TabCompleter {
     @Override
     public List<String> complete(CommandSender sender) {
         Player player = (Player) sender;
-        return new ArrayList<>(main.getWorld(player.getWorld()).getConfig().getRegistry(TerraStructure.class).keys());
+        return new ArrayList<>(main.getWorld(player.world()).getConfig().getRegistry(TerraStructure.class).keys());
     }
 }

common/implementation/src/main/java/com/dfsek/terra/config/pack/ConfigPackImpl.java

@@ -368,4 +368,9 @@ public class ConfigPackImpl implements ConfigPack {
     public boolean doBetaCarvers() {
         return template.doBetaCarvers();
     }
+
+    @Override
+    public boolean vanillaFlora() {
+        return template.vanillaDecorations();
+    }
 }

common/implementation/src/main/java/com/dfsek/terra/config/pack/WorldConfigImpl.java

@@ -109,6 +109,16 @@ public class WorldConfigImpl implements WorldConfig {
         return pack.getVersion();
     }
 
+    @Override
+    public Map<String, String> getLocatable() {
+        return pack.getLocatable();
+    }
+
+    @Override
+    public boolean isDisableSaplings() {
+        return getTemplate().isDisableSaplings();
+    }
+
     public Set<TerraStructure> getStructures() {
         return new HashSet<>(getRegistry(TerraStructure.class).entries());
     }

platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitEntity.java

@@ -1,9 +1,11 @@
 package com.dfsek.terra.bukkit;
 
+import com.dfsek.terra.api.vector.Vector3;
 import com.dfsek.terra.vector.LocationImpl;
 import com.dfsek.terra.api.entity.Entity;
 import com.dfsek.terra.api.world.World;
 import com.dfsek.terra.bukkit.world.BukkitAdapter;
+import org.bukkit.Location;
 
 public class BukkitEntity implements Entity {
     private final org.bukkit.entity.Entity entity;
@@ -18,17 +20,24 @@ public class BukkitEntity implements Entity {
     }
 
     @Override
-    public LocationImpl getLocation() {
+    public Vector3 position() {
-        return BukkitAdapter.adapt(entity.getLocation());
+        return BukkitAdapter.adapt(entity.getLocation().toVector());
     }
 
     @Override
-    public void setLocation(LocationImpl location) {
+    public void position(Vector3 location) {
-        entity.teleport(BukkitAdapter.adapt(location));
+        entity.teleport(BukkitAdapter.adapt(location).toLocation(entity.getWorld()));
     }
 
     @Override
-    public World getWorld() {
+    public void world(World world) {
+        Location newLoc = entity.getLocation().clone();
+        newLoc.setWorld(BukkitAdapter.adapt(world));
+        entity.teleport(newLoc);
+    }
+
+    @Override
+    public World world() {
         return BukkitAdapter.adapt(entity.getWorld());
     }
 

platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitPlayer.java

@@ -1,9 +1,12 @@
 package com.dfsek.terra.bukkit;
 
+import com.dfsek.terra.api.vector.Vector3;
 import com.dfsek.terra.vector.LocationImpl;
 import com.dfsek.terra.api.entity.Player;
 import com.dfsek.terra.api.world.World;
 import com.dfsek.terra.bukkit.world.BukkitAdapter;
+import com.dfsek.terra.vector.Vector3Impl;
+import org.bukkit.Location;
 
 public class BukkitPlayer implements Player {
     private final org.bukkit.entity.Player delegate;
@@ -18,18 +21,25 @@ public class BukkitPlayer implements Player {
     }
 
     @Override
-    public LocationImpl getLocation() {
+    public Vector3 position() {
         org.bukkit.Location bukkit = delegate.getLocation();
-        return new LocationImpl(BukkitAdapter.adapt(bukkit.getWorld()), bukkit.getX(), bukkit.getY(), bukkit.getZ());
+        return new Vector3Impl(bukkit.getX(), bukkit.getY(), bukkit.getZ());
     }
 
     @Override
-    public void setLocation(LocationImpl location) {
+    public void position(Vector3 location) {
-        delegate.teleport(BukkitAdapter.adapt(location));
+        delegate.teleport(BukkitAdapter.adapt(location).toLocation(delegate.getWorld()));
     }
 
     @Override
-    public World getWorld() {
+    public void world(World world) {
+        Location newLoc = delegate.getLocation().clone();
+        newLoc.setWorld(BukkitAdapter.adapt(world));
+        delegate.teleport(newLoc);
+    }
+
+    @Override
+    public World world() {
         return BukkitAdapter.adapt(delegate.getWorld());
     }
 

platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java

@@ -17,11 +17,11 @@ import com.dfsek.terra.api.block.BlockData;
 import com.dfsek.terra.api.handle.ItemHandle;
 import com.dfsek.terra.api.handle.WorldHandle;
 import com.dfsek.terra.api.lang.Language;
+import com.dfsek.terra.api.registry.Registry;
 import com.dfsek.terra.api.world.TerraWorld;
 import com.dfsek.terra.api.world.biome.Biome;
 import com.dfsek.terra.api.world.World;
 import com.dfsek.terra.api.registry.CheckedRegistry;
-import com.dfsek.terra.api.registry.LockedRegistry;
 import com.dfsek.terra.api.util.logging.DebugLogger;
 import com.dfsek.terra.api.util.logging.JavaLogger;
 import com.dfsek.terra.api.Logger;
@@ -45,6 +45,8 @@ import com.dfsek.terra.config.PluginConfigImpl;
 import com.dfsek.terra.config.lang.LangUtil;
 import com.dfsek.terra.api.profiler.Profiler;
 import com.dfsek.terra.profiler.ProfilerImpl;
+import com.dfsek.terra.registry.CheckedRegistryImpl;
+import com.dfsek.terra.registry.LockedRegistryImpl;
 import com.dfsek.terra.registry.master.AddonRegistry;
 import com.dfsek.terra.registry.master.ConfigRegistry;
 import com.dfsek.terra.world.TerraWorldImpl;
@@ -72,7 +74,7 @@ public class TerraBukkitPlugin extends JavaPlugin implements TerraPlugin {
     private final Profiler profiler = new ProfilerImpl();
 
     private final ConfigRegistry registry = new ConfigRegistry();
-    private final CheckedRegistry<ConfigPack> checkedRegistry = new CheckedRegistry<>(registry);
+    private final CheckedRegistry<ConfigPack> checkedRegistry = new CheckedRegistryImpl<>(registry);
 
     private final PluginConfig config = new PluginConfigImpl();
     private final ItemHandle itemHandle = new BukkitItemHandle();
@@ -95,7 +97,7 @@ public class TerraBukkitPlugin extends JavaPlugin implements TerraPlugin {
     }
 
     private final AddonRegistry addonRegistry = new AddonRegistry(new BukkitAddon(this), this);
-    private final LockedRegistry<TerraAddon> addonLockedRegistry = new LockedRegistry<>(addonRegistry);
+    private final LockedRegistryImpl<TerraAddon> addonLockedRegistry = new LockedRegistryImpl<>(addonRegistry);
 
 
 
@@ -106,7 +108,7 @@ public class TerraBukkitPlugin extends JavaPlugin implements TerraPlugin {
         Map<World, TerraWorld> newMap = new HashMap<>();
         worldMap.forEach((world, tw) -> {
             tw.getConfig().getSamplerCache().clear();
-            String packID = tw.getConfig().getTemplate().getID();
+            String packID = tw.getConfig().getID();
             newMap.put(world, new TerraWorldImpl(world, registry.get(packID), this));
         });
         worldMap.clear();
@@ -306,7 +308,7 @@ public class TerraBukkitPlugin extends JavaPlugin implements TerraPlugin {
     }
 
     @Override
-    public LockedRegistry<TerraAddon> getAddons() {
+    public Registry<TerraAddon> getAddons() {
         return addonLockedRegistry;
     }
 

platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/FixChunkCommand.java

@@ -15,6 +15,6 @@ public class FixChunkCommand implements CommandTemplate {
     @Override
     public void execute(CommandSender sender) {
         Player player = (Player) sender;
-        BukkitChunkGeneratorWrapper.fixChunk(player.getWorld().getChunkAt(player.getLocation()));
+        BukkitChunkGeneratorWrapper.fixChunk(player.world().getChunkAt(player.position().toLocation(player.world())));
     }
 }

platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitChunkGeneratorWrapper.java

@@ -82,27 +82,27 @@ public class BukkitChunkGeneratorWrapper extends ChunkGenerator implements Gener
 
     @Override
     public boolean isParallelCapable() {
-        return delegate.isParallelCapable();
+        return true;
     }
 
     @Override
     public boolean shouldGenerateCaves() {
-        return delegate.shouldGenerateCaves();
+        return delegate.getConfigPack().vanillaCaves();
     }
 
     @Override
     public boolean shouldGenerateDecorations() {
-        return delegate.shouldGenerateDecorations();
+        return delegate.getConfigPack().vanillaFlora();
     }
 
     @Override
     public boolean shouldGenerateMobs() {
-        return delegate.shouldGenerateMobs();
+        return delegate.getConfigPack().vanillaMobs();
     }
 
     @Override
     public boolean shouldGenerateStructures() {
-        return delegate.shouldGenerateStructures();
+        return delegate.getConfigPack().vanillaStructures();
     }
 
     @Override

platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/handles/BukkitWorldHandle.java

@@ -1,5 +1,6 @@
 package com.dfsek.terra.bukkit.handles;
 
+import com.dfsek.terra.api.vector.Location;
 import com.dfsek.terra.vector.LocationImpl;
 import com.dfsek.terra.api.block.BlockData;
 import com.dfsek.terra.api.entity.EntityType;
@@ -26,7 +27,7 @@ public class BukkitWorldHandle implements WorldHandle {
     }
 
     @Override
-    public Pair<LocationImpl, LocationImpl> getSelectedLocation(Player player) {
+    public Pair<Location, Location> getSelectedLocation(Player player) {
         org.bukkit.Location[] locations = WorldEditUtil.getSelectionLocations(BukkitAdapter.adapt(player));
         return Pair.of(BukkitAdapter.adapt(locations[0]), BukkitAdapter.adapt(locations[1]));
     }

platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/CommonListener.java

@@ -1,6 +1,7 @@
 package com.dfsek.terra.bukkit.listeners;
 
 import com.dfsek.terra.api.TerraPlugin;
+import com.dfsek.terra.api.config.WorldConfig;
 import com.dfsek.terra.vector.LocationImpl;
 import com.dfsek.terra.api.world.TerraWorld;
 import com.dfsek.terra.api.world.Tree;
@@ -46,8 +47,8 @@ public class CommonListener implements Listener {
         World bukkit = BukkitAdapter.adapt(e.getWorld());
         if(!bukkit.isTerraWorld()) return;
         TerraWorld tw = main.getWorld(bukkit);
-        WorldConfigImpl c = tw.getConfig();
+        WorldConfig c = tw.getConfig();
-        if(c.getTemplate().isDisableSaplings()) return;
+        if(c.isDisableSaplings()) return;
         e.setCancelled(true);
         Block block = e.getLocation().getBlock();
         BlockData data = block.getBlockData();

platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/PaperListener.java

@@ -22,7 +22,7 @@ public class PaperListener implements Listener {
         String name = "minecraft:" + e.getType().getName();
         main.getDebugLogger().info("Overriding structure location for \"" + name + "\"");
         TerraWorld tw = main.getWorld(BukkitAdapter.adapt(e.getWorld()));
-        TerraStructure config = tw.getConfig().getRegistry(TerraStructure.class).get(tw.getConfig().getTemplate().getLocatable().get(name));
+        TerraStructure config = tw.getConfig().getRegistry(TerraStructure.class).get(tw.getConfig().getLocatable().get(name));
         if(config != null) {
             AsyncStructureFinder finder = new AsyncStructureFinder(tw.getBiomeProvider(), config, BukkitAdapter.adapt(e.getOrigin()), 0, 500, location -> {
                 if(location != null)

platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/SpigotListener.java

@@ -37,7 +37,7 @@ public class SpigotListener implements Listener {
             if(!BukkitAdapter.adapt(e.getEntity().getWorld()).isTerraWorld()) return;
             TerraWorld tw = main.getWorld(BukkitAdapter.adapt(e.getEntity().getWorld()));
             EnderSignal signal = (EnderSignal) entity;
-            TerraStructure config = tw.getConfig().getRegistry(TerraStructure.class).get(tw.getConfig().getTemplate().getLocatable().get("STRONGHOLD"));
+            TerraStructure config = tw.getConfig().getRegistry(TerraStructure.class).get(tw.getConfig().getLocatable().get("STRONGHOLD"));
             if(config != null) {
                 main.getDebugLogger().info("Overriding Ender Signal...");
                 AsyncStructureFinder finder = new AsyncStructureFinder(tw.getBiomeProvider(), config, BukkitAdapter.adapt(e.getLocation()), 0, 500, location -> {

platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitAdapter.java

@@ -338,7 +338,7 @@ public final class BukkitAdapter {
         }
     }
 
-    public static Location adapt(LocationImpl location) {
+    public static Location adapt(com.dfsek.terra.api.vector.Location location) {
         return new Location(((BukkitWorld) location.getWorld()).getHandle(), location.getX(), location.getY(), location.getZ());
     }
 

platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitTree.java

@@ -1,6 +1,7 @@
 package com.dfsek.terra.bukkit.world;
 
 import com.dfsek.terra.api.TerraPlugin;
+import com.dfsek.terra.api.vector.Location;
 import com.dfsek.terra.vector.LocationImpl;
 import com.dfsek.terra.api.handle.WorldHandle;
 import com.dfsek.terra.api.world.Tree;
@@ -43,7 +44,7 @@ public class BukkitTree implements Tree {
 
     @Override
     @SuppressWarnings("try")
-    public boolean plant(LocationImpl l, Random r) {
+    public boolean plant(Location l, Random r) {
         try(ProfileFrame ignore = main.getProfiler().profile("bukkit_tree:" + delegate.toString().toLowerCase(Locale.ROOT))) {
             return ((BukkitWorld) l.getWorld()).getHandle().generateTree(BukkitAdapter.adapt(l), delegate);
         }

platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitWorld.java

@@ -1,5 +1,6 @@
 package com.dfsek.terra.bukkit.world;
 
+import com.dfsek.terra.api.vector.Location;
 import com.dfsek.terra.vector.LocationImpl;
 import com.dfsek.terra.api.block.Block;
 import com.dfsek.terra.api.entity.Entity;
@@ -64,7 +65,7 @@ public class BukkitWorld implements World {
     }
 
     @Override
-    public Entity spawnEntity(LocationImpl location, EntityType entityType) {
+    public Entity spawnEntity(Location location, EntityType entityType) {
         return new BukkitEntity(delegate.spawnEntity(BukkitAdapter.adapt(location), ((BukkitEntityType) entityType).getHandle()));
     }
 

platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/FabricChunkGeneratorWrapper.java

@@ -54,7 +54,7 @@ public class FabricChunkGeneratorWrapper extends ChunkGenerator implements Gener
     public static final Codec<ConfigPack> PACK_CODEC = RecordCodecBuilder.create(
             config -> config.group(
                     Codec.STRING.fieldOf("pack")
-                            .forGetter(pack -> pack.getID())
+                            .forGetter(ConfigPack::getID)
             ).apply(config, config.stable(TerraFabricPlugin.getInstance().getConfigRegistry()::get)));
 
     public static final Codec<FabricChunkGeneratorWrapper> CODEC = RecordCodecBuilder.create(

platforms/fabric/src/main/java/com/dfsek/terra/fabric/util/WorldEditUtil.java

@@ -17,11 +17,11 @@ public final class WorldEditUtil {
         try {
             Region selection = worldEdit.getSessionManager()
                     .get(com.sk89q.worldedit.fabric.FabricAdapter.adaptPlayer((ServerPlayerEntity) player))
-                    .getSelection(com.sk89q.worldedit.fabric.FabricAdapter.adapt((World) player.getWorld()));
+                    .getSelection(com.sk89q.worldedit.fabric.FabricAdapter.adapt((World) player.world()));
             BlockVector3 min = selection.getMinimumPoint();
             BlockVector3 max = selection.getMaximumPoint();
-            LocationImpl l1 = new LocationImpl(player.getWorld(), min.getBlockX(), min.getBlockY(), min.getBlockZ());
+            LocationImpl l1 = new LocationImpl(player.world(), min.getBlockX(), min.getBlockY(), min.getBlockZ());
-            LocationImpl l2 = new LocationImpl(player.getWorld(), max.getBlockX(), max.getBlockY(), max.getBlockZ());
+            LocationImpl l2 = new LocationImpl(player.world(), max.getBlockX(), max.getBlockY(), max.getBlockZ());
             return Pair.of(l1, l2);
         } catch(IncompleteRegionException e) {
             throw new IllegalStateException("No selection has been made", e);