From 622fed96e531098a14392886df50d53c933b3ed9 Mon Sep 17 00:00:00 2001 From: Astrash Date: Mon, 1 May 2023 12:48:13 +1000 Subject: [PATCH] Use colorsampler package name instead of sampler --- .../addons/biome/image/v2/ImageBiomeProvider.java | 2 +- .../image/v2/config/ImageProviderTemplate.java | 2 +- .../terra/addons/noise/image/ImageSampler.java | 2 +- .../noise/image/config/ImageSamplerTemplate.java | 2 +- .../dfsek/terra/addons/image/ImageLibraryAddon.java | 12 ++++++------ .../{sampler => colorsampler}/ColorSampler.java | 2 +- .../image/SingleImageColorSampler.java | 6 +++--- .../image/TileImageColorSampler.java | 6 +++--- .../image/transform/Alignment.java | 2 +- .../image/transform/ImageTransformation.java | 2 +- .../mutate/RotateColorSampler.java | 4 ++-- .../mutate/TranslateColorSampler.java | 4 ++-- .../ConstantColorSamplerTemplate.java | 4 ++-- .../image/ImageColorSamplerTemplate.java | 6 +++--- .../image/SingleImageColorSamplerTemplate.java | 6 +++--- .../image/TileImageColorSamplerTemplate.java | 13 +++++++++++++ .../mutate/MutateColorSamplerTemplate.java | 4 ++-- .../mutate/RotateColorSamplerTemplate.java | 6 +++--- .../mutate/TranslateColorSamplerTemplate.java | 6 +++--- .../image/TileImageColorSamplerTemplate.java | 13 ------------- 20 files changed, 52 insertions(+), 52 deletions(-) rename common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/{sampler => colorsampler}/ColorSampler.java (81%) rename common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/{sampler => colorsampler}/image/SingleImageColorSampler.java (79%) rename common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/{sampler => colorsampler}/image/TileImageColorSampler.java (76%) rename common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/{sampler => colorsampler}/image/transform/Alignment.java (90%) rename common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/{sampler => colorsampler}/image/transform/ImageTransformation.java (73%) rename common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/{sampler => colorsampler}/mutate/RotateColorSampler.java (82%) rename common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/{sampler => colorsampler}/mutate/TranslateColorSampler.java (80%) rename common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/{sampler => colorsampler}/ConstantColorSamplerTemplate.java (75%) rename common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/{sampler => colorsampler}/image/ImageColorSamplerTemplate.java (70%) rename common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/{sampler => colorsampler}/image/SingleImageColorSamplerTemplate.java (62%) create mode 100644 common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/colorsampler/image/TileImageColorSamplerTemplate.java rename common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/{sampler => colorsampler}/mutate/MutateColorSamplerTemplate.java (70%) rename common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/{sampler => colorsampler}/mutate/RotateColorSamplerTemplate.java (63%) rename common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/{sampler => colorsampler}/mutate/TranslateColorSamplerTemplate.java (64%) delete mode 100644 common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/sampler/image/TileImageColorSamplerTemplate.java 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 0198e49c5..7a37664a1 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 @@ -10,7 +10,7 @@ package com.dfsek.terra.addons.biome.image.v2; import java.util.Optional; import com.dfsek.terra.addons.image.converter.ColorConverter; -import com.dfsek.terra.addons.image.sampler.ColorSampler; +import com.dfsek.terra.addons.image.colorsampler.ColorSampler; import com.dfsek.terra.api.world.biome.Biome; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; 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 ddc93ee6e..8d9955ad4 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 @@ -14,7 +14,7 @@ import com.dfsek.tectonic.api.config.template.object.ObjectTemplate; import com.dfsek.terra.addons.biome.image.v2.ImageBiomeProvider; import com.dfsek.terra.addons.image.converter.ColorConverter; -import com.dfsek.terra.addons.image.sampler.ColorSampler; +import com.dfsek.terra.addons.image.colorsampler.ColorSampler; import com.dfsek.terra.api.world.biome.Biome; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; diff --git a/common/addons/config-noise-image/src/main/java/com/dfsek/terra/addons/noise/image/ImageSampler.java b/common/addons/config-noise-image/src/main/java/com/dfsek/terra/addons/noise/image/ImageSampler.java index 3f162dba6..ad9ed167b 100644 --- a/common/addons/config-noise-image/src/main/java/com/dfsek/terra/addons/noise/image/ImageSampler.java +++ b/common/addons/config-noise-image/src/main/java/com/dfsek/terra/addons/noise/image/ImageSampler.java @@ -7,7 +7,7 @@ package com.dfsek.terra.addons.noise.image; -import com.dfsek.terra.addons.image.sampler.ColorSampler; +import com.dfsek.terra.addons.image.colorsampler.ColorSampler; import com.dfsek.terra.addons.image.util.ColorUtil.Channel; import com.dfsek.terra.api.noise.NoiseSampler; diff --git a/common/addons/config-noise-image/src/main/java/com/dfsek/terra/addons/noise/image/config/ImageSamplerTemplate.java b/common/addons/config-noise-image/src/main/java/com/dfsek/terra/addons/noise/image/config/ImageSamplerTemplate.java index 60ac77e0c..dc05def7b 100644 --- a/common/addons/config-noise-image/src/main/java/com/dfsek/terra/addons/noise/image/config/ImageSamplerTemplate.java +++ b/common/addons/config-noise-image/src/main/java/com/dfsek/terra/addons/noise/image/config/ImageSamplerTemplate.java @@ -9,7 +9,7 @@ package com.dfsek.terra.addons.noise.image.config; import com.dfsek.tectonic.api.config.template.annotations.Value; -import com.dfsek.terra.addons.image.sampler.ColorSampler; +import com.dfsek.terra.addons.image.colorsampler.ColorSampler; import com.dfsek.terra.addons.image.util.ColorUtil.Channel; import com.dfsek.terra.addons.noise.config.templates.SamplerTemplate; import com.dfsek.terra.addons.noise.image.ImageSampler; diff --git a/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/ImageLibraryAddon.java b/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/ImageLibraryAddon.java index f1798b4b6..a3981b739 100644 --- a/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/ImageLibraryAddon.java +++ b/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/ImageLibraryAddon.java @@ -7,14 +7,14 @@ import java.util.function.Supplier; import com.dfsek.terra.addons.image.config.image.DistanceTransformNoiseSamplerTemplate; import com.dfsek.terra.addons.image.config.image.ImageTemplate; import com.dfsek.terra.addons.image.config.image.StitchedImageTemplate; -import com.dfsek.terra.addons.image.config.sampler.ConstantColorSamplerTemplate; -import com.dfsek.terra.addons.image.config.sampler.image.SingleImageColorSamplerTemplate; -import com.dfsek.terra.addons.image.config.sampler.image.TileImageColorSamplerTemplate; -import com.dfsek.terra.addons.image.config.sampler.mutate.RotateColorSamplerTemplate; -import com.dfsek.terra.addons.image.config.sampler.mutate.TranslateColorSamplerTemplate; +import com.dfsek.terra.addons.image.config.colorsampler.ConstantColorSamplerTemplate; +import com.dfsek.terra.addons.image.config.colorsampler.image.SingleImageColorSamplerTemplate; +import com.dfsek.terra.addons.image.config.colorsampler.image.TileImageColorSamplerTemplate; +import com.dfsek.terra.addons.image.config.colorsampler.mutate.RotateColorSamplerTemplate; +import com.dfsek.terra.addons.image.config.colorsampler.mutate.TranslateColorSamplerTemplate; import com.dfsek.terra.addons.image.image.Image; import com.dfsek.terra.addons.image.operator.DistanceTransform; -import com.dfsek.terra.addons.image.sampler.ColorSampler; +import com.dfsek.terra.addons.image.colorsampler.ColorSampler; import com.dfsek.terra.addons.manifest.api.AddonInitializer; import com.dfsek.terra.api.Platform; import com.dfsek.terra.api.addon.BaseAddon; diff --git a/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/sampler/ColorSampler.java b/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/colorsampler/ColorSampler.java similarity index 81% rename from common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/sampler/ColorSampler.java rename to common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/colorsampler/ColorSampler.java index b6eaade20..4856a08f9 100644 --- a/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/sampler/ColorSampler.java +++ b/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/colorsampler/ColorSampler.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.addons.image.sampler; +package com.dfsek.terra.addons.image.colorsampler; @FunctionalInterface public interface ColorSampler { diff --git a/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/sampler/image/SingleImageColorSampler.java b/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/colorsampler/image/SingleImageColorSampler.java similarity index 79% rename from common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/sampler/image/SingleImageColorSampler.java rename to common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/colorsampler/image/SingleImageColorSampler.java index 08e8c6e89..2c19f70bf 100644 --- a/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/sampler/image/SingleImageColorSampler.java +++ b/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/colorsampler/image/SingleImageColorSampler.java @@ -1,8 +1,8 @@ -package com.dfsek.terra.addons.image.sampler.image; +package com.dfsek.terra.addons.image.colorsampler.image; import com.dfsek.terra.addons.image.image.Image; -import com.dfsek.terra.addons.image.sampler.ColorSampler; -import com.dfsek.terra.addons.image.sampler.image.transform.ImageTransformation; +import com.dfsek.terra.addons.image.colorsampler.ColorSampler; +import com.dfsek.terra.addons.image.colorsampler.image.transform.ImageTransformation; public class SingleImageColorSampler implements ColorSampler { diff --git a/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/sampler/image/TileImageColorSampler.java b/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/colorsampler/image/TileImageColorSampler.java similarity index 76% rename from common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/sampler/image/TileImageColorSampler.java rename to common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/colorsampler/image/TileImageColorSampler.java index 7d035eff4..aae1bf21f 100644 --- a/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/sampler/image/TileImageColorSampler.java +++ b/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/colorsampler/image/TileImageColorSampler.java @@ -1,10 +1,10 @@ -package com.dfsek.terra.addons.image.sampler.image; +package com.dfsek.terra.addons.image.colorsampler.image; import net.jafama.FastMath; import com.dfsek.terra.addons.image.image.Image; -import com.dfsek.terra.addons.image.sampler.ColorSampler; -import com.dfsek.terra.addons.image.sampler.image.transform.ImageTransformation; +import com.dfsek.terra.addons.image.colorsampler.ColorSampler; +import com.dfsek.terra.addons.image.colorsampler.image.transform.ImageTransformation; public class TileImageColorSampler implements ColorSampler { diff --git a/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/sampler/image/transform/Alignment.java b/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/colorsampler/image/transform/Alignment.java similarity index 90% rename from common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/sampler/image/transform/Alignment.java rename to common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/colorsampler/image/transform/Alignment.java index 43674b2e9..834428c5c 100644 --- a/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/sampler/image/transform/Alignment.java +++ b/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/colorsampler/image/transform/Alignment.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.addons.image.sampler.image.transform; +package com.dfsek.terra.addons.image.colorsampler.image.transform; import com.dfsek.terra.addons.image.image.Image; diff --git a/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/sampler/image/transform/ImageTransformation.java b/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/colorsampler/image/transform/ImageTransformation.java similarity index 73% rename from common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/sampler/image/transform/ImageTransformation.java rename to common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/colorsampler/image/transform/ImageTransformation.java index bc9ae5143..cc5b63e7f 100644 --- a/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/sampler/image/transform/ImageTransformation.java +++ b/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/colorsampler/image/transform/ImageTransformation.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.addons.image.sampler.image.transform; +package com.dfsek.terra.addons.image.colorsampler.image.transform; import com.dfsek.terra.addons.image.image.Image; diff --git a/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/sampler/mutate/RotateColorSampler.java b/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/colorsampler/mutate/RotateColorSampler.java similarity index 82% rename from common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/sampler/mutate/RotateColorSampler.java rename to common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/colorsampler/mutate/RotateColorSampler.java index 92e99f59d..d7fae42b2 100644 --- a/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/sampler/mutate/RotateColorSampler.java +++ b/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/colorsampler/mutate/RotateColorSampler.java @@ -1,6 +1,6 @@ -package com.dfsek.terra.addons.image.sampler.mutate; +package com.dfsek.terra.addons.image.colorsampler.mutate; -import com.dfsek.terra.addons.image.sampler.ColorSampler; +import com.dfsek.terra.addons.image.colorsampler.ColorSampler; import net.jafama.FastMath; diff --git a/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/sampler/mutate/TranslateColorSampler.java b/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/colorsampler/mutate/TranslateColorSampler.java similarity index 80% rename from common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/sampler/mutate/TranslateColorSampler.java rename to common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/colorsampler/mutate/TranslateColorSampler.java index 8f9c35fa8..f281e5152 100644 --- a/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/sampler/mutate/TranslateColorSampler.java +++ b/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/colorsampler/mutate/TranslateColorSampler.java @@ -1,6 +1,6 @@ -package com.dfsek.terra.addons.image.sampler.mutate; +package com.dfsek.terra.addons.image.colorsampler.mutate; -import com.dfsek.terra.addons.image.sampler.ColorSampler; +import com.dfsek.terra.addons.image.colorsampler.ColorSampler; public class TranslateColorSampler implements ColorSampler { diff --git a/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/sampler/ConstantColorSamplerTemplate.java b/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/colorsampler/ConstantColorSamplerTemplate.java similarity index 75% rename from common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/sampler/ConstantColorSamplerTemplate.java rename to common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/colorsampler/ConstantColorSamplerTemplate.java index 2e3269daf..4a07edd3f 100644 --- a/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/sampler/ConstantColorSamplerTemplate.java +++ b/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/colorsampler/ConstantColorSamplerTemplate.java @@ -1,9 +1,9 @@ -package com.dfsek.terra.addons.image.config.sampler; +package com.dfsek.terra.addons.image.config.colorsampler; import com.dfsek.tectonic.api.config.template.annotations.Value; import com.dfsek.tectonic.api.config.template.object.ObjectTemplate; -import com.dfsek.terra.addons.image.sampler.ColorSampler; +import com.dfsek.terra.addons.image.colorsampler.ColorSampler; public class ConstantColorSamplerTemplate implements ObjectTemplate { diff --git a/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/sampler/image/ImageColorSamplerTemplate.java b/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/colorsampler/image/ImageColorSamplerTemplate.java similarity index 70% rename from common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/sampler/image/ImageColorSamplerTemplate.java rename to common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/colorsampler/image/ImageColorSamplerTemplate.java index 3e129ba6e..3b9e6fe37 100644 --- a/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/sampler/image/ImageColorSamplerTemplate.java +++ b/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/colorsampler/image/ImageColorSamplerTemplate.java @@ -1,12 +1,12 @@ -package com.dfsek.terra.addons.image.config.sampler.image; +package com.dfsek.terra.addons.image.config.colorsampler.image; import com.dfsek.tectonic.api.config.template.annotations.Default; import com.dfsek.tectonic.api.config.template.annotations.Value; import com.dfsek.tectonic.api.config.template.object.ObjectTemplate; import com.dfsek.terra.addons.image.image.Image; -import com.dfsek.terra.addons.image.sampler.ColorSampler; -import com.dfsek.terra.addons.image.sampler.image.transform.Alignment; +import com.dfsek.terra.addons.image.colorsampler.ColorSampler; +import com.dfsek.terra.addons.image.colorsampler.image.transform.Alignment; public abstract class ImageColorSamplerTemplate implements ObjectTemplate { diff --git a/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/sampler/image/SingleImageColorSamplerTemplate.java b/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/colorsampler/image/SingleImageColorSamplerTemplate.java similarity index 62% rename from common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/sampler/image/SingleImageColorSamplerTemplate.java rename to common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/colorsampler/image/SingleImageColorSamplerTemplate.java index fdd552804..dd31a3d67 100644 --- a/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/sampler/image/SingleImageColorSamplerTemplate.java +++ b/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/colorsampler/image/SingleImageColorSamplerTemplate.java @@ -1,9 +1,9 @@ -package com.dfsek.terra.addons.image.config.sampler.image; +package com.dfsek.terra.addons.image.config.colorsampler.image; import com.dfsek.tectonic.api.config.template.annotations.Value; -import com.dfsek.terra.addons.image.sampler.ColorSampler; -import com.dfsek.terra.addons.image.sampler.image.SingleImageColorSampler; +import com.dfsek.terra.addons.image.colorsampler.ColorSampler; +import com.dfsek.terra.addons.image.colorsampler.image.SingleImageColorSampler; public class SingleImageColorSamplerTemplate extends ImageColorSamplerTemplate { diff --git a/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/colorsampler/image/TileImageColorSamplerTemplate.java b/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/colorsampler/image/TileImageColorSamplerTemplate.java new file mode 100644 index 000000000..72421cb58 --- /dev/null +++ b/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/colorsampler/image/TileImageColorSamplerTemplate.java @@ -0,0 +1,13 @@ +package com.dfsek.terra.addons.image.config.colorsampler.image; + +import com.dfsek.terra.addons.image.colorsampler.ColorSampler; +import com.dfsek.terra.addons.image.colorsampler.image.TileImageColorSampler; + + +public class TileImageColorSamplerTemplate extends ImageColorSamplerTemplate { + + @Override + public ColorSampler get() { + return new TileImageColorSampler(image, alignment); + } +} diff --git a/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/sampler/mutate/MutateColorSamplerTemplate.java b/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/colorsampler/mutate/MutateColorSamplerTemplate.java similarity index 70% rename from common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/sampler/mutate/MutateColorSamplerTemplate.java rename to common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/colorsampler/mutate/MutateColorSamplerTemplate.java index 2274f7b20..532963837 100644 --- a/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/sampler/mutate/MutateColorSamplerTemplate.java +++ b/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/colorsampler/mutate/MutateColorSamplerTemplate.java @@ -1,9 +1,9 @@ -package com.dfsek.terra.addons.image.config.sampler.mutate; +package com.dfsek.terra.addons.image.config.colorsampler.mutate; import com.dfsek.tectonic.api.config.template.annotations.Value; import com.dfsek.tectonic.api.config.template.object.ObjectTemplate; -import com.dfsek.terra.addons.image.sampler.ColorSampler; +import com.dfsek.terra.addons.image.colorsampler.ColorSampler; public abstract class MutateColorSamplerTemplate implements ObjectTemplate { diff --git a/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/sampler/mutate/RotateColorSamplerTemplate.java b/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/colorsampler/mutate/RotateColorSamplerTemplate.java similarity index 63% rename from common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/sampler/mutate/RotateColorSamplerTemplate.java rename to common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/colorsampler/mutate/RotateColorSamplerTemplate.java index 3122d3c34..6ade23c77 100644 --- a/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/sampler/mutate/RotateColorSamplerTemplate.java +++ b/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/colorsampler/mutate/RotateColorSamplerTemplate.java @@ -1,10 +1,10 @@ -package com.dfsek.terra.addons.image.config.sampler.mutate; +package com.dfsek.terra.addons.image.config.colorsampler.mutate; import com.dfsek.tectonic.api.config.template.annotations.Value; import net.jafama.FastMath; -import com.dfsek.terra.addons.image.sampler.ColorSampler; -import com.dfsek.terra.addons.image.sampler.mutate.RotateColorSampler; +import com.dfsek.terra.addons.image.colorsampler.ColorSampler; +import com.dfsek.terra.addons.image.colorsampler.mutate.RotateColorSampler; public class RotateColorSamplerTemplate extends MutateColorSamplerTemplate { diff --git a/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/sampler/mutate/TranslateColorSamplerTemplate.java b/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/colorsampler/mutate/TranslateColorSamplerTemplate.java similarity index 64% rename from common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/sampler/mutate/TranslateColorSamplerTemplate.java rename to common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/colorsampler/mutate/TranslateColorSamplerTemplate.java index 7141c8ad8..e8e18c447 100644 --- a/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/sampler/mutate/TranslateColorSamplerTemplate.java +++ b/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/colorsampler/mutate/TranslateColorSamplerTemplate.java @@ -1,9 +1,9 @@ -package com.dfsek.terra.addons.image.config.sampler.mutate; +package com.dfsek.terra.addons.image.config.colorsampler.mutate; import com.dfsek.tectonic.api.config.template.annotations.Value; -import com.dfsek.terra.addons.image.sampler.ColorSampler; -import com.dfsek.terra.addons.image.sampler.mutate.TranslateColorSampler; +import com.dfsek.terra.addons.image.colorsampler.ColorSampler; +import com.dfsek.terra.addons.image.colorsampler.mutate.TranslateColorSampler; public class TranslateColorSamplerTemplate extends MutateColorSamplerTemplate { diff --git a/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/sampler/image/TileImageColorSamplerTemplate.java b/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/sampler/image/TileImageColorSamplerTemplate.java deleted file mode 100644 index 759559c21..000000000 --- a/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/sampler/image/TileImageColorSamplerTemplate.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.dfsek.terra.addons.image.config.sampler.image; - -import com.dfsek.terra.addons.image.sampler.ColorSampler; -import com.dfsek.terra.addons.image.sampler.image.TileImageColorSampler; - - -public class TileImageColorSamplerTemplate extends ImageColorSamplerTemplate { - - @Override - public ColorSampler get() { - return new TileImageColorSampler(image, alignment); - } -}