Revert to single-input-color version

Author: NegaNote

run/kubejs/server_scripts/PrismaC_test.js

@@ -1,38 +1,37 @@
 ServerEvents.recipes(event =>{
     event.recipes.gtceu.prismatic_crucible("test2")
-        .inputColor(PrismaticColor.RED)
+        .inputStates(PrismaticColor.RED)
         .itemInputs("minecraft:red_dye")
         .itemOutputs("minecraft:green_dye")
         .EUt(128)
         .duration(100)
         .outputStates(PrismaticColor.GREEN)
 
     event.recipes.gtceu.prismatic_crucible("test3")
-        .inputColor(PrismaticColor.GREEN)
+        .inputStates(PrismaticColor.GREEN)
         .itemInputs("minecraft:green_dye")
         .itemOutputs("minecraft:red_dye")
         .EUt(128)
         .duration(100)
         .outputStates(PrismaticColor.RED)
 
     event.recipes.gtceu.prismatic_crucible("test4")
-        .inputColor(PrismaticColor.GREEN)
+        .inputStates(PrismaticColor.GREEN)
         .itemInputs("minecraft:stone")
         .itemOutputs("minecraft:cobblestone")
         .EUt(128)
         .duration(100)
         .outputStates(PrismaticColor.RED)
 
     event.recipes.gtceu.prismatic_crucible("test5")
-        .inputColor(PrismaticColor.BASIC)
+        .inputStatesSpecial(SpecialCase.BASIC)
         .itemInputs("minecraft:white_dye")
         .itemOutputs("minecraft:black_dye")
         .EUt(128)
         .duration(100)
-        .outputStates(PrismaticColor.MAGENTA)
 
     event.recipes.gtceu.prismatic_crucible("test6")
-        .inputColor(PrismaticColor.RED)
+        .inputStates(PrismaticColor.RED)
         .itemInputs("minecraft:stone")
         .itemOutputs("minecraft:diamond", 4)
         .EUt(128)

src/main/java/net/neganote/monilabs/capability/recipe/ChromaRecipeCapability.java

@@ -2,7 +2,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Stream;
 
 import com.google.gson.JsonElement;
 import com.google.gson.JsonPrimitive;
@@ -29,25 +28,9 @@ public boolean isRecipeSearchFilter() {
     public List<AbstractMapIngredient> convertToMapIngredient(Object ingredient) {
         if (ingredient instanceof Color ingredientColor) {
             //TODO add the generic/special case "colors" ie primary colors
-            return switch (ingredientColor) {
-                case RED -> List.of(new MapColorIngredient(Color.RED));
-                case ORANGE -> List.of(new MapColorIngredient(Color.ORANGE));
-                case YELLOW -> List.of(new MapColorIngredient(Color.YELLOW));
-                case LIME -> List.of(new MapColorIngredient(Color.LIME));
-                case GREEN -> List.of(new MapColorIngredient(Color.GREEN));
-                case TEAL -> List.of(new MapColorIngredient(Color.TEAL));
-                case CYAN -> List.of(new MapColorIngredient(Color.CYAN));
-                case AZURE -> List.of(new MapColorIngredient(Color.AZURE));
-                case BLUE -> List.of(new MapColorIngredient(Color.BLUE));
-                case INDIGO -> List.of(new MapColorIngredient(Color.INDIGO));
-                case MAGENTA -> List.of(new MapColorIngredient(Color.MAGENTA));
-                case PINK -> List.of(new MapColorIngredient(Color.PINK));
-                case PRIMARY -> new ArrayList<>(Stream.of(Color.RED, Color.GREEN, Color.BLUE).map(MapColorIngredient::new).toList());
-                case SECONDARY -> new ArrayList<>(Stream.of(Color.YELLOW, Color.CYAN, Color.MAGENTA).map(MapColorIngredient::new).toList());
-                case BASIC -> new ArrayList<>(Stream.of(Color.RED, Color.YELLOW, Color.GREEN, Color.CYAN, Color.BLUE, Color.MAGENTA).map(MapColorIngredient::new).toList());
-                case TERTIARY -> new ArrayList<>(Stream.of(Color.ORANGE, Color.LIME, Color.TEAL, Color.AZURE, Color.INDIGO, Color.PINK).map(MapColorIngredient::new).toList());
-                case ANY -> new ArrayList<>(Stream.of(Color.COLORS).map(MapColorIngredient::new).toList());
-            };
+            List<AbstractMapIngredient> list = new ArrayList<>();
+            list.add(new MapColorIngredient(ingredientColor));
+            return list;
         } else {
             return super.convertToMapIngredient(ingredient);
         }

src/main/java/net/neganote/monilabs/common/machine/multiblock/PrismaticCrucibleMachine.java

@@ -107,26 +107,17 @@ public enum Color {
         BLUE(8, "monilabs.prismatic.color_name.blue", 0f, 0f, 1.0f),
         INDIGO(9, "monilabs.prismatic.color_name.indigo", 0.5f, 0f, 1.0f),
         MAGENTA(10, "monilabs.prismatic.color_name.magenta", 1.0f, 0f, 1.0f),
-        PINK(11, "monilabs.prismatic.color_name.pink", 1.0f, 0f, 0.5f),
-        PRIMARY(12, "", 0f, 0f, 0f),
-        SECONDARY(13, "", 0f, 0f, 0f),
-        BASIC(14, "", 0f, 0f, 0f),
-        TERTIARY(15, "", 0f, 0f, 0f),
-        ANY(16, "", 0f, 0f, 0f);
+        PINK(11, "monilabs.prismatic.color_name.pink", 1.0f, 0f, 0.5f);
 
         public static final Color[] COLORS = Color.values();
 
-        public static final Color[] ACTUAL_COLORS = new Color[]{RED, ORANGE, YELLOW, LIME, GREEN, TEAL, CYAN, AZURE, BLUE, INDIGO, MAGENTA, PINK};
-
         public final String nameKey;
         public final int key;
         public final float r;
         public final float g;
         public final float b;
 
-        public static final int COLOR_COUNT = COLORS.length;
-
-        public static final int ACTUAL_COLOR_COUNT = ACTUAL_COLORS.length;
+        public static final int COLOR_COUNT = Color.values().length;
 
         Color(int key, String nameKey, float r, float g, float b) {
             this.key = key;
@@ -136,27 +127,11 @@ public enum Color {
             this.b = b;
         }
 
-        public boolean isPrimary() {
-            return this == RED || this == GREEN || this == BLUE;
-        }
-
-        public boolean isSecondary() {
-            return this == YELLOW || this == CYAN || this == MAGENTA;
-        }
-
-        public boolean isBasic() {
-            return isPrimary() || isSecondary();
-        }
-
-        public boolean isTertiary() {
-            return !isBasic();
-        }
-
         public static Color getColorFromKey(int pKey) {
             return COLORS[pKey];
         }
         public static int getRandomColor() {
-            return (int) Math.floor(Math.random() * Color.ACTUAL_COLOR_COUNT);
+            return (int) Math.floor(Math.random() * Color.COLOR_COUNT);
         }
 
         public static int getRandomColorFromKeys(int[] keys) {

src/main/java/net/neganote/monilabs/integration/kjs/recipe/MoniRecipeSchema.java

@@ -26,12 +26,28 @@ enum SpecialCase {
     @SuppressWarnings({ "unused", "UnusedReturnValue" })
     @Accessors(chain = true, fluent = true)
     class MoniRecipeJS extends GTRecipeSchema.GTRecipeJS {
-        public GTRecipeSchema.GTRecipeJS inputColor(Color color) {
-            this.input(MoniRecipeCapabilities.CHROMA, color);
+
+        public GTRecipeSchema.GTRecipeJS inputStates(Color... states) {
+            for (Color color : states) {
+                this.input(MoniRecipeCapabilities.CHROMA, color);
+            }
 
             return this;
         }
 
+        // Used to have a shorthand for special cases in recipe definitions
+        public GTRecipeSchema.GTRecipeJS inputStatesSpecial(SpecialCase specialCase) {
+            return switch (specialCase) {
+                case PRIMARY -> this.inputStates(Color.RED, Color.GREEN, Color.BLUE); // Red, Green, Blue
+                case SECONDARY -> this.inputStates(Color.YELLOW, Color.CYAN, Color.MAGENTA); // Yellow, Cyan, Magenta
+                case BASIC -> this.inputStates(Color.RED, Color.YELLOW, Color.GREEN, Color.CYAN, Color.BLUE, Color.MAGENTA); // Primary + Secondary Colors
+                case TERTIARY -> this.inputStates(Color.ORANGE, Color.LIME, Color.TEAL, Color.AZURE, Color.INDIGO, Color.PINK); // Non-Basic Colors
+
+                // Saving computation by skipping unnecessary steps
+                case ANY -> this.addData("input_states", Color.COLOR_COUNT);
+            };
+        }
+
 
         public GTRecipeSchema.GTRecipeJS outputStates(boolean relative, Color... states) {