diff --git a/platforms/allay/src/main/java/org/allaymc/terra/allay/AllayPlatform.java b/platforms/allay/src/main/java/org/allaymc/terra/allay/AllayPlatform.java index 513b10cd6..4cad7a112 100644 --- a/platforms/allay/src/main/java/org/allaymc/terra/allay/AllayPlatform.java +++ b/platforms/allay/src/main/java/org/allaymc/terra/allay/AllayPlatform.java @@ -3,11 +3,6 @@ package org.allaymc.terra.allay; import com.dfsek.tectonic.api.TypeRegistry; import com.dfsek.tectonic.api.depth.DepthTracker; import com.dfsek.tectonic.api.exception.LoadException; -import com.dfsek.terra.AbstractPlatform; -import com.dfsek.terra.api.block.state.BlockState; -import com.dfsek.terra.api.handle.ItemHandle; -import com.dfsek.terra.api.handle.WorldHandle; -import com.dfsek.terra.api.world.biome.PlatformBiome; import org.allaymc.api.data.VanillaBiomeId; import org.allaymc.api.server.Server; import org.allaymc.terra.allay.delegate.AllayBiome; @@ -17,6 +12,12 @@ import org.jetbrains.annotations.NotNull; import java.io.File; +import com.dfsek.terra.AbstractPlatform; +import com.dfsek.terra.api.block.state.BlockState; +import com.dfsek.terra.api.handle.ItemHandle; +import com.dfsek.terra.api.handle.WorldHandle; +import com.dfsek.terra.api.world.biome.PlatformBiome; + /** * Terra Project 2024/6/15 diff --git a/platforms/allay/src/main/java/org/allaymc/terra/allay/Mapping.java b/platforms/allay/src/main/java/org/allaymc/terra/allay/Mapping.java index 05181dca5..592c0affc 100644 --- a/platforms/allay/src/main/java/org/allaymc/terra/allay/Mapping.java +++ b/platforms/allay/src/main/java/org/allaymc/terra/allay/Mapping.java @@ -1,7 +1,5 @@ package org.allaymc.terra.allay; -import com.dfsek.terra.api.block.state.properties.Property; - import com.google.gson.reflect.TypeToken; import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; @@ -11,8 +9,6 @@ import org.allaymc.api.block.property.type.BlockPropertyType.BlockPropertyValue; import org.allaymc.api.block.registry.BlockTypeRegistry; import org.allaymc.api.block.type.BlockState; import org.allaymc.api.block.type.BlockTypes; -import org.allaymc.api.entity.registry.EntityTypeRegistry; -import org.allaymc.api.entity.type.EntityType; import org.allaymc.api.utils.Identifier; import org.allaymc.api.utils.JSONUtils; diff --git a/platforms/allay/src/main/java/org/allaymc/terra/allay/TerraAllayPlugin.java b/platforms/allay/src/main/java/org/allaymc/terra/allay/TerraAllayPlugin.java index 0e10dd492..359c2dfe9 100644 --- a/platforms/allay/src/main/java/org/allaymc/terra/allay/TerraAllayPlugin.java +++ b/platforms/allay/src/main/java/org/allaymc/terra/allay/TerraAllayPlugin.java @@ -1,12 +1,12 @@ package org.allaymc.terra.allay; -import com.dfsek.terra.api.event.events.platform.PlatformInitializationEvent; - import lombok.extern.slf4j.Slf4j; import org.allaymc.api.plugin.Plugin; import org.allaymc.api.world.generator.WorldGeneratorFactory; import org.allaymc.terra.allay.generator.AllayGeneratorWrapper; +import com.dfsek.terra.api.event.events.platform.PlatformInitializationEvent; + /** * Terra Project 2024/6/15 diff --git a/platforms/allay/src/main/java/org/allaymc/terra/allay/delegate/AllayBiome.java b/platforms/allay/src/main/java/org/allaymc/terra/allay/delegate/AllayBiome.java index 8fd05108b..71673618a 100644 --- a/platforms/allay/src/main/java/org/allaymc/terra/allay/delegate/AllayBiome.java +++ b/platforms/allay/src/main/java/org/allaymc/terra/allay/delegate/AllayBiome.java @@ -1,8 +1,9 @@ package org.allaymc.terra.allay.delegate; -import com.dfsek.terra.api.world.biome.PlatformBiome; import org.allaymc.api.world.biome.BiomeType; +import com.dfsek.terra.api.world.biome.PlatformBiome; + /** * Terra Project 2024/6/16 diff --git a/platforms/allay/src/main/java/org/allaymc/terra/allay/delegate/AllayBlockState.java b/platforms/allay/src/main/java/org/allaymc/terra/allay/delegate/AllayBlockState.java index df446445f..79791d554 100644 --- a/platforms/allay/src/main/java/org/allaymc/terra/allay/delegate/AllayBlockState.java +++ b/platforms/allay/src/main/java/org/allaymc/terra/allay/delegate/AllayBlockState.java @@ -1,12 +1,12 @@ package org.allaymc.terra.allay.delegate; -import com.dfsek.terra.api.block.BlockType; -import com.dfsek.terra.api.block.state.properties.Property; - import org.allaymc.api.block.type.BlockState; import org.allaymc.api.block.type.BlockTypes; import org.allaymc.terra.allay.JeBlockState; +import com.dfsek.terra.api.block.BlockType; +import com.dfsek.terra.api.block.state.properties.Property; + /** * Terra Project 2024/6/16 diff --git a/platforms/allay/src/main/java/org/allaymc/terra/allay/delegate/AllayBlockType.java b/platforms/allay/src/main/java/org/allaymc/terra/allay/delegate/AllayBlockType.java index fc47b8803..1cbf4d284 100644 --- a/platforms/allay/src/main/java/org/allaymc/terra/allay/delegate/AllayBlockType.java +++ b/platforms/allay/src/main/java/org/allaymc/terra/allay/delegate/AllayBlockType.java @@ -1,11 +1,11 @@ package org.allaymc.terra.allay.delegate; -import com.dfsek.terra.api.block.state.BlockState; - import org.allaymc.api.block.type.BlockType; import org.allaymc.api.block.type.BlockTypes; import org.allaymc.terra.allay.Mapping; +import com.dfsek.terra.api.block.state.BlockState; + /** * Terra Project 2024/6/16 diff --git a/platforms/allay/src/main/java/org/allaymc/terra/allay/delegate/AllayChunk.java b/platforms/allay/src/main/java/org/allaymc/terra/allay/delegate/AllayChunk.java index 60a337fee..b5cf27910 100644 --- a/platforms/allay/src/main/java/org/allaymc/terra/allay/delegate/AllayChunk.java +++ b/platforms/allay/src/main/java/org/allaymc/terra/allay/delegate/AllayChunk.java @@ -1,12 +1,12 @@ package org.allaymc.terra.allay.delegate; -import com.dfsek.terra.api.block.state.BlockState; -import com.dfsek.terra.api.world.ServerWorld; - import org.allaymc.api.world.chunk.Chunk; import org.allaymc.terra.allay.Mapping; import org.jetbrains.annotations.NotNull; +import com.dfsek.terra.api.block.state.BlockState; +import com.dfsek.terra.api.world.ServerWorld; + /** * Terra Project 2024/6/16 diff --git a/platforms/allay/src/main/java/org/allaymc/terra/allay/delegate/AllayEnchantment.java b/platforms/allay/src/main/java/org/allaymc/terra/allay/delegate/AllayEnchantment.java index f74d8c2f9..ef8e0b400 100644 --- a/platforms/allay/src/main/java/org/allaymc/terra/allay/delegate/AllayEnchantment.java +++ b/platforms/allay/src/main/java/org/allaymc/terra/allay/delegate/AllayEnchantment.java @@ -1,11 +1,11 @@ package org.allaymc.terra.allay.delegate; -import com.dfsek.terra.api.inventory.ItemStack; -import com.dfsek.terra.api.inventory.item.Enchantment; - import org.allaymc.api.item.enchantment.EnchantmentType; import org.allaymc.terra.allay.Mapping; +import com.dfsek.terra.api.inventory.ItemStack; +import com.dfsek.terra.api.inventory.item.Enchantment; + /** * Terra Project 2024/6/16 diff --git a/platforms/allay/src/main/java/org/allaymc/terra/allay/delegate/AllayItemMeta.java b/platforms/allay/src/main/java/org/allaymc/terra/allay/delegate/AllayItemMeta.java index 27b04090c..07620bd60 100644 --- a/platforms/allay/src/main/java/org/allaymc/terra/allay/delegate/AllayItemMeta.java +++ b/platforms/allay/src/main/java/org/allaymc/terra/allay/delegate/AllayItemMeta.java @@ -1,13 +1,13 @@ package org.allaymc.terra.allay.delegate; -import com.dfsek.terra.api.inventory.item.Enchantment; -import com.dfsek.terra.api.inventory.item.ItemMeta; - import org.allaymc.api.item.ItemStack; import java.util.HashMap; import java.util.Map; +import com.dfsek.terra.api.inventory.item.Enchantment; +import com.dfsek.terra.api.inventory.item.ItemMeta; + /** * Terra Project 2024/6/16 diff --git a/platforms/allay/src/main/java/org/allaymc/terra/allay/delegate/AllayItemStack.java b/platforms/allay/src/main/java/org/allaymc/terra/allay/delegate/AllayItemStack.java index dfa7aeba4..9eb4484be 100644 --- a/platforms/allay/src/main/java/org/allaymc/terra/allay/delegate/AllayItemStack.java +++ b/platforms/allay/src/main/java/org/allaymc/terra/allay/delegate/AllayItemStack.java @@ -1,10 +1,10 @@ package org.allaymc.terra.allay.delegate; +import org.allaymc.api.item.ItemStack; + import com.dfsek.terra.api.inventory.Item; import com.dfsek.terra.api.inventory.item.ItemMeta; -import org.allaymc.api.item.ItemStack; - /** * Terra Project 2024/6/16 diff --git a/platforms/allay/src/main/java/org/allaymc/terra/allay/delegate/AllayItemType.java b/platforms/allay/src/main/java/org/allaymc/terra/allay/delegate/AllayItemType.java index 0fb41a0e0..d5735e430 100644 --- a/platforms/allay/src/main/java/org/allaymc/terra/allay/delegate/AllayItemType.java +++ b/platforms/allay/src/main/java/org/allaymc/terra/allay/delegate/AllayItemType.java @@ -1,9 +1,9 @@ package org.allaymc.terra.allay.delegate; -import com.dfsek.terra.api.inventory.Item; - import org.allaymc.api.item.type.ItemType; +import com.dfsek.terra.api.inventory.Item; + /** * Terra Project 2024/6/16 diff --git a/platforms/allay/src/main/java/org/allaymc/terra/allay/delegate/AllayProtoChunk.java b/platforms/allay/src/main/java/org/allaymc/terra/allay/delegate/AllayProtoChunk.java index 1c3fbc4e4..7cc24b963 100644 --- a/platforms/allay/src/main/java/org/allaymc/terra/allay/delegate/AllayProtoChunk.java +++ b/platforms/allay/src/main/java/org/allaymc/terra/allay/delegate/AllayProtoChunk.java @@ -1,13 +1,12 @@ package org.allaymc.terra.allay.delegate; -import com.dfsek.terra.api.block.state.BlockState; -import com.dfsek.terra.api.world.chunk.generation.ProtoChunk; - -import org.allaymc.api.world.chunk.Chunk; import org.allaymc.api.world.chunk.UnsafeChunk; import org.allaymc.terra.allay.Mapping; import org.jetbrains.annotations.NotNull; +import com.dfsek.terra.api.block.state.BlockState; +import com.dfsek.terra.api.world.chunk.generation.ProtoChunk; + /** * Terra Project 2024/6/16 diff --git a/platforms/allay/src/main/java/org/allaymc/terra/allay/delegate/AllayProtoWorld.java b/platforms/allay/src/main/java/org/allaymc/terra/allay/delegate/AllayProtoWorld.java index 85420669f..9df965a8a 100644 --- a/platforms/allay/src/main/java/org/allaymc/terra/allay/delegate/AllayProtoWorld.java +++ b/platforms/allay/src/main/java/org/allaymc/terra/allay/delegate/AllayProtoWorld.java @@ -1,5 +1,8 @@ package org.allaymc.terra.allay.delegate; +import org.allaymc.api.world.chunk.UnsafeChunk; +import org.allaymc.terra.allay.Mapping; + import com.dfsek.terra.api.block.entity.BlockEntity; import com.dfsek.terra.api.block.state.BlockState; import com.dfsek.terra.api.config.ConfigPack; @@ -10,9 +13,6 @@ import com.dfsek.terra.api.world.biome.generation.BiomeProvider; import com.dfsek.terra.api.world.chunk.generation.ChunkGenerator; import com.dfsek.terra.api.world.chunk.generation.ProtoWorld; -import org.allaymc.api.world.chunk.UnsafeChunk; -import org.allaymc.terra.allay.Mapping; - /** * Terra Project 2024/6/16 diff --git a/platforms/allay/src/main/java/org/allaymc/terra/allay/delegate/AllayServerWorld.java b/platforms/allay/src/main/java/org/allaymc/terra/allay/delegate/AllayServerWorld.java index 489c98ef3..941b8ddc5 100644 --- a/platforms/allay/src/main/java/org/allaymc/terra/allay/delegate/AllayServerWorld.java +++ b/platforms/allay/src/main/java/org/allaymc/terra/allay/delegate/AllayServerWorld.java @@ -1,5 +1,9 @@ package org.allaymc.terra.allay.delegate; +import org.allaymc.api.world.Dimension; +import org.allaymc.terra.allay.Mapping; +import org.allaymc.terra.allay.generator.AllayGeneratorWrapper; + import com.dfsek.terra.api.block.entity.BlockEntity; import com.dfsek.terra.api.block.state.BlockState; import com.dfsek.terra.api.config.ConfigPack; @@ -10,10 +14,6 @@ import com.dfsek.terra.api.world.biome.generation.BiomeProvider; import com.dfsek.terra.api.world.chunk.Chunk; import com.dfsek.terra.api.world.chunk.generation.ChunkGenerator; -import org.allaymc.api.world.Dimension; -import org.allaymc.terra.allay.Mapping; -import org.allaymc.terra.allay.generator.AllayGeneratorWrapper; - /** * Terra Project 2024/6/16 diff --git a/platforms/allay/src/main/java/org/allaymc/terra/allay/generator/AllayGeneratorWrapper.java b/platforms/allay/src/main/java/org/allaymc/terra/allay/generator/AllayGeneratorWrapper.java index 5fd7ed19c..e0c5fb7e4 100644 --- a/platforms/allay/src/main/java/org/allaymc/terra/allay/generator/AllayGeneratorWrapper.java +++ b/platforms/allay/src/main/java/org/allaymc/terra/allay/generator/AllayGeneratorWrapper.java @@ -1,12 +1,5 @@ package org.allaymc.terra.allay.generator; -import com.dfsek.terra.api.config.ConfigPack; -import com.dfsek.terra.api.world.biome.generation.BiomeProvider; -import com.dfsek.terra.api.world.chunk.generation.ChunkGenerator; -import com.dfsek.terra.api.world.chunk.generation.util.GeneratorWrapper; - -import com.dfsek.terra.api.world.info.WorldProperties; - import lombok.Getter; import lombok.extern.slf4j.Slf4j; import org.allaymc.api.world.Dimension; @@ -21,6 +14,12 @@ import org.allaymc.terra.allay.delegate.AllayServerWorld; import java.util.Locale; +import com.dfsek.terra.api.config.ConfigPack; +import com.dfsek.terra.api.world.biome.generation.BiomeProvider; +import com.dfsek.terra.api.world.chunk.generation.ChunkGenerator; +import com.dfsek.terra.api.world.chunk.generation.util.GeneratorWrapper; +import com.dfsek.terra.api.world.info.WorldProperties; + /** * Terra Project 2024/6/16 diff --git a/platforms/allay/src/main/java/org/allaymc/terra/allay/handle/AllayItemHandle.java b/platforms/allay/src/main/java/org/allaymc/terra/allay/handle/AllayItemHandle.java index fe0819de3..f0ceb0c3b 100644 --- a/platforms/allay/src/main/java/org/allaymc/terra/allay/handle/AllayItemHandle.java +++ b/platforms/allay/src/main/java/org/allaymc/terra/allay/handle/AllayItemHandle.java @@ -1,11 +1,6 @@ package org.allaymc.terra.allay.handle; -import com.dfsek.terra.api.handle.ItemHandle; -import com.dfsek.terra.api.inventory.Item; -import com.dfsek.terra.api.inventory.item.Enchantment; - import org.allaymc.api.item.enchantment.EnchantmentRegistry; -import org.allaymc.api.item.enchantment.type.EnchantmentLuckOfTheSeaType; import org.allaymc.api.item.registry.ItemTypeRegistry; import org.allaymc.api.utils.Identifier; import org.allaymc.terra.allay.Mapping; @@ -15,6 +10,10 @@ import org.allaymc.terra.allay.delegate.AllayItemType; import java.util.Set; import java.util.stream.Collectors; +import com.dfsek.terra.api.handle.ItemHandle; +import com.dfsek.terra.api.inventory.Item; +import com.dfsek.terra.api.inventory.item.Enchantment; + /** * Terra Project 2024/6/16 diff --git a/platforms/allay/src/main/java/org/allaymc/terra/allay/handle/AllayWorldHandle.java b/platforms/allay/src/main/java/org/allaymc/terra/allay/handle/AllayWorldHandle.java index 06e163abd..ed9137dd8 100644 --- a/platforms/allay/src/main/java/org/allaymc/terra/allay/handle/AllayWorldHandle.java +++ b/platforms/allay/src/main/java/org/allaymc/terra/allay/handle/AllayWorldHandle.java @@ -1,14 +1,14 @@ package org.allaymc.terra.allay.handle; -import com.dfsek.terra.api.block.state.BlockState; -import com.dfsek.terra.api.entity.EntityType; -import com.dfsek.terra.api.handle.WorldHandle; - import org.allaymc.terra.allay.JeBlockState; import org.allaymc.terra.allay.Mapping; import org.allaymc.terra.allay.delegate.AllayBlockState; import org.jetbrains.annotations.NotNull; +import com.dfsek.terra.api.block.state.BlockState; +import com.dfsek.terra.api.entity.EntityType; +import com.dfsek.terra.api.handle.WorldHandle; + /** * Terra Project 2024/6/16