compile bukkit

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

@@ -1,62 +1,28 @@
 package com.dfsek.terra.bukkit;
 
-import com.dfsek.tectonic.exception.LoadException;
-import com.dfsek.tectonic.loading.TypeRegistry;
-import com.dfsek.terra.api.Logger;
-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.block.state.BlockState;
 import com.dfsek.terra.api.command.CommandManager;
 import com.dfsek.terra.api.command.exception.MalformedCommandException;
 import com.dfsek.terra.api.config.ConfigPack;
-import com.dfsek.terra.api.config.PluginConfig;
-import com.dfsek.terra.api.event.EventManager;
-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.profiler.Profiler;
-import com.dfsek.terra.api.registry.CheckedRegistry;
-import com.dfsek.terra.api.registry.Registry;
-import com.dfsek.terra.api.world.biome.Biome;
 import com.dfsek.terra.bukkit.command.BukkitCommandAdapter;
 import com.dfsek.terra.bukkit.command.FixChunkCommand;
 import com.dfsek.terra.bukkit.command.SaveDataCommand;
 import com.dfsek.terra.bukkit.generator.BukkitChunkGeneratorWrapper;
-import com.dfsek.terra.bukkit.handles.BukkitItemHandle;
-import com.dfsek.terra.bukkit.handles.BukkitWorldHandle;
 import com.dfsek.terra.bukkit.listeners.CommonListener;
 import com.dfsek.terra.bukkit.listeners.PaperListener;
 import com.dfsek.terra.bukkit.listeners.SpigotListener;
 import com.dfsek.terra.bukkit.util.PaperUtil;
-import com.dfsek.terra.bukkit.world.BukkitBiome;
 import com.dfsek.terra.commands.CommandUtil;
 import com.dfsek.terra.commands.TerraCommandManager;
-import com.dfsek.terra.config.GenericLoaders;
-import com.dfsek.terra.config.PluginConfigImpl;
-import com.dfsek.terra.config.lang.LangUtil;
-import com.dfsek.terra.event.EventManagerImpl;
-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.util.logging.DebugLogger;
-import com.dfsek.terra.util.logging.JavaLogger;
 import io.papermc.lib.PaperLib;
 import org.bstats.bukkit.Metrics;
 import org.bukkit.Bukkit;
 import org.bukkit.command.PluginCommand;
-import org.bukkit.entity.EntityType;
 import org.bukkit.generator.ChunkGenerator;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.HashMap;
-import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
 

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

@@ -1,12 +1,14 @@
 package com.dfsek.terra.bukkit.generator;
 
 import com.dfsek.terra.api.TerraPlugin;
+import com.dfsek.terra.api.config.WorldConfig;
 import com.dfsek.terra.api.world.Chunk;
 import com.dfsek.terra.api.world.generator.GeneratorWrapper;
 import com.dfsek.terra.api.world.generator.ChunkGenerator;
 import com.dfsek.terra.bukkit.population.PopulationManager;
 import com.dfsek.terra.bukkit.world.BukkitAdapter;
 import com.dfsek.terra.bukkit.world.BukkitBiomeGrid;
+import com.dfsek.terra.bukkit.world.BukkitWorld;
 import org.bukkit.World;
 import org.bukkit.generator.BlockPopulator;
 import org.jetbrains.annotations.NotNull;
@@ -31,11 +33,12 @@ public class BukkitChunkGeneratorWrapper extends org.bukkit.generator.ChunkGener
 
     private boolean needsLoad = true;
 
+    private WorldConfig worldConfig;
+
     public BukkitChunkGeneratorWrapper(ChunkGenerator delegate) {
         this.delegate = delegate;
         this.main = delegate.getMain();
         this.popMan = new PopulationManager(delegate, main);
-
     }
 
 
