diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 732a59b1d..f40b5cfd8 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,13 +1,14 @@ # Global owners, automatically request review when pull request is submitted -* @dfsek @solonovamax @duplexsystem @Astrashh @justaureus +* @dfsek @solonovamax @duplexsystem @astrsh @justaureus # Platforms /platforms/ @dfsek @solonovamax @duplexsystem @justaureus +/platforms/bukkit @dfsek @solonovamax @duplexsystem @justaureus @OakLoaf # Common -/common/ @dfsek @solonovamax @duplexsystem @Astrashh +/common/ @dfsek @solonovamax @duplexsystem @astrsh # Gradle Stuff /buildSrc/ @dfsek @solonovamax @duplexsystem *.gradle.kts @dfsek @solonovamax @duplexsystem -/gradle/ @dfsek @solonovamax @duplexsystem \ No newline at end of file +/gradle/ @dfsek @solonovamax @duplexsystem diff --git a/LICENSE b/LICENSE index 22b8e06e5..02ee7bae3 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2020-2023 Polyhedral Development +Copyright (c) 2020-2024 Polyhedral Development Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/build.gradle.kts b/build.gradle.kts index 67b22ccb5..2d6105c73 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,8 +1,8 @@ preRelease(true) -versionProjects(":common:api", version("6.5.0")) -versionProjects(":common:implementation", version("6.5.0")) -versionProjects(":platforms", version("6.5.0")) +versionProjects(":common:api", version("6.6.0")) +versionProjects(":common:implementation", version("6.6.0")) +versionProjects(":platforms", version("6.6.0")) allprojects { diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index df18dc709..e507febd5 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -76,5 +76,6 @@ object Versions { // object CLI { const val logback = "1.5.8" + const val picocli = "4.7.6" } } \ No newline at end of file diff --git a/common/addons/api-addon-loader/LICENSE b/common/addons/api-addon-loader/LICENSE index 22b8e06e5..02ee7bae3 100644 --- a/common/addons/api-addon-loader/LICENSE +++ b/common/addons/api-addon-loader/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2020-2023 Polyhedral Development +Copyright (c) 2020-2024 Polyhedral Development Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/common/addons/api-addon-loader/src/main/java/com/dfsek/terra/addon/loader/ApiAddonClassLoader.java b/common/addons/api-addon-loader/src/main/java/com/dfsek/terra/addon/loader/ApiAddonClassLoader.java index 31c1eda90..e511bd13f 100644 --- a/common/addons/api-addon-loader/src/main/java/com/dfsek/terra/addon/loader/ApiAddonClassLoader.java +++ b/common/addons/api-addon-loader/src/main/java/com/dfsek/terra/addon/loader/ApiAddonClassLoader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/api-addon-loader/src/main/java/com/dfsek/terra/addon/loader/ApiAddonLoader.java b/common/addons/api-addon-loader/src/main/java/com/dfsek/terra/addon/loader/ApiAddonLoader.java index 3d2c977f5..0611eb847 100644 --- a/common/addons/api-addon-loader/src/main/java/com/dfsek/terra/addon/loader/ApiAddonLoader.java +++ b/common/addons/api-addon-loader/src/main/java/com/dfsek/terra/addon/loader/ApiAddonLoader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/biome-provider-image-v2/LICENSE b/common/addons/biome-provider-image-v2/LICENSE index 22b8e06e5..02ee7bae3 100644 --- a/common/addons/biome-provider-image-v2/LICENSE +++ b/common/addons/biome-provider-image-v2/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2020-2023 Polyhedral Development +Copyright (c) 2020-2024 Polyhedral Development Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/common/addons/biome-provider-image-v2/src/main/java/com/dfsek/terra/addons/biome/image/v2/ImageBiomeProvider.java b/common/addons/biome-provider-image-v2/src/main/java/com/dfsek/terra/addons/biome/image/v2/ImageBiomeProvider.java index 073bea70e..39599b8d4 100644 --- a/common/addons/biome-provider-image-v2/src/main/java/com/dfsek/terra/addons/biome/image/v2/ImageBiomeProvider.java +++ b/common/addons/biome-provider-image-v2/src/main/java/com/dfsek/terra/addons/biome/image/v2/ImageBiomeProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/biome-provider-image-v2/src/main/java/com/dfsek/terra/addons/biome/image/v2/ImageBiomeProviderAddon.java b/common/addons/biome-provider-image-v2/src/main/java/com/dfsek/terra/addons/biome/image/v2/ImageBiomeProviderAddon.java index 8c9763336..c30b0adb3 100644 --- a/common/addons/biome-provider-image-v2/src/main/java/com/dfsek/terra/addons/biome/image/v2/ImageBiomeProviderAddon.java +++ b/common/addons/biome-provider-image-v2/src/main/java/com/dfsek/terra/addons/biome/image/v2/ImageBiomeProviderAddon.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/biome-provider-image-v2/src/main/java/com/dfsek/terra/addons/biome/image/v2/config/ImageProviderTemplate.java b/common/addons/biome-provider-image-v2/src/main/java/com/dfsek/terra/addons/biome/image/v2/config/ImageProviderTemplate.java index 6596a0a8d..67e6765b2 100644 --- a/common/addons/biome-provider-image-v2/src/main/java/com/dfsek/terra/addons/biome/image/v2/config/ImageProviderTemplate.java +++ b/common/addons/biome-provider-image-v2/src/main/java/com/dfsek/terra/addons/biome/image/v2/config/ImageProviderTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/biome-provider-image/LICENSE b/common/addons/biome-provider-image/LICENSE index 22b8e06e5..02ee7bae3 100644 --- a/common/addons/biome-provider-image/LICENSE +++ b/common/addons/biome-provider-image/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2020-2023 Polyhedral Development +Copyright (c) 2020-2024 Polyhedral Development Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/common/addons/biome-provider-image/src/main/java/com/dfsek/terra/addons/biome/image/ImageBiomeProvider.java b/common/addons/biome-provider-image/src/main/java/com/dfsek/terra/addons/biome/image/ImageBiomeProvider.java index 47132b653..e16db358d 100644 --- a/common/addons/biome-provider-image/src/main/java/com/dfsek/terra/addons/biome/image/ImageBiomeProvider.java +++ b/common/addons/biome-provider-image/src/main/java/com/dfsek/terra/addons/biome/image/ImageBiomeProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/biome-provider-image/src/main/java/com/dfsek/terra/addons/biome/image/ImageBiomeProviderAddon.java b/common/addons/biome-provider-image/src/main/java/com/dfsek/terra/addons/biome/image/ImageBiomeProviderAddon.java index b561910bf..714876366 100644 --- a/common/addons/biome-provider-image/src/main/java/com/dfsek/terra/addons/biome/image/ImageBiomeProviderAddon.java +++ b/common/addons/biome-provider-image/src/main/java/com/dfsek/terra/addons/biome/image/ImageBiomeProviderAddon.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/biome-provider-image/src/main/java/com/dfsek/terra/addons/biome/image/ImageProviderTemplate.java b/common/addons/biome-provider-image/src/main/java/com/dfsek/terra/addons/biome/image/ImageProviderTemplate.java index 01bbffab6..d445e033f 100644 --- a/common/addons/biome-provider-image/src/main/java/com/dfsek/terra/addons/biome/image/ImageProviderTemplate.java +++ b/common/addons/biome-provider-image/src/main/java/com/dfsek/terra/addons/biome/image/ImageProviderTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/biome-provider-pipeline-v2/LICENSE b/common/addons/biome-provider-pipeline-v2/LICENSE index 22b8e06e5..02ee7bae3 100644 --- a/common/addons/biome-provider-pipeline-v2/LICENSE +++ b/common/addons/biome-provider-pipeline-v2/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2020-2023 Polyhedral Development +Copyright (c) 2020-2024 Polyhedral Development Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/BiomePipelineAddon.java b/common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/BiomePipelineAddon.java index 509651d7d..949952a50 100644 --- a/common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/BiomePipelineAddon.java +++ b/common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/BiomePipelineAddon.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/PipelineBiomeProvider.java b/common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/PipelineBiomeProvider.java index 8c36a7ccf..6858a3731 100644 --- a/common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/PipelineBiomeProvider.java +++ b/common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/PipelineBiomeProvider.java @@ -1,5 +1,7 @@ package com.dfsek.terra.addons.biome.pipeline.v2; +import com.dfsek.terra.api.util.cache.SeededVector2Key; + import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.LoadingCache; @@ -11,7 +13,6 @@ import java.util.stream.StreamSupport; import com.dfsek.terra.addons.biome.pipeline.v2.api.BiomeChunk; import com.dfsek.terra.addons.biome.pipeline.v2.api.Pipeline; -import com.dfsek.terra.addons.biome.pipeline.v2.api.SeededVector; import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage; import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome; import com.dfsek.terra.api.noise.NoiseSampler; @@ -23,7 +24,7 @@ import com.dfsek.terra.api.world.biome.generation.BiomeProvider; public class PipelineBiomeProvider implements BiomeProvider { - private final LoadingCache biomeChunkCache; + private final LoadingCache biomeChunkCache; private final int chunkSize; private final int resolution; private final NoiseSampler mutator; @@ -90,7 +91,7 @@ public class PipelineBiomeProvider implements BiomeProvider { int xInChunk = x - chunkWorldX; int zInChunk = z - chunkWorldZ; - return biomeChunkCache.get(new SeededVector(seed, chunkWorldX, chunkWorldZ)).get(xInChunk, zInChunk).getBiome(); + return biomeChunkCache.get(new SeededVector2Key(chunkWorldX, chunkWorldZ, seed)).get(xInChunk, zInChunk).getBiome(); } @Override diff --git a/common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/api/Pipeline.java b/common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/api/Pipeline.java index 37c8f1db0..9c48aff9f 100644 --- a/common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/api/Pipeline.java +++ b/common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/api/Pipeline.java @@ -1,10 +1,12 @@ package com.dfsek.terra.addons.biome.pipeline.v2.api; +import com.dfsek.terra.api.util.cache.SeededVector2Key; + import java.util.List; public interface Pipeline { - BiomeChunk generateChunk(SeededVector worldCoordinates); + BiomeChunk generateChunk(SeededVector2Key worldCoordinates); int getChunkSize(); diff --git a/common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/api/SeededVector.java b/common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/api/SeededVector.java deleted file mode 100644 index bee1f2424..000000000 --- a/common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/api/SeededVector.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.dfsek.terra.addons.biome.pipeline.v2.api; - -public record SeededVector(long seed, int x, int z) { - - @Override - public boolean equals(Object obj) { - if(obj instanceof SeededVector that) { - return this.z == that.z && this.x == that.x && this.seed == that.seed; - } - return false; - } - - @Override - public int hashCode() { - int code = x; - code = 31 * code + z; - return 31 * code + ((int) (seed ^ (seed >>> 32))); - } -} diff --git a/common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/BiomePipelineTemplate.java b/common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/BiomePipelineTemplate.java index 75ffb8d65..8ff6d5ac7 100644 --- a/common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/BiomePipelineTemplate.java +++ b/common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/BiomePipelineTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/source/SamplerSourceTemplate.java b/common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/source/SamplerSourceTemplate.java index 8b98cad62..5782a6f08 100644 --- a/common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/source/SamplerSourceTemplate.java +++ b/common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/source/SamplerSourceTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/source/SourceTemplate.java b/common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/source/SourceTemplate.java index 2c87fc98f..4c5d6cf85 100644 --- a/common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/source/SourceTemplate.java +++ b/common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/source/SourceTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/stage/StageTemplate.java b/common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/stage/StageTemplate.java index d3bbe528c..60399bf8d 100644 --- a/common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/stage/StageTemplate.java +++ b/common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/stage/StageTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/stage/expander/ExpanderStageTemplate.java b/common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/stage/expander/ExpanderStageTemplate.java index 7c1b58ad4..1f8227896 100644 --- a/common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/stage/expander/ExpanderStageTemplate.java +++ b/common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/stage/expander/ExpanderStageTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/stage/mutator/BorderListStageTemplate.java b/common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/stage/mutator/BorderListStageTemplate.java index 0f5ccc6ed..9e292108a 100644 --- a/common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/stage/mutator/BorderListStageTemplate.java +++ b/common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/stage/mutator/BorderListStageTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/stage/mutator/BorderStageTemplate.java b/common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/stage/mutator/BorderStageTemplate.java index 6b6bbe4f8..f2cdf370a 100644 --- a/common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/stage/mutator/BorderStageTemplate.java +++ b/common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/stage/mutator/BorderStageTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/stage/mutator/ReplaceListStageTemplate.java b/common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/stage/mutator/ReplaceListStageTemplate.java index 53d6aff2f..2a2f7f71a 100644 --- a/common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/stage/mutator/ReplaceListStageTemplate.java +++ b/common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/stage/mutator/ReplaceListStageTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/stage/mutator/ReplaceStageTemplate.java b/common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/stage/mutator/ReplaceStageTemplate.java index 4a62704c9..ff01f95df 100644 --- a/common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/stage/mutator/ReplaceStageTemplate.java +++ b/common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/stage/mutator/ReplaceStageTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/stage/mutator/SmoothStageTemplate.java b/common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/stage/mutator/SmoothStageTemplate.java index 8f897c0ab..163cb9843 100644 --- a/common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/stage/mutator/SmoothStageTemplate.java +++ b/common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/config/stage/mutator/SmoothStageTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/pipeline/BiomeChunkImpl.java b/common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/pipeline/BiomeChunkImpl.java index 78b0fe806..0e0b4d5f6 100644 --- a/common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/pipeline/BiomeChunkImpl.java +++ b/common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/pipeline/BiomeChunkImpl.java @@ -4,20 +4,20 @@ import java.util.List; import com.dfsek.terra.addons.biome.pipeline.v2.api.BiomeChunk; import com.dfsek.terra.addons.biome.pipeline.v2.api.Expander; -import com.dfsek.terra.addons.biome.pipeline.v2.api.SeededVector; import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage; import com.dfsek.terra.addons.biome.pipeline.v2.api.biome.PipelineBiome; +import com.dfsek.terra.api.util.cache.SeededVector2Key; public class BiomeChunkImpl implements BiomeChunk { - private final SeededVector worldOrigin; + private final SeededVector2Key worldOrigin; private final int chunkOriginArrayIndex; private final int worldCoordinateScale; private final int size; private PipelineBiome[] biomes; - public BiomeChunkImpl(SeededVector worldOrigin, PipelineImpl pipeline) { + public BiomeChunkImpl(SeededVector2Key worldOrigin, PipelineImpl pipeline) { this.worldOrigin = worldOrigin; this.chunkOriginArrayIndex = pipeline.getChunkOriginArrayIndex(); @@ -44,7 +44,7 @@ public class BiomeChunkImpl implements BiomeChunk { for(int gridZ = 0; gridZ < gridSize; gridZ++) { int xIndex = gridOrigin + gridX * gridInterval; int zIndex = gridOrigin + gridZ * gridInterval; - biomes[(xIndex * size) + zIndex] = pipeline.getSource().get(worldOrigin.seed(), xIndexToWorldCoordinate(xIndex), + biomes[(xIndex * size) + zIndex] = pipeline.getSource().get(worldOrigin.seed, xIndexToWorldCoordinate(xIndex), zIndexToWorldCoordinate(zIndex)); } } @@ -139,14 +139,14 @@ public class BiomeChunkImpl implements BiomeChunk { } private int xIndexToWorldCoordinate(int xIndex) { - return (worldOrigin.x() + xIndex - chunkOriginArrayIndex) * worldCoordinateScale; + return (worldOrigin.x + xIndex - chunkOriginArrayIndex) * worldCoordinateScale; } private int zIndexToWorldCoordinate(int zIndex) { - return (worldOrigin.z() + zIndex - chunkOriginArrayIndex) * worldCoordinateScale; + return (worldOrigin.z + zIndex - chunkOriginArrayIndex) * worldCoordinateScale; } - private SeededVector getOrigin() { + private SeededVector2Key getOrigin() { return worldOrigin; } @@ -216,7 +216,7 @@ public class BiomeChunkImpl implements BiomeChunk { } public long worldSeed() { - return chunk.getOrigin().seed(); + return chunk.getOrigin().seed; } } } diff --git a/common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/pipeline/PipelineImpl.java b/common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/pipeline/PipelineImpl.java index 3adef3d8e..71032531a 100644 --- a/common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/pipeline/PipelineImpl.java +++ b/common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/pipeline/PipelineImpl.java @@ -1,5 +1,7 @@ package com.dfsek.terra.addons.biome.pipeline.v2.pipeline; +import com.dfsek.terra.api.util.cache.SeededVector2Key; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -8,7 +10,6 @@ import java.util.List; import com.dfsek.terra.addons.biome.pipeline.v2.api.BiomeChunk; import com.dfsek.terra.addons.biome.pipeline.v2.api.Expander; import com.dfsek.terra.addons.biome.pipeline.v2.api.Pipeline; -import com.dfsek.terra.addons.biome.pipeline.v2.api.SeededVector; import com.dfsek.terra.addons.biome.pipeline.v2.api.Source; import com.dfsek.terra.addons.biome.pipeline.v2.api.Stage; @@ -55,7 +56,7 @@ public class PipelineImpl implements Pipeline { } @Override - public BiomeChunk generateChunk(SeededVector worldCoordinates) { + public BiomeChunk generateChunk(SeededVector2Key worldCoordinates) { return new BiomeChunkImpl(worldCoordinates, this); } diff --git a/common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/stage/mutators/BorderListStage.java b/common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/stage/mutators/BorderListStage.java index a269fb7f2..fd45c4422 100644 --- a/common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/stage/mutators/BorderListStage.java +++ b/common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/stage/mutators/BorderListStage.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/stage/mutators/BorderStage.java b/common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/stage/mutators/BorderStage.java index c1b5dbfba..d9caa708b 100644 --- a/common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/stage/mutators/BorderStage.java +++ b/common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/stage/mutators/BorderStage.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/stage/mutators/ReplaceListStage.java b/common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/stage/mutators/ReplaceListStage.java index 4d86958a2..bc2278f52 100644 --- a/common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/stage/mutators/ReplaceListStage.java +++ b/common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/stage/mutators/ReplaceListStage.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/stage/mutators/ReplaceStage.java b/common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/stage/mutators/ReplaceStage.java index b15986c82..02952d850 100644 --- a/common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/stage/mutators/ReplaceStage.java +++ b/common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/stage/mutators/ReplaceStage.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/stage/mutators/SmoothStage.java b/common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/stage/mutators/SmoothStage.java index 5b8cac234..b95523f6f 100644 --- a/common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/stage/mutators/SmoothStage.java +++ b/common/addons/biome-provider-pipeline-v2/src/main/java/com/dfsek/terra/addons/biome/pipeline/v2/stage/mutators/SmoothStage.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/biome-provider-pipeline/LICENSE b/common/addons/biome-provider-pipeline/LICENSE index 22b8e06e5..02ee7bae3 100644 --- a/common/addons/biome-provider-pipeline/LICENSE +++ b/common/addons/biome-provider-pipeline/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2020-2023 Polyhedral Development +Copyright (c) 2020-2024 Polyhedral Development Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomeHolderImpl.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomeHolderImpl.java index 73dc95675..dd56f1948 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomeHolderImpl.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomeHolderImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomePipeline.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomePipeline.java index e5f5f9ed6..7ecc57d60 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomePipeline.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomePipeline.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomePipelineAddon.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomePipelineAddon.java index 5df9c900c..9cc90642a 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomePipelineAddon.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomePipelineAddon.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomePipelineProvider.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomePipelineProvider.java index ef952736d..4e7abbdbb 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomePipelineProvider.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomePipelineProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/BiomeHolder.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/BiomeHolder.java index 5acb166a1..2f3b01597 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/BiomeHolder.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/BiomeHolder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/stage/Stage.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/stage/Stage.java index d007c6c8f..e6186b049 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/stage/Stage.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/stage/Stage.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/stage/type/BiomeExpander.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/stage/type/BiomeExpander.java index 4fcb9feeb..04ecf8ed4 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/stage/type/BiomeExpander.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/stage/type/BiomeExpander.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/stage/type/BiomeMutator.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/stage/type/BiomeMutator.java index 6362b582d..ff57de5c6 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/stage/type/BiomeMutator.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/stage/type/BiomeMutator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/BiomePipelineTemplate.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/BiomePipelineTemplate.java index 1566de524..14a5dfad2 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/BiomePipelineTemplate.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/BiomePipelineTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/BiomeProviderTemplate.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/BiomeProviderTemplate.java index 93f84e80a..e7b2ee4f4 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/BiomeProviderTemplate.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/BiomeProviderTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/SamplerSourceTemplate.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/SamplerSourceTemplate.java index b79c2e79a..743b7095a 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/SamplerSourceTemplate.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/SamplerSourceTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/SourceTemplate.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/SourceTemplate.java index 6f04cfd47..2a1fb997e 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/SourceTemplate.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/SourceTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/StageTemplate.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/StageTemplate.java index ec326ed0c..26bdb6e42 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/StageTemplate.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/StageTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/expander/ExpanderStageTemplate.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/expander/ExpanderStageTemplate.java index 9c13e1fd2..482dda91b 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/expander/ExpanderStageTemplate.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/expander/ExpanderStageTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/BorderListMutatorTemplate.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/BorderListMutatorTemplate.java index 5cb7287e1..f03338db8 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/BorderListMutatorTemplate.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/BorderListMutatorTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/BorderMutatorTemplate.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/BorderMutatorTemplate.java index f9b8888df..1afca776d 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/BorderMutatorTemplate.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/BorderMutatorTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/ReplaceListMutatorTemplate.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/ReplaceListMutatorTemplate.java index 8522f0488..cd14345ca 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/ReplaceListMutatorTemplate.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/ReplaceListMutatorTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/ReplaceMutatorTemplate.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/ReplaceMutatorTemplate.java index 48e3da95b..320c5e766 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/ReplaceMutatorTemplate.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/ReplaceMutatorTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/SmoothMutatorTemplate.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/SmoothMutatorTemplate.java index 8959a229a..117cdd983 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/SmoothMutatorTemplate.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/SmoothMutatorTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/expand/FractalExpander.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/expand/FractalExpander.java index aa06967e2..3f2183573 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/expand/FractalExpander.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/expand/FractalExpander.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/mutator/BorderListMutator.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/mutator/BorderListMutator.java index 21ed29efe..18d4e4ea8 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/mutator/BorderListMutator.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/mutator/BorderListMutator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/mutator/BorderMutator.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/mutator/BorderMutator.java index 43fd9f663..2c2422e13 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/mutator/BorderMutator.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/mutator/BorderMutator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/mutator/ReplaceListMutator.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/mutator/ReplaceListMutator.java index 3939b133b..3e35983c5 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/mutator/ReplaceListMutator.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/mutator/ReplaceListMutator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/mutator/ReplaceMutator.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/mutator/ReplaceMutator.java index f64871b39..6f8c0e332 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/mutator/ReplaceMutator.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/mutator/ReplaceMutator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/mutator/SmoothMutator.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/mutator/SmoothMutator.java index 8d8d01bf2..fd92fdf19 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/mutator/SmoothMutator.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/mutator/SmoothMutator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/source/BiomeSource.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/source/BiomeSource.java index 56b67b7f4..e4ee18bae 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/source/BiomeSource.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/source/BiomeSource.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/source/SamplerSource.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/source/SamplerSource.java index 7fc981d31..428f81363 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/source/SamplerSource.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/source/SamplerSource.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/stages/ExpanderStage.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/stages/ExpanderStage.java index 45602fb6b..91b191cbf 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/stages/ExpanderStage.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/stages/ExpanderStage.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/stages/MutatorStage.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/stages/MutatorStage.java index 8efbaaa27..2bb7d4cd5 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/stages/MutatorStage.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/stages/MutatorStage.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/biome-provider-single/LICENSE b/common/addons/biome-provider-single/LICENSE index 22b8e06e5..02ee7bae3 100644 --- a/common/addons/biome-provider-single/LICENSE +++ b/common/addons/biome-provider-single/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2020-2023 Polyhedral Development +Copyright (c) 2020-2024 Polyhedral Development Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/common/addons/biome-provider-single/src/main/java/com/dfsek/terra/addons/biome/single/SingleBiomeProvider.java b/common/addons/biome-provider-single/src/main/java/com/dfsek/terra/addons/biome/single/SingleBiomeProvider.java index 839508981..4f449890b 100644 --- a/common/addons/biome-provider-single/src/main/java/com/dfsek/terra/addons/biome/single/SingleBiomeProvider.java +++ b/common/addons/biome-provider-single/src/main/java/com/dfsek/terra/addons/biome/single/SingleBiomeProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/biome-provider-single/src/main/java/com/dfsek/terra/addons/biome/single/SingleBiomeProviderAddon.java b/common/addons/biome-provider-single/src/main/java/com/dfsek/terra/addons/biome/single/SingleBiomeProviderAddon.java index ebf355e72..e209d0295 100644 --- a/common/addons/biome-provider-single/src/main/java/com/dfsek/terra/addons/biome/single/SingleBiomeProviderAddon.java +++ b/common/addons/biome-provider-single/src/main/java/com/dfsek/terra/addons/biome/single/SingleBiomeProviderAddon.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/biome-provider-single/src/main/java/com/dfsek/terra/addons/biome/single/SingleBiomeProviderTemplate.java b/common/addons/biome-provider-single/src/main/java/com/dfsek/terra/addons/biome/single/SingleBiomeProviderTemplate.java index 3a4c3f05e..3bcc016a9 100644 --- a/common/addons/biome-provider-single/src/main/java/com/dfsek/terra/addons/biome/single/SingleBiomeProviderTemplate.java +++ b/common/addons/biome-provider-single/src/main/java/com/dfsek/terra/addons/biome/single/SingleBiomeProviderTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/chunk-generator-noise-3d/LICENSE b/common/addons/chunk-generator-noise-3d/LICENSE index 22b8e06e5..02ee7bae3 100644 --- a/common/addons/chunk-generator-noise-3d/LICENSE +++ b/common/addons/chunk-generator-noise-3d/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2020-2023 Polyhedral Development +Copyright (c) 2020-2024 Polyhedral Development Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/NoiseChunkGenerator3DAddon.java b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/NoiseChunkGenerator3DAddon.java index f2f0c9386..cb9b32c20 100644 --- a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/NoiseChunkGenerator3DAddon.java +++ b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/NoiseChunkGenerator3DAddon.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/config/palette/BiomePaletteTemplate.java b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/config/palette/BiomePaletteTemplate.java index a4ff986e4..edfecf3e2 100644 --- a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/config/palette/BiomePaletteTemplate.java +++ b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/config/palette/BiomePaletteTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/NoiseChunkGenerator3D.java b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/NoiseChunkGenerator3D.java index 4f891d12b..89d07b141 100644 --- a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/NoiseChunkGenerator3D.java +++ b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/NoiseChunkGenerator3D.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/interpolation/ChunkInterpolator.java b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/interpolation/ChunkInterpolator.java index 2a2640a91..ed29a061a 100644 --- a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/interpolation/ChunkInterpolator.java +++ b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/interpolation/ChunkInterpolator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/interpolation/ElevationInterpolator.java b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/interpolation/ElevationInterpolator.java index d5f1c03ad..89d166696 100644 --- a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/interpolation/ElevationInterpolator.java +++ b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/interpolation/ElevationInterpolator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/interpolation/Interpolator.java b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/interpolation/Interpolator.java index 74cc8fd99..fd4784e88 100644 --- a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/interpolation/Interpolator.java +++ b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/interpolation/Interpolator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/interpolation/Interpolator3.java b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/interpolation/Interpolator3.java index 5ea8ef578..47e586525 100644 --- a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/interpolation/Interpolator3.java +++ b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/interpolation/Interpolator3.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/samplers/Sampler3D.java b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/samplers/Sampler3D.java index fcae0ce8c..100f014bc 100644 --- a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/samplers/Sampler3D.java +++ b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/samplers/Sampler3D.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/palette/BiomePaletteInfo.java b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/palette/BiomePaletteInfo.java index 56555afef..938fbb596 100644 --- a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/palette/BiomePaletteInfo.java +++ b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/palette/BiomePaletteInfo.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/palette/PaletteHolder.java b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/palette/PaletteHolder.java index 5b5673770..0f1d52f9d 100644 --- a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/palette/PaletteHolder.java +++ b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/palette/PaletteHolder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/palette/slant/MultipleSlantHolder.java b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/palette/slant/MultipleSlantHolder.java index 08f1d16fe..b4710cdd1 100644 --- a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/palette/slant/MultipleSlantHolder.java +++ b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/palette/slant/MultipleSlantHolder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-biome/LICENSE b/common/addons/config-biome/LICENSE index 22b8e06e5..02ee7bae3 100644 --- a/common/addons/config-biome/LICENSE +++ b/common/addons/config-biome/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2020-2023 Polyhedral Development +Copyright (c) 2020-2024 Polyhedral Development Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/BiomeAddon.java b/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/BiomeAddon.java index 01d80e999..0ebd8cfcf 100644 --- a/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/BiomeAddon.java +++ b/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/BiomeAddon.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/BiomeConfigType.java b/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/BiomeConfigType.java index 8ed5d2aea..a21a86c34 100644 --- a/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/BiomeConfigType.java +++ b/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/BiomeConfigType.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/BiomeFactory.java b/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/BiomeFactory.java index 95029a434..562c0f6b8 100644 --- a/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/BiomeFactory.java +++ b/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/BiomeFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/BiomeTemplate.java b/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/BiomeTemplate.java index 9ae2d52f0..ed2948f02 100644 --- a/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/BiomeTemplate.java +++ b/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/BiomeTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/PaletteSettingsImpl.java b/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/PaletteSettingsImpl.java index 57b56cd0e..681bc96e6 100644 --- a/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/PaletteSettingsImpl.java +++ b/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/PaletteSettingsImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/UserDefinedBiome.java b/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/UserDefinedBiome.java index 8f9ac0d11..b6778eff7 100644 --- a/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/UserDefinedBiome.java +++ b/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/UserDefinedBiome.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/holder/PaletteHolder.java b/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/holder/PaletteHolder.java index 81a5973aa..de4cdd715 100644 --- a/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/holder/PaletteHolder.java +++ b/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/holder/PaletteHolder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/holder/PaletteHolderBuilder.java b/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/holder/PaletteHolderBuilder.java index a96cbcc48..ffdde46ed 100644 --- a/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/holder/PaletteHolderBuilder.java +++ b/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/holder/PaletteHolderBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-distributors/LICENSE b/common/addons/config-distributors/LICENSE index 22b8e06e5..02ee7bae3 100644 --- a/common/addons/config-distributors/LICENSE +++ b/common/addons/config-distributors/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2020-2023 Polyhedral Development +Copyright (c) 2020-2024 Polyhedral Development Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/DistributorAddon.java b/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/DistributorAddon.java index 0006885a7..4e4c3c747 100644 --- a/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/DistributorAddon.java +++ b/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/DistributorAddon.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/config/AndDistributorTemplate.java b/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/config/AndDistributorTemplate.java index 28408129f..9a8d1e0cc 100644 --- a/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/config/AndDistributorTemplate.java +++ b/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/config/AndDistributorTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/config/NoDistributorTemplate.java b/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/config/NoDistributorTemplate.java index eecc77b77..5acb0ef2c 100644 --- a/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/config/NoDistributorTemplate.java +++ b/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/config/NoDistributorTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/config/OrDistributorTemplate.java b/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/config/OrDistributorTemplate.java index a48f912ec..cba623924 100644 --- a/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/config/OrDistributorTemplate.java +++ b/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/config/OrDistributorTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/config/PointSetDistributorTemplate.java b/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/config/PointSetDistributorTemplate.java index ef8e2649b..53df1ed8e 100644 --- a/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/config/PointSetDistributorTemplate.java +++ b/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/config/PointSetDistributorTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/config/SamplerDistributorTemplate.java b/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/config/SamplerDistributorTemplate.java index 6640fbe01..524f70633 100644 --- a/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/config/SamplerDistributorTemplate.java +++ b/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/config/SamplerDistributorTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/config/XorDistributorTemplate.java b/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/config/XorDistributorTemplate.java index ffeaa146b..ba3af6853 100644 --- a/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/config/XorDistributorTemplate.java +++ b/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/config/XorDistributorTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/config/YesDistributorTemplate.java b/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/config/YesDistributorTemplate.java index a4bae8e4f..2c0f35ac7 100644 --- a/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/config/YesDistributorTemplate.java +++ b/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/config/YesDistributorTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/distributors/PointSetDistributor.java b/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/distributors/PointSetDistributor.java index 4285af486..89db4f13a 100644 --- a/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/distributors/PointSetDistributor.java +++ b/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/distributors/PointSetDistributor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/distributors/SamplerDistributor.java b/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/distributors/SamplerDistributor.java index d93c85fa4..6768bc91b 100644 --- a/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/distributors/SamplerDistributor.java +++ b/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/distributors/SamplerDistributor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/util/Point.java b/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/util/Point.java index 47248c6e2..3cd0278c9 100644 --- a/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/util/Point.java +++ b/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/util/Point.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/util/PointTemplate.java b/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/util/PointTemplate.java index aabe7c004..c88715f8c 100644 --- a/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/util/PointTemplate.java +++ b/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/util/PointTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-feature/LICENSE b/common/addons/config-feature/LICENSE index 22b8e06e5..02ee7bae3 100644 --- a/common/addons/config-feature/LICENSE +++ b/common/addons/config-feature/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2020-2023 Polyhedral Development +Copyright (c) 2020-2024 Polyhedral Development Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/common/addons/config-feature/src/main/java/com/dfsek/terra/addons/feature/ConfiguredFeature.java b/common/addons/config-feature/src/main/java/com/dfsek/terra/addons/feature/ConfiguredFeature.java index 46066c9fb..0fb2d02e3 100644 --- a/common/addons/config-feature/src/main/java/com/dfsek/terra/addons/feature/ConfiguredFeature.java +++ b/common/addons/config-feature/src/main/java/com/dfsek/terra/addons/feature/ConfiguredFeature.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-feature/src/main/java/com/dfsek/terra/addons/feature/FeatureAddon.java b/common/addons/config-feature/src/main/java/com/dfsek/terra/addons/feature/FeatureAddon.java index c8fee225b..eac7d3e17 100644 --- a/common/addons/config-feature/src/main/java/com/dfsek/terra/addons/feature/FeatureAddon.java +++ b/common/addons/config-feature/src/main/java/com/dfsek/terra/addons/feature/FeatureAddon.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-feature/src/main/java/com/dfsek/terra/addons/feature/FeatureConfigType.java b/common/addons/config-feature/src/main/java/com/dfsek/terra/addons/feature/FeatureConfigType.java index aeae9f9e0..804574560 100644 --- a/common/addons/config-feature/src/main/java/com/dfsek/terra/addons/feature/FeatureConfigType.java +++ b/common/addons/config-feature/src/main/java/com/dfsek/terra/addons/feature/FeatureConfigType.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-feature/src/main/java/com/dfsek/terra/addons/feature/FeatureFactory.java b/common/addons/config-feature/src/main/java/com/dfsek/terra/addons/feature/FeatureFactory.java index 7d4d2be12..afe75a9f4 100644 --- a/common/addons/config-feature/src/main/java/com/dfsek/terra/addons/feature/FeatureFactory.java +++ b/common/addons/config-feature/src/main/java/com/dfsek/terra/addons/feature/FeatureFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-feature/src/main/java/com/dfsek/terra/addons/feature/FeatureTemplate.java b/common/addons/config-feature/src/main/java/com/dfsek/terra/addons/feature/FeatureTemplate.java index 5e3eb95cc..2f00b38cb 100644 --- a/common/addons/config-feature/src/main/java/com/dfsek/terra/addons/feature/FeatureTemplate.java +++ b/common/addons/config-feature/src/main/java/com/dfsek/terra/addons/feature/FeatureTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-flora/LICENSE b/common/addons/config-flora/LICENSE index 22b8e06e5..02ee7bae3 100644 --- a/common/addons/config-flora/LICENSE +++ b/common/addons/config-flora/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2020-2023 Polyhedral Development +Copyright (c) 2020-2024 Polyhedral Development Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/FloraAddon.java b/common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/FloraAddon.java index 132a52594..e021ca1b1 100644 --- a/common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/FloraAddon.java +++ b/common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/FloraAddon.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/FloraConfigType.java b/common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/FloraConfigType.java index 30e0f3ec8..b255d60bc 100644 --- a/common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/FloraConfigType.java +++ b/common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/FloraConfigType.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/FloraFactory.java b/common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/FloraFactory.java index 14a50d55a..994c5d3c2 100644 --- a/common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/FloraFactory.java +++ b/common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/FloraFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/FloraTemplate.java b/common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/FloraTemplate.java index 214a17ab4..55d285459 100644 --- a/common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/FloraTemplate.java +++ b/common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/FloraTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/config/BlockLayerTemplate.java b/common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/config/BlockLayerTemplate.java index 6b99c8277..1b3e36155 100644 --- a/common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/config/BlockLayerTemplate.java +++ b/common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/config/BlockLayerTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/flora/gen/BlockLayer.java b/common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/flora/gen/BlockLayer.java index d372ac2fe..089dfc7b7 100644 --- a/common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/flora/gen/BlockLayer.java +++ b/common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/flora/gen/BlockLayer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/flora/gen/TerraFlora.java b/common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/flora/gen/TerraFlora.java index 661b820f2..146543652 100644 --- a/common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/flora/gen/TerraFlora.java +++ b/common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/flora/gen/TerraFlora.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-locators/LICENSE b/common/addons/config-locators/LICENSE index 22b8e06e5..02ee7bae3 100644 --- a/common/addons/config-locators/LICENSE +++ b/common/addons/config-locators/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2020-2023 Polyhedral Development +Copyright (c) 2020-2024 Polyhedral Development Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/LocatorAddon.java b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/LocatorAddon.java index 8a0896181..f8f382221 100644 --- a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/LocatorAddon.java +++ b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/LocatorAddon.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/AdjacentPatternLocatorTemplate.java b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/AdjacentPatternLocatorTemplate.java index 9afff0a28..379649648 100644 --- a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/AdjacentPatternLocatorTemplate.java +++ b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/AdjacentPatternLocatorTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/AndLocatorTemplate.java b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/AndLocatorTemplate.java index 3de3c59f1..399e563e7 100644 --- a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/AndLocatorTemplate.java +++ b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/AndLocatorTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/GaussianRandomLocatorTemplate.java b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/GaussianRandomLocatorTemplate.java index 350c818c2..12c56eb9f 100644 --- a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/GaussianRandomLocatorTemplate.java +++ b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/GaussianRandomLocatorTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/OrLocatorTemplate.java b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/OrLocatorTemplate.java index bbbb10e7f..ba2cc85b8 100644 --- a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/OrLocatorTemplate.java +++ b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/OrLocatorTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/PatternLocatorTemplate.java b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/PatternLocatorTemplate.java index a7e7c2fa7..74db6c9d9 100644 --- a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/PatternLocatorTemplate.java +++ b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/PatternLocatorTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/RandomLocatorTemplate.java b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/RandomLocatorTemplate.java index db73e11bd..fd0fb7d92 100644 --- a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/RandomLocatorTemplate.java +++ b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/RandomLocatorTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/Sampler3DLocatorTemplate.java b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/Sampler3DLocatorTemplate.java index b0dfaab3d..81a0be7f8 100644 --- a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/Sampler3DLocatorTemplate.java +++ b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/Sampler3DLocatorTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/SamplerLocatorTemplate.java b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/SamplerLocatorTemplate.java index 599d37e66..c404f36e8 100644 --- a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/SamplerLocatorTemplate.java +++ b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/SamplerLocatorTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/SurfaceLocatorTemplate.java b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/SurfaceLocatorTemplate.java index 861adb0fd..0f1f6e1db 100644 --- a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/SurfaceLocatorTemplate.java +++ b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/SurfaceLocatorTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/TopLocatorTemplate.java b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/TopLocatorTemplate.java index 0967e47af..881259eb9 100644 --- a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/TopLocatorTemplate.java +++ b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/TopLocatorTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/XorLocatorTemplate.java b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/XorLocatorTemplate.java index 48dca2bb0..0a618c960 100644 --- a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/XorLocatorTemplate.java +++ b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/XorLocatorTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/pattern/AirMatchPatternTemplate.java b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/pattern/AirMatchPatternTemplate.java index 41398b9c7..9848f517e 100644 --- a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/pattern/AirMatchPatternTemplate.java +++ b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/pattern/AirMatchPatternTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/pattern/AndPatternTemplate.java b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/pattern/AndPatternTemplate.java index 59a786e4a..866d56337 100644 --- a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/pattern/AndPatternTemplate.java +++ b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/pattern/AndPatternTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/pattern/BlockSetMatchPatternTemplate.java b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/pattern/BlockSetMatchPatternTemplate.java index 5b9be9beb..9c6af3deb 100644 --- a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/pattern/BlockSetMatchPatternTemplate.java +++ b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/pattern/BlockSetMatchPatternTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/pattern/NotPatternTemplate.java b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/pattern/NotPatternTemplate.java index 6aa0d8689..80d92e7fe 100644 --- a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/pattern/NotPatternTemplate.java +++ b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/pattern/NotPatternTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/pattern/OrPatternTemplate.java b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/pattern/OrPatternTemplate.java index c97873fb6..d01d711e0 100644 --- a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/pattern/OrPatternTemplate.java +++ b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/pattern/OrPatternTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/pattern/SingleBlockMatchPatternTemplate.java b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/pattern/SingleBlockMatchPatternTemplate.java index 72c791971..411f77350 100644 --- a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/pattern/SingleBlockMatchPatternTemplate.java +++ b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/pattern/SingleBlockMatchPatternTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/pattern/SolidMatchPatternTemplate.java b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/pattern/SolidMatchPatternTemplate.java index b3710d9f1..ab8b33d6a 100644 --- a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/pattern/SolidMatchPatternTemplate.java +++ b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/pattern/SolidMatchPatternTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/pattern/XorPatternTemplate.java b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/pattern/XorPatternTemplate.java index 5250a2129..8fe84df23 100644 --- a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/pattern/XorPatternTemplate.java +++ b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/pattern/XorPatternTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/AdjacentPatternLocator.java b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/AdjacentPatternLocator.java index 0cbf09c64..b7819a466 100644 --- a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/AdjacentPatternLocator.java +++ b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/AdjacentPatternLocator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/GaussianRandomLocator.java b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/GaussianRandomLocator.java index db1279ab9..c7ce12383 100644 --- a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/GaussianRandomLocator.java +++ b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/GaussianRandomLocator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/PatternLocator.java b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/PatternLocator.java index 869d3cc0e..1265bed2f 100644 --- a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/PatternLocator.java +++ b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/PatternLocator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/RandomLocator.java b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/RandomLocator.java index 1f8dbd19a..04c0d3d87 100644 --- a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/RandomLocator.java +++ b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/RandomLocator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/Sampler3DLocator.java b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/Sampler3DLocator.java index a91049299..5fc7d6d9c 100644 --- a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/Sampler3DLocator.java +++ b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/Sampler3DLocator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/SamplerLocator.java b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/SamplerLocator.java index 42b04f4d7..362d83988 100644 --- a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/SamplerLocator.java +++ b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/SamplerLocator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/SurfaceLocator.java b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/SurfaceLocator.java index 9f7fd625f..313fd636d 100644 --- a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/SurfaceLocator.java +++ b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/SurfaceLocator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/TopLocator.java b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/TopLocator.java index 35547d88d..5d0209fe6 100644 --- a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/TopLocator.java +++ b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/TopLocator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/patterns/MatchPattern.java b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/patterns/MatchPattern.java index 78a0e0232..1035d5222 100644 --- a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/patterns/MatchPattern.java +++ b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/patterns/MatchPattern.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/patterns/Pattern.java b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/patterns/Pattern.java index 9d6617d39..8444c17e3 100644 --- a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/patterns/Pattern.java +++ b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/patterns/Pattern.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-noise-function/LICENSE b/common/addons/config-noise-function/LICENSE index 22b8e06e5..02ee7bae3 100644 --- a/common/addons/config-noise-function/LICENSE +++ b/common/addons/config-noise-function/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2020-2023 Polyhedral Development +Copyright (c) 2020-2024 Polyhedral Development Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/NoiseAddon.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/NoiseAddon.java index e2fa8956c..24691d38f 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/NoiseAddon.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/NoiseAddon.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. @@ -17,6 +17,7 @@ import com.dfsek.terra.addons.manifest.api.AddonInitializer; import com.dfsek.terra.addons.noise.config.CubicSplinePointTemplate; import com.dfsek.terra.addons.noise.config.DimensionApplicableNoiseSampler; import com.dfsek.terra.addons.noise.config.templates.BinaryArithmeticTemplate; +import com.dfsek.terra.addons.noise.config.templates.CacheSamplerTemplate; import com.dfsek.terra.addons.noise.config.templates.DerivativeNoiseSamplerTemplate; import com.dfsek.terra.addons.noise.config.templates.DomainWarpTemplate; import com.dfsek.terra.addons.noise.config.templates.FunctionTemplate; @@ -150,6 +151,8 @@ public class NoiseAddon implements AddonInitializer { noiseRegistry.register(addon.key("MAX"), () -> new BinaryArithmeticTemplate<>(MaxSampler::new)); noiseRegistry.register(addon.key("MIN"), () -> new BinaryArithmeticTemplate<>(MinSampler::new)); + noiseRegistry.register(addon.key("CACHE"), CacheSamplerTemplate::new); + Map packSamplers = new LinkedHashMap<>(); Map packFunctions = new LinkedHashMap<>(); diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/NoiseConfigPackTemplate.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/NoiseConfigPackTemplate.java index d6ac6c00c..c93e7823f 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/NoiseConfigPackTemplate.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/NoiseConfigPackTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/DimensionApplicableNoiseSampler.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/DimensionApplicableNoiseSampler.java index bc5d32555..43ded4752 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/DimensionApplicableNoiseSampler.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/DimensionApplicableNoiseSampler.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/CacheSamplerTemplate.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/CacheSamplerTemplate.java new file mode 100644 index 000000000..492f9ad5a --- /dev/null +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/CacheSamplerTemplate.java @@ -0,0 +1,24 @@ +package com.dfsek.terra.addons.noise.config.templates; + +import com.dfsek.tectonic.api.config.template.annotations.Default; +import com.dfsek.tectonic.api.config.template.annotations.Value; + +import com.dfsek.terra.addons.noise.samplers.CacheSampler; +import com.dfsek.terra.addons.noise.samplers.LinearHeightmapSampler; +import com.dfsek.terra.api.noise.NoiseSampler; + + +public class CacheSamplerTemplate extends SamplerTemplate { + @Value("sampler") + @Default + private NoiseSampler sampler; + + public CacheSamplerTemplate() { + + } + + @Override + public NoiseSampler get() { + return new CacheSampler(sampler, getDimensions()); + } +} diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/DomainWarpTemplate.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/DomainWarpTemplate.java index 6780d593e..68fc1b47b 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/DomainWarpTemplate.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/DomainWarpTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/FunctionTemplate.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/FunctionTemplate.java index 543ac908a..95005043a 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/FunctionTemplate.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/FunctionTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/ImageSamplerTemplate.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/ImageSamplerTemplate.java index c7359426c..a207533b7 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/ImageSamplerTemplate.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/ImageSamplerTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/KernelTemplate.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/KernelTemplate.java index 3d2478e35..a68e04137 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/KernelTemplate.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/KernelTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/SamplerTemplate.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/SamplerTemplate.java index a39e9c9a2..f76cf53fc 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/SamplerTemplate.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/SamplerTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/CellularNoiseTemplate.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/CellularNoiseTemplate.java index c1fdd2122..42bd00262 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/CellularNoiseTemplate.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/CellularNoiseTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/ConstantNoiseTemplate.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/ConstantNoiseTemplate.java index 4755f5f8d..05cc8dc2a 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/ConstantNoiseTemplate.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/ConstantNoiseTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/ExpressionFunctionTemplate.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/ExpressionFunctionTemplate.java index 3268af5b0..56a84f663 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/ExpressionFunctionTemplate.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/ExpressionFunctionTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/GaborNoiseTemplate.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/GaborNoiseTemplate.java index ef32def58..e62578608 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/GaborNoiseTemplate.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/GaborNoiseTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/NoiseTemplate.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/NoiseTemplate.java index b83971c14..7680b46c5 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/NoiseTemplate.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/NoiseTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/SimpleNoiseTemplate.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/SimpleNoiseTemplate.java index 5a9c497a5..fd81f7147 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/SimpleNoiseTemplate.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/SimpleNoiseTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/fractal/BrownianMotionTemplate.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/fractal/BrownianMotionTemplate.java index d4fae6e9c..3b550a41b 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/fractal/BrownianMotionTemplate.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/fractal/BrownianMotionTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/fractal/FractalTemplate.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/fractal/FractalTemplate.java index c363235b3..eac7143af 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/fractal/FractalTemplate.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/fractal/FractalTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/fractal/PingPongTemplate.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/fractal/PingPongTemplate.java index 3092c7cb8..52d74e2cc 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/fractal/PingPongTemplate.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/fractal/PingPongTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/fractal/RidgedFractalTemplate.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/fractal/RidgedFractalTemplate.java index 7d3cd340f..da6f7c847 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/fractal/RidgedFractalTemplate.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/fractal/RidgedFractalTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/normalizer/ClampNormalizerTemplate.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/normalizer/ClampNormalizerTemplate.java index 6e8cdb2e4..cc0fa3996 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/normalizer/ClampNormalizerTemplate.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/normalizer/ClampNormalizerTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/normalizer/ExpressionNormalizerTemplate.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/normalizer/ExpressionNormalizerTemplate.java index 4254f4798..264c50f81 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/normalizer/ExpressionNormalizerTemplate.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/normalizer/ExpressionNormalizerTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/normalizer/LinearNormalizerTemplate.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/normalizer/LinearNormalizerTemplate.java index faa0818bc..d2eccae25 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/normalizer/LinearNormalizerTemplate.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/normalizer/LinearNormalizerTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/normalizer/NormalNormalizerTemplate.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/normalizer/NormalNormalizerTemplate.java index b33e5b2b7..a9098483a 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/normalizer/NormalNormalizerTemplate.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/normalizer/NormalNormalizerTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/normalizer/NormalizerTemplate.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/normalizer/NormalizerTemplate.java index 9dbbb5e51..7f67929b6 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/normalizer/NormalizerTemplate.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/normalizer/NormalizerTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/normalizer/ClampNormalizer.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/normalizer/ClampNormalizer.java index 76b85de0a..1e07a67ed 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/normalizer/ClampNormalizer.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/normalizer/ClampNormalizer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/normalizer/LinearNormalizer.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/normalizer/LinearNormalizer.java index 42678ceb5..213442bce 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/normalizer/LinearNormalizer.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/normalizer/LinearNormalizer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/normalizer/NormalNormalizer.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/normalizer/NormalNormalizer.java index c20cc8ee7..4273e2e7b 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/normalizer/NormalNormalizer.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/normalizer/NormalNormalizer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/normalizer/Normalizer.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/normalizer/Normalizer.java index 60206bc1a..539701920 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/normalizer/Normalizer.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/normalizer/Normalizer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/paralithic/defined/UserDefinedFunction.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/paralithic/defined/UserDefinedFunction.java index f55fe3e12..638af0473 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/paralithic/defined/UserDefinedFunction.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/paralithic/defined/UserDefinedFunction.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/paralithic/noise/NoiseFunction2.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/paralithic/noise/NoiseFunction2.java index 10844d38c..1e04afebf 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/paralithic/noise/NoiseFunction2.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/paralithic/noise/NoiseFunction2.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/paralithic/noise/NoiseFunction3.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/paralithic/noise/NoiseFunction3.java index 725439ad3..b62a6636b 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/paralithic/noise/NoiseFunction3.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/paralithic/noise/NoiseFunction3.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/paralithic/noise/SeedContext.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/paralithic/noise/SeedContext.java index 78d6d3862..5b8b71530 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/paralithic/noise/SeedContext.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/paralithic/noise/SeedContext.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/CacheSampler.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/CacheSampler.java new file mode 100644 index 000000000..59ff6a75a --- /dev/null +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/CacheSampler.java @@ -0,0 +1,78 @@ +package com.dfsek.terra.addons.noise.samplers; + +import com.dfsek.terra.api.noise.NoiseSampler; + +import com.dfsek.terra.api.util.cache.DoubleSeededVector2Key; +import com.dfsek.terra.api.util.cache.DoubleSeededVector3Key; +import com.dfsek.terra.api.util.generic.pair.Pair; + +import com.dfsek.terra.api.util.generic.pair.Pair.Mutable; + +import com.github.benmanes.caffeine.cache.Caffeine; +import com.github.benmanes.caffeine.cache.LoadingCache; +import com.github.benmanes.caffeine.cache.Scheduler; + +import static com.dfsek.terra.api.util.cache.CacheUtils.CACHE_EXECUTOR; + + +public class CacheSampler implements NoiseSampler { + + private final NoiseSampler sampler; + private final ThreadLocal>> cache2D; + private final ThreadLocal>> cache3D; + + public CacheSampler(NoiseSampler sampler, int dimensions) { + this.sampler = sampler; + if (dimensions == 2) { + this.cache2D = ThreadLocal.withInitial(() -> { + LoadingCache cache = Caffeine + .newBuilder() + .executor(CACHE_EXECUTOR) + .scheduler(Scheduler.systemScheduler()) + .initialCapacity(256) + .maximumSize(256) + .build(this::sampleNoise); + return Pair.of(new DoubleSeededVector2Key(0, 0, 0), cache).mutable(); + }); + this.cache3D = null; + } else { + this.cache3D = ThreadLocal.withInitial(() -> { + LoadingCache cache = Caffeine + .newBuilder() + .executor(CACHE_EXECUTOR) + .scheduler(Scheduler.systemScheduler()) + .initialCapacity(981504) + .maximumSize(981504) + .build(this::sampleNoise); + return Pair.of(new DoubleSeededVector3Key(0, 0, 0, 0), cache).mutable(); + }); + this.cache2D = null; + } + } + + private Double sampleNoise(DoubleSeededVector2Key vec) { + this.cache2D.get().setLeft(new DoubleSeededVector2Key(0, 0, 0)); + return this.sampler.noise(vec.seed, vec.x, vec.z); + } + + private Double sampleNoise(DoubleSeededVector3Key vec) { + this.cache3D.get().setLeft(new DoubleSeededVector3Key(0, 0, 0, 0)); + return this.sampler.noise(vec.seed, vec.x, vec.y, vec.z); + } + + @Override + public double noise(long seed, double x, double y) { + Mutable> cachePair = cache2D.get(); + DoubleSeededVector2Key mutableKey = cachePair.getLeft(); + mutableKey.set(x, y, seed); + return cachePair.getRight().get(mutableKey); + } + + @Override + public double noise(long seed, double x, double y, double z) { + Mutable> cachePair = cache3D.get(); + DoubleSeededVector3Key mutableKey = cachePair.getLeft(); + mutableKey.set(x, y, z, seed); + return cachePair.getRight().get(mutableKey); + } +} diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/DomainWarpedSampler.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/DomainWarpedSampler.java index beb4d691b..7f67d93b6 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/DomainWarpedSampler.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/DomainWarpedSampler.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/ImageSampler.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/ImageSampler.java index 13c9ceb6d..0ff72747d 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/ImageSampler.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/ImageSampler.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/KernelSampler.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/KernelSampler.java index 96c81bca5..9715398b0 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/KernelSampler.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/KernelSampler.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/CellularSampler.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/CellularSampler.java index 8e163f9ad..2c7908bca 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/CellularSampler.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/CellularSampler.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. @@ -279,7 +279,8 @@ public class CellularSampler extends NoiseFunction { if(distanceFunction == DistanceFunction.Euclidean && returnType != ReturnType.CellValue) { distance0 = Math.sqrt(distance0); - if(returnType != ReturnType.CellValue) { + + if (returnType != ReturnType.Distance) { distance1 = Math.sqrt(distance1); } } @@ -370,7 +371,8 @@ public class CellularSampler extends NoiseFunction { if(distanceFunction == DistanceFunction.Euclidean && returnType != ReturnType.CellValue) { distance0 = Math.sqrt(distance0); - if(returnType != ReturnType.CellValue) { + + if (returnType != ReturnType.Distance) { distance1 = Math.sqrt(distance1); } } diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/ConstantSampler.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/ConstantSampler.java index a8372bfb7..cba951e06 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/ConstantSampler.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/ConstantSampler.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/ExpressionFunction.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/ExpressionFunction.java index 15b7dfbb0..0b70933eb 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/ExpressionFunction.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/ExpressionFunction.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/GaborNoiseSampler.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/GaborNoiseSampler.java index 5d0e763f9..4eea46264 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/GaborNoiseSampler.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/GaborNoiseSampler.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/NoiseFunction.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/NoiseFunction.java index bdc03618f..552396796 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/NoiseFunction.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/NoiseFunction.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/fractal/BrownianMotionSampler.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/fractal/BrownianMotionSampler.java index 524545514..ce44000d3 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/fractal/BrownianMotionSampler.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/fractal/BrownianMotionSampler.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/fractal/FractalNoiseFunction.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/fractal/FractalNoiseFunction.java index 6428b0b93..2228a4d29 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/fractal/FractalNoiseFunction.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/fractal/FractalNoiseFunction.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/fractal/PingPongSampler.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/fractal/PingPongSampler.java index 761a5deaa..06e6c78da 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/fractal/PingPongSampler.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/fractal/PingPongSampler.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/fractal/RidgedFractalSampler.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/fractal/RidgedFractalSampler.java index 1b45ed820..92c578cc7 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/fractal/RidgedFractalSampler.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/fractal/RidgedFractalSampler.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/random/GaussianNoiseSampler.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/random/GaussianNoiseSampler.java index 6a4be9cbe..df78392b4 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/random/GaussianNoiseSampler.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/random/GaussianNoiseSampler.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/random/PositiveWhiteNoiseSampler.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/random/PositiveWhiteNoiseSampler.java index 86be91206..571947564 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/random/PositiveWhiteNoiseSampler.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/random/PositiveWhiteNoiseSampler.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/random/WhiteNoiseSampler.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/random/WhiteNoiseSampler.java index 482c0cc9c..4aed9ece9 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/random/WhiteNoiseSampler.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/random/WhiteNoiseSampler.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/simplex/OpenSimplex2SSampler.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/simplex/OpenSimplex2SSampler.java index 86adcee3b..5d7b01f3b 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/simplex/OpenSimplex2SSampler.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/simplex/OpenSimplex2SSampler.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/simplex/OpenSimplex2Sampler.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/simplex/OpenSimplex2Sampler.java index e86ec2234..ca973ca0c 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/simplex/OpenSimplex2Sampler.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/simplex/OpenSimplex2Sampler.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/simplex/PerlinSampler.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/simplex/PerlinSampler.java index 8ce0c19dc..078a300a8 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/simplex/PerlinSampler.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/simplex/PerlinSampler.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/simplex/SimplexSampler.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/simplex/SimplexSampler.java index 1a1f12245..c398f93d6 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/simplex/SimplexSampler.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/simplex/SimplexSampler.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/simplex/SimplexStyleSampler.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/simplex/SimplexStyleSampler.java index 9b646830b..2b5188ce4 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/simplex/SimplexStyleSampler.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/simplex/SimplexStyleSampler.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/value/ValueCubicSampler.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/value/ValueCubicSampler.java index 811241f52..b11da6c23 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/value/ValueCubicSampler.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/value/ValueCubicSampler.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/value/ValueSampler.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/value/ValueSampler.java index f0ce72403..be415e298 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/value/ValueSampler.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/value/ValueSampler.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/value/ValueStyleNoise.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/value/ValueStyleNoise.java index 58212b6fe..342de1091 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/value/ValueStyleNoise.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/value/ValueStyleNoise.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-number-predicate/src/main/java/com/dfsek/terra/addons/numberpredicate/NumberPredicateAddon.java b/common/addons/config-number-predicate/src/main/java/com/dfsek/terra/addons/numberpredicate/NumberPredicateAddon.java index 541249369..f14c6fc9a 100644 --- a/common/addons/config-number-predicate/src/main/java/com/dfsek/terra/addons/numberpredicate/NumberPredicateAddon.java +++ b/common/addons/config-number-predicate/src/main/java/com/dfsek/terra/addons/numberpredicate/NumberPredicateAddon.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-ore/LICENSE b/common/addons/config-ore/LICENSE index 22b8e06e5..02ee7bae3 100644 --- a/common/addons/config-ore/LICENSE +++ b/common/addons/config-ore/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2020-2023 Polyhedral Development +Copyright (c) 2020-2024 Polyhedral Development Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OreAddon.java b/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OreAddon.java index 9527fa84e..ca400b9f7 100644 --- a/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OreAddon.java +++ b/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OreAddon.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OreConfigType.java b/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OreConfigType.java index 5b3feebd0..df12a9406 100644 --- a/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OreConfigType.java +++ b/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OreConfigType.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OreFactory.java b/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OreFactory.java index 23d0daa8d..906298bb8 100644 --- a/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OreFactory.java +++ b/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OreFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OreTemplate.java b/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OreTemplate.java index 24bbd6d3c..a17d08bd7 100644 --- a/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OreTemplate.java +++ b/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OreTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/ScatteredOreConfigType.java b/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/ScatteredOreConfigType.java index c9749ddde..314e46cd6 100644 --- a/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/ScatteredOreConfigType.java +++ b/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/ScatteredOreConfigType.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/ScatteredOreFactory.java b/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/ScatteredOreFactory.java index 6d9178854..c578a8e5d 100644 --- a/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/ScatteredOreFactory.java +++ b/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/ScatteredOreFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/ScatteredOreTemplate.java b/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/ScatteredOreTemplate.java index 58448b442..9f7b23789 100644 --- a/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/ScatteredOreTemplate.java +++ b/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/ScatteredOreTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/ores/VanillaOre.java b/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/ores/VanillaOre.java index f51ac47ef..e5f471cc3 100644 --- a/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/ores/VanillaOre.java +++ b/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/ores/VanillaOre.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-palette/LICENSE b/common/addons/config-palette/LICENSE index 22b8e06e5..02ee7bae3 100644 --- a/common/addons/config-palette/LICENSE +++ b/common/addons/config-palette/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2020-2023 Polyhedral Development +Copyright (c) 2020-2024 Polyhedral Development Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/PaletteAddon.java b/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/PaletteAddon.java index a7e7c6b10..af17d260c 100644 --- a/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/PaletteAddon.java +++ b/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/PaletteAddon.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/PaletteConfigType.java b/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/PaletteConfigType.java index ff0c92800..72ec325f2 100644 --- a/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/PaletteConfigType.java +++ b/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/PaletteConfigType.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/PaletteFactory.java b/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/PaletteFactory.java index 74ee564dd..1deb75c93 100644 --- a/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/PaletteFactory.java +++ b/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/PaletteFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. @@ -8,7 +8,6 @@ package com.dfsek.terra.addons.palette; import com.dfsek.terra.addons.palette.palette.PaletteImpl; -import com.dfsek.terra.addons.palette.palette.PaletteLayerHolder; import com.dfsek.terra.api.Platform; import com.dfsek.terra.api.config.ConfigFactory; import com.dfsek.terra.api.world.chunk.generation.util.Palette; @@ -17,10 +16,6 @@ import com.dfsek.terra.api.world.chunk.generation.util.Palette; public class PaletteFactory implements ConfigFactory { @Override public Palette build(PaletteTemplate config, Platform platform) { - PaletteImpl palette = new PaletteImpl(config.getNoise()); - for(PaletteLayerHolder layer : config.getPalette()) { - palette.add(layer.getLayer(), layer.getSize(), layer.getSampler()); - } - return palette; + return new PaletteImpl(config.getPalette(), config.getDefaultSampler()); } } diff --git a/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/PaletteTemplate.java b/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/PaletteTemplate.java index de4af6319..d2c966320 100644 --- a/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/PaletteTemplate.java +++ b/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/PaletteTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. @@ -23,7 +23,7 @@ import com.dfsek.terra.api.noise.NoiseSampler; public class PaletteTemplate implements AbstractableTemplate { @Value("sampler") @Default - private @Meta NoiseSampler noise = NoiseSampler.zero(); + private @Meta NoiseSampler defaultSampler = NoiseSampler.zero(); @Value("id") @Final @@ -40,7 +40,7 @@ public class PaletteTemplate implements AbstractableTemplate { return palette; } - public NoiseSampler getNoise() { - return noise; + public NoiseSampler getDefaultSampler() { + return defaultSampler; } } diff --git a/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/palette/PaletteImpl.java b/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/palette/PaletteImpl.java index e0a314726..1eeaff73d 100644 --- a/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/palette/PaletteImpl.java +++ b/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/palette/PaletteImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. @@ -15,73 +15,45 @@ import com.dfsek.terra.api.noise.NoiseSampler; import com.dfsek.terra.api.util.collection.ProbabilityCollection; import com.dfsek.terra.api.world.chunk.generation.util.Palette; - /** * A class representation of a "slice" of the world. * Used to get a section of blocks, based on the depth at which they are found. */ public class PaletteImpl implements Palette { - private final List pallet = new ArrayList<>(); - private final NoiseSampler sampler; + private final PaletteLayer[] layers; - public PaletteImpl(NoiseSampler sampler) { - this.sampler = sampler; - } + public PaletteImpl(List layers, NoiseSampler defaultSampler) { + List layerArray = new ArrayList<>(); - public Palette add(ProbabilityCollection m, int layers, NoiseSampler sampler) { - for(int i = 0; i < layers; i++) { - pallet.add(new PaletteLayer(m, sampler)); + for (PaletteLayerHolder holder : layers) { + PaletteLayer layer; + ProbabilityCollection materials = holder.getLayer(); + NoiseSampler sampler = holder.getSampler() == null ? defaultSampler : holder.getSampler(); + layer = new PaletteLayer(materials, sampler); + for (int i = 0; i < holder.getSize(); i++) + layerArray.add(layer); } - return this; + + this.layers = layerArray.toArray(new PaletteLayer[0]); } @Override public BlockState get(int layer, double x, double y, double z, long seed) { - PaletteLayer paletteLayer; - if(layer > this.getSize()) paletteLayer = this.getLayers().get(this.getLayers().size() - 1); - else { - List pl = getLayers(); - if(layer >= pl.size()) paletteLayer = pl.get(pl.size() - 1); - else paletteLayer = pl.get(layer); - } - NoiseSampler paletteSampler = paletteLayer.getSampler(); - return paletteLayer.get(paletteSampler == null ? sampler : paletteSampler, x, y, z, seed); + int idx = layer < layers.length ? layer : layers.length - 1; + return layers[idx].get(x, y, z, seed); } - - public int getSize() { - return pallet.size(); - } - - public List getLayers() { - return pallet; - } - - /** - * Class representation of a layer of a BlockPalette. - */ - public static class PaletteLayer { + static class PaletteLayer { private final NoiseSampler sampler; private final ProbabilityCollection collection; - /** - * Constructs a PaletteLayerHolder with a ProbabilityCollection of materials and a number of layers. - * - * @param type The collection of materials to choose from. - * @param sampler Noise sampler to use - */ public PaletteLayer(ProbabilityCollection type, NoiseSampler sampler) { this.sampler = sampler; this.collection = type; } - public BlockState get(NoiseSampler random, double x, double y, double z, long seed) { - return this.collection.get(random, x, y, z, seed); + public BlockState get(double x, double y, double z, long seed) { + return this.collection.get(sampler, x, y, z, seed); } - - public NoiseSampler getSampler() { - return sampler; - } - } } diff --git a/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/palette/PaletteLayerHolder.java b/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/palette/PaletteLayerHolder.java index 6ff4bdd8d..51cf079d9 100644 --- a/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/palette/PaletteLayerHolder.java +++ b/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/palette/PaletteLayerHolder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/palette/PaletteLayerLoader.java b/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/palette/PaletteLayerLoader.java index 918b9abb4..afc0eec05 100644 --- a/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/palette/PaletteLayerLoader.java +++ b/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/palette/PaletteLayerLoader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-structure/LICENSE b/common/addons/config-structure/LICENSE index 22b8e06e5..02ee7bae3 100644 --- a/common/addons/config-structure/LICENSE +++ b/common/addons/config-structure/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2020-2023 Polyhedral Development +Copyright (c) 2020-2024 Polyhedral Development Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/BiomeStructures.java b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/BiomeStructures.java index dfebf0f79..102ead8c2 100644 --- a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/BiomeStructures.java +++ b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/BiomeStructures.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/BiomeStructuresTemplate.java b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/BiomeStructuresTemplate.java index 99e80e9bc..2a5749023 100644 --- a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/BiomeStructuresTemplate.java +++ b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/BiomeStructuresTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/StructureAddon.java b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/StructureAddon.java index c56823307..5987c2134 100644 --- a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/StructureAddon.java +++ b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/StructureAddon.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/StructureConfigType.java b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/StructureConfigType.java index cf8f662a6..c8438feec 100644 --- a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/StructureConfigType.java +++ b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/StructureConfigType.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/StructureFactory.java b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/StructureFactory.java index eac1bc6ce..58296549b 100644 --- a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/StructureFactory.java +++ b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/StructureFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/StructureTemplate.java b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/StructureTemplate.java index 5856ab5a5..9ffa481a2 100644 --- a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/StructureTemplate.java +++ b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/StructureTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/TerraStructure.java b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/TerraStructure.java index 2fd78f77d..f84cc9350 100644 --- a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/TerraStructure.java +++ b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/TerraStructure.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/structures/loot/Entry.java b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/structures/loot/Entry.java index 106147229..da8a23579 100644 --- a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/structures/loot/Entry.java +++ b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/structures/loot/Entry.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/structures/loot/LootTableImpl.java b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/structures/loot/LootTableImpl.java index cebf93ef2..c3eccff17 100644 --- a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/structures/loot/LootTableImpl.java +++ b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/structures/loot/LootTableImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/structures/loot/Pool.java b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/structures/loot/Pool.java index dd80e03ec..8928279f8 100644 --- a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/structures/loot/Pool.java +++ b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/structures/loot/Pool.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/structures/loot/functions/AmountFunction.java b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/structures/loot/functions/AmountFunction.java index 2605840f6..26697c1c2 100644 --- a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/structures/loot/functions/AmountFunction.java +++ b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/structures/loot/functions/AmountFunction.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/structures/loot/functions/DamageFunction.java b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/structures/loot/functions/DamageFunction.java index c90090199..6cb626bdd 100644 --- a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/structures/loot/functions/DamageFunction.java +++ b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/structures/loot/functions/DamageFunction.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/structures/loot/functions/EnchantFunction.java b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/structures/loot/functions/EnchantFunction.java index e741bd9f5..2fcb41313 100644 --- a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/structures/loot/functions/EnchantFunction.java +++ b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/structures/loot/functions/EnchantFunction.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/structures/loot/functions/LootFunction.java b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/structures/loot/functions/LootFunction.java index a881ca634..1e399a460 100644 --- a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/structures/loot/functions/LootFunction.java +++ b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/structures/loot/functions/LootFunction.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/generation-stage-feature/LICENSE b/common/addons/generation-stage-feature/LICENSE index 22b8e06e5..02ee7bae3 100644 --- a/common/addons/generation-stage-feature/LICENSE +++ b/common/addons/generation-stage-feature/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2020-2023 Polyhedral Development +Copyright (c) 2020-2024 Polyhedral Development Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/common/addons/generation-stage-feature/src/main/java/com/dfsek/terra/addons/generation/feature/FeatureGenerationAddon.java b/common/addons/generation-stage-feature/src/main/java/com/dfsek/terra/addons/generation/feature/FeatureGenerationAddon.java index f1ca7d945..c18b9bc24 100644 --- a/common/addons/generation-stage-feature/src/main/java/com/dfsek/terra/addons/generation/feature/FeatureGenerationAddon.java +++ b/common/addons/generation-stage-feature/src/main/java/com/dfsek/terra/addons/generation/feature/FeatureGenerationAddon.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/generation-stage-feature/src/main/java/com/dfsek/terra/addons/generation/feature/FeatureGenerationStage.java b/common/addons/generation-stage-feature/src/main/java/com/dfsek/terra/addons/generation/feature/FeatureGenerationStage.java index 132889d23..092b8c0e2 100644 --- a/common/addons/generation-stage-feature/src/main/java/com/dfsek/terra/addons/generation/feature/FeatureGenerationStage.java +++ b/common/addons/generation-stage-feature/src/main/java/com/dfsek/terra/addons/generation/feature/FeatureGenerationStage.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/generation-stage-feature/src/main/java/com/dfsek/terra/addons/generation/feature/config/BiomeFeatures.java b/common/addons/generation-stage-feature/src/main/java/com/dfsek/terra/addons/generation/feature/config/BiomeFeatures.java index afd10efce..fa4f28d15 100644 --- a/common/addons/generation-stage-feature/src/main/java/com/dfsek/terra/addons/generation/feature/config/BiomeFeatures.java +++ b/common/addons/generation-stage-feature/src/main/java/com/dfsek/terra/addons/generation/feature/config/BiomeFeatures.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/generation-stage-structure/LICENSE b/common/addons/generation-stage-structure/LICENSE index 22b8e06e5..02ee7bae3 100644 --- a/common/addons/generation-stage-structure/LICENSE +++ b/common/addons/generation-stage-structure/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2020-2023 Polyhedral Development +Copyright (c) 2020-2024 Polyhedral Development Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/common/addons/language-yaml/LICENSE b/common/addons/language-yaml/LICENSE index 22b8e06e5..02ee7bae3 100644 --- a/common/addons/language-yaml/LICENSE +++ b/common/addons/language-yaml/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2020-2023 Polyhedral Development +Copyright (c) 2020-2024 Polyhedral Development Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/common/addons/language-yaml/src/main/java/com/dfsek/terra/addons/yaml/YamlAddon.java b/common/addons/language-yaml/src/main/java/com/dfsek/terra/addons/yaml/YamlAddon.java index 08cb9751a..1e0298a09 100644 --- a/common/addons/language-yaml/src/main/java/com/dfsek/terra/addons/yaml/YamlAddon.java +++ b/common/addons/language-yaml/src/main/java/com/dfsek/terra/addons/yaml/YamlAddon.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/image/ImageCache.java b/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/image/ImageCache.java index 9283aa4b7..88240b7ce 100644 --- a/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/image/ImageCache.java +++ b/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/image/ImageCache.java @@ -17,6 +17,10 @@ import com.dfsek.terra.api.config.Loader; import com.dfsek.terra.api.properties.Properties; import com.dfsek.terra.api.util.generic.Lazy; +import com.github.benmanes.caffeine.cache.Scheduler; + +import static com.dfsek.terra.api.util.cache.CacheUtils.CACHE_EXECUTOR; + /* * Cache prevents configs from loading the same image multiple times into memory @@ -26,7 +30,7 @@ record ImageCache(LoadingCache cache) implements Properties { ImageLibraryPackConfigTemplate config = pack.getContext().get(ImageLibraryPackConfigTemplate.class); ImageCache images; if(!pack.getContext().has(ImageCache.class)) { - var cacheBuilder = Caffeine.newBuilder(); + var cacheBuilder = Caffeine.newBuilder().executor(CACHE_EXECUTOR).scheduler(Scheduler.systemScheduler()); if(config.unloadOnTimeout()) cacheBuilder.expireAfterAccess(config.getCacheTimeout(), TimeUnit.SECONDS); images = new ImageCache(cacheBuilder.build(s -> loadImage(s, files))); pack.getContext().put(images); diff --git a/common/addons/manifest-addon-loader/LICENSE b/common/addons/manifest-addon-loader/LICENSE index 22b8e06e5..02ee7bae3 100644 --- a/common/addons/manifest-addon-loader/LICENSE +++ b/common/addons/manifest-addon-loader/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2020-2023 Polyhedral Development +Copyright (c) 2020-2024 Polyhedral Development Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/common/addons/manifest-addon-loader/src/main/java/com/dfsek/terra/addons/manifest/api/AddonInitializer.java b/common/addons/manifest-addon-loader/src/main/java/com/dfsek/terra/addons/manifest/api/AddonInitializer.java index 8f195d62c..46b2949e1 100644 --- a/common/addons/manifest-addon-loader/src/main/java/com/dfsek/terra/addons/manifest/api/AddonInitializer.java +++ b/common/addons/manifest-addon-loader/src/main/java/com/dfsek/terra/addons/manifest/api/AddonInitializer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/manifest-addon-loader/src/main/java/com/dfsek/terra/addons/manifest/impl/ManifestAddon.java b/common/addons/manifest-addon-loader/src/main/java/com/dfsek/terra/addons/manifest/impl/ManifestAddon.java index b3c19d872..a98a96fdc 100644 --- a/common/addons/manifest-addon-loader/src/main/java/com/dfsek/terra/addons/manifest/impl/ManifestAddon.java +++ b/common/addons/manifest-addon-loader/src/main/java/com/dfsek/terra/addons/manifest/impl/ManifestAddon.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/manifest-addon-loader/src/main/java/com/dfsek/terra/addons/manifest/impl/ManifestAddonClassLoader.java b/common/addons/manifest-addon-loader/src/main/java/com/dfsek/terra/addons/manifest/impl/ManifestAddonClassLoader.java index 109142a98..864f3dd04 100644 --- a/common/addons/manifest-addon-loader/src/main/java/com/dfsek/terra/addons/manifest/impl/ManifestAddonClassLoader.java +++ b/common/addons/manifest-addon-loader/src/main/java/com/dfsek/terra/addons/manifest/impl/ManifestAddonClassLoader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/manifest-addon-loader/src/main/java/com/dfsek/terra/addons/manifest/impl/ManifestAddonLoader.java b/common/addons/manifest-addon-loader/src/main/java/com/dfsek/terra/addons/manifest/impl/ManifestAddonLoader.java index 8055c2101..b9696dd8f 100644 --- a/common/addons/manifest-addon-loader/src/main/java/com/dfsek/terra/addons/manifest/impl/ManifestAddonLoader.java +++ b/common/addons/manifest-addon-loader/src/main/java/com/dfsek/terra/addons/manifest/impl/ManifestAddonLoader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/manifest-addon-loader/src/main/java/com/dfsek/terra/addons/manifest/impl/config/AddonManifest.java b/common/addons/manifest-addon-loader/src/main/java/com/dfsek/terra/addons/manifest/impl/config/AddonManifest.java index 97cd8332f..8fa3ff82c 100644 --- a/common/addons/manifest-addon-loader/src/main/java/com/dfsek/terra/addons/manifest/impl/config/AddonManifest.java +++ b/common/addons/manifest-addon-loader/src/main/java/com/dfsek/terra/addons/manifest/impl/config/AddonManifest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/manifest-addon-loader/src/main/java/com/dfsek/terra/addons/manifest/impl/config/WebsiteConfig.java b/common/addons/manifest-addon-loader/src/main/java/com/dfsek/terra/addons/manifest/impl/config/WebsiteConfig.java index d648223df..15929671f 100644 --- a/common/addons/manifest-addon-loader/src/main/java/com/dfsek/terra/addons/manifest/impl/config/WebsiteConfig.java +++ b/common/addons/manifest-addon-loader/src/main/java/com/dfsek/terra/addons/manifest/impl/config/WebsiteConfig.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/manifest-addon-loader/src/main/java/com/dfsek/terra/addons/manifest/impl/config/loaders/VersionLoader.java b/common/addons/manifest-addon-loader/src/main/java/com/dfsek/terra/addons/manifest/impl/config/loaders/VersionLoader.java index 263c691d3..8d5f19b4d 100644 --- a/common/addons/manifest-addon-loader/src/main/java/com/dfsek/terra/addons/manifest/impl/config/loaders/VersionLoader.java +++ b/common/addons/manifest-addon-loader/src/main/java/com/dfsek/terra/addons/manifest/impl/config/loaders/VersionLoader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/manifest-addon-loader/src/main/java/com/dfsek/terra/addons/manifest/impl/config/loaders/VersionRangeLoader.java b/common/addons/manifest-addon-loader/src/main/java/com/dfsek/terra/addons/manifest/impl/config/loaders/VersionRangeLoader.java index 1f7d4d983..33243d3a0 100644 --- a/common/addons/manifest-addon-loader/src/main/java/com/dfsek/terra/addons/manifest/impl/config/loaders/VersionRangeLoader.java +++ b/common/addons/manifest-addon-loader/src/main/java/com/dfsek/terra/addons/manifest/impl/config/loaders/VersionRangeLoader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/manifest-addon-loader/src/main/java/com/dfsek/terra/addons/manifest/impl/exception/AddonException.java b/common/addons/manifest-addon-loader/src/main/java/com/dfsek/terra/addons/manifest/impl/exception/AddonException.java index 9db7b67bf..051ee66ec 100644 --- a/common/addons/manifest-addon-loader/src/main/java/com/dfsek/terra/addons/manifest/impl/exception/AddonException.java +++ b/common/addons/manifest-addon-loader/src/main/java/com/dfsek/terra/addons/manifest/impl/exception/AddonException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/manifest-addon-loader/src/main/java/com/dfsek/terra/addons/manifest/impl/exception/ManifestException.java b/common/addons/manifest-addon-loader/src/main/java/com/dfsek/terra/addons/manifest/impl/exception/ManifestException.java index e8d8ad5c7..063f106f7 100644 --- a/common/addons/manifest-addon-loader/src/main/java/com/dfsek/terra/addons/manifest/impl/exception/ManifestException.java +++ b/common/addons/manifest-addon-loader/src/main/java/com/dfsek/terra/addons/manifest/impl/exception/ManifestException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/manifest-addon-loader/src/main/java/com/dfsek/terra/addons/manifest/impl/exception/ManifestNotPresentException.java b/common/addons/manifest-addon-loader/src/main/java/com/dfsek/terra/addons/manifest/impl/exception/ManifestNotPresentException.java index 77b579d12..9248e3da2 100644 --- a/common/addons/manifest-addon-loader/src/main/java/com/dfsek/terra/addons/manifest/impl/exception/ManifestNotPresentException.java +++ b/common/addons/manifest-addon-loader/src/main/java/com/dfsek/terra/addons/manifest/impl/exception/ManifestNotPresentException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/palette-block-shortcut/LICENSE b/common/addons/palette-block-shortcut/LICENSE index 22b8e06e5..02ee7bae3 100644 --- a/common/addons/palette-block-shortcut/LICENSE +++ b/common/addons/palette-block-shortcut/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2020-2023 Polyhedral Development +Copyright (c) 2020-2024 Polyhedral Development Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/common/addons/pipeline-image/LICENSE b/common/addons/pipeline-image/LICENSE index 22b8e06e5..02ee7bae3 100644 --- a/common/addons/pipeline-image/LICENSE +++ b/common/addons/pipeline-image/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2020-2023 Polyhedral Development +Copyright (c) 2020-2024 Polyhedral Development Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/common/addons/structure-block-shortcut/LICENSE b/common/addons/structure-block-shortcut/LICENSE index 22b8e06e5..02ee7bae3 100644 --- a/common/addons/structure-block-shortcut/LICENSE +++ b/common/addons/structure-block-shortcut/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2020-2023 Polyhedral Development +Copyright (c) 2020-2024 Polyhedral Development Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/common/addons/structure-sponge-loader/LICENSE b/common/addons/structure-sponge-loader/LICENSE index 22b8e06e5..02ee7bae3 100644 --- a/common/addons/structure-sponge-loader/LICENSE +++ b/common/addons/structure-sponge-loader/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2020-2023 Polyhedral Development +Copyright (c) 2020-2024 Polyhedral Development Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/common/addons/structure-sponge-loader/src/main/java/com/dfsek/terra/addons/sponge/SpongeSchematicAddon.java b/common/addons/structure-sponge-loader/src/main/java/com/dfsek/terra/addons/sponge/SpongeSchematicAddon.java index 199864cd1..d31c5b71f 100644 --- a/common/addons/structure-sponge-loader/src/main/java/com/dfsek/terra/addons/sponge/SpongeSchematicAddon.java +++ b/common/addons/structure-sponge-loader/src/main/java/com/dfsek/terra/addons/sponge/SpongeSchematicAddon.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-sponge-loader/src/main/java/com/dfsek/terra/addons/sponge/SpongeStructure.java b/common/addons/structure-sponge-loader/src/main/java/com/dfsek/terra/addons/sponge/SpongeStructure.java index 12ce1f42b..c371d9e46 100644 --- a/common/addons/structure-sponge-loader/src/main/java/com/dfsek/terra/addons/sponge/SpongeStructure.java +++ b/common/addons/structure-sponge-loader/src/main/java/com/dfsek/terra/addons/sponge/SpongeStructure.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/LICENSE b/common/addons/structure-terrascript-loader/LICENSE index 22b8e06e5..02ee7bae3 100644 --- a/common/addons/structure-terrascript-loader/LICENSE +++ b/common/addons/structure-terrascript-loader/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2020-2023 Polyhedral Development +Copyright (c) 2020-2024 Polyhedral Development Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/TerraScriptAddon.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/TerraScriptAddon.java index b555b7bac..4b4ed7acd 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/TerraScriptAddon.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/TerraScriptAddon.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/Parser.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/Parser.java index 1a24c5ee2..04d7a0b97 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/Parser.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/Parser.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/ParserUtil.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/ParserUtil.java index 4fc805a8f..c669bb8e9 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/ParserUtil.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/ParserUtil.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/exceptions/ParseException.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/exceptions/ParseException.java index 9e62ad278..2d8be44d7 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/exceptions/ParseException.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/exceptions/ParseException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/Block.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/Block.java index 1b49e8ca4..ea01adad6 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/Block.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/Block.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/ImplementationArguments.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/ImplementationArguments.java index 18c82e574..f57c5cc2f 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/ImplementationArguments.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/ImplementationArguments.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/Item.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/Item.java index 297319fe8..90147a948 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/Item.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/Item.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/Keyword.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/Keyword.java index e2be6b0aa..d918a115c 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/Keyword.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/Keyword.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/Returnable.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/Returnable.java index 8faaba844..4f082392a 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/Returnable.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/Returnable.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/Statement.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/Statement.java index 8651cff52..a934d70b4 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/Statement.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/Statement.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/constants/BooleanConstant.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/constants/BooleanConstant.java index 7629beb16..d96f32de7 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/constants/BooleanConstant.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/constants/BooleanConstant.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/constants/ConstantExpression.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/constants/ConstantExpression.java index 668f5ab49..28d2944d6 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/constants/ConstantExpression.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/constants/ConstantExpression.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/constants/NumericConstant.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/constants/NumericConstant.java index e0fe4e352..dee638a48 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/constants/NumericConstant.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/constants/NumericConstant.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/constants/StringConstant.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/constants/StringConstant.java index db45f04b2..09ecd5ff3 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/constants/StringConstant.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/constants/StringConstant.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/functions/Function.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/functions/Function.java index 4a31c0f62..8f1b1848b 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/functions/Function.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/functions/Function.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/functions/FunctionBuilder.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/functions/FunctionBuilder.java index a29b11643..147720dd6 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/functions/FunctionBuilder.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/functions/FunctionBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/flow/BreakKeyword.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/flow/BreakKeyword.java index 6375b0c92..d325ca081 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/flow/BreakKeyword.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/flow/BreakKeyword.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/flow/ContinueKeyword.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/flow/ContinueKeyword.java index 5b774c4bb..a87a64c77 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/flow/ContinueKeyword.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/flow/ContinueKeyword.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/flow/FailKeyword.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/flow/FailKeyword.java index 94a9f43e6..a8f686f49 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/flow/FailKeyword.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/flow/FailKeyword.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/flow/ReturnKeyword.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/flow/ReturnKeyword.java index 01873d4f2..9e797b420 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/flow/ReturnKeyword.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/flow/ReturnKeyword.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/looplike/ForKeyword.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/looplike/ForKeyword.java index 0cf31eac2..6240242d0 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/looplike/ForKeyword.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/looplike/ForKeyword.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/looplike/IfKeyword.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/looplike/IfKeyword.java index f7952b8f2..abe8fb216 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/looplike/IfKeyword.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/looplike/IfKeyword.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/looplike/WhileKeyword.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/looplike/WhileKeyword.java index 1d86c70a0..9d6e2cb78 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/looplike/WhileKeyword.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/looplike/WhileKeyword.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/BinaryOperation.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/BinaryOperation.java index 036473537..6a2c07e53 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/BinaryOperation.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/BinaryOperation.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/BooleanAndOperation.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/BooleanAndOperation.java index e936aa172..c1c1b9b93 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/BooleanAndOperation.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/BooleanAndOperation.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/BooleanNotOperation.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/BooleanNotOperation.java index fedeac9f6..81d903a55 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/BooleanNotOperation.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/BooleanNotOperation.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/BooleanOrOperation.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/BooleanOrOperation.java index 34a55f566..45cc14fe6 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/BooleanOrOperation.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/BooleanOrOperation.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/ConcatenationOperation.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/ConcatenationOperation.java index 3b683733d..a406a7c04 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/ConcatenationOperation.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/ConcatenationOperation.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/DivisionOperation.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/DivisionOperation.java index 7dea11393..d6c688f30 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/DivisionOperation.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/DivisionOperation.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/ModuloOperation.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/ModuloOperation.java index 966726e41..0a9ead0ad 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/ModuloOperation.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/ModuloOperation.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/MultiplicationOperation.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/MultiplicationOperation.java index 25dca639f..700a7696f 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/MultiplicationOperation.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/MultiplicationOperation.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/NegationOperation.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/NegationOperation.java index a56feb2ca..59de8ba33 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/NegationOperation.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/NegationOperation.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/NumberAdditionOperation.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/NumberAdditionOperation.java index 5183bd690..3ada1d252 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/NumberAdditionOperation.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/NumberAdditionOperation.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/SubtractionOperation.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/SubtractionOperation.java index 8b8bf5585..41255450e 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/SubtractionOperation.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/SubtractionOperation.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/UnaryOperation.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/UnaryOperation.java index 316b884d6..0aeef140a 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/UnaryOperation.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/UnaryOperation.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/statements/EqualsStatement.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/statements/EqualsStatement.java index b9b892439..727fb2187 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/statements/EqualsStatement.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/statements/EqualsStatement.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/statements/GreaterOrEqualsThanStatement.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/statements/GreaterOrEqualsThanStatement.java index 4a2b67505..30b17a45a 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/statements/GreaterOrEqualsThanStatement.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/statements/GreaterOrEqualsThanStatement.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/statements/GreaterThanStatement.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/statements/GreaterThanStatement.java index 1119b0adf..b295ffbfb 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/statements/GreaterThanStatement.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/statements/GreaterThanStatement.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/statements/LessThanOrEqualsStatement.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/statements/LessThanOrEqualsStatement.java index 0a72a8da4..08d67ff33 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/statements/LessThanOrEqualsStatement.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/statements/LessThanOrEqualsStatement.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/statements/LessThanStatement.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/statements/LessThanStatement.java index c56366819..5cdc79c07 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/statements/LessThanStatement.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/statements/LessThanStatement.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/statements/NotEqualsStatement.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/statements/NotEqualsStatement.java index fab918c89..9143c8f6a 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/statements/NotEqualsStatement.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/statements/NotEqualsStatement.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/variables/BooleanVariable.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/variables/BooleanVariable.java index 9e4c8aa24..69dde1f7c 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/variables/BooleanVariable.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/variables/BooleanVariable.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/variables/NumberVariable.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/variables/NumberVariable.java index 8d4cfb62b..1bbc1fc56 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/variables/NumberVariable.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/variables/NumberVariable.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/variables/StringVariable.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/variables/StringVariable.java index 564e71ebf..9b33db620 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/variables/StringVariable.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/variables/StringVariable.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/variables/Variable.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/variables/Variable.java index a19122f37..211d08b39 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/variables/Variable.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/variables/Variable.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/variables/assign/VariableAssignmentNode.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/variables/assign/VariableAssignmentNode.java index 634ff152a..8690140ea 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/variables/assign/VariableAssignmentNode.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/variables/assign/VariableAssignmentNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/variables/reference/VariableReferenceNode.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/variables/reference/VariableReferenceNode.java index 598828b34..1cb3043cd 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/variables/reference/VariableReferenceNode.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/variables/reference/VariableReferenceNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/StructureScript.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/StructureScript.java index 45b004a22..8412bd52d 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/StructureScript.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/StructureScript.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/TerraImplementationArguments.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/TerraImplementationArguments.java index 97e69feca..fcc7fc7a9 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/TerraImplementationArguments.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/TerraImplementationArguments.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/BinaryNumberFunctionBuilder.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/BinaryNumberFunctionBuilder.java index 66fdf3555..0658ba54b 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/BinaryNumberFunctionBuilder.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/BinaryNumberFunctionBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/BiomeFunctionBuilder.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/BiomeFunctionBuilder.java index 2b53cfef7..9ab3a0420 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/BiomeFunctionBuilder.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/BiomeFunctionBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/BlockFunctionBuilder.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/BlockFunctionBuilder.java index d0621e206..343a860db 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/BlockFunctionBuilder.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/BlockFunctionBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/CheckBlockFunctionBuilder.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/CheckBlockFunctionBuilder.java index cfef3f572..a87b67e3a 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/CheckBlockFunctionBuilder.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/CheckBlockFunctionBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/EntityFunctionBuilder.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/EntityFunctionBuilder.java index c91f89f11..9e793bc67 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/EntityFunctionBuilder.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/EntityFunctionBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/GetMarkFunctionBuilder.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/GetMarkFunctionBuilder.java index 487548ab5..f01d9c977 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/GetMarkFunctionBuilder.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/GetMarkFunctionBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/LootFunctionBuilder.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/LootFunctionBuilder.java index c26900dd1..5d4d66c99 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/LootFunctionBuilder.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/LootFunctionBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/PullFunctionBuilder.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/PullFunctionBuilder.java index e92174323..d098c3d25 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/PullFunctionBuilder.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/PullFunctionBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/RandomFunctionBuilder.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/RandomFunctionBuilder.java index b83543d9e..6ad67b8f3 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/RandomFunctionBuilder.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/RandomFunctionBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/RecursionsFunctionBuilder.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/RecursionsFunctionBuilder.java index 37827e830..53e345ac3 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/RecursionsFunctionBuilder.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/RecursionsFunctionBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/SetMarkFunctionBuilder.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/SetMarkFunctionBuilder.java index 35bf746c7..a32eeb58e 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/SetMarkFunctionBuilder.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/SetMarkFunctionBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/StateFunctionBuilder.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/StateFunctionBuilder.java index 3ff527e89..eb7aff7da 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/StateFunctionBuilder.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/StateFunctionBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/StructureFunctionBuilder.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/StructureFunctionBuilder.java index 9985c36b4..65415ff1b 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/StructureFunctionBuilder.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/StructureFunctionBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/UnaryBooleanFunctionBuilder.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/UnaryBooleanFunctionBuilder.java index 0be9cd209..b41337071 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/UnaryBooleanFunctionBuilder.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/UnaryBooleanFunctionBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/UnaryNumberFunctionBuilder.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/UnaryNumberFunctionBuilder.java index 888dedf1a..e95d2dd75 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/UnaryNumberFunctionBuilder.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/UnaryNumberFunctionBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/UnaryStringFunctionBuilder.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/UnaryStringFunctionBuilder.java index fd009b249..d597edc98 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/UnaryStringFunctionBuilder.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/UnaryStringFunctionBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/ZeroArgFunctionBuilder.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/ZeroArgFunctionBuilder.java index 55d39bd23..4c4498381 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/ZeroArgFunctionBuilder.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/ZeroArgFunctionBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/BiomeFunction.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/BiomeFunction.java index 21a1d155b..c4ac1c9e4 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/BiomeFunction.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/BiomeFunction.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/BlockFunction.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/BlockFunction.java index 28de64481..b35605fec 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/BlockFunction.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/BlockFunction.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/CheckBlockFunction.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/CheckBlockFunction.java index 8cc0d8864..412cc1312 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/CheckBlockFunction.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/CheckBlockFunction.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/EntityFunction.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/EntityFunction.java index cf703fbe8..f5ff5d981 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/EntityFunction.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/EntityFunction.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/GetMarkFunction.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/GetMarkFunction.java index 613773441..ae6b7ebe3 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/GetMarkFunction.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/GetMarkFunction.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/LootFunction.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/LootFunction.java index 67dd7fad3..eeb4e81f3 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/LootFunction.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/LootFunction.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/PullFunction.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/PullFunction.java index 600cecae0..9e7457cd4 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/PullFunction.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/PullFunction.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/RandomFunction.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/RandomFunction.java index 6b794d776..cd4eaac6a 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/RandomFunction.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/RandomFunction.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/RecursionsFunction.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/RecursionsFunction.java index c19329656..d684bb4d8 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/RecursionsFunction.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/RecursionsFunction.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/SetMarkFunction.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/SetMarkFunction.java index 908164030..4fb42690f 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/SetMarkFunction.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/SetMarkFunction.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/StateFunction.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/StateFunction.java index bed6773a9..cbc2cd6f8 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/StateFunction.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/StateFunction.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/StructureFunction.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/StructureFunction.java index 6eb60e8a3..8cb18a696 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/StructureFunction.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/StructureFunction.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/tokenizer/Char.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/tokenizer/Char.java index 59d949acd..301ddbb72 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/tokenizer/Char.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/tokenizer/Char.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/tokenizer/Lookahead.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/tokenizer/Lookahead.java index e7c3754c8..f5d198f36 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/tokenizer/Lookahead.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/tokenizer/Lookahead.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/tokenizer/Position.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/tokenizer/Position.java index 9edbadc93..a6dfc484b 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/tokenizer/Position.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/tokenizer/Position.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/tokenizer/Token.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/tokenizer/Token.java index b27803fc6..04e2d9310 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/tokenizer/Token.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/tokenizer/Token.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/tokenizer/Tokenizer.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/tokenizer/Tokenizer.java index 1c70a840d..09a1bd21c 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/tokenizer/Tokenizer.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/tokenizer/Tokenizer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/tokenizer/exceptions/EOFException.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/tokenizer/exceptions/EOFException.java index d0855664d..f4fecd33f 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/tokenizer/exceptions/EOFException.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/tokenizer/exceptions/EOFException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/tokenizer/exceptions/FormatException.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/tokenizer/exceptions/FormatException.java index 8154b2d0d..622e3a58e 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/tokenizer/exceptions/FormatException.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/tokenizer/exceptions/FormatException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/tokenizer/exceptions/TokenizerException.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/tokenizer/exceptions/TokenizerException.java index c1ce67d4f..4c273c360 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/tokenizer/exceptions/TokenizerException.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/tokenizer/exceptions/TokenizerException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/test/java/structure/LookaheadTest.java b/common/addons/structure-terrascript-loader/src/test/java/structure/LookaheadTest.java index 037e67f6e..e34513123 100644 --- a/common/addons/structure-terrascript-loader/src/test/java/structure/LookaheadTest.java +++ b/common/addons/structure-terrascript-loader/src/test/java/structure/LookaheadTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/structure-terrascript-loader/src/test/java/structure/ParserTest.java b/common/addons/structure-terrascript-loader/src/test/java/structure/ParserTest.java index f3f1b4995..cbfbfbc9c 100644 --- a/common/addons/structure-terrascript-loader/src/test/java/structure/ParserTest.java +++ b/common/addons/structure-terrascript-loader/src/test/java/structure/ParserTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/terrascript-function-check-noise-3d/src/main/java/com/dfsek/terra/addon/terrascript/check/CheckFunction.java b/common/addons/terrascript-function-check-noise-3d/src/main/java/com/dfsek/terra/addon/terrascript/check/CheckFunction.java index 5cb593a29..7c14bef0a 100644 --- a/common/addons/terrascript-function-check-noise-3d/src/main/java/com/dfsek/terra/addon/terrascript/check/CheckFunction.java +++ b/common/addons/terrascript-function-check-noise-3d/src/main/java/com/dfsek/terra/addon/terrascript/check/CheckFunction.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/addons/terrascript-function-check-noise-3d/src/main/java/com/dfsek/terra/addon/terrascript/check/CheckFunctionBuilder.java b/common/addons/terrascript-function-check-noise-3d/src/main/java/com/dfsek/terra/addon/terrascript/check/CheckFunctionBuilder.java index 84e465b1b..546ef17a4 100644 --- a/common/addons/terrascript-function-check-noise-3d/src/main/java/com/dfsek/terra/addon/terrascript/check/CheckFunctionBuilder.java +++ b/common/addons/terrascript-function-check-noise-3d/src/main/java/com/dfsek/terra/addon/terrascript/check/CheckFunctionBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra Core Addons are licensed under the terms of the MIT License. For more details, * reference the LICENSE file in this module's root directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/Handle.java b/common/api/src/main/java/com/dfsek/terra/api/Handle.java index 2bd59fbb1..c091b507d 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/Handle.java +++ b/common/api/src/main/java/com/dfsek/terra/api/Handle.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/Platform.java b/common/api/src/main/java/com/dfsek/terra/api/Platform.java index 95b00c575..64d92136d 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/Platform.java +++ b/common/api/src/main/java/com/dfsek/terra/api/Platform.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. @@ -81,4 +81,7 @@ public interface Platform extends LoaderRegistrar { @NotNull @Contract(pure = true) Profiler getProfiler(); + + @Contract(pure = true) + int getGenerationThreads(); } diff --git a/common/api/src/main/java/com/dfsek/terra/api/addon/BaseAddon.java b/common/api/src/main/java/com/dfsek/terra/api/addon/BaseAddon.java index ad695d3c5..f0718c4a0 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/addon/BaseAddon.java +++ b/common/api/src/main/java/com/dfsek/terra/api/addon/BaseAddon.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/addon/bootstrap/BootstrapBaseAddon.java b/common/api/src/main/java/com/dfsek/terra/api/addon/bootstrap/BootstrapBaseAddon.java index 03aa177ae..61e5328a0 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/addon/bootstrap/BootstrapBaseAddon.java +++ b/common/api/src/main/java/com/dfsek/terra/api/addon/bootstrap/BootstrapBaseAddon.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/block/BlockType.java b/common/api/src/main/java/com/dfsek/terra/api/block/BlockType.java index 62b117e7b..471fc6f43 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/block/BlockType.java +++ b/common/api/src/main/java/com/dfsek/terra/api/block/BlockType.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/block/entity/BlockEntity.java b/common/api/src/main/java/com/dfsek/terra/api/block/entity/BlockEntity.java index 40489ab84..8061c3961 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/block/entity/BlockEntity.java +++ b/common/api/src/main/java/com/dfsek/terra/api/block/entity/BlockEntity.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/block/entity/Container.java b/common/api/src/main/java/com/dfsek/terra/api/block/entity/Container.java index 5cbcba323..465f52326 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/block/entity/Container.java +++ b/common/api/src/main/java/com/dfsek/terra/api/block/entity/Container.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/block/entity/MobSpawner.java b/common/api/src/main/java/com/dfsek/terra/api/block/entity/MobSpawner.java index 780c391bd..be33ebf83 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/block/entity/MobSpawner.java +++ b/common/api/src/main/java/com/dfsek/terra/api/block/entity/MobSpawner.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/block/entity/SerialState.java b/common/api/src/main/java/com/dfsek/terra/api/block/entity/SerialState.java index 6bd45df22..0c2bb5caf 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/block/entity/SerialState.java +++ b/common/api/src/main/java/com/dfsek/terra/api/block/entity/SerialState.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/block/entity/Sign.java b/common/api/src/main/java/com/dfsek/terra/api/block/entity/Sign.java index adc0bc359..dc15acfe3 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/block/entity/Sign.java +++ b/common/api/src/main/java/com/dfsek/terra/api/block/entity/Sign.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/block/state/BlockState.java b/common/api/src/main/java/com/dfsek/terra/api/block/state/BlockState.java index d62c77d8d..1af5adb6f 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/block/state/BlockState.java +++ b/common/api/src/main/java/com/dfsek/terra/api/block/state/BlockState.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/block/state/properties/Property.java b/common/api/src/main/java/com/dfsek/terra/api/block/state/properties/Property.java index 1a209010c..4863eee69 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/block/state/properties/Property.java +++ b/common/api/src/main/java/com/dfsek/terra/api/block/state/properties/Property.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/block/state/properties/base/BooleanProperty.java b/common/api/src/main/java/com/dfsek/terra/api/block/state/properties/base/BooleanProperty.java index 9044051a0..4216e8b08 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/block/state/properties/base/BooleanProperty.java +++ b/common/api/src/main/java/com/dfsek/terra/api/block/state/properties/base/BooleanProperty.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/block/state/properties/base/EnumProperty.java b/common/api/src/main/java/com/dfsek/terra/api/block/state/properties/base/EnumProperty.java index ca3797fa6..d0362b8c8 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/block/state/properties/base/EnumProperty.java +++ b/common/api/src/main/java/com/dfsek/terra/api/block/state/properties/base/EnumProperty.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/block/state/properties/base/IntProperty.java b/common/api/src/main/java/com/dfsek/terra/api/block/state/properties/base/IntProperty.java index 59cd63017..054f452ef 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/block/state/properties/base/IntProperty.java +++ b/common/api/src/main/java/com/dfsek/terra/api/block/state/properties/base/IntProperty.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/block/state/properties/enums/Axis.java b/common/api/src/main/java/com/dfsek/terra/api/block/state/properties/enums/Axis.java index cddd00f54..07d5e777f 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/block/state/properties/enums/Axis.java +++ b/common/api/src/main/java/com/dfsek/terra/api/block/state/properties/enums/Axis.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/block/state/properties/enums/Direction.java b/common/api/src/main/java/com/dfsek/terra/api/block/state/properties/enums/Direction.java index ea7bf8b8f..4bb0540d4 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/block/state/properties/enums/Direction.java +++ b/common/api/src/main/java/com/dfsek/terra/api/block/state/properties/enums/Direction.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/block/state/properties/enums/Half.java b/common/api/src/main/java/com/dfsek/terra/api/block/state/properties/enums/Half.java index 42b0e7123..94fb4a7e0 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/block/state/properties/enums/Half.java +++ b/common/api/src/main/java/com/dfsek/terra/api/block/state/properties/enums/Half.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/block/state/properties/enums/RailShape.java b/common/api/src/main/java/com/dfsek/terra/api/block/state/properties/enums/RailShape.java index ed3864c69..6ccf4c5ab 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/block/state/properties/enums/RailShape.java +++ b/common/api/src/main/java/com/dfsek/terra/api/block/state/properties/enums/RailShape.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/block/state/properties/enums/RedstoneConnection.java b/common/api/src/main/java/com/dfsek/terra/api/block/state/properties/enums/RedstoneConnection.java index a3f674e17..d506b35f0 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/block/state/properties/enums/RedstoneConnection.java +++ b/common/api/src/main/java/com/dfsek/terra/api/block/state/properties/enums/RedstoneConnection.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/block/state/properties/enums/WallHeight.java b/common/api/src/main/java/com/dfsek/terra/api/block/state/properties/enums/WallHeight.java index 956ea2082..a866a39c7 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/block/state/properties/enums/WallHeight.java +++ b/common/api/src/main/java/com/dfsek/terra/api/block/state/properties/enums/WallHeight.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/command/CommandSender.java b/common/api/src/main/java/com/dfsek/terra/api/command/CommandSender.java index b58da77f2..021cb7a26 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/command/CommandSender.java +++ b/common/api/src/main/java/com/dfsek/terra/api/command/CommandSender.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/config/AbstractableTemplate.java b/common/api/src/main/java/com/dfsek/terra/api/config/AbstractableTemplate.java index 5910b1f25..a7481610e 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/config/AbstractableTemplate.java +++ b/common/api/src/main/java/com/dfsek/terra/api/config/AbstractableTemplate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/config/ConfigFactory.java b/common/api/src/main/java/com/dfsek/terra/api/config/ConfigFactory.java index a8c94eca8..2ecd87227 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/config/ConfigFactory.java +++ b/common/api/src/main/java/com/dfsek/terra/api/config/ConfigFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/config/ConfigPack.java b/common/api/src/main/java/com/dfsek/terra/api/config/ConfigPack.java index 8e0214ff0..b3edb2c9c 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/config/ConfigPack.java +++ b/common/api/src/main/java/com/dfsek/terra/api/config/ConfigPack.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/config/ConfigType.java b/common/api/src/main/java/com/dfsek/terra/api/config/ConfigType.java index c577f533b..bf5a66e3a 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/config/ConfigType.java +++ b/common/api/src/main/java/com/dfsek/terra/api/config/ConfigType.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/config/Loader.java b/common/api/src/main/java/com/dfsek/terra/api/config/Loader.java index 5b12e43c2..633067796 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/config/Loader.java +++ b/common/api/src/main/java/com/dfsek/terra/api/config/Loader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/config/PluginConfig.java b/common/api/src/main/java/com/dfsek/terra/api/config/PluginConfig.java index 7946d0ec9..c09ad141d 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/config/PluginConfig.java +++ b/common/api/src/main/java/com/dfsek/terra/api/config/PluginConfig.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/config/meta/Meta.java b/common/api/src/main/java/com/dfsek/terra/api/config/meta/Meta.java index 4df20e7d8..c635d68be 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/config/meta/Meta.java +++ b/common/api/src/main/java/com/dfsek/terra/api/config/meta/Meta.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. 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 aaa53ce4e..41823f3eb 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,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/entity/EntityType.java b/common/api/src/main/java/com/dfsek/terra/api/entity/EntityType.java index c0bcfbedc..53cd6bbcb 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/entity/EntityType.java +++ b/common/api/src/main/java/com/dfsek/terra/api/entity/EntityType.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/entity/Player.java b/common/api/src/main/java/com/dfsek/terra/api/entity/Player.java index f71c38aa6..ea7a86bb8 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/entity/Player.java +++ b/common/api/src/main/java/com/dfsek/terra/api/entity/Player.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/event/EventHandler.java b/common/api/src/main/java/com/dfsek/terra/api/event/EventHandler.java index 011f27614..fba181c7a 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/event/EventHandler.java +++ b/common/api/src/main/java/com/dfsek/terra/api/event/EventHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/event/EventManager.java b/common/api/src/main/java/com/dfsek/terra/api/event/EventManager.java index c705e4beb..cc035829f 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/event/EventManager.java +++ b/common/api/src/main/java/com/dfsek/terra/api/event/EventManager.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/event/events/AbstractCancellable.java b/common/api/src/main/java/com/dfsek/terra/api/event/events/AbstractCancellable.java index f13858638..f7d9f5715 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/event/events/AbstractCancellable.java +++ b/common/api/src/main/java/com/dfsek/terra/api/event/events/AbstractCancellable.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/event/events/Cancellable.java b/common/api/src/main/java/com/dfsek/terra/api/event/events/Cancellable.java index e3967a598..810420dff 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/event/events/Cancellable.java +++ b/common/api/src/main/java/com/dfsek/terra/api/event/events/Cancellable.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/event/events/Event.java b/common/api/src/main/java/com/dfsek/terra/api/event/events/Event.java index 145957333..8c1c0c60f 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/event/events/Event.java +++ b/common/api/src/main/java/com/dfsek/terra/api/event/events/Event.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/event/events/FailThroughEvent.java b/common/api/src/main/java/com/dfsek/terra/api/event/events/FailThroughEvent.java index 3cd44267b..e54443ae8 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/event/events/FailThroughEvent.java +++ b/common/api/src/main/java/com/dfsek/terra/api/event/events/FailThroughEvent.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/event/events/PackEvent.java b/common/api/src/main/java/com/dfsek/terra/api/event/events/PackEvent.java index cc621fb57..b1d0b82e1 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/event/events/PackEvent.java +++ b/common/api/src/main/java/com/dfsek/terra/api/event/events/PackEvent.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/event/events/config/ConfigurationLoadEvent.java b/common/api/src/main/java/com/dfsek/terra/api/event/events/config/ConfigurationLoadEvent.java index ba832dff9..d2b1994bf 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/event/events/config/ConfigurationLoadEvent.java +++ b/common/api/src/main/java/com/dfsek/terra/api/event/events/config/ConfigurationLoadEvent.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/event/events/config/pack/ConfigPackLoadEvent.java b/common/api/src/main/java/com/dfsek/terra/api/event/events/config/pack/ConfigPackLoadEvent.java index f18e32109..05eb41910 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/event/events/config/pack/ConfigPackLoadEvent.java +++ b/common/api/src/main/java/com/dfsek/terra/api/event/events/config/pack/ConfigPackLoadEvent.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/event/events/config/pack/ConfigPackPostLoadEvent.java b/common/api/src/main/java/com/dfsek/terra/api/event/events/config/pack/ConfigPackPostLoadEvent.java index b565d3c7d..72ca85d94 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/event/events/config/pack/ConfigPackPostLoadEvent.java +++ b/common/api/src/main/java/com/dfsek/terra/api/event/events/config/pack/ConfigPackPostLoadEvent.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/event/events/config/pack/ConfigPackPreLoadEvent.java b/common/api/src/main/java/com/dfsek/terra/api/event/events/config/pack/ConfigPackPreLoadEvent.java index 96816ee4f..578e7dd48 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/event/events/config/pack/ConfigPackPreLoadEvent.java +++ b/common/api/src/main/java/com/dfsek/terra/api/event/events/config/pack/ConfigPackPreLoadEvent.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/event/events/config/type/ConfigTypeLoadEvent.java b/common/api/src/main/java/com/dfsek/terra/api/event/events/config/type/ConfigTypeLoadEvent.java index 517460a7c..44f14dd83 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/event/events/config/type/ConfigTypeLoadEvent.java +++ b/common/api/src/main/java/com/dfsek/terra/api/event/events/config/type/ConfigTypeLoadEvent.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/event/events/config/type/ConfigTypePostLoadEvent.java b/common/api/src/main/java/com/dfsek/terra/api/event/events/config/type/ConfigTypePostLoadEvent.java index 358e0ea3a..5b674acc9 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/event/events/config/type/ConfigTypePostLoadEvent.java +++ b/common/api/src/main/java/com/dfsek/terra/api/event/events/config/type/ConfigTypePostLoadEvent.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/event/events/config/type/ConfigTypePreLoadEvent.java b/common/api/src/main/java/com/dfsek/terra/api/event/events/config/type/ConfigTypePreLoadEvent.java index 0028b0f04..d43672fa3 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/event/events/config/type/ConfigTypePreLoadEvent.java +++ b/common/api/src/main/java/com/dfsek/terra/api/event/events/config/type/ConfigTypePreLoadEvent.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/event/events/platform/PlatformInitializationEvent.java b/common/api/src/main/java/com/dfsek/terra/api/event/events/platform/PlatformInitializationEvent.java index 39b7c6546..cf6440820 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/event/events/platform/PlatformInitializationEvent.java +++ b/common/api/src/main/java/com/dfsek/terra/api/event/events/platform/PlatformInitializationEvent.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. 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 bebbfa21e..660f581ab 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,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. 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 b03f897af..a037e2da3 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,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/event/functional/EventContext.java b/common/api/src/main/java/com/dfsek/terra/api/event/functional/EventContext.java index c09396059..bcab94086 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/event/functional/EventContext.java +++ b/common/api/src/main/java/com/dfsek/terra/api/event/functional/EventContext.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/event/functional/FunctionalEventHandler.java b/common/api/src/main/java/com/dfsek/terra/api/event/functional/FunctionalEventHandler.java index a4af619de..d7dcade9d 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/event/functional/FunctionalEventHandler.java +++ b/common/api/src/main/java/com/dfsek/terra/api/event/functional/FunctionalEventHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/handle/ItemHandle.java b/common/api/src/main/java/com/dfsek/terra/api/handle/ItemHandle.java index 83295c5fd..b4a58dc18 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/handle/ItemHandle.java +++ b/common/api/src/main/java/com/dfsek/terra/api/handle/ItemHandle.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/handle/WorldHandle.java b/common/api/src/main/java/com/dfsek/terra/api/handle/WorldHandle.java index be1bb893a..8bc5d8b97 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/handle/WorldHandle.java +++ b/common/api/src/main/java/com/dfsek/terra/api/handle/WorldHandle.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/inject/Injector.java b/common/api/src/main/java/com/dfsek/terra/api/inject/Injector.java index 87eec5263..93a4c6836 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/inject/Injector.java +++ b/common/api/src/main/java/com/dfsek/terra/api/inject/Injector.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/inject/annotations/Inject.java b/common/api/src/main/java/com/dfsek/terra/api/inject/annotations/Inject.java index 78b0e746d..2ff80ea43 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/inject/annotations/Inject.java +++ b/common/api/src/main/java/com/dfsek/terra/api/inject/annotations/Inject.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/inject/exception/InjectionException.java b/common/api/src/main/java/com/dfsek/terra/api/inject/exception/InjectionException.java index a395d5369..d3bf10be8 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/inject/exception/InjectionException.java +++ b/common/api/src/main/java/com/dfsek/terra/api/inject/exception/InjectionException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/inject/impl/InjectorImpl.java b/common/api/src/main/java/com/dfsek/terra/api/inject/impl/InjectorImpl.java index f0e870e07..5edbca4f5 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/inject/impl/InjectorImpl.java +++ b/common/api/src/main/java/com/dfsek/terra/api/inject/impl/InjectorImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/inventory/BlockInventoryHolder.java b/common/api/src/main/java/com/dfsek/terra/api/inventory/BlockInventoryHolder.java index 3e961e42a..ed9927f53 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/inventory/BlockInventoryHolder.java +++ b/common/api/src/main/java/com/dfsek/terra/api/inventory/BlockInventoryHolder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/inventory/Inventory.java b/common/api/src/main/java/com/dfsek/terra/api/inventory/Inventory.java index 0b6c3ab1c..eb3f31896 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/inventory/Inventory.java +++ b/common/api/src/main/java/com/dfsek/terra/api/inventory/Inventory.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/inventory/InventoryHolder.java b/common/api/src/main/java/com/dfsek/terra/api/inventory/InventoryHolder.java index 304e448c9..b7dfae4b9 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/inventory/InventoryHolder.java +++ b/common/api/src/main/java/com/dfsek/terra/api/inventory/InventoryHolder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/inventory/Item.java b/common/api/src/main/java/com/dfsek/terra/api/inventory/Item.java index bc9a92b6c..fc9f107a0 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/inventory/Item.java +++ b/common/api/src/main/java/com/dfsek/terra/api/inventory/Item.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/inventory/ItemStack.java b/common/api/src/main/java/com/dfsek/terra/api/inventory/ItemStack.java index 070efaf73..d3ca47e29 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/inventory/ItemStack.java +++ b/common/api/src/main/java/com/dfsek/terra/api/inventory/ItemStack.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/inventory/item/Damageable.java b/common/api/src/main/java/com/dfsek/terra/api/inventory/item/Damageable.java index 121c3652c..7ca006518 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/inventory/item/Damageable.java +++ b/common/api/src/main/java/com/dfsek/terra/api/inventory/item/Damageable.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/inventory/item/Enchantment.java b/common/api/src/main/java/com/dfsek/terra/api/inventory/item/Enchantment.java index a8c7e07b3..582d567e8 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/inventory/item/Enchantment.java +++ b/common/api/src/main/java/com/dfsek/terra/api/inventory/item/Enchantment.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/inventory/item/ItemMeta.java b/common/api/src/main/java/com/dfsek/terra/api/inventory/item/ItemMeta.java index b2bc68ca9..626d7eac1 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/inventory/item/ItemMeta.java +++ b/common/api/src/main/java/com/dfsek/terra/api/inventory/item/ItemMeta.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/noise/NoiseSampler.java b/common/api/src/main/java/com/dfsek/terra/api/noise/NoiseSampler.java index 06021126e..38676c846 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/noise/NoiseSampler.java +++ b/common/api/src/main/java/com/dfsek/terra/api/noise/NoiseSampler.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/profiler/Profiler.java b/common/api/src/main/java/com/dfsek/terra/api/profiler/Profiler.java index 0e8122891..d5ddc8d57 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/profiler/Profiler.java +++ b/common/api/src/main/java/com/dfsek/terra/api/profiler/Profiler.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/profiler/Timings.java b/common/api/src/main/java/com/dfsek/terra/api/profiler/Timings.java index 6beae577d..12b7659f8 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/profiler/Timings.java +++ b/common/api/src/main/java/com/dfsek/terra/api/profiler/Timings.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/properties/Context.java b/common/api/src/main/java/com/dfsek/terra/api/properties/Context.java index 45e5ea07e..9d894d4b8 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/properties/Context.java +++ b/common/api/src/main/java/com/dfsek/terra/api/properties/Context.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/properties/Properties.java b/common/api/src/main/java/com/dfsek/terra/api/properties/Properties.java index 32e95ac9d..445258912 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/properties/Properties.java +++ b/common/api/src/main/java/com/dfsek/terra/api/properties/Properties.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/properties/PropertyHolder.java b/common/api/src/main/java/com/dfsek/terra/api/properties/PropertyHolder.java index 0e8fbdf5d..5d52a345d 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/properties/PropertyHolder.java +++ b/common/api/src/main/java/com/dfsek/terra/api/properties/PropertyHolder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/properties/annotations/Linked.java b/common/api/src/main/java/com/dfsek/terra/api/properties/annotations/Linked.java index 1845ec5b3..56b07d2a0 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/properties/annotations/Linked.java +++ b/common/api/src/main/java/com/dfsek/terra/api/properties/annotations/Linked.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/registry/CheckedRegistry.java b/common/api/src/main/java/com/dfsek/terra/api/registry/CheckedRegistry.java index 20535a293..e9db724e1 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/registry/CheckedRegistry.java +++ b/common/api/src/main/java/com/dfsek/terra/api/registry/CheckedRegistry.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/registry/OpenRegistry.java b/common/api/src/main/java/com/dfsek/terra/api/registry/OpenRegistry.java index ababb389d..67473a9cc 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/registry/OpenRegistry.java +++ b/common/api/src/main/java/com/dfsek/terra/api/registry/OpenRegistry.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/registry/Registry.java b/common/api/src/main/java/com/dfsek/terra/api/registry/Registry.java index 33995a9f5..96a9012dd 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/registry/Registry.java +++ b/common/api/src/main/java/com/dfsek/terra/api/registry/Registry.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/registry/exception/DuplicateEntryException.java b/common/api/src/main/java/com/dfsek/terra/api/registry/exception/DuplicateEntryException.java index 82afcda98..d3a38b8aa 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/registry/exception/DuplicateEntryException.java +++ b/common/api/src/main/java/com/dfsek/terra/api/registry/exception/DuplicateEntryException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/registry/key/StringIdentifiable.java b/common/api/src/main/java/com/dfsek/terra/api/registry/key/StringIdentifiable.java index 70ccfb6d5..d056ae449 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/registry/key/StringIdentifiable.java +++ b/common/api/src/main/java/com/dfsek/terra/api/registry/key/StringIdentifiable.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/registry/meta/RegistryHolder.java b/common/api/src/main/java/com/dfsek/terra/api/registry/meta/RegistryHolder.java index b7a8b1530..f61735e12 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/registry/meta/RegistryHolder.java +++ b/common/api/src/main/java/com/dfsek/terra/api/registry/meta/RegistryHolder.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/structure/LootTable.java b/common/api/src/main/java/com/dfsek/terra/api/structure/LootTable.java index 3108dd1f3..f244775d1 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/structure/LootTable.java +++ b/common/api/src/main/java/com/dfsek/terra/api/structure/LootTable.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/structure/Structure.java b/common/api/src/main/java/com/dfsek/terra/api/structure/Structure.java index d5f3ca7e2..5f69c8338 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/structure/Structure.java +++ b/common/api/src/main/java/com/dfsek/terra/api/structure/Structure.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/structure/StructureSpawn.java b/common/api/src/main/java/com/dfsek/terra/api/structure/StructureSpawn.java index 09c4f785d..e85b92bd4 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/structure/StructureSpawn.java +++ b/common/api/src/main/java/com/dfsek/terra/api/structure/StructureSpawn.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/structure/configured/ConfiguredStructure.java b/common/api/src/main/java/com/dfsek/terra/api/structure/configured/ConfiguredStructure.java index 37a03996f..f44ad1f7b 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/structure/configured/ConfiguredStructure.java +++ b/common/api/src/main/java/com/dfsek/terra/api/structure/configured/ConfiguredStructure.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/structure/feature/BinaryColumn.java b/common/api/src/main/java/com/dfsek/terra/api/structure/feature/BinaryColumn.java index 9a4baab54..b4710170f 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/structure/feature/BinaryColumn.java +++ b/common/api/src/main/java/com/dfsek/terra/api/structure/feature/BinaryColumn.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/structure/feature/Distributor.java b/common/api/src/main/java/com/dfsek/terra/api/structure/feature/Distributor.java index 7f2ec0a1b..409adb37a 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/structure/feature/Distributor.java +++ b/common/api/src/main/java/com/dfsek/terra/api/structure/feature/Distributor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/structure/feature/Feature.java b/common/api/src/main/java/com/dfsek/terra/api/structure/feature/Feature.java index 5ce08b3dd..ced3faf04 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/structure/feature/Feature.java +++ b/common/api/src/main/java/com/dfsek/terra/api/structure/feature/Feature.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/structure/feature/Locator.java b/common/api/src/main/java/com/dfsek/terra/api/structure/feature/Locator.java index ac0f4be3d..58dc70f67 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/structure/feature/Locator.java +++ b/common/api/src/main/java/com/dfsek/terra/api/structure/feature/Locator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/tectonic/ConfigLoadingDelegate.java b/common/api/src/main/java/com/dfsek/terra/api/tectonic/ConfigLoadingDelegate.java index ce05d5ae1..b4a0bdaa2 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/tectonic/ConfigLoadingDelegate.java +++ b/common/api/src/main/java/com/dfsek/terra/api/tectonic/ConfigLoadingDelegate.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/tectonic/LoaderRegistrar.java b/common/api/src/main/java/com/dfsek/terra/api/tectonic/LoaderRegistrar.java index ec70d4077..b766cc4fc 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/tectonic/LoaderRegistrar.java +++ b/common/api/src/main/java/com/dfsek/terra/api/tectonic/LoaderRegistrar.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/transform/Transform.java b/common/api/src/main/java/com/dfsek/terra/api/transform/Transform.java index fe7741070..87a3d78a9 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/transform/Transform.java +++ b/common/api/src/main/java/com/dfsek/terra/api/transform/Transform.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/transform/Transformer.java b/common/api/src/main/java/com/dfsek/terra/api/transform/Transformer.java index eb1427aee..feaa9dd71 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/transform/Transformer.java +++ b/common/api/src/main/java/com/dfsek/terra/api/transform/Transformer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/transform/Validator.java b/common/api/src/main/java/com/dfsek/terra/api/transform/Validator.java index 430f3df3b..43a203ff4 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/transform/Validator.java +++ b/common/api/src/main/java/com/dfsek/terra/api/transform/Validator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/transform/exception/AttemptsFailedException.java b/common/api/src/main/java/com/dfsek/terra/api/transform/exception/AttemptsFailedException.java index 694df9fb5..d101e1f49 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/transform/exception/AttemptsFailedException.java +++ b/common/api/src/main/java/com/dfsek/terra/api/transform/exception/AttemptsFailedException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/transform/exception/TransformException.java b/common/api/src/main/java/com/dfsek/terra/api/transform/exception/TransformException.java index d0625a226..218b18dc4 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/transform/exception/TransformException.java +++ b/common/api/src/main/java/com/dfsek/terra/api/transform/exception/TransformException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/util/ConstantRange.java b/common/api/src/main/java/com/dfsek/terra/api/util/ConstantRange.java index 68b062d21..aecf51ed2 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/util/ConstantRange.java +++ b/common/api/src/main/java/com/dfsek/terra/api/util/ConstantRange.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. 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 e57765f2e..c5c9d814d 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 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/util/PopulationUtil.java b/common/api/src/main/java/com/dfsek/terra/api/util/PopulationUtil.java index f3ea39f10..5db33c83c 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/util/PopulationUtil.java +++ b/common/api/src/main/java/com/dfsek/terra/api/util/PopulationUtil.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/util/Range.java b/common/api/src/main/java/com/dfsek/terra/api/util/Range.java index f42bc174d..f5a0670a1 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/util/Range.java +++ b/common/api/src/main/java/com/dfsek/terra/api/util/Range.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/util/Rotation.java b/common/api/src/main/java/com/dfsek/terra/api/util/Rotation.java index 6f0a17c71..135ca57bd 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/util/Rotation.java +++ b/common/api/src/main/java/com/dfsek/terra/api/util/Rotation.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/util/RotationUtil.java b/common/api/src/main/java/com/dfsek/terra/api/util/RotationUtil.java index 96c968650..64d50a8d9 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/util/RotationUtil.java +++ b/common/api/src/main/java/com/dfsek/terra/api/util/RotationUtil.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/util/StringUtil.java b/common/api/src/main/java/com/dfsek/terra/api/util/StringUtil.java index d48753fb2..22b934e18 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/util/StringUtil.java +++ b/common/api/src/main/java/com/dfsek/terra/api/util/StringUtil.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/util/cache/CacheUtils.java b/common/api/src/main/java/com/dfsek/terra/api/util/cache/CacheUtils.java new file mode 100644 index 000000000..9c5e7766b --- /dev/null +++ b/common/api/src/main/java/com/dfsek/terra/api/util/cache/CacheUtils.java @@ -0,0 +1,9 @@ +package com.dfsek.terra.api.util.cache; + +import java.util.concurrent.Executor; +import java.util.concurrent.Executors; + + +public class CacheUtils { + public static final Executor CACHE_EXECUTOR = Executors.newSingleThreadExecutor(); +} diff --git a/common/api/src/main/java/com/dfsek/terra/api/util/cache/DoubleSeededVector2Key.java b/common/api/src/main/java/com/dfsek/terra/api/util/cache/DoubleSeededVector2Key.java new file mode 100644 index 000000000..16845f7bc --- /dev/null +++ b/common/api/src/main/java/com/dfsek/terra/api/util/cache/DoubleSeededVector2Key.java @@ -0,0 +1,35 @@ +package com.dfsek.terra.api.util.cache; + +public class DoubleSeededVector2Key { + + public double x; + public double z; + public long seed; + + public DoubleSeededVector2Key(double x, double z, long seed) { + this.x = x; + this.z = z; + this.seed = seed; + } + + public void set(double x, double z, long seed) { + this.x = x; + this.z = z; + this.seed = seed; + } + + @Override + public boolean equals(Object obj) { + if(obj instanceof DoubleSeededVector2Key that) { + return this.z == that.z && this.x == that.x && this.seed == that.seed; + } + return false; + } + + @Override + public int hashCode() { + int code = (int) Double.doubleToLongBits(x); + code = 31 * code + (int) Double.doubleToLongBits(z); + return 31 * code + (Long.hashCode(seed)); + } +} \ No newline at end of file diff --git a/common/api/src/main/java/com/dfsek/terra/api/util/cache/DoubleSeededVector3Key.java b/common/api/src/main/java/com/dfsek/terra/api/util/cache/DoubleSeededVector3Key.java new file mode 100644 index 000000000..dff9e5929 --- /dev/null +++ b/common/api/src/main/java/com/dfsek/terra/api/util/cache/DoubleSeededVector3Key.java @@ -0,0 +1,38 @@ +package com.dfsek.terra.api.util.cache; + +public class DoubleSeededVector3Key { + public double x; + public double y; + public double z; + public long seed; + + public DoubleSeededVector3Key(double x, double y, double z, long seed) { + this.x = x; + this.y = y; + this.z = z; + this.seed = seed; + } + + public void set(double x, double y, double z, long seed) { + this.x = x; + this.y = y; + this.z = z; + this.seed = seed; + } + + @Override + public boolean equals(Object obj) { + if(obj instanceof DoubleSeededVector3Key that) { + return this.y == that.y && this.z == that.z && this.x == that.x && this.seed == that.seed; + } + return false; + } + + @Override + public int hashCode() { + int code = (int) Double.doubleToLongBits(x); + code = 31 * code + (int) Double.doubleToLongBits(y); + code = 31 * code + (int) Double.doubleToLongBits(z); + return 31 * code + (Long.hashCode(seed)); + } +} \ No newline at end of file diff --git a/common/api/src/main/java/com/dfsek/terra/api/util/cache/SeededVector2Key.java b/common/api/src/main/java/com/dfsek/terra/api/util/cache/SeededVector2Key.java new file mode 100644 index 000000000..2023867a6 --- /dev/null +++ b/common/api/src/main/java/com/dfsek/terra/api/util/cache/SeededVector2Key.java @@ -0,0 +1,37 @@ +package com.dfsek.terra.api.util.cache; + + + + +public class SeededVector2Key { + public int x; + public int z; + public long seed; + + public SeededVector2Key(int x, int z, long seed) { + this.x = x; + this.z = z; + this.seed = seed; + } + + public void set(int x, int z, long seed) { + this.x = x; + this.z = z; + this.seed = seed; + } + + @Override + public boolean equals(Object obj) { + if(obj instanceof SeededVector2Key that) { + return this.z == that.z && this.x == that.x && this.seed == that.seed; + } + return false; + } + + @Override + public int hashCode() { + int code = x; + code = 31 * code + z; + return 31 * code + (Long.hashCode(seed)); + } + } diff --git a/common/api/src/main/java/com/dfsek/terra/api/util/cache/SeededVector3Key.java b/common/api/src/main/java/com/dfsek/terra/api/util/cache/SeededVector3Key.java new file mode 100644 index 000000000..90af87b32 --- /dev/null +++ b/common/api/src/main/java/com/dfsek/terra/api/util/cache/SeededVector3Key.java @@ -0,0 +1,40 @@ +package com.dfsek.terra.api.util.cache; + + + +public class SeededVector3Key { + public int x; + public int y; + public int z; + public long seed; + + public SeededVector3Key(int x, int y, int z, long seed) { + this.x = x; + this.y = y; + this.z = z; + this.seed = seed; + } + + public void set(int x, int y, int z, long seed) { + this.x = x; + this.y = y; + this.z = z; + this.seed = seed; + } + + @Override + public boolean equals(Object obj) { + if(obj instanceof SeededVector3Key that) { + return this.y == that.y && this.z == that.z && this.x == that.x && this.seed == that.seed; + } + return false; + } + + @Override + public int hashCode() { + int code = x; + code = 31 * code + y; + code = 31 * code + z; + return 31 * code + (Long.hashCode(seed)); + } +} \ No newline at end of file diff --git a/common/api/src/main/java/com/dfsek/terra/api/util/collection/MaterialSet.java b/common/api/src/main/java/com/dfsek/terra/api/util/collection/MaterialSet.java index a0c28b1e1..6dc868142 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/util/collection/MaterialSet.java +++ b/common/api/src/main/java/com/dfsek/terra/api/util/collection/MaterialSet.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/util/collection/ProbabilityCollection.java b/common/api/src/main/java/com/dfsek/terra/api/util/collection/ProbabilityCollection.java index 4aad8b7e1..dbf367d79 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/util/collection/ProbabilityCollection.java +++ b/common/api/src/main/java/com/dfsek/terra/api/util/collection/ProbabilityCollection.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/util/generic/Construct.java b/common/api/src/main/java/com/dfsek/terra/api/util/generic/Construct.java index 88ee6a751..3b5d17753 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/util/generic/Construct.java +++ b/common/api/src/main/java/com/dfsek/terra/api/util/generic/Construct.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/util/generic/Lazy.java b/common/api/src/main/java/com/dfsek/terra/api/util/generic/Lazy.java index 7a1a11831..da06ea98a 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/util/generic/Lazy.java +++ b/common/api/src/main/java/com/dfsek/terra/api/util/generic/Lazy.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/util/generic/either/Either.java b/common/api/src/main/java/com/dfsek/terra/api/util/generic/either/Either.java index b60a09ef4..e7409872f 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/util/generic/either/Either.java +++ b/common/api/src/main/java/com/dfsek/terra/api/util/generic/either/Either.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/util/generic/pair/Pair.java b/common/api/src/main/java/com/dfsek/terra/api/util/generic/pair/Pair.java index 424d8bea0..3ae239117 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/util/generic/pair/Pair.java +++ b/common/api/src/main/java/com/dfsek/terra/api/util/generic/pair/Pair.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/util/mutable/MutableBoolean.java b/common/api/src/main/java/com/dfsek/terra/api/util/mutable/MutableBoolean.java index 6dfef1ca5..a4385a826 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/util/mutable/MutableBoolean.java +++ b/common/api/src/main/java/com/dfsek/terra/api/util/mutable/MutableBoolean.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/util/mutable/MutableDouble.java b/common/api/src/main/java/com/dfsek/terra/api/util/mutable/MutableDouble.java index 91c21a9af..3cd751770 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/util/mutable/MutableDouble.java +++ b/common/api/src/main/java/com/dfsek/terra/api/util/mutable/MutableDouble.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/util/mutable/MutableInteger.java b/common/api/src/main/java/com/dfsek/terra/api/util/mutable/MutableInteger.java index e66bcff43..126406697 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/util/mutable/MutableInteger.java +++ b/common/api/src/main/java/com/dfsek/terra/api/util/mutable/MutableInteger.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/util/mutable/MutableNumber.java b/common/api/src/main/java/com/dfsek/terra/api/util/mutable/MutableNumber.java index 8ba43fac8..ef48a935e 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/util/mutable/MutableNumber.java +++ b/common/api/src/main/java/com/dfsek/terra/api/util/mutable/MutableNumber.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. 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 f4c9fd65f..096dba054 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,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/util/mutable/package-info.java b/common/api/src/main/java/com/dfsek/terra/api/util/mutable/package-info.java index fb53df1a7..703c736f5 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/util/mutable/package-info.java +++ b/common/api/src/main/java/com/dfsek/terra/api/util/mutable/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/util/reflection/ReflectionUtil.java b/common/api/src/main/java/com/dfsek/terra/api/util/reflection/ReflectionUtil.java index 2583b9ab6..0dd90b292 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/util/reflection/ReflectionUtil.java +++ b/common/api/src/main/java/com/dfsek/terra/api/util/reflection/ReflectionUtil.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/util/reflection/TypeKey.java b/common/api/src/main/java/com/dfsek/terra/api/util/reflection/TypeKey.java index b5ae20265..a2cdc27c1 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/util/reflection/TypeKey.java +++ b/common/api/src/main/java/com/dfsek/terra/api/util/reflection/TypeKey.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/util/vector/Vector2.java b/common/api/src/main/java/com/dfsek/terra/api/util/vector/Vector2.java index 021e98122..c2b3a87fb 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/util/vector/Vector2.java +++ b/common/api/src/main/java/com/dfsek/terra/api/util/vector/Vector2.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/util/vector/Vector3.java b/common/api/src/main/java/com/dfsek/terra/api/util/vector/Vector3.java index d6d74c68a..8f6007e80 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/util/vector/Vector3.java +++ b/common/api/src/main/java/com/dfsek/terra/api/util/vector/Vector3.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/world/ServerWorld.java b/common/api/src/main/java/com/dfsek/terra/api/world/ServerWorld.java index be30a3f33..8c54302d4 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/world/ServerWorld.java +++ b/common/api/src/main/java/com/dfsek/terra/api/world/ServerWorld.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/world/biome/Biome.java b/common/api/src/main/java/com/dfsek/terra/api/world/biome/Biome.java index af52720a4..292c9937a 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/world/biome/Biome.java +++ b/common/api/src/main/java/com/dfsek/terra/api/world/biome/Biome.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/world/biome/PaletteSettings.java b/common/api/src/main/java/com/dfsek/terra/api/world/biome/PaletteSettings.java index 45a5c1a10..1c33fb223 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/world/biome/PaletteSettings.java +++ b/common/api/src/main/java/com/dfsek/terra/api/world/biome/PaletteSettings.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/world/biome/PlatformBiome.java b/common/api/src/main/java/com/dfsek/terra/api/world/biome/PlatformBiome.java index d749b4089..e1cec39cd 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/world/biome/PlatformBiome.java +++ b/common/api/src/main/java/com/dfsek/terra/api/world/biome/PlatformBiome.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/world/biome/generation/BiomeProvider.java b/common/api/src/main/java/com/dfsek/terra/api/world/biome/generation/BiomeProvider.java index d049cd43b..83b8723d3 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/world/biome/generation/BiomeProvider.java +++ b/common/api/src/main/java/com/dfsek/terra/api/world/biome/generation/BiomeProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. @@ -7,6 +7,8 @@ package com.dfsek.terra.api.world.biome.generation; +import com.dfsek.terra.api.Platform; + import org.jetbrains.annotations.Contract; import java.util.Optional; @@ -91,7 +93,7 @@ public interface BiomeProvider { return StreamSupport.stream(getBiomes().spliterator(), false); } - default CachingBiomeProvider caching() { + default CachingBiomeProvider caching(Platform platform) { if(this instanceof CachingBiomeProvider cachingBiomeProvider) { return cachingBiomeProvider; } diff --git a/common/api/src/main/java/com/dfsek/terra/api/world/biome/generation/CachingBiomeProvider.java b/common/api/src/main/java/com/dfsek/terra/api/world/biome/generation/CachingBiomeProvider.java index a07e9efd9..3e42ff1d1 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/world/biome/generation/CachingBiomeProvider.java +++ b/common/api/src/main/java/com/dfsek/terra/api/world/biome/generation/CachingBiomeProvider.java @@ -1,5 +1,11 @@ package com.dfsek.terra.api.world.biome.generation; +import com.dfsek.terra.api.util.cache.SeededVector2Key; +import com.dfsek.terra.api.util.cache.SeededVector3Key; +import com.dfsek.terra.api.util.generic.pair.Pair; + +import com.dfsek.terra.api.util.generic.pair.Pair.Mutable; + import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.LoadingCache; import com.github.benmanes.caffeine.cache.Scheduler; @@ -9,6 +15,8 @@ import java.util.Optional; import com.dfsek.terra.api.Handle; import com.dfsek.terra.api.world.biome.Biome; +import static com.dfsek.terra.api.util.cache.CacheUtils.CACHE_EXECUTOR; + /** * A biome provider implementation that lazily evaluates biomes, and caches them. @@ -18,24 +26,47 @@ import com.dfsek.terra.api.world.biome.Biome; public class CachingBiomeProvider implements BiomeProvider, Handle { protected final BiomeProvider delegate; private final int res; - private final LoadingCache cache; - private final LoadingCache> baseCache; + private final ThreadLocal>> cache; + private final ThreadLocal>>> baseCache; protected CachingBiomeProvider(BiomeProvider delegate) { this.delegate = delegate; this.res = delegate.resolution(); - this.cache = Caffeine - .newBuilder() - .scheduler(Scheduler.disabledScheduler()) - .initialCapacity(98304) - .maximumSize(98304) // 1 full chunk (high res) - .build(vec -> delegate.getBiome(vec.x * res, vec.y * res, vec.z * res, vec.seed)); - this.baseCache = Caffeine - .newBuilder() - .maximumSize(256) // 1 full chunk (high res) - .build(vec -> delegate.getBaseBiome(vec.x * res, vec.z * res, vec.seed)); + this.baseCache = ThreadLocal.withInitial(() -> { + LoadingCache> cache = Caffeine + .newBuilder() + .executor(CACHE_EXECUTOR) + .scheduler(Scheduler.systemScheduler()) + .initialCapacity(256) + .maximumSize(256) + .build(this::sampleBiome); + return Pair.of(new SeededVector2Key(0, 0, 0), cache).mutable(); + }); + this.cache = ThreadLocal.withInitial(() -> { + LoadingCache cache3D = Caffeine + .newBuilder() + .executor(CACHE_EXECUTOR) + .scheduler(Scheduler.systemScheduler()) + .initialCapacity(981504) + .maximumSize(981504) + .build(this::sampleBiome); + return Pair.of(new SeededVector3Key(0, 0, 0, 0), cache3D).mutable(); + }); + + + + } + + private Optional sampleBiome(SeededVector2Key vec) { + this.baseCache.get().setLeft(new SeededVector2Key(0, 0, 0)); + return this.delegate.getBaseBiome(vec.x * res, vec.z * res, vec.seed); + } + + private Biome sampleBiome(SeededVector3Key vec) { + this.cache.get().setLeft(new SeededVector3Key(0, 0, 0, 0)); + return this.delegate.getBiome(vec.x * res, vec.y * res, vec.z * res, vec.seed); } @Override @@ -45,12 +76,18 @@ public class CachingBiomeProvider implements BiomeProvider, Handle { @Override public Biome getBiome(int x, int y, int z, long seed) { - return cache.get(new SeededVector3(x / res, y / res, z / res, seed)); + Mutable> cachePair = cache.get(); + SeededVector3Key mutableKey = cachePair.getLeft(); + mutableKey.set(x, y, z, seed); + return cachePair.getRight().get(mutableKey); } @Override public Optional getBaseBiome(int x, int z, long seed) { - return baseCache.get(new SeededVector2(x / res, z / res, seed)); + Mutable>> cachePair = baseCache.get(); + SeededVector2Key mutableKey = cachePair.getLeft(); + mutableKey.set(x, z, seed); + return cachePair.getRight().get(mutableKey); } @Override @@ -62,40 +99,4 @@ public class CachingBiomeProvider implements BiomeProvider, Handle { public int resolution() { return delegate.resolution(); } - - private record SeededVector3(int x, int y, int z, long seed) { - @Override - public boolean equals(Object obj) { - if(obj instanceof SeededVector3 that) { - return this.y == that.y && this.z == that.z && this.x == that.x && this.seed == that.seed; - } - return false; - } - - @Override - public int hashCode() { - int code = x; - code = 31 * code + y; - code = 31 * code + z; - return 31 * code + ((int) (seed ^ (seed >>> 32))); - } - } - - - private record SeededVector2(int x, int z, long seed) { - @Override - public boolean equals(Object obj) { - if(obj instanceof SeededVector2 that) { - return this.z == that.z && this.x == that.x && this.seed == that.seed; - } - return false; - } - - @Override - public int hashCode() { - int code = x; - code = 31 * code + z; - return 31 * code + ((int) (seed ^ (seed >>> 32))); - } - } } diff --git a/common/api/src/main/java/com/dfsek/terra/api/world/chunk/Chunk.java b/common/api/src/main/java/com/dfsek/terra/api/world/chunk/Chunk.java index b1d532631..cc25f919a 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/world/chunk/Chunk.java +++ b/common/api/src/main/java/com/dfsek/terra/api/world/chunk/Chunk.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/world/chunk/ChunkAccess.java b/common/api/src/main/java/com/dfsek/terra/api/world/chunk/ChunkAccess.java index a98d0e42e..d7039b63e 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/world/chunk/ChunkAccess.java +++ b/common/api/src/main/java/com/dfsek/terra/api/world/chunk/ChunkAccess.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/world/chunk/generation/ChunkGenerator.java b/common/api/src/main/java/com/dfsek/terra/api/world/chunk/generation/ChunkGenerator.java index 0bf8d753d..a7a69ed25 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/world/chunk/generation/ChunkGenerator.java +++ b/common/api/src/main/java/com/dfsek/terra/api/world/chunk/generation/ChunkGenerator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/world/chunk/generation/ProtoChunk.java b/common/api/src/main/java/com/dfsek/terra/api/world/chunk/generation/ProtoChunk.java index 744bfda7f..6bd84b743 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/world/chunk/generation/ProtoChunk.java +++ b/common/api/src/main/java/com/dfsek/terra/api/world/chunk/generation/ProtoChunk.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/world/chunk/generation/stage/Chunkified.java b/common/api/src/main/java/com/dfsek/terra/api/world/chunk/generation/stage/Chunkified.java index fe8d81f8c..144521d06 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/world/chunk/generation/stage/Chunkified.java +++ b/common/api/src/main/java/com/dfsek/terra/api/world/chunk/generation/stage/Chunkified.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/world/chunk/generation/stage/GenerationStage.java b/common/api/src/main/java/com/dfsek/terra/api/world/chunk/generation/stage/GenerationStage.java index 0d7401910..3961ef100 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/world/chunk/generation/stage/GenerationStage.java +++ b/common/api/src/main/java/com/dfsek/terra/api/world/chunk/generation/stage/GenerationStage.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/world/chunk/generation/util/Column.java b/common/api/src/main/java/com/dfsek/terra/api/world/chunk/generation/util/Column.java index d41d17237..0268ffc91 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/world/chunk/generation/util/Column.java +++ b/common/api/src/main/java/com/dfsek/terra/api/world/chunk/generation/util/Column.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/world/chunk/generation/util/GeneratorWrapper.java b/common/api/src/main/java/com/dfsek/terra/api/world/chunk/generation/util/GeneratorWrapper.java index fc7044a98..2f36eb543 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/world/chunk/generation/util/GeneratorWrapper.java +++ b/common/api/src/main/java/com/dfsek/terra/api/world/chunk/generation/util/GeneratorWrapper.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/world/chunk/generation/util/Palette.java b/common/api/src/main/java/com/dfsek/terra/api/world/chunk/generation/util/Palette.java index 19f948495..4e54fd072 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/world/chunk/generation/util/Palette.java +++ b/common/api/src/main/java/com/dfsek/terra/api/world/chunk/generation/util/Palette.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/world/chunk/generation/util/provider/ChunkGeneratorProvider.java b/common/api/src/main/java/com/dfsek/terra/api/world/chunk/generation/util/provider/ChunkGeneratorProvider.java index 1a169da02..d5d0582ed 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/world/chunk/generation/util/provider/ChunkGeneratorProvider.java +++ b/common/api/src/main/java/com/dfsek/terra/api/world/chunk/generation/util/provider/ChunkGeneratorProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/api/src/main/java/com/dfsek/terra/api/world/chunk/generation/util/provider/GenerationStageProvider.java b/common/api/src/main/java/com/dfsek/terra/api/world/chunk/generation/util/provider/GenerationStageProvider.java index 470db1a22..3f994d331 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/world/chunk/generation/util/provider/GenerationStageProvider.java +++ b/common/api/src/main/java/com/dfsek/terra/api/world/chunk/generation/util/provider/GenerationStageProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023 Polyhedral Development + * Copyright (c) 2020-2024 Polyhedral Development * * The Terra API is licensed under the terms of the MIT License. For more details, * reference the LICENSE file in the common/api directory. diff --git a/common/implementation/base/src/main/java/com/dfsek/terra/AbstractPlatform.java b/common/implementation/base/src/main/java/com/dfsek/terra/AbstractPlatform.java index 86d22bc2a..6e4e8ad73 100644 --- a/common/implementation/base/src/main/java/com/dfsek/terra/AbstractPlatform.java +++ b/common/implementation/base/src/main/java/com/dfsek/terra/AbstractPlatform.java @@ -310,6 +310,24 @@ public abstract class AbstractPlatform implements Platform { } } + public static int getGenerationThreadsWithReflection(String className, String fieldName, String project) { + try { + Class aClass = Class.forName(className); + int threads = aClass.getField(fieldName).getInt(null); + logger.info("{} found, setting {} generation threads.", project, threads); + return threads; + } catch(ClassNotFoundException e) { + logger.info("{} not found.", project); + } catch(NoSuchFieldException e) { + logger.warn("{} found, but {} field not found this probably means {0} has changed its code and " + + "Terra has not updated to reflect that.", project, fieldName); + } catch(IllegalAccessException e) { + logger.error("Failed to access {} field in {}, assuming 1 generation thread.", fieldName, project, e); + } + return 0; + + } + @Override public void register(TypeRegistry registry) { loaders.register(registry); @@ -339,4 +357,9 @@ public abstract class AbstractPlatform implements Platform { public @NotNull Profiler getProfiler() { return profiler; } + + @Override + public int getGenerationThreads() { + return 1; + } } diff --git a/common/implementation/base/src/main/java/com/dfsek/terra/config/loaders/ProbabilityCollectionLoader.java b/common/implementation/base/src/main/java/com/dfsek/terra/config/loaders/ProbabilityCollectionLoader.java index 6a9e10bd0..0c0406bf3 100644 --- a/common/implementation/base/src/main/java/com/dfsek/terra/config/loaders/ProbabilityCollectionLoader.java +++ b/common/implementation/base/src/main/java/com/dfsek/terra/config/loaders/ProbabilityCollectionLoader.java @@ -43,23 +43,27 @@ public class ProbabilityCollectionLoader implements TypeLoader map = (Map) o; + if (map.size() == 1) { + Object onlyKey = map.keySet().iterator().next(); + return new ProbabilityCollection.Singleton<>(configLoader.loadType(generic, onlyKey, depthTracker)); + } for(Map.Entry entry : map.entrySet()) { collection.add(configLoader.loadType(generic, entry.getKey(), depthTracker.entry((String) entry.getKey())), configLoader.loadType(Integer.class, entry.getValue(), depthTracker.entry((String) entry.getKey()))); } } else if(o instanceof List) { - List> map = (List>) o; - if(map.size() == 1) { - Map entry = map.get(0); - if(entry.size() == 1) { - for(Object value : entry.keySet()) { + List> list = (List>) o; + if(list.size() == 1) { + Map map = list.getFirst(); + if(map.size() == 1) { + for(Object value : map.keySet()) { return new ProbabilityCollection.Singleton<>(configLoader.loadType(generic, value, depthTracker)); } } } - for(int i = 0; i < map.size(); i++) { - Map l = map.get(i); - for(Entry entry : l.entrySet()) { + for(int i = 0; i < list.size(); i++) { + Map map = list.get(i); + for(Entry entry : map.entrySet()) { if(entry.getValue() == null) throw new LoadException("No probability defined for entry \"" + entry.getKey() + "\"", depthTracker); Object val = configLoader.loadType(generic, entry.getKey(), depthTracker.index(i).entry((String) entry.getKey())); diff --git a/common/implementation/base/src/main/java/com/dfsek/terra/config/pack/ConfigPackImpl.java b/common/implementation/base/src/main/java/com/dfsek/terra/config/pack/ConfigPackImpl.java index 82ec7d95b..a03584e3f 100644 --- a/common/implementation/base/src/main/java/com/dfsek/terra/config/pack/ConfigPackImpl.java +++ b/common/implementation/base/src/main/java/com/dfsek/terra/config/pack/ConfigPackImpl.java @@ -232,7 +232,7 @@ public class ConfigPackImpl implements ConfigPack { ConfigPackPostTemplate packPostTemplate = new ConfigPackPostTemplate(); selfLoader.load(packPostTemplate, packManifest); seededBiomeProvider = - template.getBiomeCache() ? packPostTemplate.getProviderBuilder().caching() : packPostTemplate.getProviderBuilder(); + template.getBiomeCache() ? packPostTemplate.getProviderBuilder().caching(platform) : packPostTemplate.getProviderBuilder(); checkDeadEntries(); } diff --git a/common/implementation/base/src/main/java/com/dfsek/terra/profiler/ProfilerImpl.java b/common/implementation/base/src/main/java/com/dfsek/terra/profiler/ProfilerImpl.java index 4e419f883..81519cac8 100644 --- a/common/implementation/base/src/main/java/com/dfsek/terra/profiler/ProfilerImpl.java +++ b/common/implementation/base/src/main/java/com/dfsek/terra/profiler/ProfilerImpl.java @@ -57,7 +57,7 @@ public class ProfilerImpl implements Profiler { Stack stack = THREAD_STACK.get(); stack.push(new Frame(stack.isEmpty() ? frame : stack.peek().getId() + "." + frame)); } else SAFE.set(false); - } else SAFE.set(false); + } } @Override @@ -99,6 +99,7 @@ public class ProfilerImpl implements Profiler { public void stop() { logger.info("Stopping Terra profiler"); running = false; + SAFE.set(false); } @Override diff --git a/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/PlatformImpl.java b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/PlatformImpl.java index 45a82c5cb..f26698b39 100644 --- a/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/PlatformImpl.java +++ b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/PlatformImpl.java @@ -51,7 +51,13 @@ public class PlatformImpl extends AbstractPlatform { private final TerraBukkitPlugin plugin; + private int generationThreads; + public PlatformImpl(TerraBukkitPlugin plugin) { + generationThreads = getGenerationThreadsWithReflection("ca.spottedleaf.moonrise.common.util.MoonriseCommon", "WORKER_THREADS", "Moonrise"); + if (generationThreads == 0) { + generationThreads = 1; + } this.plugin = plugin; load(); } @@ -108,6 +114,11 @@ public class PlatformImpl extends AbstractPlatform { return itemHandle; } + @Override + public int getGenerationThreads() { + return generationThreads; + } + @Override public void register(TypeRegistry registry) { super.register(registry); diff --git a/platforms/bukkit/nms/v1_21/src/main/java/com/dfsek/terra/bukkit/nms/v1_21/NMSInjectListener.java b/platforms/bukkit/nms/v1_21/src/main/java/com/dfsek/terra/bukkit/nms/v1_21/NMSInjectListener.java index 927b019ed..a25638594 100644 --- a/platforms/bukkit/nms/v1_21/src/main/java/com/dfsek/terra/bukkit/nms/v1_21/NMSInjectListener.java +++ b/platforms/bukkit/nms/v1_21/src/main/java/com/dfsek/terra/bukkit/nms/v1_21/NMSInjectListener.java @@ -42,18 +42,13 @@ public class NMSInjectListener implements Listener { NMSBiomeProvider provider = new NMSBiomeProvider(pack.getBiomeProvider(), craftWorld.getSeed()); ChunkMap chunkMap = serverWorld.getChunkSource().chunkMap; WorldGenContext worldGenContext = chunkMap.worldGenContext; - - try { - ReflectionUtil.setFinalField(chunkMap, "worldGenContext", new WorldGenContext( - worldGenContext.level(), - new NMSChunkGeneratorDelegate(vanilla, pack, provider, craftWorld.getSeed()), - worldGenContext.structureManager(), - worldGenContext.lightEngine(), - worldGenContext.mainThreadMailBox() - )); - } catch(NoSuchFieldException e) { - throw new RuntimeException(e); - } + Reflection.CHUNKMAP.setWorldGenContext(chunkMap, new WorldGenContext( + worldGenContext.level(), + new NMSChunkGeneratorDelegate(vanilla, pack, provider, craftWorld.getSeed()), + worldGenContext.structureManager(), + worldGenContext.lightEngine(), + worldGenContext.mainThreadMailBox() + )); LOGGER.info("Successfully injected into world."); diff --git a/platforms/bukkit/nms/v1_21/src/main/java/com/dfsek/terra/bukkit/nms/v1_21/Reflection.java b/platforms/bukkit/nms/v1_21/src/main/java/com/dfsek/terra/bukkit/nms/v1_21/Reflection.java index 57e1b8c9c..a6f4ea9ba 100644 --- a/platforms/bukkit/nms/v1_21/src/main/java/com/dfsek/terra/bukkit/nms/v1_21/Reflection.java +++ b/platforms/bukkit/nms/v1_21/src/main/java/com/dfsek/terra/bukkit/nms/v1_21/Reflection.java @@ -3,8 +3,10 @@ package com.dfsek.terra.bukkit.nms.v1_21; import net.minecraft.core.Holder; import net.minecraft.core.Holder.Reference; import net.minecraft.core.MappedRegistry; +import net.minecraft.server.level.ChunkMap; import net.minecraft.world.level.LevelAccessor; import net.minecraft.world.level.StructureManager; +import net.minecraft.world.level.chunk.status.WorldGenContext; import xyz.jpenilla.reflectionremapper.ReflectionRemapper; import xyz.jpenilla.reflectionremapper.proxy.ReflectionProxyFactory; import xyz.jpenilla.reflectionremapper.proxy.annotation.FieldGetter; @@ -19,6 +21,8 @@ public class Reflection { public static final ReferenceProxy REFERENCE; + public static final ChunkMapProxy CHUNKMAP; + static { ReflectionRemapper reflectionRemapper = ReflectionRemapper.forReobfMappingsInPaperJar(); ReflectionProxyFactory reflectionProxyFactory = ReflectionProxyFactory.create(reflectionRemapper, @@ -27,6 +31,7 @@ public class Reflection { MAPPED_REGISTRY = reflectionProxyFactory.reflectionProxy(MappedRegistryProxy.class); STRUCTURE_MANAGER = reflectionProxyFactory.reflectionProxy(StructureManagerProxy.class); REFERENCE = reflectionProxyFactory.reflectionProxy(ReferenceProxy.class); + CHUNKMAP = reflectionProxyFactory.reflectionProxy(ChunkMapProxy.class); } @@ -49,4 +54,10 @@ public class Reflection { @MethodName("bindValue") void invokeBindValue(Reference instance, T value); } + + @Proxies(ChunkMap.class) + public interface ChunkMapProxy { + @FieldSetter("worldGenContext") + void setWorldGenContext(ChunkMap instance, WorldGenContext worldGenContext); + } } diff --git a/platforms/cli/build.gradle.kts b/platforms/cli/build.gradle.kts index 893649caf..1d5cb6f73 100644 --- a/platforms/cli/build.gradle.kts +++ b/platforms/cli/build.gradle.kts @@ -10,6 +10,9 @@ dependencies { shadedApi("commons-io", "commons-io", Versions.Libraries.Internal.apacheIO) shadedApi("com.github.Querz", "NBT", Versions.Libraries.Internal.nbt) + shadedImplementation("info.picocli", "picocli", Versions.CLI.picocli) + annotationProcessor("info.picocli", "picocli-codegen", Versions.CLI.picocli) + shadedImplementation("com.google.guava", "guava", Versions.Libraries.Internal.guava) shadedImplementation("ch.qos.logback", "logback-classic", Versions.CLI.logback) @@ -26,6 +29,12 @@ tasks.withType { } } +tasks.withType { + doFirst { + options.compilerArgs.add("-Aproject=${project.group}/${project.name}") + } +} + application { mainClass.set(javaMainClass) } diff --git a/platforms/cli/src/main/java/com/dfsek/terra/cli/CLIPlatform.java b/platforms/cli/src/main/java/com/dfsek/terra/cli/CLIPlatform.java index ca58f1f5d..3d366d0e6 100644 --- a/platforms/cli/src/main/java/com/dfsek/terra/cli/CLIPlatform.java +++ b/platforms/cli/src/main/java/com/dfsek/terra/cli/CLIPlatform.java @@ -22,6 +22,8 @@ public class CLIPlatform extends AbstractPlatform { private final CLIWorldHandle worldHandle = new CLIWorldHandle(); private final CLIItemHandle itemHandle = new CLIItemHandle(); + private final int generationThreads = Runtime.getRuntime().availableProcessors() - 1; + public CLIPlatform() { LOGGER.info("Root directory: {}", getDataFolder().getAbsoluteFile()); load(); @@ -58,4 +60,9 @@ public class CLIPlatform extends AbstractPlatform { super.register(registry); registry.registerLoader(PlatformBiome.class, (TypeLoader) (annotatedType, o, configLoader, depthTracker) -> () -> o); } + + @Override + public int getGenerationThreads() { + return generationThreads; + } } diff --git a/platforms/cli/src/main/java/com/dfsek/terra/cli/TerraCLI.java b/platforms/cli/src/main/java/com/dfsek/terra/cli/TerraCLI.java index 8f62528bc..5fa0e7514 100644 --- a/platforms/cli/src/main/java/com/dfsek/terra/cli/TerraCLI.java +++ b/platforms/cli/src/main/java/com/dfsek/terra/cli/TerraCLI.java @@ -5,41 +5,74 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.IOException; +import java.util.concurrent.Callable; import com.dfsek.terra.api.config.ConfigPack; import com.dfsek.terra.api.event.events.platform.PlatformInitializationEvent; import com.dfsek.terra.api.util.vector.Vector2Int; import com.dfsek.terra.cli.world.CLIWorld; +import picocli.CommandLine; +import picocli.CommandLine.Command; +import picocli.CommandLine.Option; -public final class TerraCLI { - private static final Logger LOGGER = LoggerFactory.getLogger(TerraCLI.class); - public static void main(String... args) { +//TODO auto pull in version +@Command(name = "TerraCLI", mixinStandardHelpOptions = true, version = "6.6.0", + description = "Generates a Terra World and saves it in minecraft region format.") +public final class TerraCLI implements Callable { + @Option(names = { "-s", "--size"}, description = "Number of regions to generate.") + private int size = 2; + + @Option(names = { "-p", "--pack"}, description = "Config pack to use.") + private String pack = "OVERWORLD"; + + @Option(names = { "--seed"}, description = "Seed for world generation.") + private long seed = 0; + + @Option(names = { "--max-height"}, description = "Maximum height of the world.") + private int maxHeight = 320; + + @Option(names = { "--min-height"}, description = "Minimum height of the world.") + private int minHeight = -64; + + @Option(names = { "--no-save"}, description = "Don't save the world to disk.") + private boolean noSave = false; + + @Override + public Integer call() { + Logger LOGGER = LoggerFactory.getLogger(TerraCLI.class); LOGGER.info("Starting Terra CLI..."); CLIPlatform platform = new CLIPlatform(); platform.getEventManager().callEvent(new PlatformInitializationEvent()); - ConfigPack generate = platform.getConfigRegistry().getByID("OVERWORLD").orElseThrow(); // TODO: make this a cli argument + ConfigPack generate = platform.getConfigRegistry().getByID(pack).orElseThrow(); - CLIWorld world = new CLIWorld(2, 2, 384, -64, generate); + CLIWorld world = new CLIWorld(size, seed, maxHeight, minHeight, generate, noSave); world.generate(); - world.serialize().parallel().forEach(mcaFile -> { - Vector2Int pos = mcaFile.getLeft(); - String name = MCAUtil.createNameFromRegionLocation(pos.getX(), pos.getZ()); - LOGGER.info("Writing region ({}, {}) to {}", pos.getX(), pos.getZ(), name); + if(!noSave) { + world.serialize().parallel().forEach(mcaFile -> { + Vector2Int pos = mcaFile.getLeft(); + String name = MCAUtil.createNameFromRegionLocation(pos.getX(), pos.getZ()); + LOGGER.info("Writing region ({}, {}) to {}", pos.getX(), pos.getZ(), name); - try { - MCAUtil.write(mcaFile.getRight(), name); - } catch(IOException e) { - e.printStackTrace(); - } - LOGGER.info("Wrote region to file."); - }); + try { + MCAUtil.write(mcaFile.getRight(), name); + } catch(IOException e) { + e.printStackTrace(); + } + LOGGER.info("Wrote region to file."); + }); + } LOGGER.info("Done."); - System.exit(0); + return 0; + } + + public static void main(String... args) { + int exitCode = new CommandLine(new TerraCLI()).execute(args); + System.exit(exitCode); } } diff --git a/platforms/cli/src/main/java/com/dfsek/terra/cli/world/CLIWorld.java b/platforms/cli/src/main/java/com/dfsek/terra/cli/world/CLIWorld.java index a4af0d02e..cb22ac666 100644 --- a/platforms/cli/src/main/java/com/dfsek/terra/cli/world/CLIWorld.java +++ b/platforms/cli/src/main/java/com/dfsek/terra/cli/world/CLIWorld.java @@ -43,6 +43,7 @@ public class CLIWorld implements ServerWorld, NBTSerializable CPSHistory = new ArrayList<>(); int sizeChunks = size * 32; List> futures = new ArrayList<>(); final AtomicLong start = new AtomicLong(System.nanoTime()); @@ -83,7 +86,13 @@ public class CLIWorld implements ServerWorld, NBTSerializable { try { int num = amount.getAndIncrement(); - CLIChunk chunk = getChunkAt(finalX, finalZ); + CLIChunk chunk; + if (!noSave) { + chunk = getChunkAt(finalX, finalZ); + } else { + chunk = new CLIChunk(Math.floorMod(finalX, 32), Math.floorMod(finalZ, 32), this); + } + BiomeProvider cachingBiomeProvider = pack.getBiomeProvider(); chunkGenerator.generateChunkData(chunk, this, cachingBiomeProvider, finalX, finalZ); CLIProtoWorld protoWorld = new CLIProtoWorld(this, cachingBiomeProvider, finalX, finalZ); @@ -91,6 +100,7 @@ public class CLIWorld implements ServerWorld, NBTSerializable d).average().orElse(0)); } @Override diff --git a/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/LifecyclePlatform.java b/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/LifecyclePlatform.java index 7c7c49306..b1b33c6b9 100644 --- a/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/LifecyclePlatform.java +++ b/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/LifecyclePlatform.java @@ -3,6 +3,9 @@ package com.dfsek.terra.lifecycle; import ca.solostudios.strata.Versions; import ca.solostudios.strata.parser.tokenizer.ParseException; import ca.solostudios.strata.version.Version; + +import com.dfsek.terra.api.util.reflection.ReflectionUtil; + import net.minecraft.MinecraftVersion; import net.minecraft.enchantment.Enchantment; import net.minecraft.registry.Registry; @@ -37,8 +40,15 @@ public abstract class LifecyclePlatform extends ModPlatform { private static final AtomicReference> NOISE = new AtomicReference<>(); private static final AtomicReference> ENCHANTMENT = new AtomicReference<>(); private static MinecraftServer server; + private int generationThreads; public LifecyclePlatform() { + generationThreads = getGenerationThreadsWithReflection("com.ishland.c2me.base.common.GlobalExecutors", "GLOBAL_EXECUTOR_PARALLELISM", "C2ME"); + if (generationThreads == 0) { + generationThreads = getGenerationThreadsWithReflection("ca.spottedleaf.moonrise.common.util.MoonriseCommon", "WORKER_THREADS", "Moonrise"); + } if (generationThreads == 0) { + generationThreads = 1; + } CommonPlatform.initialize(this); load(); } @@ -55,6 +65,8 @@ public abstract class LifecyclePlatform extends ModPlatform { ENCHANTMENT.set(enchantmentRegistry); } + + @Override public MinecraftServer getServer() { return server;