Merge pull request #4 from AE2-Enthusiast/main

NegaNote · web-flow · commit c710290d0f96 · 2025-03-20T21:41:45.000-04:00
Properly Implement Special Case Colors
diff --git a/run/kubejs/server_scripts/PrismaC_test.js b/run/kubejs/server_scripts/PrismaC_test.js
@@ -1,40 +1,49 @@
 ServerEvents.recipes(event =>{
     event.recipes.gtceu.prismatic_crucible("test2")
-        .inputStates(PrismaticColor.RED)
+        .inputColor(PrismaticColor.RED)
         .itemInputs("minecraft:red_dye")
         .itemOutputs("minecraft:green_dye")
         .EUt(128)
         .duration(100)
         .outputStates(PrismaticColor.GREEN)
 
     event.recipes.gtceu.prismatic_crucible("test3")
-        .inputStates(PrismaticColor.GREEN)
+        .inputColor(PrismaticColor.GREEN)
         .itemInputs("minecraft:green_dye")
         .itemOutputs("minecraft:red_dye")
         .EUt(128)
         .duration(100)
         .outputStates(PrismaticColor.RED)
 
     event.recipes.gtceu.prismatic_crucible("test4")
-        .inputStates(PrismaticColor.GREEN)
+        .inputColor(PrismaticColor.GREEN)
         .itemInputs("minecraft:stone")
         .itemOutputs("minecraft:cobblestone")
         .EUt(128)
         .duration(100)
         .outputStates(PrismaticColor.RED)
 
     event.recipes.gtceu.prismatic_crucible("test5")
-        .inputStatesSpecial(SpecialCase.BASIC)
+        .inputColor(PrismaticColor.BASIC)
         .itemInputs("minecraft:white_dye")
         .itemOutputs("minecraft:black_dye")
         .EUt(128)
         .duration(100)
+        .outputStates(PrismaticColor.MAGENTA)
 
     event.recipes.gtceu.prismatic_crucible("test6")
-        .inputStates(PrismaticColor.RED)
+        .inputColor(PrismaticColor.RED)
         .itemInputs("minecraft:stone")
         .itemOutputs("minecraft:diamond", 4)
         .EUt(128)
         .duration(100)
         .outputStates(PrismaticColor.GREEN)
-})
+    
+    event.recipes.gtceu.prismatic_crucible("test7")
+        .inputColor(PrismaticColor.ANY)
+        .itemInputs("minecraft:dirt")
+        .itemOutputs("minecraft:diamond", 4)
+        .EUt(128)
+        .duration(100)
+        .outputStates(PrismaticColor.GREEN)
+})
diff --git a/src/main/java/net/neganote/monilabs/capability/recipe/ChromaRecipeCapability.java b/src/main/java/net/neganote/monilabs/capability/recipe/ChromaRecipeCapability.java
@@ -1,6 +1,7 @@
 package net.neganote.monilabs.capability.recipe;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 
 import com.google.gson.JsonElement;
@@ -10,6 +11,7 @@
 import com.gregtechceu.gtceu.api.recipe.lookup.AbstractMapIngredient;
 import com.mojang.serialization.Codec;
 
+import it.unimi.dsi.fastutil.objects.ObjectArrayList;
 import net.neganote.monilabs.common.machine.multiblock.PrismaticCrucibleMachine.Color;
 
 public class ChromaRecipeCapability extends RecipeCapability<Color> {
@@ -27,15 +29,30 @@ public boolean isRecipeSearchFilter() {
     @Override
     public List<AbstractMapIngredient> convertToMapIngredient(Object ingredient) {
         if (ingredient instanceof Color ingredientColor) {
-            //TODO add the generic/special case "colors" ie primary colors
-            List<AbstractMapIngredient> list = new ArrayList<>();
-            list.add(new MapColorIngredient(ingredientColor));
-            return list;
+            List<AbstractMapIngredient> ingredients = new ObjectArrayList<>();
+            ingredients.add(new MapColorIngredient(ingredientColor));
+            int key = ingredientColor.key;
+            if (key % 4 == 0) {
+                ingredients.add(new MapColorIngredient(Color.PRIMARY));
+                ingredients.add(new MapColorIngredient(Color.BASIC));
+            } else if ((key + 2) % 4 == 0) {
+                ingredients.add(new MapColorIngredient(Color.SECONDARY));
+                ingredients.add(new MapColorIngredient(Color.BASIC));
+            } else {
+                ingredients.add(new MapColorIngredient(Color.TERTIARY));
+            }
+            ingredients.add(new MapColorIngredient(Color.ANY));
+            return ingredients;
         } else {
             return super.convertToMapIngredient(ingredient);
         }
     }
 
+    @Override
+    public Color copyInner(Color content) {
+        return content;
+    }
+
     private static class SerializerColor implements IContentSerializer<Color> {
         public static SerializerColor INSTANCE = new SerializerColor();
 
diff --git a/src/main/java/net/neganote/monilabs/common/machine/multiblock/PrismaticCrucibleMachine.java b/src/main/java/net/neganote/monilabs/common/machine/multiblock/PrismaticCrucibleMachine.java
@@ -107,17 +107,26 @@ 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);
+        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);
 
         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 = Color.values().length;
+        public static final int COLOR_COUNT = COLORS.length;
+
+        public static final int ACTUAL_COLOR_COUNT = ACTUAL_COLORS.length;
 
         Color(int key, String nameKey, float r, float g, float b) {
             this.key = key;
@@ -127,11 +136,27 @@ 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.COLOR_COUNT);
+            return (int) Math.floor(Math.random() * Color.ACTUAL_COLOR_COUNT);
         }
 
         public static int getRandomColorFromKeys(int[] keys) {
diff --git a/src/main/java/net/neganote/monilabs/common/machine/trait/NotifiableChromaContainer.java b/src/main/java/net/neganote/monilabs/common/machine/trait/NotifiableChromaContainer.java
@@ -57,6 +57,25 @@ public List<Color> handleRecipeInner(IO io, GTRecipe recipe, List<Color> left, @
         if (left.contains(heldColor) && colors.contains(heldColor)) {
             return null;
         } else {
+            for (Color color : colors) {
+                int key = this.heldColor.key;
+                if (key % 4 == 0) {
+                    if (color == Color.PRIMARY)
+                        return null;
+                    if (color == Color.BASIC)
+                        return null;
+                } else if ((key + 2) % 4 == 0) {
+                    if (color == Color.SECONDARY)
+                        return null;
+                    if (color == Color.BASIC)
+                        return null;
+                } else {
+                    if (color == Color.TERTIARY)
+                        return null;
+                }
+                if (color == Color.ANY)
+                    return null;
+            }
             return left;
         }
     }
diff --git a/src/main/java/net/neganote/monilabs/integration/kjs/recipe/MoniRecipeSchema.java b/src/main/java/net/neganote/monilabs/integration/kjs/recipe/MoniRecipeSchema.java
@@ -26,28 +26,12 @@ enum SpecialCase {
     @SuppressWarnings({ "unused", "UnusedReturnValue" })
     @Accessors(chain = true, fluent = true)
     class MoniRecipeJS extends GTRecipeSchema.GTRecipeJS {
-
-        public GTRecipeSchema.GTRecipeJS inputStates(Color... states) {
-            for (Color color : states) {
-                this.input(MoniRecipeCapabilities.CHROMA, color);
-            }
+        public GTRecipeSchema.GTRecipeJS inputColor(Color color) {
+            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) {
 
