From 6b7fb822026e43cd529cd0396ef1055e5c5d2764 Mon Sep 17 00:00:00 2001
From: Astrash <astrash@protonmail.com>
Date: Sat, 26 Nov 2022 14:21:02 +1100
Subject: [PATCH] Put mutator color samplers in their own packages

---
 .../dfsek/terra/addons/image/ImageLibraryAddon.java |  2 +-
 .../sampler/mutate/MutateColorSamplerTemplate.java  | 13 +++++++++++++
 .../{ => mutate}/RotateColorSamplerTemplate.java    | 10 +++-------
 .../sampler/{ => mutate}/RotateColorSampler.java    |  3 ++-
 4 files changed, 19 insertions(+), 9 deletions(-)
 create mode 100644 common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/sampler/mutate/MutateColorSamplerTemplate.java
 rename common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/sampler/{ => mutate}/RotateColorSamplerTemplate.java (50%)
 rename common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/sampler/{ => mutate}/RotateColorSampler.java (83%)

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 01f33c839..9793958c4 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
@@ -5,7 +5,7 @@ import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
 import java.util.function.Supplier;
 
 import com.dfsek.terra.addons.image.config.ImageLoader;
-import com.dfsek.terra.addons.image.config.sampler.RotateColorSamplerTemplate;
+import com.dfsek.terra.addons.image.config.sampler.mutate.RotateColorSamplerTemplate;
 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;
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/sampler/mutate/MutateColorSamplerTemplate.java
new file mode 100644
index 000000000..35f5f137c
--- /dev/null
+++ b/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/sampler/mutate/MutateColorSamplerTemplate.java
@@ -0,0 +1,13 @@
+package com.dfsek.terra.addons.image.config.sampler.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;
+
+
+public abstract class MutateColorSamplerTemplate implements ObjectTemplate<ColorSampler> {
+    
+    @Value("image")
+    protected ColorSampler sampler;
+}
diff --git a/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/sampler/RotateColorSamplerTemplate.java b/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/sampler/mutate/RotateColorSamplerTemplate.java
similarity index 50%
rename from common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/sampler/RotateColorSamplerTemplate.java
rename to common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/sampler/mutate/RotateColorSamplerTemplate.java
index b7fcc4dc4..3122d3c34 100644
--- a/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/sampler/RotateColorSamplerTemplate.java
+++ b/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/sampler/mutate/RotateColorSamplerTemplate.java
@@ -1,17 +1,13 @@
-package com.dfsek.terra.addons.image.config.sampler;
+package com.dfsek.terra.addons.image.config.sampler.mutate;
 
 import com.dfsek.tectonic.api.config.template.annotations.Value;
-import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
 import net.jafama.FastMath;
 
 import com.dfsek.terra.addons.image.sampler.ColorSampler;
-import com.dfsek.terra.addons.image.sampler.RotateColorSampler;
+import com.dfsek.terra.addons.image.sampler.mutate.RotateColorSampler;
 
 
-public class RotateColorSamplerTemplate implements ObjectTemplate<ColorSampler> {
-    
-    @Value("image")
-    private ColorSampler sampler;
+public class RotateColorSamplerTemplate extends MutateColorSamplerTemplate {
     
     @Value("angle")
     private double angle;
diff --git a/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/sampler/RotateColorSampler.java b/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/sampler/mutate/RotateColorSampler.java
similarity index 83%
rename from common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/sampler/RotateColorSampler.java
rename to common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/sampler/mutate/RotateColorSampler.java
index f7e511617..92e99f59d 100644
--- a/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/sampler/RotateColorSampler.java
+++ b/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/sampler/mutate/RotateColorSampler.java
@@ -1,5 +1,6 @@
-package com.dfsek.terra.addons.image.sampler;
+package com.dfsek.terra.addons.image.sampler.mutate;
 
+import com.dfsek.terra.addons.image.sampler.ColorSampler;
 import net.jafama.FastMath;