From d1af8c12244e7c6e25cc43265181be4f9a6ca40b Mon Sep 17 00:00:00 2001 From: dfsek Date: Fri, 18 Dec 2020 19:36:27 -0700 Subject: [PATCH] Begin absorbing Gaea into Terra --- .../java/com/dfsek/terra/TerraProfiler.java | 2 +- .../main/java/com/dfsek/terra/TerraWorld.java | 8 ++-- .../main/java/com/dfsek/terra/api/Entity.java | 4 +- .../com/dfsek/terra/api/GenericLoaders.java | 2 +- .../java/com/dfsek/terra/api/gaea/Debug.java | 2 +- .../java/com/dfsek/terra/api/gaea/Gaea.java | 2 +- .../dfsek/terra/api/gaea/lang/Language.java | 2 +- .../dfsek/terra/api/gaea/lang/Message.java | 2 +- .../terra/api/gaea/lang/MultiLineMessage.java | 2 +- .../api/gaea/lang/SingleLineMessage.java | 2 +- .../api/gaea/math/ChunkInterpolator3.java | 8 ++-- .../api/gaea/math/ProbabilityCollection.java | 2 +- .../api/gaea/population/ChunkCoordinate.java | 2 +- .../gaea/population/PopulationManager.java | 8 ++-- .../api/gaea/profiler/WorldProfiler.java | 2 +- .../terra/api/gaea/structures/loot/Entry.java | 6 +-- .../api/gaea/structures/loot/LootTable.java | 6 +-- .../terra/api/gaea/structures/loot/Pool.java | 4 +- .../loot/functions/AmountFunction.java | 2 +- .../loot/functions/DamageFunction.java | 6 +-- .../structures/loot/functions/Function.java | 2 +- .../com/dfsek/terra/api/gaea/tree/Tree.java | 14 ------- .../com/dfsek/terra/api/gaea/world/Flora.java | 6 +-- .../com/dfsek/terra/api/generic/Tree.java | 4 -- .../api/generic/generator/BlockPopulator.java | 11 ------ .../generator/TerraBlockPopulator.java | 10 ----- .../api/generic/inventory/ItemHandle.java | 7 ---- .../api/generic/inventory/item/ItemMeta.java | 6 --- .../dfsek/terra/api/generic/world/Biome.java | 6 --- .../dfsek/terra/api/generic/world/Chunk.java | 14 ------- .../terra/api/generic/world/block/Axis.java | 5 --- .../generic/world/block/data/Directional.java | 10 ----- .../generic/world/block/data/Orientable.java | 12 ------ .../generic/world/block/data/Rotatable.java | 10 ----- .../generic/world/block/state/BlockState.java | 4 -- .../{generic => platform}/CommandSender.java | 2 +- .../api/{generic => platform}/Entity.java | 2 +- .../api/{generic => platform}/Handle.java | 2 +- .../{generic => platform}/TerraPlugin.java | 8 ++-- .../com/dfsek/terra/api/platform/Tree.java | 4 ++ .../platform/generator/BlockPopulator.java | 11 ++++++ .../generator/ChunkGenerator.java | 11 +++--- .../inventory/Inventory.java | 4 +- .../api/platform/inventory/ItemHandle.java | 7 ++++ .../inventory/ItemStack.java | 8 ++-- .../inventory/item/Damageable.java | 4 +- .../api/platform/inventory/item/ItemMeta.java | 6 +++ .../dfsek/terra/api/platform/world/Biome.java | 6 +++ .../world/BiomeGrid.java | 4 +- .../dfsek/terra/api/platform/world/Chunk.java | 14 +++++++ .../{generic => platform}/world/World.java | 14 +++---- .../world/WorldHandle.java | 10 ++--- .../terra/api/platform/world/block/Axis.java | 5 +++ .../world/block/Block.java | 6 +-- .../world/block/BlockData.java | 4 +- .../world/block/BlockFace.java | 4 +- .../world/block/MaterialData.java | 4 +- .../world/block/data/AnaloguePowerable.java | 4 +- .../world/block/data/Bisected.java | 4 +- .../world/block/data/Directional.java | 10 +++++ .../world/block/data/MultipleFacing.java | 6 +-- .../platform/world/block/data/Orientable.java | 14 +++++++ .../world/block/data/Rail.java | 4 +- .../world/block/data/RedstoneWire.java | 6 +-- .../platform/world/block/data/Rotatable.java | 10 +++++ .../world/block/data/Slab.java | 2 +- .../world/block/data/Stairs.java | 2 +- .../world/block/data/Wall.java | 6 +-- .../world/block/data/Waterlogged.java | 4 +- .../world/block/state/BlockState.java | 4 ++ .../world/vector/Location.java | 6 +-- .../world/vector/Vector2.java | 2 +- .../world/vector/Vector3.java | 4 +- .../api/{gaea => world}/biome/Biome.java | 6 +-- .../api/{gaea => world}/biome/BiomeGrid.java | 6 +-- .../api/{gaea => world}/biome/Decorator.java | 4 +- .../api/{gaea => world}/biome/Generator.java | 8 ++-- .../biome/NormalizationUtil.java | 2 +- .../api/{gaea => }/world/carving/Carver.java | 6 +-- .../api/{gaea => }/world/carving/Worm.java | 4 +- .../generation/GenerationPhase.java | 2 +- .../world/generation/TerraBlockPopulator.java | 10 +++++ .../generation}/TerraChunkGenerator.java | 9 +++-- .../api/{gaea => }/world/palette/Palette.java | 6 +-- .../world/palette/RandomPalette.java | 2 +- .../world/palette/SimplexPalette.java | 2 +- .../com/dfsek/terra/api/world/tree/Tree.java | 14 +++++++ .../tree/fractal/EntitySpawnHolder.java | 6 +-- .../tree/fractal/FractalTree.java | 10 ++--- .../tree/fractal/TreeGeometry.java | 8 ++-- .../tree/fractal/trees/Cactus.java | 10 ++--- .../tree/fractal/trees/IceSpike.java | 16 ++++---- .../tree/fractal/trees/OakTree.java | 14 +++---- .../tree/fractal/trees/ShatteredPillar.java | 10 ++--- .../tree/fractal/trees/ShatteredTree.java | 16 ++++---- .../fractal/trees/SmallShatteredPillar.java | 10 ++--- .../fractal/trees/SmallShatteredTree.java | 16 ++++---- .../tree/fractal/trees/SpruceTree.java | 14 +++---- .../dfsek/terra/async/AsyncBiomeFinder.java | 10 ++--- .../dfsek/terra/async/AsyncFeatureFinder.java | 8 ++-- .../java/com/dfsek/terra/biome/BiomeZone.java | 4 +- .../dfsek/terra/biome/UserDefinedBiome.java | 14 +++---- .../terra/biome/grid/SingleBiomeGrid.java | 8 ++-- .../terra/biome/grid/UserDefinedGrid.java | 10 ++--- .../biome/grid/master/TerraBiomeGrid.java | 4 +- .../grid/master/TerraRadialBiomeGrid.java | 10 ++--- .../grid/master/TerraStandardBiomeGrid.java | 8 ++-- .../terra/biome/palette/PaletteHolder.java | 4 +- .../biome/palette/PaletteHolderBuilder.java | 4 +- .../terra/biome/palette/PaletteLayer.java | 2 +- .../terra/biome/palette/SinglePalette.java | 2 +- .../postprocessing/CoordinatePerturb.java | 2 +- .../com/dfsek/terra/carving/CarverCache.java | 12 +++--- .../dfsek/terra/carving/CarverPalette.java | 4 +- .../terra/carving/UserDefinedCarver.java | 12 +++--- .../dfsek/terra/config/base/ConfigPack.java | 8 ++-- .../dfsek/terra/config/base/PluginConfig.java | 2 +- .../builder/biomegrid/BiomeGridBuilder.java | 2 +- .../builder/biomegrid/SingleGridBuilder.java | 2 +- .../biomegrid/UserDefinedGridBuilder.java | 2 +- .../terra/config/factories/BiomeFactory.java | 2 +- .../config/factories/BiomeGridFactory.java | 4 +- .../terra/config/factories/CarverFactory.java | 2 +- .../terra/config/factories/FloraFactory.java | 8 ++-- .../terra/config/factories/OreFactory.java | 4 +- .../config/factories/PaletteFactory.java | 10 ++--- .../config/factories/StructureFactory.java | 2 +- .../terra/config/factories/TerraFactory.java | 2 +- .../terra/config/factories/TreeFactory.java | 4 +- .../com/dfsek/terra/config/lang/LangUtil.java | 4 +- .../terra/config/loaders/LootTableLoader.java | 2 +- .../config/loaders/MaterialSetLoader.java | 2 +- .../com/dfsek/terra/config/loaders/Types.java | 8 ++-- .../loaders/config/TreeLayerLoader.java | 4 +- .../loaders/palette/CarverPaletteLoader.java | 2 +- .../loaders/palette/PaletteHolderLoader.java | 4 +- .../loaders/palette/PaletteLayerLoader.java | 2 +- .../config/templates/BiomeGridTemplate.java | 2 +- .../terra/config/templates/BiomeTemplate.java | 10 ++--- .../config/templates/CarverTemplate.java | 2 +- .../terra/config/templates/OreTemplate.java | 2 +- .../com/dfsek/terra/debug/gui/DebugFrame.java | 2 +- .../com/dfsek/terra/debug/gui/DebugGUI.java | 2 +- .../generation/ElevationInterpolator.java | 2 +- ...nerator.java => MasterChunkGenerator.java} | 38 +++++++++---------- .../generation/UserDefinedDecorator.java | 4 +- .../generation/config/WorldGenerator.java | 8 ++-- .../generation/items/PlaceableLayer.java | 4 +- .../generation/items/flora/BlockFlora.java | 10 ++--- .../generation/items/flora/ConstantFlora.java | 10 ++--- .../generation/items/flora/FloraLayer.java | 4 +- .../generation/items/flora/TerraFlora.java | 22 +++++------ .../items/ores/DeformedSphereOre.java | 12 +++--- .../terra/generation/items/ores/Ore.java | 8 ++-- .../generation/items/ores/VanillaOre.java | 12 +++--- .../generation/items/tree/TerraTree.java | 6 +-- .../generation/items/tree/TreeLayer.java | 10 ++--- .../com/dfsek/terra/image/ImageLoader.java | 6 +-- .../terra/image/WorldImageGenerator.java | 6 +-- .../dfsek/terra/population/CavePopulator.java | 18 ++++----- .../terra/population/FloraPopulator.java | 14 +++---- .../dfsek/terra/population/OrePopulator.java | 14 +++---- .../terra/population/StructurePopulator.java | 8 ++-- .../dfsek/terra/population/TreePopulator.java | 12 +++--- .../com/dfsek/terra/procgen/GridSpawn.java | 2 +- .../dfsek/terra/procgen/pixel/Polygon.java | 2 +- .../dfsek/terra/procgen/pixel/Rectangle.java | 2 +- .../dfsek/terra/procgen/voxel/Cylinder.java | 2 +- .../terra/procgen/voxel/DeformedSphere.java | 2 +- .../com/dfsek/terra/procgen/voxel/Sphere.java | 2 +- .../com/dfsek/terra/procgen/voxel/Tube.java | 2 +- .../terra/procgen/voxel/VoxelGeometry.java | 2 +- .../dfsek/terra/registry/ConfigRegistry.java | 2 +- .../dfsek/terra/registry/FloraRegistry.java | 6 +-- .../dfsek/terra/registry/PaletteRegistry.java | 6 +-- .../dfsek/terra/registry/TreeRegistry.java | 28 +++++++------- .../com/dfsek/terra/util/MaterialSet.java | 4 +- .../com/dfsek/terra/util/PaletteUtil.java | 4 +- .../com/dfsek/terra/util/PopulationUtil.java | 2 +- .../java/com/dfsek/terra/util/TagUtil.java | 2 +- .../dfsek/terra/bukkit/BukkitBiomeGrid.java | 4 +- .../com/dfsek/terra/bukkit/BukkitChunk.java | 6 +-- .../terra/bukkit/BukkitCommandSender.java | 2 +- .../com/dfsek/terra/bukkit/BukkitEntity.java | 2 +- .../dfsek/terra/bukkit/BukkitItemHandle.java | 6 +-- .../dfsek/terra/bukkit/BukkitItemMeta.java | 2 +- .../dfsek/terra/bukkit/BukkitItemStack.java | 6 +-- .../com/dfsek/terra/bukkit/BukkitPlayer.java | 2 +- .../com/dfsek/terra/bukkit/BukkitTree.java | 10 ++--- .../com/dfsek/terra/bukkit/BukkitWorld.java | 14 +++---- .../dfsek/terra/bukkit/BukkitWorldHandle.java | 12 +++--- .../dfsek/terra/bukkit/TerraBukkitPlugin.java | 24 ++++++------ .../dfsek/terra/bukkit/command/Command.java | 2 +- .../bukkit/command/command/TerraCommand.java | 2 +- .../geometry/DeformedSphereCommand.java | 2 +- .../command/geometry/SphereCommand.java | 2 +- .../command/command/geometry/TubeCommand.java | 2 +- .../generator/BukkitChunkGenerator.java | 12 +++--- .../BukkitChunkGeneratorWrapper.java | 17 +++++---- .../bukkit/generator/BukkitPopulator.java | 6 +-- .../generator/BukkitPopulatorWrapper.java | 2 +- .../terra/bukkit/listeners/EventListener.java | 2 +- .../bukkit/listeners/SpigotListener.java | 2 +- .../terra/bukkit/structure/RotationUtil.java | 22 +++++------ .../terra/bukkit/util/BukkitConversions.java | 4 +- .../dfsek/terra/bukkit/world/BukkitBiome.java | 2 +- .../terra/bukkit/world/block/BukkitBlock.java | 10 ++--- .../bukkit/world/block/BukkitBlockData.java | 4 +- .../world/block/BukkitMaterialData.java | 4 +- .../world/block/data/BukkitEnumAdapter.java | 8 ++-- .../block/data/BukkitMultipleFacing.java | 4 +- .../bukkit/world/block/data/BukkitSlab.java | 2 +- .../bukkit/world/block/data/BukkitStairs.java | 4 +- .../world/block/data/BukkitWaterlogged.java | 2 +- .../world/block/data/TerraEnumAdapter.java | 8 ++-- .../dfsek/terra/fabric/TerraFabricPlugin.java | 14 +++---- .../fabric/inventory/FabricItemHandle.java | 6 +-- .../fabric/inventory/FabricItemStack.java | 6 +-- .../terra/fabric/world/FabricAdapters.java | 2 +- .../dfsek/terra/fabric/world/FabricBiome.java | 2 +- .../dfsek/terra/fabric/world/FabricTree.java | 6 +-- .../terra/fabric/world/FabricWorldHandle.java | 10 ++--- .../terra/fabric/world/TerraBiomeSource.java | 2 +- .../terra/fabric/world/block/FabricBlock.java | 10 ++--- .../fabric/world/block/FabricBlockData.java | 4 +- .../world/block/FabricMaterialData.java | 4 +- .../world/block/data/FabricEnumAdapter.java | 8 ++-- .../block/data/FabricMultipleFacing.java | 4 +- .../fabric/world/block/data/FabricSlab.java | 2 +- .../fabric/world/block/data/FabricStairs.java | 4 +- .../world/block/data/FabricWaterlogged.java | 2 +- .../world/block/data/TerraEnumAdapter.java | 8 ++-- .../world/generator/FabricChunkData.java | 4 +- .../world/generator/FabricChunkGenerator.java | 10 ++--- .../FabricChunkGeneratorWrapper.java | 10 ++--- .../fabric/world/handles/FabricWorld.java | 14 +++---- .../world/handles/chunk/FabricChunk.java | 6 +-- .../handles/chunk/FabricChunkWorldAccess.java | 6 +-- .../world/FabricSeededWorldAccess.java | 14 +++---- .../handles/world/FabricWorldAccess.java | 14 +++---- .../handles/world/FabricWorldChunkRegion.java | 14 +++---- 241 files changed, 779 insertions(+), 774 deletions(-) delete mode 100644 common/src/main/java/com/dfsek/terra/api/gaea/tree/Tree.java delete mode 100644 common/src/main/java/com/dfsek/terra/api/generic/Tree.java delete mode 100644 common/src/main/java/com/dfsek/terra/api/generic/generator/BlockPopulator.java delete mode 100644 common/src/main/java/com/dfsek/terra/api/generic/generator/TerraBlockPopulator.java delete mode 100644 common/src/main/java/com/dfsek/terra/api/generic/inventory/ItemHandle.java delete mode 100644 common/src/main/java/com/dfsek/terra/api/generic/inventory/item/ItemMeta.java delete mode 100644 common/src/main/java/com/dfsek/terra/api/generic/world/Biome.java delete mode 100644 common/src/main/java/com/dfsek/terra/api/generic/world/Chunk.java delete mode 100644 common/src/main/java/com/dfsek/terra/api/generic/world/block/Axis.java delete mode 100644 common/src/main/java/com/dfsek/terra/api/generic/world/block/data/Directional.java delete mode 100644 common/src/main/java/com/dfsek/terra/api/generic/world/block/data/Orientable.java delete mode 100644 common/src/main/java/com/dfsek/terra/api/generic/world/block/data/Rotatable.java delete mode 100644 common/src/main/java/com/dfsek/terra/api/generic/world/block/state/BlockState.java rename common/src/main/java/com/dfsek/terra/api/{generic => platform}/CommandSender.java (70%) rename common/src/main/java/com/dfsek/terra/api/{generic => platform}/Entity.java (53%) rename common/src/main/java/com/dfsek/terra/api/{generic => platform}/Handle.java (74%) rename common/src/main/java/com/dfsek/terra/api/{generic => platform}/TerraPlugin.java (77%) create mode 100644 common/src/main/java/com/dfsek/terra/api/platform/Tree.java create mode 100644 common/src/main/java/com/dfsek/terra/api/platform/generator/BlockPopulator.java rename common/src/main/java/com/dfsek/terra/api/{generic => platform}/generator/ChunkGenerator.java (86%) rename common/src/main/java/com/dfsek/terra/api/{generic => platform}/inventory/Inventory.java (61%) create mode 100644 common/src/main/java/com/dfsek/terra/api/platform/inventory/ItemHandle.java rename common/src/main/java/com/dfsek/terra/api/{generic => platform}/inventory/ItemStack.java (51%) rename common/src/main/java/com/dfsek/terra/api/{generic => platform}/inventory/item/Damageable.java (62%) create mode 100644 common/src/main/java/com/dfsek/terra/api/platform/inventory/item/ItemMeta.java create mode 100644 common/src/main/java/com/dfsek/terra/api/platform/world/Biome.java rename common/src/main/java/com/dfsek/terra/api/{generic => platform}/world/BiomeGrid.java (91%) create mode 100644 common/src/main/java/com/dfsek/terra/api/platform/world/Chunk.java rename common/src/main/java/com/dfsek/terra/api/{generic => platform}/world/World.java (64%) rename common/src/main/java/com/dfsek/terra/api/{generic => platform}/world/WorldHandle.java (58%) create mode 100644 common/src/main/java/com/dfsek/terra/api/platform/world/block/Axis.java rename common/src/main/java/com/dfsek/terra/api/{generic => platform}/world/block/Block.java (71%) rename common/src/main/java/com/dfsek/terra/api/{generic => platform}/world/block/BlockData.java (63%) rename common/src/main/java/com/dfsek/terra/api/{generic => platform}/world/block/BlockFace.java (97%) rename common/src/main/java/com/dfsek/terra/api/{generic => platform}/world/block/MaterialData.java (72%) rename common/src/main/java/com/dfsek/terra/api/{generic => platform}/world/block/data/AnaloguePowerable.java (54%) rename common/src/main/java/com/dfsek/terra/api/{generic => platform}/world/block/data/Bisected.java (75%) create mode 100644 common/src/main/java/com/dfsek/terra/api/platform/world/block/data/Directional.java rename common/src/main/java/com/dfsek/terra/api/{generic => platform}/world/block/data/MultipleFacing.java (57%) create mode 100644 common/src/main/java/com/dfsek/terra/api/platform/world/block/data/Orientable.java rename common/src/main/java/com/dfsek/terra/api/{generic => platform}/world/block/data/Rail.java (75%) rename common/src/main/java/com/dfsek/terra/api/{generic => platform}/world/block/data/RedstoneWire.java (61%) create mode 100644 common/src/main/java/com/dfsek/terra/api/platform/world/block/data/Rotatable.java rename common/src/main/java/com/dfsek/terra/api/{generic => platform}/world/block/data/Slab.java (72%) rename common/src/main/java/com/dfsek/terra/api/{generic => platform}/world/block/data/Stairs.java (92%) rename common/src/main/java/com/dfsek/terra/api/{generic => platform}/world/block/data/Wall.java (58%) rename common/src/main/java/com/dfsek/terra/api/{generic => platform}/world/block/data/Waterlogged.java (53%) create mode 100644 common/src/main/java/com/dfsek/terra/api/platform/world/block/state/BlockState.java rename common/src/main/java/com/dfsek/terra/api/{generic => platform}/world/vector/Location.java (92%) rename common/src/main/java/com/dfsek/terra/api/{generic => platform}/world/vector/Vector2.java (98%) rename common/src/main/java/com/dfsek/terra/api/{generic => platform}/world/vector/Vector3.java (98%) rename common/src/main/java/com/dfsek/terra/api/{gaea => world}/biome/Biome.java (86%) rename common/src/main/java/com/dfsek/terra/api/{gaea => world}/biome/BiomeGrid.java (95%) rename common/src/main/java/com/dfsek/terra/api/{gaea => world}/biome/Decorator.java (82%) rename common/src/main/java/com/dfsek/terra/api/{gaea => world}/biome/Generator.java (84%) rename common/src/main/java/com/dfsek/terra/api/{gaea => world}/biome/NormalizationUtil.java (99%) rename common/src/main/java/com/dfsek/terra/api/{gaea => }/world/carving/Carver.java (93%) rename common/src/main/java/com/dfsek/terra/api/{gaea => }/world/carving/Worm.java (97%) rename common/src/main/java/com/dfsek/terra/api/{gaea => world}/generation/GenerationPhase.java (81%) create mode 100644 common/src/main/java/com/dfsek/terra/api/world/generation/TerraBlockPopulator.java rename common/src/main/java/com/dfsek/terra/api/{generic/generator => world/generation}/TerraChunkGenerator.java (71%) rename common/src/main/java/com/dfsek/terra/api/{gaea => }/world/palette/Palette.java (92%) rename common/src/main/java/com/dfsek/terra/api/{gaea => }/world/palette/RandomPalette.java (91%) rename common/src/main/java/com/dfsek/terra/api/{gaea => }/world/palette/SimplexPalette.java (92%) create mode 100644 common/src/main/java/com/dfsek/terra/api/world/tree/Tree.java rename common/src/main/java/com/dfsek/terra/api/{gaea => world}/tree/fractal/EntitySpawnHolder.java (78%) rename common/src/main/java/com/dfsek/terra/api/{gaea => world}/tree/fractal/FractalTree.java (80%) rename common/src/main/java/com/dfsek/terra/api/{gaea => world}/tree/fractal/TreeGeometry.java (92%) rename common/src/main/java/com/dfsek/terra/api/{gaea => world}/tree/fractal/trees/Cactus.java (75%) rename common/src/main/java/com/dfsek/terra/api/{gaea => world}/tree/fractal/trees/IceSpike.java (80%) rename common/src/main/java/com/dfsek/terra/api/{gaea => world}/tree/fractal/trees/OakTree.java (87%) rename common/src/main/java/com/dfsek/terra/api/{gaea => world}/tree/fractal/trees/ShatteredPillar.java (86%) rename common/src/main/java/com/dfsek/terra/api/{gaea => world}/tree/fractal/trees/ShatteredTree.java (87%) rename common/src/main/java/com/dfsek/terra/api/{gaea => world}/tree/fractal/trees/SmallShatteredPillar.java (75%) rename common/src/main/java/com/dfsek/terra/api/{gaea => world}/tree/fractal/trees/SmallShatteredTree.java (87%) rename common/src/main/java/com/dfsek/terra/api/{gaea => world}/tree/fractal/trees/SpruceTree.java (81%) rename common/src/main/java/com/dfsek/terra/generation/{TerraChunkGenerator.java => MasterChunkGenerator.java} (89%) diff --git a/common/src/main/java/com/dfsek/terra/TerraProfiler.java b/common/src/main/java/com/dfsek/terra/TerraProfiler.java index 127968132..1d1885197 100644 --- a/common/src/main/java/com/dfsek/terra/TerraProfiler.java +++ b/common/src/main/java/com/dfsek/terra/TerraProfiler.java @@ -3,7 +3,7 @@ package com.dfsek.terra; import com.dfsek.terra.api.gaea.profiler.DataType; import com.dfsek.terra.api.gaea.profiler.Measurement; import com.dfsek.terra.api.gaea.profiler.WorldProfiler; -import com.dfsek.terra.api.generic.world.World; +import com.dfsek.terra.api.platform.world.World; public class TerraProfiler extends WorldProfiler { public TerraProfiler(World w) { diff --git a/common/src/main/java/com/dfsek/terra/TerraWorld.java b/common/src/main/java/com/dfsek/terra/TerraWorld.java index 8cb4c4392..62efb8e94 100644 --- a/common/src/main/java/com/dfsek/terra/TerraWorld.java +++ b/common/src/main/java/com/dfsek/terra/TerraWorld.java @@ -1,11 +1,11 @@ package com.dfsek.terra; -import com.dfsek.terra.api.generic.TerraPlugin; -import com.dfsek.terra.api.generic.world.World; +import com.dfsek.terra.api.platform.TerraPlugin; +import com.dfsek.terra.api.platform.world.World; import com.dfsek.terra.biome.BiomeZone; import com.dfsek.terra.biome.grid.master.TerraBiomeGrid; import com.dfsek.terra.config.base.ConfigPack; -import com.dfsek.terra.generation.TerraChunkGenerator; +import com.dfsek.terra.generation.MasterChunkGenerator; public class TerraWorld { private final TerraBiomeGrid grid; @@ -24,7 +24,7 @@ public class TerraWorld { } public static boolean isTerraWorld(World w) { - return w.getGenerator() instanceof TerraChunkGenerator; + return w.getGenerator() instanceof MasterChunkGenerator; } public TerraBiomeGrid getGrid() { diff --git a/common/src/main/java/com/dfsek/terra/api/Entity.java b/common/src/main/java/com/dfsek/terra/api/Entity.java index ace1710e4..353aac09b 100644 --- a/common/src/main/java/com/dfsek/terra/api/Entity.java +++ b/common/src/main/java/com/dfsek/terra/api/Entity.java @@ -1,7 +1,7 @@ package com.dfsek.terra.api; -import com.dfsek.terra.api.generic.Handle; -import com.dfsek.terra.api.generic.world.vector.Location; +import com.dfsek.terra.api.platform.Handle; +import com.dfsek.terra.api.platform.world.vector.Location; public interface Entity extends Handle { Location getLocation(); diff --git a/common/src/main/java/com/dfsek/terra/api/GenericLoaders.java b/common/src/main/java/com/dfsek/terra/api/GenericLoaders.java index 454ecc50d..a51aa4143 100644 --- a/common/src/main/java/com/dfsek/terra/api/GenericLoaders.java +++ b/common/src/main/java/com/dfsek/terra/api/GenericLoaders.java @@ -3,7 +3,7 @@ package com.dfsek.terra.api; import com.dfsek.tectonic.loading.TypeRegistry; import com.dfsek.terra.api.gaea.math.ProbabilityCollection; import com.dfsek.terra.api.gaea.math.Range; -import com.dfsek.terra.api.generic.TerraPlugin; +import com.dfsek.terra.api.platform.TerraPlugin; import com.dfsek.terra.biome.grid.master.TerraBiomeGrid; import com.dfsek.terra.biome.palette.PaletteHolder; import com.dfsek.terra.biome.palette.PaletteLayer; diff --git a/common/src/main/java/com/dfsek/terra/api/gaea/Debug.java b/common/src/main/java/com/dfsek/terra/api/gaea/Debug.java index d447e695f..c513cfba0 100644 --- a/common/src/main/java/com/dfsek/terra/api/gaea/Debug.java +++ b/common/src/main/java/com/dfsek/terra/api/gaea/Debug.java @@ -1,6 +1,6 @@ package com.dfsek.terra.api.gaea; -import com.dfsek.terra.api.generic.TerraPlugin; +import com.dfsek.terra.api.platform.TerraPlugin; public class Debug { public static TerraPlugin main; diff --git a/common/src/main/java/com/dfsek/terra/api/gaea/Gaea.java b/common/src/main/java/com/dfsek/terra/api/gaea/Gaea.java index a8c38b374..5254fe730 100644 --- a/common/src/main/java/com/dfsek/terra/api/gaea/Gaea.java +++ b/common/src/main/java/com/dfsek/terra/api/gaea/Gaea.java @@ -1,7 +1,7 @@ package com.dfsek.terra.api.gaea; -import com.dfsek.terra.api.generic.world.World; +import com.dfsek.terra.api.platform.world.World; import java.io.File; diff --git a/common/src/main/java/com/dfsek/terra/api/gaea/lang/Language.java b/common/src/main/java/com/dfsek/terra/api/gaea/lang/Language.java index a8c442668..d1703ee32 100644 --- a/common/src/main/java/com/dfsek/terra/api/gaea/lang/Language.java +++ b/common/src/main/java/com/dfsek/terra/api/gaea/lang/Language.java @@ -2,7 +2,7 @@ package com.dfsek.terra.api.gaea.lang; import com.dfsek.tectonic.config.Configuration; -import com.dfsek.terra.api.generic.CommandSender; +import com.dfsek.terra.api.platform.CommandSender; import java.io.File; import java.io.FileInputStream; diff --git a/common/src/main/java/com/dfsek/terra/api/gaea/lang/Message.java b/common/src/main/java/com/dfsek/terra/api/gaea/lang/Message.java index 1a3e00003..0451f56b4 100644 --- a/common/src/main/java/com/dfsek/terra/api/gaea/lang/Message.java +++ b/common/src/main/java/com/dfsek/terra/api/gaea/lang/Message.java @@ -1,7 +1,7 @@ package com.dfsek.terra.api.gaea.lang; -import com.dfsek.terra.api.generic.CommandSender; +import com.dfsek.terra.api.platform.CommandSender; import java.util.logging.Level; import java.util.logging.Logger; diff --git a/common/src/main/java/com/dfsek/terra/api/gaea/lang/MultiLineMessage.java b/common/src/main/java/com/dfsek/terra/api/gaea/lang/MultiLineMessage.java index 2518f286d..37cf33072 100644 --- a/common/src/main/java/com/dfsek/terra/api/gaea/lang/MultiLineMessage.java +++ b/common/src/main/java/com/dfsek/terra/api/gaea/lang/MultiLineMessage.java @@ -1,6 +1,6 @@ package com.dfsek.terra.api.gaea.lang; -import com.dfsek.terra.api.generic.CommandSender; +import com.dfsek.terra.api.platform.CommandSender; import java.util.Arrays; import java.util.List; diff --git a/common/src/main/java/com/dfsek/terra/api/gaea/lang/SingleLineMessage.java b/common/src/main/java/com/dfsek/terra/api/gaea/lang/SingleLineMessage.java index 9254300fe..5d482ee16 100644 --- a/common/src/main/java/com/dfsek/terra/api/gaea/lang/SingleLineMessage.java +++ b/common/src/main/java/com/dfsek/terra/api/gaea/lang/SingleLineMessage.java @@ -1,7 +1,7 @@ package com.dfsek.terra.api.gaea.lang; -import com.dfsek.terra.api.generic.CommandSender; +import com.dfsek.terra.api.platform.CommandSender; import java.util.Arrays; import java.util.logging.Level; diff --git a/common/src/main/java/com/dfsek/terra/api/gaea/math/ChunkInterpolator3.java b/common/src/main/java/com/dfsek/terra/api/gaea/math/ChunkInterpolator3.java index 95547e132..d7e9098f9 100644 --- a/common/src/main/java/com/dfsek/terra/api/gaea/math/ChunkInterpolator3.java +++ b/common/src/main/java/com/dfsek/terra/api/gaea/math/ChunkInterpolator3.java @@ -1,9 +1,9 @@ package com.dfsek.terra.api.gaea.math; -import com.dfsek.terra.api.gaea.biome.BiomeGrid; -import com.dfsek.terra.api.gaea.biome.Generator; -import com.dfsek.terra.api.gaea.generation.GenerationPhase; -import com.dfsek.terra.api.generic.world.World; +import com.dfsek.terra.api.platform.world.World; +import com.dfsek.terra.api.world.biome.BiomeGrid; +import com.dfsek.terra.api.world.biome.Generator; +import com.dfsek.terra.api.world.generation.GenerationPhase; import net.jafama.FastMath; /** diff --git a/common/src/main/java/com/dfsek/terra/api/gaea/math/ProbabilityCollection.java b/common/src/main/java/com/dfsek/terra/api/gaea/math/ProbabilityCollection.java index 2fd1db812..5cc12b5a2 100644 --- a/common/src/main/java/com/dfsek/terra/api/gaea/math/ProbabilityCollection.java +++ b/common/src/main/java/com/dfsek/terra/api/gaea/math/ProbabilityCollection.java @@ -1,6 +1,6 @@ package com.dfsek.terra.api.gaea.math; -import com.dfsek.terra.api.gaea.biome.NormalizationUtil; +import com.dfsek.terra.api.world.biome.NormalizationUtil; import java.util.HashSet; import java.util.Random; diff --git a/common/src/main/java/com/dfsek/terra/api/gaea/population/ChunkCoordinate.java b/common/src/main/java/com/dfsek/terra/api/gaea/population/ChunkCoordinate.java index a5d2a34e7..ea39f6ccf 100644 --- a/common/src/main/java/com/dfsek/terra/api/gaea/population/ChunkCoordinate.java +++ b/common/src/main/java/com/dfsek/terra/api/gaea/population/ChunkCoordinate.java @@ -1,7 +1,7 @@ package com.dfsek.terra.api.gaea.population; -import com.dfsek.terra.api.generic.world.Chunk; +import com.dfsek.terra.api.platform.world.Chunk; import java.io.Serializable; import java.util.UUID; diff --git a/common/src/main/java/com/dfsek/terra/api/gaea/population/PopulationManager.java b/common/src/main/java/com/dfsek/terra/api/gaea/population/PopulationManager.java index c790b63a7..4f2b0470b 100644 --- a/common/src/main/java/com/dfsek/terra/api/gaea/population/PopulationManager.java +++ b/common/src/main/java/com/dfsek/terra/api/gaea/population/PopulationManager.java @@ -6,10 +6,10 @@ import com.dfsek.terra.api.gaea.profiler.WorldProfiler; import com.dfsek.terra.api.gaea.util.FastRandom; import com.dfsek.terra.api.gaea.util.GlueList; import com.dfsek.terra.api.gaea.util.SerializationUtil; -import com.dfsek.terra.api.generic.TerraPlugin; -import com.dfsek.terra.api.generic.generator.TerraBlockPopulator; -import com.dfsek.terra.api.generic.world.Chunk; -import com.dfsek.terra.api.generic.world.World; +import com.dfsek.terra.api.platform.TerraPlugin; +import com.dfsek.terra.api.platform.world.Chunk; +import com.dfsek.terra.api.platform.world.World; +import com.dfsek.terra.api.world.generation.TerraBlockPopulator; import org.jetbrains.annotations.NotNull; import java.io.File; diff --git a/common/src/main/java/com/dfsek/terra/api/gaea/profiler/WorldProfiler.java b/common/src/main/java/com/dfsek/terra/api/gaea/profiler/WorldProfiler.java index 8f486d310..5c3bee6f8 100644 --- a/common/src/main/java/com/dfsek/terra/api/gaea/profiler/WorldProfiler.java +++ b/common/src/main/java/com/dfsek/terra/api/gaea/profiler/WorldProfiler.java @@ -1,6 +1,6 @@ package com.dfsek.terra.api.gaea.profiler; -import com.dfsek.terra.api.generic.world.World; +import com.dfsek.terra.api.platform.world.World; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; import net.jafama.FastMath; diff --git a/common/src/main/java/com/dfsek/terra/api/gaea/structures/loot/Entry.java b/common/src/main/java/com/dfsek/terra/api/gaea/structures/loot/Entry.java index 5eb15b4aa..ff325a46a 100644 --- a/common/src/main/java/com/dfsek/terra/api/gaea/structures/loot/Entry.java +++ b/common/src/main/java/com/dfsek/terra/api/gaea/structures/loot/Entry.java @@ -4,9 +4,9 @@ import com.dfsek.terra.api.gaea.structures.loot.functions.AmountFunction; import com.dfsek.terra.api.gaea.structures.loot.functions.DamageFunction; import com.dfsek.terra.api.gaea.structures.loot.functions.Function; import com.dfsek.terra.api.gaea.util.GlueList; -import com.dfsek.terra.api.generic.TerraPlugin; -import com.dfsek.terra.api.generic.inventory.ItemStack; -import com.dfsek.terra.api.generic.world.block.MaterialData; +import com.dfsek.terra.api.platform.TerraPlugin; +import com.dfsek.terra.api.platform.inventory.ItemStack; +import com.dfsek.terra.api.platform.world.block.MaterialData; import net.jafama.FastMath; import org.json.simple.JSONArray; import org.json.simple.JSONObject; diff --git a/common/src/main/java/com/dfsek/terra/api/gaea/structures/loot/LootTable.java b/common/src/main/java/com/dfsek/terra/api/gaea/structures/loot/LootTable.java index 08c571915..8c3997502 100644 --- a/common/src/main/java/com/dfsek/terra/api/gaea/structures/loot/LootTable.java +++ b/common/src/main/java/com/dfsek/terra/api/gaea/structures/loot/LootTable.java @@ -1,9 +1,9 @@ package com.dfsek.terra.api.gaea.structures.loot; import com.dfsek.terra.api.gaea.util.GlueList; -import com.dfsek.terra.api.generic.TerraPlugin; -import com.dfsek.terra.api.generic.inventory.Inventory; -import com.dfsek.terra.api.generic.inventory.ItemStack; +import com.dfsek.terra.api.platform.TerraPlugin; +import com.dfsek.terra.api.platform.inventory.Inventory; +import com.dfsek.terra.api.platform.inventory.ItemStack; import org.json.simple.JSONArray; import org.json.simple.JSONObject; import org.json.simple.parser.JSONParser; diff --git a/common/src/main/java/com/dfsek/terra/api/gaea/structures/loot/Pool.java b/common/src/main/java/com/dfsek/terra/api/gaea/structures/loot/Pool.java index 1e8a2117e..926dfd8c9 100644 --- a/common/src/main/java/com/dfsek/terra/api/gaea/structures/loot/Pool.java +++ b/common/src/main/java/com/dfsek/terra/api/gaea/structures/loot/Pool.java @@ -2,8 +2,8 @@ package com.dfsek.terra.api.gaea.structures.loot; import com.dfsek.terra.api.gaea.math.ProbabilityCollection; import com.dfsek.terra.api.gaea.util.GlueList; -import com.dfsek.terra.api.generic.TerraPlugin; -import com.dfsek.terra.api.generic.inventory.ItemStack; +import com.dfsek.terra.api.platform.TerraPlugin; +import com.dfsek.terra.api.platform.inventory.ItemStack; import net.jafama.FastMath; import org.json.simple.JSONArray; import org.json.simple.JSONObject; diff --git a/common/src/main/java/com/dfsek/terra/api/gaea/structures/loot/functions/AmountFunction.java b/common/src/main/java/com/dfsek/terra/api/gaea/structures/loot/functions/AmountFunction.java index e93400a7d..a93f1b2fb 100644 --- a/common/src/main/java/com/dfsek/terra/api/gaea/structures/loot/functions/AmountFunction.java +++ b/common/src/main/java/com/dfsek/terra/api/gaea/structures/loot/functions/AmountFunction.java @@ -1,7 +1,7 @@ package com.dfsek.terra.api.gaea.structures.loot.functions; -import com.dfsek.terra.api.generic.inventory.ItemStack; +import com.dfsek.terra.api.platform.inventory.ItemStack; import java.util.Random; diff --git a/common/src/main/java/com/dfsek/terra/api/gaea/structures/loot/functions/DamageFunction.java b/common/src/main/java/com/dfsek/terra/api/gaea/structures/loot/functions/DamageFunction.java index ee9d3932b..04d57e22a 100644 --- a/common/src/main/java/com/dfsek/terra/api/gaea/structures/loot/functions/DamageFunction.java +++ b/common/src/main/java/com/dfsek/terra/api/gaea/structures/loot/functions/DamageFunction.java @@ -1,8 +1,8 @@ package com.dfsek.terra.api.gaea.structures.loot.functions; -import com.dfsek.terra.api.generic.inventory.ItemStack; -import com.dfsek.terra.api.generic.inventory.item.Damageable; -import com.dfsek.terra.api.generic.inventory.item.ItemMeta; +import com.dfsek.terra.api.platform.inventory.ItemStack; +import com.dfsek.terra.api.platform.inventory.item.Damageable; +import com.dfsek.terra.api.platform.inventory.item.ItemMeta; import java.util.Random; diff --git a/common/src/main/java/com/dfsek/terra/api/gaea/structures/loot/functions/Function.java b/common/src/main/java/com/dfsek/terra/api/gaea/structures/loot/functions/Function.java index ed1961390..a1aae5f75 100644 --- a/common/src/main/java/com/dfsek/terra/api/gaea/structures/loot/functions/Function.java +++ b/common/src/main/java/com/dfsek/terra/api/gaea/structures/loot/functions/Function.java @@ -1,7 +1,7 @@ package com.dfsek.terra.api.gaea.structures.loot.functions; -import com.dfsek.terra.api.generic.inventory.ItemStack; +import com.dfsek.terra.api.platform.inventory.ItemStack; import java.util.Random; diff --git a/common/src/main/java/com/dfsek/terra/api/gaea/tree/Tree.java b/common/src/main/java/com/dfsek/terra/api/gaea/tree/Tree.java deleted file mode 100644 index 5b78a34d4..000000000 --- a/common/src/main/java/com/dfsek/terra/api/gaea/tree/Tree.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.dfsek.terra.api.gaea.tree; - - -import com.dfsek.terra.api.generic.world.block.MaterialData; -import com.dfsek.terra.api.generic.world.vector.Location; - -import java.util.Random; -import java.util.Set; - -public interface Tree { - boolean plant(Location l, Random r); - - Set getSpawnable(); -} diff --git a/common/src/main/java/com/dfsek/terra/api/gaea/world/Flora.java b/common/src/main/java/com/dfsek/terra/api/gaea/world/Flora.java index bd1aa95ea..051302a47 100644 --- a/common/src/main/java/com/dfsek/terra/api/gaea/world/Flora.java +++ b/common/src/main/java/com/dfsek/terra/api/gaea/world/Flora.java @@ -1,9 +1,9 @@ package com.dfsek.terra.api.gaea.world; import com.dfsek.terra.api.gaea.math.Range; -import com.dfsek.terra.api.generic.world.Chunk; -import com.dfsek.terra.api.generic.world.block.Block; -import com.dfsek.terra.api.generic.world.vector.Location; +import com.dfsek.terra.api.platform.world.Chunk; +import com.dfsek.terra.api.platform.world.block.Block; +import com.dfsek.terra.api.platform.world.vector.Location; import java.util.List; diff --git a/common/src/main/java/com/dfsek/terra/api/generic/Tree.java b/common/src/main/java/com/dfsek/terra/api/generic/Tree.java deleted file mode 100644 index 5dadfb11d..000000000 --- a/common/src/main/java/com/dfsek/terra/api/generic/Tree.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.dfsek.terra.api.generic; - -public interface Tree extends Handle, com.dfsek.terra.api.gaea.tree.Tree { -} diff --git a/common/src/main/java/com/dfsek/terra/api/generic/generator/BlockPopulator.java b/common/src/main/java/com/dfsek/terra/api/generic/generator/BlockPopulator.java deleted file mode 100644 index 15591155f..000000000 --- a/common/src/main/java/com/dfsek/terra/api/generic/generator/BlockPopulator.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.dfsek.terra.api.generic.generator; - -import com.dfsek.terra.api.generic.Handle; -import com.dfsek.terra.api.generic.world.Chunk; -import com.dfsek.terra.api.generic.world.World; - -import java.util.Random; - -public interface BlockPopulator extends Handle { - void populate(World world, Random random, Chunk chunk); -} diff --git a/common/src/main/java/com/dfsek/terra/api/generic/generator/TerraBlockPopulator.java b/common/src/main/java/com/dfsek/terra/api/generic/generator/TerraBlockPopulator.java deleted file mode 100644 index bc6b6dfb8..000000000 --- a/common/src/main/java/com/dfsek/terra/api/generic/generator/TerraBlockPopulator.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.dfsek.terra.api.generic.generator; - -import com.dfsek.terra.api.generic.world.Chunk; -import com.dfsek.terra.api.generic.world.World; - -import java.util.Random; - -public interface TerraBlockPopulator { - void populate(World world, Random random, Chunk chunk); -} diff --git a/common/src/main/java/com/dfsek/terra/api/generic/inventory/ItemHandle.java b/common/src/main/java/com/dfsek/terra/api/generic/inventory/ItemHandle.java deleted file mode 100644 index d554cb169..000000000 --- a/common/src/main/java/com/dfsek/terra/api/generic/inventory/ItemHandle.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.dfsek.terra.api.generic.inventory; - -import com.dfsek.terra.api.generic.world.block.MaterialData; - -public interface ItemHandle { - ItemStack newItemStack(MaterialData material, int amount); -} diff --git a/common/src/main/java/com/dfsek/terra/api/generic/inventory/item/ItemMeta.java b/common/src/main/java/com/dfsek/terra/api/generic/inventory/item/ItemMeta.java deleted file mode 100644 index 3a6a89d9d..000000000 --- a/common/src/main/java/com/dfsek/terra/api/generic/inventory/item/ItemMeta.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.dfsek.terra.api.generic.inventory.item; - -import com.dfsek.terra.api.generic.Handle; - -public interface ItemMeta extends Handle { -} diff --git a/common/src/main/java/com/dfsek/terra/api/generic/world/Biome.java b/common/src/main/java/com/dfsek/terra/api/generic/world/Biome.java deleted file mode 100644 index 693972fed..000000000 --- a/common/src/main/java/com/dfsek/terra/api/generic/world/Biome.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.dfsek.terra.api.generic.world; - -import com.dfsek.terra.api.generic.Handle; - -public interface Biome extends Handle { -} diff --git a/common/src/main/java/com/dfsek/terra/api/generic/world/Chunk.java b/common/src/main/java/com/dfsek/terra/api/generic/world/Chunk.java deleted file mode 100644 index e83ef4ab5..000000000 --- a/common/src/main/java/com/dfsek/terra/api/generic/world/Chunk.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.dfsek.terra.api.generic.world; - -import com.dfsek.terra.api.generic.Handle; -import com.dfsek.terra.api.generic.world.block.Block; - -public interface Chunk extends Handle { - int getX(); - - int getZ(); - - World getWorld(); - - Block getBlock(int x, int y, int z); -} diff --git a/common/src/main/java/com/dfsek/terra/api/generic/world/block/Axis.java b/common/src/main/java/com/dfsek/terra/api/generic/world/block/Axis.java deleted file mode 100644 index e6de705b5..000000000 --- a/common/src/main/java/com/dfsek/terra/api/generic/world/block/Axis.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.dfsek.terra.api.generic.world.block; - -public enum Axis { - X, Y, Z -} diff --git a/common/src/main/java/com/dfsek/terra/api/generic/world/block/data/Directional.java b/common/src/main/java/com/dfsek/terra/api/generic/world/block/data/Directional.java deleted file mode 100644 index d7f5979a1..000000000 --- a/common/src/main/java/com/dfsek/terra/api/generic/world/block/data/Directional.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.dfsek.terra.api.generic.world.block.data; - -import com.dfsek.terra.api.generic.world.block.BlockData; -import com.dfsek.terra.api.generic.world.block.BlockFace; - -public interface Directional extends BlockData { - BlockFace getFacing(); - - void setFacing(BlockFace facing); -} diff --git a/common/src/main/java/com/dfsek/terra/api/generic/world/block/data/Orientable.java b/common/src/main/java/com/dfsek/terra/api/generic/world/block/data/Orientable.java deleted file mode 100644 index 4daf84992..000000000 --- a/common/src/main/java/com/dfsek/terra/api/generic/world/block/data/Orientable.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.dfsek.terra.api.generic.world.block.data; - -import com.dfsek.terra.api.generic.world.block.Axis; -import com.dfsek.terra.api.generic.world.block.BlockData; - -import java.util.Set; - -public interface Orientable extends BlockData { - Set getAxes(); - void setAxis(Axis axis); - Axis getAxis(); -} diff --git a/common/src/main/java/com/dfsek/terra/api/generic/world/block/data/Rotatable.java b/common/src/main/java/com/dfsek/terra/api/generic/world/block/data/Rotatable.java deleted file mode 100644 index 25842bec7..000000000 --- a/common/src/main/java/com/dfsek/terra/api/generic/world/block/data/Rotatable.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.dfsek.terra.api.generic.world.block.data; - -import com.dfsek.terra.api.generic.world.block.BlockData; -import com.dfsek.terra.api.generic.world.block.BlockFace; - -public interface Rotatable extends BlockData { - BlockFace getRotation(); - - void setRotation(BlockFace face); -} diff --git a/common/src/main/java/com/dfsek/terra/api/generic/world/block/state/BlockState.java b/common/src/main/java/com/dfsek/terra/api/generic/world/block/state/BlockState.java deleted file mode 100644 index d09ebc1e0..000000000 --- a/common/src/main/java/com/dfsek/terra/api/generic/world/block/state/BlockState.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.dfsek.terra.api.generic.world.block.state; - -public interface BlockState { -} diff --git a/common/src/main/java/com/dfsek/terra/api/generic/CommandSender.java b/common/src/main/java/com/dfsek/terra/api/platform/CommandSender.java similarity index 70% rename from common/src/main/java/com/dfsek/terra/api/generic/CommandSender.java rename to common/src/main/java/com/dfsek/terra/api/platform/CommandSender.java index 82a819579..5fd7d60a7 100644 --- a/common/src/main/java/com/dfsek/terra/api/generic/CommandSender.java +++ b/common/src/main/java/com/dfsek/terra/api/platform/CommandSender.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.api.generic; +package com.dfsek.terra.api.platform; public interface CommandSender extends Handle { void sendMessage(String message); diff --git a/common/src/main/java/com/dfsek/terra/api/generic/Entity.java b/common/src/main/java/com/dfsek/terra/api/platform/Entity.java similarity index 53% rename from common/src/main/java/com/dfsek/terra/api/generic/Entity.java rename to common/src/main/java/com/dfsek/terra/api/platform/Entity.java index 0ba6db725..b29d81bc6 100644 --- a/common/src/main/java/com/dfsek/terra/api/generic/Entity.java +++ b/common/src/main/java/com/dfsek/terra/api/platform/Entity.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.api.generic; +package com.dfsek.terra.api.platform; public interface Entity extends Handle { } diff --git a/common/src/main/java/com/dfsek/terra/api/generic/Handle.java b/common/src/main/java/com/dfsek/terra/api/platform/Handle.java similarity index 74% rename from common/src/main/java/com/dfsek/terra/api/generic/Handle.java rename to common/src/main/java/com/dfsek/terra/api/platform/Handle.java index 1df2e8946..e0419aca3 100644 --- a/common/src/main/java/com/dfsek/terra/api/generic/Handle.java +++ b/common/src/main/java/com/dfsek/terra/api/platform/Handle.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.api.generic; +package com.dfsek.terra.api.platform; /** * An interface that contains a platform delegate. diff --git a/common/src/main/java/com/dfsek/terra/api/generic/TerraPlugin.java b/common/src/main/java/com/dfsek/terra/api/platform/TerraPlugin.java similarity index 77% rename from common/src/main/java/com/dfsek/terra/api/generic/TerraPlugin.java rename to common/src/main/java/com/dfsek/terra/api/platform/TerraPlugin.java index 47c845f92..fcf5acf55 100644 --- a/common/src/main/java/com/dfsek/terra/api/generic/TerraPlugin.java +++ b/common/src/main/java/com/dfsek/terra/api/platform/TerraPlugin.java @@ -1,11 +1,11 @@ -package com.dfsek.terra.api.generic; +package com.dfsek.terra.api.platform; import com.dfsek.terra.TerraWorld; import com.dfsek.terra.api.LoaderRegistrar; import com.dfsek.terra.api.gaea.lang.Language; -import com.dfsek.terra.api.generic.inventory.ItemHandle; -import com.dfsek.terra.api.generic.world.World; -import com.dfsek.terra.api.generic.world.WorldHandle; +import com.dfsek.terra.api.platform.inventory.ItemHandle; +import com.dfsek.terra.api.platform.world.World; +import com.dfsek.terra.api.platform.world.WorldHandle; import com.dfsek.terra.config.base.PluginConfig; import com.dfsek.terra.registry.ConfigRegistry; diff --git a/common/src/main/java/com/dfsek/terra/api/platform/Tree.java b/common/src/main/java/com/dfsek/terra/api/platform/Tree.java new file mode 100644 index 000000000..a4f4a3d9e --- /dev/null +++ b/common/src/main/java/com/dfsek/terra/api/platform/Tree.java @@ -0,0 +1,4 @@ +package com.dfsek.terra.api.platform; + +public interface Tree extends Handle, com.dfsek.terra.api.world.tree.Tree { +} diff --git a/common/src/main/java/com/dfsek/terra/api/platform/generator/BlockPopulator.java b/common/src/main/java/com/dfsek/terra/api/platform/generator/BlockPopulator.java new file mode 100644 index 000000000..cebe7f3da --- /dev/null +++ b/common/src/main/java/com/dfsek/terra/api/platform/generator/BlockPopulator.java @@ -0,0 +1,11 @@ +package com.dfsek.terra.api.platform.generator; + +import com.dfsek.terra.api.platform.Handle; +import com.dfsek.terra.api.platform.world.Chunk; +import com.dfsek.terra.api.platform.world.World; + +import java.util.Random; + +public interface BlockPopulator extends Handle { + void populate(World world, Random random, Chunk chunk); +} diff --git a/common/src/main/java/com/dfsek/terra/api/generic/generator/ChunkGenerator.java b/common/src/main/java/com/dfsek/terra/api/platform/generator/ChunkGenerator.java similarity index 86% rename from common/src/main/java/com/dfsek/terra/api/generic/generator/ChunkGenerator.java rename to common/src/main/java/com/dfsek/terra/api/platform/generator/ChunkGenerator.java index 4b939c4ce..15a770772 100644 --- a/common/src/main/java/com/dfsek/terra/api/generic/generator/ChunkGenerator.java +++ b/common/src/main/java/com/dfsek/terra/api/platform/generator/ChunkGenerator.java @@ -1,9 +1,10 @@ -package com.dfsek.terra.api.generic.generator; +package com.dfsek.terra.api.platform.generator; -import com.dfsek.terra.api.generic.Handle; -import com.dfsek.terra.api.generic.world.BiomeGrid; -import com.dfsek.terra.api.generic.world.World; -import com.dfsek.terra.api.generic.world.block.BlockData; +import com.dfsek.terra.api.platform.Handle; +import com.dfsek.terra.api.platform.world.BiomeGrid; +import com.dfsek.terra.api.platform.world.World; +import com.dfsek.terra.api.platform.world.block.BlockData; +import com.dfsek.terra.api.world.generation.TerraChunkGenerator; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/common/src/main/java/com/dfsek/terra/api/generic/inventory/Inventory.java b/common/src/main/java/com/dfsek/terra/api/platform/inventory/Inventory.java similarity index 61% rename from common/src/main/java/com/dfsek/terra/api/generic/inventory/Inventory.java rename to common/src/main/java/com/dfsek/terra/api/platform/inventory/Inventory.java index ab6148c75..776a23614 100644 --- a/common/src/main/java/com/dfsek/terra/api/generic/inventory/Inventory.java +++ b/common/src/main/java/com/dfsek/terra/api/platform/inventory/Inventory.java @@ -1,6 +1,6 @@ -package com.dfsek.terra.api.generic.inventory; +package com.dfsek.terra.api.platform.inventory; -import com.dfsek.terra.api.generic.Handle; +import com.dfsek.terra.api.platform.Handle; public interface Inventory extends Handle { int getSize(); diff --git a/common/src/main/java/com/dfsek/terra/api/platform/inventory/ItemHandle.java b/common/src/main/java/com/dfsek/terra/api/platform/inventory/ItemHandle.java new file mode 100644 index 000000000..b77f8f707 --- /dev/null +++ b/common/src/main/java/com/dfsek/terra/api/platform/inventory/ItemHandle.java @@ -0,0 +1,7 @@ +package com.dfsek.terra.api.platform.inventory; + +import com.dfsek.terra.api.platform.world.block.MaterialData; + +public interface ItemHandle { + ItemStack newItemStack(MaterialData material, int amount); +} diff --git a/common/src/main/java/com/dfsek/terra/api/generic/inventory/ItemStack.java b/common/src/main/java/com/dfsek/terra/api/platform/inventory/ItemStack.java similarity index 51% rename from common/src/main/java/com/dfsek/terra/api/generic/inventory/ItemStack.java rename to common/src/main/java/com/dfsek/terra/api/platform/inventory/ItemStack.java index f6040bea1..9350ea6a6 100644 --- a/common/src/main/java/com/dfsek/terra/api/generic/inventory/ItemStack.java +++ b/common/src/main/java/com/dfsek/terra/api/platform/inventory/ItemStack.java @@ -1,8 +1,8 @@ -package com.dfsek.terra.api.generic.inventory; +package com.dfsek.terra.api.platform.inventory; -import com.dfsek.terra.api.generic.Handle; -import com.dfsek.terra.api.generic.inventory.item.ItemMeta; -import com.dfsek.terra.api.generic.world.block.MaterialData; +import com.dfsek.terra.api.platform.Handle; +import com.dfsek.terra.api.platform.inventory.item.ItemMeta; +import com.dfsek.terra.api.platform.world.block.MaterialData; public interface ItemStack extends Handle, Cloneable { int getAmount(); diff --git a/common/src/main/java/com/dfsek/terra/api/generic/inventory/item/Damageable.java b/common/src/main/java/com/dfsek/terra/api/platform/inventory/item/Damageable.java similarity index 62% rename from common/src/main/java/com/dfsek/terra/api/generic/inventory/item/Damageable.java rename to common/src/main/java/com/dfsek/terra/api/platform/inventory/item/Damageable.java index 35e97ac22..b4c6a5596 100644 --- a/common/src/main/java/com/dfsek/terra/api/generic/inventory/item/Damageable.java +++ b/common/src/main/java/com/dfsek/terra/api/platform/inventory/item/Damageable.java @@ -1,6 +1,6 @@ -package com.dfsek.terra.api.generic.inventory.item; +package com.dfsek.terra.api.platform.inventory.item; -import com.dfsek.terra.api.generic.Handle; +import com.dfsek.terra.api.platform.Handle; public interface Damageable extends Handle, Cloneable { Damageable clone(); diff --git a/common/src/main/java/com/dfsek/terra/api/platform/inventory/item/ItemMeta.java b/common/src/main/java/com/dfsek/terra/api/platform/inventory/item/ItemMeta.java new file mode 100644 index 000000000..6c20f2a4b --- /dev/null +++ b/common/src/main/java/com/dfsek/terra/api/platform/inventory/item/ItemMeta.java @@ -0,0 +1,6 @@ +package com.dfsek.terra.api.platform.inventory.item; + +import com.dfsek.terra.api.platform.Handle; + +public interface ItemMeta extends Handle { +} diff --git a/common/src/main/java/com/dfsek/terra/api/platform/world/Biome.java b/common/src/main/java/com/dfsek/terra/api/platform/world/Biome.java new file mode 100644 index 000000000..ec1b2060d --- /dev/null +++ b/common/src/main/java/com/dfsek/terra/api/platform/world/Biome.java @@ -0,0 +1,6 @@ +package com.dfsek.terra.api.platform.world; + +import com.dfsek.terra.api.platform.Handle; + +public interface Biome extends Handle { +} diff --git a/common/src/main/java/com/dfsek/terra/api/generic/world/BiomeGrid.java b/common/src/main/java/com/dfsek/terra/api/platform/world/BiomeGrid.java similarity index 91% rename from common/src/main/java/com/dfsek/terra/api/generic/world/BiomeGrid.java rename to common/src/main/java/com/dfsek/terra/api/platform/world/BiomeGrid.java index 5f6905441..0fe72dd42 100644 --- a/common/src/main/java/com/dfsek/terra/api/generic/world/BiomeGrid.java +++ b/common/src/main/java/com/dfsek/terra/api/platform/world/BiomeGrid.java @@ -1,6 +1,6 @@ -package com.dfsek.terra.api.generic.world; +package com.dfsek.terra.api.platform.world; -import com.dfsek.terra.api.generic.Handle; +import com.dfsek.terra.api.platform.Handle; import org.jetbrains.annotations.NotNull; public interface BiomeGrid extends Handle { diff --git a/common/src/main/java/com/dfsek/terra/api/platform/world/Chunk.java b/common/src/main/java/com/dfsek/terra/api/platform/world/Chunk.java new file mode 100644 index 000000000..81f5cf972 --- /dev/null +++ b/common/src/main/java/com/dfsek/terra/api/platform/world/Chunk.java @@ -0,0 +1,14 @@ +package com.dfsek.terra.api.platform.world; + +import com.dfsek.terra.api.platform.Handle; +import com.dfsek.terra.api.platform.world.block.Block; + +public interface Chunk extends Handle { + int getX(); + + int getZ(); + + World getWorld(); + + Block getBlock(int x, int y, int z); +} diff --git a/common/src/main/java/com/dfsek/terra/api/generic/world/World.java b/common/src/main/java/com/dfsek/terra/api/platform/world/World.java similarity index 64% rename from common/src/main/java/com/dfsek/terra/api/generic/world/World.java rename to common/src/main/java/com/dfsek/terra/api/platform/world/World.java index 402ac478e..d7833fa59 100644 --- a/common/src/main/java/com/dfsek/terra/api/generic/world/World.java +++ b/common/src/main/java/com/dfsek/terra/api/platform/world/World.java @@ -1,11 +1,11 @@ -package com.dfsek.terra.api.generic.world; +package com.dfsek.terra.api.platform.world; -import com.dfsek.terra.api.generic.Entity; -import com.dfsek.terra.api.generic.Handle; -import com.dfsek.terra.api.generic.Tree; -import com.dfsek.terra.api.generic.generator.ChunkGenerator; -import com.dfsek.terra.api.generic.world.block.Block; -import com.dfsek.terra.api.generic.world.vector.Location; +import com.dfsek.terra.api.platform.Entity; +import com.dfsek.terra.api.platform.Handle; +import com.dfsek.terra.api.platform.Tree; +import com.dfsek.terra.api.platform.generator.ChunkGenerator; +import com.dfsek.terra.api.platform.world.block.Block; +import com.dfsek.terra.api.platform.world.vector.Location; import java.io.File; import java.util.UUID; diff --git a/common/src/main/java/com/dfsek/terra/api/generic/world/WorldHandle.java b/common/src/main/java/com/dfsek/terra/api/platform/world/WorldHandle.java similarity index 58% rename from common/src/main/java/com/dfsek/terra/api/generic/world/WorldHandle.java rename to common/src/main/java/com/dfsek/terra/api/platform/world/WorldHandle.java index d438c5df3..397fc61f9 100644 --- a/common/src/main/java/com/dfsek/terra/api/generic/world/WorldHandle.java +++ b/common/src/main/java/com/dfsek/terra/api/platform/world/WorldHandle.java @@ -1,9 +1,9 @@ -package com.dfsek.terra.api.generic.world; +package com.dfsek.terra.api.platform.world; -import com.dfsek.terra.api.generic.Tree; -import com.dfsek.terra.api.generic.world.block.Block; -import com.dfsek.terra.api.generic.world.block.BlockData; -import com.dfsek.terra.api.generic.world.block.MaterialData; +import com.dfsek.terra.api.platform.Tree; +import com.dfsek.terra.api.platform.world.block.Block; +import com.dfsek.terra.api.platform.world.block.BlockData; +import com.dfsek.terra.api.platform.world.block.MaterialData; /** * Interface to be implemented for world manipulation. diff --git a/common/src/main/java/com/dfsek/terra/api/platform/world/block/Axis.java b/common/src/main/java/com/dfsek/terra/api/platform/world/block/Axis.java new file mode 100644 index 000000000..8a5b2d61d --- /dev/null +++ b/common/src/main/java/com/dfsek/terra/api/platform/world/block/Axis.java @@ -0,0 +1,5 @@ +package com.dfsek.terra.api.platform.world.block; + +public enum Axis { + X, Y, Z +} diff --git a/common/src/main/java/com/dfsek/terra/api/generic/world/block/Block.java b/common/src/main/java/com/dfsek/terra/api/platform/world/block/Block.java similarity index 71% rename from common/src/main/java/com/dfsek/terra/api/generic/world/block/Block.java rename to common/src/main/java/com/dfsek/terra/api/platform/world/block/Block.java index d72371bab..8eedc7495 100644 --- a/common/src/main/java/com/dfsek/terra/api/generic/world/block/Block.java +++ b/common/src/main/java/com/dfsek/terra/api/platform/world/block/Block.java @@ -1,7 +1,7 @@ -package com.dfsek.terra.api.generic.world.block; +package com.dfsek.terra.api.platform.world.block; -import com.dfsek.terra.api.generic.Handle; -import com.dfsek.terra.api.generic.world.vector.Location; +import com.dfsek.terra.api.platform.Handle; +import com.dfsek.terra.api.platform.world.vector.Location; public interface Block extends Handle { void setBlockData(BlockData data, boolean physics); diff --git a/common/src/main/java/com/dfsek/terra/api/generic/world/block/BlockData.java b/common/src/main/java/com/dfsek/terra/api/platform/world/block/BlockData.java similarity index 63% rename from common/src/main/java/com/dfsek/terra/api/generic/world/block/BlockData.java rename to common/src/main/java/com/dfsek/terra/api/platform/world/block/BlockData.java index 2a9d02fb1..fc73956ad 100644 --- a/common/src/main/java/com/dfsek/terra/api/generic/world/block/BlockData.java +++ b/common/src/main/java/com/dfsek/terra/api/platform/world/block/BlockData.java @@ -1,6 +1,6 @@ -package com.dfsek.terra.api.generic.world.block; +package com.dfsek.terra.api.platform.world.block; -import com.dfsek.terra.api.generic.Handle; +import com.dfsek.terra.api.platform.Handle; public interface BlockData extends Cloneable, Handle { MaterialData getMaterial(); diff --git a/common/src/main/java/com/dfsek/terra/api/generic/world/block/BlockFace.java b/common/src/main/java/com/dfsek/terra/api/platform/world/block/BlockFace.java similarity index 97% rename from common/src/main/java/com/dfsek/terra/api/generic/world/block/BlockFace.java rename to common/src/main/java/com/dfsek/terra/api/platform/world/block/BlockFace.java index d1f48544d..ad6032345 100644 --- a/common/src/main/java/com/dfsek/terra/api/generic/world/block/BlockFace.java +++ b/common/src/main/java/com/dfsek/terra/api/platform/world/block/BlockFace.java @@ -1,6 +1,6 @@ -package com.dfsek.terra.api.generic.world.block; +package com.dfsek.terra.api.platform.world.block; -import com.dfsek.terra.api.generic.world.vector.Vector3; +import com.dfsek.terra.api.platform.world.vector.Vector3; import org.jetbrains.annotations.NotNull; public enum BlockFace { diff --git a/common/src/main/java/com/dfsek/terra/api/generic/world/block/MaterialData.java b/common/src/main/java/com/dfsek/terra/api/platform/world/block/MaterialData.java similarity index 72% rename from common/src/main/java/com/dfsek/terra/api/generic/world/block/MaterialData.java rename to common/src/main/java/com/dfsek/terra/api/platform/world/block/MaterialData.java index 0180a65f0..db99a0e29 100644 --- a/common/src/main/java/com/dfsek/terra/api/generic/world/block/MaterialData.java +++ b/common/src/main/java/com/dfsek/terra/api/platform/world/block/MaterialData.java @@ -1,6 +1,6 @@ -package com.dfsek.terra.api.generic.world.block; +package com.dfsek.terra.api.platform.world.block; -import com.dfsek.terra.api.generic.Handle; +import com.dfsek.terra.api.platform.Handle; public interface MaterialData extends Handle { boolean matches(MaterialData other); diff --git a/common/src/main/java/com/dfsek/terra/api/generic/world/block/data/AnaloguePowerable.java b/common/src/main/java/com/dfsek/terra/api/platform/world/block/data/AnaloguePowerable.java similarity index 54% rename from common/src/main/java/com/dfsek/terra/api/generic/world/block/data/AnaloguePowerable.java rename to common/src/main/java/com/dfsek/terra/api/platform/world/block/data/AnaloguePowerable.java index d3b702234..af14b8f24 100644 --- a/common/src/main/java/com/dfsek/terra/api/generic/world/block/data/AnaloguePowerable.java +++ b/common/src/main/java/com/dfsek/terra/api/platform/world/block/data/AnaloguePowerable.java @@ -1,6 +1,6 @@ -package com.dfsek.terra.api.generic.world.block.data; +package com.dfsek.terra.api.platform.world.block.data; -import com.dfsek.terra.api.generic.world.block.BlockData; +import com.dfsek.terra.api.platform.world.block.BlockData; public interface AnaloguePowerable extends BlockData { int getMaximumPower(); diff --git a/common/src/main/java/com/dfsek/terra/api/generic/world/block/data/Bisected.java b/common/src/main/java/com/dfsek/terra/api/platform/world/block/data/Bisected.java similarity index 75% rename from common/src/main/java/com/dfsek/terra/api/generic/world/block/data/Bisected.java rename to common/src/main/java/com/dfsek/terra/api/platform/world/block/data/Bisected.java index 3c897f048..02eb2d86b 100644 --- a/common/src/main/java/com/dfsek/terra/api/generic/world/block/data/Bisected.java +++ b/common/src/main/java/com/dfsek/terra/api/platform/world/block/data/Bisected.java @@ -1,6 +1,6 @@ -package com.dfsek.terra.api.generic.world.block.data; +package com.dfsek.terra.api.platform.world.block.data; -import com.dfsek.terra.api.generic.world.block.BlockData; +import com.dfsek.terra.api.platform.world.block.BlockData; public interface Bisected extends BlockData { Half getHalf(); diff --git a/common/src/main/java/com/dfsek/terra/api/platform/world/block/data/Directional.java b/common/src/main/java/com/dfsek/terra/api/platform/world/block/data/Directional.java new file mode 100644 index 000000000..0ca549f47 --- /dev/null +++ b/common/src/main/java/com/dfsek/terra/api/platform/world/block/data/Directional.java @@ -0,0 +1,10 @@ +package com.dfsek.terra.api.platform.world.block.data; + +import com.dfsek.terra.api.platform.world.block.BlockData; +import com.dfsek.terra.api.platform.world.block.BlockFace; + +public interface Directional extends BlockData { + BlockFace getFacing(); + + void setFacing(BlockFace facing); +} diff --git a/common/src/main/java/com/dfsek/terra/api/generic/world/block/data/MultipleFacing.java b/common/src/main/java/com/dfsek/terra/api/platform/world/block/data/MultipleFacing.java similarity index 57% rename from common/src/main/java/com/dfsek/terra/api/generic/world/block/data/MultipleFacing.java rename to common/src/main/java/com/dfsek/terra/api/platform/world/block/data/MultipleFacing.java index 9caeea20b..c9982384c 100644 --- a/common/src/main/java/com/dfsek/terra/api/generic/world/block/data/MultipleFacing.java +++ b/common/src/main/java/com/dfsek/terra/api/platform/world/block/data/MultipleFacing.java @@ -1,7 +1,7 @@ -package com.dfsek.terra.api.generic.world.block.data; +package com.dfsek.terra.api.platform.world.block.data; -import com.dfsek.terra.api.generic.world.block.BlockData; -import com.dfsek.terra.api.generic.world.block.BlockFace; +import com.dfsek.terra.api.platform.world.block.BlockData; +import com.dfsek.terra.api.platform.world.block.BlockFace; import java.util.Set; diff --git a/common/src/main/java/com/dfsek/terra/api/platform/world/block/data/Orientable.java b/common/src/main/java/com/dfsek/terra/api/platform/world/block/data/Orientable.java new file mode 100644 index 000000000..91861f611 --- /dev/null +++ b/common/src/main/java/com/dfsek/terra/api/platform/world/block/data/Orientable.java @@ -0,0 +1,14 @@ +package com.dfsek.terra.api.platform.world.block.data; + +import com.dfsek.terra.api.platform.world.block.Axis; +import com.dfsek.terra.api.platform.world.block.BlockData; + +import java.util.Set; + +public interface Orientable extends BlockData { + Set getAxes(); + + Axis getAxis(); + + void setAxis(Axis axis); +} diff --git a/common/src/main/java/com/dfsek/terra/api/generic/world/block/data/Rail.java b/common/src/main/java/com/dfsek/terra/api/platform/world/block/data/Rail.java similarity index 75% rename from common/src/main/java/com/dfsek/terra/api/generic/world/block/data/Rail.java rename to common/src/main/java/com/dfsek/terra/api/platform/world/block/data/Rail.java index d0f9dc14c..b3e7d1275 100644 --- a/common/src/main/java/com/dfsek/terra/api/generic/world/block/data/Rail.java +++ b/common/src/main/java/com/dfsek/terra/api/platform/world/block/data/Rail.java @@ -1,6 +1,6 @@ -package com.dfsek.terra.api.generic.world.block.data; +package com.dfsek.terra.api.platform.world.block.data; -import com.dfsek.terra.api.generic.world.block.BlockData; +import com.dfsek.terra.api.platform.world.block.BlockData; public interface Rail extends BlockData { Shape getShape(); diff --git a/common/src/main/java/com/dfsek/terra/api/generic/world/block/data/RedstoneWire.java b/common/src/main/java/com/dfsek/terra/api/platform/world/block/data/RedstoneWire.java similarity index 61% rename from common/src/main/java/com/dfsek/terra/api/generic/world/block/data/RedstoneWire.java rename to common/src/main/java/com/dfsek/terra/api/platform/world/block/data/RedstoneWire.java index 8a680ecbc..fe11ac2b5 100644 --- a/common/src/main/java/com/dfsek/terra/api/generic/world/block/data/RedstoneWire.java +++ b/common/src/main/java/com/dfsek/terra/api/platform/world/block/data/RedstoneWire.java @@ -1,7 +1,7 @@ -package com.dfsek.terra.api.generic.world.block.data; +package com.dfsek.terra.api.platform.world.block.data; -import com.dfsek.terra.api.generic.world.block.BlockData; -import com.dfsek.terra.api.generic.world.block.BlockFace; +import com.dfsek.terra.api.platform.world.block.BlockData; +import com.dfsek.terra.api.platform.world.block.BlockFace; import java.util.Set; diff --git a/common/src/main/java/com/dfsek/terra/api/platform/world/block/data/Rotatable.java b/common/src/main/java/com/dfsek/terra/api/platform/world/block/data/Rotatable.java new file mode 100644 index 000000000..c2111889e --- /dev/null +++ b/common/src/main/java/com/dfsek/terra/api/platform/world/block/data/Rotatable.java @@ -0,0 +1,10 @@ +package com.dfsek.terra.api.platform.world.block.data; + +import com.dfsek.terra.api.platform.world.block.BlockData; +import com.dfsek.terra.api.platform.world.block.BlockFace; + +public interface Rotatable extends BlockData { + BlockFace getRotation(); + + void setRotation(BlockFace face); +} diff --git a/common/src/main/java/com/dfsek/terra/api/generic/world/block/data/Slab.java b/common/src/main/java/com/dfsek/terra/api/platform/world/block/data/Slab.java similarity index 72% rename from common/src/main/java/com/dfsek/terra/api/generic/world/block/data/Slab.java rename to common/src/main/java/com/dfsek/terra/api/platform/world/block/data/Slab.java index 6b5f241bf..f9e12cf94 100644 --- a/common/src/main/java/com/dfsek/terra/api/generic/world/block/data/Slab.java +++ b/common/src/main/java/com/dfsek/terra/api/platform/world/block/data/Slab.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.api.generic.world.block.data; +package com.dfsek.terra.api.platform.world.block.data; public interface Slab extends Waterlogged { Type getType(); diff --git a/common/src/main/java/com/dfsek/terra/api/generic/world/block/data/Stairs.java b/common/src/main/java/com/dfsek/terra/api/platform/world/block/data/Stairs.java similarity index 92% rename from common/src/main/java/com/dfsek/terra/api/generic/world/block/data/Stairs.java rename to common/src/main/java/com/dfsek/terra/api/platform/world/block/data/Stairs.java index 5ac6bfcfd..c79b79a9c 100644 --- a/common/src/main/java/com/dfsek/terra/api/generic/world/block/data/Stairs.java +++ b/common/src/main/java/com/dfsek/terra/api/platform/world/block/data/Stairs.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.api.generic.world.block.data; +package com.dfsek.terra.api.platform.world.block.data; public interface Stairs extends Waterlogged, Directional, Bisected { Shape getShape(); diff --git a/common/src/main/java/com/dfsek/terra/api/generic/world/block/data/Wall.java b/common/src/main/java/com/dfsek/terra/api/platform/world/block/data/Wall.java similarity index 58% rename from common/src/main/java/com/dfsek/terra/api/generic/world/block/data/Wall.java rename to common/src/main/java/com/dfsek/terra/api/platform/world/block/data/Wall.java index f52aa8fdc..bf9279fbd 100644 --- a/common/src/main/java/com/dfsek/terra/api/generic/world/block/data/Wall.java +++ b/common/src/main/java/com/dfsek/terra/api/platform/world/block/data/Wall.java @@ -1,7 +1,7 @@ -package com.dfsek.terra.api.generic.world.block.data; +package com.dfsek.terra.api.platform.world.block.data; -import com.dfsek.terra.api.generic.world.block.BlockData; -import com.dfsek.terra.api.generic.world.block.BlockFace; +import com.dfsek.terra.api.platform.world.block.BlockData; +import com.dfsek.terra.api.platform.world.block.BlockFace; public interface Wall extends BlockData, Waterlogged { boolean isUp(); diff --git a/common/src/main/java/com/dfsek/terra/api/generic/world/block/data/Waterlogged.java b/common/src/main/java/com/dfsek/terra/api/platform/world/block/data/Waterlogged.java similarity index 53% rename from common/src/main/java/com/dfsek/terra/api/generic/world/block/data/Waterlogged.java rename to common/src/main/java/com/dfsek/terra/api/platform/world/block/data/Waterlogged.java index da3caacf7..06e5c126c 100644 --- a/common/src/main/java/com/dfsek/terra/api/generic/world/block/data/Waterlogged.java +++ b/common/src/main/java/com/dfsek/terra/api/platform/world/block/data/Waterlogged.java @@ -1,6 +1,6 @@ -package com.dfsek.terra.api.generic.world.block.data; +package com.dfsek.terra.api.platform.world.block.data; -import com.dfsek.terra.api.generic.world.block.BlockData; +import com.dfsek.terra.api.platform.world.block.BlockData; public interface Waterlogged extends BlockData { boolean isWaterlogged(); diff --git a/common/src/main/java/com/dfsek/terra/api/platform/world/block/state/BlockState.java b/common/src/main/java/com/dfsek/terra/api/platform/world/block/state/BlockState.java new file mode 100644 index 000000000..6ef98f014 --- /dev/null +++ b/common/src/main/java/com/dfsek/terra/api/platform/world/block/state/BlockState.java @@ -0,0 +1,4 @@ +package com.dfsek.terra.api.platform.world.block.state; + +public interface BlockState { +} diff --git a/common/src/main/java/com/dfsek/terra/api/generic/world/vector/Location.java b/common/src/main/java/com/dfsek/terra/api/platform/world/vector/Location.java similarity index 92% rename from common/src/main/java/com/dfsek/terra/api/generic/world/vector/Location.java rename to common/src/main/java/com/dfsek/terra/api/platform/world/vector/Location.java index 4cd2f2265..fa46861ed 100644 --- a/common/src/main/java/com/dfsek/terra/api/generic/world/vector/Location.java +++ b/common/src/main/java/com/dfsek/terra/api/platform/world/vector/Location.java @@ -1,7 +1,7 @@ -package com.dfsek.terra.api.generic.world.vector; +package com.dfsek.terra.api.platform.world.vector; -import com.dfsek.terra.api.generic.world.World; -import com.dfsek.terra.api.generic.world.block.Block; +import com.dfsek.terra.api.platform.world.World; +import com.dfsek.terra.api.platform.world.block.Block; public class Location implements Cloneable { private World world; diff --git a/common/src/main/java/com/dfsek/terra/api/generic/world/vector/Vector2.java b/common/src/main/java/com/dfsek/terra/api/platform/world/vector/Vector2.java similarity index 98% rename from common/src/main/java/com/dfsek/terra/api/generic/world/vector/Vector2.java rename to common/src/main/java/com/dfsek/terra/api/platform/world/vector/Vector2.java index f98c2fb7a..52e8753fc 100644 --- a/common/src/main/java/com/dfsek/terra/api/generic/world/vector/Vector2.java +++ b/common/src/main/java/com/dfsek/terra/api/platform/world/vector/Vector2.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.api.generic.world.vector; +package com.dfsek.terra.api.platform.world.vector; import net.jafama.FastMath; diff --git a/common/src/main/java/com/dfsek/terra/api/generic/world/vector/Vector3.java b/common/src/main/java/com/dfsek/terra/api/platform/world/vector/Vector3.java similarity index 98% rename from common/src/main/java/com/dfsek/terra/api/generic/world/vector/Vector3.java rename to common/src/main/java/com/dfsek/terra/api/platform/world/vector/Vector3.java index d58ba3240..0363e95d5 100644 --- a/common/src/main/java/com/dfsek/terra/api/generic/world/vector/Vector3.java +++ b/common/src/main/java/com/dfsek/terra/api/platform/world/vector/Vector3.java @@ -1,6 +1,6 @@ -package com.dfsek.terra.api.generic.world.vector; +package com.dfsek.terra.api.platform.world.vector; -import com.dfsek.terra.api.generic.world.World; +import com.dfsek.terra.api.platform.world.World; import net.jafama.FastMath; import org.jetbrains.annotations.NotNull; diff --git a/common/src/main/java/com/dfsek/terra/api/gaea/biome/Biome.java b/common/src/main/java/com/dfsek/terra/api/world/biome/Biome.java similarity index 86% rename from common/src/main/java/com/dfsek/terra/api/gaea/biome/Biome.java rename to common/src/main/java/com/dfsek/terra/api/world/biome/Biome.java index d36a22e56..0bdfba763 100644 --- a/common/src/main/java/com/dfsek/terra/api/gaea/biome/Biome.java +++ b/common/src/main/java/com/dfsek/terra/api/world/biome/Biome.java @@ -1,7 +1,7 @@ -package com.dfsek.terra.api.gaea.biome; +package com.dfsek.terra.api.world.biome; -import com.dfsek.terra.api.generic.world.World; +import com.dfsek.terra.api.platform.world.World; /** * Interface to be implemented by a custom generator's Biome enum.
@@ -14,7 +14,7 @@ public interface Biome { * * @return Biome - The Vanilla biome. */ - com.dfsek.terra.api.generic.world.Biome getVanillaBiome(); + com.dfsek.terra.api.platform.world.Biome getVanillaBiome(); /** * Gets the BiomeTerrain instance used to generate the biome. diff --git a/common/src/main/java/com/dfsek/terra/api/gaea/biome/BiomeGrid.java b/common/src/main/java/com/dfsek/terra/api/world/biome/BiomeGrid.java similarity index 95% rename from common/src/main/java/com/dfsek/terra/api/gaea/biome/BiomeGrid.java rename to common/src/main/java/com/dfsek/terra/api/world/biome/BiomeGrid.java index 9c2bfc51d..4b5029872 100644 --- a/common/src/main/java/com/dfsek/terra/api/gaea/biome/BiomeGrid.java +++ b/common/src/main/java/com/dfsek/terra/api/world/biome/BiomeGrid.java @@ -1,8 +1,8 @@ -package com.dfsek.terra.api.gaea.biome; +package com.dfsek.terra.api.world.biome; -import com.dfsek.terra.api.gaea.generation.GenerationPhase; import com.dfsek.terra.api.gaea.math.FastNoiseLite; -import com.dfsek.terra.api.generic.world.vector.Location; +import com.dfsek.terra.api.platform.world.vector.Location; +import com.dfsek.terra.api.world.generation.GenerationPhase; public abstract class BiomeGrid { private final FastNoiseLite noiseX; diff --git a/common/src/main/java/com/dfsek/terra/api/gaea/biome/Decorator.java b/common/src/main/java/com/dfsek/terra/api/world/biome/Decorator.java similarity index 82% rename from common/src/main/java/com/dfsek/terra/api/gaea/biome/Decorator.java rename to common/src/main/java/com/dfsek/terra/api/world/biome/Decorator.java index 480dc96cb..c301a30ef 100644 --- a/common/src/main/java/com/dfsek/terra/api/gaea/biome/Decorator.java +++ b/common/src/main/java/com/dfsek/terra/api/world/biome/Decorator.java @@ -1,8 +1,8 @@ -package com.dfsek.terra.api.gaea.biome; +package com.dfsek.terra.api.world.biome; import com.dfsek.terra.api.gaea.math.ProbabilityCollection; -import com.dfsek.terra.api.gaea.tree.Tree; import com.dfsek.terra.api.gaea.world.Flora; +import com.dfsek.terra.api.world.tree.Tree; public abstract class Decorator { diff --git a/common/src/main/java/com/dfsek/terra/api/gaea/biome/Generator.java b/common/src/main/java/com/dfsek/terra/api/world/biome/Generator.java similarity index 84% rename from common/src/main/java/com/dfsek/terra/api/gaea/biome/Generator.java rename to common/src/main/java/com/dfsek/terra/api/world/biome/Generator.java index d11d26623..18b09aec2 100644 --- a/common/src/main/java/com/dfsek/terra/api/gaea/biome/Generator.java +++ b/common/src/main/java/com/dfsek/terra/api/world/biome/Generator.java @@ -1,9 +1,9 @@ -package com.dfsek.terra.api.gaea.biome; +package com.dfsek.terra.api.world.biome; import com.dfsek.terra.api.gaea.math.Interpolator; -import com.dfsek.terra.api.gaea.world.palette.Palette; -import com.dfsek.terra.api.generic.world.World; -import com.dfsek.terra.api.generic.world.block.BlockData; +import com.dfsek.terra.api.platform.world.World; +import com.dfsek.terra.api.platform.world.block.BlockData; +import com.dfsek.terra.api.world.palette.Palette; public abstract class Generator { /** diff --git a/common/src/main/java/com/dfsek/terra/api/gaea/biome/NormalizationUtil.java b/common/src/main/java/com/dfsek/terra/api/world/biome/NormalizationUtil.java similarity index 99% rename from common/src/main/java/com/dfsek/terra/api/gaea/biome/NormalizationUtil.java rename to common/src/main/java/com/dfsek/terra/api/world/biome/NormalizationUtil.java index 0943a70a9..8d277a275 100644 --- a/common/src/main/java/com/dfsek/terra/api/gaea/biome/NormalizationUtil.java +++ b/common/src/main/java/com/dfsek/terra/api/world/biome/NormalizationUtil.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.api.gaea.biome; +package com.dfsek.terra.api.world.biome; import net.jafama.FastMath; diff --git a/common/src/main/java/com/dfsek/terra/api/gaea/world/carving/Carver.java b/common/src/main/java/com/dfsek/terra/api/world/carving/Carver.java similarity index 93% rename from common/src/main/java/com/dfsek/terra/api/gaea/world/carving/Carver.java rename to common/src/main/java/com/dfsek/terra/api/world/carving/Carver.java index d85feafcd..39717170c 100644 --- a/common/src/main/java/com/dfsek/terra/api/gaea/world/carving/Carver.java +++ b/common/src/main/java/com/dfsek/terra/api/world/carving/Carver.java @@ -1,9 +1,9 @@ -package com.dfsek.terra.api.gaea.world.carving; +package com.dfsek.terra.api.world.carving; import com.dfsek.terra.api.gaea.math.MathUtil; import com.dfsek.terra.api.gaea.util.FastRandom; -import com.dfsek.terra.api.generic.world.World; -import com.dfsek.terra.api.generic.world.vector.Vector3; +import com.dfsek.terra.api.platform.world.World; +import com.dfsek.terra.api.platform.world.vector.Vector3; import net.jafama.FastMath; import java.util.Random; diff --git a/common/src/main/java/com/dfsek/terra/api/gaea/world/carving/Worm.java b/common/src/main/java/com/dfsek/terra/api/world/carving/Worm.java similarity index 97% rename from common/src/main/java/com/dfsek/terra/api/gaea/world/carving/Worm.java rename to common/src/main/java/com/dfsek/terra/api/world/carving/Worm.java index 62072db04..7cc0748de 100644 --- a/common/src/main/java/com/dfsek/terra/api/gaea/world/carving/Worm.java +++ b/common/src/main/java/com/dfsek/terra/api/world/carving/Worm.java @@ -1,6 +1,6 @@ -package com.dfsek.terra.api.gaea.world.carving; +package com.dfsek.terra.api.world.carving; -import com.dfsek.terra.api.generic.world.vector.Vector3; +import com.dfsek.terra.api.platform.world.vector.Vector3; import net.jafama.FastMath; import java.util.Random; diff --git a/common/src/main/java/com/dfsek/terra/api/gaea/generation/GenerationPhase.java b/common/src/main/java/com/dfsek/terra/api/world/generation/GenerationPhase.java similarity index 81% rename from common/src/main/java/com/dfsek/terra/api/gaea/generation/GenerationPhase.java rename to common/src/main/java/com/dfsek/terra/api/world/generation/GenerationPhase.java index 9ccfe22c1..6dfee8985 100644 --- a/common/src/main/java/com/dfsek/terra/api/gaea/generation/GenerationPhase.java +++ b/common/src/main/java/com/dfsek/terra/api/world/generation/GenerationPhase.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.api.gaea.generation; +package com.dfsek.terra.api.world.generation; /** * The phase of terrain generation. Used for modifying values based on the phase of generation. diff --git a/common/src/main/java/com/dfsek/terra/api/world/generation/TerraBlockPopulator.java b/common/src/main/java/com/dfsek/terra/api/world/generation/TerraBlockPopulator.java new file mode 100644 index 000000000..8797c924e --- /dev/null +++ b/common/src/main/java/com/dfsek/terra/api/world/generation/TerraBlockPopulator.java @@ -0,0 +1,10 @@ +package com.dfsek.terra.api.world.generation; + +import com.dfsek.terra.api.platform.world.Chunk; +import com.dfsek.terra.api.platform.world.World; + +import java.util.Random; + +public interface TerraBlockPopulator { + void populate(World world, Random random, Chunk chunk); +} diff --git a/common/src/main/java/com/dfsek/terra/api/generic/generator/TerraChunkGenerator.java b/common/src/main/java/com/dfsek/terra/api/world/generation/TerraChunkGenerator.java similarity index 71% rename from common/src/main/java/com/dfsek/terra/api/generic/generator/TerraChunkGenerator.java rename to common/src/main/java/com/dfsek/terra/api/world/generation/TerraChunkGenerator.java index 5f0b95e17..85d2cea78 100644 --- a/common/src/main/java/com/dfsek/terra/api/generic/generator/TerraChunkGenerator.java +++ b/common/src/main/java/com/dfsek/terra/api/world/generation/TerraChunkGenerator.java @@ -1,8 +1,9 @@ -package com.dfsek.terra.api.generic.generator; +package com.dfsek.terra.api.world.generation; -import com.dfsek.terra.api.generic.TerraPlugin; -import com.dfsek.terra.api.generic.world.BiomeGrid; -import com.dfsek.terra.api.generic.world.World; +import com.dfsek.terra.api.platform.TerraPlugin; +import com.dfsek.terra.api.platform.generator.ChunkGenerator; +import com.dfsek.terra.api.platform.world.BiomeGrid; +import com.dfsek.terra.api.platform.world.World; import com.dfsek.terra.config.base.ConfigPack; import org.jetbrains.annotations.NotNull; diff --git a/common/src/main/java/com/dfsek/terra/api/gaea/world/palette/Palette.java b/common/src/main/java/com/dfsek/terra/api/world/palette/Palette.java similarity index 92% rename from common/src/main/java/com/dfsek/terra/api/gaea/world/palette/Palette.java rename to common/src/main/java/com/dfsek/terra/api/world/palette/Palette.java index f708f028c..378213a60 100644 --- a/common/src/main/java/com/dfsek/terra/api/gaea/world/palette/Palette.java +++ b/common/src/main/java/com/dfsek/terra/api/world/palette/Palette.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.api.gaea.world.palette; +package com.dfsek.terra.api.world.palette; import com.dfsek.terra.api.gaea.math.FastNoiseLite; import com.dfsek.terra.api.gaea.math.ProbabilityCollection; @@ -28,7 +28,7 @@ public abstract class Palette { * @param layers - The number of layers the material occupies. * @return - BlockPalette instance for chaining. */ - public com.dfsek.terra.api.gaea.world.palette.Palette add(E m, int layers) { + public com.dfsek.terra.api.world.palette.Palette add(E m, int layers) { for(int i = 0; i < layers; i++) { pallet.add(new PaletteLayer<>(m)); } @@ -42,7 +42,7 @@ public abstract class Palette { * @param layers - The number of layers the material occupies. * @return - BlockPalette instance for chaining. */ - public com.dfsek.terra.api.gaea.world.palette.Palette add(ProbabilityCollection m, int layers) { + public com.dfsek.terra.api.world.palette.Palette add(ProbabilityCollection m, int layers) { for(int i = 0; i < layers; i++) { pallet.add(new PaletteLayer<>(m)); } diff --git a/common/src/main/java/com/dfsek/terra/api/gaea/world/palette/RandomPalette.java b/common/src/main/java/com/dfsek/terra/api/world/palette/RandomPalette.java similarity index 91% rename from common/src/main/java/com/dfsek/terra/api/gaea/world/palette/RandomPalette.java rename to common/src/main/java/com/dfsek/terra/api/world/palette/RandomPalette.java index 65f1e0498..88452d953 100644 --- a/common/src/main/java/com/dfsek/terra/api/gaea/world/palette/RandomPalette.java +++ b/common/src/main/java/com/dfsek/terra/api/world/palette/RandomPalette.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.api.gaea.world.palette; +package com.dfsek.terra.api.world.palette; import java.util.List; import java.util.Random; diff --git a/common/src/main/java/com/dfsek/terra/api/gaea/world/palette/SimplexPalette.java b/common/src/main/java/com/dfsek/terra/api/world/palette/SimplexPalette.java similarity index 92% rename from common/src/main/java/com/dfsek/terra/api/gaea/world/palette/SimplexPalette.java rename to common/src/main/java/com/dfsek/terra/api/world/palette/SimplexPalette.java index 3071b4a69..16c9552be 100644 --- a/common/src/main/java/com/dfsek/terra/api/gaea/world/palette/SimplexPalette.java +++ b/common/src/main/java/com/dfsek/terra/api/world/palette/SimplexPalette.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.api.gaea.world.palette; +package com.dfsek.terra.api.world.palette; import com.dfsek.terra.api.gaea.math.FastNoiseLite; diff --git a/common/src/main/java/com/dfsek/terra/api/world/tree/Tree.java b/common/src/main/java/com/dfsek/terra/api/world/tree/Tree.java new file mode 100644 index 000000000..98d23a7ff --- /dev/null +++ b/common/src/main/java/com/dfsek/terra/api/world/tree/Tree.java @@ -0,0 +1,14 @@ +package com.dfsek.terra.api.world.tree; + + +import com.dfsek.terra.api.platform.world.block.MaterialData; +import com.dfsek.terra.api.platform.world.vector.Location; + +import java.util.Random; +import java.util.Set; + +public interface Tree { + boolean plant(Location l, Random r); + + Set getSpawnable(); +} diff --git a/common/src/main/java/com/dfsek/terra/api/gaea/tree/fractal/EntitySpawnHolder.java b/common/src/main/java/com/dfsek/terra/api/world/tree/fractal/EntitySpawnHolder.java similarity index 78% rename from common/src/main/java/com/dfsek/terra/api/gaea/tree/fractal/EntitySpawnHolder.java rename to common/src/main/java/com/dfsek/terra/api/world/tree/fractal/EntitySpawnHolder.java index a2983e747..e32fda49c 100644 --- a/common/src/main/java/com/dfsek/terra/api/gaea/tree/fractal/EntitySpawnHolder.java +++ b/common/src/main/java/com/dfsek/terra/api/world/tree/fractal/EntitySpawnHolder.java @@ -1,7 +1,7 @@ -package com.dfsek.terra.api.gaea.tree.fractal; +package com.dfsek.terra.api.world.tree.fractal; -import com.dfsek.terra.api.generic.Entity; -import com.dfsek.terra.api.generic.world.vector.Location; +import com.dfsek.terra.api.platform.Entity; +import com.dfsek.terra.api.platform.world.vector.Location; import java.util.function.Consumer; diff --git a/common/src/main/java/com/dfsek/terra/api/gaea/tree/fractal/FractalTree.java b/common/src/main/java/com/dfsek/terra/api/world/tree/fractal/FractalTree.java similarity index 80% rename from common/src/main/java/com/dfsek/terra/api/gaea/tree/fractal/FractalTree.java rename to common/src/main/java/com/dfsek/terra/api/world/tree/fractal/FractalTree.java index 6fdf481ec..93398a6e2 100644 --- a/common/src/main/java/com/dfsek/terra/api/gaea/tree/fractal/FractalTree.java +++ b/common/src/main/java/com/dfsek/terra/api/world/tree/fractal/FractalTree.java @@ -1,9 +1,9 @@ -package com.dfsek.terra.api.gaea.tree.fractal; +package com.dfsek.terra.api.world.tree.fractal; -import com.dfsek.terra.api.generic.Entity; -import com.dfsek.terra.api.generic.TerraPlugin; -import com.dfsek.terra.api.generic.world.block.BlockData; -import com.dfsek.terra.api.generic.world.vector.Location; +import com.dfsek.terra.api.platform.Entity; +import com.dfsek.terra.api.platform.TerraPlugin; +import com.dfsek.terra.api.platform.world.block.BlockData; +import com.dfsek.terra.api.platform.world.vector.Location; import com.dfsek.terra.util.MaterialSet; import java.util.Random; diff --git a/common/src/main/java/com/dfsek/terra/api/gaea/tree/fractal/TreeGeometry.java b/common/src/main/java/com/dfsek/terra/api/world/tree/fractal/TreeGeometry.java similarity index 92% rename from common/src/main/java/com/dfsek/terra/api/gaea/tree/fractal/TreeGeometry.java rename to common/src/main/java/com/dfsek/terra/api/world/tree/fractal/TreeGeometry.java index 255e1d48a..50a75b583 100644 --- a/common/src/main/java/com/dfsek/terra/api/gaea/tree/fractal/TreeGeometry.java +++ b/common/src/main/java/com/dfsek/terra/api/world/tree/fractal/TreeGeometry.java @@ -1,9 +1,9 @@ -package com.dfsek.terra.api.gaea.tree.fractal; +package com.dfsek.terra.api.world.tree.fractal; import com.dfsek.terra.api.gaea.math.ProbabilityCollection; -import com.dfsek.terra.api.generic.world.block.BlockData; -import com.dfsek.terra.api.generic.world.vector.Location; -import com.dfsek.terra.api.generic.world.vector.Vector3; +import com.dfsek.terra.api.platform.world.block.BlockData; +import com.dfsek.terra.api.platform.world.vector.Location; +import com.dfsek.terra.api.platform.world.vector.Vector3; import java.util.Random; diff --git a/common/src/main/java/com/dfsek/terra/api/gaea/tree/fractal/trees/Cactus.java b/common/src/main/java/com/dfsek/terra/api/world/tree/fractal/trees/Cactus.java similarity index 75% rename from common/src/main/java/com/dfsek/terra/api/gaea/tree/fractal/trees/Cactus.java rename to common/src/main/java/com/dfsek/terra/api/world/tree/fractal/trees/Cactus.java index a0776c6b8..1e8f37202 100644 --- a/common/src/main/java/com/dfsek/terra/api/gaea/tree/fractal/trees/Cactus.java +++ b/common/src/main/java/com/dfsek/terra/api/world/tree/fractal/trees/Cactus.java @@ -1,9 +1,9 @@ -package com.dfsek.terra.api.gaea.tree.fractal.trees; +package com.dfsek.terra.api.world.tree.fractal.trees; -import com.dfsek.terra.api.gaea.tree.fractal.FractalTree; -import com.dfsek.terra.api.generic.TerraPlugin; -import com.dfsek.terra.api.generic.world.block.BlockData; -import com.dfsek.terra.api.generic.world.vector.Location; +import com.dfsek.terra.api.platform.TerraPlugin; +import com.dfsek.terra.api.platform.world.block.BlockData; +import com.dfsek.terra.api.platform.world.vector.Location; +import com.dfsek.terra.api.world.tree.fractal.FractalTree; import com.dfsek.terra.util.MaterialSet; import java.util.Random; diff --git a/common/src/main/java/com/dfsek/terra/api/gaea/tree/fractal/trees/IceSpike.java b/common/src/main/java/com/dfsek/terra/api/world/tree/fractal/trees/IceSpike.java similarity index 80% rename from common/src/main/java/com/dfsek/terra/api/gaea/tree/fractal/trees/IceSpike.java rename to common/src/main/java/com/dfsek/terra/api/world/tree/fractal/trees/IceSpike.java index be472aeeb..8e6a8c443 100644 --- a/common/src/main/java/com/dfsek/terra/api/gaea/tree/fractal/trees/IceSpike.java +++ b/common/src/main/java/com/dfsek/terra/api/world/tree/fractal/trees/IceSpike.java @@ -1,13 +1,13 @@ -package com.dfsek.terra.api.gaea.tree.fractal.trees; +package com.dfsek.terra.api.world.tree.fractal.trees; import com.dfsek.terra.api.gaea.math.ProbabilityCollection; -import com.dfsek.terra.api.gaea.tree.fractal.FractalTree; -import com.dfsek.terra.api.gaea.tree.fractal.TreeGeometry; -import com.dfsek.terra.api.generic.TerraPlugin; -import com.dfsek.terra.api.generic.world.WorldHandle; -import com.dfsek.terra.api.generic.world.block.BlockData; -import com.dfsek.terra.api.generic.world.vector.Location; -import com.dfsek.terra.api.generic.world.vector.Vector3; +import com.dfsek.terra.api.platform.TerraPlugin; +import com.dfsek.terra.api.platform.world.WorldHandle; +import com.dfsek.terra.api.platform.world.block.BlockData; +import com.dfsek.terra.api.platform.world.vector.Location; +import com.dfsek.terra.api.platform.world.vector.Vector3; +import com.dfsek.terra.api.world.tree.fractal.FractalTree; +import com.dfsek.terra.api.world.tree.fractal.TreeGeometry; import com.dfsek.terra.util.MaterialSet; import java.util.Random; diff --git a/common/src/main/java/com/dfsek/terra/api/gaea/tree/fractal/trees/OakTree.java b/common/src/main/java/com/dfsek/terra/api/world/tree/fractal/trees/OakTree.java similarity index 87% rename from common/src/main/java/com/dfsek/terra/api/gaea/tree/fractal/trees/OakTree.java rename to common/src/main/java/com/dfsek/terra/api/world/tree/fractal/trees/OakTree.java index 2086215f0..6f04e9c71 100644 --- a/common/src/main/java/com/dfsek/terra/api/gaea/tree/fractal/trees/OakTree.java +++ b/common/src/main/java/com/dfsek/terra/api/world/tree/fractal/trees/OakTree.java @@ -1,11 +1,11 @@ -package com.dfsek.terra.api.gaea.tree.fractal.trees; +package com.dfsek.terra.api.world.tree.fractal.trees; -import com.dfsek.terra.api.gaea.tree.fractal.FractalTree; -import com.dfsek.terra.api.gaea.tree.fractal.TreeGeometry; -import com.dfsek.terra.api.generic.TerraPlugin; -import com.dfsek.terra.api.generic.world.block.BlockData; -import com.dfsek.terra.api.generic.world.vector.Location; -import com.dfsek.terra.api.generic.world.vector.Vector3; +import com.dfsek.terra.api.platform.TerraPlugin; +import com.dfsek.terra.api.platform.world.block.BlockData; +import com.dfsek.terra.api.platform.world.vector.Location; +import com.dfsek.terra.api.platform.world.vector.Vector3; +import com.dfsek.terra.api.world.tree.fractal.FractalTree; +import com.dfsek.terra.api.world.tree.fractal.TreeGeometry; import com.dfsek.terra.util.MaterialSet; import net.jafama.FastMath; diff --git a/common/src/main/java/com/dfsek/terra/api/gaea/tree/fractal/trees/ShatteredPillar.java b/common/src/main/java/com/dfsek/terra/api/world/tree/fractal/trees/ShatteredPillar.java similarity index 86% rename from common/src/main/java/com/dfsek/terra/api/gaea/tree/fractal/trees/ShatteredPillar.java rename to common/src/main/java/com/dfsek/terra/api/world/tree/fractal/trees/ShatteredPillar.java index a883beb4f..3d5281200 100644 --- a/common/src/main/java/com/dfsek/terra/api/gaea/tree/fractal/trees/ShatteredPillar.java +++ b/common/src/main/java/com/dfsek/terra/api/world/tree/fractal/trees/ShatteredPillar.java @@ -1,9 +1,9 @@ -package com.dfsek.terra.api.gaea.tree.fractal.trees; +package com.dfsek.terra.api.world.tree.fractal.trees; -import com.dfsek.terra.api.gaea.tree.fractal.FractalTree; -import com.dfsek.terra.api.generic.TerraPlugin; -import com.dfsek.terra.api.generic.world.block.BlockData; -import com.dfsek.terra.api.generic.world.vector.Location; +import com.dfsek.terra.api.platform.TerraPlugin; +import com.dfsek.terra.api.platform.world.block.BlockData; +import com.dfsek.terra.api.platform.world.vector.Location; +import com.dfsek.terra.api.world.tree.fractal.FractalTree; import com.dfsek.terra.util.MaterialSet; import java.util.Random; diff --git a/common/src/main/java/com/dfsek/terra/api/gaea/tree/fractal/trees/ShatteredTree.java b/common/src/main/java/com/dfsek/terra/api/world/tree/fractal/trees/ShatteredTree.java similarity index 87% rename from common/src/main/java/com/dfsek/terra/api/gaea/tree/fractal/trees/ShatteredTree.java rename to common/src/main/java/com/dfsek/terra/api/world/tree/fractal/trees/ShatteredTree.java index b137dccb9..fffb78e1e 100644 --- a/common/src/main/java/com/dfsek/terra/api/gaea/tree/fractal/trees/ShatteredTree.java +++ b/common/src/main/java/com/dfsek/terra/api/world/tree/fractal/trees/ShatteredTree.java @@ -1,13 +1,13 @@ -package com.dfsek.terra.api.gaea.tree.fractal.trees; +package com.dfsek.terra.api.world.tree.fractal.trees; import com.dfsek.terra.api.gaea.math.ProbabilityCollection; -import com.dfsek.terra.api.gaea.tree.fractal.FractalTree; -import com.dfsek.terra.api.gaea.tree.fractal.TreeGeometry; -import com.dfsek.terra.api.generic.TerraPlugin; -import com.dfsek.terra.api.generic.world.WorldHandle; -import com.dfsek.terra.api.generic.world.block.BlockData; -import com.dfsek.terra.api.generic.world.vector.Location; -import com.dfsek.terra.api.generic.world.vector.Vector3; +import com.dfsek.terra.api.platform.TerraPlugin; +import com.dfsek.terra.api.platform.world.WorldHandle; +import com.dfsek.terra.api.platform.world.block.BlockData; +import com.dfsek.terra.api.platform.world.vector.Location; +import com.dfsek.terra.api.platform.world.vector.Vector3; +import com.dfsek.terra.api.world.tree.fractal.FractalTree; +import com.dfsek.terra.api.world.tree.fractal.TreeGeometry; import com.dfsek.terra.util.MaterialSet; import net.jafama.FastMath; diff --git a/common/src/main/java/com/dfsek/terra/api/gaea/tree/fractal/trees/SmallShatteredPillar.java b/common/src/main/java/com/dfsek/terra/api/world/tree/fractal/trees/SmallShatteredPillar.java similarity index 75% rename from common/src/main/java/com/dfsek/terra/api/gaea/tree/fractal/trees/SmallShatteredPillar.java rename to common/src/main/java/com/dfsek/terra/api/world/tree/fractal/trees/SmallShatteredPillar.java index 5104ae0e6..447547435 100644 --- a/common/src/main/java/com/dfsek/terra/api/gaea/tree/fractal/trees/SmallShatteredPillar.java +++ b/common/src/main/java/com/dfsek/terra/api/world/tree/fractal/trees/SmallShatteredPillar.java @@ -1,9 +1,9 @@ -package com.dfsek.terra.api.gaea.tree.fractal.trees; +package com.dfsek.terra.api.world.tree.fractal.trees; -import com.dfsek.terra.api.gaea.tree.fractal.FractalTree; -import com.dfsek.terra.api.generic.TerraPlugin; -import com.dfsek.terra.api.generic.world.block.BlockData; -import com.dfsek.terra.api.generic.world.vector.Location; +import com.dfsek.terra.api.platform.TerraPlugin; +import com.dfsek.terra.api.platform.world.block.BlockData; +import com.dfsek.terra.api.platform.world.vector.Location; +import com.dfsek.terra.api.world.tree.fractal.FractalTree; import com.dfsek.terra.util.MaterialSet; import java.util.Random; diff --git a/common/src/main/java/com/dfsek/terra/api/gaea/tree/fractal/trees/SmallShatteredTree.java b/common/src/main/java/com/dfsek/terra/api/world/tree/fractal/trees/SmallShatteredTree.java similarity index 87% rename from common/src/main/java/com/dfsek/terra/api/gaea/tree/fractal/trees/SmallShatteredTree.java rename to common/src/main/java/com/dfsek/terra/api/world/tree/fractal/trees/SmallShatteredTree.java index 3ad22b777..e6fc319e3 100644 --- a/common/src/main/java/com/dfsek/terra/api/gaea/tree/fractal/trees/SmallShatteredTree.java +++ b/common/src/main/java/com/dfsek/terra/api/world/tree/fractal/trees/SmallShatteredTree.java @@ -1,13 +1,13 @@ -package com.dfsek.terra.api.gaea.tree.fractal.trees; +package com.dfsek.terra.api.world.tree.fractal.trees; import com.dfsek.terra.api.gaea.math.ProbabilityCollection; -import com.dfsek.terra.api.gaea.tree.fractal.FractalTree; -import com.dfsek.terra.api.gaea.tree.fractal.TreeGeometry; -import com.dfsek.terra.api.generic.TerraPlugin; -import com.dfsek.terra.api.generic.world.WorldHandle; -import com.dfsek.terra.api.generic.world.block.BlockData; -import com.dfsek.terra.api.generic.world.vector.Location; -import com.dfsek.terra.api.generic.world.vector.Vector3; +import com.dfsek.terra.api.platform.TerraPlugin; +import com.dfsek.terra.api.platform.world.WorldHandle; +import com.dfsek.terra.api.platform.world.block.BlockData; +import com.dfsek.terra.api.platform.world.vector.Location; +import com.dfsek.terra.api.platform.world.vector.Vector3; +import com.dfsek.terra.api.world.tree.fractal.FractalTree; +import com.dfsek.terra.api.world.tree.fractal.TreeGeometry; import com.dfsek.terra.util.MaterialSet; import net.jafama.FastMath; diff --git a/common/src/main/java/com/dfsek/terra/api/gaea/tree/fractal/trees/SpruceTree.java b/common/src/main/java/com/dfsek/terra/api/world/tree/fractal/trees/SpruceTree.java similarity index 81% rename from common/src/main/java/com/dfsek/terra/api/gaea/tree/fractal/trees/SpruceTree.java rename to common/src/main/java/com/dfsek/terra/api/world/tree/fractal/trees/SpruceTree.java index 7bf002c06..bb38a51ca 100644 --- a/common/src/main/java/com/dfsek/terra/api/gaea/tree/fractal/trees/SpruceTree.java +++ b/common/src/main/java/com/dfsek/terra/api/world/tree/fractal/trees/SpruceTree.java @@ -1,11 +1,11 @@ -package com.dfsek.terra.api.gaea.tree.fractal.trees; +package com.dfsek.terra.api.world.tree.fractal.trees; -import com.dfsek.terra.api.gaea.tree.fractal.FractalTree; -import com.dfsek.terra.api.gaea.tree.fractal.TreeGeometry; -import com.dfsek.terra.api.generic.TerraPlugin; -import com.dfsek.terra.api.generic.world.block.BlockData; -import com.dfsek.terra.api.generic.world.vector.Location; -import com.dfsek.terra.api.generic.world.vector.Vector3; +import com.dfsek.terra.api.platform.TerraPlugin; +import com.dfsek.terra.api.platform.world.block.BlockData; +import com.dfsek.terra.api.platform.world.vector.Location; +import com.dfsek.terra.api.platform.world.vector.Vector3; +import com.dfsek.terra.api.world.tree.fractal.FractalTree; +import com.dfsek.terra.api.world.tree.fractal.TreeGeometry; import com.dfsek.terra.util.MaterialSet; import net.jafama.FastMath; diff --git a/common/src/main/java/com/dfsek/terra/async/AsyncBiomeFinder.java b/common/src/main/java/com/dfsek/terra/async/AsyncBiomeFinder.java index 22ddfd603..754898bf3 100644 --- a/common/src/main/java/com/dfsek/terra/async/AsyncBiomeFinder.java +++ b/common/src/main/java/com/dfsek/terra/async/AsyncBiomeFinder.java @@ -1,10 +1,10 @@ package com.dfsek.terra.async; -import com.dfsek.terra.api.gaea.biome.Biome; -import com.dfsek.terra.api.gaea.generation.GenerationPhase; -import com.dfsek.terra.api.generic.TerraPlugin; -import com.dfsek.terra.api.generic.world.vector.Location; -import com.dfsek.terra.api.generic.world.vector.Vector3; +import com.dfsek.terra.api.platform.TerraPlugin; +import com.dfsek.terra.api.platform.world.vector.Location; +import com.dfsek.terra.api.platform.world.vector.Vector3; +import com.dfsek.terra.api.world.biome.Biome; +import com.dfsek.terra.api.world.generation.GenerationPhase; import com.dfsek.terra.biome.grid.master.TerraBiomeGrid; import org.jetbrains.annotations.NotNull; diff --git a/common/src/main/java/com/dfsek/terra/async/AsyncFeatureFinder.java b/common/src/main/java/com/dfsek/terra/async/AsyncFeatureFinder.java index 9b6383134..38adb5cb5 100644 --- a/common/src/main/java/com/dfsek/terra/async/AsyncFeatureFinder.java +++ b/common/src/main/java/com/dfsek/terra/async/AsyncFeatureFinder.java @@ -1,9 +1,9 @@ package com.dfsek.terra.async; -import com.dfsek.terra.api.generic.TerraPlugin; -import com.dfsek.terra.api.generic.world.World; -import com.dfsek.terra.api.generic.world.vector.Location; -import com.dfsek.terra.api.generic.world.vector.Vector3; +import com.dfsek.terra.api.platform.TerraPlugin; +import com.dfsek.terra.api.platform.world.World; +import com.dfsek.terra.api.platform.world.vector.Location; +import com.dfsek.terra.api.platform.world.vector.Vector3; import com.dfsek.terra.biome.grid.master.TerraBiomeGrid; import org.jetbrains.annotations.NotNull; diff --git a/common/src/main/java/com/dfsek/terra/biome/BiomeZone.java b/common/src/main/java/com/dfsek/terra/biome/BiomeZone.java index d9535363b..684ddb2c3 100644 --- a/common/src/main/java/com/dfsek/terra/biome/BiomeZone.java +++ b/common/src/main/java/com/dfsek/terra/biome/BiomeZone.java @@ -1,8 +1,8 @@ package com.dfsek.terra.biome; -import com.dfsek.terra.api.gaea.biome.BiomeGrid; -import com.dfsek.terra.api.gaea.biome.NormalizationUtil; import com.dfsek.terra.api.gaea.math.FastNoiseLite; +import com.dfsek.terra.api.world.biome.BiomeGrid; +import com.dfsek.terra.api.world.biome.NormalizationUtil; import com.dfsek.terra.config.base.ConfigPack; import com.dfsek.terra.config.base.ConfigPackTemplate; import com.dfsek.terra.image.ImageLoader; diff --git a/common/src/main/java/com/dfsek/terra/biome/UserDefinedBiome.java b/common/src/main/java/com/dfsek/terra/biome/UserDefinedBiome.java index cbc77e328..4b74662e5 100644 --- a/common/src/main/java/com/dfsek/terra/biome/UserDefinedBiome.java +++ b/common/src/main/java/com/dfsek/terra/biome/UserDefinedBiome.java @@ -1,9 +1,9 @@ package com.dfsek.terra.biome; -import com.dfsek.terra.api.gaea.biome.Biome; -import com.dfsek.terra.api.gaea.biome.Decorator; -import com.dfsek.terra.api.gaea.biome.Generator; -import com.dfsek.terra.api.generic.world.World; +import com.dfsek.terra.api.platform.world.World; +import com.dfsek.terra.api.world.biome.Biome; +import com.dfsek.terra.api.world.biome.Decorator; +import com.dfsek.terra.api.world.biome.Generator; import com.dfsek.terra.config.base.ConfigPack; import com.dfsek.terra.config.builder.GeneratorBuilder; import com.dfsek.terra.config.templates.BiomeTemplate; @@ -15,14 +15,14 @@ import com.dfsek.terra.generation.UserDefinedDecorator; public class UserDefinedBiome implements Biome { private final GeneratorBuilder gen; private final UserDefinedDecorator decorator; - private final com.dfsek.terra.api.generic.world.Biome vanilla; + private final com.dfsek.terra.api.platform.world.Biome vanilla; private final String id; private final BiomeTemplate config; private final ConfigPack pack; private UserDefinedBiome erode; - public UserDefinedBiome(com.dfsek.terra.api.generic.world.Biome vanilla, UserDefinedDecorator dec, GeneratorBuilder gen, BiomeTemplate config, ConfigPack pack) { + public UserDefinedBiome(com.dfsek.terra.api.platform.world.Biome vanilla, UserDefinedDecorator dec, GeneratorBuilder gen, BiomeTemplate config, ConfigPack pack) { this.vanilla = vanilla; this.decorator = dec; this.gen = gen; @@ -37,7 +37,7 @@ public class UserDefinedBiome implements Biome { * @return Biome - The Vanilla biome. */ @Override - public com.dfsek.terra.api.generic.world.Biome getVanillaBiome() { + public com.dfsek.terra.api.platform.world.Biome getVanillaBiome() { return vanilla; } diff --git a/common/src/main/java/com/dfsek/terra/biome/grid/SingleBiomeGrid.java b/common/src/main/java/com/dfsek/terra/biome/grid/SingleBiomeGrid.java index ef203f355..7b35af473 100644 --- a/common/src/main/java/com/dfsek/terra/biome/grid/SingleBiomeGrid.java +++ b/common/src/main/java/com/dfsek/terra/biome/grid/SingleBiomeGrid.java @@ -1,9 +1,9 @@ package com.dfsek.terra.biome.grid; -import com.dfsek.terra.api.gaea.biome.Biome; -import com.dfsek.terra.api.gaea.biome.BiomeGrid; -import com.dfsek.terra.api.gaea.generation.GenerationPhase; -import com.dfsek.terra.api.generic.world.vector.Location; +import com.dfsek.terra.api.platform.world.vector.Location; +import com.dfsek.terra.api.world.biome.Biome; +import com.dfsek.terra.api.world.biome.BiomeGrid; +import com.dfsek.terra.api.world.generation.GenerationPhase; /** * BiomeGrid implementation that holds a single biome. diff --git a/common/src/main/java/com/dfsek/terra/biome/grid/UserDefinedGrid.java b/common/src/main/java/com/dfsek/terra/biome/grid/UserDefinedGrid.java index b86a55611..8794a4ded 100644 --- a/common/src/main/java/com/dfsek/terra/biome/grid/UserDefinedGrid.java +++ b/common/src/main/java/com/dfsek/terra/biome/grid/UserDefinedGrid.java @@ -1,10 +1,10 @@ package com.dfsek.terra.biome.grid; -import com.dfsek.terra.api.gaea.biome.Biome; -import com.dfsek.terra.api.gaea.biome.BiomeGrid; -import com.dfsek.terra.api.gaea.biome.NormalizationUtil; -import com.dfsek.terra.api.gaea.generation.GenerationPhase; -import com.dfsek.terra.api.generic.world.vector.Location; +import com.dfsek.terra.api.platform.world.vector.Location; +import com.dfsek.terra.api.world.biome.Biome; +import com.dfsek.terra.api.world.biome.BiomeGrid; +import com.dfsek.terra.api.world.biome.NormalizationUtil; +import com.dfsek.terra.api.world.generation.GenerationPhase; import com.dfsek.terra.config.base.ConfigPack; import com.dfsek.terra.config.base.ConfigPackTemplate; import com.dfsek.terra.image.ImageLoader; diff --git a/common/src/main/java/com/dfsek/terra/biome/grid/master/TerraBiomeGrid.java b/common/src/main/java/com/dfsek/terra/biome/grid/master/TerraBiomeGrid.java index 359118611..0a4713b2f 100644 --- a/common/src/main/java/com/dfsek/terra/biome/grid/master/TerraBiomeGrid.java +++ b/common/src/main/java/com/dfsek/terra/biome/grid/master/TerraBiomeGrid.java @@ -1,7 +1,7 @@ package com.dfsek.terra.biome.grid.master; -import com.dfsek.terra.api.gaea.biome.BiomeGrid; -import com.dfsek.terra.api.generic.TerraPlugin; +import com.dfsek.terra.api.platform.TerraPlugin; +import com.dfsek.terra.api.world.biome.BiomeGrid; import com.dfsek.terra.biome.BiomeZone; import com.dfsek.terra.biome.grid.UserDefinedGrid; import com.dfsek.terra.config.base.ConfigPack; diff --git a/common/src/main/java/com/dfsek/terra/biome/grid/master/TerraRadialBiomeGrid.java b/common/src/main/java/com/dfsek/terra/biome/grid/master/TerraRadialBiomeGrid.java index 047d9c4ec..fc673cd11 100644 --- a/common/src/main/java/com/dfsek/terra/biome/grid/master/TerraRadialBiomeGrid.java +++ b/common/src/main/java/com/dfsek/terra/biome/grid/master/TerraRadialBiomeGrid.java @@ -1,10 +1,10 @@ package com.dfsek.terra.biome.grid.master; -import com.dfsek.terra.api.gaea.biome.Biome; -import com.dfsek.terra.api.gaea.biome.BiomeGrid; -import com.dfsek.terra.api.gaea.generation.GenerationPhase; -import com.dfsek.terra.api.generic.world.vector.Location; -import com.dfsek.terra.api.generic.world.vector.Vector2; +import com.dfsek.terra.api.platform.world.vector.Location; +import com.dfsek.terra.api.platform.world.vector.Vector2; +import com.dfsek.terra.api.world.biome.Biome; +import com.dfsek.terra.api.world.biome.BiomeGrid; +import com.dfsek.terra.api.world.generation.GenerationPhase; import com.dfsek.terra.biome.BiomeZone; import com.dfsek.terra.biome.UserDefinedBiome; import com.dfsek.terra.biome.grid.UserDefinedGrid; diff --git a/common/src/main/java/com/dfsek/terra/biome/grid/master/TerraStandardBiomeGrid.java b/common/src/main/java/com/dfsek/terra/biome/grid/master/TerraStandardBiomeGrid.java index db5c730a9..b3250ef7c 100644 --- a/common/src/main/java/com/dfsek/terra/biome/grid/master/TerraStandardBiomeGrid.java +++ b/common/src/main/java/com/dfsek/terra/biome/grid/master/TerraStandardBiomeGrid.java @@ -1,9 +1,9 @@ package com.dfsek.terra.biome.grid.master; -import com.dfsek.terra.api.gaea.biome.Biome; -import com.dfsek.terra.api.gaea.generation.GenerationPhase; -import com.dfsek.terra.api.generic.world.vector.Location; -import com.dfsek.terra.api.generic.world.vector.Vector2; +import com.dfsek.terra.api.platform.world.vector.Location; +import com.dfsek.terra.api.platform.world.vector.Vector2; +import com.dfsek.terra.api.world.biome.Biome; +import com.dfsek.terra.api.world.generation.GenerationPhase; import com.dfsek.terra.biome.BiomeZone; import com.dfsek.terra.biome.UserDefinedBiome; import com.dfsek.terra.biome.grid.UserDefinedGrid; diff --git a/common/src/main/java/com/dfsek/terra/biome/palette/PaletteHolder.java b/common/src/main/java/com/dfsek/terra/biome/palette/PaletteHolder.java index 95230cce1..11c6142de 100644 --- a/common/src/main/java/com/dfsek/terra/biome/palette/PaletteHolder.java +++ b/common/src/main/java/com/dfsek/terra/biome/palette/PaletteHolder.java @@ -1,7 +1,7 @@ package com.dfsek.terra.biome.palette; -import com.dfsek.terra.api.gaea.world.palette.Palette; -import com.dfsek.terra.api.generic.world.block.BlockData; +import com.dfsek.terra.api.platform.world.block.BlockData; +import com.dfsek.terra.api.world.palette.Palette; public class PaletteHolder { private final Palette[] palettes; diff --git a/common/src/main/java/com/dfsek/terra/biome/palette/PaletteHolderBuilder.java b/common/src/main/java/com/dfsek/terra/biome/palette/PaletteHolderBuilder.java index db944f239..9d4068bab 100644 --- a/common/src/main/java/com/dfsek/terra/biome/palette/PaletteHolderBuilder.java +++ b/common/src/main/java/com/dfsek/terra/biome/palette/PaletteHolderBuilder.java @@ -1,7 +1,7 @@ package com.dfsek.terra.biome.palette; -import com.dfsek.terra.api.gaea.world.palette.Palette; -import com.dfsek.terra.api.generic.world.block.BlockData; +import com.dfsek.terra.api.platform.world.block.BlockData; +import com.dfsek.terra.api.world.palette.Palette; import net.jafama.FastMath; import java.util.Map; diff --git a/common/src/main/java/com/dfsek/terra/biome/palette/PaletteLayer.java b/common/src/main/java/com/dfsek/terra/biome/palette/PaletteLayer.java index 4b72a6226..ecd09c4cd 100644 --- a/common/src/main/java/com/dfsek/terra/biome/palette/PaletteLayer.java +++ b/common/src/main/java/com/dfsek/terra/biome/palette/PaletteLayer.java @@ -1,7 +1,7 @@ package com.dfsek.terra.biome.palette; import com.dfsek.terra.api.gaea.math.ProbabilityCollection; -import com.dfsek.terra.api.generic.world.block.BlockData; +import com.dfsek.terra.api.platform.world.block.BlockData; import org.jetbrains.annotations.NotNull; public class PaletteLayer { diff --git a/common/src/main/java/com/dfsek/terra/biome/palette/SinglePalette.java b/common/src/main/java/com/dfsek/terra/biome/palette/SinglePalette.java index 254e43c26..76e01281e 100644 --- a/common/src/main/java/com/dfsek/terra/biome/palette/SinglePalette.java +++ b/common/src/main/java/com/dfsek/terra/biome/palette/SinglePalette.java @@ -1,6 +1,6 @@ package com.dfsek.terra.biome.palette; -import com.dfsek.terra.api.gaea.world.palette.Palette; +import com.dfsek.terra.api.world.palette.Palette; public class SinglePalette extends Palette { private final E item; diff --git a/common/src/main/java/com/dfsek/terra/biome/postprocessing/CoordinatePerturb.java b/common/src/main/java/com/dfsek/terra/biome/postprocessing/CoordinatePerturb.java index 595cd31e8..f488b2df4 100644 --- a/common/src/main/java/com/dfsek/terra/biome/postprocessing/CoordinatePerturb.java +++ b/common/src/main/java/com/dfsek/terra/biome/postprocessing/CoordinatePerturb.java @@ -1,7 +1,7 @@ package com.dfsek.terra.biome.postprocessing; import com.dfsek.terra.api.gaea.math.FastNoiseLite; -import com.dfsek.terra.api.generic.world.vector.Vector2; +import com.dfsek.terra.api.platform.world.vector.Vector2; /** * Offset a coordinate pair by an amount. diff --git a/common/src/main/java/com/dfsek/terra/carving/CarverCache.java b/common/src/main/java/com/dfsek/terra/carving/CarverCache.java index 02c5040ab..78f731a0b 100644 --- a/common/src/main/java/com/dfsek/terra/carving/CarverCache.java +++ b/common/src/main/java/com/dfsek/terra/carving/CarverCache.java @@ -1,14 +1,14 @@ package com.dfsek.terra.carving; -import com.dfsek.terra.api.gaea.biome.Biome; -import com.dfsek.terra.api.gaea.generation.GenerationPhase; import com.dfsek.terra.api.gaea.math.MathUtil; import com.dfsek.terra.api.gaea.util.FastRandom; import com.dfsek.terra.api.gaea.util.GlueList; -import com.dfsek.terra.api.gaea.world.carving.Worm; -import com.dfsek.terra.api.generic.TerraPlugin; -import com.dfsek.terra.api.generic.world.World; -import com.dfsek.terra.api.generic.world.vector.Vector3; +import com.dfsek.terra.api.platform.TerraPlugin; +import com.dfsek.terra.api.platform.world.World; +import com.dfsek.terra.api.platform.world.vector.Vector3; +import com.dfsek.terra.api.world.biome.Biome; +import com.dfsek.terra.api.world.carving.Worm; +import com.dfsek.terra.api.world.generation.GenerationPhase; import com.dfsek.terra.biome.UserDefinedBiome; import com.dfsek.terra.biome.grid.master.TerraBiomeGrid; diff --git a/common/src/main/java/com/dfsek/terra/carving/CarverPalette.java b/common/src/main/java/com/dfsek/terra/carving/CarverPalette.java index afa30729a..98511814c 100644 --- a/common/src/main/java/com/dfsek/terra/carving/CarverPalette.java +++ b/common/src/main/java/com/dfsek/terra/carving/CarverPalette.java @@ -1,8 +1,8 @@ package com.dfsek.terra.carving; import com.dfsek.terra.api.gaea.math.ProbabilityCollection; -import com.dfsek.terra.api.generic.world.block.BlockData; -import com.dfsek.terra.api.generic.world.block.MaterialData; +import com.dfsek.terra.api.platform.world.block.BlockData; +import com.dfsek.terra.api.platform.world.block.MaterialData; import com.dfsek.terra.util.MaterialSet; import java.util.Map; diff --git a/common/src/main/java/com/dfsek/terra/carving/UserDefinedCarver.java b/common/src/main/java/com/dfsek/terra/carving/UserDefinedCarver.java index 2d78c2407..0a7fc66b1 100644 --- a/common/src/main/java/com/dfsek/terra/carving/UserDefinedCarver.java +++ b/common/src/main/java/com/dfsek/terra/carving/UserDefinedCarver.java @@ -1,13 +1,13 @@ package com.dfsek.terra.carving; -import com.dfsek.terra.api.gaea.generation.GenerationPhase; import com.dfsek.terra.api.gaea.math.Range; import com.dfsek.terra.api.gaea.util.FastRandom; -import com.dfsek.terra.api.gaea.world.carving.Carver; -import com.dfsek.terra.api.gaea.world.carving.Worm; -import com.dfsek.terra.api.generic.TerraPlugin; -import com.dfsek.terra.api.generic.world.World; -import com.dfsek.terra.api.generic.world.vector.Vector3; +import com.dfsek.terra.api.platform.TerraPlugin; +import com.dfsek.terra.api.platform.world.World; +import com.dfsek.terra.api.platform.world.vector.Vector3; +import com.dfsek.terra.api.world.carving.Carver; +import com.dfsek.terra.api.world.carving.Worm; +import com.dfsek.terra.api.world.generation.GenerationPhase; import com.dfsek.terra.biome.UserDefinedBiome; import com.dfsek.terra.config.templates.BiomeTemplate; import com.dfsek.terra.config.templates.CarverTemplate; diff --git a/common/src/main/java/com/dfsek/terra/config/base/ConfigPack.java b/common/src/main/java/com/dfsek/terra/config/base/ConfigPack.java index a3aceb438..1b60d7c83 100644 --- a/common/src/main/java/com/dfsek/terra/config/base/ConfigPack.java +++ b/common/src/main/java/com/dfsek/terra/config/base/ConfigPack.java @@ -6,12 +6,12 @@ import com.dfsek.tectonic.exception.LoadException; import com.dfsek.tectonic.loading.ConfigLoader; import com.dfsek.tectonic.loading.TypeRegistry; import com.dfsek.terra.api.LoaderRegistrar; -import com.dfsek.terra.api.gaea.biome.Biome; import com.dfsek.terra.api.gaea.structures.loot.LootTable; -import com.dfsek.terra.api.gaea.tree.Tree; import com.dfsek.terra.api.gaea.world.Flora; -import com.dfsek.terra.api.gaea.world.palette.Palette; -import com.dfsek.terra.api.generic.TerraPlugin; +import com.dfsek.terra.api.platform.TerraPlugin; +import com.dfsek.terra.api.world.biome.Biome; +import com.dfsek.terra.api.world.palette.Palette; +import com.dfsek.terra.api.world.tree.Tree; import com.dfsek.terra.biome.UserDefinedBiome; import com.dfsek.terra.biome.grid.master.TerraBiomeGrid; import com.dfsek.terra.carving.UserDefinedCarver; diff --git a/common/src/main/java/com/dfsek/terra/config/base/PluginConfig.java b/common/src/main/java/com/dfsek/terra/config/base/PluginConfig.java index d8f3de9dc..6e6405e3c 100644 --- a/common/src/main/java/com/dfsek/terra/config/base/PluginConfig.java +++ b/common/src/main/java/com/dfsek/terra/config/base/PluginConfig.java @@ -6,7 +6,7 @@ import com.dfsek.tectonic.config.ConfigTemplate; import com.dfsek.tectonic.exception.ConfigException; import com.dfsek.tectonic.loading.ConfigLoader; import com.dfsek.terra.api.gaea.util.JarUtil; -import com.dfsek.terra.api.generic.TerraPlugin; +import com.dfsek.terra.api.platform.TerraPlugin; import com.dfsek.terra.debug.Debug; import java.io.File; diff --git a/common/src/main/java/com/dfsek/terra/config/builder/biomegrid/BiomeGridBuilder.java b/common/src/main/java/com/dfsek/terra/config/builder/biomegrid/BiomeGridBuilder.java index e0c402088..7bd7fda29 100644 --- a/common/src/main/java/com/dfsek/terra/config/builder/biomegrid/BiomeGridBuilder.java +++ b/common/src/main/java/com/dfsek/terra/config/builder/biomegrid/BiomeGridBuilder.java @@ -1,6 +1,6 @@ package com.dfsek.terra.config.builder.biomegrid; -import com.dfsek.terra.api.gaea.biome.BiomeGrid; +import com.dfsek.terra.api.world.biome.BiomeGrid; import com.dfsek.terra.config.base.ConfigPack; public interface BiomeGridBuilder { diff --git a/common/src/main/java/com/dfsek/terra/config/builder/biomegrid/SingleGridBuilder.java b/common/src/main/java/com/dfsek/terra/config/builder/biomegrid/SingleGridBuilder.java index 8e03874a1..92b12caa2 100644 --- a/common/src/main/java/com/dfsek/terra/config/builder/biomegrid/SingleGridBuilder.java +++ b/common/src/main/java/com/dfsek/terra/config/builder/biomegrid/SingleGridBuilder.java @@ -1,6 +1,6 @@ package com.dfsek.terra.config.builder.biomegrid; -import com.dfsek.terra.api.gaea.biome.Biome; +import com.dfsek.terra.api.world.biome.Biome; import com.dfsek.terra.biome.grid.SingleBiomeGrid; import com.dfsek.terra.config.base.ConfigPack; diff --git a/common/src/main/java/com/dfsek/terra/config/builder/biomegrid/UserDefinedGridBuilder.java b/common/src/main/java/com/dfsek/terra/config/builder/biomegrid/UserDefinedGridBuilder.java index 0dbda3288..9c71fb1f2 100644 --- a/common/src/main/java/com/dfsek/terra/config/builder/biomegrid/UserDefinedGridBuilder.java +++ b/common/src/main/java/com/dfsek/terra/config/builder/biomegrid/UserDefinedGridBuilder.java @@ -1,6 +1,6 @@ package com.dfsek.terra.config.builder.biomegrid; -import com.dfsek.terra.api.gaea.biome.Biome; +import com.dfsek.terra.api.world.biome.Biome; import com.dfsek.terra.biome.grid.UserDefinedGrid; import com.dfsek.terra.config.base.ConfigPack; diff --git a/common/src/main/java/com/dfsek/terra/config/factories/BiomeFactory.java b/common/src/main/java/com/dfsek/terra/config/factories/BiomeFactory.java index 0648cabe9..4b0859672 100644 --- a/common/src/main/java/com/dfsek/terra/config/factories/BiomeFactory.java +++ b/common/src/main/java/com/dfsek/terra/config/factories/BiomeFactory.java @@ -1,7 +1,7 @@ package com.dfsek.terra.config.factories; import com.dfsek.terra.api.gaea.math.ProbabilityCollection; -import com.dfsek.terra.api.generic.TerraPlugin; +import com.dfsek.terra.api.platform.TerraPlugin; import com.dfsek.terra.biome.UserDefinedBiome; import com.dfsek.terra.config.base.ConfigPack; import com.dfsek.terra.config.builder.GeneratorBuilder; diff --git a/common/src/main/java/com/dfsek/terra/config/factories/BiomeGridFactory.java b/common/src/main/java/com/dfsek/terra/config/factories/BiomeGridFactory.java index b954f1bf1..b290b659e 100644 --- a/common/src/main/java/com/dfsek/terra/config/factories/BiomeGridFactory.java +++ b/common/src/main/java/com/dfsek/terra/config/factories/BiomeGridFactory.java @@ -1,7 +1,7 @@ package com.dfsek.terra.config.factories; -import com.dfsek.terra.api.gaea.biome.Biome; -import com.dfsek.terra.api.generic.TerraPlugin; +import com.dfsek.terra.api.platform.TerraPlugin; +import com.dfsek.terra.api.world.biome.Biome; import com.dfsek.terra.biome.UserDefinedBiome; import com.dfsek.terra.config.builder.biomegrid.BiomeGridBuilder; import com.dfsek.terra.config.builder.biomegrid.UserDefinedGridBuilder; diff --git a/common/src/main/java/com/dfsek/terra/config/factories/CarverFactory.java b/common/src/main/java/com/dfsek/terra/config/factories/CarverFactory.java index 92aea8bb8..54c33cbd6 100644 --- a/common/src/main/java/com/dfsek/terra/config/factories/CarverFactory.java +++ b/common/src/main/java/com/dfsek/terra/config/factories/CarverFactory.java @@ -2,7 +2,7 @@ package com.dfsek.terra.config.factories; import com.dfsek.tectonic.exception.LoadException; import com.dfsek.terra.api.gaea.math.MathUtil; -import com.dfsek.terra.api.generic.TerraPlugin; +import com.dfsek.terra.api.platform.TerraPlugin; import com.dfsek.terra.carving.UserDefinedCarver; import com.dfsek.terra.config.base.ConfigPack; import com.dfsek.terra.config.templates.CarverTemplate; diff --git a/common/src/main/java/com/dfsek/terra/config/factories/FloraFactory.java b/common/src/main/java/com/dfsek/terra/config/factories/FloraFactory.java index a1ee6bf81..5f42dda4d 100644 --- a/common/src/main/java/com/dfsek/terra/config/factories/FloraFactory.java +++ b/common/src/main/java/com/dfsek/terra/config/factories/FloraFactory.java @@ -2,10 +2,10 @@ package com.dfsek.terra.config.factories; import com.dfsek.terra.api.gaea.util.FastRandom; import com.dfsek.terra.api.gaea.world.Flora; -import com.dfsek.terra.api.gaea.world.palette.Palette; -import com.dfsek.terra.api.gaea.world.palette.RandomPalette; -import com.dfsek.terra.api.generic.TerraPlugin; -import com.dfsek.terra.api.generic.world.block.BlockData; +import com.dfsek.terra.api.platform.TerraPlugin; +import com.dfsek.terra.api.platform.world.block.BlockData; +import com.dfsek.terra.api.world.palette.Palette; +import com.dfsek.terra.api.world.palette.RandomPalette; import com.dfsek.terra.biome.palette.PaletteLayer; import com.dfsek.terra.config.templates.FloraTemplate; import com.dfsek.terra.generation.items.flora.TerraFlora; diff --git a/common/src/main/java/com/dfsek/terra/config/factories/OreFactory.java b/common/src/main/java/com/dfsek/terra/config/factories/OreFactory.java index a07f4847c..487477623 100644 --- a/common/src/main/java/com/dfsek/terra/config/factories/OreFactory.java +++ b/common/src/main/java/com/dfsek/terra/config/factories/OreFactory.java @@ -1,7 +1,7 @@ package com.dfsek.terra.config.factories; -import com.dfsek.terra.api.generic.TerraPlugin; -import com.dfsek.terra.api.generic.world.block.BlockData; +import com.dfsek.terra.api.platform.TerraPlugin; +import com.dfsek.terra.api.platform.world.block.BlockData; import com.dfsek.terra.config.templates.OreTemplate; import com.dfsek.terra.generation.items.ores.DeformedSphereOre; import com.dfsek.terra.generation.items.ores.Ore; diff --git a/common/src/main/java/com/dfsek/terra/config/factories/PaletteFactory.java b/common/src/main/java/com/dfsek/terra/config/factories/PaletteFactory.java index 9c889088e..1abc6a4cd 100644 --- a/common/src/main/java/com/dfsek/terra/config/factories/PaletteFactory.java +++ b/common/src/main/java/com/dfsek/terra/config/factories/PaletteFactory.java @@ -2,11 +2,11 @@ package com.dfsek.terra.config.factories; import com.dfsek.terra.api.gaea.math.FastNoiseLite; import com.dfsek.terra.api.gaea.util.FastRandom; -import com.dfsek.terra.api.gaea.world.palette.Palette; -import com.dfsek.terra.api.gaea.world.palette.RandomPalette; -import com.dfsek.terra.api.gaea.world.palette.SimplexPalette; -import com.dfsek.terra.api.generic.TerraPlugin; -import com.dfsek.terra.api.generic.world.block.BlockData; +import com.dfsek.terra.api.platform.TerraPlugin; +import com.dfsek.terra.api.platform.world.block.BlockData; +import com.dfsek.terra.api.world.palette.Palette; +import com.dfsek.terra.api.world.palette.RandomPalette; +import com.dfsek.terra.api.world.palette.SimplexPalette; import com.dfsek.terra.biome.palette.PaletteLayer; import com.dfsek.terra.config.templates.PaletteTemplate; diff --git a/common/src/main/java/com/dfsek/terra/config/factories/StructureFactory.java b/common/src/main/java/com/dfsek/terra/config/factories/StructureFactory.java index 7421eb8ba..0c8a65ce3 100644 --- a/common/src/main/java/com/dfsek/terra/config/factories/StructureFactory.java +++ b/common/src/main/java/com/dfsek/terra/config/factories/StructureFactory.java @@ -1,7 +1,7 @@ package com.dfsek.terra.config.factories; import com.dfsek.tectonic.exception.LoadException; -import com.dfsek.terra.api.generic.TerraPlugin; +import com.dfsek.terra.api.platform.TerraPlugin; import com.dfsek.terra.config.templates.StructureTemplate; import com.dfsek.terra.generation.items.TerraStructure; diff --git a/common/src/main/java/com/dfsek/terra/config/factories/TerraFactory.java b/common/src/main/java/com/dfsek/terra/config/factories/TerraFactory.java index 13049b1a5..485d7f8af 100644 --- a/common/src/main/java/com/dfsek/terra/config/factories/TerraFactory.java +++ b/common/src/main/java/com/dfsek/terra/config/factories/TerraFactory.java @@ -2,7 +2,7 @@ package com.dfsek.terra.config.factories; import com.dfsek.tectonic.config.ConfigTemplate; import com.dfsek.tectonic.exception.LoadException; -import com.dfsek.terra.api.generic.TerraPlugin; +import com.dfsek.terra.api.platform.TerraPlugin; public interface TerraFactory { O build(C config, TerraPlugin main) throws LoadException; diff --git a/common/src/main/java/com/dfsek/terra/config/factories/TreeFactory.java b/common/src/main/java/com/dfsek/terra/config/factories/TreeFactory.java index 01e0bc6df..3d1267036 100644 --- a/common/src/main/java/com/dfsek/terra/config/factories/TreeFactory.java +++ b/common/src/main/java/com/dfsek/terra/config/factories/TreeFactory.java @@ -1,8 +1,8 @@ package com.dfsek.terra.config.factories; import com.dfsek.tectonic.exception.LoadException; -import com.dfsek.terra.api.gaea.tree.Tree; -import com.dfsek.terra.api.generic.TerraPlugin; +import com.dfsek.terra.api.platform.TerraPlugin; +import com.dfsek.terra.api.world.tree.Tree; import com.dfsek.terra.config.templates.TreeTemplate; import com.dfsek.terra.generation.items.tree.TerraTree; diff --git a/common/src/main/java/com/dfsek/terra/config/lang/LangUtil.java b/common/src/main/java/com/dfsek/terra/config/lang/LangUtil.java index 8e01fcff5..1e77d26da 100644 --- a/common/src/main/java/com/dfsek/terra/config/lang/LangUtil.java +++ b/common/src/main/java/com/dfsek/terra/config/lang/LangUtil.java @@ -1,8 +1,8 @@ package com.dfsek.terra.config.lang; import com.dfsek.terra.api.gaea.lang.Language; -import com.dfsek.terra.api.generic.CommandSender; -import com.dfsek.terra.api.generic.TerraPlugin; +import com.dfsek.terra.api.platform.CommandSender; +import com.dfsek.terra.api.platform.TerraPlugin; import com.dfsek.terra.debug.Debug; import java.io.File; diff --git a/common/src/main/java/com/dfsek/terra/config/loaders/LootTableLoader.java b/common/src/main/java/com/dfsek/terra/config/loaders/LootTableLoader.java index cfa3dcb3e..f4c0c5ce0 100644 --- a/common/src/main/java/com/dfsek/terra/config/loaders/LootTableLoader.java +++ b/common/src/main/java/com/dfsek/terra/config/loaders/LootTableLoader.java @@ -4,7 +4,7 @@ import com.dfsek.tectonic.exception.LoadException; import com.dfsek.tectonic.loading.ConfigLoader; import com.dfsek.tectonic.loading.TypeLoader; import com.dfsek.terra.api.gaea.structures.loot.LootTable; -import com.dfsek.terra.api.generic.TerraPlugin; +import com.dfsek.terra.api.platform.TerraPlugin; import com.dfsek.terra.config.files.Loader; import org.apache.commons.io.IOUtils; import org.json.simple.parser.ParseException; diff --git a/common/src/main/java/com/dfsek/terra/config/loaders/MaterialSetLoader.java b/common/src/main/java/com/dfsek/terra/config/loaders/MaterialSetLoader.java index 3924521d1..1a0534454 100644 --- a/common/src/main/java/com/dfsek/terra/config/loaders/MaterialSetLoader.java +++ b/common/src/main/java/com/dfsek/terra/config/loaders/MaterialSetLoader.java @@ -3,7 +3,7 @@ package com.dfsek.terra.config.loaders; import com.dfsek.tectonic.exception.LoadException; import com.dfsek.tectonic.loading.ConfigLoader; import com.dfsek.tectonic.loading.TypeLoader; -import com.dfsek.terra.api.generic.world.block.MaterialData; +import com.dfsek.terra.api.platform.world.block.MaterialData; import com.dfsek.terra.util.MaterialSet; import java.lang.reflect.Type; diff --git a/common/src/main/java/com/dfsek/terra/config/loaders/Types.java b/common/src/main/java/com/dfsek/terra/config/loaders/Types.java index fdd0fefcb..1dd9f266f 100644 --- a/common/src/main/java/com/dfsek/terra/config/loaders/Types.java +++ b/common/src/main/java/com/dfsek/terra/config/loaders/Types.java @@ -1,11 +1,11 @@ package com.dfsek.terra.config.loaders; import com.dfsek.terra.api.gaea.math.ProbabilityCollection; -import com.dfsek.terra.api.gaea.tree.Tree; import com.dfsek.terra.api.gaea.world.Flora; -import com.dfsek.terra.api.gaea.world.palette.Palette; -import com.dfsek.terra.api.generic.world.block.BlockData; -import com.dfsek.terra.api.generic.world.block.MaterialData; +import com.dfsek.terra.api.platform.world.block.BlockData; +import com.dfsek.terra.api.platform.world.block.MaterialData; +import com.dfsek.terra.api.world.palette.Palette; +import com.dfsek.terra.api.world.tree.Tree; import java.lang.reflect.Type; import java.util.Set; diff --git a/common/src/main/java/com/dfsek/terra/config/loaders/config/TreeLayerLoader.java b/common/src/main/java/com/dfsek/terra/config/loaders/config/TreeLayerLoader.java index 66c17da32..754a5dac4 100644 --- a/common/src/main/java/com/dfsek/terra/config/loaders/config/TreeLayerLoader.java +++ b/common/src/main/java/com/dfsek/terra/config/loaders/config/TreeLayerLoader.java @@ -6,8 +6,8 @@ import com.dfsek.tectonic.loading.TypeLoader; import com.dfsek.terra.api.gaea.math.FastNoiseLite; import com.dfsek.terra.api.gaea.math.ProbabilityCollection; import com.dfsek.terra.api.gaea.math.Range; -import com.dfsek.terra.api.gaea.tree.Tree; -import com.dfsek.terra.api.generic.TerraPlugin; +import com.dfsek.terra.api.platform.TerraPlugin; +import com.dfsek.terra.api.world.tree.Tree; import com.dfsek.terra.config.loaders.Types; import com.dfsek.terra.generation.items.tree.TreeLayer; diff --git a/common/src/main/java/com/dfsek/terra/config/loaders/palette/CarverPaletteLoader.java b/common/src/main/java/com/dfsek/terra/config/loaders/palette/CarverPaletteLoader.java index 9fe397513..5b6ed4182 100644 --- a/common/src/main/java/com/dfsek/terra/config/loaders/palette/CarverPaletteLoader.java +++ b/common/src/main/java/com/dfsek/terra/config/loaders/palette/CarverPaletteLoader.java @@ -5,7 +5,7 @@ import com.dfsek.tectonic.exception.LoadException; import com.dfsek.tectonic.loading.ConfigLoader; import com.dfsek.tectonic.loading.TypeLoader; import com.dfsek.terra.api.gaea.math.ProbabilityCollection; -import com.dfsek.terra.api.generic.world.block.BlockData; +import com.dfsek.terra.api.platform.world.block.BlockData; import com.dfsek.terra.carving.CarverPalette; import com.dfsek.terra.config.loaders.Types; import com.dfsek.terra.util.MaterialSet; diff --git a/common/src/main/java/com/dfsek/terra/config/loaders/palette/PaletteHolderLoader.java b/common/src/main/java/com/dfsek/terra/config/loaders/palette/PaletteHolderLoader.java index 612877bd8..6df7319cb 100644 --- a/common/src/main/java/com/dfsek/terra/config/loaders/palette/PaletteHolderLoader.java +++ b/common/src/main/java/com/dfsek/terra/config/loaders/palette/PaletteHolderLoader.java @@ -3,8 +3,8 @@ package com.dfsek.terra.config.loaders.palette; import com.dfsek.tectonic.exception.LoadException; import com.dfsek.tectonic.loading.ConfigLoader; import com.dfsek.tectonic.loading.TypeLoader; -import com.dfsek.terra.api.gaea.world.palette.Palette; -import com.dfsek.terra.api.generic.world.block.BlockData; +import com.dfsek.terra.api.platform.world.block.BlockData; +import com.dfsek.terra.api.world.palette.Palette; import com.dfsek.terra.biome.palette.PaletteHolder; import com.dfsek.terra.biome.palette.PaletteHolderBuilder; import com.dfsek.terra.config.loaders.Types; diff --git a/common/src/main/java/com/dfsek/terra/config/loaders/palette/PaletteLayerLoader.java b/common/src/main/java/com/dfsek/terra/config/loaders/palette/PaletteLayerLoader.java index fc998ff5c..bfa0949d6 100644 --- a/common/src/main/java/com/dfsek/terra/config/loaders/palette/PaletteLayerLoader.java +++ b/common/src/main/java/com/dfsek/terra/config/loaders/palette/PaletteLayerLoader.java @@ -4,7 +4,7 @@ import com.dfsek.tectonic.exception.LoadException; import com.dfsek.tectonic.loading.ConfigLoader; import com.dfsek.tectonic.loading.TypeLoader; import com.dfsek.terra.api.gaea.math.ProbabilityCollection; -import com.dfsek.terra.api.generic.world.block.BlockData; +import com.dfsek.terra.api.platform.world.block.BlockData; import com.dfsek.terra.biome.palette.PaletteLayer; import com.dfsek.terra.config.loaders.Types; diff --git a/common/src/main/java/com/dfsek/terra/config/templates/BiomeGridTemplate.java b/common/src/main/java/com/dfsek/terra/config/templates/BiomeGridTemplate.java index 2ba67be40..885885c3e 100644 --- a/common/src/main/java/com/dfsek/terra/config/templates/BiomeGridTemplate.java +++ b/common/src/main/java/com/dfsek/terra/config/templates/BiomeGridTemplate.java @@ -2,7 +2,7 @@ package com.dfsek.terra.config.templates; import com.dfsek.tectonic.annotations.Abstractable; import com.dfsek.tectonic.annotations.Value; -import com.dfsek.terra.api.gaea.biome.Biome; +import com.dfsek.terra.api.world.biome.Biome; import java.util.List; diff --git a/common/src/main/java/com/dfsek/terra/config/templates/BiomeTemplate.java b/common/src/main/java/com/dfsek/terra/config/templates/BiomeTemplate.java index c037edf52..38fc7cdb1 100644 --- a/common/src/main/java/com/dfsek/terra/config/templates/BiomeTemplate.java +++ b/common/src/main/java/com/dfsek/terra/config/templates/BiomeTemplate.java @@ -6,11 +6,11 @@ import com.dfsek.tectonic.annotations.Value; import com.dfsek.tectonic.config.ValidatedConfigTemplate; import com.dfsek.tectonic.exception.ValidationException; import com.dfsek.terra.api.gaea.util.GlueList; -import com.dfsek.terra.api.gaea.world.palette.Palette; -import com.dfsek.terra.api.generic.TerraPlugin; -import com.dfsek.terra.api.generic.world.Biome; -import com.dfsek.terra.api.generic.world.block.BlockData; -import com.dfsek.terra.api.generic.world.block.MaterialData; +import com.dfsek.terra.api.platform.TerraPlugin; +import com.dfsek.terra.api.platform.world.Biome; +import com.dfsek.terra.api.platform.world.block.BlockData; +import com.dfsek.terra.api.platform.world.block.MaterialData; +import com.dfsek.terra.api.world.palette.Palette; import com.dfsek.terra.biome.palette.PaletteHolder; import com.dfsek.terra.biome.palette.SinglePalette; import com.dfsek.terra.carving.UserDefinedCarver; diff --git a/common/src/main/java/com/dfsek/terra/config/templates/CarverTemplate.java b/common/src/main/java/com/dfsek/terra/config/templates/CarverTemplate.java index 782d81355..c781c910e 100644 --- a/common/src/main/java/com/dfsek/terra/config/templates/CarverTemplate.java +++ b/common/src/main/java/com/dfsek/terra/config/templates/CarverTemplate.java @@ -4,7 +4,7 @@ import com.dfsek.tectonic.annotations.Abstractable; import com.dfsek.tectonic.annotations.Default; import com.dfsek.tectonic.annotations.Value; import com.dfsek.terra.api.gaea.math.Range; -import com.dfsek.terra.api.generic.world.block.MaterialData; +import com.dfsek.terra.api.platform.world.block.MaterialData; import com.dfsek.terra.carving.CarverPalette; import com.dfsek.terra.util.MaterialSet; diff --git a/common/src/main/java/com/dfsek/terra/config/templates/OreTemplate.java b/common/src/main/java/com/dfsek/terra/config/templates/OreTemplate.java index 20f6c7b1f..36a958207 100644 --- a/common/src/main/java/com/dfsek/terra/config/templates/OreTemplate.java +++ b/common/src/main/java/com/dfsek/terra/config/templates/OreTemplate.java @@ -4,7 +4,7 @@ import com.dfsek.tectonic.annotations.Abstractable; import com.dfsek.tectonic.annotations.Default; import com.dfsek.tectonic.annotations.Value; import com.dfsek.terra.api.gaea.math.Range; -import com.dfsek.terra.api.generic.world.block.BlockData; +import com.dfsek.terra.api.platform.world.block.BlockData; import com.dfsek.terra.generation.items.ores.Ore; import com.dfsek.terra.util.MaterialSet; diff --git a/common/src/main/java/com/dfsek/terra/debug/gui/DebugFrame.java b/common/src/main/java/com/dfsek/terra/debug/gui/DebugFrame.java index c89a2eb43..cce1b0a80 100644 --- a/common/src/main/java/com/dfsek/terra/debug/gui/DebugFrame.java +++ b/common/src/main/java/com/dfsek/terra/debug/gui/DebugFrame.java @@ -1,6 +1,6 @@ package com.dfsek.terra.debug.gui; -import com.dfsek.terra.api.generic.TerraPlugin; +import com.dfsek.terra.api.platform.TerraPlugin; import javax.swing.*; import java.awt.*; diff --git a/common/src/main/java/com/dfsek/terra/debug/gui/DebugGUI.java b/common/src/main/java/com/dfsek/terra/debug/gui/DebugGUI.java index c1e2e3144..77a22e76e 100644 --- a/common/src/main/java/com/dfsek/terra/debug/gui/DebugGUI.java +++ b/common/src/main/java/com/dfsek/terra/debug/gui/DebugGUI.java @@ -1,6 +1,6 @@ package com.dfsek.terra.debug.gui; -import com.dfsek.terra.api.generic.TerraPlugin; +import com.dfsek.terra.api.platform.TerraPlugin; import javax.swing.*; import java.awt.*; diff --git a/common/src/main/java/com/dfsek/terra/generation/ElevationInterpolator.java b/common/src/main/java/com/dfsek/terra/generation/ElevationInterpolator.java index 3269e3510..4a8d38489 100644 --- a/common/src/main/java/com/dfsek/terra/generation/ElevationInterpolator.java +++ b/common/src/main/java/com/dfsek/terra/generation/ElevationInterpolator.java @@ -1,7 +1,7 @@ package com.dfsek.terra.generation; -import com.dfsek.terra.api.gaea.generation.GenerationPhase; import com.dfsek.terra.api.gaea.math.Interpolator; +import com.dfsek.terra.api.world.generation.GenerationPhase; import com.dfsek.terra.biome.grid.master.TerraBiomeGrid; import com.dfsek.terra.generation.config.WorldGenerator; diff --git a/common/src/main/java/com/dfsek/terra/generation/TerraChunkGenerator.java b/common/src/main/java/com/dfsek/terra/generation/MasterChunkGenerator.java similarity index 89% rename from common/src/main/java/com/dfsek/terra/generation/TerraChunkGenerator.java rename to common/src/main/java/com/dfsek/terra/generation/MasterChunkGenerator.java index 9a17b02b3..fc822e326 100644 --- a/common/src/main/java/com/dfsek/terra/generation/TerraChunkGenerator.java +++ b/common/src/main/java/com/dfsek/terra/generation/MasterChunkGenerator.java @@ -1,23 +1,23 @@ package com.dfsek.terra.generation; import com.dfsek.terra.TerraWorld; -import com.dfsek.terra.api.gaea.biome.Biome; -import com.dfsek.terra.api.gaea.generation.GenerationPhase; import com.dfsek.terra.api.gaea.math.ChunkInterpolator3; import com.dfsek.terra.api.gaea.profiler.ProfileFuture; -import com.dfsek.terra.api.gaea.world.palette.Palette; -import com.dfsek.terra.api.generic.TerraPlugin; -import com.dfsek.terra.api.generic.generator.ChunkGenerator; -import com.dfsek.terra.api.generic.world.BiomeGrid; -import com.dfsek.terra.api.generic.world.World; -import com.dfsek.terra.api.generic.world.block.BlockData; -import com.dfsek.terra.api.generic.world.block.BlockFace; -import com.dfsek.terra.api.generic.world.block.MaterialData; -import com.dfsek.terra.api.generic.world.block.data.Bisected; -import com.dfsek.terra.api.generic.world.block.data.Slab; -import com.dfsek.terra.api.generic.world.block.data.Stairs; -import com.dfsek.terra.api.generic.world.block.data.Waterlogged; -import com.dfsek.terra.api.generic.world.vector.Vector3; +import com.dfsek.terra.api.platform.TerraPlugin; +import com.dfsek.terra.api.platform.generator.ChunkGenerator; +import com.dfsek.terra.api.platform.world.BiomeGrid; +import com.dfsek.terra.api.platform.world.World; +import com.dfsek.terra.api.platform.world.block.BlockData; +import com.dfsek.terra.api.platform.world.block.BlockFace; +import com.dfsek.terra.api.platform.world.block.MaterialData; +import com.dfsek.terra.api.platform.world.block.data.Bisected; +import com.dfsek.terra.api.platform.world.block.data.Slab; +import com.dfsek.terra.api.platform.world.block.data.Stairs; +import com.dfsek.terra.api.platform.world.block.data.Waterlogged; +import com.dfsek.terra.api.platform.world.vector.Vector3; +import com.dfsek.terra.api.world.biome.Biome; +import com.dfsek.terra.api.world.generation.GenerationPhase; +import com.dfsek.terra.api.world.palette.Palette; import com.dfsek.terra.biome.UserDefinedBiome; import com.dfsek.terra.biome.palette.SinglePalette; import com.dfsek.terra.config.base.ConfigPack; @@ -28,7 +28,7 @@ import org.jetbrains.annotations.NotNull; import java.util.Map; import java.util.Random; -public class TerraChunkGenerator implements com.dfsek.terra.api.generic.generator.TerraChunkGenerator { +public class MasterChunkGenerator implements com.dfsek.terra.api.world.generation.TerraChunkGenerator { private final ConfigPack configPack; @@ -37,7 +37,7 @@ public class TerraChunkGenerator implements com.dfsek.terra.api.generic.generato private final SinglePalette blank; - public TerraChunkGenerator(ConfigPack c, TerraPlugin main) { + public MasterChunkGenerator(ConfigPack c, TerraPlugin main) { this.configPack = c; this.main = main; water = main.getWorldHandle().createMaterialData("minecraft:water"); @@ -83,7 +83,7 @@ public class TerraChunkGenerator implements com.dfsek.terra.api.generic.generato @SuppressWarnings({"try"}) public ChunkGenerator.ChunkData generateChunkData(@NotNull World world, @NotNull Random random, int chunkX, int chunkZ, ChunkGenerator.ChunkData chunk) { TerraWorld tw = main.getWorld(world); - com.dfsek.terra.api.gaea.biome.BiomeGrid grid = tw.getGrid(); + com.dfsek.terra.api.world.biome.BiomeGrid grid = tw.getGrid(); try(ProfileFuture ignore = tw.getProfiler().measure("TotalChunkGenTime")) { ChunkInterpolator3 interp; try(ProfileFuture ignored = tw.getProfiler().measure("ChunkBaseGenTime")) { @@ -213,7 +213,7 @@ public class TerraChunkGenerator implements com.dfsek.terra.api.generic.generato public void generateBiomes(@NotNull World world, @NotNull Random random, int chunkX, int chunkZ, @NotNull BiomeGrid biome) { int xOrig = (chunkX << 4); int zOrig = (chunkZ << 4); - com.dfsek.terra.api.gaea.biome.BiomeGrid grid = main.getWorld(world).getGrid(); + com.dfsek.terra.api.world.biome.BiomeGrid grid = main.getWorld(world).getGrid(); for(int x = 0; x < 4; x++) { for(byte z = 0; z < 4; z++) { int cx = xOrig + (x << 2); diff --git a/common/src/main/java/com/dfsek/terra/generation/UserDefinedDecorator.java b/common/src/main/java/com/dfsek/terra/generation/UserDefinedDecorator.java index 15a59cb55..6d9a5336b 100644 --- a/common/src/main/java/com/dfsek/terra/generation/UserDefinedDecorator.java +++ b/common/src/main/java/com/dfsek/terra/generation/UserDefinedDecorator.java @@ -1,9 +1,9 @@ package com.dfsek.terra.generation; -import com.dfsek.terra.api.gaea.biome.Decorator; import com.dfsek.terra.api.gaea.math.ProbabilityCollection; -import com.dfsek.terra.api.gaea.tree.Tree; import com.dfsek.terra.api.gaea.world.Flora; +import com.dfsek.terra.api.world.biome.Decorator; +import com.dfsek.terra.api.world.tree.Tree; public class UserDefinedDecorator extends Decorator { diff --git a/common/src/main/java/com/dfsek/terra/generation/config/WorldGenerator.java b/common/src/main/java/com/dfsek/terra/generation/config/WorldGenerator.java index 2c2bb2ce6..7a3ef9214 100644 --- a/common/src/main/java/com/dfsek/terra/generation/config/WorldGenerator.java +++ b/common/src/main/java/com/dfsek/terra/generation/config/WorldGenerator.java @@ -1,10 +1,10 @@ package com.dfsek.terra.generation.config; -import com.dfsek.terra.api.gaea.biome.Generator; import com.dfsek.terra.api.gaea.math.Interpolator; -import com.dfsek.terra.api.gaea.world.palette.Palette; -import com.dfsek.terra.api.generic.world.World; -import com.dfsek.terra.api.generic.world.block.BlockData; +import com.dfsek.terra.api.platform.world.World; +import com.dfsek.terra.api.platform.world.block.BlockData; +import com.dfsek.terra.api.world.biome.Generator; +import com.dfsek.terra.api.world.palette.Palette; import com.dfsek.terra.biome.palette.PaletteHolder; import com.dfsek.terra.math.NoiseFunction2; import com.dfsek.terra.math.NoiseFunction3; diff --git a/common/src/main/java/com/dfsek/terra/generation/items/PlaceableLayer.java b/common/src/main/java/com/dfsek/terra/generation/items/PlaceableLayer.java index 77cdce7ed..65c5049f6 100644 --- a/common/src/main/java/com/dfsek/terra/generation/items/PlaceableLayer.java +++ b/common/src/main/java/com/dfsek/terra/generation/items/PlaceableLayer.java @@ -3,8 +3,8 @@ package com.dfsek.terra.generation.items; import com.dfsek.terra.api.gaea.math.FastNoiseLite; import com.dfsek.terra.api.gaea.math.ProbabilityCollection; import com.dfsek.terra.api.gaea.math.Range; -import com.dfsek.terra.api.generic.world.Chunk; -import com.dfsek.terra.api.generic.world.vector.Vector2; +import com.dfsek.terra.api.platform.world.Chunk; +import com.dfsek.terra.api.platform.world.vector.Vector2; import java.util.Random; diff --git a/common/src/main/java/com/dfsek/terra/generation/items/flora/BlockFlora.java b/common/src/main/java/com/dfsek/terra/generation/items/flora/BlockFlora.java index a8013e3d7..8d7fb72e6 100644 --- a/common/src/main/java/com/dfsek/terra/generation/items/flora/BlockFlora.java +++ b/common/src/main/java/com/dfsek/terra/generation/items/flora/BlockFlora.java @@ -3,11 +3,11 @@ package com.dfsek.terra.generation.items.flora; import com.dfsek.terra.api.gaea.math.Range; import com.dfsek.terra.api.gaea.util.GlueList; import com.dfsek.terra.api.gaea.world.Flora; -import com.dfsek.terra.api.generic.world.Chunk; -import com.dfsek.terra.api.generic.world.block.Block; -import com.dfsek.terra.api.generic.world.block.BlockData; -import com.dfsek.terra.api.generic.world.block.BlockFace; -import com.dfsek.terra.api.generic.world.vector.Location; +import com.dfsek.terra.api.platform.world.Chunk; +import com.dfsek.terra.api.platform.world.block.Block; +import com.dfsek.terra.api.platform.world.block.BlockData; +import com.dfsek.terra.api.platform.world.block.BlockFace; +import com.dfsek.terra.api.platform.world.vector.Location; import java.util.List; diff --git a/common/src/main/java/com/dfsek/terra/generation/items/flora/ConstantFlora.java b/common/src/main/java/com/dfsek/terra/generation/items/flora/ConstantFlora.java index a8c5d89e9..9c3dce121 100644 --- a/common/src/main/java/com/dfsek/terra/generation/items/flora/ConstantFlora.java +++ b/common/src/main/java/com/dfsek/terra/generation/items/flora/ConstantFlora.java @@ -3,11 +3,11 @@ package com.dfsek.terra.generation.items.flora; import com.dfsek.terra.api.gaea.math.Range; import com.dfsek.terra.api.gaea.util.GlueList; import com.dfsek.terra.api.gaea.world.Flora; -import com.dfsek.terra.api.generic.world.Chunk; -import com.dfsek.terra.api.generic.world.block.Block; -import com.dfsek.terra.api.generic.world.block.BlockData; -import com.dfsek.terra.api.generic.world.block.BlockFace; -import com.dfsek.terra.api.generic.world.vector.Location; +import com.dfsek.terra.api.platform.world.Chunk; +import com.dfsek.terra.api.platform.world.block.Block; +import com.dfsek.terra.api.platform.world.block.BlockData; +import com.dfsek.terra.api.platform.world.block.BlockFace; +import com.dfsek.terra.api.platform.world.vector.Location; import com.dfsek.terra.util.MaterialSet; import java.util.List; diff --git a/common/src/main/java/com/dfsek/terra/generation/items/flora/FloraLayer.java b/common/src/main/java/com/dfsek/terra/generation/items/flora/FloraLayer.java index 80812adcd..57dea8995 100644 --- a/common/src/main/java/com/dfsek/terra/generation/items/flora/FloraLayer.java +++ b/common/src/main/java/com/dfsek/terra/generation/items/flora/FloraLayer.java @@ -4,8 +4,8 @@ import com.dfsek.terra.api.gaea.math.FastNoiseLite; import com.dfsek.terra.api.gaea.math.ProbabilityCollection; import com.dfsek.terra.api.gaea.math.Range; import com.dfsek.terra.api.gaea.world.Flora; -import com.dfsek.terra.api.generic.world.Chunk; -import com.dfsek.terra.api.generic.world.vector.Vector2; +import com.dfsek.terra.api.platform.world.Chunk; +import com.dfsek.terra.api.platform.world.vector.Vector2; import com.dfsek.terra.generation.items.PlaceableLayer; import java.util.Random; diff --git a/common/src/main/java/com/dfsek/terra/generation/items/flora/TerraFlora.java b/common/src/main/java/com/dfsek/terra/generation/items/flora/TerraFlora.java index fb5e60ce8..06109bca6 100644 --- a/common/src/main/java/com/dfsek/terra/generation/items/flora/TerraFlora.java +++ b/common/src/main/java/com/dfsek/terra/generation/items/flora/TerraFlora.java @@ -4,17 +4,17 @@ import com.dfsek.terra.api.gaea.math.Range; import com.dfsek.terra.api.gaea.util.FastRandom; import com.dfsek.terra.api.gaea.util.GlueList; import com.dfsek.terra.api.gaea.world.Flora; -import com.dfsek.terra.api.gaea.world.palette.Palette; -import com.dfsek.terra.api.generic.TerraPlugin; -import com.dfsek.terra.api.generic.world.Chunk; -import com.dfsek.terra.api.generic.world.WorldHandle; -import com.dfsek.terra.api.generic.world.block.Block; -import com.dfsek.terra.api.generic.world.block.BlockData; -import com.dfsek.terra.api.generic.world.block.BlockFace; -import com.dfsek.terra.api.generic.world.block.data.Directional; -import com.dfsek.terra.api.generic.world.block.data.MultipleFacing; -import com.dfsek.terra.api.generic.world.block.data.Rotatable; -import com.dfsek.terra.api.generic.world.vector.Location; +import com.dfsek.terra.api.platform.TerraPlugin; +import com.dfsek.terra.api.platform.world.Chunk; +import com.dfsek.terra.api.platform.world.WorldHandle; +import com.dfsek.terra.api.platform.world.block.Block; +import com.dfsek.terra.api.platform.world.block.BlockData; +import com.dfsek.terra.api.platform.world.block.BlockFace; +import com.dfsek.terra.api.platform.world.block.data.Directional; +import com.dfsek.terra.api.platform.world.block.data.MultipleFacing; +import com.dfsek.terra.api.platform.world.block.data.Rotatable; +import com.dfsek.terra.api.platform.world.vector.Location; +import com.dfsek.terra.api.world.palette.Palette; import com.dfsek.terra.util.MaterialSet; import net.jafama.FastMath; diff --git a/common/src/main/java/com/dfsek/terra/generation/items/ores/DeformedSphereOre.java b/common/src/main/java/com/dfsek/terra/generation/items/ores/DeformedSphereOre.java index 027b1e160..070b26687 100644 --- a/common/src/main/java/com/dfsek/terra/generation/items/ores/DeformedSphereOre.java +++ b/common/src/main/java/com/dfsek/terra/generation/items/ores/DeformedSphereOre.java @@ -2,12 +2,12 @@ package com.dfsek.terra.generation.items.ores; import com.dfsek.terra.api.gaea.math.FastNoiseLite; import com.dfsek.terra.api.gaea.math.Range; -import com.dfsek.terra.api.generic.TerraPlugin; -import com.dfsek.terra.api.generic.world.Chunk; -import com.dfsek.terra.api.generic.world.WorldHandle; -import com.dfsek.terra.api.generic.world.block.Block; -import com.dfsek.terra.api.generic.world.block.BlockData; -import com.dfsek.terra.api.generic.world.vector.Vector3; +import com.dfsek.terra.api.platform.TerraPlugin; +import com.dfsek.terra.api.platform.world.Chunk; +import com.dfsek.terra.api.platform.world.WorldHandle; +import com.dfsek.terra.api.platform.world.block.Block; +import com.dfsek.terra.api.platform.world.block.BlockData; +import com.dfsek.terra.api.platform.world.vector.Vector3; import com.dfsek.terra.util.MaterialSet; import java.util.Random; diff --git a/common/src/main/java/com/dfsek/terra/generation/items/ores/Ore.java b/common/src/main/java/com/dfsek/terra/generation/items/ores/Ore.java index 1b47852c2..379bffc70 100644 --- a/common/src/main/java/com/dfsek/terra/generation/items/ores/Ore.java +++ b/common/src/main/java/com/dfsek/terra/generation/items/ores/Ore.java @@ -1,9 +1,9 @@ package com.dfsek.terra.generation.items.ores; -import com.dfsek.terra.api.generic.TerraPlugin; -import com.dfsek.terra.api.generic.world.Chunk; -import com.dfsek.terra.api.generic.world.block.BlockData; -import com.dfsek.terra.api.generic.world.vector.Vector3; +import com.dfsek.terra.api.platform.TerraPlugin; +import com.dfsek.terra.api.platform.world.Chunk; +import com.dfsek.terra.api.platform.world.block.BlockData; +import com.dfsek.terra.api.platform.world.vector.Vector3; import com.dfsek.terra.util.MaterialSet; import java.util.Random; diff --git a/common/src/main/java/com/dfsek/terra/generation/items/ores/VanillaOre.java b/common/src/main/java/com/dfsek/terra/generation/items/ores/VanillaOre.java index defb508e4..cf654d96f 100644 --- a/common/src/main/java/com/dfsek/terra/generation/items/ores/VanillaOre.java +++ b/common/src/main/java/com/dfsek/terra/generation/items/ores/VanillaOre.java @@ -1,12 +1,12 @@ package com.dfsek.terra.generation.items.ores; import com.dfsek.terra.api.gaea.math.Range; -import com.dfsek.terra.api.generic.TerraPlugin; -import com.dfsek.terra.api.generic.world.Chunk; -import com.dfsek.terra.api.generic.world.WorldHandle; -import com.dfsek.terra.api.generic.world.block.Block; -import com.dfsek.terra.api.generic.world.block.BlockData; -import com.dfsek.terra.api.generic.world.vector.Vector3; +import com.dfsek.terra.api.platform.TerraPlugin; +import com.dfsek.terra.api.platform.world.Chunk; +import com.dfsek.terra.api.platform.world.WorldHandle; +import com.dfsek.terra.api.platform.world.block.Block; +import com.dfsek.terra.api.platform.world.block.BlockData; +import com.dfsek.terra.api.platform.world.vector.Vector3; import com.dfsek.terra.util.MaterialSet; import net.jafama.FastMath; diff --git a/common/src/main/java/com/dfsek/terra/generation/items/tree/TerraTree.java b/common/src/main/java/com/dfsek/terra/generation/items/tree/TerraTree.java index 3176d3a6e..b97bb645f 100644 --- a/common/src/main/java/com/dfsek/terra/generation/items/tree/TerraTree.java +++ b/common/src/main/java/com/dfsek/terra/generation/items/tree/TerraTree.java @@ -1,9 +1,9 @@ package com.dfsek.terra.generation.items.tree; import com.dfsek.terra.api.gaea.math.ProbabilityCollection; -import com.dfsek.terra.api.gaea.tree.Tree; -import com.dfsek.terra.api.generic.TerraPlugin; -import com.dfsek.terra.api.generic.world.vector.Location; +import com.dfsek.terra.api.platform.TerraPlugin; +import com.dfsek.terra.api.platform.world.vector.Location; +import com.dfsek.terra.api.world.tree.Tree; import com.dfsek.terra.util.MaterialSet; import java.util.Random; diff --git a/common/src/main/java/com/dfsek/terra/generation/items/tree/TreeLayer.java b/common/src/main/java/com/dfsek/terra/generation/items/tree/TreeLayer.java index 29ddaa480..29eafb6aa 100644 --- a/common/src/main/java/com/dfsek/terra/generation/items/tree/TreeLayer.java +++ b/common/src/main/java/com/dfsek/terra/generation/items/tree/TreeLayer.java @@ -3,11 +3,11 @@ package com.dfsek.terra.generation.items.tree; import com.dfsek.terra.api.gaea.math.FastNoiseLite; import com.dfsek.terra.api.gaea.math.ProbabilityCollection; import com.dfsek.terra.api.gaea.math.Range; -import com.dfsek.terra.api.gaea.tree.Tree; -import com.dfsek.terra.api.generic.world.Chunk; -import com.dfsek.terra.api.generic.world.block.Block; -import com.dfsek.terra.api.generic.world.block.BlockFace; -import com.dfsek.terra.api.generic.world.vector.Vector2; +import com.dfsek.terra.api.platform.world.Chunk; +import com.dfsek.terra.api.platform.world.block.Block; +import com.dfsek.terra.api.platform.world.block.BlockFace; +import com.dfsek.terra.api.platform.world.vector.Vector2; +import com.dfsek.terra.api.world.tree.Tree; import com.dfsek.terra.generation.items.PlaceableLayer; import java.util.Random; diff --git a/common/src/main/java/com/dfsek/terra/image/ImageLoader.java b/common/src/main/java/com/dfsek/terra/image/ImageLoader.java index 70a1757f6..4b0836672 100644 --- a/common/src/main/java/com/dfsek/terra/image/ImageLoader.java +++ b/common/src/main/java/com/dfsek/terra/image/ImageLoader.java @@ -1,8 +1,8 @@ package com.dfsek.terra.image; -import com.dfsek.terra.api.gaea.biome.NormalizationUtil; -import com.dfsek.terra.api.generic.TerraPlugin; -import com.dfsek.terra.api.generic.world.World; +import com.dfsek.terra.api.platform.TerraPlugin; +import com.dfsek.terra.api.platform.world.World; +import com.dfsek.terra.api.world.biome.NormalizationUtil; import com.dfsek.terra.biome.BiomeZone; import com.dfsek.terra.biome.grid.master.TerraBiomeGrid; import com.dfsek.terra.debug.gui.DebugGUI; diff --git a/common/src/main/java/com/dfsek/terra/image/WorldImageGenerator.java b/common/src/main/java/com/dfsek/terra/image/WorldImageGenerator.java index 9c06ba049..3e3d0d8c5 100644 --- a/common/src/main/java/com/dfsek/terra/image/WorldImageGenerator.java +++ b/common/src/main/java/com/dfsek/terra/image/WorldImageGenerator.java @@ -1,9 +1,9 @@ package com.dfsek.terra.image; import com.dfsek.terra.TerraWorld; -import com.dfsek.terra.api.gaea.biome.NormalizationUtil; -import com.dfsek.terra.api.generic.TerraPlugin; -import com.dfsek.terra.api.generic.world.World; +import com.dfsek.terra.api.platform.TerraPlugin; +import com.dfsek.terra.api.platform.world.World; +import com.dfsek.terra.api.world.biome.NormalizationUtil; import com.dfsek.terra.biome.grid.master.TerraBiomeGrid; import javax.imageio.ImageIO; diff --git a/common/src/main/java/com/dfsek/terra/population/CavePopulator.java b/common/src/main/java/com/dfsek/terra/population/CavePopulator.java index 4b977fc83..bf5f83b72 100644 --- a/common/src/main/java/com/dfsek/terra/population/CavePopulator.java +++ b/common/src/main/java/com/dfsek/terra/population/CavePopulator.java @@ -2,15 +2,15 @@ package com.dfsek.terra.population; import com.dfsek.terra.TerraWorld; import com.dfsek.terra.api.gaea.profiler.ProfileFuture; -import com.dfsek.terra.api.generic.TerraPlugin; -import com.dfsek.terra.api.generic.generator.TerraBlockPopulator; -import com.dfsek.terra.api.generic.world.Chunk; -import com.dfsek.terra.api.generic.world.World; -import com.dfsek.terra.api.generic.world.WorldHandle; -import com.dfsek.terra.api.generic.world.block.Block; -import com.dfsek.terra.api.generic.world.block.BlockData; -import com.dfsek.terra.api.generic.world.block.MaterialData; -import com.dfsek.terra.api.generic.world.vector.Location; +import com.dfsek.terra.api.platform.TerraPlugin; +import com.dfsek.terra.api.platform.world.Chunk; +import com.dfsek.terra.api.platform.world.World; +import com.dfsek.terra.api.platform.world.WorldHandle; +import com.dfsek.terra.api.platform.world.block.Block; +import com.dfsek.terra.api.platform.world.block.BlockData; +import com.dfsek.terra.api.platform.world.block.MaterialData; +import com.dfsek.terra.api.platform.world.vector.Location; +import com.dfsek.terra.api.world.generation.TerraBlockPopulator; import com.dfsek.terra.carving.UserDefinedCarver; import com.dfsek.terra.config.base.ConfigPack; import com.dfsek.terra.config.templates.CarverTemplate; diff --git a/common/src/main/java/com/dfsek/terra/population/FloraPopulator.java b/common/src/main/java/com/dfsek/terra/population/FloraPopulator.java index 75cf94cfd..7d54b761d 100644 --- a/common/src/main/java/com/dfsek/terra/population/FloraPopulator.java +++ b/common/src/main/java/com/dfsek/terra/population/FloraPopulator.java @@ -1,13 +1,13 @@ package com.dfsek.terra.population; import com.dfsek.terra.TerraWorld; -import com.dfsek.terra.api.gaea.generation.GenerationPhase; import com.dfsek.terra.api.gaea.profiler.ProfileFuture; -import com.dfsek.terra.api.generic.TerraPlugin; -import com.dfsek.terra.api.generic.generator.TerraBlockPopulator; -import com.dfsek.terra.api.generic.world.Chunk; -import com.dfsek.terra.api.generic.world.World; -import com.dfsek.terra.api.generic.world.vector.Vector2; +import com.dfsek.terra.api.platform.TerraPlugin; +import com.dfsek.terra.api.platform.world.Chunk; +import com.dfsek.terra.api.platform.world.World; +import com.dfsek.terra.api.platform.world.vector.Vector2; +import com.dfsek.terra.api.world.generation.GenerationPhase; +import com.dfsek.terra.api.world.generation.TerraBlockPopulator; import com.dfsek.terra.biome.UserDefinedBiome; import com.dfsek.terra.biome.grid.master.TerraBiomeGrid; import com.dfsek.terra.generation.items.flora.FloraLayer; @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Random; /** - * Populates Flora and Trees + * Populates Flora */ public class FloraPopulator implements TerraBlockPopulator { private final TerraPlugin main; diff --git a/common/src/main/java/com/dfsek/terra/population/OrePopulator.java b/common/src/main/java/com/dfsek/terra/population/OrePopulator.java index 19ba94497..3e4148846 100644 --- a/common/src/main/java/com/dfsek/terra/population/OrePopulator.java +++ b/common/src/main/java/com/dfsek/terra/population/OrePopulator.java @@ -1,16 +1,16 @@ package com.dfsek.terra.population; import com.dfsek.terra.TerraWorld; -import com.dfsek.terra.api.gaea.biome.Biome; -import com.dfsek.terra.api.gaea.generation.GenerationPhase; import com.dfsek.terra.api.gaea.math.MathUtil; import com.dfsek.terra.api.gaea.profiler.ProfileFuture; import com.dfsek.terra.api.gaea.util.FastRandom; -import com.dfsek.terra.api.generic.TerraPlugin; -import com.dfsek.terra.api.generic.generator.TerraBlockPopulator; -import com.dfsek.terra.api.generic.world.Chunk; -import com.dfsek.terra.api.generic.world.World; -import com.dfsek.terra.api.generic.world.vector.Vector3; +import com.dfsek.terra.api.platform.TerraPlugin; +import com.dfsek.terra.api.platform.world.Chunk; +import com.dfsek.terra.api.platform.world.World; +import com.dfsek.terra.api.platform.world.vector.Vector3; +import com.dfsek.terra.api.world.biome.Biome; +import com.dfsek.terra.api.world.generation.GenerationPhase; +import com.dfsek.terra.api.world.generation.TerraBlockPopulator; import com.dfsek.terra.biome.UserDefinedBiome; import com.dfsek.terra.config.templates.BiomeTemplate; import org.jetbrains.annotations.NotNull; diff --git a/common/src/main/java/com/dfsek/terra/population/StructurePopulator.java b/common/src/main/java/com/dfsek/terra/population/StructurePopulator.java index 9533fee37..5172bd33d 100644 --- a/common/src/main/java/com/dfsek/terra/population/StructurePopulator.java +++ b/common/src/main/java/com/dfsek/terra/population/StructurePopulator.java @@ -1,9 +1,9 @@ package com.dfsek.terra.population; -import com.dfsek.terra.api.generic.TerraPlugin; -import com.dfsek.terra.api.generic.generator.TerraBlockPopulator; -import com.dfsek.terra.api.generic.world.Chunk; -import com.dfsek.terra.api.generic.world.World; +import com.dfsek.terra.api.platform.TerraPlugin; +import com.dfsek.terra.api.platform.world.Chunk; +import com.dfsek.terra.api.platform.world.World; +import com.dfsek.terra.api.world.generation.TerraBlockPopulator; import org.jetbrains.annotations.NotNull; import java.util.Random; diff --git a/common/src/main/java/com/dfsek/terra/population/TreePopulator.java b/common/src/main/java/com/dfsek/terra/population/TreePopulator.java index 565e1e409..b5039c469 100644 --- a/common/src/main/java/com/dfsek/terra/population/TreePopulator.java +++ b/common/src/main/java/com/dfsek/terra/population/TreePopulator.java @@ -1,13 +1,13 @@ package com.dfsek.terra.population; import com.dfsek.terra.TerraWorld; -import com.dfsek.terra.api.gaea.generation.GenerationPhase; import com.dfsek.terra.api.gaea.profiler.ProfileFuture; -import com.dfsek.terra.api.generic.TerraPlugin; -import com.dfsek.terra.api.generic.generator.TerraBlockPopulator; -import com.dfsek.terra.api.generic.world.Chunk; -import com.dfsek.terra.api.generic.world.World; -import com.dfsek.terra.api.generic.world.vector.Vector2; +import com.dfsek.terra.api.platform.TerraPlugin; +import com.dfsek.terra.api.platform.world.Chunk; +import com.dfsek.terra.api.platform.world.World; +import com.dfsek.terra.api.platform.world.vector.Vector2; +import com.dfsek.terra.api.world.generation.GenerationPhase; +import com.dfsek.terra.api.world.generation.TerraBlockPopulator; import com.dfsek.terra.biome.UserDefinedBiome; import com.dfsek.terra.biome.grid.master.TerraBiomeGrid; import com.dfsek.terra.generation.items.tree.TreeLayer; diff --git a/common/src/main/java/com/dfsek/terra/procgen/GridSpawn.java b/common/src/main/java/com/dfsek/terra/procgen/GridSpawn.java index 753310128..19a2f9d2b 100644 --- a/common/src/main/java/com/dfsek/terra/procgen/GridSpawn.java +++ b/common/src/main/java/com/dfsek/terra/procgen/GridSpawn.java @@ -3,7 +3,7 @@ package com.dfsek.terra.procgen; import com.dfsek.terra.api.gaea.math.MathUtil; import com.dfsek.terra.api.gaea.util.FastRandom; import com.dfsek.terra.api.gaea.util.GlueList; -import com.dfsek.terra.api.generic.world.vector.Vector3; +import com.dfsek.terra.api.platform.world.vector.Vector3; import java.util.List; import java.util.Random; diff --git a/common/src/main/java/com/dfsek/terra/procgen/pixel/Polygon.java b/common/src/main/java/com/dfsek/terra/procgen/pixel/Polygon.java index 5988a3295..07434e62b 100644 --- a/common/src/main/java/com/dfsek/terra/procgen/pixel/Polygon.java +++ b/common/src/main/java/com/dfsek/terra/procgen/pixel/Polygon.java @@ -1,6 +1,6 @@ package com.dfsek.terra.procgen.pixel; -import com.dfsek.terra.api.generic.world.vector.Vector2; +import com.dfsek.terra.api.platform.world.vector.Vector2; import java.util.Set; diff --git a/common/src/main/java/com/dfsek/terra/procgen/pixel/Rectangle.java b/common/src/main/java/com/dfsek/terra/procgen/pixel/Rectangle.java index 019ddb912..4b8943ea5 100644 --- a/common/src/main/java/com/dfsek/terra/procgen/pixel/Rectangle.java +++ b/common/src/main/java/com/dfsek/terra/procgen/pixel/Rectangle.java @@ -1,6 +1,6 @@ package com.dfsek.terra.procgen.pixel; -import com.dfsek.terra.api.generic.world.vector.Vector2; +import com.dfsek.terra.api.platform.world.vector.Vector2; import net.jafama.FastMath; import java.util.HashSet; diff --git a/common/src/main/java/com/dfsek/terra/procgen/voxel/Cylinder.java b/common/src/main/java/com/dfsek/terra/procgen/voxel/Cylinder.java index 3ba238ac6..4a86deb34 100644 --- a/common/src/main/java/com/dfsek/terra/procgen/voxel/Cylinder.java +++ b/common/src/main/java/com/dfsek/terra/procgen/voxel/Cylinder.java @@ -1,7 +1,7 @@ package com.dfsek.terra.procgen.voxel; -import com.dfsek.terra.api.generic.world.vector.Vector3; +import com.dfsek.terra.api.platform.world.vector.Vector3; public class Cylinder extends VoxelGeometry { public Cylinder(Vector3 start, int rad, int height) { diff --git a/common/src/main/java/com/dfsek/terra/procgen/voxel/DeformedSphere.java b/common/src/main/java/com/dfsek/terra/procgen/voxel/DeformedSphere.java index 6236594d5..40e0c5133 100644 --- a/common/src/main/java/com/dfsek/terra/procgen/voxel/DeformedSphere.java +++ b/common/src/main/java/com/dfsek/terra/procgen/voxel/DeformedSphere.java @@ -1,7 +1,7 @@ package com.dfsek.terra.procgen.voxel; import com.dfsek.terra.api.gaea.math.FastNoiseLite; -import com.dfsek.terra.api.generic.world.vector.Vector3; +import com.dfsek.terra.api.platform.world.vector.Vector3; public class DeformedSphere extends VoxelGeometry { public DeformedSphere(Vector3 start, int rad, double deform, FastNoiseLite noise) { diff --git a/common/src/main/java/com/dfsek/terra/procgen/voxel/Sphere.java b/common/src/main/java/com/dfsek/terra/procgen/voxel/Sphere.java index f1ed10b19..9cb1ae499 100644 --- a/common/src/main/java/com/dfsek/terra/procgen/voxel/Sphere.java +++ b/common/src/main/java/com/dfsek/terra/procgen/voxel/Sphere.java @@ -1,6 +1,6 @@ package com.dfsek.terra.procgen.voxel; -import com.dfsek.terra.api.generic.world.vector.Vector3; +import com.dfsek.terra.api.platform.world.vector.Vector3; public class Sphere extends VoxelGeometry { public Sphere(Vector3 start, int rad) { diff --git a/common/src/main/java/com/dfsek/terra/procgen/voxel/Tube.java b/common/src/main/java/com/dfsek/terra/procgen/voxel/Tube.java index 75a528d68..7f25138f5 100644 --- a/common/src/main/java/com/dfsek/terra/procgen/voxel/Tube.java +++ b/common/src/main/java/com/dfsek/terra/procgen/voxel/Tube.java @@ -1,6 +1,6 @@ package com.dfsek.terra.procgen.voxel; -import com.dfsek.terra.api.generic.world.vector.Vector3; +import com.dfsek.terra.api.platform.world.vector.Vector3; public class Tube extends VoxelGeometry { public Tube(Vector3 start, Vector3 end, int radius) { diff --git a/common/src/main/java/com/dfsek/terra/procgen/voxel/VoxelGeometry.java b/common/src/main/java/com/dfsek/terra/procgen/voxel/VoxelGeometry.java index 3e186cab4..27c896e81 100644 --- a/common/src/main/java/com/dfsek/terra/procgen/voxel/VoxelGeometry.java +++ b/common/src/main/java/com/dfsek/terra/procgen/voxel/VoxelGeometry.java @@ -1,7 +1,7 @@ package com.dfsek.terra.procgen.voxel; import com.dfsek.terra.api.gaea.util.GlueList; -import com.dfsek.terra.api.generic.world.vector.Vector3; +import com.dfsek.terra.api.platform.world.vector.Vector3; import java.util.List; diff --git a/common/src/main/java/com/dfsek/terra/registry/ConfigRegistry.java b/common/src/main/java/com/dfsek/terra/registry/ConfigRegistry.java index 60f7c90e8..0fdc6163a 100644 --- a/common/src/main/java/com/dfsek/terra/registry/ConfigRegistry.java +++ b/common/src/main/java/com/dfsek/terra/registry/ConfigRegistry.java @@ -1,7 +1,7 @@ package com.dfsek.terra.registry; import com.dfsek.tectonic.exception.ConfigException; -import com.dfsek.terra.api.generic.TerraPlugin; +import com.dfsek.terra.api.platform.TerraPlugin; import com.dfsek.terra.config.base.ConfigPack; import com.dfsek.terra.debug.Debug; diff --git a/common/src/main/java/com/dfsek/terra/registry/FloraRegistry.java b/common/src/main/java/com/dfsek/terra/registry/FloraRegistry.java index 35ac8d916..131743c75 100644 --- a/common/src/main/java/com/dfsek/terra/registry/FloraRegistry.java +++ b/common/src/main/java/com/dfsek/terra/registry/FloraRegistry.java @@ -1,9 +1,9 @@ package com.dfsek.terra.registry; import com.dfsek.terra.api.gaea.world.Flora; -import com.dfsek.terra.api.generic.TerraPlugin; -import com.dfsek.terra.api.generic.world.block.BlockData; -import com.dfsek.terra.api.generic.world.block.MaterialData; +import com.dfsek.terra.api.platform.TerraPlugin; +import com.dfsek.terra.api.platform.world.block.BlockData; +import com.dfsek.terra.api.platform.world.block.MaterialData; import com.dfsek.terra.generation.items.flora.ConstantFlora; import com.dfsek.terra.util.MaterialSet; diff --git a/common/src/main/java/com/dfsek/terra/registry/PaletteRegistry.java b/common/src/main/java/com/dfsek/terra/registry/PaletteRegistry.java index 0e620dcd4..b60d12a47 100644 --- a/common/src/main/java/com/dfsek/terra/registry/PaletteRegistry.java +++ b/common/src/main/java/com/dfsek/terra/registry/PaletteRegistry.java @@ -1,8 +1,8 @@ package com.dfsek.terra.registry; -import com.dfsek.terra.api.gaea.world.palette.Palette; -import com.dfsek.terra.api.generic.TerraPlugin; -import com.dfsek.terra.api.generic.world.block.BlockData; +import com.dfsek.terra.api.platform.TerraPlugin; +import com.dfsek.terra.api.platform.world.block.BlockData; +import com.dfsek.terra.api.world.palette.Palette; import com.dfsek.terra.biome.palette.SinglePalette; public class PaletteRegistry extends TerraRegistry> { diff --git a/common/src/main/java/com/dfsek/terra/registry/TreeRegistry.java b/common/src/main/java/com/dfsek/terra/registry/TreeRegistry.java index cd45ae226..e7849c762 100644 --- a/common/src/main/java/com/dfsek/terra/registry/TreeRegistry.java +++ b/common/src/main/java/com/dfsek/terra/registry/TreeRegistry.java @@ -1,19 +1,19 @@ package com.dfsek.terra.registry; -import com.dfsek.terra.api.gaea.tree.Tree; -import com.dfsek.terra.api.gaea.tree.fractal.FractalTree; -import com.dfsek.terra.api.gaea.tree.fractal.trees.Cactus; -import com.dfsek.terra.api.gaea.tree.fractal.trees.IceSpike; -import com.dfsek.terra.api.gaea.tree.fractal.trees.OakTree; -import com.dfsek.terra.api.gaea.tree.fractal.trees.ShatteredPillar; -import com.dfsek.terra.api.gaea.tree.fractal.trees.ShatteredTree; -import com.dfsek.terra.api.gaea.tree.fractal.trees.SmallShatteredPillar; -import com.dfsek.terra.api.gaea.tree.fractal.trees.SmallShatteredTree; -import com.dfsek.terra.api.gaea.tree.fractal.trees.SpruceTree; -import com.dfsek.terra.api.generic.TerraPlugin; -import com.dfsek.terra.api.generic.world.block.BlockFace; -import com.dfsek.terra.api.generic.world.block.MaterialData; -import com.dfsek.terra.api.generic.world.vector.Location; +import com.dfsek.terra.api.platform.TerraPlugin; +import com.dfsek.terra.api.platform.world.block.BlockFace; +import com.dfsek.terra.api.platform.world.block.MaterialData; +import com.dfsek.terra.api.platform.world.vector.Location; +import com.dfsek.terra.api.world.tree.Tree; +import com.dfsek.terra.api.world.tree.fractal.FractalTree; +import com.dfsek.terra.api.world.tree.fractal.trees.Cactus; +import com.dfsek.terra.api.world.tree.fractal.trees.IceSpike; +import com.dfsek.terra.api.world.tree.fractal.trees.OakTree; +import com.dfsek.terra.api.world.tree.fractal.trees.ShatteredPillar; +import com.dfsek.terra.api.world.tree.fractal.trees.ShatteredTree; +import com.dfsek.terra.api.world.tree.fractal.trees.SmallShatteredPillar; +import com.dfsek.terra.api.world.tree.fractal.trees.SmallShatteredTree; +import com.dfsek.terra.api.world.tree.fractal.trees.SpruceTree; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; diff --git a/common/src/main/java/com/dfsek/terra/util/MaterialSet.java b/common/src/main/java/com/dfsek/terra/util/MaterialSet.java index b3008a8ce..6a7caf3f6 100644 --- a/common/src/main/java/com/dfsek/terra/util/MaterialSet.java +++ b/common/src/main/java/com/dfsek/terra/util/MaterialSet.java @@ -1,7 +1,7 @@ package com.dfsek.terra.util; -import com.dfsek.terra.api.generic.world.block.BlockData; -import com.dfsek.terra.api.generic.world.block.MaterialData; +import com.dfsek.terra.api.platform.world.block.BlockData; +import com.dfsek.terra.api.platform.world.block.MaterialData; import java.util.Arrays; import java.util.HashSet; diff --git a/common/src/main/java/com/dfsek/terra/util/PaletteUtil.java b/common/src/main/java/com/dfsek/terra/util/PaletteUtil.java index 8d3a6767b..95a118e3b 100644 --- a/common/src/main/java/com/dfsek/terra/util/PaletteUtil.java +++ b/common/src/main/java/com/dfsek/terra/util/PaletteUtil.java @@ -1,7 +1,7 @@ package com.dfsek.terra.util; -import com.dfsek.terra.api.gaea.world.palette.Palette; -import com.dfsek.terra.api.generic.world.block.BlockData; +import com.dfsek.terra.api.platform.world.block.BlockData; +import com.dfsek.terra.api.world.palette.Palette; import com.dfsek.terra.biome.palette.PaletteHolder; import com.dfsek.terra.config.templates.BiomeTemplate; import com.dfsek.terra.generation.Sampler; diff --git a/common/src/main/java/com/dfsek/terra/util/PopulationUtil.java b/common/src/main/java/com/dfsek/terra/util/PopulationUtil.java index 3c47c7d52..2d5c85ff6 100644 --- a/common/src/main/java/com/dfsek/terra/util/PopulationUtil.java +++ b/common/src/main/java/com/dfsek/terra/util/PopulationUtil.java @@ -2,7 +2,7 @@ package com.dfsek.terra.util; import com.dfsek.terra.api.gaea.math.MathUtil; import com.dfsek.terra.api.gaea.util.FastRandom; -import com.dfsek.terra.api.generic.world.Chunk; +import com.dfsek.terra.api.platform.world.Chunk; public final class PopulationUtil { public static FastRandom getRandom(Chunk c) { diff --git a/common/src/main/java/com/dfsek/terra/util/TagUtil.java b/common/src/main/java/com/dfsek/terra/util/TagUtil.java index 9e96b04e0..eba42151c 100644 --- a/common/src/main/java/com/dfsek/terra/util/TagUtil.java +++ b/common/src/main/java/com/dfsek/terra/util/TagUtil.java @@ -1,6 +1,6 @@ package com.dfsek.terra.util; -import com.dfsek.terra.api.generic.world.block.MaterialData; +import com.dfsek.terra.api.platform.world.block.MaterialData; import com.dfsek.terra.debug.Debug; import org.jetbrains.annotations.NotNull; diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitBiomeGrid.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitBiomeGrid.java index f68c67b4b..649cafd57 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitBiomeGrid.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitBiomeGrid.java @@ -1,7 +1,7 @@ package com.dfsek.terra.bukkit; -import com.dfsek.terra.api.generic.world.Biome; -import com.dfsek.terra.api.generic.world.BiomeGrid; +import com.dfsek.terra.api.platform.world.Biome; +import com.dfsek.terra.api.platform.world.BiomeGrid; import com.dfsek.terra.bukkit.world.BukkitBiome; import org.bukkit.generator.ChunkGenerator; import org.jetbrains.annotations.NotNull; diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitChunk.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitChunk.java index 11cbc6832..6db72b19a 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitChunk.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitChunk.java @@ -1,8 +1,8 @@ package com.dfsek.terra.bukkit; -import com.dfsek.terra.api.generic.world.Chunk; -import com.dfsek.terra.api.generic.world.World; -import com.dfsek.terra.api.generic.world.block.Block; +import com.dfsek.terra.api.platform.world.Chunk; +import com.dfsek.terra.api.platform.world.World; +import com.dfsek.terra.api.platform.world.block.Block; import com.dfsek.terra.bukkit.world.block.BukkitBlock; public class BukkitChunk implements Chunk { diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitCommandSender.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitCommandSender.java index 71c1aed3b..ed65c569a 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitCommandSender.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitCommandSender.java @@ -1,6 +1,6 @@ package com.dfsek.terra.bukkit; -import com.dfsek.terra.api.generic.CommandSender; +import com.dfsek.terra.api.platform.CommandSender; import org.bukkit.ChatColor; public class BukkitCommandSender implements CommandSender { diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitEntity.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitEntity.java index c600c474e..587b48246 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitEntity.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitEntity.java @@ -1,6 +1,6 @@ package com.dfsek.terra.bukkit; -import com.dfsek.terra.api.generic.Entity; +import com.dfsek.terra.api.platform.Entity; public class BukkitEntity implements Entity { private final org.bukkit.entity.Entity entity; diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitItemHandle.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitItemHandle.java index a29c92528..58dd09d03 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitItemHandle.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitItemHandle.java @@ -1,8 +1,8 @@ package com.dfsek.terra.bukkit; -import com.dfsek.terra.api.generic.inventory.ItemHandle; -import com.dfsek.terra.api.generic.inventory.ItemStack; -import com.dfsek.terra.api.generic.world.block.MaterialData; +import com.dfsek.terra.api.platform.inventory.ItemHandle; +import com.dfsek.terra.api.platform.inventory.ItemStack; +import com.dfsek.terra.api.platform.world.block.MaterialData; import com.dfsek.terra.bukkit.world.block.BukkitMaterialData; public class BukkitItemHandle implements ItemHandle { diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitItemMeta.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitItemMeta.java index 519beb3cb..a4742e02c 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitItemMeta.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitItemMeta.java @@ -1,6 +1,6 @@ package com.dfsek.terra.bukkit; -import com.dfsek.terra.api.generic.inventory.item.ItemMeta; +import com.dfsek.terra.api.platform.inventory.item.ItemMeta; public class BukkitItemMeta implements ItemMeta { private final org.bukkit.inventory.meta.ItemMeta delegate; diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitItemStack.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitItemStack.java index 8c0ce2a33..81a20c358 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitItemStack.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitItemStack.java @@ -1,8 +1,8 @@ package com.dfsek.terra.bukkit; -import com.dfsek.terra.api.generic.inventory.ItemStack; -import com.dfsek.terra.api.generic.inventory.item.ItemMeta; -import com.dfsek.terra.api.generic.world.block.MaterialData; +import com.dfsek.terra.api.platform.inventory.ItemStack; +import com.dfsek.terra.api.platform.inventory.item.ItemMeta; +import com.dfsek.terra.api.platform.world.block.MaterialData; import com.dfsek.terra.bukkit.world.block.BukkitMaterialData; public class BukkitItemStack implements ItemStack { diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitPlayer.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitPlayer.java index ae419c4b0..5644ffec4 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitPlayer.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitPlayer.java @@ -1,7 +1,7 @@ package com.dfsek.terra.bukkit; import com.dfsek.terra.api.Player; -import com.dfsek.terra.api.generic.world.vector.Location; +import com.dfsek.terra.api.platform.world.vector.Location; public class BukkitPlayer implements Player { private final org.bukkit.entity.Player delegate; diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitTree.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitTree.java index fe35f0f7c..456121f4e 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitTree.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitTree.java @@ -1,10 +1,10 @@ package com.dfsek.terra.bukkit; -import com.dfsek.terra.api.generic.TerraPlugin; -import com.dfsek.terra.api.generic.Tree; -import com.dfsek.terra.api.generic.world.WorldHandle; -import com.dfsek.terra.api.generic.world.block.MaterialData; -import com.dfsek.terra.api.generic.world.vector.Location; +import com.dfsek.terra.api.platform.TerraPlugin; +import com.dfsek.terra.api.platform.Tree; +import com.dfsek.terra.api.platform.world.WorldHandle; +import com.dfsek.terra.api.platform.world.block.MaterialData; +import com.dfsek.terra.api.platform.world.vector.Location; import com.dfsek.terra.bukkit.util.BukkitConversions; import com.dfsek.terra.util.MaterialSet; import org.bukkit.TreeType; diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitWorld.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitWorld.java index f6cfd8765..90be26848 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitWorld.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitWorld.java @@ -1,11 +1,11 @@ package com.dfsek.terra.bukkit; -import com.dfsek.terra.api.generic.Tree; -import com.dfsek.terra.api.generic.generator.ChunkGenerator; -import com.dfsek.terra.api.generic.world.Chunk; -import com.dfsek.terra.api.generic.world.World; -import com.dfsek.terra.api.generic.world.block.Block; -import com.dfsek.terra.api.generic.world.vector.Location; +import com.dfsek.terra.api.platform.Tree; +import com.dfsek.terra.api.platform.generator.ChunkGenerator; +import com.dfsek.terra.api.platform.world.Chunk; +import com.dfsek.terra.api.platform.world.World; +import com.dfsek.terra.api.platform.world.block.Block; +import com.dfsek.terra.api.platform.world.vector.Location; import com.dfsek.terra.bukkit.generator.BukkitChunkGenerator; import com.dfsek.terra.bukkit.world.block.BukkitBlock; @@ -75,7 +75,7 @@ public class BukkitWorld implements World { } @Override - public void spawn(Location l, Class entity, java.util.function.Consumer consumer) { + public void spawn(Location l, Class entity, java.util.function.Consumer consumer) { } @Override diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitWorldHandle.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitWorldHandle.java index 64d9943d9..a8612a237 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitWorldHandle.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitWorldHandle.java @@ -1,11 +1,11 @@ package com.dfsek.terra.bukkit; -import com.dfsek.terra.api.generic.TerraPlugin; -import com.dfsek.terra.api.generic.Tree; -import com.dfsek.terra.api.generic.world.WorldHandle; -import com.dfsek.terra.api.generic.world.block.Block; -import com.dfsek.terra.api.generic.world.block.BlockData; -import com.dfsek.terra.api.generic.world.block.MaterialData; +import com.dfsek.terra.api.platform.TerraPlugin; +import com.dfsek.terra.api.platform.Tree; +import com.dfsek.terra.api.platform.world.WorldHandle; +import com.dfsek.terra.api.platform.world.block.Block; +import com.dfsek.terra.api.platform.world.block.BlockData; +import com.dfsek.terra.api.platform.world.block.MaterialData; import com.dfsek.terra.api.transform.Transformer; import com.dfsek.terra.bukkit.world.block.BukkitBlockData; import com.dfsek.terra.bukkit.world.block.BukkitMaterialData; diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java index 85c8fea12..7304ad9ac 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java @@ -4,14 +4,14 @@ import com.dfsek.tectonic.loading.TypeRegistry; import com.dfsek.terra.TerraWorld; import com.dfsek.terra.api.GenericLoaders; import com.dfsek.terra.api.gaea.lang.Language; -import com.dfsek.terra.api.generic.TerraPlugin; -import com.dfsek.terra.api.generic.Tree; -import com.dfsek.terra.api.generic.inventory.ItemHandle; -import com.dfsek.terra.api.generic.world.Biome; -import com.dfsek.terra.api.generic.world.World; -import com.dfsek.terra.api.generic.world.WorldHandle; -import com.dfsek.terra.api.generic.world.block.BlockData; -import com.dfsek.terra.api.generic.world.block.MaterialData; +import com.dfsek.terra.api.platform.TerraPlugin; +import com.dfsek.terra.api.platform.Tree; +import com.dfsek.terra.api.platform.inventory.ItemHandle; +import com.dfsek.terra.api.platform.world.Biome; +import com.dfsek.terra.api.platform.world.World; +import com.dfsek.terra.api.platform.world.WorldHandle; +import com.dfsek.terra.api.platform.world.block.BlockData; +import com.dfsek.terra.api.platform.world.block.MaterialData; import com.dfsek.terra.api.transform.MapTransform; import com.dfsek.terra.api.transform.Transformer; import com.dfsek.terra.bukkit.command.command.TerraCommand; @@ -26,7 +26,7 @@ import com.dfsek.terra.config.base.ConfigPack; import com.dfsek.terra.config.base.PluginConfig; import com.dfsek.terra.config.lang.LangUtil; import com.dfsek.terra.debug.Debug; -import com.dfsek.terra.generation.TerraChunkGenerator; +import com.dfsek.terra.generation.MasterChunkGenerator; import com.dfsek.terra.registry.ConfigRegistry; import com.dfsek.terra.util.StringUtils; import org.bstats.bukkit.Metrics; @@ -45,7 +45,7 @@ import java.util.Objects; public class TerraBukkitPlugin extends JavaPlugin implements TerraPlugin { - private final Map generatorMap = new HashMap<>(); + private final Map generatorMap = new HashMap<>(); private final Map worldMap = new HashMap<>(); private final Map worlds = new HashMap<>(); private final ConfigRegistry registry = new ConfigRegistry(); @@ -138,7 +138,7 @@ public class TerraBukkitPlugin extends JavaPlugin implements TerraPlugin { return new BukkitChunkGeneratorWrapper(generatorMap.computeIfAbsent(worldName, name -> { if(!registry.contains(id)) throw new IllegalArgumentException("No such config pack \"" + id + "\""); worlds.put(worldName, registry.get(id)); - return new TerraChunkGenerator(registry.get(id), this); + return new MasterChunkGenerator(registry.get(id), this); })); } @@ -162,7 +162,7 @@ public class TerraBukkitPlugin extends JavaPlugin implements TerraPlugin { throw new IllegalArgumentException("Not a Terra world! " + w.getGenerator()); if(!worlds.containsKey(w.getName())) { getLogger().warning("Unexpected world load detected: \"" + w.getName() + "\""); - return new TerraWorld(w, ((TerraChunkGenerator) w.getGenerator()).getConfigPack(), this); + return new TerraWorld(w, ((MasterChunkGenerator) w.getGenerator()).getConfigPack(), this); } return worldMap.computeIfAbsent(w, world -> new TerraWorld(w, worlds.get(w.getName()), this)); } diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/Command.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/Command.java index 77abc1cda..913e07798 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/Command.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/Command.java @@ -1,6 +1,6 @@ package com.dfsek.terra.bukkit.command; -import com.dfsek.terra.api.generic.TerraPlugin; +import com.dfsek.terra.api.platform.TerraPlugin; import com.dfsek.terra.bukkit.BukkitCommandSender; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/TerraCommand.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/TerraCommand.java index 2e4a4db46..7ceed79e6 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/TerraCommand.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/TerraCommand.java @@ -1,6 +1,6 @@ package com.dfsek.terra.bukkit.command.command; -import com.dfsek.terra.api.generic.TerraPlugin; +import com.dfsek.terra.api.platform.TerraPlugin; import com.dfsek.terra.bukkit.BukkitCommandSender; import com.dfsek.terra.bukkit.command.Command; import com.dfsek.terra.bukkit.command.command.biome.BiomeCommand; diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/geometry/DeformedSphereCommand.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/geometry/DeformedSphereCommand.java index ea56bd1e9..ffd3f8234 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/geometry/DeformedSphereCommand.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/geometry/DeformedSphereCommand.java @@ -1,7 +1,7 @@ package com.dfsek.terra.bukkit.command.command.geometry; import com.dfsek.terra.api.gaea.math.FastNoiseLite; -import com.dfsek.terra.api.generic.world.vector.Vector3; +import com.dfsek.terra.api.platform.world.vector.Vector3; import com.dfsek.terra.bukkit.BukkitCommandSender; import com.dfsek.terra.bukkit.BukkitPlayer; import com.dfsek.terra.bukkit.BukkitWorld; diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/geometry/SphereCommand.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/geometry/SphereCommand.java index 8f4f20da7..1b86d9d12 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/geometry/SphereCommand.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/geometry/SphereCommand.java @@ -1,6 +1,6 @@ package com.dfsek.terra.bukkit.command.command.geometry; -import com.dfsek.terra.api.generic.world.vector.Vector3; +import com.dfsek.terra.api.platform.world.vector.Vector3; import com.dfsek.terra.bukkit.BukkitCommandSender; import com.dfsek.terra.bukkit.BukkitPlayer; import com.dfsek.terra.bukkit.BukkitWorld; diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/geometry/TubeCommand.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/geometry/TubeCommand.java index 29583380b..190103791 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/geometry/TubeCommand.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/geometry/TubeCommand.java @@ -1,6 +1,6 @@ package com.dfsek.terra.bukkit.command.command.geometry; -import com.dfsek.terra.api.generic.world.vector.Vector3; +import com.dfsek.terra.api.platform.world.vector.Vector3; import com.dfsek.terra.bukkit.BukkitCommandSender; import com.dfsek.terra.bukkit.BukkitWorld; import com.dfsek.terra.bukkit.command.PlayerCommand; diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitChunkGenerator.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitChunkGenerator.java index 1478afab8..5ea9beafb 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitChunkGenerator.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitChunkGenerator.java @@ -1,10 +1,10 @@ package com.dfsek.terra.bukkit.generator; -import com.dfsek.terra.api.generic.generator.BlockPopulator; -import com.dfsek.terra.api.generic.generator.TerraChunkGenerator; -import com.dfsek.terra.api.generic.world.BiomeGrid; -import com.dfsek.terra.api.generic.world.World; -import com.dfsek.terra.api.generic.world.block.BlockData; +import com.dfsek.terra.api.platform.generator.BlockPopulator; +import com.dfsek.terra.api.platform.world.BiomeGrid; +import com.dfsek.terra.api.platform.world.World; +import com.dfsek.terra.api.platform.world.block.BlockData; +import com.dfsek.terra.api.world.generation.TerraChunkGenerator; import com.dfsek.terra.bukkit.BukkitBiomeGrid; import com.dfsek.terra.bukkit.BukkitWorld; import com.dfsek.terra.bukkit.world.block.BukkitBlockData; @@ -16,7 +16,7 @@ import java.util.List; import java.util.Random; import java.util.stream.Collectors; -public class BukkitChunkGenerator implements com.dfsek.terra.api.generic.generator.ChunkGenerator { +public class BukkitChunkGenerator implements com.dfsek.terra.api.platform.generator.ChunkGenerator { private final ChunkGenerator delegate; public BukkitChunkGenerator(ChunkGenerator delegate) { diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitChunkGeneratorWrapper.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitChunkGeneratorWrapper.java index ae4f4f5f3..99a66ae3c 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitChunkGeneratorWrapper.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitChunkGeneratorWrapper.java @@ -1,14 +1,15 @@ package com.dfsek.terra.bukkit.generator; import com.dfsek.terra.api.gaea.population.PopulationManager; -import com.dfsek.terra.api.generic.Handle; -import com.dfsek.terra.api.generic.TerraPlugin; -import com.dfsek.terra.api.generic.generator.TerraChunkGenerator; -import com.dfsek.terra.api.generic.world.Chunk; +import com.dfsek.terra.api.platform.Handle; +import com.dfsek.terra.api.platform.TerraPlugin; +import com.dfsek.terra.api.platform.world.Chunk; +import com.dfsek.terra.api.world.generation.TerraChunkGenerator; import com.dfsek.terra.bukkit.BukkitBiomeGrid; import com.dfsek.terra.bukkit.BukkitWorld; import com.dfsek.terra.config.lang.LangUtil; import com.dfsek.terra.debug.Debug; +import com.dfsek.terra.generation.MasterChunkGenerator; import com.dfsek.terra.population.CavePopulator; import com.dfsek.terra.population.FloraPopulator; import com.dfsek.terra.population.OrePopulator; @@ -31,7 +32,7 @@ import java.util.stream.Stream; public class BukkitChunkGeneratorWrapper extends ChunkGenerator implements Handle { - private static final Map popMap = new HashMap<>(); + private static final Map popMap = new HashMap<>(); private final PopulationManager popMan; @@ -52,7 +53,7 @@ public class BukkitChunkGeneratorWrapper extends ChunkGenerator implements Handl public static synchronized void saveAll() { - for(Map.Entry e : popMap.entrySet()) { + for(Map.Entry e : popMap.entrySet()) { try { e.getValue().saveBlocks(e.getKey()); Debug.info("Saved data for world " + e.getKey().getName()); @@ -63,11 +64,11 @@ public class BukkitChunkGeneratorWrapper extends ChunkGenerator implements Handl } public static synchronized void fixChunk(Chunk c) { - if(!(c.getWorld().getGenerator() instanceof com.dfsek.terra.generation.TerraChunkGenerator)) throw new IllegalArgumentException(); + if(!(c.getWorld().getGenerator() instanceof MasterChunkGenerator)) throw new IllegalArgumentException(); popMap.get(c.getWorld()).checkNeighbors(c.getX(), c.getZ(), c.getWorld()); } - private void load(com.dfsek.terra.api.generic.world.World w) { + private void load(com.dfsek.terra.api.platform.world.World w) { try { popMan.loadBlocks(w); } catch(FileNotFoundException e) { diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitPopulator.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitPopulator.java index 64eb84c63..dae8b73fc 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitPopulator.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitPopulator.java @@ -1,8 +1,8 @@ package com.dfsek.terra.bukkit.generator; -import com.dfsek.terra.api.generic.generator.BlockPopulator; -import com.dfsek.terra.api.generic.world.Chunk; -import com.dfsek.terra.api.generic.world.World; +import com.dfsek.terra.api.platform.generator.BlockPopulator; +import com.dfsek.terra.api.platform.world.Chunk; +import com.dfsek.terra.api.platform.world.World; import com.dfsek.terra.bukkit.BukkitChunk; import com.dfsek.terra.bukkit.BukkitWorld; diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitPopulatorWrapper.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitPopulatorWrapper.java index efa7b6d78..566de2470 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitPopulatorWrapper.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitPopulatorWrapper.java @@ -1,6 +1,6 @@ package com.dfsek.terra.bukkit.generator; -import com.dfsek.terra.api.generic.generator.TerraBlockPopulator; +import com.dfsek.terra.api.world.generation.TerraBlockPopulator; import com.dfsek.terra.bukkit.BukkitChunk; import com.dfsek.terra.bukkit.BukkitWorld; import org.bukkit.Chunk; diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/EventListener.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/EventListener.java index a2ca4fadd..8fb58bc2d 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/EventListener.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/EventListener.java @@ -1,6 +1,6 @@ package com.dfsek.terra.bukkit.listeners; -import com.dfsek.terra.api.generic.TerraPlugin; +import com.dfsek.terra.api.platform.TerraPlugin; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.world.StructureGrowEvent; diff --git 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 index 1efe86781..b35bc71a9 100644 --- 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,6 +1,6 @@ package com.dfsek.terra.bukkit.listeners; -import com.dfsek.terra.api.generic.TerraPlugin; +import com.dfsek.terra.api.platform.TerraPlugin; import org.bukkit.event.Listener; /** diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/structure/RotationUtil.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/structure/RotationUtil.java index 082e5ff1b..e88a28eff 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/structure/RotationUtil.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/structure/RotationUtil.java @@ -1,16 +1,16 @@ package com.dfsek.terra.bukkit.structure; -import com.dfsek.terra.api.generic.world.block.Axis; -import com.dfsek.terra.api.generic.world.block.BlockData; -import com.dfsek.terra.api.generic.world.block.BlockFace; -import com.dfsek.terra.api.generic.world.block.data.Directional; -import com.dfsek.terra.api.generic.world.block.data.MultipleFacing; -import com.dfsek.terra.api.generic.world.block.data.Orientable; -import com.dfsek.terra.api.generic.world.block.data.Rail; -import com.dfsek.terra.api.generic.world.block.data.RedstoneWire; -import com.dfsek.terra.api.generic.world.block.data.Rotatable; -import com.dfsek.terra.api.generic.world.block.data.Wall; -import com.dfsek.terra.api.generic.world.vector.Vector2; +import com.dfsek.terra.api.platform.world.block.Axis; +import com.dfsek.terra.api.platform.world.block.BlockData; +import com.dfsek.terra.api.platform.world.block.BlockFace; +import com.dfsek.terra.api.platform.world.block.data.Directional; +import com.dfsek.terra.api.platform.world.block.data.MultipleFacing; +import com.dfsek.terra.api.platform.world.block.data.Orientable; +import com.dfsek.terra.api.platform.world.block.data.Rail; +import com.dfsek.terra.api.platform.world.block.data.RedstoneWire; +import com.dfsek.terra.api.platform.world.block.data.Rotatable; +import com.dfsek.terra.api.platform.world.block.data.Wall; +import com.dfsek.terra.api.platform.world.vector.Vector2; import com.dfsek.terra.structure.Rotation; import net.jafama.FastMath; diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/util/BukkitConversions.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/util/BukkitConversions.java index 674a22010..2351ef43d 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/util/BukkitConversions.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/util/BukkitConversions.java @@ -1,6 +1,6 @@ package com.dfsek.terra.bukkit.util; -import com.dfsek.terra.api.generic.world.vector.Vector3; +import com.dfsek.terra.api.platform.world.vector.Vector3; import com.dfsek.terra.bukkit.BukkitWorld; import org.bukkit.Location; import org.bukkit.util.Vector; @@ -10,7 +10,7 @@ public final class BukkitConversions { return new Vector3(bukkit.getX(), bukkit.getY(), bukkit.getZ()); } - public static Location toBukkitLocation(com.dfsek.terra.api.generic.world.vector.Location terra) { + public static Location toBukkitLocation(com.dfsek.terra.api.platform.world.vector.Location terra) { return new Location(((BukkitWorld) terra.getWorld()).getHandle(), terra.getX(), terra.getY(), terra.getZ()); } } diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitBiome.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitBiome.java index eac3332e6..843268183 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitBiome.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitBiome.java @@ -1,6 +1,6 @@ package com.dfsek.terra.bukkit.world; -import com.dfsek.terra.api.generic.world.Biome; +import com.dfsek.terra.api.platform.world.Biome; public class BukkitBiome implements Biome { private final org.bukkit.block.Biome biome; diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/BukkitBlock.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/BukkitBlock.java index 421c110c2..215f1d7f0 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/BukkitBlock.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/BukkitBlock.java @@ -1,10 +1,10 @@ package com.dfsek.terra.bukkit.world.block; -import com.dfsek.terra.api.generic.world.block.Block; -import com.dfsek.terra.api.generic.world.block.BlockData; -import com.dfsek.terra.api.generic.world.block.BlockFace; -import com.dfsek.terra.api.generic.world.block.MaterialData; -import com.dfsek.terra.api.generic.world.vector.Location; +import com.dfsek.terra.api.platform.world.block.Block; +import com.dfsek.terra.api.platform.world.block.BlockData; +import com.dfsek.terra.api.platform.world.block.BlockFace; +import com.dfsek.terra.api.platform.world.block.MaterialData; +import com.dfsek.terra.api.platform.world.vector.Location; import com.dfsek.terra.bukkit.BukkitWorld; import com.dfsek.terra.bukkit.world.block.data.TerraEnumAdapter; diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/BukkitBlockData.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/BukkitBlockData.java index 05b3496fc..a4c0b69a6 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/BukkitBlockData.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/BukkitBlockData.java @@ -1,7 +1,7 @@ package com.dfsek.terra.bukkit.world.block; -import com.dfsek.terra.api.generic.world.block.BlockData; -import com.dfsek.terra.api.generic.world.block.MaterialData; +import com.dfsek.terra.api.platform.world.block.BlockData; +import com.dfsek.terra.api.platform.world.block.MaterialData; public class BukkitBlockData implements BlockData { private org.bukkit.block.data.BlockData delegate; diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/BukkitMaterialData.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/BukkitMaterialData.java index 9a7acf859..c5c0861d2 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/BukkitMaterialData.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/BukkitMaterialData.java @@ -1,7 +1,7 @@ package com.dfsek.terra.bukkit.world.block; -import com.dfsek.terra.api.generic.world.block.BlockData; -import com.dfsek.terra.api.generic.world.block.MaterialData; +import com.dfsek.terra.api.platform.world.block.BlockData; +import com.dfsek.terra.api.platform.world.block.MaterialData; import org.bukkit.Material; public class BukkitMaterialData implements MaterialData { diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/data/BukkitEnumAdapter.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/data/BukkitEnumAdapter.java index a4a8df802..8d0dce046 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/data/BukkitEnumAdapter.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/data/BukkitEnumAdapter.java @@ -1,10 +1,10 @@ package com.dfsek.terra.bukkit.world.block.data; -import com.dfsek.terra.api.generic.world.block.BlockFace; -import com.dfsek.terra.api.generic.world.block.data.Bisected; -import com.dfsek.terra.api.generic.world.block.data.Slab; -import com.dfsek.terra.api.generic.world.block.data.Stairs; +import com.dfsek.terra.api.platform.world.block.BlockFace; +import com.dfsek.terra.api.platform.world.block.data.Bisected; +import com.dfsek.terra.api.platform.world.block.data.Slab; +import com.dfsek.terra.api.platform.world.block.data.Stairs; /** * Utility class to adapt Bukkit enums to Terra enums. diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/data/BukkitMultipleFacing.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/data/BukkitMultipleFacing.java index e32421029..854a85fcc 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/data/BukkitMultipleFacing.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/data/BukkitMultipleFacing.java @@ -1,7 +1,7 @@ package com.dfsek.terra.bukkit.world.block.data; -import com.dfsek.terra.api.generic.world.block.BlockFace; -import com.dfsek.terra.api.generic.world.block.data.MultipleFacing; +import com.dfsek.terra.api.platform.world.block.BlockFace; +import com.dfsek.terra.api.platform.world.block.data.MultipleFacing; import com.dfsek.terra.bukkit.world.block.BukkitBlockData; import java.util.Set; diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/data/BukkitSlab.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/data/BukkitSlab.java index b889f311e..dbdc14968 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/data/BukkitSlab.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/data/BukkitSlab.java @@ -1,6 +1,6 @@ package com.dfsek.terra.bukkit.world.block.data; -import com.dfsek.terra.api.generic.world.block.data.Slab; +import com.dfsek.terra.api.platform.world.block.data.Slab; public class BukkitSlab extends BukkitWaterlogged implements Slab { public BukkitSlab(org.bukkit.block.data.type.Slab delegate) { diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/data/BukkitStairs.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/data/BukkitStairs.java index 04bf258d8..fa12c6fc8 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/data/BukkitStairs.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/data/BukkitStairs.java @@ -1,7 +1,7 @@ package com.dfsek.terra.bukkit.world.block.data; -import com.dfsek.terra.api.generic.world.block.BlockFace; -import com.dfsek.terra.api.generic.world.block.data.Stairs; +import com.dfsek.terra.api.platform.world.block.BlockFace; +import com.dfsek.terra.api.platform.world.block.data.Stairs; import com.dfsek.terra.bukkit.world.block.BukkitBlockData; public class BukkitStairs extends BukkitBlockData implements Stairs { diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/data/BukkitWaterlogged.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/data/BukkitWaterlogged.java index 6d6bc8aa0..075a95039 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/data/BukkitWaterlogged.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/data/BukkitWaterlogged.java @@ -1,6 +1,6 @@ package com.dfsek.terra.bukkit.world.block.data; -import com.dfsek.terra.api.generic.world.block.data.Waterlogged; +import com.dfsek.terra.api.platform.world.block.data.Waterlogged; import com.dfsek.terra.bukkit.world.block.BukkitBlockData; public class BukkitWaterlogged extends BukkitBlockData implements Waterlogged { diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/data/TerraEnumAdapter.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/data/TerraEnumAdapter.java index fb7ceb044..9ac9ddd28 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/data/TerraEnumAdapter.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/data/TerraEnumAdapter.java @@ -1,7 +1,7 @@ package com.dfsek.terra.bukkit.world.block.data; -import com.dfsek.terra.api.generic.world.block.BlockFace; +import com.dfsek.terra.api.platform.world.block.BlockFace; import org.bukkit.block.data.Bisected; import org.bukkit.block.data.type.Slab; import org.bukkit.block.data.type.Stairs; @@ -10,7 +10,7 @@ import org.bukkit.block.data.type.Stairs; * Utility class to adapt Terra enums to Bukkit enums */ public final class TerraEnumAdapter { - public static Stairs.Shape fromTerraStair(com.dfsek.terra.api.generic.world.block.data.Stairs.Shape shape) { + public static Stairs.Shape fromTerraStair(com.dfsek.terra.api.platform.world.block.data.Stairs.Shape shape) { switch(shape) { case STRAIGHT: return Stairs.Shape.STRAIGHT; @@ -27,7 +27,7 @@ public final class TerraEnumAdapter { } } - public static Bisected.Half fromTerraHalf(com.dfsek.terra.api.generic.world.block.data.Bisected.Half half) { + public static Bisected.Half fromTerraHalf(com.dfsek.terra.api.platform.world.block.data.Bisected.Half half) { switch(half) { case TOP: return Bisected.Half.TOP; @@ -83,7 +83,7 @@ public final class TerraEnumAdapter { } } - public static Slab.Type fromTerraSlabType(com.dfsek.terra.api.generic.world.block.data.Slab.Type type) { + public static Slab.Type fromTerraSlabType(com.dfsek.terra.api.platform.world.block.data.Slab.Type type) { switch(type) { case TOP: return Slab.Type.TOP; diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraFabricPlugin.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraFabricPlugin.java index f479a868c..588672056 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraFabricPlugin.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraFabricPlugin.java @@ -4,12 +4,12 @@ import com.dfsek.tectonic.loading.TypeRegistry; import com.dfsek.terra.TerraWorld; import com.dfsek.terra.api.GenericLoaders; import com.dfsek.terra.api.gaea.lang.Language; -import com.dfsek.terra.api.generic.TerraPlugin; -import com.dfsek.terra.api.generic.inventory.ItemHandle; -import com.dfsek.terra.api.generic.world.World; -import com.dfsek.terra.api.generic.world.WorldHandle; -import com.dfsek.terra.api.generic.world.block.BlockData; -import com.dfsek.terra.api.generic.world.block.MaterialData; +import com.dfsek.terra.api.platform.TerraPlugin; +import com.dfsek.terra.api.platform.inventory.ItemHandle; +import com.dfsek.terra.api.platform.world.World; +import com.dfsek.terra.api.platform.world.WorldHandle; +import com.dfsek.terra.api.platform.world.block.BlockData; +import com.dfsek.terra.api.platform.world.block.MaterialData; import com.dfsek.terra.api.transform.MapTransform; import com.dfsek.terra.api.transform.NotNullValidator; import com.dfsek.terra.api.transform.Transformer; @@ -176,7 +176,7 @@ public class TerraFabricPlugin implements TerraPlugin, ModInitializer { registry .registerLoader(BlockData.class, (t, o, l) -> worldHandle.createBlockData((String) o)) .registerLoader(MaterialData.class, (t, o, l) -> worldHandle.createMaterialData((String) o)) - .registerLoader(com.dfsek.terra.api.generic.world.Biome.class, (t, o, l) -> new FabricBiome(biomeFixer.translate((String) o))); + .registerLoader(com.dfsek.terra.api.platform.world.Biome.class, (t, o, l) -> new FabricBiome(biomeFixer.translate((String) o))); } public static String createBiomeID(ConfigPack pack, UserDefinedBiome biome) { diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/inventory/FabricItemHandle.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/inventory/FabricItemHandle.java index 312de6e83..7648480d2 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/inventory/FabricItemHandle.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/inventory/FabricItemHandle.java @@ -1,8 +1,8 @@ package com.dfsek.terra.fabric.inventory; -import com.dfsek.terra.api.generic.inventory.ItemHandle; -import com.dfsek.terra.api.generic.inventory.ItemStack; -import com.dfsek.terra.api.generic.world.block.MaterialData; +import com.dfsek.terra.api.platform.inventory.ItemHandle; +import com.dfsek.terra.api.platform.inventory.ItemStack; +import com.dfsek.terra.api.platform.world.block.MaterialData; public class FabricItemHandle implements ItemHandle { @Override diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/inventory/FabricItemStack.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/inventory/FabricItemStack.java index dc71067be..f7662acee 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/inventory/FabricItemStack.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/inventory/FabricItemStack.java @@ -1,8 +1,8 @@ package com.dfsek.terra.fabric.inventory; -import com.dfsek.terra.api.generic.inventory.ItemStack; -import com.dfsek.terra.api.generic.inventory.item.ItemMeta; -import com.dfsek.terra.api.generic.world.block.MaterialData; +import com.dfsek.terra.api.platform.inventory.ItemStack; +import com.dfsek.terra.api.platform.inventory.item.ItemMeta; +import com.dfsek.terra.api.platform.world.block.MaterialData; public class FabricItemStack implements ItemStack { net.minecraft.item.ItemStack delegate; diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/FabricAdapters.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/FabricAdapters.java index 1130ef6d5..470e60080 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/FabricAdapters.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/FabricAdapters.java @@ -1,6 +1,6 @@ package com.dfsek.terra.fabric.world; -import com.dfsek.terra.api.generic.world.vector.Vector3; +import com.dfsek.terra.api.platform.world.vector.Vector3; import net.minecraft.util.math.BlockPos; public final class FabricAdapters { diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/FabricBiome.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/FabricBiome.java index d804bf3b3..99dab1c2c 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/FabricBiome.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/FabricBiome.java @@ -1,6 +1,6 @@ package com.dfsek.terra.fabric.world; -import com.dfsek.terra.api.generic.world.Biome; +import com.dfsek.terra.api.platform.world.Biome; public class FabricBiome implements Biome { private final net.minecraft.world.biome.Biome delegate; diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/FabricTree.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/FabricTree.java index ff870c3c3..f1020b7d5 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/FabricTree.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/FabricTree.java @@ -1,8 +1,8 @@ package com.dfsek.terra.fabric.world; -import com.dfsek.terra.api.generic.Tree; -import com.dfsek.terra.api.generic.world.block.MaterialData; -import com.dfsek.terra.api.generic.world.vector.Location; +import com.dfsek.terra.api.platform.Tree; +import com.dfsek.terra.api.platform.world.block.MaterialData; +import com.dfsek.terra.api.platform.world.vector.Location; import com.dfsek.terra.fabric.TerraFabricPlugin; import com.dfsek.terra.fabric.world.generator.FabricChunkGenerator; import com.dfsek.terra.fabric.world.handles.world.FabricWorldAccess; diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/FabricWorldHandle.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/FabricWorldHandle.java index 260d3c9ea..779b55332 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/FabricWorldHandle.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/FabricWorldHandle.java @@ -1,10 +1,10 @@ package com.dfsek.terra.fabric.world; -import com.dfsek.terra.api.generic.Tree; -import com.dfsek.terra.api.generic.world.WorldHandle; -import com.dfsek.terra.api.generic.world.block.Block; -import com.dfsek.terra.api.generic.world.block.BlockData; -import com.dfsek.terra.api.generic.world.block.MaterialData; +import com.dfsek.terra.api.platform.Tree; +import com.dfsek.terra.api.platform.world.WorldHandle; +import com.dfsek.terra.api.platform.world.block.Block; +import com.dfsek.terra.api.platform.world.block.BlockData; +import com.dfsek.terra.api.platform.world.block.MaterialData; import com.dfsek.terra.api.transform.Transformer; import com.dfsek.terra.fabric.world.block.FabricBlockData; import com.dfsek.terra.fabric.world.block.FabricMaterialData; diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/TerraBiomeSource.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/TerraBiomeSource.java index 2e24fc8b3..529cec805 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/TerraBiomeSource.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/TerraBiomeSource.java @@ -1,6 +1,6 @@ package com.dfsek.terra.fabric.world; -import com.dfsek.terra.api.gaea.generation.GenerationPhase; +import com.dfsek.terra.api.world.generation.GenerationPhase; import com.dfsek.terra.biome.UserDefinedBiome; import com.dfsek.terra.biome.grid.master.TerraBiomeGrid; import com.dfsek.terra.config.base.ConfigPack; diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/block/FabricBlock.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/block/FabricBlock.java index 4164df37a..f20724743 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/block/FabricBlock.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/block/FabricBlock.java @@ -1,10 +1,10 @@ package com.dfsek.terra.fabric.world.block; -import com.dfsek.terra.api.generic.world.block.Block; -import com.dfsek.terra.api.generic.world.block.BlockData; -import com.dfsek.terra.api.generic.world.block.BlockFace; -import com.dfsek.terra.api.generic.world.block.MaterialData; -import com.dfsek.terra.api.generic.world.vector.Location; +import com.dfsek.terra.api.platform.world.block.Block; +import com.dfsek.terra.api.platform.world.block.BlockData; +import com.dfsek.terra.api.platform.world.block.BlockFace; +import com.dfsek.terra.api.platform.world.block.MaterialData; +import com.dfsek.terra.api.platform.world.vector.Location; import com.dfsek.terra.fabric.world.FabricAdapters; import com.dfsek.terra.fabric.world.handles.world.FabricWorldAccess; import net.minecraft.util.math.BlockPos; diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/block/FabricBlockData.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/block/FabricBlockData.java index 683ad720a..e3d87d9b6 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/block/FabricBlockData.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/block/FabricBlockData.java @@ -1,7 +1,7 @@ package com.dfsek.terra.fabric.world.block; -import com.dfsek.terra.api.generic.world.block.BlockData; -import com.dfsek.terra.api.generic.world.block.MaterialData; +import com.dfsek.terra.api.platform.world.block.BlockData; +import com.dfsek.terra.api.platform.world.block.MaterialData; import net.minecraft.block.BlockState; public class FabricBlockData implements BlockData { diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/block/FabricMaterialData.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/block/FabricMaterialData.java index 19bb30b61..be531f86a 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/block/FabricMaterialData.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/block/FabricMaterialData.java @@ -1,7 +1,7 @@ package com.dfsek.terra.fabric.world.block; -import com.dfsek.terra.api.generic.world.block.BlockData; -import com.dfsek.terra.api.generic.world.block.MaterialData; +import com.dfsek.terra.api.platform.world.block.BlockData; +import com.dfsek.terra.api.platform.world.block.MaterialData; import net.minecraft.block.Block; import net.minecraft.block.Blocks; diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/block/data/FabricEnumAdapter.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/block/data/FabricEnumAdapter.java index 1cf39dc2f..ca60af062 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/block/data/FabricEnumAdapter.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/block/data/FabricEnumAdapter.java @@ -1,9 +1,9 @@ package com.dfsek.terra.fabric.world.block.data; -import com.dfsek.terra.api.generic.world.block.BlockFace; -import com.dfsek.terra.api.generic.world.block.data.Bisected; -import com.dfsek.terra.api.generic.world.block.data.Slab; -import com.dfsek.terra.api.generic.world.block.data.Stairs; +import com.dfsek.terra.api.platform.world.block.BlockFace; +import com.dfsek.terra.api.platform.world.block.data.Bisected; +import com.dfsek.terra.api.platform.world.block.data.Slab; +import com.dfsek.terra.api.platform.world.block.data.Stairs; import net.minecraft.block.enums.BlockHalf; import net.minecraft.block.enums.SlabType; import net.minecraft.block.enums.StairShape; diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/block/data/FabricMultipleFacing.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/block/data/FabricMultipleFacing.java index a397f4e58..20adcb618 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/block/data/FabricMultipleFacing.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/block/data/FabricMultipleFacing.java @@ -1,7 +1,7 @@ package com.dfsek.terra.fabric.world.block.data; -import com.dfsek.terra.api.generic.world.block.BlockFace; -import com.dfsek.terra.api.generic.world.block.data.MultipleFacing; +import com.dfsek.terra.api.platform.world.block.BlockFace; +import com.dfsek.terra.api.platform.world.block.data.MultipleFacing; import com.dfsek.terra.fabric.world.block.FabricBlockData; import net.minecraft.block.BlockState; import net.minecraft.state.property.Properties; diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/block/data/FabricSlab.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/block/data/FabricSlab.java index 4f66c02d4..3ec3db9db 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/block/data/FabricSlab.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/block/data/FabricSlab.java @@ -1,6 +1,6 @@ package com.dfsek.terra.fabric.world.block.data; -import com.dfsek.terra.api.generic.world.block.data.Slab; +import com.dfsek.terra.api.platform.world.block.data.Slab; import net.minecraft.block.BlockState; import net.minecraft.state.property.Properties; diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/block/data/FabricStairs.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/block/data/FabricStairs.java index 74c8b1fb7..4bb032b8a 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/block/data/FabricStairs.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/block/data/FabricStairs.java @@ -1,7 +1,7 @@ package com.dfsek.terra.fabric.world.block.data; -import com.dfsek.terra.api.generic.world.block.BlockFace; -import com.dfsek.terra.api.generic.world.block.data.Stairs; +import com.dfsek.terra.api.platform.world.block.BlockFace; +import com.dfsek.terra.api.platform.world.block.data.Stairs; import net.minecraft.block.BlockState; import net.minecraft.state.property.Properties; diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/block/data/FabricWaterlogged.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/block/data/FabricWaterlogged.java index 97b3c3dd7..92756ee9a 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/block/data/FabricWaterlogged.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/block/data/FabricWaterlogged.java @@ -1,6 +1,6 @@ package com.dfsek.terra.fabric.world.block.data; -import com.dfsek.terra.api.generic.world.block.data.Waterlogged; +import com.dfsek.terra.api.platform.world.block.data.Waterlogged; import com.dfsek.terra.fabric.world.block.FabricBlockData; import net.minecraft.block.BlockState; import net.minecraft.state.property.Properties; diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/block/data/TerraEnumAdapter.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/block/data/TerraEnumAdapter.java index 019b70e74..a5a53fa7b 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/block/data/TerraEnumAdapter.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/block/data/TerraEnumAdapter.java @@ -1,9 +1,9 @@ package com.dfsek.terra.fabric.world.block.data; -import com.dfsek.terra.api.generic.world.block.BlockFace; -import com.dfsek.terra.api.generic.world.block.data.Bisected; -import com.dfsek.terra.api.generic.world.block.data.Slab; -import com.dfsek.terra.api.generic.world.block.data.Stairs; +import com.dfsek.terra.api.platform.world.block.BlockFace; +import com.dfsek.terra.api.platform.world.block.data.Bisected; +import com.dfsek.terra.api.platform.world.block.data.Slab; +import com.dfsek.terra.api.platform.world.block.data.Stairs; import net.minecraft.block.enums.BlockHalf; import net.minecraft.block.enums.SlabType; import net.minecraft.block.enums.StairShape; diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/generator/FabricChunkData.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/generator/FabricChunkData.java index 35f9f7d06..8fa09df1f 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/generator/FabricChunkData.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/generator/FabricChunkData.java @@ -1,7 +1,7 @@ package com.dfsek.terra.fabric.world.generator; -import com.dfsek.terra.api.generic.generator.ChunkGenerator; -import com.dfsek.terra.api.generic.world.block.BlockData; +import com.dfsek.terra.api.platform.generator.ChunkGenerator; +import com.dfsek.terra.api.platform.world.block.BlockData; import com.dfsek.terra.fabric.world.block.FabricBlockData; import net.minecraft.util.math.BlockPos; import net.minecraft.world.chunk.Chunk; diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/generator/FabricChunkGenerator.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/generator/FabricChunkGenerator.java index 0d8232a60..5ec22b9e3 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/generator/FabricChunkGenerator.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/generator/FabricChunkGenerator.java @@ -1,10 +1,10 @@ package com.dfsek.terra.fabric.world.generator; -import com.dfsek.terra.api.generic.generator.BlockPopulator; -import com.dfsek.terra.api.generic.generator.ChunkGenerator; -import com.dfsek.terra.api.generic.generator.TerraChunkGenerator; -import com.dfsek.terra.api.generic.world.BiomeGrid; -import com.dfsek.terra.api.generic.world.World; +import com.dfsek.terra.api.platform.generator.BlockPopulator; +import com.dfsek.terra.api.platform.generator.ChunkGenerator; +import com.dfsek.terra.api.platform.world.BiomeGrid; +import com.dfsek.terra.api.platform.world.World; +import com.dfsek.terra.api.world.generation.TerraChunkGenerator; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/generator/FabricChunkGeneratorWrapper.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/generator/FabricChunkGeneratorWrapper.java index 031074f99..3592216f9 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/generator/FabricChunkGeneratorWrapper.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/generator/FabricChunkGeneratorWrapper.java @@ -1,12 +1,12 @@ package com.dfsek.terra.fabric.world.generator; import com.dfsek.terra.api.gaea.util.FastRandom; -import com.dfsek.terra.api.generic.Handle; +import com.dfsek.terra.api.platform.Handle; import com.dfsek.terra.config.base.ConfigPack; import com.dfsek.terra.fabric.TerraFabricPlugin; import com.dfsek.terra.fabric.world.TerraBiomeSource; import com.dfsek.terra.fabric.world.handles.world.FabricSeededWorldAccess; -import com.dfsek.terra.generation.TerraChunkGenerator; +import com.dfsek.terra.generation.MasterChunkGenerator; import com.dfsek.terra.population.CavePopulator; import com.dfsek.terra.population.FloraPopulator; import com.dfsek.terra.population.OrePopulator; @@ -32,7 +32,7 @@ import net.minecraft.world.gen.chunk.VerticalBlockSample; public class FabricChunkGeneratorWrapper extends ChunkGenerator implements Handle { private final long seed; - private final TerraChunkGenerator delegate; + private final MasterChunkGenerator delegate; private final TerraBiomeSource biomeSource; public static final Codec PACK_CODEC = (RecordCodecBuilder.create(config -> config.group( Codec.STRING.fieldOf("pack").forGetter(pack -> pack.getTemplate().getID()) @@ -70,7 +70,7 @@ public class FabricChunkGeneratorWrapper extends ChunkGenerator implements Handl super(biomeSource, new StructuresConfig(false)); this.pack = configPack; - this.delegate = new TerraChunkGenerator(configPack, TerraFabricPlugin.getInstance()); + this.delegate = new MasterChunkGenerator(configPack, TerraFabricPlugin.getInstance()); delegate.getMain().getLogger().info("Loading world..."); this.biomeSource = biomeSource; @@ -78,7 +78,7 @@ public class FabricChunkGeneratorWrapper extends ChunkGenerator implements Handl } @Override - public TerraChunkGenerator getHandle() { + public MasterChunkGenerator getHandle() { return delegate; } diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/handles/FabricWorld.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/handles/FabricWorld.java index b8e9f5cf3..e30efbca9 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/handles/FabricWorld.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/handles/FabricWorld.java @@ -1,12 +1,12 @@ package com.dfsek.terra.fabric.world.handles; -import com.dfsek.terra.api.generic.Entity; -import com.dfsek.terra.api.generic.Tree; -import com.dfsek.terra.api.generic.generator.ChunkGenerator; -import com.dfsek.terra.api.generic.world.Chunk; -import com.dfsek.terra.api.generic.world.World; -import com.dfsek.terra.api.generic.world.block.Block; -import com.dfsek.terra.api.generic.world.vector.Location; +import com.dfsek.terra.api.platform.Entity; +import com.dfsek.terra.api.platform.Tree; +import com.dfsek.terra.api.platform.generator.ChunkGenerator; +import com.dfsek.terra.api.platform.world.Chunk; +import com.dfsek.terra.api.platform.world.World; +import com.dfsek.terra.api.platform.world.block.Block; +import com.dfsek.terra.api.platform.world.vector.Location; import com.dfsek.terra.fabric.world.handles.chunk.FabricChunk; import net.minecraft.server.world.ServerWorld; diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/handles/chunk/FabricChunk.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/handles/chunk/FabricChunk.java index 89fdb8ec4..d3a571cb9 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/handles/chunk/FabricChunk.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/handles/chunk/FabricChunk.java @@ -1,8 +1,8 @@ package com.dfsek.terra.fabric.world.handles.chunk; -import com.dfsek.terra.api.generic.world.Chunk; -import com.dfsek.terra.api.generic.world.World; -import com.dfsek.terra.api.generic.world.block.Block; +import com.dfsek.terra.api.platform.world.Chunk; +import com.dfsek.terra.api.platform.world.World; +import com.dfsek.terra.api.platform.world.block.Block; public class FabricChunk implements Chunk { private final net.minecraft.world.chunk.Chunk chunk; diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/handles/chunk/FabricChunkWorldAccess.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/handles/chunk/FabricChunkWorldAccess.java index 94684c0b7..ec78da35d 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/handles/chunk/FabricChunkWorldAccess.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/handles/chunk/FabricChunkWorldAccess.java @@ -1,8 +1,8 @@ package com.dfsek.terra.fabric.world.handles.chunk; -import com.dfsek.terra.api.generic.world.Chunk; -import com.dfsek.terra.api.generic.world.World; -import com.dfsek.terra.api.generic.world.block.Block; +import com.dfsek.terra.api.platform.world.Chunk; +import com.dfsek.terra.api.platform.world.World; +import com.dfsek.terra.api.platform.world.block.Block; import com.dfsek.terra.fabric.world.block.FabricBlock; import com.dfsek.terra.fabric.world.handles.world.FabricWorldAccess; import net.minecraft.util.math.BlockPos; diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/handles/world/FabricSeededWorldAccess.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/handles/world/FabricSeededWorldAccess.java index cf871c34c..0056dcba8 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/handles/world/FabricSeededWorldAccess.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/handles/world/FabricSeededWorldAccess.java @@ -1,12 +1,12 @@ package com.dfsek.terra.fabric.world.handles.world; -import com.dfsek.terra.api.generic.Entity; -import com.dfsek.terra.api.generic.Tree; -import com.dfsek.terra.api.generic.generator.ChunkGenerator; -import com.dfsek.terra.api.generic.world.Chunk; -import com.dfsek.terra.api.generic.world.World; -import com.dfsek.terra.api.generic.world.block.Block; -import com.dfsek.terra.api.generic.world.vector.Location; +import com.dfsek.terra.api.platform.Entity; +import com.dfsek.terra.api.platform.Tree; +import com.dfsek.terra.api.platform.generator.ChunkGenerator; +import com.dfsek.terra.api.platform.world.Chunk; +import com.dfsek.terra.api.platform.world.World; +import com.dfsek.terra.api.platform.world.block.Block; +import com.dfsek.terra.api.platform.world.vector.Location; import com.dfsek.terra.fabric.world.block.FabricBlock; import com.dfsek.terra.fabric.world.generator.FabricChunkGenerator; import net.minecraft.util.math.BlockPos; diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/handles/world/FabricWorldAccess.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/handles/world/FabricWorldAccess.java index c5816ca25..11636a62f 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/handles/world/FabricWorldAccess.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/handles/world/FabricWorldAccess.java @@ -1,12 +1,12 @@ package com.dfsek.terra.fabric.world.handles.world; -import com.dfsek.terra.api.generic.Entity; -import com.dfsek.terra.api.generic.Tree; -import com.dfsek.terra.api.generic.generator.ChunkGenerator; -import com.dfsek.terra.api.generic.world.Chunk; -import com.dfsek.terra.api.generic.world.World; -import com.dfsek.terra.api.generic.world.block.Block; -import com.dfsek.terra.api.generic.world.vector.Location; +import com.dfsek.terra.api.platform.Entity; +import com.dfsek.terra.api.platform.Tree; +import com.dfsek.terra.api.platform.generator.ChunkGenerator; +import com.dfsek.terra.api.platform.world.Chunk; +import com.dfsek.terra.api.platform.world.World; +import com.dfsek.terra.api.platform.world.block.Block; +import com.dfsek.terra.api.platform.world.vector.Location; import com.dfsek.terra.fabric.world.block.FabricBlock; import com.dfsek.terra.fabric.world.generator.FabricChunkGenerator; import net.minecraft.util.math.BlockPos; diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/handles/world/FabricWorldChunkRegion.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/handles/world/FabricWorldChunkRegion.java index 9e6ca13eb..d5d1c06fd 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/handles/world/FabricWorldChunkRegion.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/handles/world/FabricWorldChunkRegion.java @@ -1,12 +1,12 @@ package com.dfsek.terra.fabric.world.handles.world; -import com.dfsek.terra.api.generic.Entity; -import com.dfsek.terra.api.generic.Tree; -import com.dfsek.terra.api.generic.generator.ChunkGenerator; -import com.dfsek.terra.api.generic.world.Chunk; -import com.dfsek.terra.api.generic.world.World; -import com.dfsek.terra.api.generic.world.block.Block; -import com.dfsek.terra.api.generic.world.vector.Location; +import com.dfsek.terra.api.platform.Entity; +import com.dfsek.terra.api.platform.Tree; +import com.dfsek.terra.api.platform.generator.ChunkGenerator; +import com.dfsek.terra.api.platform.world.Chunk; +import com.dfsek.terra.api.platform.world.World; +import com.dfsek.terra.api.platform.world.block.Block; +import com.dfsek.terra.api.platform.world.vector.Location; import com.dfsek.terra.fabric.world.block.FabricBlock; import com.dfsek.terra.fabric.world.generator.FabricChunkGenerator; import net.minecraft.util.math.BlockPos;