Use colorsampler package name instead of sampler

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;
 

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;
 

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;
 

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;

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;

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 {

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 {

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 {

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;
 

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;
 

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;
 
 

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 {

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<ColorSampler> {

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<ColorSampler> {

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 {

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);
+    }
+}

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<ColorSampler> {

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 {

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 {

common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/sampler/image/TileImageColorSamplerTemplate.java

@@ -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);
-    }
-}