@@ -67,12 +70,19 @@ public class BukkitChunkGeneratorWrapper extends org.bukkit.generator.ChunkGener
 
     @Override
     public @NotNull ChunkData generateChunkData(@NotNull World world, @NotNull Random random, int x, int z, @NotNull BiomeGrid biome) {
+        if(this.worldConfig == null) {
+            this.worldConfig = delegate.getConfigPack().toWorldConfig(BukkitAdapter.adapt(world));
+        }
         com.dfsek.terra.api.world.World bukkitWorld = BukkitAdapter.adapt(world);
         if(needsLoad) load(bukkitWorld); // Load population data for world.
         delegate.generateBiomes(bukkitWorld, random, x, z, new BukkitBiomeGrid(biome));
         return (ChunkData) delegate.generateChunkData(bukkitWorld, random, x, z, new BukkitChunkData(createChunkData(world))).getHandle();
     }
 
+    public WorldConfig getWorldConfig() {
+        return worldConfig;
+    }
+
     @Override
     public @NotNull List<BlockPopulator> getDefaultPopulators(@NotNull World world) {
         return Arrays.asList(popMan, new BukkitPopulatorWrapper(delegate));

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

@@ -11,8 +11,14 @@ import com.dfsek.terra.bukkit.world.BukkitAdapter;
 import com.dfsek.terra.bukkit.world.block.data.BukkitBlockState;
 import com.dfsek.terra.bukkit.world.entity.BukkitEntityType;
 import org.bukkit.Bukkit;
+import org.bukkit.Material;
 
 public class BukkitWorldHandle implements WorldHandle {
+    private final BlockState air;
+
+    public BukkitWorldHandle() {
+        this.air = BukkitBlockState.newInstance(Material.AIR.createBlockData());
+    }
 
     @Override
     public BlockState createBlockData(String data) {
@@ -20,6 +26,11 @@ public class BukkitWorldHandle implements WorldHandle {
         return BukkitBlockState.newInstance(bukkitData);
     }
 
+    @Override
+    public BlockState air() {
+        return air;
+    }
+
     @Override
     public EntityType getEntity(String id) {
         return new BukkitEntityType(org.bukkit.entity.EntityType.valueOf(id));

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

@@ -2,6 +2,7 @@ package com.dfsek.terra.bukkit.listeners;
 
 import com.dfsek.terra.api.TerraPlugin;
 import com.dfsek.terra.api.config.WorldConfig;
+import com.dfsek.terra.api.vector.Vector3;
 import com.dfsek.terra.api.world.Tree;
 import com.dfsek.terra.api.world.World;
 import com.dfsek.terra.bukkit.world.BukkitAdapter;

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

@@ -1,11 +1,6 @@
 package com.dfsek.terra.bukkit.listeners;
 
 import com.dfsek.terra.api.TerraPlugin;
-import com.dfsek.terra.api.structure.configured.ConfiguredStructure;
-import com.dfsek.terra.api.world.World;
-import com.dfsek.terra.api.world.locate.AsyncStructureFinder;
-import com.dfsek.terra.bukkit.world.BukkitAdapter;
-import com.dfsek.terra.world.population.items.TerraStructure;
 import io.papermc.paper.event.world.StructureLocateEvent;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
@@ -19,7 +14,7 @@ public class PaperListener implements Listener {
 
     @EventHandler
     public void onStructureLocate(StructureLocateEvent e) {
-        String name = "minecraft:" + e.getType().getName();
+        /*String name = "minecraft:" + e.getType().getName();
         main.getDebugLogger().info("Overriding structure location for \"" + name + "\"");
         World w = BukkitAdapter.adapt(e.getWorld());
         ConfiguredStructure config = tw.getConfig().getRegistry(TerraStructure.class).get(tw.getConfig().getLocatable().get(name));
@@ -34,5 +29,6 @@ public class PaperListener implements Listener {
             e.setResult(e.getOrigin());
             main.logger().warning("No overrides are defined for \"" + name + "\". Locating this structure will NOT work properly!");
         }
+         */
     }
 }

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

@@ -1,14 +1,6 @@
 package com.dfsek.terra.bukkit.listeners;
 
 import com.dfsek.terra.api.TerraPlugin;
-import com.dfsek.terra.api.structure.configured.ConfiguredStructure;
-import com.dfsek.terra.api.world.World;
-import com.dfsek.terra.api.world.locate.AsyncStructureFinder;
-import com.dfsek.terra.bukkit.world.BukkitAdapter;
-import com.dfsek.terra.world.population.items.TerraStructure;
-import org.bukkit.entity.EnderSignal;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Villager;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -32,6 +24,7 @@ public class SpigotListener implements Listener {
 
     @EventHandler(priority = EventPriority.NORMAL)
     public void onEnderEye(EntitySpawnEvent e) {
+        /*
         Entity entity = e.getEntity();
         if(e.getEntityType().equals(EntityType.ENDER_SIGNAL)) {
             main.getDebugLogger().info("Detected Ender Signal...");
@@ -49,6 +42,7 @@ public class SpigotListener implements Listener {
             } else
                 main.logger().warning("No overrides are defined for Strongholds. Ender Signals will not work correctly.");
         }
+         */
     }
 
     @EventHandler

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

@@ -2,12 +2,16 @@ package com.dfsek.terra.bukkit.world;
 
 import com.dfsek.terra.api.block.entity.BlockEntity;
 import com.dfsek.terra.api.block.state.BlockState;
+import com.dfsek.terra.api.config.WorldConfig;
 import com.dfsek.terra.api.entity.Entity;
 import com.dfsek.terra.api.entity.EntityType;
 import com.dfsek.terra.api.vector.Vector3;
 import com.dfsek.terra.api.world.Chunk;
 import com.dfsek.terra.api.world.World;
+import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
+import com.dfsek.terra.api.world.generator.ChunkGenerator;
 import com.dfsek.terra.bukkit.BukkitEntity;
+import com.dfsek.terra.bukkit.generator.BukkitChunkGeneratorWrapper;
 import com.dfsek.terra.bukkit.world.block.state.BukkitBlockEntity;
 import com.dfsek.terra.bukkit.world.entity.BukkitEntityType;
 
@@ -77,6 +81,21 @@ public class BukkitWorld implements World {
         return delegate.getMinHeight();
     }
 
+    @Override
+    public ChunkGenerator getGenerator() {
+        return ((BukkitChunkGeneratorWrapper) delegate.getGenerator()).getHandle();
+    }
+
+    @Override
+    public BiomeProvider getBiomeProvider() {
+        return ((BukkitChunkGeneratorWrapper) delegate.getGenerator()).getWorldConfig().getProvider();
+    }
+
+    @Override
+    public WorldConfig getConfig() {
+        return ((BukkitChunkGeneratorWrapper) delegate.getGenerator()).getWorldConfig();
+    }
+
     @Override
     public org.bukkit.World getHandle() {
         return delegate;

platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/data/BukkitBlockState.java

@@ -2,6 +2,7 @@ package com.dfsek.terra.bukkit.world.block.data;
 
 import com.dfsek.terra.api.block.BlockType;
 import com.dfsek.terra.api.block.state.BlockState;
+import com.dfsek.terra.api.block.state.properties.Property;
 import com.dfsek.terra.bukkit.world.BukkitAdapter;
 import org.bukkit.Material;
 
@@ -57,4 +58,19 @@ public class BukkitBlockState implements BlockState {
     public boolean isStructureVoid() {
         return delegate.getMaterial() == Material.STRUCTURE_VOID;
     }
+
+    @Override
+    public <T> boolean has(Property<T> property) {
+        return false;
+    }
+
+    @Override
+    public <T> T get(Property<T> property) {
+        return null;
+    }
+
+    @Override
+    public <T> BlockState set(Property<T> property, T value) {
+        return null;
+    }
 }