diff --git a/.editorconfig b/.editorconfig index 1c53c29c2..fcb82af5d 100644 --- a/.editorconfig +++ b/.editorconfig @@ -105,7 +105,7 @@ ij_java_for_statement_wrap = off ij_java_generate_final_locals = false ij_java_generate_final_parameters = false ij_java_if_brace_force = never -ij_java_imports_layout = *,|,javax.**,java.**,|,$* +ij_java_imports_layout = *, |, javax.**, java.**, |, $* ij_java_indent_case_from_switch = true ij_java_insert_inner_class_imports = false ij_java_insert_override_annotation = true @@ -137,7 +137,7 @@ ij_java_method_parameters_wrap = off ij_java_modifier_list_wrap = false ij_java_names_count_to_use_import_on_demand = 3 ij_java_new_line_after_lparen_in_record_header = false -ij_java_packages_to_use_import_on_demand = java.awt.*,javax.swing.* +ij_java_packages_to_use_import_on_demand = java.awt.*, javax.swing.* ij_java_parameter_annotation_wrap = off ij_java_parentheses_expression_new_line_after_left_paren = false ij_java_parentheses_expression_right_paren_on_new_line = false @@ -246,7 +246,7 @@ ij_java_wrap_comments = false ij_java_wrap_first_method_in_call_chain = false ij_java_wrap_long_lines = false -[{*.gradle.kts,*.kt,*.kts,*.main.kts}] +[{*.gradle.kts, *.kt, *.kts, *.main.kts}] ij_kotlin_align_in_columns_case_branch = false ij_kotlin_align_multiline_binary_operation = false ij_kotlin_align_multiline_extends_list = false @@ -325,7 +325,7 @@ ij_kotlin_wrap_elvis_expressions = 1 ij_kotlin_wrap_expression_body_functions = 0 ij_kotlin_wrap_first_method_in_call_chain = false -[{*.har,*.jsb2,*.jsb3,*.json,.babelrc,.eslintrc,.stylelintrc,bowerrc,jest.config}] +[{*.har, *.jsb2, *.jsb3, *.json, .babelrc, .eslintrc, .stylelintrc, bowerrc, jest.config}] indent_size = 2 ij_json_keep_blank_lines_in_code = 0 ij_json_keep_indents_on_empty_lines = false @@ -338,7 +338,7 @@ ij_json_spaces_within_braces = false ij_json_spaces_within_brackets = false ij_json_wrap_long_lines = false -[{*.yaml,*.yml}] +[{*.yaml, *.yml}] indent_size = 2 ij_yaml_keep_indents_on_empty_lines = true ij_yaml_keep_line_breaks = true diff --git a/.github/ISSUE_TEMPLATE/OTHER_ISSUES.md b/.github/ISSUE_TEMPLATE/OTHER_ISSUES.md index 1677fab03..75a5c71fa 100644 --- a/.github/ISSUE_TEMPLATE/OTHER_ISSUES.md +++ b/.github/ISSUE_TEMPLATE/OTHER_ISSUES.md @@ -8,4 +8,5 @@ assignees: "" --- ## Describe the issue + \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 9c7f2e470..4611034c8 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,11 +1,11 @@ blank_issues_enabled: false contact_links: - - name: Which Issue Template do I Choose? - url: https://github.com/PolyhedralDev/Terra/wiki/How-To-Choose-An-Issue-Template + - name: Which Issue Template do I Choose? + url: https://github.com/PolyhedralDev/Terra/wiki/How-To-Choose-An-Issue-Template about: Click this if you don't know which issue template to select. This will help you make sure you choose the right one and provide enough information for us to help you. - - name: Terra Wiki - url: https://github.com/PolyhedralDev/Terra/wiki + - name: Terra Wiki + url: https://github.com/PolyhedralDev/Terra/wiki about: Documentation for all things Terra. - - name: Join the Support Discord - url: https://discord.dfsek.com + - name: Join the Support Discord + url: https://discord.dfsek.com about: If you have a basic support question, join the Discord instead. \ No newline at end of file diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index af9b7a546..a07456fd9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,7 +21,7 @@ jobs: java-version: 1.8 - name: Build Terra - run: gradle shadowJar + run: gradle shadowJar - name: Upload artifacts uses: actions/upload-artifact@v2 @@ -34,7 +34,7 @@ jobs: with: repo_token: ${{ secrets.GITHUB_TOKEN }} prerelease: false - files: | - build/libs/Terra-*.jar - LICENSE + files: | + build/libs/Terra-*.jar + LICENSE \ No newline at end of file diff --git a/README.md b/README.md index 0b0eb8b93..a33baa859 100644 --- a/README.md +++ b/README.md @@ -7,40 +7,47 @@ to your specifications, with no knowledge of Java required. * Paper+ servers (Paper, Tuinity, Purpur, etc): [SpigotMC](https://www.spigotmc.org/resources/85151/) * Fabric: [Modrinth](https://modrinth.com/mod/terra) / [CurseForge](https://www.curseforge.com/minecraft/mc-mods/terra-world-generator) -* Forge **(ALPHA - NOT PRODUCTION-READY)**: [Modrinth](https://modrinth.com/mod/terra) / [CurseForge](https://www.curseforge.com/minecraft/mc-mods/terra-world-generator) +* Forge **(ALPHA - NOT PRODUCTION-READY)**: [Modrinth](https://modrinth.com/mod/terra) + / [CurseForge](https://www.curseforge.com/minecraft/mc-mods/terra-world-generator) ## Building and Running Terra -To build, simply run `./gradlew build` (`gradlew.bat build` on Windows). This will build all platforms, and -produce JARs in `platforms//build/libs` +To build, simply run `./gradlew build` (`gradlew.bat build` on Windows). This will build all platforms, and produce JARs +in `platforms//build/libs` ### Production JARs: + * Bukkit: `Terra--shaded.jar` * Fabric: `Terra--shaded-mapped.jar` * Forge: `Terra--shaded.jar` ### Building a Specific Platform + To build a specific platform, run `gradlew :platforms::build`. JARs are produced in `platforms//build/libs`. ### Running Minecraft in the IDE + To run Minecraft with Terra in the IDE (for testing) use the following tasks: + * Bukkit - * `installPaper` - Install a [Paper](https://github.com/PaperMC/Paper) test server. (Only needs to be run once). - * `installPurpur` - Install a [Purpur](https://github.com/pl3xgaming/Purpur) test server. (Only needs to be run once). - * `runPaper` - Run the Paper test server with Terra (`installPaper` must have been run previously). - * `runPurpur` - Run the Purpur test server with Terra (`installPurpur` must have been run previously). + * `installPaper` - Install a [Paper](https://github.com/PaperMC/Paper) test server. (Only needs to be run once). + * `installPurpur` - Install a [Purpur](https://github.com/pl3xgaming/Purpur) test server. (Only needs to be run once). + * `runPaper` - Run the Paper test server with Terra (`installPaper` must have been run previously). + * `runPurpur` - Run the Purpur test server with Terra (`installPurpur` must have been run previously). * Fabric - * `runClient` - Run a Minecraft Fabric client with Terra installed. - * `runServer` - Run a Minecraft Fabric server with Terra installed. + * `runClient` - Run a Minecraft Fabric client with Terra installed. + * `runServer` - Run a Minecraft Fabric server with Terra installed. * Forge - * `runClient` - Run a Minecraft Forge client with Terra installed. - * `runServer` - Run a Minecraft Forge server with Terra installed. + * `runClient` - Run a Minecraft Forge client with Terra installed. + * `runServer` - Run a Minecraft Forge server with Terra installed. + ## Contributing -Contributions are welcome! If you want to see a feature in Terra, please, open an issue, or implement it yourself and -submit a PR! + +Contributions are welcome! If you want to see a feature in Terra, please, open an issue, or implement it yourself and submit a PR! Join the discord [here](https://discord.gg/PXUEbbF) if you would like to talk more about the project! ## Beta + Terra is still in beta! While it is stable, it is not feature-complete. There is a lot to be added! diff --git a/buildSrc/src/main/kotlin/com/dfsek/terra/CommonConfig.kt b/buildSrc/src/main/kotlin/com/dfsek/terra/CommonConfig.kt index 3f10dc573..fa6952a8d 100644 --- a/buildSrc/src/main/kotlin/com/dfsek/terra/CommonConfig.kt +++ b/buildSrc/src/main/kotlin/com/dfsek/terra/CommonConfig.kt @@ -1,9 +1,6 @@ package com.dfsek.terra import org.gradle.api.Project -import org.gradle.api.tasks.testing.Test -import org.gradle.kotlin.dsl.apply -import org.gradle.kotlin.dsl.withType import java.io.ByteArrayOutputStream fun Project.configureCommon() { diff --git a/buildSrc/src/main/kotlin/com/dfsek/terra/DistributionConfig.kt b/buildSrc/src/main/kotlin/com/dfsek/terra/DistributionConfig.kt index ee81dc9b8..179feee76 100644 --- a/buildSrc/src/main/kotlin/com/dfsek/terra/DistributionConfig.kt +++ b/buildSrc/src/main/kotlin/com/dfsek/terra/DistributionConfig.kt @@ -4,9 +4,10 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar import org.gradle.api.DefaultTask import org.gradle.api.Project import org.gradle.api.plugins.BasePluginConvention -import org.gradle.api.tasks.bundling.Jar -import org.gradle.api.tasks.javadoc.Javadoc -import org.gradle.kotlin.dsl.* +import org.gradle.kotlin.dsl.apply +import org.gradle.kotlin.dsl.get +import org.gradle.kotlin.dsl.getPlugin +import org.gradle.kotlin.dsl.named import java.io.File import java.net.URL diff --git a/common/api/src/main/java/com/dfsek/terra/api/block/Block.java b/common/api/src/main/java/com/dfsek/terra/api/block/Block.java index 4827a7845..97cd4af8b 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/block/Block.java +++ b/common/api/src/main/java/com/dfsek/terra/api/block/Block.java @@ -1,8 +1,8 @@ package com.dfsek.terra.api.block; -import com.dfsek.terra.api.vector.Location; import com.dfsek.terra.api.Handle; import com.dfsek.terra.api.block.state.BlockState; +import com.dfsek.terra.api.vector.Location; public interface Block extends Handle { void setBlockData(BlockData data, boolean physics); diff --git a/common/api/src/main/java/com/dfsek/terra/api/block/BlockFace.java b/common/api/src/main/java/com/dfsek/terra/api/block/BlockFace.java index d367839e7..14a2f5efd 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/block/BlockFace.java +++ b/common/api/src/main/java/com/dfsek/terra/api/block/BlockFace.java @@ -1,6 +1,5 @@ package com.dfsek.terra.api.block; -import com.dfsek.terra.api.vector.Vector3; import org.jetbrains.annotations.NotNull; public enum BlockFace { diff --git a/common/api/src/main/java/com/dfsek/terra/api/block/data/AnaloguePowerable.java b/common/api/src/main/java/com/dfsek/terra/api/block/data/AnaloguePowerable.java index c0df25e37..cfa57bb7a 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/block/data/AnaloguePowerable.java +++ b/common/api/src/main/java/com/dfsek/terra/api/block/data/AnaloguePowerable.java @@ -4,6 +4,8 @@ import com.dfsek.terra.api.block.BlockData; public interface AnaloguePowerable extends BlockData { int getMaximumPower(); + int getPower(); + void setPower(int power); } diff --git a/common/api/src/main/java/com/dfsek/terra/api/block/data/RedstoneWire.java b/common/api/src/main/java/com/dfsek/terra/api/block/data/RedstoneWire.java index 0f34dcb52..06a406d49 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/block/data/RedstoneWire.java +++ b/common/api/src/main/java/com/dfsek/terra/api/block/data/RedstoneWire.java @@ -7,8 +7,11 @@ import java.util.Set; public interface RedstoneWire extends BlockData, AnaloguePowerable { Set getAllowedFaces(); + Connection getFace(BlockFace face); + void setFace(BlockFace face, Connection connection); + enum Connection { NONE, SIDE, UP } diff --git a/common/api/src/main/java/com/dfsek/terra/api/block/data/Wall.java b/common/api/src/main/java/com/dfsek/terra/api/block/data/Wall.java index 440daccbb..33d8ed086 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/block/data/Wall.java +++ b/common/api/src/main/java/com/dfsek/terra/api/block/data/Wall.java @@ -5,8 +5,11 @@ import com.dfsek.terra.api.block.BlockFace; public interface Wall extends BlockData, Waterlogged { boolean isUp(); + void setHeight(BlockFace face, Height height); + Height getHeight(BlockFace face); + void setUp(boolean up); enum Height { diff --git a/common/api/src/main/java/com/dfsek/terra/api/config/WorldConfig.java b/common/api/src/main/java/com/dfsek/terra/api/config/WorldConfig.java index 46afd9635..8b8f0144d 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/config/WorldConfig.java +++ b/common/api/src/main/java/com/dfsek/terra/api/config/WorldConfig.java @@ -1,13 +1,11 @@ package com.dfsek.terra.api.config; import com.dfsek.terra.api.registry.Registry; -import com.dfsek.terra.api.util.ProbabilityCollection; import com.dfsek.terra.api.world.TerraWorld; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; import com.dfsek.terra.api.world.generator.SamplerCache; import java.util.Map; -import java.util.Set; public interface WorldConfig { @SuppressWarnings("unchecked") diff --git a/common/api/src/main/java/com/dfsek/terra/api/entity/Entity.java b/common/api/src/main/java/com/dfsek/terra/api/entity/Entity.java index f2410e8ac..96811a9a6 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/entity/Entity.java +++ b/common/api/src/main/java/com/dfsek/terra/api/entity/Entity.java @@ -1,6 +1,5 @@ package com.dfsek.terra.api.entity; -import com.dfsek.terra.api.vector.Location; import com.dfsek.terra.api.Handle; import com.dfsek.terra.api.vector.Vector3; import com.dfsek.terra.api.world.World; diff --git a/common/api/src/main/java/com/dfsek/terra/api/event/annotations/Priority.java b/common/api/src/main/java/com/dfsek/terra/api/event/annotations/Priority.java index 2d5b7c11f..08c0d86c9 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/event/annotations/Priority.java +++ b/common/api/src/main/java/com/dfsek/terra/api/event/annotations/Priority.java @@ -31,6 +31,7 @@ public @interface Priority { * Low Priority. */ int LOW = -1; + /** * @return Priority of this event. Events are executed from lowest to highest priorities. */ diff --git a/common/api/src/main/java/com/dfsek/terra/api/event/events/world/generation/EntitySpawnEvent.java b/common/api/src/main/java/com/dfsek/terra/api/event/events/world/generation/EntitySpawnEvent.java index c02acaa03..ecd4a842d 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/event/events/world/generation/EntitySpawnEvent.java +++ b/common/api/src/main/java/com/dfsek/terra/api/event/events/world/generation/EntitySpawnEvent.java @@ -1,10 +1,8 @@ package com.dfsek.terra.api.event.events.world.generation; import com.dfsek.terra.api.config.ConfigPack; -import com.dfsek.terra.api.event.events.PackEvent; import com.dfsek.terra.api.entity.Entity; -import com.dfsek.terra.api.vector.Location; -import com.dfsek.terra.api.vector.Vector3; +import com.dfsek.terra.api.event.events.PackEvent; /** * Called when an entity is spawned. diff --git a/common/api/src/main/java/com/dfsek/terra/api/event/events/world/generation/LootPopulateEvent.java b/common/api/src/main/java/com/dfsek/terra/api/event/events/world/generation/LootPopulateEvent.java index 7e22770f0..28af48a39 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/event/events/world/generation/LootPopulateEvent.java +++ b/common/api/src/main/java/com/dfsek/terra/api/event/events/world/generation/LootPopulateEvent.java @@ -1,11 +1,11 @@ package com.dfsek.terra.api.event.events.world.generation; +import com.dfsek.terra.api.block.Block; +import com.dfsek.terra.api.block.state.Container; import com.dfsek.terra.api.config.ConfigPack; import com.dfsek.terra.api.event.events.AbstractCancellable; import com.dfsek.terra.api.event.events.Cancellable; import com.dfsek.terra.api.event.events.PackEvent; -import com.dfsek.terra.api.block.Block; -import com.dfsek.terra.api.block.state.Container; import com.dfsek.terra.api.structure.LootTable; import com.dfsek.terra.api.structure.Structure; import org.jetbrains.annotations.NotNull; @@ -53,6 +53,7 @@ public class LootPopulateEvent extends AbstractCancellable implements PackEvent, /** * Get the loot table to be populated. + * * @return Loot table. */ public LootTable getTable() { diff --git a/common/api/src/main/java/com/dfsek/terra/api/lang/Message.java b/common/api/src/main/java/com/dfsek/terra/api/lang/Message.java index 9fedd163d..866f753f8 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/lang/Message.java +++ b/common/api/src/main/java/com/dfsek/terra/api/lang/Message.java @@ -8,6 +8,8 @@ import java.util.logging.Logger; public interface Message { void log(Logger logger, Level level, String... args); + void send(CommandSender sender, String... args); + boolean isEmpty(); } diff --git a/common/api/src/main/java/com/dfsek/terra/api/util/JarUtil.java b/common/api/src/main/java/com/dfsek/terra/api/util/JarUtil.java index 981dfdb7f..569c46cd6 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/util/JarUtil.java +++ b/common/api/src/main/java/com/dfsek/terra/api/util/JarUtil.java @@ -16,7 +16,7 @@ public class JarUtil { public static void copyResourcesToDirectory(JarFile fromJar, String sourceDir, String destDir) throws IOException { for(Enumeration entries = fromJar.entries(); entries.hasMoreElements(); ) { JarEntry entry = entries.nextElement(); - if(entry.getName().startsWith(sourceDir + "/") && ! entry.isDirectory()) { + if(entry.getName().startsWith(sourceDir + "/") && !entry.isDirectory()) { File dest = new File(destDir + File.separator + entry.getName().substring(sourceDir.length() + 1)); if(dest.exists()) continue; File parent = dest.getParentFile(); diff --git a/common/api/src/main/java/com/dfsek/terra/api/util/MathUtil.java b/common/api/src/main/java/com/dfsek/terra/api/util/MathUtil.java index 2109e3088..54289a105 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/util/MathUtil.java +++ b/common/api/src/main/java/com/dfsek/terra/api/util/MathUtil.java @@ -4,7 +4,6 @@ import com.dfsek.terra.api.world.generator.Sampler; import net.jafama.FastMath; import java.util.List; -import java.util.Random; /** * Utility class for mathematical functions. diff --git a/common/api/src/main/java/com/dfsek/terra/api/util/mutable/MutablePrimitive.java b/common/api/src/main/java/com/dfsek/terra/api/util/mutable/MutablePrimitive.java index ab3e17f70..3c714f44c 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/util/mutable/MutablePrimitive.java +++ b/common/api/src/main/java/com/dfsek/terra/api/util/mutable/MutablePrimitive.java @@ -1,6 +1,6 @@ package com.dfsek.terra.api.util.mutable; -public interface MutablePrimitive extends Comparable{ +public interface MutablePrimitive extends Comparable { T get(); void set(T value); diff --git a/common/api/src/main/java/com/dfsek/terra/api/world/Flora.java b/common/api/src/main/java/com/dfsek/terra/api/world/Flora.java index 536018fac..38481728f 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/world/Flora.java +++ b/common/api/src/main/java/com/dfsek/terra/api/world/Flora.java @@ -1,8 +1,8 @@ package com.dfsek.terra.api.world; +import com.dfsek.terra.api.block.Block; import com.dfsek.terra.api.util.Range; import com.dfsek.terra.api.vector.Location; -import com.dfsek.terra.api.block.Block; import java.util.List; diff --git a/common/api/src/main/java/com/dfsek/terra/api/world/World.java b/common/api/src/main/java/com/dfsek/terra/api/world/World.java index 1a4a96d1e..956f95d93 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/world/World.java +++ b/common/api/src/main/java/com/dfsek/terra/api/world/World.java @@ -1,10 +1,10 @@ package com.dfsek.terra.api.world; -import com.dfsek.terra.api.vector.Location; import com.dfsek.terra.api.Handle; import com.dfsek.terra.api.block.Block; import com.dfsek.terra.api.entity.Entity; import com.dfsek.terra.api.entity.EntityType; +import com.dfsek.terra.api.vector.Location; import com.dfsek.terra.api.world.generator.ChunkGenerator; import com.dfsek.terra.api.world.generator.GeneratorWrapper; import com.dfsek.terra.api.world.generator.TerraChunkGenerator; diff --git a/common/api/src/main/java/com/dfsek/terra/api/world/biome/generation/pipeline/BiomeMutator.java b/common/api/src/main/java/com/dfsek/terra/api/world/biome/generation/pipeline/BiomeMutator.java index 3240297c0..d474ddb08 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/world/biome/generation/pipeline/BiomeMutator.java +++ b/common/api/src/main/java/com/dfsek/terra/api/world/biome/generation/pipeline/BiomeMutator.java @@ -1,7 +1,6 @@ package com.dfsek.terra.api.world.biome.generation.pipeline; import com.dfsek.terra.api.world.biome.TerraBiome; -import com.dfsek.terra.api.world.biome.generation.pipeline.BiomeHolder; public interface BiomeMutator { TerraBiome mutate(ViewPoint viewPoint, double x, double z); diff --git a/common/api/src/main/java/com/dfsek/terra/api/world/biome/generation/pipeline/Stage.java b/common/api/src/main/java/com/dfsek/terra/api/world/biome/generation/pipeline/Stage.java index 3ed4417f6..5d5c44aa4 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/world/biome/generation/pipeline/Stage.java +++ b/common/api/src/main/java/com/dfsek/terra/api/world/biome/generation/pipeline/Stage.java @@ -1,7 +1,5 @@ package com.dfsek.terra.api.world.biome.generation.pipeline; -import com.dfsek.terra.api.world.biome.generation.pipeline.BiomeHolder; - public interface Stage { boolean isExpansion(); diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/command/TerraCommandManager.java b/common/implementation/src/main/java/com/dfsek/terra/api/command/TerraCommandManager.java index a4c413db3..76370a7c3 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/command/TerraCommandManager.java +++ b/common/implementation/src/main/java/com/dfsek/terra/api/command/TerraCommandManager.java @@ -17,10 +17,10 @@ import com.dfsek.terra.api.command.exception.InvalidArgumentsException; import com.dfsek.terra.api.command.exception.MalformedCommandException; import com.dfsek.terra.api.command.exception.SwitchFormatException; import com.dfsek.terra.api.command.tab.TabCompleter; -import com.dfsek.terra.api.inject.InjectorImpl; -import com.dfsek.terra.api.injection.exception.InjectionException; import com.dfsek.terra.api.entity.CommandSender; import com.dfsek.terra.api.entity.Player; +import com.dfsek.terra.api.inject.InjectorImpl; +import com.dfsek.terra.api.injection.exception.InjectionException; import com.dfsek.terra.api.util.ReflectionUtil; import net.jafama.FastMath; diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/math/GridSpawn.java b/common/implementation/src/main/java/com/dfsek/terra/api/math/GridSpawn.java index 00cd32036..f50ac27f5 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/math/GridSpawn.java +++ b/common/implementation/src/main/java/com/dfsek/terra/api/math/GridSpawn.java @@ -1,10 +1,10 @@ package com.dfsek.terra.api.math; +import com.dfsek.terra.api.util.FastRandom; +import com.dfsek.terra.api.util.GlueList; import com.dfsek.terra.api.util.PopulationUtil; import com.dfsek.terra.api.vector.Vector3; import com.dfsek.terra.vector.Vector3Impl; -import com.dfsek.terra.api.util.FastRandom; -import com.dfsek.terra.api.util.GlueList; import java.util.List; import java.util.Random; diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/math/paralithic/noise/NoiseFunction2.java b/common/implementation/src/main/java/com/dfsek/terra/api/math/paralithic/noise/NoiseFunction2.java index 113a9cd5d..2a1fa0f94 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/math/paralithic/noise/NoiseFunction2.java +++ b/common/implementation/src/main/java/com/dfsek/terra/api/math/paralithic/noise/NoiseFunction2.java @@ -4,7 +4,6 @@ import com.dfsek.terra.api.noise.NoiseSampler; import com.dfsek.terra.api.util.hash.HashMapDoubleDouble; - public class NoiseFunction2 implements NoiseFunction { private final NoiseSampler gen; private final Cache cache = new Cache(); diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/structures/parser/Parser.java b/common/implementation/src/main/java/com/dfsek/terra/api/structures/parser/Parser.java index c6434fbad..14d88016c 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/structures/parser/Parser.java +++ b/common/implementation/src/main/java/com/dfsek/terra/api/structures/parser/Parser.java @@ -346,7 +346,7 @@ public class Parser { Token token = tokens.get(); if(token.getType().equals(Token.Type.BLOCK_END)) break; // Stop parsing at block end. Item parsedItem = parseItem(tokens, parsedVariables, loop); - if (parsedItem != Function.NULL) { + if(parsedItem != Function.NULL) { parsedItems.add(parsedItem); } if(tokens.hasNext() && !token.isLoopLike()) ParserUtil.checkType(tokens.consume(), Token.Type.STATEMENT_END); @@ -407,7 +407,7 @@ public class Parser { ParserUtil.checkType(tokens.consume(), Token.Type.GROUP_END); // Remove body end if(fullStatement) ParserUtil.checkType(tokens.get(), Token.Type.STATEMENT_END); - + if(ignoredFunctions.contains(identifier.getContent())) { return Function.NULL; } diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/StructureScript.java b/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/StructureScript.java index fcdf95946..3ed76c81f 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/StructureScript.java +++ b/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/StructureScript.java @@ -1,12 +1,12 @@ package com.dfsek.terra.api.structures.script; import com.dfsek.terra.api.TerraPlugin; +import com.dfsek.terra.api.profiler.ProfileFrame; +import com.dfsek.terra.api.registry.Registry; import com.dfsek.terra.api.structure.LootTable; import com.dfsek.terra.api.structure.Structure; -import com.dfsek.terra.api.vector.Location; -import com.dfsek.terra.vector.LocationImpl; -import com.dfsek.terra.api.world.Chunk; -import com.dfsek.terra.api.registry.Registry; +import com.dfsek.terra.api.structure.buffer.Buffer; +import com.dfsek.terra.api.structure.rotation.Rotation; import com.dfsek.terra.api.structures.parser.Parser; import com.dfsek.terra.api.structures.parser.exceptions.ParseException; import com.dfsek.terra.api.structures.parser.lang.Block; @@ -30,11 +30,10 @@ import com.dfsek.terra.api.structures.script.builders.UnaryBooleanFunctionBuilde import com.dfsek.terra.api.structures.script.builders.UnaryNumberFunctionBuilder; import com.dfsek.terra.api.structures.script.builders.UnaryStringFunctionBuilder; import com.dfsek.terra.api.structures.script.builders.ZeroArgFunctionBuilder; -import com.dfsek.terra.api.structure.rotation.Rotation; -import com.dfsek.terra.api.structure.buffer.Buffer; import com.dfsek.terra.api.structures.structure.buffer.DirectBuffer; import com.dfsek.terra.api.structures.structure.buffer.StructureBuffer; -import com.dfsek.terra.api.profiler.ProfileFrame; +import com.dfsek.terra.api.vector.Location; +import com.dfsek.terra.api.world.Chunk; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; import net.jafama.FastMath; diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/TerraImplementationArguments.java b/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/TerraImplementationArguments.java index c81f73224..40a8ec29f 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/TerraImplementationArguments.java +++ b/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/TerraImplementationArguments.java @@ -1,8 +1,8 @@ package com.dfsek.terra.api.structures.script; -import com.dfsek.terra.api.structures.parser.lang.ImplementationArguments; -import com.dfsek.terra.api.structure.rotation.Rotation; import com.dfsek.terra.api.structure.buffer.Buffer; +import com.dfsek.terra.api.structure.rotation.Rotation; +import com.dfsek.terra.api.structures.parser.lang.ImplementationArguments; import java.util.Random; diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/AbstractBlockFunction.java b/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/AbstractBlockFunction.java index 99761f949..12ae0a519 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/AbstractBlockFunction.java +++ b/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/AbstractBlockFunction.java @@ -1,18 +1,18 @@ package com.dfsek.terra.api.structures.script.functions; import com.dfsek.terra.api.TerraPlugin; -import com.dfsek.terra.api.vector.Vector2; -import com.dfsek.terra.vector.Vector2Impl; -import com.dfsek.terra.vector.Vector3Impl; import com.dfsek.terra.api.block.BlockData; import com.dfsek.terra.api.structures.parser.lang.ImplementationArguments; import com.dfsek.terra.api.structures.parser.lang.Returnable; import com.dfsek.terra.api.structures.parser.lang.functions.Function; import com.dfsek.terra.api.structures.parser.lang.variables.Variable; import com.dfsek.terra.api.structures.script.TerraImplementationArguments; -import com.dfsek.terra.api.util.RotationUtil; import com.dfsek.terra.api.structures.structure.buffer.items.BufferedBlock; import com.dfsek.terra.api.structures.tokenizer.Position; +import com.dfsek.terra.api.util.RotationUtil; +import com.dfsek.terra.api.vector.Vector2; +import com.dfsek.terra.vector.Vector2Impl; +import com.dfsek.terra.vector.Vector3Impl; import net.jafama.FastMath; import java.util.Map; diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/BiomeFunction.java b/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/BiomeFunction.java index d90384b5c..90f74f799 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/BiomeFunction.java +++ b/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/BiomeFunction.java @@ -1,18 +1,18 @@ package com.dfsek.terra.api.structures.script.functions; import com.dfsek.terra.api.TerraPlugin; -import com.dfsek.terra.api.vector.Vector2; -import com.dfsek.terra.vector.Vector2Impl; -import com.dfsek.terra.vector.Vector3Impl; import com.dfsek.terra.api.structures.parser.lang.ImplementationArguments; import com.dfsek.terra.api.structures.parser.lang.Returnable; import com.dfsek.terra.api.structures.parser.lang.functions.Function; import com.dfsek.terra.api.structures.parser.lang.variables.Variable; import com.dfsek.terra.api.structures.script.TerraImplementationArguments; -import com.dfsek.terra.api.util.RotationUtil; import com.dfsek.terra.api.structures.tokenizer.Position; +import com.dfsek.terra.api.util.RotationUtil; +import com.dfsek.terra.api.vector.Vector2; import com.dfsek.terra.api.world.biome.UserDefinedBiome; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; +import com.dfsek.terra.vector.Vector2Impl; +import com.dfsek.terra.vector.Vector3Impl; import net.jafama.FastMath; import java.util.Map; diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/CheckBlockFunction.java b/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/CheckBlockFunction.java index 3ea7addc7..987bc9778 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/CheckBlockFunction.java +++ b/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/CheckBlockFunction.java @@ -1,15 +1,15 @@ package com.dfsek.terra.api.structures.script.functions; -import com.dfsek.terra.api.vector.Vector2; -import com.dfsek.terra.vector.Vector2Impl; -import com.dfsek.terra.vector.Vector3Impl; import com.dfsek.terra.api.structures.parser.lang.ImplementationArguments; import com.dfsek.terra.api.structures.parser.lang.Returnable; import com.dfsek.terra.api.structures.parser.lang.functions.Function; import com.dfsek.terra.api.structures.parser.lang.variables.Variable; import com.dfsek.terra.api.structures.script.TerraImplementationArguments; -import com.dfsek.terra.api.util.RotationUtil; import com.dfsek.terra.api.structures.tokenizer.Position; +import com.dfsek.terra.api.util.RotationUtil; +import com.dfsek.terra.api.vector.Vector2; +import com.dfsek.terra.vector.Vector2Impl; +import com.dfsek.terra.vector.Vector3Impl; import net.jafama.FastMath; import java.util.Map; diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/CheckFunction.java b/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/CheckFunction.java index 5a9813acc..1aa5441ee 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/CheckFunction.java +++ b/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/CheckFunction.java @@ -1,24 +1,23 @@ package com.dfsek.terra.api.structures.script.functions; import com.dfsek.terra.api.TerraPlugin; -import com.dfsek.terra.api.vector.Location; -import com.dfsek.terra.api.world.generator.SamplerCache; -import com.dfsek.terra.vector.LocationImpl; -import com.dfsek.terra.api.vector.Vector2; -import com.dfsek.terra.api.world.TerraWorld; -import com.dfsek.terra.vector.Vector2Impl; -import com.dfsek.terra.vector.Vector3Impl; -import com.dfsek.terra.api.world.World; import com.dfsek.terra.api.structures.parser.lang.ImplementationArguments; import com.dfsek.terra.api.structures.parser.lang.Returnable; import com.dfsek.terra.api.structures.parser.lang.functions.Function; import com.dfsek.terra.api.structures.parser.lang.variables.Variable; import com.dfsek.terra.api.structures.script.TerraImplementationArguments; -import com.dfsek.terra.api.util.RotationUtil; import com.dfsek.terra.api.structures.tokenizer.Position; +import com.dfsek.terra.api.util.RotationUtil; +import com.dfsek.terra.api.vector.Location; +import com.dfsek.terra.api.vector.Vector2; +import com.dfsek.terra.api.world.TerraWorld; +import com.dfsek.terra.api.world.World; import com.dfsek.terra.api.world.biome.UserDefinedBiome; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; +import com.dfsek.terra.api.world.generator.SamplerCache; import com.dfsek.terra.config.templates.BiomeTemplate; +import com.dfsek.terra.vector.Vector2Impl; +import com.dfsek.terra.vector.Vector3Impl; import net.jafama.FastMath; import java.util.Map; diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/EntityFunction.java b/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/EntityFunction.java index e5c0875ed..22c378c78 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/EntityFunction.java +++ b/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/EntityFunction.java @@ -1,9 +1,6 @@ package com.dfsek.terra.api.structures.script.functions; import com.dfsek.terra.api.TerraPlugin; -import com.dfsek.terra.api.vector.Vector2; -import com.dfsek.terra.vector.Vector2Impl; -import com.dfsek.terra.vector.Vector3Impl; import com.dfsek.terra.api.entity.EntityType; import com.dfsek.terra.api.structures.parser.exceptions.ParseException; import com.dfsek.terra.api.structures.parser.lang.ImplementationArguments; @@ -12,9 +9,12 @@ import com.dfsek.terra.api.structures.parser.lang.constants.ConstantExpression; import com.dfsek.terra.api.structures.parser.lang.functions.Function; import com.dfsek.terra.api.structures.parser.lang.variables.Variable; import com.dfsek.terra.api.structures.script.TerraImplementationArguments; -import com.dfsek.terra.api.util.RotationUtil; import com.dfsek.terra.api.structures.structure.buffer.items.BufferedEntity; import com.dfsek.terra.api.structures.tokenizer.Position; +import com.dfsek.terra.api.util.RotationUtil; +import com.dfsek.terra.api.vector.Vector2; +import com.dfsek.terra.vector.Vector2Impl; +import com.dfsek.terra.vector.Vector3Impl; import java.util.Map; diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/GetMarkFunction.java b/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/GetMarkFunction.java index 60468a73d..c691db385 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/GetMarkFunction.java +++ b/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/GetMarkFunction.java @@ -1,15 +1,15 @@ package com.dfsek.terra.api.structures.script.functions; -import com.dfsek.terra.api.vector.Vector2; -import com.dfsek.terra.vector.Vector2Impl; -import com.dfsek.terra.vector.Vector3Impl; import com.dfsek.terra.api.structures.parser.lang.ImplementationArguments; import com.dfsek.terra.api.structures.parser.lang.Returnable; import com.dfsek.terra.api.structures.parser.lang.functions.Function; import com.dfsek.terra.api.structures.parser.lang.variables.Variable; import com.dfsek.terra.api.structures.script.TerraImplementationArguments; -import com.dfsek.terra.api.util.RotationUtil; import com.dfsek.terra.api.structures.tokenizer.Position; +import com.dfsek.terra.api.util.RotationUtil; +import com.dfsek.terra.api.vector.Vector2; +import com.dfsek.terra.vector.Vector2Impl; +import com.dfsek.terra.vector.Vector3Impl; import net.jafama.FastMath; import java.util.Map; diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/LootFunction.java b/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/LootFunction.java index a3f0f7079..61c2c87e8 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/LootFunction.java +++ b/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/LootFunction.java @@ -1,21 +1,20 @@ package com.dfsek.terra.api.structures.script.functions; import com.dfsek.terra.api.TerraPlugin; -import com.dfsek.terra.api.structure.LootTable; -import com.dfsek.terra.api.vector.Vector2; -import com.dfsek.terra.vector.Vector2Impl; -import com.dfsek.terra.vector.Vector3Impl; import com.dfsek.terra.api.registry.Registry; -import com.dfsek.terra.api.structures.loot.LootTableImpl; +import com.dfsek.terra.api.structure.LootTable; import com.dfsek.terra.api.structures.parser.lang.ImplementationArguments; import com.dfsek.terra.api.structures.parser.lang.Returnable; import com.dfsek.terra.api.structures.parser.lang.functions.Function; import com.dfsek.terra.api.structures.parser.lang.variables.Variable; import com.dfsek.terra.api.structures.script.StructureScript; import com.dfsek.terra.api.structures.script.TerraImplementationArguments; -import com.dfsek.terra.api.util.RotationUtil; import com.dfsek.terra.api.structures.structure.buffer.items.BufferedLootApplication; import com.dfsek.terra.api.structures.tokenizer.Position; +import com.dfsek.terra.api.util.RotationUtil; +import com.dfsek.terra.api.vector.Vector2; +import com.dfsek.terra.vector.Vector2Impl; +import com.dfsek.terra.vector.Vector3Impl; import net.jafama.FastMath; import java.util.Map; diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/PullFunction.java b/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/PullFunction.java index 0c27d0f2f..f8ce4a49e 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/PullFunction.java +++ b/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/PullFunction.java @@ -1,9 +1,6 @@ package com.dfsek.terra.api.structures.script.functions; import com.dfsek.terra.api.TerraPlugin; -import com.dfsek.terra.api.vector.Vector2; -import com.dfsek.terra.vector.Vector2Impl; -import com.dfsek.terra.vector.Vector3Impl; import com.dfsek.terra.api.block.BlockData; import com.dfsek.terra.api.structures.parser.exceptions.ParseException; import com.dfsek.terra.api.structures.parser.lang.ImplementationArguments; @@ -12,9 +9,12 @@ import com.dfsek.terra.api.structures.parser.lang.constants.ConstantExpression; import com.dfsek.terra.api.structures.parser.lang.functions.Function; import com.dfsek.terra.api.structures.parser.lang.variables.Variable; import com.dfsek.terra.api.structures.script.TerraImplementationArguments; -import com.dfsek.terra.api.util.RotationUtil; import com.dfsek.terra.api.structures.structure.buffer.items.BufferedPulledBlock; import com.dfsek.terra.api.structures.tokenizer.Position; +import com.dfsek.terra.api.util.RotationUtil; +import com.dfsek.terra.api.vector.Vector2; +import com.dfsek.terra.vector.Vector2Impl; +import com.dfsek.terra.vector.Vector3Impl; import net.jafama.FastMath; import java.util.Map; diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/SetMarkFunction.java b/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/SetMarkFunction.java index fdf9d3ba0..3fe7fbb8e 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/SetMarkFunction.java +++ b/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/SetMarkFunction.java @@ -1,15 +1,15 @@ package com.dfsek.terra.api.structures.script.functions; -import com.dfsek.terra.api.vector.Vector2; -import com.dfsek.terra.vector.Vector2Impl; -import com.dfsek.terra.vector.Vector3Impl; import com.dfsek.terra.api.structures.parser.lang.ImplementationArguments; import com.dfsek.terra.api.structures.parser.lang.Returnable; import com.dfsek.terra.api.structures.parser.lang.functions.Function; import com.dfsek.terra.api.structures.parser.lang.variables.Variable; import com.dfsek.terra.api.structures.script.TerraImplementationArguments; -import com.dfsek.terra.api.util.RotationUtil; import com.dfsek.terra.api.structures.tokenizer.Position; +import com.dfsek.terra.api.util.RotationUtil; +import com.dfsek.terra.api.vector.Vector2; +import com.dfsek.terra.vector.Vector2Impl; +import com.dfsek.terra.vector.Vector3Impl; import net.jafama.FastMath; import java.util.Map; diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/StateFunction.java b/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/StateFunction.java index 6ff2263d2..5c6f68306 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/StateFunction.java +++ b/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/StateFunction.java @@ -1,17 +1,17 @@ package com.dfsek.terra.api.structures.script.functions; import com.dfsek.terra.api.TerraPlugin; -import com.dfsek.terra.api.vector.Vector2; -import com.dfsek.terra.vector.Vector2Impl; -import com.dfsek.terra.vector.Vector3Impl; import com.dfsek.terra.api.structures.parser.lang.ImplementationArguments; import com.dfsek.terra.api.structures.parser.lang.Returnable; import com.dfsek.terra.api.structures.parser.lang.functions.Function; import com.dfsek.terra.api.structures.parser.lang.variables.Variable; import com.dfsek.terra.api.structures.script.TerraImplementationArguments; -import com.dfsek.terra.api.util.RotationUtil; import com.dfsek.terra.api.structures.structure.buffer.items.BufferedStateManipulator; import com.dfsek.terra.api.structures.tokenizer.Position; +import com.dfsek.terra.api.util.RotationUtil; +import com.dfsek.terra.api.vector.Vector2; +import com.dfsek.terra.vector.Vector2Impl; +import com.dfsek.terra.vector.Vector3Impl; import net.jafama.FastMath; import java.util.Map; diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/StructureFunction.java b/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/StructureFunction.java index 7e4c6c6b5..86e342256 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/StructureFunction.java +++ b/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/StructureFunction.java @@ -1,21 +1,21 @@ package com.dfsek.terra.api.structures.script.functions; import com.dfsek.terra.api.TerraPlugin; -import com.dfsek.terra.api.structure.Structure; -import com.dfsek.terra.api.vector.Vector2; -import com.dfsek.terra.vector.Vector2Impl; -import com.dfsek.terra.api.vector.Vector3; -import com.dfsek.terra.vector.Vector3Impl; import com.dfsek.terra.api.registry.Registry; +import com.dfsek.terra.api.structure.Structure; +import com.dfsek.terra.api.structure.rotation.Rotation; import com.dfsek.terra.api.structures.parser.lang.ImplementationArguments; import com.dfsek.terra.api.structures.parser.lang.Returnable; import com.dfsek.terra.api.structures.parser.lang.functions.Function; import com.dfsek.terra.api.structures.parser.lang.variables.Variable; import com.dfsek.terra.api.structures.script.TerraImplementationArguments; -import com.dfsek.terra.api.structure.rotation.Rotation; -import com.dfsek.terra.api.util.RotationUtil; import com.dfsek.terra.api.structures.structure.buffer.IntermediateBuffer; import com.dfsek.terra.api.structures.tokenizer.Position; +import com.dfsek.terra.api.util.RotationUtil; +import com.dfsek.terra.api.vector.Vector2; +import com.dfsek.terra.api.vector.Vector3; +import com.dfsek.terra.vector.Vector2Impl; +import com.dfsek.terra.vector.Vector3Impl; import net.jafama.FastMath; import java.util.List; diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/Cell.java b/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/Cell.java index 21e9a7def..7ed8d2ce5 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/Cell.java +++ b/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/Cell.java @@ -1,9 +1,8 @@ package com.dfsek.terra.api.structures.structure.buffer; -import com.dfsek.terra.api.vector.Location; -import com.dfsek.terra.vector.LocationImpl; import com.dfsek.terra.api.structure.buffer.BufferedItem; import com.dfsek.terra.api.util.GlueList; +import com.dfsek.terra.api.vector.Location; import java.util.List; diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/DirectBuffer.java b/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/DirectBuffer.java index c947e7d76..2c875bf2f 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/DirectBuffer.java +++ b/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/DirectBuffer.java @@ -1,9 +1,8 @@ package com.dfsek.terra.api.structures.structure.buffer; import com.dfsek.terra.api.structure.buffer.Buffer; -import com.dfsek.terra.api.vector.Location; -import com.dfsek.terra.vector.LocationImpl; import com.dfsek.terra.api.structure.buffer.BufferedItem; +import com.dfsek.terra.api.vector.Location; import java.util.LinkedHashMap; import java.util.Map; diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/IntermediateBuffer.java b/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/IntermediateBuffer.java index 737a6bd2b..25b36a466 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/IntermediateBuffer.java +++ b/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/IntermediateBuffer.java @@ -1,10 +1,9 @@ package com.dfsek.terra.api.structures.structure.buffer; import com.dfsek.terra.api.structure.buffer.Buffer; -import com.dfsek.terra.api.vector.Location; -import com.dfsek.terra.vector.LocationImpl; -import com.dfsek.terra.api.vector.Vector3; import com.dfsek.terra.api.structure.buffer.BufferedItem; +import com.dfsek.terra.api.vector.Location; +import com.dfsek.terra.api.vector.Vector3; public class IntermediateBuffer implements Buffer { private final Buffer original; diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/StructureBuffer.java b/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/StructureBuffer.java index 4e53c92dd..3d89b343d 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/StructureBuffer.java +++ b/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/StructureBuffer.java @@ -1,10 +1,9 @@ package com.dfsek.terra.api.structures.structure.buffer; import com.dfsek.terra.api.structure.buffer.Buffer; -import com.dfsek.terra.api.vector.Location; -import com.dfsek.terra.vector.LocationImpl; -import com.dfsek.terra.api.world.Chunk; import com.dfsek.terra.api.structure.buffer.BufferedItem; +import com.dfsek.terra.api.vector.Location; +import com.dfsek.terra.api.world.Chunk; import net.jafama.FastMath; import java.util.LinkedHashMap; diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/items/BufferedBlock.java b/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/items/BufferedBlock.java index df40380fd..08c7117a5 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/items/BufferedBlock.java +++ b/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/items/BufferedBlock.java @@ -1,12 +1,11 @@ package com.dfsek.terra.api.structures.structure.buffer.items; import com.dfsek.terra.api.TerraPlugin; -import com.dfsek.terra.api.structure.buffer.BufferedItem; -import com.dfsek.terra.api.vector.Location; -import com.dfsek.terra.vector.LocationImpl; import com.dfsek.terra.api.block.Block; import com.dfsek.terra.api.block.BlockData; import com.dfsek.terra.api.block.data.Waterlogged; +import com.dfsek.terra.api.structure.buffer.BufferedItem; +import com.dfsek.terra.api.vector.Location; public class BufferedBlock implements BufferedItem { private final BlockData data; diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/items/BufferedEntity.java b/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/items/BufferedEntity.java index 262fc6718..e54e2fdf4 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/items/BufferedEntity.java +++ b/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/items/BufferedEntity.java @@ -1,11 +1,11 @@ package com.dfsek.terra.api.structures.structure.buffer.items; import com.dfsek.terra.api.TerraPlugin; +import com.dfsek.terra.api.entity.Entity; +import com.dfsek.terra.api.entity.EntityType; import com.dfsek.terra.api.event.events.world.generation.EntitySpawnEvent; import com.dfsek.terra.api.structure.buffer.BufferedItem; import com.dfsek.terra.api.vector.Location; -import com.dfsek.terra.api.entity.Entity; -import com.dfsek.terra.api.entity.EntityType; public class BufferedEntity implements BufferedItem { diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/items/BufferedLootApplication.java b/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/items/BufferedLootApplication.java index 0222fd51b..b25f4546b 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/items/BufferedLootApplication.java +++ b/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/items/BufferedLootApplication.java @@ -1,17 +1,15 @@ package com.dfsek.terra.api.structures.structure.buffer.items; import com.dfsek.terra.api.TerraPlugin; -import com.dfsek.terra.api.event.events.world.generation.LootPopulateEvent; -import com.dfsek.terra.api.structure.LootTable; -import com.dfsek.terra.api.structure.buffer.BufferedItem; -import com.dfsek.terra.api.vector.Location; -import com.dfsek.terra.vector.LocationImpl; import com.dfsek.terra.api.block.Block; import com.dfsek.terra.api.block.state.BlockState; import com.dfsek.terra.api.block.state.Container; -import com.dfsek.terra.api.structures.loot.LootTableImpl; +import com.dfsek.terra.api.event.events.world.generation.LootPopulateEvent; +import com.dfsek.terra.api.structure.LootTable; +import com.dfsek.terra.api.structure.buffer.BufferedItem; import com.dfsek.terra.api.structures.script.StructureScript; import com.dfsek.terra.api.util.FastRandom; +import com.dfsek.terra.api.vector.Location; public class BufferedLootApplication implements BufferedItem { private final LootTable table; diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/items/BufferedPulledBlock.java b/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/items/BufferedPulledBlock.java index 9b5117283..df34b67c8 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/items/BufferedPulledBlock.java +++ b/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/items/BufferedPulledBlock.java @@ -1,11 +1,10 @@ package com.dfsek.terra.api.structures.structure.buffer.items; -import com.dfsek.terra.api.structure.buffer.BufferedItem; -import com.dfsek.terra.api.vector.Location; -import com.dfsek.terra.vector.LocationImpl; import com.dfsek.terra.api.block.Block; import com.dfsek.terra.api.block.BlockData; import com.dfsek.terra.api.block.BlockFace; +import com.dfsek.terra.api.structure.buffer.BufferedItem; +import com.dfsek.terra.api.vector.Location; public class BufferedPulledBlock implements BufferedItem { private final BlockData data; diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/items/BufferedStateManipulator.java b/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/items/BufferedStateManipulator.java index 1fcb2801c..0211d1a6b 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/items/BufferedStateManipulator.java +++ b/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/items/BufferedStateManipulator.java @@ -1,10 +1,9 @@ package com.dfsek.terra.api.structures.structure.buffer.items; import com.dfsek.terra.api.TerraPlugin; +import com.dfsek.terra.api.block.state.BlockState; import com.dfsek.terra.api.structure.buffer.BufferedItem; import com.dfsek.terra.api.vector.Location; -import com.dfsek.terra.vector.LocationImpl; -import com.dfsek.terra.api.block.state.BlockState; public class BufferedStateManipulator implements BufferedItem { private final TerraPlugin main; diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/util/FastRandom.java b/common/implementation/src/main/java/com/dfsek/terra/api/util/FastRandom.java index fc530944a..c1521b6e2 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/util/FastRandom.java +++ b/common/implementation/src/main/java/com/dfsek/terra/api/util/FastRandom.java @@ -22,7 +22,7 @@ public class FastRandom extends Random { SplittableRandom randomseed = new SplittableRandom(seed); this.random = new XoRoShiRo128PlusPlus(randomseed.nextLong(), randomseed.nextLong()); } - + @Override public boolean nextBoolean() { return random.nextBoolean(); diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/util/GlueList.java b/common/implementation/src/main/java/com/dfsek/terra/api/util/GlueList.java index 144738f56..1ae19ef29 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/util/GlueList.java +++ b/common/implementation/src/main/java/com/dfsek/terra/api/util/GlueList.java @@ -65,18 +65,17 @@ import static net.jafama.FastMath.*; * Remove O(n*m)
* Search O(m)
* Access O(m) - * + *

* version v1.0 - * + *

* Date: 03.11.2015 * - * + * @param the type of elements held in this collection * @author Ertuğrul Çetin ~ ertu.ctn@gmail.com * @see Collection * @see List * @see LinkedList * @see ArrayList - * @param the type of elements held in this collection */ @SuppressWarnings({"ManualMinMaxCalculation", "ConstantConditions", "ManualArrayToCollectionCopy"}) public class GlueList extends AbstractList implements List, Cloneable, Serializable { @@ -119,7 +118,7 @@ public class GlueList extends AbstractList implements List, Cloneable, int len = arr.length; - if (len != 0) { + if(len != 0) { Node initNode = new Node<>(null, null, 0, len); @@ -146,7 +145,7 @@ public class GlueList extends AbstractList implements List, Cloneable, Node l = last; - if (l.isAddable()) { + if(l.isAddable()) { l.add(element); } else { Node newNode = new Node<>(l, null, size); @@ -169,7 +168,7 @@ public class GlueList extends AbstractList implements List, Cloneable, Node node = getNodeForAdd(index); - if (node == null) { + if(node == null) { Node l = last; @@ -183,7 +182,7 @@ public class GlueList extends AbstractList implements List, Cloneable, } //if it is last and has extra space for element... - if (node == last && node.elementData.length - node.elementDataPointer > 0) { + if(node == last && node.elementData.length - node.elementDataPointer > 0) { int nodeArrIndex = index - node.startingIndex; @@ -191,7 +190,7 @@ public class GlueList extends AbstractList implements List, Cloneable, node.elementData[nodeArrIndex] = element; - if (nodeArrIndex > 0) { + if(nodeArrIndex > 0) { System.arraycopy(node.elementData, 0, node.elementData, 0, nodeArrIndex); } @@ -207,7 +206,7 @@ public class GlueList extends AbstractList implements List, Cloneable, newElementData[nodeArrIndex] = element; - if (nodeArrIndex > 0) { + if(nodeArrIndex > 0) { System.arraycopy(node.elementData, 0, newElementData, 0, nodeArrIndex); } @@ -224,14 +223,14 @@ public class GlueList extends AbstractList implements List, Cloneable, private void rangeCheckForAdd(int index) { - if (index > size || index < 0) { + if(index > size || index < 0) { throw new ArrayIndexOutOfBoundsException(index); } } private void updateNodesAfterAdd(Node nodeFrom) { - for (Node node = nodeFrom.next; node != null; node = node.next) { + for(Node node = nodeFrom.next; node != null; node = node.next) { node.startingIndex++; node.endingIndex++; @@ -252,9 +251,9 @@ public class GlueList extends AbstractList implements List, Cloneable, return false; } - if (size == 0) { + if(size == 0) { - if (initialCapacity >= len) { + if(initialCapacity >= len) { System.arraycopy(collection, 0, last.elementData, 0, len); } else { last.elementData = Arrays.copyOf((T[]) collection, len); @@ -274,7 +273,7 @@ public class GlueList extends AbstractList implements List, Cloneable, int remainedStorage = elementDataLen - elementSize; - if (remainedStorage == 0) { + if(remainedStorage == 0) { Node l = last; @@ -296,7 +295,7 @@ public class GlueList extends AbstractList implements List, Cloneable, return true; } - if (len <= remainedStorage) { + if(len <= remainedStorage) { System.arraycopy(collection, 0, last.elementData, elementSize, len); @@ -308,7 +307,7 @@ public class GlueList extends AbstractList implements List, Cloneable, return true; } - if (len > remainedStorage) { + if(len > remainedStorage) { System.arraycopy(collection, 0, last.elementData, elementSize, remainedStorage); @@ -371,11 +370,11 @@ public class GlueList extends AbstractList implements List, Cloneable, int index = 0; - if (o == null) { + if(o == null) { - for (Node node = first; node != null; node = node.next) { - for (int i = 0; i < node.elementDataPointer; i++) { - if (node.elementData[i] == null) { + for(Node node = first; node != null; node = node.next) { + for(int i = 0; i < node.elementDataPointer; i++) { + if(node.elementData[i] == null) { return index; } index++; @@ -383,9 +382,9 @@ public class GlueList extends AbstractList implements List, Cloneable, } } else { - for (Node node = first; node != null; node = node.next) { - for (int i = 0; i < node.elementDataPointer; i++) { - if (o.equals(node.elementData[i])) { + for(Node node = first; node != null; node = node.next) { + for(int i = 0; i < node.elementDataPointer; i++) { + if(o.equals(node.elementData[i])) { return index; } index++; @@ -401,10 +400,10 @@ public class GlueList extends AbstractList implements List, Cloneable, int index = size - 1; - if (o == null) { - for (Node node = last; node != null; node = node.pre) { - for (int i = node.elementDataPointer - 1; i >= 0; i--) { - if (node.elementData[i] == null) { + if(o == null) { + for(Node node = last; node != null; node = node.pre) { + for(int i = node.elementDataPointer - 1; i >= 0; i--) { + if(node.elementData[i] == null) { return index; } index--; @@ -412,9 +411,9 @@ public class GlueList extends AbstractList implements List, Cloneable, } } else { - for (Node node = last; node != null; node = node.pre) { - for (int i = node.elementDataPointer - 1; i >= 0; i--) { - if (o.equals(node.elementData[i])) { + for(Node node = last; node != null; node = node.pre) { + for(int i = node.elementDataPointer - 1; i >= 0; i--) { + if(o.equals(node.elementData[i])) { return index; } index--; @@ -437,7 +436,7 @@ public class GlueList extends AbstractList implements List, Cloneable, Node node; - if (size == 2 && first != last) { + if(size == 2 && first != last) { Node newNode = new Node<>(null, null, 0, 2); newNode.add(first.elementData[0]); @@ -458,11 +457,11 @@ public class GlueList extends AbstractList implements List, Cloneable, int numMoved = elementSize - nodeArrIndex - 1; - if (numMoved > 0) { + if(numMoved > 0) { System.arraycopy(node.elementData, nodeArrIndex + 1, node.elementData, nodeArrIndex, numMoved); } - if (first == last || node == last) { + if(first == last || node == last) { node.elementData[elementSize - 1] = null; } else { node.elementData = Arrays.copyOf(node.elementData, elementSize - 1); @@ -473,19 +472,19 @@ public class GlueList extends AbstractList implements List, Cloneable, updateNodesAfterRemove(node); - if (node.elementDataPointer == 0 && first != last) { + if(node.elementDataPointer == 0 && first != last) { Node next = node.next; Node prev = node.pre; - if (prev == null) { + if(prev == null) { first = next; } else { prev.next = next; node.pre = null; } - if (next == null) { + if(next == null) { last = prev; } else { next.pre = prev; @@ -513,7 +512,7 @@ public class GlueList extends AbstractList implements List, Cloneable, boolean isModified = false; - for (Object o : arr) { + for(Object o : arr) { isModified |= remove(o); } @@ -534,9 +533,9 @@ public class GlueList extends AbstractList implements List, Cloneable, Object[] elements = toArray(); - for (Object element : elements) { + for(Object element : elements) { - if (!c.contains(element)) { + if(!c.contains(element)) { isModified |= remove(element); } } @@ -549,7 +548,7 @@ public class GlueList extends AbstractList implements List, Cloneable, int index = indexOf(o); - if (index != -1) { + if(index != -1) { remove(index); return true; } else { @@ -559,7 +558,7 @@ public class GlueList extends AbstractList implements List, Cloneable, private void updateNodesAfterRemove(Node fromNode) { - for (Node node = fromNode.next; node != null; node = node.next) { + for(Node node = fromNode.next; node != null; node = node.next) { node.startingIndex = (--node.startingIndex < 0) ? 0 : node.startingIndex; node.endingIndex = (--node.endingIndex < 0) ? 0 : node.endingIndex; @@ -578,34 +577,34 @@ public class GlueList extends AbstractList implements List, Cloneable, int lastMinDistance = min(abs(index - lastStartingIndex), abs(index - lastEndingIndex)); - if (firstMinDistance <= lastMinDistance) { + if(firstMinDistance <= lastMinDistance) { Node node = first; do { - if (node.startingIndex <= index && index <= node.endingIndex) { + if(node.startingIndex <= index && index <= node.endingIndex) { return node; } node = node.next; - } while (true); + } while(true); } else { Node node = last; do { - if (node.startingIndex <= index && index <= node.endingIndex) { + if(node.startingIndex <= index && index <= node.endingIndex) { return node; } node = node.pre; - } while (true); + } while(true); } } private Node getNodeForAdd(int index) { - if (index == size && !(last.startingIndex <= index && index <= last.endingIndex)) { + if(index == size && !(last.startingIndex <= index && index <= last.endingIndex)) { return null; } @@ -614,7 +613,7 @@ public class GlueList extends AbstractList implements List, Cloneable, private void rangeCheck(int index) { - if (index >= size || index < 0) { + if(index >= size || index < 0) { throw new ArrayIndexOutOfBoundsException(index); } } @@ -622,7 +621,7 @@ public class GlueList extends AbstractList implements List, Cloneable, @Override public void clear() { - for (Node node = first; node != null; ) { + for(Node node = first; node != null; ) { Node next = node.next; @@ -653,9 +652,9 @@ public class GlueList extends AbstractList implements List, Cloneable, int pointer = last.elementDataPointer; int arrLen = last.elementData.length; - if (pointer < arrLen && arrLen > 2) { + if(pointer < arrLen && arrLen > 2) { - if (pointer < 2) { + if(pointer < 2) { last.elementData = Arrays.copyOf(last.elementData, 2); last.endingIndex -= arrLen - 2; } else { @@ -676,11 +675,11 @@ public class GlueList extends AbstractList implements List, Cloneable, Object[] objects = new Object[size]; int i = 0; - for (Node node = first; node != null; node = node.next) { + for(Node node = first; node != null; node = node.next) { int len = node.elementDataPointer; - if (len > 0) { + if(len > 0) { System.arraycopy(node.elementData, 0, objects, i, len); } @@ -842,15 +841,15 @@ public class GlueList extends AbstractList implements List, Cloneable, int temp = j - 1; - if (temp < 0) { + if(temp < 0) { throw new NoSuchElementException(); } - if (temp >= last.endingIndex + 1) { + if(temp >= last.endingIndex + 1) { throw new ConcurrentModificationException(); } - if (j == size) { + if(j == size) { node = last; @@ -860,7 +859,7 @@ public class GlueList extends AbstractList implements List, Cloneable, } int index = j - node.startingIndex; - if (index == 0) { + if(index == 0) { node = node.pre; @@ -871,7 +870,7 @@ public class GlueList extends AbstractList implements List, Cloneable, T val = node.elementData[--i]; - if (i < 0) { + if(i < 0) { node = node.pre; i = (node != null) ? node.elementDataPointer : 0; } @@ -896,7 +895,7 @@ public class GlueList extends AbstractList implements List, Cloneable, @Override public void set(T t) { - if (lastReturn < 0) { + if(lastReturn < 0) { throw new IllegalStateException(); } @@ -904,7 +903,7 @@ public class GlueList extends AbstractList implements List, Cloneable, try { com.dfsek.terra.api.util.GlueList.this.set(lastReturn, t); - } catch (IndexOutOfBoundsException e) { + } catch(IndexOutOfBoundsException e) { throw new ConcurrentModificationException(); } } @@ -927,7 +926,7 @@ public class GlueList extends AbstractList implements List, Cloneable, elementDataPointer = (node != null) ? node.elementDataPointer : 0; expectedModCount = modCount; - } catch (IndexOutOfBoundsException e) { + } catch(IndexOutOfBoundsException e) { throw new ConcurrentModificationException(); } } @@ -941,13 +940,13 @@ public class GlueList extends AbstractList implements List, Cloneable, s.writeInt(size); - for (Node node = first; node != null; node = node.next) { - for (int i = 0; i < node.elementDataPointer; i++) { + for(Node node = first; node != null; node = node.next) { + for(int i = 0; i < node.elementDataPointer; i++) { s.writeObject(node.elementData[i]); } } - if (modCount != expectedModCount) { + if(modCount != expectedModCount) { throw new ConcurrentModificationException(); } } @@ -962,7 +961,7 @@ public class GlueList extends AbstractList implements List, Cloneable, int size = s.readInt(); - for (int i = 0; i < size; i++) { + for(int i = 0; i < size; i++) { last.add((T) s.readObject()); } } diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/util/PaletteUtil.java b/common/implementation/src/main/java/com/dfsek/terra/api/util/PaletteUtil.java index 9672c7746..b16ebafba 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/util/PaletteUtil.java +++ b/common/implementation/src/main/java/com/dfsek/terra/api/util/PaletteUtil.java @@ -1,18 +1,17 @@ package com.dfsek.terra.api.util; -import com.dfsek.terra.api.util.MathUtil; import com.dfsek.terra.api.world.generator.Palette; +import com.dfsek.terra.api.world.generator.Sampler; import com.dfsek.terra.api.world.palette.slant.SlantHolder; import com.dfsek.terra.config.templates.BiomeTemplate; -import com.dfsek.terra.api.world.generator.Sampler; public final class PaletteUtil { public static Palette getPalette(int x, int y, int z, BiomeTemplate c, Sampler sampler) { SlantHolder slant = c.getSlant(); - if (slant != null) { + if(slant != null) { double slope = MathUtil.derivative(sampler, x, y, z); - if (slope > slant.getMinSlope()) { + if(slope > slant.getMinSlope()) { return slant.getPalette(slope).getPalette(y); } } diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/util/RotationUtil.java b/common/implementation/src/main/java/com/dfsek/terra/api/util/RotationUtil.java index 13e67bd48..5e643579d 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/util/RotationUtil.java +++ b/common/implementation/src/main/java/com/dfsek/terra/api/util/RotationUtil.java @@ -1,7 +1,5 @@ package com.dfsek.terra.api.util; -import com.dfsek.terra.api.structure.rotation.Rotation; -import com.dfsek.terra.api.vector.Vector2; import com.dfsek.terra.api.block.Axis; import com.dfsek.terra.api.block.BlockData; import com.dfsek.terra.api.block.BlockFace; @@ -12,6 +10,8 @@ import com.dfsek.terra.api.block.data.Rail; import com.dfsek.terra.api.block.data.RedstoneWire; import com.dfsek.terra.api.block.data.Rotatable; import com.dfsek.terra.api.block.data.Wall; +import com.dfsek.terra.api.structure.rotation.Rotation; +import com.dfsek.terra.api.vector.Vector2; import com.google.common.collect.Sets; import net.jafama.FastMath; diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/util/collections/ProbabilityCollectionImpl.java b/common/implementation/src/main/java/com/dfsek/terra/api/util/collections/ProbabilityCollectionImpl.java index 6542c6b47..aa307ad50 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/util/collections/ProbabilityCollectionImpl.java +++ b/common/implementation/src/main/java/com/dfsek/terra/api/util/collections/ProbabilityCollectionImpl.java @@ -1,7 +1,7 @@ package com.dfsek.terra.api.util.collections; -import com.dfsek.terra.api.util.MathUtil; import com.dfsek.terra.api.noise.NoiseSampler; +import com.dfsek.terra.api.util.MathUtil; import com.dfsek.terra.api.util.ProbabilityCollection; import com.dfsek.terra.api.util.mutable.MutableInteger; import org.jetbrains.annotations.NotNull; diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/world/biome/UserDefinedBiome.java b/common/implementation/src/main/java/com/dfsek/terra/api/world/biome/UserDefinedBiome.java index 729cff32b..12b63a405 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/world/biome/UserDefinedBiome.java +++ b/common/implementation/src/main/java/com/dfsek/terra/api/world/biome/UserDefinedBiome.java @@ -2,7 +2,6 @@ package com.dfsek.terra.api.world.biome; import com.dfsek.terra.api.util.ProbabilityCollection; import com.dfsek.terra.api.world.World; -import com.dfsek.terra.api.util.collections.ProbabilityCollectionImpl; import com.dfsek.terra.config.templates.BiomeTemplate; import com.dfsek.terra.world.generation.WorldGenerator; diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/world/biome/pipeline/BiomeHolderImpl.java b/common/implementation/src/main/java/com/dfsek/terra/api/world/biome/pipeline/BiomeHolderImpl.java index e39e5771a..28a099807 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/world/biome/pipeline/BiomeHolderImpl.java +++ b/common/implementation/src/main/java/com/dfsek/terra/api/world/biome/pipeline/BiomeHolderImpl.java @@ -2,8 +2,8 @@ package com.dfsek.terra.api.world.biome.pipeline; import com.dfsek.terra.api.vector.Vector2; import com.dfsek.terra.api.world.biome.TerraBiome; -import com.dfsek.terra.api.world.biome.generation.pipeline.BiomeHolder; import com.dfsek.terra.api.world.biome.generation.pipeline.BiomeExpander; +import com.dfsek.terra.api.world.biome.generation.pipeline.BiomeHolder; import com.dfsek.terra.api.world.biome.generation.pipeline.BiomeMutator; import com.dfsek.terra.api.world.biome.generation.pipeline.BiomeSource; diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/world/biome/pipeline/BiomePipelineImpl.java b/common/implementation/src/main/java/com/dfsek/terra/api/world/biome/pipeline/BiomePipelineImpl.java index cc6684316..ff46cfef6 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/world/biome/pipeline/BiomePipelineImpl.java +++ b/common/implementation/src/main/java/com/dfsek/terra/api/world/biome/pipeline/BiomePipelineImpl.java @@ -1,11 +1,11 @@ package com.dfsek.terra.api.world.biome.pipeline; -import com.dfsek.terra.api.world.biome.generation.pipeline.BiomeHolder; -import com.dfsek.terra.vector.Vector2Impl; import com.dfsek.terra.api.util.GlueList; import com.dfsek.terra.api.util.seeded.StageSeeded; +import com.dfsek.terra.api.world.biome.generation.pipeline.BiomeHolder; import com.dfsek.terra.api.world.biome.generation.pipeline.BiomeSource; import com.dfsek.terra.api.world.biome.generation.pipeline.Stage; +import com.dfsek.terra.vector.Vector2Impl; import java.util.List; import java.util.stream.Collectors; diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/world/biome/pipeline/expand/FractalExpander.java b/common/implementation/src/main/java/com/dfsek/terra/api/world/biome/pipeline/expand/FractalExpander.java index 18179b82d..8677cb37d 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/world/biome/pipeline/expand/FractalExpander.java +++ b/common/implementation/src/main/java/com/dfsek/terra/api/world/biome/pipeline/expand/FractalExpander.java @@ -1,7 +1,7 @@ package com.dfsek.terra.api.world.biome.pipeline.expand; -import com.dfsek.terra.api.util.MathUtil; import com.dfsek.terra.api.noise.NoiseSampler; +import com.dfsek.terra.api.util.MathUtil; import com.dfsek.terra.api.world.biome.TerraBiome; import com.dfsek.terra.api.world.biome.generation.pipeline.BiomeExpander; diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/world/biome/pipeline/mutator/BorderListMutator.java b/common/implementation/src/main/java/com/dfsek/terra/api/world/biome/pipeline/mutator/BorderListMutator.java index fabb52e76..410b9cf85 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/world/biome/pipeline/mutator/BorderListMutator.java +++ b/common/implementation/src/main/java/com/dfsek/terra/api/world/biome/pipeline/mutator/BorderListMutator.java @@ -2,7 +2,6 @@ package com.dfsek.terra.api.world.biome.pipeline.mutator; import com.dfsek.terra.api.noise.NoiseSampler; import com.dfsek.terra.api.util.ProbabilityCollection; -import com.dfsek.terra.api.util.collections.ProbabilityCollectionImpl; import com.dfsek.terra.api.world.biome.TerraBiome; import com.dfsek.terra.api.world.biome.generation.pipeline.BiomeMutator; diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/world/biome/pipeline/mutator/BorderMutator.java b/common/implementation/src/main/java/com/dfsek/terra/api/world/biome/pipeline/mutator/BorderMutator.java index d4a922f49..48b56c877 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/world/biome/pipeline/mutator/BorderMutator.java +++ b/common/implementation/src/main/java/com/dfsek/terra/api/world/biome/pipeline/mutator/BorderMutator.java @@ -2,7 +2,6 @@ package com.dfsek.terra.api.world.biome.pipeline.mutator; import com.dfsek.terra.api.noise.NoiseSampler; import com.dfsek.terra.api.util.ProbabilityCollection; -import com.dfsek.terra.api.util.collections.ProbabilityCollectionImpl; import com.dfsek.terra.api.world.biome.TerraBiome; import com.dfsek.terra.api.world.biome.generation.pipeline.BiomeMutator; diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/world/biome/pipeline/mutator/ReplaceListMutator.java b/common/implementation/src/main/java/com/dfsek/terra/api/world/biome/pipeline/mutator/ReplaceListMutator.java index d7a6f47ac..912abf252 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/world/biome/pipeline/mutator/ReplaceListMutator.java +++ b/common/implementation/src/main/java/com/dfsek/terra/api/world/biome/pipeline/mutator/ReplaceListMutator.java @@ -2,7 +2,6 @@ package com.dfsek.terra.api.world.biome.pipeline.mutator; import com.dfsek.terra.api.noise.NoiseSampler; import com.dfsek.terra.api.util.ProbabilityCollection; -import com.dfsek.terra.api.util.collections.ProbabilityCollectionImpl; import com.dfsek.terra.api.world.biome.TerraBiome; import com.dfsek.terra.api.world.biome.generation.pipeline.BiomeMutator; diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/world/biome/pipeline/mutator/ReplaceMutator.java b/common/implementation/src/main/java/com/dfsek/terra/api/world/biome/pipeline/mutator/ReplaceMutator.java index f5d0015d7..c7ef22630 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/world/biome/pipeline/mutator/ReplaceMutator.java +++ b/common/implementation/src/main/java/com/dfsek/terra/api/world/biome/pipeline/mutator/ReplaceMutator.java @@ -2,7 +2,6 @@ package com.dfsek.terra.api.world.biome.pipeline.mutator; import com.dfsek.terra.api.noise.NoiseSampler; import com.dfsek.terra.api.util.ProbabilityCollection; -import com.dfsek.terra.api.util.collections.ProbabilityCollectionImpl; import com.dfsek.terra.api.world.biome.TerraBiome; import com.dfsek.terra.api.world.biome.generation.pipeline.BiomeMutator; diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/world/biome/pipeline/mutator/SmoothMutator.java b/common/implementation/src/main/java/com/dfsek/terra/api/world/biome/pipeline/mutator/SmoothMutator.java index 35a5f7ba8..529efdfd4 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/world/biome/pipeline/mutator/SmoothMutator.java +++ b/common/implementation/src/main/java/com/dfsek/terra/api/world/biome/pipeline/mutator/SmoothMutator.java @@ -1,7 +1,7 @@ package com.dfsek.terra.api.world.biome.pipeline.mutator; -import com.dfsek.terra.api.util.MathUtil; import com.dfsek.terra.api.noise.NoiseSampler; +import com.dfsek.terra.api.util.MathUtil; import com.dfsek.terra.api.world.biome.TerraBiome; import com.dfsek.terra.api.world.biome.generation.pipeline.BiomeMutator; diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/world/biome/pipeline/source/RandomSource.java b/common/implementation/src/main/java/com/dfsek/terra/api/world/biome/pipeline/source/RandomSource.java index e74186aea..85e7776c9 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/world/biome/pipeline/source/RandomSource.java +++ b/common/implementation/src/main/java/com/dfsek/terra/api/world/biome/pipeline/source/RandomSource.java @@ -2,7 +2,6 @@ package com.dfsek.terra.api.world.biome.pipeline.source; import com.dfsek.terra.api.noise.NoiseSampler; import com.dfsek.terra.api.util.ProbabilityCollection; -import com.dfsek.terra.api.util.collections.ProbabilityCollectionImpl; import com.dfsek.terra.api.world.biome.TerraBiome; import com.dfsek.terra.api.world.biome.generation.pipeline.BiomeSource; diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/world/biome/pipeline/stages/ExpanderStage.java b/common/implementation/src/main/java/com/dfsek/terra/api/world/biome/pipeline/stages/ExpanderStage.java index 9285b4021..8d195be5e 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/world/biome/pipeline/stages/ExpanderStage.java +++ b/common/implementation/src/main/java/com/dfsek/terra/api/world/biome/pipeline/stages/ExpanderStage.java @@ -1,8 +1,8 @@ package com.dfsek.terra.api.world.biome.pipeline.stages; +import com.dfsek.terra.api.world.biome.generation.pipeline.BiomeExpander; import com.dfsek.terra.api.world.biome.generation.pipeline.BiomeHolder; import com.dfsek.terra.api.world.biome.generation.pipeline.Stage; -import com.dfsek.terra.api.world.biome.generation.pipeline.BiomeExpander; public class ExpanderStage implements Stage { private final BiomeExpander expander; diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/world/biome/pipeline/stages/MutatorStage.java b/common/implementation/src/main/java/com/dfsek/terra/api/world/biome/pipeline/stages/MutatorStage.java index af2851538..083e865f7 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/world/biome/pipeline/stages/MutatorStage.java +++ b/common/implementation/src/main/java/com/dfsek/terra/api/world/biome/pipeline/stages/MutatorStage.java @@ -1,8 +1,8 @@ package com.dfsek.terra.api.world.biome.pipeline.stages; import com.dfsek.terra.api.world.biome.generation.pipeline.BiomeHolder; -import com.dfsek.terra.api.world.biome.generation.pipeline.Stage; import com.dfsek.terra.api.world.biome.generation.pipeline.BiomeMutator; +import com.dfsek.terra.api.world.biome.generation.pipeline.Stage; public class MutatorStage implements Stage { private final BiomeMutator mutator; diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/world/biome/provider/StandardBiomeProvider.java b/common/implementation/src/main/java/com/dfsek/terra/api/world/biome/provider/StandardBiomeProvider.java index ac5633e90..ee1578732 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/world/biome/provider/StandardBiomeProvider.java +++ b/common/implementation/src/main/java/com/dfsek/terra/api/world/biome/provider/StandardBiomeProvider.java @@ -3,11 +3,11 @@ package com.dfsek.terra.api.world.biome.provider; import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.noise.NoiseSampler; import com.dfsek.terra.api.vector.Vector2; -import com.dfsek.terra.api.world.biome.generation.BiomeProvider; -import com.dfsek.terra.vector.Vector2Impl; import com.dfsek.terra.api.world.biome.TerraBiome; +import com.dfsek.terra.api.world.biome.generation.BiomeProvider; import com.dfsek.terra.api.world.biome.generation.pipeline.BiomeHolder; import com.dfsek.terra.api.world.biome.pipeline.BiomePipelineImpl; +import com.dfsek.terra.vector.Vector2Impl; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/world/carving/Worm.java b/common/implementation/src/main/java/com/dfsek/terra/api/world/carving/Worm.java index 2430150d9..c2ccb4be3 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/world/carving/Worm.java +++ b/common/implementation/src/main/java/com/dfsek/terra/api/world/carving/Worm.java @@ -1,8 +1,8 @@ package com.dfsek.terra.api.world.carving; import com.dfsek.terra.api.vector.Vector3; -import com.dfsek.terra.vector.Vector3Impl; import com.dfsek.terra.api.world.World; +import com.dfsek.terra.vector.Vector3Impl; import net.jafama.FastMath; import java.util.Random; diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/world/locate/AsyncBiomeFinder.java b/common/implementation/src/main/java/com/dfsek/terra/api/world/locate/AsyncBiomeFinder.java index 2fac9bd54..d5355509b 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/world/locate/AsyncBiomeFinder.java +++ b/common/implementation/src/main/java/com/dfsek/terra/api/world/locate/AsyncBiomeFinder.java @@ -2,7 +2,6 @@ package com.dfsek.terra.api.world.locate; import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.vector.Location; -import com.dfsek.terra.vector.LocationImpl; import com.dfsek.terra.api.vector.Vector3; import com.dfsek.terra.api.world.biome.TerraBiome; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/world/locate/AsyncFeatureFinder.java b/common/implementation/src/main/java/com/dfsek/terra/api/world/locate/AsyncFeatureFinder.java index 79b0a0961..f361db044 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/world/locate/AsyncFeatureFinder.java +++ b/common/implementation/src/main/java/com/dfsek/terra/api/world/locate/AsyncFeatureFinder.java @@ -2,11 +2,10 @@ package com.dfsek.terra.api.world.locate; import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.vector.Location; -import com.dfsek.terra.vector.LocationImpl; import com.dfsek.terra.api.vector.Vector3; -import com.dfsek.terra.vector.Vector3Impl; import com.dfsek.terra.api.world.World; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; +import com.dfsek.terra.vector.Vector3Impl; import org.jetbrains.annotations.NotNull; import java.util.function.Consumer; diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/world/locate/AsyncStructureFinder.java b/common/implementation/src/main/java/com/dfsek/terra/api/world/locate/AsyncStructureFinder.java index 6df9b92d9..a191ff87c 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/world/locate/AsyncStructureFinder.java +++ b/common/implementation/src/main/java/com/dfsek/terra/api/world/locate/AsyncStructureFinder.java @@ -1,12 +1,11 @@ package com.dfsek.terra.api.world.locate; import com.dfsek.terra.api.TerraPlugin; -import com.dfsek.terra.api.util.PopulationUtil; -import com.dfsek.terra.api.vector.Location; -import com.dfsek.terra.vector.LocationImpl; -import com.dfsek.terra.api.vector.Vector3; import com.dfsek.terra.api.structure.rotation.Rotation; import com.dfsek.terra.api.util.FastRandom; +import com.dfsek.terra.api.util.PopulationUtil; +import com.dfsek.terra.api.vector.Location; +import com.dfsek.terra.api.vector.Vector3; import com.dfsek.terra.api.world.biome.UserDefinedBiome; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; import com.dfsek.terra.world.population.items.TerraStructure; diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/world/palette/NoisePalette.java b/common/implementation/src/main/java/com/dfsek/terra/api/world/palette/NoisePalette.java index f40004922..306a00a4a 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/world/palette/NoisePalette.java +++ b/common/implementation/src/main/java/com/dfsek/terra/api/world/palette/NoisePalette.java @@ -1,7 +1,7 @@ package com.dfsek.terra.api.world.palette; -import com.dfsek.terra.api.noise.NoiseSampler; import com.dfsek.terra.api.block.BlockData; +import com.dfsek.terra.api.noise.NoiseSampler; import java.util.List; diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/world/palette/PaletteImpl.java b/common/implementation/src/main/java/com/dfsek/terra/api/world/palette/PaletteImpl.java index b0fc2429b..9112fe41a 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/world/palette/PaletteImpl.java +++ b/common/implementation/src/main/java/com/dfsek/terra/api/world/palette/PaletteImpl.java @@ -1,10 +1,9 @@ package com.dfsek.terra.api.world.palette; -import com.dfsek.terra.api.noise.NoiseSampler; import com.dfsek.terra.api.block.BlockData; +import com.dfsek.terra.api.noise.NoiseSampler; import com.dfsek.terra.api.util.GlueList; import com.dfsek.terra.api.util.ProbabilityCollection; -import com.dfsek.terra.api.util.collections.ProbabilityCollectionImpl; import com.dfsek.terra.api.world.generator.Palette; import java.util.List; diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/world/palette/holder/PaletteLayerHolder.java b/common/implementation/src/main/java/com/dfsek/terra/api/world/palette/holder/PaletteLayerHolder.java index 57946f7c3..628b763cb 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/world/palette/holder/PaletteLayerHolder.java +++ b/common/implementation/src/main/java/com/dfsek/terra/api/world/palette/holder/PaletteLayerHolder.java @@ -1,9 +1,8 @@ package com.dfsek.terra.api.world.palette.holder; -import com.dfsek.terra.api.noise.NoiseSampler; import com.dfsek.terra.api.block.BlockData; +import com.dfsek.terra.api.noise.NoiseSampler; import com.dfsek.terra.api.util.ProbabilityCollection; -import com.dfsek.terra.api.util.collections.ProbabilityCollectionImpl; import org.jetbrains.annotations.NotNull; public class PaletteLayerHolder { diff --git a/common/implementation/src/main/java/com/dfsek/terra/carving/CarverCache.java b/common/implementation/src/main/java/com/dfsek/terra/carving/CarverCache.java index 9d18e058f..a31dc9aa6 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/carving/CarverCache.java +++ b/common/implementation/src/main/java/com/dfsek/terra/carving/CarverCache.java @@ -1,16 +1,16 @@ package com.dfsek.terra.carving; import com.dfsek.terra.api.TerraPlugin; -import com.dfsek.terra.api.util.MathUtil; -import com.dfsek.terra.api.util.PopulationUtil; -import com.dfsek.terra.vector.Vector3Impl; -import com.dfsek.terra.api.world.World; import com.dfsek.terra.api.util.FastRandom; import com.dfsek.terra.api.util.GlueList; +import com.dfsek.terra.api.util.MathUtil; +import com.dfsek.terra.api.util.PopulationUtil; +import com.dfsek.terra.api.world.World; import com.dfsek.terra.api.world.biome.TerraBiome; import com.dfsek.terra.api.world.biome.UserDefinedBiome; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; import com.dfsek.terra.api.world.carving.Worm; +import com.dfsek.terra.vector.Vector3Impl; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; diff --git a/common/implementation/src/main/java/com/dfsek/terra/carving/CarverPalette.java b/common/implementation/src/main/java/com/dfsek/terra/carving/CarverPalette.java index d30e3a35f..40e1bccc2 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/carving/CarverPalette.java +++ b/common/implementation/src/main/java/com/dfsek/terra/carving/CarverPalette.java @@ -4,7 +4,6 @@ import com.dfsek.terra.api.block.BlockData; import com.dfsek.terra.api.block.BlockType; import com.dfsek.terra.api.util.ProbabilityCollection; import com.dfsek.terra.api.util.collections.MaterialSet; -import com.dfsek.terra.api.util.collections.ProbabilityCollectionImpl; import net.jafama.FastMath; import java.util.Map; diff --git a/common/implementation/src/main/java/com/dfsek/terra/carving/UserDefinedCarver.java b/common/implementation/src/main/java/com/dfsek/terra/carving/UserDefinedCarver.java index 2022d7f93..d6bf399fd 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/carving/UserDefinedCarver.java +++ b/common/implementation/src/main/java/com/dfsek/terra/carving/UserDefinedCarver.java @@ -5,22 +5,22 @@ import com.dfsek.paralithic.eval.parser.Parser; import com.dfsek.paralithic.eval.parser.Scope; import com.dfsek.paralithic.eval.tokenizer.ParseException; import com.dfsek.terra.api.TerraPlugin; -import com.dfsek.terra.api.math.range.ConstantRange; import com.dfsek.terra.api.math.paralithic.defined.UserDefinedFunction; import com.dfsek.terra.api.math.paralithic.noise.NoiseFunction2; import com.dfsek.terra.api.math.paralithic.noise.NoiseFunction3; -import com.dfsek.terra.api.util.Range; -import com.dfsek.terra.api.vector.Vector3; -import com.dfsek.terra.vector.Vector3Impl; -import com.dfsek.terra.api.world.World; +import com.dfsek.terra.api.math.range.ConstantRange; import com.dfsek.terra.api.util.FastRandom; +import com.dfsek.terra.api.util.Range; import com.dfsek.terra.api.util.seeded.NoiseSeeded; +import com.dfsek.terra.api.vector.Vector3; +import com.dfsek.terra.api.world.World; import com.dfsek.terra.api.world.biome.UserDefinedBiome; import com.dfsek.terra.api.world.carving.Carver; import com.dfsek.terra.api.world.carving.Worm; import com.dfsek.terra.config.loaders.config.function.FunctionTemplate; import com.dfsek.terra.config.templates.BiomeTemplate; import com.dfsek.terra.config.templates.CarverTemplate; +import com.dfsek.terra.vector.Vector3Impl; import net.jafama.FastMath; import java.util.List; diff --git a/common/implementation/src/main/java/com/dfsek/terra/commands/AddonsCommand.java b/common/implementation/src/main/java/com/dfsek/terra/commands/AddonsCommand.java index abb1a746c..95a7a32d0 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/commands/AddonsCommand.java +++ b/common/implementation/src/main/java/com/dfsek/terra/commands/AddonsCommand.java @@ -3,8 +3,8 @@ package com.dfsek.terra.commands; import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.command.CommandTemplate; import com.dfsek.terra.api.command.annotation.Command; -import com.dfsek.terra.api.injection.annotations.Inject; import com.dfsek.terra.api.entity.CommandSender; +import com.dfsek.terra.api.injection.annotations.Inject; @Command( usage = "/terra addons" diff --git a/common/implementation/src/main/java/com/dfsek/terra/commands/GetBlockCommand.java b/common/implementation/src/main/java/com/dfsek/terra/commands/GetBlockCommand.java index 1ccc23d7b..0e2c78f0a 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/commands/GetBlockCommand.java +++ b/common/implementation/src/main/java/com/dfsek/terra/commands/GetBlockCommand.java @@ -6,9 +6,9 @@ import com.dfsek.terra.api.command.annotation.Command; import com.dfsek.terra.api.command.annotation.type.DebugCommand; import com.dfsek.terra.api.command.annotation.type.PlayerCommand; import com.dfsek.terra.api.command.annotation.type.WorldCommand; -import com.dfsek.terra.api.injection.annotations.Inject; import com.dfsek.terra.api.entity.CommandSender; import com.dfsek.terra.api.entity.Player; +import com.dfsek.terra.api.injection.annotations.Inject; @WorldCommand @DebugCommand diff --git a/common/implementation/src/main/java/com/dfsek/terra/commands/PacksCommand.java b/common/implementation/src/main/java/com/dfsek/terra/commands/PacksCommand.java index b354cbbb3..2f2755eea 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/commands/PacksCommand.java +++ b/common/implementation/src/main/java/com/dfsek/terra/commands/PacksCommand.java @@ -4,11 +4,10 @@ import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.command.CommandTemplate; import com.dfsek.terra.api.command.annotation.Command; import com.dfsek.terra.api.config.ConfigPack; -import com.dfsek.terra.api.injection.annotations.Inject; import com.dfsek.terra.api.entity.CommandSender; +import com.dfsek.terra.api.injection.annotations.Inject; import com.dfsek.terra.api.registry.CheckedRegistry; import com.dfsek.terra.config.lang.LangUtil; -import com.dfsek.terra.config.pack.ConfigPackTemplate; @Command( usage = "/terra packs" diff --git a/common/implementation/src/main/java/com/dfsek/terra/commands/ReloadCommand.java b/common/implementation/src/main/java/com/dfsek/terra/commands/ReloadCommand.java index dc7f1faf0..59b650e07 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/commands/ReloadCommand.java +++ b/common/implementation/src/main/java/com/dfsek/terra/commands/ReloadCommand.java @@ -3,8 +3,8 @@ package com.dfsek.terra.commands; import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.command.CommandTemplate; import com.dfsek.terra.api.command.annotation.Command; -import com.dfsek.terra.api.injection.annotations.Inject; import com.dfsek.terra.api.entity.CommandSender; +import com.dfsek.terra.api.injection.annotations.Inject; import com.dfsek.terra.config.lang.LangUtil; @Command( diff --git a/common/implementation/src/main/java/com/dfsek/terra/commands/VersionCommand.java b/common/implementation/src/main/java/com/dfsek/terra/commands/VersionCommand.java index 0fcb6f4b4..8734efc08 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/commands/VersionCommand.java +++ b/common/implementation/src/main/java/com/dfsek/terra/commands/VersionCommand.java @@ -3,8 +3,8 @@ package com.dfsek.terra.commands; import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.command.CommandTemplate; import com.dfsek.terra.api.command.annotation.Command; -import com.dfsek.terra.api.injection.annotations.Inject; import com.dfsek.terra.api.entity.CommandSender; +import com.dfsek.terra.api.injection.annotations.Inject; import com.dfsek.terra.config.lang.LangUtil; @Command( diff --git a/common/implementation/src/main/java/com/dfsek/terra/commands/biome/BiomeCommand.java b/common/implementation/src/main/java/com/dfsek/terra/commands/biome/BiomeCommand.java index 4d7b263f6..1a68da9dd 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/commands/biome/BiomeCommand.java +++ b/common/implementation/src/main/java/com/dfsek/terra/commands/biome/BiomeCommand.java @@ -6,9 +6,9 @@ import com.dfsek.terra.api.command.annotation.Command; import com.dfsek.terra.api.command.annotation.Subcommand; import com.dfsek.terra.api.command.annotation.type.PlayerCommand; import com.dfsek.terra.api.command.annotation.type.WorldCommand; -import com.dfsek.terra.api.injection.annotations.Inject; import com.dfsek.terra.api.entity.CommandSender; import com.dfsek.terra.api.entity.Player; +import com.dfsek.terra.api.injection.annotations.Inject; import com.dfsek.terra.api.world.biome.UserDefinedBiome; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; import com.dfsek.terra.config.lang.LangUtil; diff --git a/common/implementation/src/main/java/com/dfsek/terra/commands/biome/BiomeLocateCommand.java b/common/implementation/src/main/java/com/dfsek/terra/commands/biome/BiomeLocateCommand.java index e332c540d..17b1f5ba9 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/commands/biome/BiomeLocateCommand.java +++ b/common/implementation/src/main/java/com/dfsek/terra/commands/biome/BiomeLocateCommand.java @@ -10,16 +10,15 @@ import com.dfsek.terra.api.command.annotation.inject.SwitchTarget; import com.dfsek.terra.api.command.annotation.type.PlayerCommand; import com.dfsek.terra.api.command.annotation.type.WorldCommand; import com.dfsek.terra.api.command.arg.IntegerArgumentParser; -import com.dfsek.terra.api.injection.annotations.Inject; -import com.dfsek.terra.vector.LocationImpl; -import com.dfsek.terra.vector.Vector3Impl; import com.dfsek.terra.api.entity.CommandSender; import com.dfsek.terra.api.entity.Player; +import com.dfsek.terra.api.injection.annotations.Inject; import com.dfsek.terra.api.world.biome.TerraBiome; import com.dfsek.terra.api.world.locate.AsyncBiomeFinder; import com.dfsek.terra.commands.biome.arg.BiomeArgumentParser; import com.dfsek.terra.commands.biome.tab.BiomeTabCompleter; import com.dfsek.terra.config.lang.LangUtil; +import com.dfsek.terra.vector.Vector3Impl; import java.util.Locale; diff --git a/common/implementation/src/main/java/com/dfsek/terra/commands/biome/arg/BiomeArgumentParser.java b/common/implementation/src/main/java/com/dfsek/terra/commands/biome/arg/BiomeArgumentParser.java index 95bd9dec6..23ec861e2 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/commands/biome/arg/BiomeArgumentParser.java +++ b/common/implementation/src/main/java/com/dfsek/terra/commands/biome/arg/BiomeArgumentParser.java @@ -2,9 +2,9 @@ package com.dfsek.terra.commands.biome.arg; import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.command.arg.ArgumentParser; -import com.dfsek.terra.api.injection.annotations.Inject; import com.dfsek.terra.api.entity.CommandSender; import com.dfsek.terra.api.entity.Player; +import com.dfsek.terra.api.injection.annotations.Inject; import com.dfsek.terra.api.world.biome.TerraBiome; public class BiomeArgumentParser implements ArgumentParser { diff --git a/common/implementation/src/main/java/com/dfsek/terra/commands/biome/tab/BiomeTabCompleter.java b/common/implementation/src/main/java/com/dfsek/terra/commands/biome/tab/BiomeTabCompleter.java index 4d805f5d0..7bc9e58b1 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/commands/biome/tab/BiomeTabCompleter.java +++ b/common/implementation/src/main/java/com/dfsek/terra/commands/biome/tab/BiomeTabCompleter.java @@ -2,9 +2,9 @@ package com.dfsek.terra.commands.biome.tab; import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.command.tab.TabCompleter; -import com.dfsek.terra.api.injection.annotations.Inject; import com.dfsek.terra.api.entity.CommandSender; import com.dfsek.terra.api.entity.Player; +import com.dfsek.terra.api.injection.annotations.Inject; import com.dfsek.terra.api.world.biome.TerraBiome; import java.util.List; diff --git a/common/implementation/src/main/java/com/dfsek/terra/commands/profiler/ProfileQueryCommand.java b/common/implementation/src/main/java/com/dfsek/terra/commands/profiler/ProfileQueryCommand.java index 11adde655..44e351268 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/commands/profiler/ProfileQueryCommand.java +++ b/common/implementation/src/main/java/com/dfsek/terra/commands/profiler/ProfileQueryCommand.java @@ -4,8 +4,8 @@ import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.command.CommandTemplate; import com.dfsek.terra.api.command.annotation.Command; import com.dfsek.terra.api.command.annotation.type.DebugCommand; -import com.dfsek.terra.api.injection.annotations.Inject; import com.dfsek.terra.api.entity.CommandSender; +import com.dfsek.terra.api.injection.annotations.Inject; @Command @DebugCommand diff --git a/common/implementation/src/main/java/com/dfsek/terra/commands/profiler/ProfileResetCommand.java b/common/implementation/src/main/java/com/dfsek/terra/commands/profiler/ProfileResetCommand.java index 65c713414..d71273cf8 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/commands/profiler/ProfileResetCommand.java +++ b/common/implementation/src/main/java/com/dfsek/terra/commands/profiler/ProfileResetCommand.java @@ -4,8 +4,8 @@ import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.command.CommandTemplate; import com.dfsek.terra.api.command.annotation.Command; import com.dfsek.terra.api.command.annotation.type.DebugCommand; -import com.dfsek.terra.api.injection.annotations.Inject; import com.dfsek.terra.api.entity.CommandSender; +import com.dfsek.terra.api.injection.annotations.Inject; @Command @DebugCommand diff --git a/common/implementation/src/main/java/com/dfsek/terra/commands/profiler/ProfileStartCommand.java b/common/implementation/src/main/java/com/dfsek/terra/commands/profiler/ProfileStartCommand.java index cd84a470f..994cb8371 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/commands/profiler/ProfileStartCommand.java +++ b/common/implementation/src/main/java/com/dfsek/terra/commands/profiler/ProfileStartCommand.java @@ -4,8 +4,8 @@ import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.command.CommandTemplate; import com.dfsek.terra.api.command.annotation.Command; import com.dfsek.terra.api.command.annotation.type.DebugCommand; -import com.dfsek.terra.api.injection.annotations.Inject; import com.dfsek.terra.api.entity.CommandSender; +import com.dfsek.terra.api.injection.annotations.Inject; @Command @DebugCommand diff --git a/common/implementation/src/main/java/com/dfsek/terra/commands/profiler/ProfileStopCommand.java b/common/implementation/src/main/java/com/dfsek/terra/commands/profiler/ProfileStopCommand.java index bc1752321..9aed43ed2 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/commands/profiler/ProfileStopCommand.java +++ b/common/implementation/src/main/java/com/dfsek/terra/commands/profiler/ProfileStopCommand.java @@ -4,8 +4,8 @@ import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.command.CommandTemplate; import com.dfsek.terra.api.command.annotation.Command; import com.dfsek.terra.api.command.annotation.type.DebugCommand; -import com.dfsek.terra.api.injection.annotations.Inject; import com.dfsek.terra.api.entity.CommandSender; +import com.dfsek.terra.api.injection.annotations.Inject; @Command @DebugCommand diff --git a/common/implementation/src/main/java/com/dfsek/terra/commands/structure/SpawnCommand.java b/common/implementation/src/main/java/com/dfsek/terra/commands/structure/SpawnCommand.java index fa7522dac..3d5d19582 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/commands/structure/SpawnCommand.java +++ b/common/implementation/src/main/java/com/dfsek/terra/commands/structure/SpawnCommand.java @@ -6,19 +6,18 @@ import com.dfsek.terra.api.command.annotation.Command; import com.dfsek.terra.api.command.annotation.type.DebugCommand; import com.dfsek.terra.api.command.annotation.type.PlayerCommand; import com.dfsek.terra.api.command.annotation.type.WorldCommand; -import com.dfsek.terra.api.injection.annotations.Inject; -import com.dfsek.terra.api.vector.Location; -import com.dfsek.terra.api.vector.Vector3; -import com.dfsek.terra.vector.LocationImpl; import com.dfsek.terra.api.entity.CommandSender; import com.dfsek.terra.api.entity.Player; +import com.dfsek.terra.api.injection.annotations.Inject; +import com.dfsek.terra.api.structure.rotation.Rotation; import com.dfsek.terra.api.structures.parser.lang.constants.NumericConstant; import com.dfsek.terra.api.structures.script.TerraImplementationArguments; import com.dfsek.terra.api.structures.script.functions.CheckFunction; -import com.dfsek.terra.api.structure.rotation.Rotation; import com.dfsek.terra.api.structures.structure.buffer.StructureBuffer; import com.dfsek.terra.api.structures.tokenizer.Position; import com.dfsek.terra.api.util.FastRandom; +import com.dfsek.terra.api.vector.Vector3; +import com.dfsek.terra.vector.LocationImpl; import java.util.HashMap; diff --git a/common/implementation/src/main/java/com/dfsek/terra/commands/structure/StructureExportCommand.java b/common/implementation/src/main/java/com/dfsek/terra/commands/structure/StructureExportCommand.java index 8d6623294..3a2ae9962 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/commands/structure/StructureExportCommand.java +++ b/common/implementation/src/main/java/com/dfsek/terra/commands/structure/StructureExportCommand.java @@ -1,6 +1,10 @@ package com.dfsek.terra.commands.structure; import com.dfsek.terra.api.TerraPlugin; +import com.dfsek.terra.api.block.Block; +import com.dfsek.terra.api.block.BlockData; +import com.dfsek.terra.api.block.state.BlockState; +import com.dfsek.terra.api.block.state.Sign; import com.dfsek.terra.api.command.CommandTemplate; import com.dfsek.terra.api.command.annotation.Argument; import com.dfsek.terra.api.command.annotation.Command; @@ -8,16 +12,12 @@ import com.dfsek.terra.api.command.annotation.inject.ArgumentTarget; import com.dfsek.terra.api.command.annotation.type.DebugCommand; import com.dfsek.terra.api.command.annotation.type.PlayerCommand; import com.dfsek.terra.api.command.annotation.type.WorldCommand; +import com.dfsek.terra.api.entity.CommandSender; +import com.dfsek.terra.api.entity.Player; import com.dfsek.terra.api.injection.annotations.Inject; +import com.dfsek.terra.api.util.generic.pair.Pair; import com.dfsek.terra.api.vector.Location; import com.dfsek.terra.vector.LocationImpl; -import com.dfsek.terra.api.entity.CommandSender; -import com.dfsek.terra.api.block.Block; -import com.dfsek.terra.api.block.BlockData; -import com.dfsek.terra.api.block.state.BlockState; -import com.dfsek.terra.api.block.state.Sign; -import com.dfsek.terra.api.entity.Player; -import com.dfsek.terra.api.util.generic.pair.Pair; import java.io.BufferedWriter; import java.io.File; diff --git a/common/implementation/src/main/java/com/dfsek/terra/commands/structure/StructureLoadCommand.java b/common/implementation/src/main/java/com/dfsek/terra/commands/structure/StructureLoadCommand.java index 73b084897..0a2d30cce 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/commands/structure/StructureLoadCommand.java +++ b/common/implementation/src/main/java/com/dfsek/terra/commands/structure/StructureLoadCommand.java @@ -11,9 +11,9 @@ import com.dfsek.terra.api.command.annotation.type.DebugCommand; import com.dfsek.terra.api.command.annotation.type.PlayerCommand; import com.dfsek.terra.api.command.annotation.type.WorldCommand; import com.dfsek.terra.api.command.arg.IntegerArgumentParser; -import com.dfsek.terra.api.injection.annotations.Inject; import com.dfsek.terra.api.entity.CommandSender; import com.dfsek.terra.api.entity.Player; +import com.dfsek.terra.api.injection.annotations.Inject; import com.dfsek.terra.api.structure.Structure; import com.dfsek.terra.api.structure.rotation.Rotation; import com.dfsek.terra.api.util.FastRandom; diff --git a/common/implementation/src/main/java/com/dfsek/terra/commands/structure/StructureLocateCommand.java b/common/implementation/src/main/java/com/dfsek/terra/commands/structure/StructureLocateCommand.java index 2eb5be047..1604d2b0d 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/commands/structure/StructureLocateCommand.java +++ b/common/implementation/src/main/java/com/dfsek/terra/commands/structure/StructureLocateCommand.java @@ -10,15 +10,14 @@ import com.dfsek.terra.api.command.annotation.inject.SwitchTarget; import com.dfsek.terra.api.command.annotation.type.PlayerCommand; import com.dfsek.terra.api.command.annotation.type.WorldCommand; import com.dfsek.terra.api.command.arg.IntegerArgumentParser; -import com.dfsek.terra.api.injection.annotations.Inject; -import com.dfsek.terra.vector.LocationImpl; -import com.dfsek.terra.vector.Vector3Impl; import com.dfsek.terra.api.entity.CommandSender; import com.dfsek.terra.api.entity.Player; +import com.dfsek.terra.api.injection.annotations.Inject; import com.dfsek.terra.api.world.locate.AsyncStructureFinder; import com.dfsek.terra.commands.structure.argument.StructureArgumentParser; import com.dfsek.terra.commands.structure.completer.StructureCompleter; import com.dfsek.terra.config.lang.LangUtil; +import com.dfsek.terra.vector.Vector3Impl; import com.dfsek.terra.world.population.items.TerraStructure; import java.util.Locale; diff --git a/common/implementation/src/main/java/com/dfsek/terra/commands/structure/argument/ScriptArgumentParser.java b/common/implementation/src/main/java/com/dfsek/terra/commands/structure/argument/ScriptArgumentParser.java index 204eb0de1..86f871183 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/commands/structure/argument/ScriptArgumentParser.java +++ b/common/implementation/src/main/java/com/dfsek/terra/commands/structure/argument/ScriptArgumentParser.java @@ -2,9 +2,9 @@ package com.dfsek.terra.commands.structure.argument; import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.command.arg.ArgumentParser; -import com.dfsek.terra.api.injection.annotations.Inject; import com.dfsek.terra.api.entity.CommandSender; import com.dfsek.terra.api.entity.Player; +import com.dfsek.terra.api.injection.annotations.Inject; import com.dfsek.terra.api.structure.Structure; import com.dfsek.terra.api.structures.script.StructureScript; diff --git a/common/implementation/src/main/java/com/dfsek/terra/commands/structure/argument/StructureArgumentParser.java b/common/implementation/src/main/java/com/dfsek/terra/commands/structure/argument/StructureArgumentParser.java index fce6d9327..1216f6e05 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/commands/structure/argument/StructureArgumentParser.java +++ b/common/implementation/src/main/java/com/dfsek/terra/commands/structure/argument/StructureArgumentParser.java @@ -2,9 +2,9 @@ package com.dfsek.terra.commands.structure.argument; import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.command.arg.ArgumentParser; -import com.dfsek.terra.api.injection.annotations.Inject; import com.dfsek.terra.api.entity.CommandSender; import com.dfsek.terra.api.entity.Player; +import com.dfsek.terra.api.injection.annotations.Inject; import com.dfsek.terra.world.population.items.TerraStructure; public class StructureArgumentParser implements ArgumentParser { diff --git a/common/implementation/src/main/java/com/dfsek/terra/commands/structure/completer/ScriptCompleter.java b/common/implementation/src/main/java/com/dfsek/terra/commands/structure/completer/ScriptCompleter.java index 00f77e274..c7380b92c 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/commands/structure/completer/ScriptCompleter.java +++ b/common/implementation/src/main/java/com/dfsek/terra/commands/structure/completer/ScriptCompleter.java @@ -2,9 +2,9 @@ package com.dfsek.terra.commands.structure.completer; import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.command.tab.TabCompleter; -import com.dfsek.terra.api.injection.annotations.Inject; import com.dfsek.terra.api.entity.CommandSender; import com.dfsek.terra.api.entity.Player; +import com.dfsek.terra.api.injection.annotations.Inject; import com.dfsek.terra.api.structure.Structure; import com.dfsek.terra.api.structures.script.StructureScript; diff --git a/common/implementation/src/main/java/com/dfsek/terra/commands/structure/completer/StructureCompleter.java b/common/implementation/src/main/java/com/dfsek/terra/commands/structure/completer/StructureCompleter.java index bc9801a4e..7d5d963e9 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/commands/structure/completer/StructureCompleter.java +++ b/common/implementation/src/main/java/com/dfsek/terra/commands/structure/completer/StructureCompleter.java @@ -2,9 +2,9 @@ package com.dfsek.terra.commands.structure.completer; import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.command.tab.TabCompleter; -import com.dfsek.terra.api.injection.annotations.Inject; import com.dfsek.terra.api.entity.CommandSender; import com.dfsek.terra.api.entity.Player; +import com.dfsek.terra.api.injection.annotations.Inject; import com.dfsek.terra.world.population.items.TerraStructure; import java.util.ArrayList; diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/PluginConfigImpl.java b/common/implementation/src/main/java/com/dfsek/terra/config/PluginConfigImpl.java index 5ddf1806c..d7b1adecc 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/PluginConfigImpl.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/PluginConfigImpl.java @@ -5,9 +5,9 @@ import com.dfsek.tectonic.annotations.Value; import com.dfsek.tectonic.config.ConfigTemplate; import com.dfsek.tectonic.exception.ConfigException; import com.dfsek.tectonic.loading.ConfigLoader; +import com.dfsek.terra.api.Logger; import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.util.JarUtil; -import com.dfsek.terra.api.Logger; import java.io.File; import java.io.FileInputStream; diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/builder/BiomeBuilder.java b/common/implementation/src/main/java/com/dfsek/terra/config/builder/BiomeBuilder.java index d57eeb473..369ce1f68 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/builder/BiomeBuilder.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/builder/BiomeBuilder.java @@ -1,9 +1,8 @@ package com.dfsek.terra.config.builder; import com.dfsek.terra.api.util.ProbabilityCollection; -import com.dfsek.terra.api.world.biome.Biome; -import com.dfsek.terra.api.util.collections.ProbabilityCollectionImpl; import com.dfsek.terra.api.util.seeded.SeededBuilder; +import com.dfsek.terra.api.world.biome.Biome; import com.dfsek.terra.api.world.biome.TerraBiome; import com.dfsek.terra.config.templates.BiomeTemplate; diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/builder/UserDefinedBiomeBuilder.java b/common/implementation/src/main/java/com/dfsek/terra/config/builder/UserDefinedBiomeBuilder.java index d07fb139f..994c15125 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/builder/UserDefinedBiomeBuilder.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/builder/UserDefinedBiomeBuilder.java @@ -4,15 +4,14 @@ import com.dfsek.paralithic.eval.parser.Scope; import com.dfsek.paralithic.eval.tokenizer.ParseException; import com.dfsek.terra.api.noise.NoiseSampler; import com.dfsek.terra.api.util.ProbabilityCollection; -import com.dfsek.terra.noise.samplers.ExpressionSampler; -import com.dfsek.terra.noise.samplers.noise.ConstantSampler; -import com.dfsek.terra.api.world.biome.Biome; -import com.dfsek.terra.api.util.collections.ProbabilityCollectionImpl; import com.dfsek.terra.api.util.seeded.NoiseSeeded; +import com.dfsek.terra.api.world.biome.Biome; import com.dfsek.terra.api.world.biome.UserDefinedBiome; import com.dfsek.terra.config.loaders.config.function.FunctionTemplate; import com.dfsek.terra.config.pack.ConfigPackImpl; import com.dfsek.terra.config.templates.BiomeTemplate; +import com.dfsek.terra.noise.samplers.ExpressionSampler; +import com.dfsek.terra.noise.samplers.noise.ConstantSampler; import com.dfsek.terra.world.generation.WorldGenerator; import java.util.LinkedHashMap; diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/dummy/DummyWorld.java b/common/implementation/src/main/java/com/dfsek/terra/config/dummy/DummyWorld.java index f75118b1a..d709654c9 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/dummy/DummyWorld.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/dummy/DummyWorld.java @@ -1,10 +1,9 @@ package com.dfsek.terra.config.dummy; -import com.dfsek.terra.api.vector.Location; -import com.dfsek.terra.vector.LocationImpl; import com.dfsek.terra.api.block.Block; import com.dfsek.terra.api.entity.Entity; import com.dfsek.terra.api.entity.EntityType; +import com.dfsek.terra.api.vector.Location; import com.dfsek.terra.api.world.Chunk; import com.dfsek.terra.api.world.World; import com.dfsek.terra.api.world.generator.ChunkGenerator; diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/factories/FloraFactory.java b/common/implementation/src/main/java/com/dfsek/terra/config/factories/FloraFactory.java index 5f79cd72a..4e4860122 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/factories/FloraFactory.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/factories/FloraFactory.java @@ -1,12 +1,12 @@ package com.dfsek.terra.config.factories; import com.dfsek.terra.api.TerraPlugin; -import com.dfsek.terra.noise.samplers.noise.random.WhiteNoiseSampler; import com.dfsek.terra.api.world.Flora; import com.dfsek.terra.api.world.palette.NoisePalette; import com.dfsek.terra.api.world.palette.PaletteImpl; import com.dfsek.terra.api.world.palette.holder.PaletteLayerHolder; import com.dfsek.terra.config.templates.FloraTemplate; +import com.dfsek.terra.noise.samplers.noise.random.WhiteNoiseSampler; import com.dfsek.terra.world.population.items.flora.TerraFlora; public class FloraFactory implements ConfigFactory { diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/fileloaders/Loader.java b/common/implementation/src/main/java/com/dfsek/terra/config/fileloaders/Loader.java index c4b0bf6c7..b80abe274 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/fileloaders/Loader.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/fileloaders/Loader.java @@ -22,7 +22,7 @@ public abstract class Loader { public Loader then(ExceptionalConsumer> consumer) throws ConfigException { List list = new GlueList<>(); streams.forEach((id, stream) -> { - list.add(new Configuration(stream, id)); + list.add(new Configuration(stream, id)); }); consumer.accept(list); return this; diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/lang/LangUtil.java b/common/implementation/src/main/java/com/dfsek/terra/config/lang/LangUtil.java index 026b37d45..8c05530e2 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/lang/LangUtil.java +++ b/common/implementation/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.Logger; import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.entity.CommandSender; -import com.dfsek.terra.api.Logger; import com.dfsek.terra.api.lang.Language; import java.io.File; diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/lang/LanguageImpl.java b/common/implementation/src/main/java/com/dfsek/terra/config/lang/LanguageImpl.java index 3faa20dae..2227c2269 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/lang/LanguageImpl.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/lang/LanguageImpl.java @@ -14,9 +14,11 @@ import java.util.logging.Logger; public class LanguageImpl implements com.dfsek.terra.api.lang.Language { private final Configuration configuration; + public LanguageImpl(File file) throws IOException { configuration = new Configuration(new FileInputStream(file)); } + @Override @SuppressWarnings("unchecked") public Message getMessage(String id) { @@ -33,10 +35,12 @@ public class LanguageImpl implements com.dfsek.terra.api.lang.Language { if(temp == null || temp.isEmpty()) return new SingleLineMessage("message:" + id + ":translation_undefined"); return temp; } + @Override public void log(String messageID, Level level, Logger logger, String... args) { getMessage(messageID).log(logger, level, args); } + @Override public void send(String messageID, CommandSender sender, String... args) { getMessage(messageID).send(sender, args); diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/lang/MultiLineMessage.java b/common/implementation/src/main/java/com/dfsek/terra/config/lang/MultiLineMessage.java index 854204231..8b4efc673 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/lang/MultiLineMessage.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/lang/MultiLineMessage.java @@ -10,19 +10,21 @@ import java.util.logging.Logger; public class MultiLineMessage implements Message { private final List message; + public MultiLineMessage(List message) { this.message = message; } + @Override public void log(Logger logger, Level level, String... args) { - for(String line: message) { + for(String line : message) { logger.log(level, String.format(line, Arrays.asList(args).toArray())); } } @Override public void send(CommandSender sender, String... args) { - for(String line: message) { + for(String line : message) { sender.sendMessage(String.format(line, Arrays.asList(args).toArray())); } } diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/lang/SingleLineMessage.java b/common/implementation/src/main/java/com/dfsek/terra/config/lang/SingleLineMessage.java index 3288f58c9..18d6b4997 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/lang/SingleLineMessage.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/lang/SingleLineMessage.java @@ -10,9 +10,11 @@ import java.util.logging.Logger; public class SingleLineMessage implements Message { private final String message; + public SingleLineMessage(String message) { this.message = message; } + @Override public void log(Logger logger, Level level, String... args) { logger.log(level, String.format(message, Arrays.asList(args).toArray())); diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/Types.java b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/Types.java index eade08c4e..347260a72 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/Types.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/Types.java @@ -2,10 +2,9 @@ package com.dfsek.terra.config.loaders; import com.dfsek.terra.api.block.BlockData; import com.dfsek.terra.api.util.ProbabilityCollection; -import com.dfsek.terra.api.world.Tree; -import com.dfsek.terra.api.util.collections.ProbabilityCollectionImpl; -import com.dfsek.terra.api.world.biome.TerraBiome; import com.dfsek.terra.api.world.Flora; +import com.dfsek.terra.api.world.Tree; +import com.dfsek.terra.api.world.biome.TerraBiome; import java.lang.reflect.Type; import java.util.Map; diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/FloraLayerLoader.java b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/FloraLayerLoader.java index 801097e63..0bf8dd5f7 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/FloraLayerLoader.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/FloraLayerLoader.java @@ -4,14 +4,12 @@ import com.dfsek.tectonic.exception.ConfigException; import com.dfsek.tectonic.exception.LoadException; import com.dfsek.tectonic.loading.ConfigLoader; import com.dfsek.tectonic.loading.TypeLoader; -import com.dfsek.terra.api.math.range.ConstantRange; import com.dfsek.terra.api.util.ProbabilityCollection; import com.dfsek.terra.api.util.Range; -import com.dfsek.terra.noise.samplers.noise.random.WhiteNoiseSampler; -import com.dfsek.terra.api.util.collections.ProbabilityCollectionImpl; import com.dfsek.terra.api.util.seeded.NoiseSeeded; import com.dfsek.terra.api.world.Flora; import com.dfsek.terra.config.loaders.Types; +import com.dfsek.terra.noise.samplers.noise.random.WhiteNoiseSampler; import com.dfsek.terra.world.population.items.flora.FloraLayer; import java.lang.reflect.Type; diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/TreeLayerLoader.java b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/TreeLayerLoader.java index 203ee6b47..293b879f2 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/TreeLayerLoader.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/TreeLayerLoader.java @@ -3,14 +3,12 @@ package com.dfsek.terra.config.loaders.config; import com.dfsek.tectonic.exception.LoadException; import com.dfsek.tectonic.loading.ConfigLoader; import com.dfsek.tectonic.loading.TypeLoader; -import com.dfsek.terra.api.math.range.ConstantRange; import com.dfsek.terra.api.util.ProbabilityCollection; import com.dfsek.terra.api.util.Range; -import com.dfsek.terra.noise.samplers.noise.random.WhiteNoiseSampler; -import com.dfsek.terra.api.world.Tree; -import com.dfsek.terra.api.util.collections.ProbabilityCollectionImpl; import com.dfsek.terra.api.util.seeded.NoiseSeeded; +import com.dfsek.terra.api.world.Tree; import com.dfsek.terra.config.loaders.Types; +import com.dfsek.terra.noise.samplers.noise.random.WhiteNoiseSampler; import com.dfsek.terra.world.population.items.tree.TreeLayer; import java.lang.reflect.Type; diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/provider/BiomePipelineTemplate.java b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/provider/BiomePipelineTemplate.java index fee9144db..31a5f704c 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/provider/BiomePipelineTemplate.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/provider/BiomePipelineTemplate.java @@ -5,8 +5,8 @@ import com.dfsek.tectonic.annotations.Value; import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.util.seeded.SourceSeeded; import com.dfsek.terra.api.util.seeded.StageSeeded; -import com.dfsek.terra.api.world.biome.pipeline.BiomePipelineImpl; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; +import com.dfsek.terra.api.world.biome.pipeline.BiomePipelineImpl; import com.dfsek.terra.api.world.biome.provider.StandardBiomeProvider; import java.util.List; diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/provider/BiomeProviderTemplate.java b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/provider/BiomeProviderTemplate.java index 359b6c346..b2213c862 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/provider/BiomeProviderTemplate.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/provider/BiomeProviderTemplate.java @@ -4,9 +4,9 @@ import com.dfsek.tectonic.annotations.Default; import com.dfsek.tectonic.annotations.Value; import com.dfsek.tectonic.loading.object.ObjectTemplate; import com.dfsek.terra.api.noise.NoiseSampler; -import com.dfsek.terra.noise.samplers.noise.ConstantSampler; import com.dfsek.terra.api.util.seeded.NoiseSeeded; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; +import com.dfsek.terra.noise.samplers.noise.ConstantSampler; public abstract class BiomeProviderTemplate implements ObjectTemplate, BiomeProvider.BiomeProviderBuilder { @Value("resolution") diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/source/NoiseSourceTemplate.java b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/source/NoiseSourceTemplate.java index 05a670879..9e021c443 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/source/NoiseSourceTemplate.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/source/NoiseSourceTemplate.java @@ -2,7 +2,6 @@ package com.dfsek.terra.config.loaders.config.biome.templates.source; import com.dfsek.tectonic.annotations.Value; import com.dfsek.terra.api.util.ProbabilityCollection; -import com.dfsek.terra.api.util.collections.ProbabilityCollectionImpl; import com.dfsek.terra.api.util.seeded.NoiseSeeded; import com.dfsek.terra.api.world.biome.generation.pipeline.BiomeSource; import com.dfsek.terra.api.world.biome.pipeline.source.RandomSource; diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/stage/expander/ExpanderStageTemplate.java b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/stage/expander/ExpanderStageTemplate.java index 1196f3043..1e2183770 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/stage/expander/ExpanderStageTemplate.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/stage/expander/ExpanderStageTemplate.java @@ -1,8 +1,8 @@ package com.dfsek.terra.config.loaders.config.biome.templates.stage.expander; +import com.dfsek.terra.api.world.biome.generation.pipeline.Stage; import com.dfsek.terra.api.world.biome.pipeline.expand.FractalExpander; import com.dfsek.terra.api.world.biome.pipeline.stages.ExpanderStage; -import com.dfsek.terra.api.world.biome.generation.pipeline.Stage; import com.dfsek.terra.config.loaders.config.biome.templates.stage.StageTemplate; public class ExpanderStageTemplate extends StageTemplate { diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/stage/mutator/BorderListMutatorTemplate.java b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/stage/mutator/BorderListMutatorTemplate.java index f9bce049a..d2f0445ae 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/stage/mutator/BorderListMutatorTemplate.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/stage/mutator/BorderListMutatorTemplate.java @@ -2,7 +2,6 @@ package com.dfsek.terra.config.loaders.config.biome.templates.stage.mutator; import com.dfsek.tectonic.annotations.Value; import com.dfsek.terra.api.util.ProbabilityCollection; -import com.dfsek.terra.api.util.collections.ProbabilityCollectionImpl; import com.dfsek.terra.api.world.biome.TerraBiome; import com.dfsek.terra.api.world.biome.generation.pipeline.BiomeMutator; import com.dfsek.terra.api.world.biome.pipeline.mutator.BorderListMutator; diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/stage/mutator/BorderMutatorTemplate.java b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/stage/mutator/BorderMutatorTemplate.java index 6a7ada974..1aed5dee0 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/stage/mutator/BorderMutatorTemplate.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/stage/mutator/BorderMutatorTemplate.java @@ -2,7 +2,6 @@ package com.dfsek.terra.config.loaders.config.biome.templates.stage.mutator; import com.dfsek.tectonic.annotations.Value; import com.dfsek.terra.api.util.ProbabilityCollection; -import com.dfsek.terra.api.util.collections.ProbabilityCollectionImpl; import com.dfsek.terra.api.world.biome.generation.pipeline.BiomeMutator; import com.dfsek.terra.api.world.biome.pipeline.mutator.BorderMutator; import com.dfsek.terra.config.builder.BiomeBuilder; diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/stage/mutator/MutatorStageTemplate.java b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/stage/mutator/MutatorStageTemplate.java index 46021e4e7..f5d922e1b 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/stage/mutator/MutatorStageTemplate.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/stage/mutator/MutatorStageTemplate.java @@ -1,8 +1,8 @@ package com.dfsek.terra.config.loaders.config.biome.templates.stage.mutator; import com.dfsek.terra.api.world.biome.generation.pipeline.BiomeMutator; -import com.dfsek.terra.api.world.biome.pipeline.stages.MutatorStage; import com.dfsek.terra.api.world.biome.generation.pipeline.Stage; +import com.dfsek.terra.api.world.biome.pipeline.stages.MutatorStage; import com.dfsek.terra.config.loaders.config.biome.templates.stage.StageTemplate; public abstract class MutatorStageTemplate extends StageTemplate { diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/stage/mutator/ReplaceListMutatorTemplate.java b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/stage/mutator/ReplaceListMutatorTemplate.java index 2a5927c68..7758c70ec 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/stage/mutator/ReplaceListMutatorTemplate.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/stage/mutator/ReplaceListMutatorTemplate.java @@ -2,7 +2,6 @@ package com.dfsek.terra.config.loaders.config.biome.templates.stage.mutator; import com.dfsek.tectonic.annotations.Value; import com.dfsek.terra.api.util.ProbabilityCollection; -import com.dfsek.terra.api.util.collections.ProbabilityCollectionImpl; import com.dfsek.terra.api.world.biome.TerraBiome; import com.dfsek.terra.api.world.biome.generation.pipeline.BiomeMutator; import com.dfsek.terra.api.world.biome.pipeline.mutator.ReplaceListMutator; diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/stage/mutator/ReplaceMutatorTemplate.java b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/stage/mutator/ReplaceMutatorTemplate.java index 2f64878e6..52fe113d1 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/stage/mutator/ReplaceMutatorTemplate.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/stage/mutator/ReplaceMutatorTemplate.java @@ -2,7 +2,6 @@ package com.dfsek.terra.config.loaders.config.biome.templates.stage.mutator; import com.dfsek.tectonic.annotations.Value; import com.dfsek.terra.api.util.ProbabilityCollection; -import com.dfsek.terra.api.util.collections.ProbabilityCollectionImpl; import com.dfsek.terra.api.world.biome.generation.pipeline.BiomeMutator; import com.dfsek.terra.api.world.biome.pipeline.mutator.ReplaceMutator; import com.dfsek.terra.config.builder.BiomeBuilder; diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/DomainWarpTemplate.java b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/DomainWarpTemplate.java index c093dfe04..8a62a6aa0 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/DomainWarpTemplate.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/DomainWarpTemplate.java @@ -3,8 +3,8 @@ package com.dfsek.terra.config.loaders.config.sampler.templates; import com.dfsek.tectonic.annotations.Default; import com.dfsek.tectonic.annotations.Value; import com.dfsek.terra.api.noise.NoiseSampler; -import com.dfsek.terra.noise.samplers.DomainWarpedSampler; import com.dfsek.terra.api.util.seeded.NoiseSeeded; +import com.dfsek.terra.noise.samplers.DomainWarpedSampler; @SuppressWarnings({"unused", "FieldMayBeFinal"}) public class DomainWarpTemplate extends SamplerTemplate { diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/KernelTemplate.java b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/KernelTemplate.java index b9a0598f3..59448ca85 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/KernelTemplate.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/KernelTemplate.java @@ -5,8 +5,8 @@ import com.dfsek.tectonic.annotations.Value; import com.dfsek.tectonic.config.ValidatedConfigTemplate; import com.dfsek.tectonic.exception.ValidationException; import com.dfsek.terra.api.noise.NoiseSampler; -import com.dfsek.terra.noise.samplers.KernelSampler; import com.dfsek.terra.api.util.seeded.NoiseSeeded; +import com.dfsek.terra.noise.samplers.KernelSampler; import java.util.List; diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/CellularNoiseTemplate.java b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/CellularNoiseTemplate.java index cc5f88064..6bec571d1 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/CellularNoiseTemplate.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/CellularNoiseTemplate.java @@ -3,9 +3,9 @@ package com.dfsek.terra.config.loaders.config.sampler.templates.noise; import com.dfsek.tectonic.annotations.Default; import com.dfsek.tectonic.annotations.Value; import com.dfsek.terra.api.noise.NoiseSampler; +import com.dfsek.terra.api.util.seeded.NoiseSeeded; import com.dfsek.terra.noise.samplers.noise.CellularSampler; import com.dfsek.terra.noise.samplers.noise.simplex.OpenSimplex2Sampler; -import com.dfsek.terra.api.util.seeded.NoiseSeeded; @SuppressWarnings("FieldMayBeFinal") public class CellularNoiseTemplate extends NoiseTemplate { diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/ConstantNoiseTemplate.java b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/ConstantNoiseTemplate.java index 2a243de48..37cf881f4 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/ConstantNoiseTemplate.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/ConstantNoiseTemplate.java @@ -3,8 +3,8 @@ package com.dfsek.terra.config.loaders.config.sampler.templates.noise; import com.dfsek.tectonic.annotations.Default; import com.dfsek.tectonic.annotations.Value; import com.dfsek.terra.api.noise.NoiseSampler; -import com.dfsek.terra.noise.samplers.noise.ConstantSampler; import com.dfsek.terra.config.loaders.config.sampler.templates.SamplerTemplate; +import com.dfsek.terra.noise.samplers.noise.ConstantSampler; @SuppressWarnings("FieldMayBeFinal") public class ConstantNoiseTemplate extends SamplerTemplate { diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/ExpressionFunctionTemplate.java b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/ExpressionFunctionTemplate.java index 0863555fb..0c88b590e 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/ExpressionFunctionTemplate.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/ExpressionFunctionTemplate.java @@ -8,14 +8,14 @@ import com.dfsek.tectonic.annotations.Default; import com.dfsek.tectonic.annotations.Value; import com.dfsek.tectonic.config.ValidatedConfigTemplate; import com.dfsek.tectonic.exception.ValidationException; -import com.dfsek.terra.api.noise.NoiseSampler; -import com.dfsek.terra.noise.samplers.noise.ExpressionFunction; import com.dfsek.terra.api.math.paralithic.defined.UserDefinedFunction; import com.dfsek.terra.api.math.paralithic.noise.NoiseFunction2; import com.dfsek.terra.api.math.paralithic.noise.NoiseFunction3; +import com.dfsek.terra.api.noise.NoiseSampler; import com.dfsek.terra.api.util.seeded.NoiseSeeded; import com.dfsek.terra.config.loaders.config.function.FunctionTemplate; import com.dfsek.terra.config.loaders.config.sampler.templates.SamplerTemplate; +import com.dfsek.terra.noise.samplers.noise.ExpressionFunction; import java.util.HashMap; import java.util.LinkedHashMap; diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/NoiseTemplate.java b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/NoiseTemplate.java index 79d06e230..32295e959 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/NoiseTemplate.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/NoiseTemplate.java @@ -2,8 +2,8 @@ package com.dfsek.terra.config.loaders.config.sampler.templates.noise; import com.dfsek.tectonic.annotations.Default; import com.dfsek.tectonic.annotations.Value; -import com.dfsek.terra.noise.samplers.noise.NoiseFunction; import com.dfsek.terra.config.loaders.config.sampler.templates.SamplerTemplate; +import com.dfsek.terra.noise.samplers.noise.NoiseFunction; @SuppressWarnings({"unused", "FieldMayBeFinal"}) public abstract class NoiseTemplate extends SamplerTemplate { diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/fractal/FractalTemplate.java b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/fractal/FractalTemplate.java index 1a10e7427..37db190de 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/fractal/FractalTemplate.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/fractal/FractalTemplate.java @@ -2,9 +2,9 @@ package com.dfsek.terra.config.loaders.config.sampler.templates.noise.fractal; import com.dfsek.tectonic.annotations.Default; import com.dfsek.tectonic.annotations.Value; -import com.dfsek.terra.noise.samplers.noise.fractal.FractalNoiseFunction; import com.dfsek.terra.api.util.seeded.NoiseSeeded; import com.dfsek.terra.config.loaders.config.sampler.templates.SamplerTemplate; +import com.dfsek.terra.noise.samplers.noise.fractal.FractalNoiseFunction; public abstract class FractalTemplate extends SamplerTemplate { @Value("octaves") diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/fractal/PingPongTemplate.java b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/fractal/PingPongTemplate.java index f51cd6863..912b89831 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/fractal/PingPongTemplate.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/fractal/PingPongTemplate.java @@ -4,6 +4,7 @@ import com.dfsek.tectonic.annotations.Default; import com.dfsek.tectonic.annotations.Value; import com.dfsek.terra.api.noise.NoiseSampler; import com.dfsek.terra.noise.samplers.noise.fractal.PingPongSampler; + @SuppressWarnings({"unused", "FieldMayBeFinal"}) public class PingPongTemplate extends FractalTemplate { @Value("ping-pong") diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/normalizer/NormalizerTemplate.java b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/normalizer/NormalizerTemplate.java index 465d16607..da4a92fa7 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/normalizer/NormalizerTemplate.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/normalizer/NormalizerTemplate.java @@ -1,9 +1,9 @@ package com.dfsek.terra.config.loaders.config.sampler.templates.normalizer; import com.dfsek.tectonic.annotations.Value; -import com.dfsek.terra.noise.normalizer.Normalizer; import com.dfsek.terra.api.util.seeded.NoiseSeeded; import com.dfsek.terra.config.loaders.config.sampler.templates.SamplerTemplate; +import com.dfsek.terra.noise.normalizer.Normalizer; public abstract class NormalizerTemplate extends SamplerTemplate { @Value("function") diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/palette/CarverPaletteLoader.java b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/palette/CarverPaletteLoader.java index 0535300a1..ff2a3372c 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/palette/CarverPaletteLoader.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/palette/CarverPaletteLoader.java @@ -7,7 +7,6 @@ import com.dfsek.tectonic.loading.TypeLoader; import com.dfsek.terra.api.block.BlockData; import com.dfsek.terra.api.util.ProbabilityCollection; import com.dfsek.terra.api.util.collections.MaterialSet; -import com.dfsek.terra.api.util.collections.ProbabilityCollectionImpl; import com.dfsek.terra.carving.CarverPalette; import com.dfsek.terra.config.loaders.Types; diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/palette/PaletteHolderLoader.java b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/palette/PaletteHolderLoader.java index 1cbcac1a7..0f2ef2861 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/palette/PaletteHolderLoader.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/palette/PaletteHolderLoader.java @@ -4,7 +4,6 @@ import com.dfsek.tectonic.exception.LoadException; import com.dfsek.tectonic.loading.ConfigLoader; import com.dfsek.tectonic.loading.TypeLoader; import com.dfsek.terra.api.world.generator.Palette; -import com.dfsek.terra.api.world.palette.PaletteImpl; import com.dfsek.terra.api.world.palette.holder.PaletteHolder; import com.dfsek.terra.api.world.palette.holder.PaletteHolderBuilder; diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/palette/PaletteLayerLoader.java b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/palette/PaletteLayerLoader.java index ab1674c06..8a34a0817 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/palette/PaletteLayerLoader.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/palette/PaletteLayerLoader.java @@ -3,10 +3,9 @@ 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.noise.NoiseSampler; import com.dfsek.terra.api.block.BlockData; +import com.dfsek.terra.api.noise.NoiseSampler; import com.dfsek.terra.api.util.ProbabilityCollection; -import com.dfsek.terra.api.util.collections.ProbabilityCollectionImpl; import com.dfsek.terra.api.util.seeded.NoiseSeeded; import com.dfsek.terra.api.world.palette.holder.PaletteLayerHolder; import com.dfsek.terra.config.loaders.Types; diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/palette/slant/SlantHolderLoader.java b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/palette/slant/SlantHolderLoader.java index 8828197f4..d85246129 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/palette/slant/SlantHolderLoader.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/palette/slant/SlantHolderLoader.java @@ -21,7 +21,7 @@ public class SlantHolderLoader implements TypeLoader { for(Map layer : layers) { double threshold = ((Number) layer.get("threshold")).doubleValue(); - if (threshold < minThreshold) minThreshold = threshold; + if(threshold < minThreshold) minThreshold = threshold; slantLayers.put(threshold, (PaletteHolder) configLoader.loadType(PaletteHolder.class, layer.get("palette"))); } diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/pack/ConfigPackImpl.java b/common/implementation/src/main/java/com/dfsek/terra/config/pack/ConfigPackImpl.java index ffe2e561e..0a9655bec 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/pack/ConfigPackImpl.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/pack/ConfigPackImpl.java @@ -11,6 +11,7 @@ import com.dfsek.tectonic.loading.TypeRegistry; import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.addon.TerraAddon; import com.dfsek.terra.api.config.ConfigPack; +import com.dfsek.terra.api.config.ConfigType; import com.dfsek.terra.api.event.events.config.ConfigPackPostLoadEvent; import com.dfsek.terra.api.event.events.config.ConfigPackPreLoadEvent; import com.dfsek.terra.api.registry.CheckedRegistry; @@ -37,7 +38,6 @@ import com.dfsek.terra.config.loaders.config.biome.templates.provider.ImageProvi import com.dfsek.terra.config.loaders.config.biome.templates.provider.SingleBiomeProviderTemplate; import com.dfsek.terra.config.loaders.config.sampler.NoiseSamplerBuilderLoader; import com.dfsek.terra.config.loaders.config.sampler.templates.ImageSamplerTemplate; -import com.dfsek.terra.api.config.ConfigType; import com.dfsek.terra.config.prototype.ProtoConfig; import com.dfsek.terra.registry.CheckedRegistryImpl; import com.dfsek.terra.registry.OpenRegistryImpl; diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/templates/BiomeTemplate.java b/common/implementation/src/main/java/com/dfsek/terra/config/templates/BiomeTemplate.java index 9b9b38b86..bdcd343c0 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/templates/BiomeTemplate.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/templates/BiomeTemplate.java @@ -9,17 +9,15 @@ import com.dfsek.tectonic.annotations.Value; import com.dfsek.tectonic.config.ValidatedConfigTemplate; import com.dfsek.tectonic.exception.ValidationException; import com.dfsek.terra.api.TerraPlugin; +import com.dfsek.terra.api.block.BlockType; import com.dfsek.terra.api.config.ConfigPack; -import com.dfsek.terra.api.noise.NoiseSampler; -import com.dfsek.terra.api.util.ProbabilityCollection; -import com.dfsek.terra.noise.samplers.noise.ConstantSampler; import com.dfsek.terra.api.math.paralithic.BlankFunction; import com.dfsek.terra.api.math.paralithic.defined.UserDefinedFunction; -import com.dfsek.terra.api.block.BlockType; -import com.dfsek.terra.api.world.biome.Biome; +import com.dfsek.terra.api.noise.NoiseSampler; import com.dfsek.terra.api.util.GlueList; -import com.dfsek.terra.api.util.collections.ProbabilityCollectionImpl; +import com.dfsek.terra.api.util.ProbabilityCollection; import com.dfsek.terra.api.util.seeded.NoiseSeeded; +import com.dfsek.terra.api.world.biome.Biome; import com.dfsek.terra.api.world.generator.Palette; import com.dfsek.terra.api.world.palette.PaletteImpl; import com.dfsek.terra.api.world.palette.holder.PaletteHolder; @@ -27,6 +25,7 @@ import com.dfsek.terra.api.world.palette.slant.SlantHolder; import com.dfsek.terra.carving.UserDefinedCarver; import com.dfsek.terra.config.loaders.config.function.FunctionTemplate; import com.dfsek.terra.config.pack.ConfigPackImpl; +import com.dfsek.terra.noise.samplers.noise.ConstantSampler; import com.dfsek.terra.world.population.items.TerraStructure; import com.dfsek.terra.world.population.items.flora.FloraLayer; import com.dfsek.terra.world.population.items.ores.OreHolder; diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/templates/CarverTemplate.java b/common/implementation/src/main/java/com/dfsek/terra/config/templates/CarverTemplate.java index 5e11d9a32..0c3b53475 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/templates/CarverTemplate.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/templates/CarverTemplate.java @@ -3,8 +3,8 @@ package com.dfsek.terra.config.templates; import com.dfsek.tectonic.annotations.Abstractable; import com.dfsek.tectonic.annotations.Default; import com.dfsek.tectonic.annotations.Value; -import com.dfsek.terra.api.math.range.ConstantRange; import com.dfsek.terra.api.block.BlockType; +import com.dfsek.terra.api.math.range.ConstantRange; import com.dfsek.terra.api.util.Range; import com.dfsek.terra.api.util.collections.MaterialSet; import com.dfsek.terra.carving.CarverPalette; diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/templates/PaletteTemplate.java b/common/implementation/src/main/java/com/dfsek/terra/config/templates/PaletteTemplate.java index 87186a9bc..b92cbc12a 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/templates/PaletteTemplate.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/templates/PaletteTemplate.java @@ -4,9 +4,9 @@ import com.dfsek.tectonic.annotations.Abstractable; import com.dfsek.tectonic.annotations.Default; import com.dfsek.tectonic.annotations.Value; import com.dfsek.terra.api.noise.NoiseSampler; -import com.dfsek.terra.noise.samplers.noise.random.WhiteNoiseSampler; import com.dfsek.terra.api.util.seeded.NoiseSeeded; import com.dfsek.terra.api.world.palette.holder.PaletteLayerHolder; +import com.dfsek.terra.noise.samplers.noise.random.WhiteNoiseSampler; import java.util.List; diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/templates/StructureTemplate.java b/common/implementation/src/main/java/com/dfsek/terra/config/templates/StructureTemplate.java index 5f99d6679..198723453 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/templates/StructureTemplate.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/templates/StructureTemplate.java @@ -9,7 +9,6 @@ import com.dfsek.terra.api.structure.Structure; import com.dfsek.terra.api.util.GlueList; import com.dfsek.terra.api.util.ProbabilityCollection; import com.dfsek.terra.api.util.Range; -import com.dfsek.terra.api.util.collections.ProbabilityCollectionImpl; import java.util.List; diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/templates/TreeTemplate.java b/common/implementation/src/main/java/com/dfsek/terra/config/templates/TreeTemplate.java index e7af73c3b..66837b818 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/templates/TreeTemplate.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/templates/TreeTemplate.java @@ -6,7 +6,6 @@ import com.dfsek.tectonic.annotations.Value; import com.dfsek.terra.api.structure.Structure; import com.dfsek.terra.api.util.ProbabilityCollection; import com.dfsek.terra.api.util.collections.MaterialSet; -import com.dfsek.terra.api.util.collections.ProbabilityCollectionImpl; @SuppressWarnings({"unused", "FieldMayBeFinal"}) public class TreeTemplate extends AbstractableTemplate { diff --git a/common/implementation/src/main/java/com/dfsek/terra/noise/samplers/noise/CellularSampler.java b/common/implementation/src/main/java/com/dfsek/terra/noise/samplers/noise/CellularSampler.java index 336226a35..7f21694d3 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/noise/samplers/noise/CellularSampler.java +++ b/common/implementation/src/main/java/com/dfsek/terra/noise/samplers/noise/CellularSampler.java @@ -1,9 +1,9 @@ package com.dfsek.terra.noise.samplers.noise; import com.dfsek.terra.api.noise.NoiseSampler; -import com.dfsek.terra.noise.samplers.noise.simplex.OpenSimplex2Sampler; import com.dfsek.terra.api.vector.Vector2; import com.dfsek.terra.api.vector.Vector3; +import com.dfsek.terra.noise.samplers.noise.simplex.OpenSimplex2Sampler; import com.dfsek.terra.vector.Vector2Impl; import com.dfsek.terra.vector.Vector3Impl; diff --git a/common/implementation/src/main/java/com/dfsek/terra/registry/CheckedRegistryImpl.java b/common/implementation/src/main/java/com/dfsek/terra/registry/CheckedRegistryImpl.java index cfccf8aa3..20cb9b0b3 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/registry/CheckedRegistryImpl.java +++ b/common/implementation/src/main/java/com/dfsek/terra/registry/CheckedRegistryImpl.java @@ -3,8 +3,8 @@ package com.dfsek.terra.registry; import com.dfsek.tectonic.exception.LoadException; import com.dfsek.tectonic.loading.ConfigLoader; import com.dfsek.terra.api.registry.CheckedRegistry; -import com.dfsek.terra.api.registry.OpenRegistry; import com.dfsek.terra.api.registry.DuplicateEntryException; +import com.dfsek.terra.api.registry.OpenRegistry; import java.lang.reflect.Type; import java.util.Collection; diff --git a/common/implementation/src/main/java/com/dfsek/terra/registry/OpenRegistryImpl.java b/common/implementation/src/main/java/com/dfsek/terra/registry/OpenRegistryImpl.java index 82070af97..2622d010a 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/registry/OpenRegistryImpl.java +++ b/common/implementation/src/main/java/com/dfsek/terra/registry/OpenRegistryImpl.java @@ -2,8 +2,8 @@ package com.dfsek.terra.registry; import com.dfsek.tectonic.exception.LoadException; import com.dfsek.tectonic.loading.ConfigLoader; -import com.dfsek.terra.api.registry.OpenRegistry; import com.dfsek.terra.api.registry.DuplicateEntryException; +import com.dfsek.terra.api.registry.OpenRegistry; import java.lang.reflect.Type; import java.util.Collection; @@ -17,6 +17,7 @@ import java.util.stream.Collectors; /** * Registry implementation with read/write access. For internal use only. + * * @param */ public class OpenRegistryImpl implements OpenRegistry { diff --git a/common/implementation/src/main/java/com/dfsek/terra/registry/config/ConfigTypeRegistry.java b/common/implementation/src/main/java/com/dfsek/terra/registry/config/ConfigTypeRegistry.java index f2537159e..4a3df8790 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/registry/config/ConfigTypeRegistry.java +++ b/common/implementation/src/main/java/com/dfsek/terra/registry/config/ConfigTypeRegistry.java @@ -4,11 +4,11 @@ import com.dfsek.tectonic.config.ConfigTemplate; import com.dfsek.tectonic.exception.LoadException; import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.config.ConfigPack; +import com.dfsek.terra.api.config.ConfigType; import com.dfsek.terra.api.registry.OpenRegistry; -import com.dfsek.terra.api.world.Tree; import com.dfsek.terra.api.world.Flora; +import com.dfsek.terra.api.world.Tree; import com.dfsek.terra.api.world.generator.Palette; -import com.dfsek.terra.api.world.palette.PaletteImpl; import com.dfsek.terra.carving.UserDefinedCarver; import com.dfsek.terra.config.builder.BiomeBuilder; import com.dfsek.terra.config.factories.BiomeFactory; @@ -20,7 +20,6 @@ import com.dfsek.terra.config.factories.PaletteFactory; import com.dfsek.terra.config.factories.StructureFactory; import com.dfsek.terra.config.factories.TreeFactory; import com.dfsek.terra.config.pack.ConfigPackImpl; -import com.dfsek.terra.api.config.ConfigType; import com.dfsek.terra.config.templates.AbstractableTemplate; import com.dfsek.terra.config.templates.BiomeTemplate; import com.dfsek.terra.config.templates.CarverTemplate; diff --git a/common/implementation/src/main/java/com/dfsek/terra/registry/config/NoiseRegistry.java b/common/implementation/src/main/java/com/dfsek/terra/registry/config/NoiseRegistry.java index 91017c2da..46fb45c4f 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/registry/config/NoiseRegistry.java +++ b/common/implementation/src/main/java/com/dfsek/terra/registry/config/NoiseRegistry.java @@ -1,13 +1,5 @@ package com.dfsek.terra.registry.config; -import com.dfsek.terra.noise.samplers.noise.random.GaussianNoiseSampler; -import com.dfsek.terra.noise.samplers.noise.random.WhiteNoiseSampler; -import com.dfsek.terra.noise.samplers.noise.simplex.OpenSimplex2SSampler; -import com.dfsek.terra.noise.samplers.noise.simplex.OpenSimplex2Sampler; -import com.dfsek.terra.noise.samplers.noise.simplex.PerlinSampler; -import com.dfsek.terra.noise.samplers.noise.simplex.SimplexSampler; -import com.dfsek.terra.noise.samplers.noise.value.ValueCubicSampler; -import com.dfsek.terra.noise.samplers.noise.value.ValueSampler; import com.dfsek.terra.api.util.seeded.NoiseProvider; import com.dfsek.terra.config.loaders.config.sampler.templates.DomainWarpTemplate; import com.dfsek.terra.config.loaders.config.sampler.templates.ImageSamplerTemplate; @@ -23,6 +15,14 @@ import com.dfsek.terra.config.loaders.config.sampler.templates.noise.fractal.Rid import com.dfsek.terra.config.loaders.config.sampler.templates.normalizer.ClampNormalizerTemplate; import com.dfsek.terra.config.loaders.config.sampler.templates.normalizer.LinearNormalizerTemplate; import com.dfsek.terra.config.loaders.config.sampler.templates.normalizer.NormalNormalizerTemplate; +import com.dfsek.terra.noise.samplers.noise.random.GaussianNoiseSampler; +import com.dfsek.terra.noise.samplers.noise.random.WhiteNoiseSampler; +import com.dfsek.terra.noise.samplers.noise.simplex.OpenSimplex2SSampler; +import com.dfsek.terra.noise.samplers.noise.simplex.OpenSimplex2Sampler; +import com.dfsek.terra.noise.samplers.noise.simplex.PerlinSampler; +import com.dfsek.terra.noise.samplers.noise.simplex.SimplexSampler; +import com.dfsek.terra.noise.samplers.noise.value.ValueCubicSampler; +import com.dfsek.terra.noise.samplers.noise.value.ValueSampler; import com.dfsek.terra.registry.OpenRegistryImpl; public class NoiseRegistry extends OpenRegistryImpl { diff --git a/common/implementation/src/main/java/com/dfsek/terra/vector/Vector3Impl.java b/common/implementation/src/main/java/com/dfsek/terra/vector/Vector3Impl.java index 2ab0f974c..7d3e911d0 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/vector/Vector3Impl.java +++ b/common/implementation/src/main/java/com/dfsek/terra/vector/Vector3Impl.java @@ -2,9 +2,9 @@ package com.dfsek.terra.vector; import com.dfsek.terra.api.util.MathUtil; import com.dfsek.terra.api.vector.Location; -import com.dfsek.terra.api.world.World; import com.dfsek.terra.api.vector.Vector2; import com.dfsek.terra.api.vector.Vector3; +import com.dfsek.terra.api.world.World; import net.jafama.FastMath; import org.jetbrains.annotations.NotNull; diff --git a/common/implementation/src/main/java/com/dfsek/terra/world/TerraWorldImpl.java b/common/implementation/src/main/java/com/dfsek/terra/world/TerraWorldImpl.java index 38ee2a1d9..daadd3e40 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/world/TerraWorldImpl.java +++ b/common/implementation/src/main/java/com/dfsek/terra/world/TerraWorldImpl.java @@ -1,20 +1,18 @@ package com.dfsek.terra.world; import com.dfsek.terra.api.TerraPlugin; +import com.dfsek.terra.api.block.BlockData; import com.dfsek.terra.api.config.ConfigPack; import com.dfsek.terra.api.event.events.world.TerraWorldLoadEvent; import com.dfsek.terra.api.vector.Location; -import com.dfsek.terra.api.world.TerraWorld; -import com.dfsek.terra.vector.LocationImpl; import com.dfsek.terra.api.vector.Vector3; -import com.dfsek.terra.api.block.BlockData; +import com.dfsek.terra.api.world.TerraWorld; import com.dfsek.terra.api.world.World; import com.dfsek.terra.api.world.biome.UserDefinedBiome; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; import com.dfsek.terra.api.world.generator.Palette; -import com.dfsek.terra.config.pack.ConfigPackImpl; -import com.dfsek.terra.config.pack.WorldConfigImpl; import com.dfsek.terra.api.world.generator.Sampler; +import com.dfsek.terra.config.pack.WorldConfigImpl; import net.jafama.FastMath; public class TerraWorldImpl implements TerraWorld { diff --git a/common/implementation/src/main/java/com/dfsek/terra/world/generation/generators/DefaultChunkGenerator2D.java b/common/implementation/src/main/java/com/dfsek/terra/world/generation/generators/DefaultChunkGenerator2D.java index 3e4963931..794fbdef8 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/world/generation/generators/DefaultChunkGenerator2D.java +++ b/common/implementation/src/main/java/com/dfsek/terra/world/generation/generators/DefaultChunkGenerator2D.java @@ -1,26 +1,26 @@ package com.dfsek.terra.world.generation.generators; import com.dfsek.terra.api.TerraPlugin; -import com.dfsek.terra.api.math.range.ConstantRange; import com.dfsek.terra.api.block.BlockData; +import com.dfsek.terra.api.math.range.ConstantRange; +import com.dfsek.terra.api.profiler.ProfileFrame; +import com.dfsek.terra.api.util.PaletteUtil; import com.dfsek.terra.api.world.BiomeGrid; import com.dfsek.terra.api.world.TerraWorld; import com.dfsek.terra.api.world.World; -import com.dfsek.terra.api.world.generator.ChunkData; -import com.dfsek.terra.api.util.PaletteUtil; import com.dfsek.terra.api.world.biome.TerraBiome; import com.dfsek.terra.api.world.biome.UserDefinedBiome; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; +import com.dfsek.terra.api.world.generator.ChunkData; import com.dfsek.terra.api.world.generator.Palette; +import com.dfsek.terra.api.world.generator.Sampler; import com.dfsek.terra.api.world.generator.SamplerCache; import com.dfsek.terra.api.world.generator.TerraBlockPopulator; import com.dfsek.terra.api.world.generator.TerraChunkGenerator; import com.dfsek.terra.config.pack.ConfigPackImpl; import com.dfsek.terra.config.templates.BiomeTemplate; -import com.dfsek.terra.api.profiler.ProfileFrame; import com.dfsek.terra.world.Carver; import com.dfsek.terra.world.carving.NoiseCarver; -import com.dfsek.terra.api.world.generator.Sampler; import com.dfsek.terra.world.generation.math.samplers.Sampler2D; import com.dfsek.terra.world.population.CavePopulator; import com.dfsek.terra.world.population.OrePopulator; diff --git a/common/implementation/src/main/java/com/dfsek/terra/world/generation/generators/DefaultChunkGenerator3D.java b/common/implementation/src/main/java/com/dfsek/terra/world/generation/generators/DefaultChunkGenerator3D.java index 1f9ca86bf..efc6dcde2 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/world/generation/generators/DefaultChunkGenerator3D.java +++ b/common/implementation/src/main/java/com/dfsek/terra/world/generation/generators/DefaultChunkGenerator3D.java @@ -1,13 +1,6 @@ package com.dfsek.terra.world.generation.generators; import com.dfsek.terra.api.TerraPlugin; -import com.dfsek.terra.api.config.ConfigPack; -import com.dfsek.terra.api.math.range.ConstantRange; -import com.dfsek.terra.api.vector.Vector3; -import com.dfsek.terra.api.world.TerraWorld; -import com.dfsek.terra.api.world.generator.Palette; -import com.dfsek.terra.config.pack.ConfigPackImpl; -import com.dfsek.terra.vector.Vector3Impl; import com.dfsek.terra.api.block.BlockData; import com.dfsek.terra.api.block.BlockFace; import com.dfsek.terra.api.block.BlockType; @@ -15,21 +8,27 @@ import com.dfsek.terra.api.block.data.Bisected; import com.dfsek.terra.api.block.data.Slab; import com.dfsek.terra.api.block.data.Stairs; import com.dfsek.terra.api.block.data.Waterlogged; -import com.dfsek.terra.api.world.BiomeGrid; -import com.dfsek.terra.api.world.World; -import com.dfsek.terra.api.world.generator.ChunkData; +import com.dfsek.terra.api.config.ConfigPack; +import com.dfsek.terra.api.math.range.ConstantRange; +import com.dfsek.terra.api.profiler.ProfileFrame; import com.dfsek.terra.api.util.PaletteUtil; +import com.dfsek.terra.api.vector.Vector3; +import com.dfsek.terra.api.world.BiomeGrid; +import com.dfsek.terra.api.world.TerraWorld; +import com.dfsek.terra.api.world.World; import com.dfsek.terra.api.world.biome.TerraBiome; import com.dfsek.terra.api.world.biome.UserDefinedBiome; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; +import com.dfsek.terra.api.world.generator.ChunkData; +import com.dfsek.terra.api.world.generator.Palette; +import com.dfsek.terra.api.world.generator.Sampler; import com.dfsek.terra.api.world.generator.TerraBlockPopulator; import com.dfsek.terra.api.world.generator.TerraChunkGenerator; import com.dfsek.terra.api.world.palette.PaletteImpl; import com.dfsek.terra.config.templates.BiomeTemplate; -import com.dfsek.terra.api.profiler.ProfileFrame; +import com.dfsek.terra.vector.Vector3Impl; import com.dfsek.terra.world.Carver; import com.dfsek.terra.world.carving.NoiseCarver; -import com.dfsek.terra.api.world.generator.Sampler; import com.dfsek.terra.world.generation.math.samplers.Sampler3D; import com.dfsek.terra.world.population.CavePopulator; import com.dfsek.terra.world.population.FloraPopulator; diff --git a/common/implementation/src/main/java/com/dfsek/terra/world/generation/math/interpolation/ChunkInterpolator2D.java b/common/implementation/src/main/java/com/dfsek/terra/world/generation/math/interpolation/ChunkInterpolator2D.java index da084e791..a0893afea 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/world/generation/math/interpolation/ChunkInterpolator2D.java +++ b/common/implementation/src/main/java/com/dfsek/terra/world/generation/math/interpolation/ChunkInterpolator2D.java @@ -1,11 +1,11 @@ package com.dfsek.terra.world.generation.math.interpolation; -import com.dfsek.terra.api.vector.Vector3; -import com.dfsek.terra.vector.Vector3Impl; -import com.dfsek.terra.api.world.World; import com.dfsek.terra.api.util.mutable.MutableInteger; +import com.dfsek.terra.api.vector.Vector3; +import com.dfsek.terra.api.world.World; import com.dfsek.terra.api.world.biome.Generator; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; +import com.dfsek.terra.vector.Vector3Impl; import net.jafama.FastMath; import java.util.HashMap; diff --git a/common/implementation/src/main/java/com/dfsek/terra/world/generation/math/interpolation/ChunkInterpolator3D.java b/common/implementation/src/main/java/com/dfsek/terra/world/generation/math/interpolation/ChunkInterpolator3D.java index 814f1f12a..f87022f14 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/world/generation/math/interpolation/ChunkInterpolator3D.java +++ b/common/implementation/src/main/java/com/dfsek/terra/world/generation/math/interpolation/ChunkInterpolator3D.java @@ -1,11 +1,11 @@ package com.dfsek.terra.world.generation.math.interpolation; -import com.dfsek.terra.api.vector.Vector3; -import com.dfsek.terra.vector.Vector3Impl; -import com.dfsek.terra.api.world.World; import com.dfsek.terra.api.util.mutable.MutableInteger; +import com.dfsek.terra.api.vector.Vector3; +import com.dfsek.terra.api.world.World; import com.dfsek.terra.api.world.biome.Generator; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; +import com.dfsek.terra.vector.Vector3Impl; import net.jafama.FastMath; import java.util.HashMap; diff --git a/common/implementation/src/main/java/com/dfsek/terra/world/population/CavePopulator.java b/common/implementation/src/main/java/com/dfsek/terra/world/population/CavePopulator.java index 20fbd2d65..1d2caf052 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/world/population/CavePopulator.java +++ b/common/implementation/src/main/java/com/dfsek/terra/world/population/CavePopulator.java @@ -1,23 +1,21 @@ package com.dfsek.terra.world.population; import com.dfsek.terra.api.TerraPlugin; -import com.dfsek.terra.api.config.WorldConfig; -import com.dfsek.terra.api.vector.Location; -import com.dfsek.terra.vector.LocationImpl; import com.dfsek.terra.api.block.Block; import com.dfsek.terra.api.block.BlockData; import com.dfsek.terra.api.block.BlockType; +import com.dfsek.terra.api.config.WorldConfig; import com.dfsek.terra.api.handle.WorldHandle; +import com.dfsek.terra.api.profiler.ProfileFrame; +import com.dfsek.terra.api.util.PopulationUtil; +import com.dfsek.terra.api.vector.Location; import com.dfsek.terra.api.world.Chunk; import com.dfsek.terra.api.world.TerraWorld; import com.dfsek.terra.api.world.World; -import com.dfsek.terra.api.util.PopulationUtil; import com.dfsek.terra.api.world.generator.Chunkified; import com.dfsek.terra.api.world.generator.TerraBlockPopulator; import com.dfsek.terra.carving.UserDefinedCarver; -import com.dfsek.terra.config.pack.WorldConfigImpl; import com.dfsek.terra.config.templates.CarverTemplate; -import com.dfsek.terra.api.profiler.ProfileFrame; import org.jetbrains.annotations.NotNull; import java.util.HashMap; diff --git a/common/implementation/src/main/java/com/dfsek/terra/world/population/FloraPopulator.java b/common/implementation/src/main/java/com/dfsek/terra/world/population/FloraPopulator.java index a42678384..6019f410a 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/world/population/FloraPopulator.java +++ b/common/implementation/src/main/java/com/dfsek/terra/world/population/FloraPopulator.java @@ -1,16 +1,16 @@ package com.dfsek.terra.world.population; import com.dfsek.terra.api.TerraPlugin; -import com.dfsek.terra.api.vector.Vector2; -import com.dfsek.terra.api.world.TerraWorld; -import com.dfsek.terra.vector.Vector2Impl; -import com.dfsek.terra.api.world.Chunk; -import com.dfsek.terra.api.world.World; +import com.dfsek.terra.api.profiler.ProfileFrame; import com.dfsek.terra.api.util.PopulationUtil; +import com.dfsek.terra.api.vector.Vector2; +import com.dfsek.terra.api.world.Chunk; +import com.dfsek.terra.api.world.TerraWorld; +import com.dfsek.terra.api.world.World; import com.dfsek.terra.api.world.biome.UserDefinedBiome; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; import com.dfsek.terra.api.world.generator.TerraBlockPopulator; -import com.dfsek.terra.api.profiler.ProfileFrame; +import com.dfsek.terra.vector.Vector2Impl; import com.dfsek.terra.world.population.items.flora.FloraLayer; import org.jetbrains.annotations.NotNull; diff --git a/common/implementation/src/main/java/com/dfsek/terra/world/population/OrePopulator.java b/common/implementation/src/main/java/com/dfsek/terra/world/population/OrePopulator.java index cdf07454c..55815917b 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/world/population/OrePopulator.java +++ b/common/implementation/src/main/java/com/dfsek/terra/world/population/OrePopulator.java @@ -1,17 +1,17 @@ package com.dfsek.terra.world.population; import com.dfsek.terra.api.TerraPlugin; -import com.dfsek.terra.api.util.PopulationUtil; -import com.dfsek.terra.api.world.TerraWorld; -import com.dfsek.terra.vector.Vector3Impl; -import com.dfsek.terra.api.world.Chunk; -import com.dfsek.terra.api.world.World; +import com.dfsek.terra.api.profiler.ProfileFrame; import com.dfsek.terra.api.util.FastRandom; +import com.dfsek.terra.api.util.PopulationUtil; +import com.dfsek.terra.api.world.Chunk; +import com.dfsek.terra.api.world.TerraWorld; +import com.dfsek.terra.api.world.World; import com.dfsek.terra.api.world.biome.TerraBiome; import com.dfsek.terra.api.world.biome.UserDefinedBiome; import com.dfsek.terra.api.world.generator.TerraBlockPopulator; import com.dfsek.terra.config.templates.BiomeTemplate; -import com.dfsek.terra.api.profiler.ProfileFrame; +import com.dfsek.terra.vector.Vector3Impl; import org.jetbrains.annotations.NotNull; import java.util.Random; diff --git a/common/implementation/src/main/java/com/dfsek/terra/world/population/StructurePopulator.java b/common/implementation/src/main/java/com/dfsek/terra/world/population/StructurePopulator.java index 0b05f5373..270895868 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/world/population/StructurePopulator.java +++ b/common/implementation/src/main/java/com/dfsek/terra/world/population/StructurePopulator.java @@ -2,21 +2,18 @@ package com.dfsek.terra.world.population; import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.config.WorldConfig; -import com.dfsek.terra.api.structure.Structure; +import com.dfsek.terra.api.profiler.ProfileFrame; +import com.dfsek.terra.api.structure.rotation.Rotation; +import com.dfsek.terra.api.util.FastRandom; import com.dfsek.terra.api.util.PopulationUtil; import com.dfsek.terra.api.vector.Location; -import com.dfsek.terra.vector.LocationImpl; import com.dfsek.terra.api.world.Chunk; import com.dfsek.terra.api.world.TerraWorld; import com.dfsek.terra.api.world.World; -import com.dfsek.terra.api.structure.rotation.Rotation; -import com.dfsek.terra.api.util.FastRandom; import com.dfsek.terra.api.world.biome.UserDefinedBiome; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; import com.dfsek.terra.api.world.generator.Chunkified; import com.dfsek.terra.api.world.generator.TerraBlockPopulator; -import com.dfsek.terra.config.pack.WorldConfigImpl; -import com.dfsek.terra.api.profiler.ProfileFrame; import com.dfsek.terra.world.population.items.TerraStructure; import net.jafama.FastMath; import org.jetbrains.annotations.NotNull; diff --git a/common/implementation/src/main/java/com/dfsek/terra/world/population/TreePopulator.java b/common/implementation/src/main/java/com/dfsek/terra/world/population/TreePopulator.java index 7e045a488..5b80a14e8 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/world/population/TreePopulator.java +++ b/common/implementation/src/main/java/com/dfsek/terra/world/population/TreePopulator.java @@ -1,15 +1,15 @@ package com.dfsek.terra.world.population; import com.dfsek.terra.api.TerraPlugin; -import com.dfsek.terra.api.world.TerraWorld; -import com.dfsek.terra.vector.Vector2Impl; -import com.dfsek.terra.api.world.Chunk; -import com.dfsek.terra.api.world.World; +import com.dfsek.terra.api.profiler.ProfileFrame; import com.dfsek.terra.api.util.PopulationUtil; +import com.dfsek.terra.api.world.Chunk; +import com.dfsek.terra.api.world.TerraWorld; +import com.dfsek.terra.api.world.World; import com.dfsek.terra.api.world.biome.UserDefinedBiome; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; import com.dfsek.terra.api.world.generator.TerraBlockPopulator; -import com.dfsek.terra.api.profiler.ProfileFrame; +import com.dfsek.terra.vector.Vector2Impl; import com.dfsek.terra.world.population.items.tree.TreeLayer; import net.jafama.FastMath; import org.jetbrains.annotations.NotNull; diff --git a/common/implementation/src/main/java/com/dfsek/terra/world/population/items/PlaceableLayer.java b/common/implementation/src/main/java/com/dfsek/terra/world/population/items/PlaceableLayer.java index b859ad1b5..51bf38a5c 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/world/population/items/PlaceableLayer.java +++ b/common/implementation/src/main/java/com/dfsek/terra/world/population/items/PlaceableLayer.java @@ -3,7 +3,6 @@ package com.dfsek.terra.world.population.items; import com.dfsek.terra.api.noise.NoiseSampler; import com.dfsek.terra.api.util.ProbabilityCollection; import com.dfsek.terra.api.util.Range; -import com.dfsek.terra.api.util.collections.ProbabilityCollectionImpl; import com.dfsek.terra.api.vector.Vector2; import com.dfsek.terra.api.world.Chunk; diff --git a/common/implementation/src/main/java/com/dfsek/terra/world/population/items/TerraStructure.java b/common/implementation/src/main/java/com/dfsek/terra/world/population/items/TerraStructure.java index e3dace7fd..361e3710d 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/world/population/items/TerraStructure.java +++ b/common/implementation/src/main/java/com/dfsek/terra/world/population/items/TerraStructure.java @@ -4,7 +4,6 @@ import com.dfsek.terra.api.math.GridSpawn; import com.dfsek.terra.api.structure.Structure; import com.dfsek.terra.api.util.ProbabilityCollection; import com.dfsek.terra.api.util.Range; -import com.dfsek.terra.api.util.collections.ProbabilityCollectionImpl; import com.dfsek.terra.config.templates.StructureTemplate; public class TerraStructure { diff --git a/common/implementation/src/main/java/com/dfsek/terra/world/population/items/flora/BlockFlora.java b/common/implementation/src/main/java/com/dfsek/terra/world/population/items/flora/BlockFlora.java index 5d00fb86c..9a9666a48 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/world/population/items/flora/BlockFlora.java +++ b/common/implementation/src/main/java/com/dfsek/terra/world/population/items/flora/BlockFlora.java @@ -1,13 +1,12 @@ package com.dfsek.terra.world.population.items.flora; -import com.dfsek.terra.api.util.Range; -import com.dfsek.terra.api.vector.Location; -import com.dfsek.terra.vector.LocationImpl; import com.dfsek.terra.api.block.Block; import com.dfsek.terra.api.block.BlockData; import com.dfsek.terra.api.block.BlockFace; -import com.dfsek.terra.api.world.Chunk; import com.dfsek.terra.api.util.GlueList; +import com.dfsek.terra.api.util.Range; +import com.dfsek.terra.api.vector.Location; +import com.dfsek.terra.api.world.Chunk; import com.dfsek.terra.api.world.Flora; import java.util.List; diff --git a/common/implementation/src/main/java/com/dfsek/terra/world/population/items/flora/ConstantFlora.java b/common/implementation/src/main/java/com/dfsek/terra/world/population/items/flora/ConstantFlora.java index 1396c96fb..77fe90ead 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/world/population/items/flora/ConstantFlora.java +++ b/common/implementation/src/main/java/com/dfsek/terra/world/population/items/flora/ConstantFlora.java @@ -1,14 +1,13 @@ package com.dfsek.terra.world.population.items.flora; -import com.dfsek.terra.api.util.Range; -import com.dfsek.terra.api.vector.Location; -import com.dfsek.terra.vector.LocationImpl; import com.dfsek.terra.api.block.Block; import com.dfsek.terra.api.block.BlockData; import com.dfsek.terra.api.block.BlockFace; -import com.dfsek.terra.api.world.Chunk; import com.dfsek.terra.api.util.GlueList; +import com.dfsek.terra.api.util.Range; import com.dfsek.terra.api.util.collections.MaterialSet; +import com.dfsek.terra.api.vector.Location; +import com.dfsek.terra.api.world.Chunk; import com.dfsek.terra.api.world.Flora; import java.util.List; diff --git a/common/implementation/src/main/java/com/dfsek/terra/world/population/items/flora/FloraLayer.java b/common/implementation/src/main/java/com/dfsek/terra/world/population/items/flora/FloraLayer.java index d2e1be079..0c688a75d 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/world/population/items/flora/FloraLayer.java +++ b/common/implementation/src/main/java/com/dfsek/terra/world/population/items/flora/FloraLayer.java @@ -1,12 +1,10 @@ package com.dfsek.terra.world.population.items.flora; -import com.dfsek.terra.api.math.range.ConstantRange; import com.dfsek.terra.api.noise.NoiseSampler; import com.dfsek.terra.api.util.ProbabilityCollection; import com.dfsek.terra.api.util.Range; import com.dfsek.terra.api.vector.Vector2; import com.dfsek.terra.api.world.Chunk; -import com.dfsek.terra.api.util.collections.ProbabilityCollectionImpl; import com.dfsek.terra.api.world.Flora; import com.dfsek.terra.world.population.items.PlaceableLayer; diff --git a/common/implementation/src/main/java/com/dfsek/terra/world/population/items/flora/TerraFlora.java b/common/implementation/src/main/java/com/dfsek/terra/world/population/items/flora/TerraFlora.java index d17c2f7d4..35861257d 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/world/population/items/flora/TerraFlora.java +++ b/common/implementation/src/main/java/com/dfsek/terra/world/population/items/flora/TerraFlora.java @@ -1,19 +1,18 @@ package com.dfsek.terra.world.population.items.flora; import com.dfsek.terra.api.TerraPlugin; -import com.dfsek.terra.api.util.Range; -import com.dfsek.terra.api.vector.Location; -import com.dfsek.terra.vector.LocationImpl; import com.dfsek.terra.api.block.Block; import com.dfsek.terra.api.block.BlockData; import com.dfsek.terra.api.block.BlockFace; import com.dfsek.terra.api.block.data.Directional; import com.dfsek.terra.api.block.data.MultipleFacing; import com.dfsek.terra.api.block.data.Rotatable; -import com.dfsek.terra.api.world.Chunk; import com.dfsek.terra.api.util.FastRandom; import com.dfsek.terra.api.util.GlueList; +import com.dfsek.terra.api.util.Range; import com.dfsek.terra.api.util.collections.MaterialSet; +import com.dfsek.terra.api.vector.Location; +import com.dfsek.terra.api.world.Chunk; import com.dfsek.terra.api.world.Flora; import com.dfsek.terra.api.world.generator.Palette; import net.jafama.FastMath; diff --git a/common/implementation/src/main/java/com/dfsek/terra/world/population/items/ores/DeformedSphereOre.java b/common/implementation/src/main/java/com/dfsek/terra/world/population/items/ores/DeformedSphereOre.java index 2d98cb11f..08d6fb4f5 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/world/population/items/ores/DeformedSphereOre.java +++ b/common/implementation/src/main/java/com/dfsek/terra/world/population/items/ores/DeformedSphereOre.java @@ -1,15 +1,15 @@ package com.dfsek.terra.world.population.items.ores; import com.dfsek.terra.api.TerraPlugin; -import com.dfsek.terra.noise.samplers.noise.simplex.OpenSimplex2Sampler; -import com.dfsek.terra.api.util.Range; -import com.dfsek.terra.api.vector.Vector3; -import com.dfsek.terra.vector.Vector3Impl; import com.dfsek.terra.api.block.Block; import com.dfsek.terra.api.block.BlockData; import com.dfsek.terra.api.block.BlockType; -import com.dfsek.terra.api.world.Chunk; +import com.dfsek.terra.api.util.Range; import com.dfsek.terra.api.util.collections.MaterialSet; +import com.dfsek.terra.api.vector.Vector3; +import com.dfsek.terra.api.world.Chunk; +import com.dfsek.terra.noise.samplers.noise.simplex.OpenSimplex2Sampler; +import com.dfsek.terra.vector.Vector3Impl; import java.util.Map; import java.util.Random; diff --git a/common/implementation/src/main/java/com/dfsek/terra/world/population/items/ores/Ore.java b/common/implementation/src/main/java/com/dfsek/terra/world/population/items/ores/Ore.java index d62568c11..5c4e744e0 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/world/population/items/ores/Ore.java +++ b/common/implementation/src/main/java/com/dfsek/terra/world/population/items/ores/Ore.java @@ -1,11 +1,11 @@ package com.dfsek.terra.world.population.items.ores; import com.dfsek.terra.api.TerraPlugin; -import com.dfsek.terra.vector.Vector3Impl; import com.dfsek.terra.api.block.BlockData; import com.dfsek.terra.api.block.BlockType; -import com.dfsek.terra.api.world.Chunk; import com.dfsek.terra.api.util.collections.MaterialSet; +import com.dfsek.terra.api.world.Chunk; +import com.dfsek.terra.vector.Vector3Impl; import java.util.Map; import java.util.Random; diff --git a/common/implementation/src/main/java/com/dfsek/terra/world/population/items/ores/VanillaOre.java b/common/implementation/src/main/java/com/dfsek/terra/world/population/items/ores/VanillaOre.java index f0422b2f6..848e14d68 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/world/population/items/ores/VanillaOre.java +++ b/common/implementation/src/main/java/com/dfsek/terra/world/population/items/ores/VanillaOre.java @@ -1,13 +1,13 @@ package com.dfsek.terra.world.population.items.ores; import com.dfsek.terra.api.TerraPlugin; -import com.dfsek.terra.api.util.Range; -import com.dfsek.terra.vector.Vector3Impl; import com.dfsek.terra.api.block.Block; import com.dfsek.terra.api.block.BlockData; import com.dfsek.terra.api.block.BlockType; -import com.dfsek.terra.api.world.Chunk; +import com.dfsek.terra.api.util.Range; import com.dfsek.terra.api.util.collections.MaterialSet; +import com.dfsek.terra.api.world.Chunk; +import com.dfsek.terra.vector.Vector3Impl; import net.jafama.FastMath; import java.util.Map; diff --git a/common/implementation/src/main/java/com/dfsek/terra/world/population/items/tree/TerraTree.java b/common/implementation/src/main/java/com/dfsek/terra/world/population/items/tree/TerraTree.java index 5e0cf1904..f37b84283 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/world/population/items/tree/TerraTree.java +++ b/common/implementation/src/main/java/com/dfsek/terra/world/population/items/tree/TerraTree.java @@ -1,13 +1,11 @@ package com.dfsek.terra.world.population.items.tree; import com.dfsek.terra.api.structure.Structure; -import com.dfsek.terra.api.util.ProbabilityCollection; -import com.dfsek.terra.api.vector.Location; -import com.dfsek.terra.vector.LocationImpl; -import com.dfsek.terra.api.world.Tree; import com.dfsek.terra.api.structure.rotation.Rotation; +import com.dfsek.terra.api.util.ProbabilityCollection; import com.dfsek.terra.api.util.collections.MaterialSet; -import com.dfsek.terra.api.util.collections.ProbabilityCollectionImpl; +import com.dfsek.terra.api.vector.Location; +import com.dfsek.terra.api.world.Tree; import java.util.Random; diff --git a/common/implementation/src/main/java/com/dfsek/terra/world/population/items/tree/TreeLayer.java b/common/implementation/src/main/java/com/dfsek/terra/world/population/items/tree/TreeLayer.java index 546a169b2..017bd0782 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/world/population/items/tree/TreeLayer.java +++ b/common/implementation/src/main/java/com/dfsek/terra/world/population/items/tree/TreeLayer.java @@ -1,16 +1,14 @@ package com.dfsek.terra.world.population.items.tree; -import com.dfsek.terra.api.math.range.ConstantRange; +import com.dfsek.terra.api.block.Block; +import com.dfsek.terra.api.block.BlockFace; import com.dfsek.terra.api.noise.NoiseSampler; +import com.dfsek.terra.api.util.PopulationUtil; import com.dfsek.terra.api.util.ProbabilityCollection; import com.dfsek.terra.api.util.Range; import com.dfsek.terra.api.vector.Vector2; -import com.dfsek.terra.api.block.Block; -import com.dfsek.terra.api.block.BlockFace; import com.dfsek.terra.api.world.Chunk; import com.dfsek.terra.api.world.Tree; -import com.dfsek.terra.api.util.collections.ProbabilityCollectionImpl; -import com.dfsek.terra.api.util.PopulationUtil; import com.dfsek.terra.world.population.items.PlaceableLayer; public class TreeLayer extends PlaceableLayer { diff --git a/common/implementation/src/main/resources/lang/cs_cz.yml b/common/implementation/src/main/resources/lang/cs_cz.yml index c01c6fcf9..b1f3b4965 100644 --- a/common/implementation/src/main/resources/lang/cs_cz.yml +++ b/common/implementation/src/main/resources/lang/cs_cz.yml @@ -112,7 +112,7 @@ warning: error: severe-config: "Vážná konfigurační chyba zabránila Terra ze správné generace terénu na koordinátech: %1$s, %2$s. Prosíme zkontrolujte konfiguraci pro chyby. Jakékoli konfigurační chyby jsou vypsány výše." debug: - data-save : "Uložena populační data." + data-save: "Uložena populační data." use-paper: - "Vypadá to, že používáte Spigot/CraftBukkit." - "Ačkoli Terra &ofunguje&r na Spigot, některé funkce budou ztraceny. (Terra je netestována na CraftBukkit; žádná podpora nebude dána pro CraftBukkit)." diff --git a/common/implementation/src/main/resources/lang/en_us.yml b/common/implementation/src/main/resources/lang/en_us.yml index cde2101d9..a70a11490 100644 --- a/common/implementation/src/main/resources/lang/en_us.yml +++ b/common/implementation/src/main/resources/lang/en_us.yml @@ -112,7 +112,7 @@ warning: error: severe-config: "A severe configuration error has prevented Terra from properly generating terrain at coordinates: %1$s, %2$s. Please check your configuration for errors. Any config errors will have been reported above." debug: - data-save : "Saved population data." + data-save: "Saved population data." use-paper: - "You appear to be using Spigot/CraftBukkit." - "While Terra &odoes&r work on Spigot, some functionality will be lost. (Terra is untested on CraftBukkit; no support will be given for CraftBukkit)." diff --git a/common/implementation/src/test/java/profiler/ProfilerTest.java b/common/implementation/src/test/java/profiler/ProfilerTest.java index e8853a1e8..e5969efc3 100644 --- a/common/implementation/src/test/java/profiler/ProfilerTest.java +++ b/common/implementation/src/test/java/profiler/ProfilerTest.java @@ -5,6 +5,7 @@ import com.dfsek.terra.profiler.ProfilerImpl; public class ProfilerTest { private static final Profiler PROFILER = new ProfilerImpl(); + //@Test public static void main(String... a) throws InterruptedException { //PROFILER.start(); diff --git a/platforms/bukkit/build.gradle.kts b/platforms/bukkit/build.gradle.kts index dfd5f4f79..cda955ddc 100644 --- a/platforms/bukkit/build.gradle.kts +++ b/platforms/bukkit/build.gradle.kts @@ -4,7 +4,6 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar import java.net.URL import java.nio.channels.Channels import java.nio.file.Files -import java.nio.file.Paths import java.nio.file.StandardCopyOption plugins { @@ -55,7 +54,7 @@ fun downloadPaperclip(url: String, dir: String) { fun copyTerra(dir: String) { file("$testDir/$dir").walk().forEach { - if(it.name.startsWith("Terra-") && it.name.endsWith(".jar")) it.delete() // Delete old Terra jar(s) + if (it.name.startsWith("Terra-") && it.name.endsWith(".jar")) it.delete() // Delete old Terra jar(s) } copy { from("$buildDir/libs/Terra-bukkit-$version-shaded.jar") @@ -87,11 +86,11 @@ fun installServer(dir: String) { } fun deleteFolder(folder: File) { - if(folder.exists()) folder.deleteRecursively() + if (folder.exists()) folder.deleteRecursively() } fun deleteFile(file: File) { - if(file.exists()) file.delete() + if (file.exists()) file.delete() } tasks.create("cleanWorlds") { 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 b7794d762..33666247f 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,8 +1,7 @@ package com.dfsek.terra.bukkit; -import com.dfsek.terra.api.vector.Vector3; -import com.dfsek.terra.vector.LocationImpl; import com.dfsek.terra.api.entity.Entity; +import com.dfsek.terra.api.vector.Vector3; import com.dfsek.terra.api.world.World; import com.dfsek.terra.bukkit.world.BukkitAdapter; import org.bukkit.Location; 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 b3de143e3..b4c5458f1 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,8 +1,7 @@ package com.dfsek.terra.bukkit; -import com.dfsek.terra.api.vector.Vector3; -import com.dfsek.terra.vector.LocationImpl; import com.dfsek.terra.api.entity.Player; +import com.dfsek.terra.api.vector.Vector3; import com.dfsek.terra.api.world.World; import com.dfsek.terra.bukkit.world.BukkitAdapter; import com.dfsek.terra.vector.Vector3Impl; 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 249855287..d42b6af6f 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 @@ -1,11 +1,13 @@ package com.dfsek.terra.bukkit; import com.dfsek.tectonic.loading.TypeRegistry; +import com.dfsek.terra.api.Logger; import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.addon.TerraAddon; import com.dfsek.terra.api.addon.annotations.Addon; import com.dfsek.terra.api.addon.annotations.Author; import com.dfsek.terra.api.addon.annotations.Version; +import com.dfsek.terra.api.block.BlockData; import com.dfsek.terra.api.command.CommandManager; import com.dfsek.terra.api.command.TerraCommandManager; import com.dfsek.terra.api.command.exception.MalformedCommandException; @@ -13,18 +15,17 @@ import com.dfsek.terra.api.config.ConfigPack; import com.dfsek.terra.api.config.PluginConfig; import com.dfsek.terra.api.event.EventManager; import com.dfsek.terra.api.event.EventManagerImpl; -import com.dfsek.terra.api.block.BlockData; import com.dfsek.terra.api.handle.ItemHandle; import com.dfsek.terra.api.handle.WorldHandle; import com.dfsek.terra.api.lang.Language; -import com.dfsek.terra.api.registry.Registry; -import com.dfsek.terra.api.world.TerraWorld; -import com.dfsek.terra.api.world.biome.Biome; -import com.dfsek.terra.api.world.World; +import com.dfsek.terra.api.profiler.Profiler; import com.dfsek.terra.api.registry.CheckedRegistry; +import com.dfsek.terra.api.registry.Registry; import com.dfsek.terra.api.util.logging.DebugLogger; import com.dfsek.terra.api.util.logging.JavaLogger; -import com.dfsek.terra.api.Logger; +import com.dfsek.terra.api.world.TerraWorld; +import com.dfsek.terra.api.world.World; +import com.dfsek.terra.api.world.biome.Biome; import com.dfsek.terra.api.world.generator.TerraChunkGenerator; import com.dfsek.terra.bukkit.command.BukkitCommandAdapter; import com.dfsek.terra.bukkit.command.FixChunkCommand; @@ -43,7 +44,6 @@ import com.dfsek.terra.commands.CommandUtil; import com.dfsek.terra.config.GenericLoaders; import com.dfsek.terra.config.PluginConfigImpl; import com.dfsek.terra.config.lang.LangUtil; -import com.dfsek.terra.api.profiler.Profiler; import com.dfsek.terra.profiler.ProfilerImpl; import com.dfsek.terra.registry.CheckedRegistryImpl; import com.dfsek.terra.registry.LockedRegistryImpl; @@ -100,7 +100,6 @@ public class TerraBukkitPlugin extends JavaPlugin implements TerraPlugin { private final LockedRegistryImpl addonLockedRegistry = new LockedRegistryImpl<>(addonRegistry); - public boolean reload() { config.load(this); LangUtil.load(config.getLanguage(), this); // Load language. diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/handles/BukkitWorldHandle.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/handles/BukkitWorldHandle.java index 5407f5773..c8451d0c6 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/handles/BukkitWorldHandle.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/handles/BukkitWorldHandle.java @@ -1,12 +1,11 @@ package com.dfsek.terra.bukkit.handles; -import com.dfsek.terra.api.vector.Location; -import com.dfsek.terra.vector.LocationImpl; import com.dfsek.terra.api.block.BlockData; import com.dfsek.terra.api.entity.EntityType; import com.dfsek.terra.api.entity.Player; import com.dfsek.terra.api.handle.WorldHandle; import com.dfsek.terra.api.util.generic.pair.Pair; +import com.dfsek.terra.api.vector.Location; import com.dfsek.terra.bukkit.structure.WorldEditUtil; import com.dfsek.terra.bukkit.world.BukkitAdapter; import com.dfsek.terra.bukkit.world.block.data.BukkitBlockData; diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/CommonListener.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/CommonListener.java index b4af701da..e7b174d04 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/CommonListener.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/CommonListener.java @@ -2,15 +2,14 @@ package com.dfsek.terra.bukkit.listeners; import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.config.WorldConfig; -import com.dfsek.terra.vector.LocationImpl; -import com.dfsek.terra.api.world.TerraWorld; -import com.dfsek.terra.api.world.Tree; -import com.dfsek.terra.api.world.World; import com.dfsek.terra.api.transform.MapTransform; import com.dfsek.terra.api.transform.TransformerImpl; import com.dfsek.terra.api.util.FastRandom; +import com.dfsek.terra.api.world.TerraWorld; +import com.dfsek.terra.api.world.Tree; +import com.dfsek.terra.api.world.World; import com.dfsek.terra.bukkit.world.BukkitAdapter; -import com.dfsek.terra.config.pack.WorldConfigImpl; +import com.dfsek.terra.vector.LocationImpl; import org.bukkit.Material; import org.bukkit.TreeType; import org.bukkit.block.Block; @@ -55,6 +54,7 @@ public class CommonListener implements Listener { block.setType(Material.AIR); Tree tree = c.getRegistry(Tree.class).get(TREE_TYPE_STRING_TRANSFORMER.translate(e.getSpecies())); org.bukkit.Location location = e.getLocation(); - if(!tree.plant(new LocationImpl(bukkit, location.getX(), location.getY(), location.getZ()), new FastRandom())) block.setBlockData(data); + if(!tree.plant(new LocationImpl(bukkit, location.getX(), location.getY(), location.getZ()), new FastRandom())) + block.setBlockData(data); } } diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/TerraListener.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/TerraListener.java index 20aae02f0..b50547658 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/TerraListener.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/TerraListener.java @@ -5,10 +5,10 @@ import com.dfsek.terra.api.event.EventListener; import com.dfsek.terra.api.event.annotations.Global; import com.dfsek.terra.api.event.annotations.Priority; import com.dfsek.terra.api.event.events.config.ConfigPackPreLoadEvent; +import com.dfsek.terra.api.registry.DuplicateEntryException; import com.dfsek.terra.api.world.Tree; import com.dfsek.terra.bukkit.world.BukkitAdapter; import com.dfsek.terra.bukkit.world.BukkitTree; -import com.dfsek.terra.api.registry.DuplicateEntryException; import org.bukkit.TreeType; public class TerraListener implements EventListener { diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/population/PopulationManager.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/population/PopulationManager.java index 4e8036cea..2a0a9c926 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/population/PopulationManager.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/population/PopulationManager.java @@ -1,14 +1,14 @@ package com.dfsek.terra.bukkit.population; import com.dfsek.terra.api.TerraPlugin; +import com.dfsek.terra.api.profiler.ProfileFrame; +import com.dfsek.terra.api.util.FastRandom; import com.dfsek.terra.api.world.Chunk; import com.dfsek.terra.api.world.World; -import com.dfsek.terra.api.util.FastRandom; import com.dfsek.terra.api.world.generator.Chunkified; import com.dfsek.terra.api.world.generator.TerraChunkGenerator; import com.dfsek.terra.bukkit.TerraBukkitPlugin; import com.dfsek.terra.bukkit.world.BukkitAdapter; -import com.dfsek.terra.api.profiler.ProfileFrame; import com.dfsek.terra.bukkit.world.BukkitWorld; import org.bukkit.generator.BlockPopulator; import org.jetbrains.annotations.NotNull; diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitAdapter.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitAdapter.java index 4fd76683e..fca571179 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitAdapter.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitAdapter.java @@ -1,10 +1,6 @@ package com.dfsek.terra.bukkit.world; -import com.dfsek.terra.vector.LocationImpl; -import com.dfsek.terra.api.vector.Vector3; -import com.dfsek.terra.vector.Vector3Impl; -import com.dfsek.terra.api.entity.CommandSender; import com.dfsek.terra.api.block.Axis; import com.dfsek.terra.api.block.BlockData; import com.dfsek.terra.api.block.BlockFace; @@ -14,12 +10,14 @@ import com.dfsek.terra.api.block.data.Rail; import com.dfsek.terra.api.block.data.RedstoneWire; import com.dfsek.terra.api.block.data.Slab; import com.dfsek.terra.api.block.data.Stairs; +import com.dfsek.terra.api.entity.CommandSender; import com.dfsek.terra.api.inventory.ItemStack; import com.dfsek.terra.api.inventory.item.Enchantment; -import com.dfsek.terra.api.world.Chunk; -import com.dfsek.terra.api.world.World; import com.dfsek.terra.api.transform.MapTransform; import com.dfsek.terra.api.transform.TransformerImpl; +import com.dfsek.terra.api.vector.Vector3; +import com.dfsek.terra.api.world.Chunk; +import com.dfsek.terra.api.world.World; import com.dfsek.terra.bukkit.BukkitCommandSender; import com.dfsek.terra.bukkit.BukkitEntity; import com.dfsek.terra.bukkit.BukkitPlayer; @@ -27,6 +25,8 @@ import com.dfsek.terra.bukkit.world.block.BukkitBlockTypeAndItem; import com.dfsek.terra.bukkit.world.block.data.BukkitBlockData; import com.dfsek.terra.bukkit.world.inventory.BukkitItemStack; import com.dfsek.terra.bukkit.world.inventory.meta.BukkitEnchantment; +import com.dfsek.terra.vector.LocationImpl; +import com.dfsek.terra.vector.Vector3Impl; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.TreeType; diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitBiomeGrid.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitBiomeGrid.java index 308e6a03d..3eb629522 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitBiomeGrid.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitBiomeGrid.java @@ -1,7 +1,7 @@ package com.dfsek.terra.bukkit.world; -import com.dfsek.terra.api.world.biome.Biome; import com.dfsek.terra.api.world.BiomeGrid; +import com.dfsek.terra.api.world.biome.Biome; import org.bukkit.generator.ChunkGenerator; import org.jetbrains.annotations.NotNull; diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitTree.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitTree.java index c1653633b..25651dccb 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitTree.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitTree.java @@ -1,12 +1,11 @@ package com.dfsek.terra.bukkit.world; import com.dfsek.terra.api.TerraPlugin; -import com.dfsek.terra.api.vector.Location; -import com.dfsek.terra.vector.LocationImpl; import com.dfsek.terra.api.handle.WorldHandle; -import com.dfsek.terra.api.world.Tree; -import com.dfsek.terra.api.util.collections.MaterialSet; import com.dfsek.terra.api.profiler.ProfileFrame; +import com.dfsek.terra.api.util.collections.MaterialSet; +import com.dfsek.terra.api.vector.Location; +import com.dfsek.terra.api.world.Tree; import org.bukkit.TreeType; import java.util.Locale; diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitWorld.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitWorld.java index 2b4bbaad7..f3c4746eb 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitWorld.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitWorld.java @@ -1,10 +1,9 @@ package com.dfsek.terra.bukkit.world; -import com.dfsek.terra.api.vector.Location; -import com.dfsek.terra.vector.LocationImpl; import com.dfsek.terra.api.block.Block; import com.dfsek.terra.api.entity.Entity; import com.dfsek.terra.api.entity.EntityType; +import com.dfsek.terra.api.vector.Location; import com.dfsek.terra.api.world.Chunk; import com.dfsek.terra.api.world.World; import com.dfsek.terra.api.world.generator.ChunkGenerator; 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 8af761a0e..2d9c29b41 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,6 +1,5 @@ package com.dfsek.terra.bukkit.world.block; -import com.dfsek.terra.vector.LocationImpl; import com.dfsek.terra.api.block.Block; import com.dfsek.terra.api.block.BlockData; import com.dfsek.terra.api.block.BlockFace; @@ -9,6 +8,7 @@ import com.dfsek.terra.api.block.state.BlockState; import com.dfsek.terra.bukkit.world.BukkitAdapter; import com.dfsek.terra.bukkit.world.block.data.BukkitBlockData; import com.dfsek.terra.bukkit.world.block.state.BukkitBlockState; +import com.dfsek.terra.vector.LocationImpl; public class BukkitBlock implements Block { private final org.bukkit.block.Block delegate; 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 205e20900..8184ebcfc 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 @@ -3,11 +3,13 @@ package com.dfsek.terra.fabric; import com.dfsek.tectonic.exception.ConfigException; import com.dfsek.tectonic.exception.LoadException; import com.dfsek.tectonic.loading.TypeRegistry; +import com.dfsek.terra.api.Logger; import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.addon.TerraAddon; import com.dfsek.terra.api.addon.annotations.Addon; import com.dfsek.terra.api.addon.annotations.Author; import com.dfsek.terra.api.addon.annotations.Version; +import com.dfsek.terra.api.block.BlockData; import com.dfsek.terra.api.command.CommandManager; import com.dfsek.terra.api.command.TerraCommandManager; import com.dfsek.terra.api.command.exception.MalformedCommandException; @@ -20,38 +22,36 @@ import com.dfsek.terra.api.event.annotations.Global; import com.dfsek.terra.api.event.annotations.Priority; import com.dfsek.terra.api.event.events.config.ConfigPackPostLoadEvent; import com.dfsek.terra.api.event.events.config.ConfigPackPreLoadEvent; -import com.dfsek.terra.api.block.BlockData; import com.dfsek.terra.api.handle.ItemHandle; import com.dfsek.terra.api.handle.WorldHandle; import com.dfsek.terra.api.lang.Language; -import com.dfsek.terra.api.world.TerraWorld; -import com.dfsek.terra.api.world.Tree; -import com.dfsek.terra.api.world.World; +import com.dfsek.terra.api.profiler.Profiler; import com.dfsek.terra.api.registry.CheckedRegistry; +import com.dfsek.terra.api.registry.DuplicateEntryException; import com.dfsek.terra.api.transform.TransformerImpl; import com.dfsek.terra.api.transform.Validator; import com.dfsek.terra.api.util.generic.pair.Pair; import com.dfsek.terra.api.util.logging.DebugLogger; -import com.dfsek.terra.api.Logger; +import com.dfsek.terra.api.world.TerraWorld; +import com.dfsek.terra.api.world.Tree; +import com.dfsek.terra.api.world.World; import com.dfsek.terra.commands.CommandUtil; import com.dfsek.terra.config.GenericLoaders; import com.dfsek.terra.config.PluginConfigImpl; import com.dfsek.terra.config.builder.BiomeBuilder; import com.dfsek.terra.config.lang.LangUtil; -import com.dfsek.terra.fabric.generation.FabricChunkGeneratorWrapper; -import com.dfsek.terra.fabric.generation.PopulatorFeature; -import com.dfsek.terra.fabric.generation.TerraBiomeSource; import com.dfsek.terra.fabric.config.PostLoadCompatibilityOptions; import com.dfsek.terra.fabric.config.PreLoadCompatibilityOptions; import com.dfsek.terra.fabric.event.BiomeRegistrationEvent; import com.dfsek.terra.fabric.event.GameInitializationEvent; +import com.dfsek.terra.fabric.generation.FabricChunkGeneratorWrapper; +import com.dfsek.terra.fabric.generation.PopulatorFeature; +import com.dfsek.terra.fabric.generation.TerraBiomeSource; import com.dfsek.terra.fabric.handle.FabricItemHandle; import com.dfsek.terra.fabric.handle.FabricWorldHandle; import com.dfsek.terra.fabric.util.FabricUtil; import com.dfsek.terra.fabric.util.ProtoBiome; -import com.dfsek.terra.api.profiler.Profiler; import com.dfsek.terra.profiler.ProfilerImpl; -import com.dfsek.terra.api.registry.DuplicateEntryException; import com.dfsek.terra.registry.CheckedRegistryImpl; import com.dfsek.terra.registry.LockedRegistryImpl; import com.dfsek.terra.registry.master.AddonRegistry; diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/block/FabricBlock.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/block/FabricBlock.java index 38d6c7680..bab4a3db1 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/block/FabricBlock.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/block/FabricBlock.java @@ -1,12 +1,11 @@ package com.dfsek.terra.fabric.block; -import com.dfsek.terra.api.vector.Location; -import com.dfsek.terra.vector.LocationImpl; import com.dfsek.terra.api.block.Block; import com.dfsek.terra.api.block.BlockData; import com.dfsek.terra.api.block.BlockFace; import com.dfsek.terra.api.block.BlockType; import com.dfsek.terra.api.block.state.BlockState; +import com.dfsek.terra.api.vector.Location; import com.dfsek.terra.api.world.World; import com.dfsek.terra.fabric.util.FabricAdapter; import net.minecraft.block.FluidBlock; diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/FabricChunkGeneratorWrapper.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/FabricChunkGeneratorWrapper.java index b59c3b5e8..00a3c0990 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/FabricChunkGeneratorWrapper.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/FabricChunkGeneratorWrapper.java @@ -1,15 +1,14 @@ package com.dfsek.terra.fabric.generation; import com.dfsek.terra.api.config.ConfigPack; +import com.dfsek.terra.api.util.FastRandom; import com.dfsek.terra.api.world.TerraWorld; import com.dfsek.terra.api.world.World; import com.dfsek.terra.api.world.generator.ChunkData; -import com.dfsek.terra.api.world.generator.GeneratorWrapper; -import com.dfsek.terra.api.util.FastRandom; import com.dfsek.terra.api.world.generator.Chunkified; +import com.dfsek.terra.api.world.generator.GeneratorWrapper; import com.dfsek.terra.api.world.generator.TerraChunkGenerator; import com.dfsek.terra.api.world.locate.AsyncStructureFinder; -import com.dfsek.terra.config.pack.ConfigPackImpl; import com.dfsek.terra.fabric.TerraFabricPlugin; import com.dfsek.terra.fabric.block.FabricBlockData; import com.dfsek.terra.fabric.mixin.StructureAccessorAccessor; diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/TerraBiomeSource.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/TerraBiomeSource.java index ba24dc759..7f38e22e6 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/TerraBiomeSource.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/TerraBiomeSource.java @@ -3,7 +3,6 @@ package com.dfsek.terra.fabric.generation; import com.dfsek.terra.api.config.ConfigPack; import com.dfsek.terra.api.world.biome.UserDefinedBiome; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; -import com.dfsek.terra.config.pack.ConfigPackImpl; import com.dfsek.terra.fabric.TerraFabricPlugin; import com.dfsek.terra.fabric.util.FabricUtil; import com.mojang.serialization.Codec; diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/TerraGeneratorType.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/TerraGeneratorType.java index 6d646fbe1..6c845c089 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/TerraGeneratorType.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/TerraGeneratorType.java @@ -1,7 +1,6 @@ package com.dfsek.terra.fabric.generation; import com.dfsek.terra.api.config.ConfigPack; -import com.dfsek.terra.config.pack.ConfigPackImpl; import com.dfsek.terra.fabric.TerraFabricPlugin; import com.dfsek.terra.fabric.event.BiomeRegistrationEvent; import net.fabricmc.api.EnvType; diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/handle/FabricWorldHandle.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/handle/FabricWorldHandle.java index 95680239c..09223ecf7 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/handle/FabricWorldHandle.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/handle/FabricWorldHandle.java @@ -1,11 +1,10 @@ package com.dfsek.terra.fabric.handle; -import com.dfsek.terra.api.vector.Location; -import com.dfsek.terra.vector.LocationImpl; import com.dfsek.terra.api.entity.EntityType; import com.dfsek.terra.api.entity.Player; import com.dfsek.terra.api.handle.WorldHandle; import com.dfsek.terra.api.util.generic.pair.Pair; +import com.dfsek.terra.api.vector.Location; import com.dfsek.terra.fabric.block.FabricBlockData; import com.dfsek.terra.fabric.util.FabricAdapter; import com.dfsek.terra.fabric.util.WorldEditUtil; diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/entity/EntityMixin.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/entity/EntityMixin.java index dd652a0ef..5c0ea6165 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/entity/EntityMixin.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/entity/EntityMixin.java @@ -1,11 +1,8 @@ package com.dfsek.terra.fabric.mixin.implementations.entity; -import com.dfsek.terra.api.vector.Location; import com.dfsek.terra.api.vector.Vector3; -import com.dfsek.terra.vector.LocationImpl; import com.dfsek.terra.api.world.World; import com.dfsek.terra.fabric.util.FabricAdapter; -import com.dfsek.terra.vector.Vector3Impl; import net.minecraft.entity.Entity; import net.minecraft.text.LiteralText; import net.minecraft.text.Text; diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/world/ChunkRegionMixin.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/world/ChunkRegionMixin.java index e7d8987e7..4e9e68375 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/world/ChunkRegionMixin.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/world/ChunkRegionMixin.java @@ -1,10 +1,9 @@ package com.dfsek.terra.fabric.mixin.implementations.world; -import com.dfsek.terra.api.vector.Location; -import com.dfsek.terra.vector.LocationImpl; import com.dfsek.terra.api.block.Block; import com.dfsek.terra.api.entity.Entity; import com.dfsek.terra.api.entity.EntityType; +import com.dfsek.terra.api.vector.Location; import com.dfsek.terra.api.world.Chunk; import com.dfsek.terra.api.world.World; import com.dfsek.terra.api.world.generator.ChunkGenerator; diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/world/ServerWorldMixin.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/world/ServerWorldMixin.java index fd32600ca..3eb4e00b2 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/world/ServerWorldMixin.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/world/ServerWorldMixin.java @@ -1,10 +1,9 @@ package com.dfsek.terra.fabric.mixin.implementations.world; -import com.dfsek.terra.api.vector.Location; -import com.dfsek.terra.vector.LocationImpl; import com.dfsek.terra.api.block.Block; import com.dfsek.terra.api.entity.Entity; import com.dfsek.terra.api.entity.EntityType; +import com.dfsek.terra.api.vector.Location; import com.dfsek.terra.api.world.Chunk; import com.dfsek.terra.api.world.World; import com.dfsek.terra.api.world.generator.ChunkGenerator; diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/lifecycle/server/GeneratorOptionsMixin.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/lifecycle/server/GeneratorOptionsMixin.java index 93e6f706e..05c9a3d06 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/lifecycle/server/GeneratorOptionsMixin.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/lifecycle/server/GeneratorOptionsMixin.java @@ -1,11 +1,10 @@ package com.dfsek.terra.fabric.mixin.lifecycle.server; import com.dfsek.terra.api.config.ConfigPack; -import com.dfsek.terra.config.pack.ConfigPackImpl; import com.dfsek.terra.fabric.TerraFabricPlugin; import com.dfsek.terra.fabric.event.BiomeRegistrationEvent; -import com.dfsek.terra.fabric.generation.TerraBiomeSource; import com.dfsek.terra.fabric.generation.FabricChunkGeneratorWrapper; +import com.dfsek.terra.fabric.generation.TerraBiomeSource; import com.google.common.base.MoreObjects; import net.minecraft.util.registry.DynamicRegistryManager; import net.minecraft.util.registry.Registry; diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/util/FabricAdapter.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/util/FabricAdapter.java index e94b779ed..408a7ff56 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/util/FabricAdapter.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/util/FabricAdapter.java @@ -1,7 +1,5 @@ package com.dfsek.terra.fabric.util; -import com.dfsek.terra.api.vector.Vector3; -import com.dfsek.terra.vector.Vector3Impl; import com.dfsek.terra.api.block.Axis; import com.dfsek.terra.api.block.BlockFace; import com.dfsek.terra.api.block.data.Bisected; @@ -10,6 +8,7 @@ import com.dfsek.terra.api.block.data.Stairs; import com.dfsek.terra.api.block.state.Container; import com.dfsek.terra.api.block.state.MobSpawner; import com.dfsek.terra.api.block.state.Sign; +import com.dfsek.terra.api.vector.Vector3; import com.dfsek.terra.fabric.block.FabricBlockData; import com.dfsek.terra.fabric.block.data.FabricDirectional; import com.dfsek.terra.fabric.block.data.FabricMultipleFacing; @@ -18,6 +17,7 @@ import com.dfsek.terra.fabric.block.data.FabricRotatable; import com.dfsek.terra.fabric.block.data.FabricSlab; import com.dfsek.terra.fabric.block.data.FabricStairs; import com.dfsek.terra.fabric.block.data.FabricWaterlogged; +import com.dfsek.terra.vector.Vector3Impl; import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntity; import net.minecraft.block.entity.LootableContainerBlockEntity; diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/util/FabricUtil.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/util/FabricUtil.java index 024dd8265..185ec0bd9 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/util/FabricUtil.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/util/FabricUtil.java @@ -3,7 +3,6 @@ package com.dfsek.terra.fabric.util; import com.dfsek.terra.api.config.ConfigPack; import com.dfsek.terra.api.util.generic.pair.Pair; import com.dfsek.terra.config.builder.BiomeBuilder; -import com.dfsek.terra.config.pack.ConfigPackImpl; import com.dfsek.terra.config.templates.BiomeTemplate; import com.dfsek.terra.fabric.TerraFabricPlugin; import com.dfsek.terra.fabric.config.PostLoadCompatibilityOptions; @@ -37,8 +36,8 @@ public final class FabricUtil { /** * Clones a Vanilla biome and injects Terra data to create a Terra-vanilla biome delegate. * - * @param biome The Terra BiomeBuilder. - * @param pack The ConfigPack this biome belongs to. + * @param biome The Terra BiomeBuilder. + * @param pack The ConfigPack this biome belongs to. * @return The Minecraft delegate biome. */ public static Biome createBiome(BiomeBuilder biome, ConfigPack pack, DynamicRegistryManager registryManager) { diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/util/WorldEditUtil.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/util/WorldEditUtil.java index 679316313..0169dbd8b 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/util/WorldEditUtil.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/util/WorldEditUtil.java @@ -1,9 +1,9 @@ package com.dfsek.terra.fabric.util; -import com.dfsek.terra.api.vector.Location; -import com.dfsek.terra.vector.LocationImpl; import com.dfsek.terra.api.entity.Player; import com.dfsek.terra.api.util.generic.pair.Pair; +import com.dfsek.terra.api.vector.Location; +import com.dfsek.terra.vector.LocationImpl; import com.sk89q.worldedit.IncompleteRegionException; import com.sk89q.worldedit.WorldEdit; import com.sk89q.worldedit.math.BlockVector3; diff --git a/platforms/fabric/src/main/resources/terra.mixins.json b/platforms/fabric/src/main/resources/terra.mixins.json index f2f42900c..a6371aee8 100644 --- a/platforms/fabric/src/main/resources/terra.mixins.json +++ b/platforms/fabric/src/main/resources/terra.mixins.json @@ -4,9 +4,9 @@ "package": "com.dfsek.terra.fabric.mixin", "compatibilityLevel": "JAVA_16", "mixins": [ - "StructureAccessorAccessor", "CommandManagerMixin", "ServerWorldMixin", + "StructureAccessorAccessor", "access.BiomeEffectsAccessor", "access.MobSpawnerLogicAccessor", "access.StateAccessor", diff --git a/platforms/forge/src/main/java/com/dfsek/terra/forge/block/ForgeBlockData.java b/platforms/forge/src/main/java/com/dfsek/terra/forge/block/ForgeBlockData.java index 00a09f0e2..91c88275d 100644 --- a/platforms/forge/src/main/java/com/dfsek/terra/forge/block/ForgeBlockData.java +++ b/platforms/forge/src/main/java/com/dfsek/terra/forge/block/ForgeBlockData.java @@ -16,7 +16,7 @@ import java.util.stream.Collectors; public class ForgeBlockData implements BlockData { private static final Function, Comparable>, String> PROPERTY_MAPPER = new Function, Comparable>, String>() { public String apply(@Nullable Map.Entry, Comparable> entry) { - if (entry == null) { + if(entry == null) { return ""; } else { Property property = entry.getKey(); @@ -26,7 +26,7 @@ public class ForgeBlockData implements BlockData { @SuppressWarnings("unchecked") private > String getName(Property property, Comparable comparable) { - return property.getName((T)comparable); + return property.getName((T) comparable); } }; diff --git a/platforms/forge/src/main/java/com/dfsek/terra/forge/generation/ForgeChunkGeneratorWrapper.java b/platforms/forge/src/main/java/com/dfsek/terra/forge/generation/ForgeChunkGeneratorWrapper.java index cfcc25216..f00e19a6d 100644 --- a/platforms/forge/src/main/java/com/dfsek/terra/forge/generation/ForgeChunkGeneratorWrapper.java +++ b/platforms/forge/src/main/java/com/dfsek/terra/forge/generation/ForgeChunkGeneratorWrapper.java @@ -80,12 +80,14 @@ public class ForgeChunkGeneratorWrapper extends ChunkGenerator implements Genera } @Override - protected @NotNull Codec codec() { + protected @NotNull + Codec codec() { return CODEC; } @Override - public @NotNull ChunkGenerator withSeed(long seed) { + public @NotNull + ChunkGenerator withSeed(long seed) { return new ForgeChunkGeneratorWrapper((TerraBiomeSource) this.biomeSource.withSeed(seed), seed, pack); } @@ -153,7 +155,8 @@ public class ForgeChunkGeneratorWrapper extends ChunkGenerator implements Genera } @Override - public @NotNull IBlockReader getBaseColumn(int x, int z) { + public @NotNull + IBlockReader getBaseColumn(int x, int z) { TerraWorld world = TerraForgePlugin.getInstance().getWorld(dimensionType); int height = getBaseHeight(x, z, Heightmap.Type.WORLD_SURFACE); BlockState[] array = new BlockState[256]; diff --git a/platforms/forge/src/main/java/com/dfsek/terra/forge/generation/TerraBiomeSource.java b/platforms/forge/src/main/java/com/dfsek/terra/forge/generation/TerraBiomeSource.java index 3220cfd58..b057272f5 100644 --- a/platforms/forge/src/main/java/com/dfsek/terra/forge/generation/TerraBiomeSource.java +++ b/platforms/forge/src/main/java/com/dfsek/terra/forge/generation/TerraBiomeSource.java @@ -40,7 +40,8 @@ public class TerraBiomeSource extends net.minecraft.world.biome.provider.BiomePr } @Override - protected @NotNull Codec codec() { + protected @NotNull + Codec codec() { return CODEC; } @@ -50,7 +51,8 @@ public class TerraBiomeSource extends net.minecraft.world.biome.provider.BiomePr } @Override - public @NotNull Biome getNoiseBiome(int biomeX, int biomeY, int biomeZ) { + public @NotNull + Biome getNoiseBiome(int biomeX, int biomeY, int biomeZ) { UserDefinedBiome biome = (UserDefinedBiome) grid.getBiome(biomeX << 2, biomeZ << 2); return Objects.requireNonNull(biomeRegistry.get(new ResourceLocation("terra", ForgeUtil.createBiomeID(pack, biome.getID())))); } diff --git a/platforms/forge/src/main/java/com/dfsek/terra/forge/generation/TerraGeneratorType.java b/platforms/forge/src/main/java/com/dfsek/terra/forge/generation/TerraGeneratorType.java index 91b8fc852..a86175e53 100644 --- a/platforms/forge/src/main/java/com/dfsek/terra/forge/generation/TerraGeneratorType.java +++ b/platforms/forge/src/main/java/com/dfsek/terra/forge/generation/TerraGeneratorType.java @@ -18,7 +18,8 @@ public class TerraGeneratorType extends BiomeGeneratorTypeScreens { } @Override - protected @NotNull ChunkGenerator generator(@NotNull Registry biomeRegistry, @NotNull Registry chunkGeneratorSettingsRegistry, long seed) { + protected @NotNull + ChunkGenerator generator(@NotNull Registry biomeRegistry, @NotNull Registry chunkGeneratorSettingsRegistry, long seed) { return new ForgeChunkGeneratorWrapper(new TerraBiomeSource(biomeRegistry, seed, pack), seed, pack); } } diff --git a/platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/block/state/SignTileEntityMixin.java b/platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/block/state/SignTileEntityMixin.java index 44a97ec83..691530c4d 100644 --- a/platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/block/state/SignTileEntityMixin.java +++ b/platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/block/state/SignTileEntityMixin.java @@ -22,7 +22,8 @@ public abstract class SignTileEntityMixin { @Shadow public abstract void setMessage(int p_212365_1_, ITextComponent p_212365_2_); - public @NotNull String[] terra$getLines() { + public @NotNull + String[] terra$getLines() { String[] lines = new String[messages.length]; for(int i = 0; i < messages.length; i++) { lines[i] = messages[i].getString(); @@ -30,7 +31,8 @@ public abstract class SignTileEntityMixin { return lines; } - public @NotNull String terra$getLine(int index) throws IndexOutOfBoundsException { + public @NotNull + String terra$getLine(int index) throws IndexOutOfBoundsException { return messages[index].getString(); } diff --git a/platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/chunk/ChunkMixin.java b/platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/chunk/ChunkMixin.java index 2a84b1a32..6ee4cd8b1 100644 --- a/platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/chunk/ChunkMixin.java +++ b/platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/chunk/ChunkMixin.java @@ -40,7 +40,8 @@ public abstract class ChunkMixin { return new ForgeBlock(pos, level); } - public @NotNull BlockData terra$getBlockData(int x, int y, int z) { + public @NotNull + BlockData terra$getBlockData(int x, int y, int z) { return terra$getBlock(x, y, z).getBlockData(); } diff --git a/platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/chunk/WorldGenRegionMixin.java b/platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/chunk/WorldGenRegionMixin.java index abec0eefd..e5b5a5c39 100644 --- a/platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/chunk/WorldGenRegionMixin.java +++ b/platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/chunk/WorldGenRegionMixin.java @@ -43,7 +43,8 @@ public abstract class WorldGenRegionMixin { return new ForgeBlock(pos, (WorldGenRegion) (Object) this); } - public @NotNull BlockData terra$getBlockData(int x, int y, int z) { + public @NotNull + BlockData terra$getBlockData(int x, int y, int z) { return terra$getBlock(x, y, z).getBlockData(); } diff --git a/platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/chunk/data/ChunkPrimerMixin.java b/platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/chunk/data/ChunkPrimerMixin.java index 59fae46c1..118d76c34 100644 --- a/platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/chunk/data/ChunkPrimerMixin.java +++ b/platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/chunk/data/ChunkPrimerMixin.java @@ -19,7 +19,8 @@ public abstract class ChunkPrimerMixin { @Shadow public abstract BlockState getBlockState(BlockPos pos); - public @NotNull BlockData terra$getBlockData(int x, int y, int z) { + public @NotNull + BlockData terra$getBlockData(int x, int y, int z) { return new ForgeBlockData(getBlockState(new BlockPos(x, y, z))); } diff --git a/platforms/region/src/main/java/com/dfsek/terra/StandalonePlugin.java b/platforms/region/src/main/java/com/dfsek/terra/StandalonePlugin.java index 16497596f..f8e609627 100644 --- a/platforms/region/src/main/java/com/dfsek/terra/StandalonePlugin.java +++ b/platforms/region/src/main/java/com/dfsek/terra/StandalonePlugin.java @@ -3,28 +3,28 @@ package com.dfsek.terra; import com.dfsek.tectonic.loading.TypeRegistry; import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.addon.TerraAddon; +import com.dfsek.terra.api.block.BlockData; import com.dfsek.terra.api.config.ConfigPack; import com.dfsek.terra.api.config.PluginConfig; import com.dfsek.terra.api.event.EventManager; import com.dfsek.terra.api.event.EventManagerImpl; -import com.dfsek.terra.api.block.BlockData; import com.dfsek.terra.api.handle.ItemHandle; import com.dfsek.terra.api.handle.WorldHandle; import com.dfsek.terra.api.lang.Language; -import com.dfsek.terra.api.world.TerraWorld; -import com.dfsek.terra.api.world.biome.Biome; -import com.dfsek.terra.api.world.World; +import com.dfsek.terra.api.profiler.Profiler; import com.dfsek.terra.api.registry.CheckedRegistry; import com.dfsek.terra.api.registry.LockedRegistry; import com.dfsek.terra.api.util.logging.DebugLogger; import com.dfsek.terra.api.util.logging.JavaLogger; +import com.dfsek.terra.api.world.TerraWorld; +import com.dfsek.terra.api.world.World; +import com.dfsek.terra.api.world.biome.Biome; import com.dfsek.terra.config.GenericLoaders; import com.dfsek.terra.config.PluginConfigImpl; import com.dfsek.terra.config.lang.LangUtil; import com.dfsek.terra.config.lang.LanguageImpl; import com.dfsek.terra.platform.RawBiome; import com.dfsek.terra.platform.RawWorldHandle; -import com.dfsek.terra.api.profiler.Profiler; import com.dfsek.terra.profiler.ProfilerImpl; import com.dfsek.terra.registry.master.AddonRegistry; import com.dfsek.terra.registry.master.ConfigRegistry; diff --git a/platforms/region/src/main/java/com/dfsek/terra/platform/DirectBlock.java b/platforms/region/src/main/java/com/dfsek/terra/platform/DirectBlock.java index 6d19a881d..1276443d6 100644 --- a/platforms/region/src/main/java/com/dfsek/terra/platform/DirectBlock.java +++ b/platforms/region/src/main/java/com/dfsek/terra/platform/DirectBlock.java @@ -1,12 +1,12 @@ package com.dfsek.terra.platform; -import com.dfsek.terra.vector.LocationImpl; -import com.dfsek.terra.api.vector.Vector3; import com.dfsek.terra.api.block.Block; import com.dfsek.terra.api.block.BlockData; import com.dfsek.terra.api.block.BlockFace; import com.dfsek.terra.api.block.BlockType; import com.dfsek.terra.api.block.state.BlockState; +import com.dfsek.terra.api.vector.Vector3; +import com.dfsek.terra.vector.LocationImpl; import net.jafama.FastMath; public class DirectBlock implements Block { diff --git a/platforms/region/src/main/java/com/dfsek/terra/platform/DirectChunkData.java b/platforms/region/src/main/java/com/dfsek/terra/platform/DirectChunkData.java index 7dcc02815..0b1764b21 100644 --- a/platforms/region/src/main/java/com/dfsek/terra/platform/DirectChunkData.java +++ b/platforms/region/src/main/java/com/dfsek/terra/platform/DirectChunkData.java @@ -1,10 +1,10 @@ package com.dfsek.terra.platform; -import com.dfsek.terra.vector.Vector3Impl; import com.dfsek.terra.api.block.Block; import com.dfsek.terra.api.block.BlockData; import com.dfsek.terra.api.world.World; import com.dfsek.terra.api.world.generator.ChunkData; +import com.dfsek.terra.vector.Vector3Impl; import net.querz.mca.Chunk; import net.querz.nbt.tag.CompoundTag; import org.jetbrains.annotations.NotNull; diff --git a/platforms/region/src/main/java/com/dfsek/terra/platform/DirectWorld.java b/platforms/region/src/main/java/com/dfsek/terra/platform/DirectWorld.java index 47f8deff9..0e7e823f0 100644 --- a/platforms/region/src/main/java/com/dfsek/terra/platform/DirectWorld.java +++ b/platforms/region/src/main/java/com/dfsek/terra/platform/DirectWorld.java @@ -1,14 +1,14 @@ package com.dfsek.terra.platform; import com.dfsek.terra.DirectUtils; -import com.dfsek.terra.vector.LocationImpl; -import com.dfsek.terra.vector.Vector3Impl; import com.dfsek.terra.api.block.Block; import com.dfsek.terra.api.entity.Entity; import com.dfsek.terra.api.entity.EntityType; import com.dfsek.terra.api.world.Chunk; import com.dfsek.terra.api.world.World; import com.dfsek.terra.api.world.generator.ChunkGenerator; +import com.dfsek.terra.vector.LocationImpl; +import com.dfsek.terra.vector.Vector3Impl; import net.jafama.FastMath; import net.querz.mca.MCAFile; import net.querz.mca.MCAUtil; diff --git a/platforms/region/src/main/java/com/dfsek/terra/platform/RawTree.java b/platforms/region/src/main/java/com/dfsek/terra/platform/RawTree.java index 97ef48609..e09d5d7d0 100644 --- a/platforms/region/src/main/java/com/dfsek/terra/platform/RawTree.java +++ b/platforms/region/src/main/java/com/dfsek/terra/platform/RawTree.java @@ -1,8 +1,8 @@ package com.dfsek.terra.platform; -import com.dfsek.terra.vector.LocationImpl; -import com.dfsek.terra.api.world.Tree; import com.dfsek.terra.api.util.collections.MaterialSet; +import com.dfsek.terra.api.world.Tree; +import com.dfsek.terra.vector.LocationImpl; import java.util.Random; diff --git a/platforms/region/src/main/java/com/dfsek/terra/region/Generator.java b/platforms/region/src/main/java/com/dfsek/terra/region/Generator.java index cf33cdd1a..e193e07f5 100644 --- a/platforms/region/src/main/java/com/dfsek/terra/region/Generator.java +++ b/platforms/region/src/main/java/com/dfsek/terra/region/Generator.java @@ -1,7 +1,6 @@ package com.dfsek.terra.region; import com.dfsek.terra.StandalonePlugin; -import com.dfsek.terra.api.world.World; import com.dfsek.terra.platform.DirectChunkData; import com.dfsek.terra.platform.DirectWorld; import com.dfsek.terra.platform.GenWrapper; @@ -70,7 +69,6 @@ public class Generator { } - System.out.println("Saving..."); for(Map.Entry entry : world.getFiles().entrySet()) { diff --git a/platforms/sponge/src/main/java/com/dfsek/terra/sponge/TerraSpongePlugin.java b/platforms/sponge/src/main/java/com/dfsek/terra/sponge/TerraSpongePlugin.java index 3bb6729bb..1098c5431 100644 --- a/platforms/sponge/src/main/java/com/dfsek/terra/sponge/TerraSpongePlugin.java +++ b/platforms/sponge/src/main/java/com/dfsek/terra/sponge/TerraSpongePlugin.java @@ -10,14 +10,14 @@ import com.dfsek.terra.api.event.EventManagerImpl; import com.dfsek.terra.api.handle.ItemHandle; import com.dfsek.terra.api.handle.WorldHandle; import com.dfsek.terra.api.lang.Language; -import com.dfsek.terra.api.world.TerraWorld; -import com.dfsek.terra.api.world.World; +import com.dfsek.terra.api.profiler.Profiler; import com.dfsek.terra.api.registry.CheckedRegistry; import com.dfsek.terra.api.registry.LockedRegistry; import com.dfsek.terra.api.util.logging.DebugLogger; +import com.dfsek.terra.api.world.TerraWorld; +import com.dfsek.terra.api.world.World; import com.dfsek.terra.config.PluginConfigImpl; import com.dfsek.terra.config.lang.LanguageImpl; -import com.dfsek.terra.api.profiler.Profiler; import com.dfsek.terra.registry.master.AddonRegistry; import com.dfsek.terra.registry.master.ConfigRegistry; import com.dfsek.terra.sponge.world.SpongeWorldHandle;