Fix DEDA Recipe Logic

Author: tier940

build.gradle

@@ -562,7 +562,7 @@ dependencies {
 
     compileOnlyApi 'org.jetbrains:annotations:24.1.0'
     annotationProcessor 'org.jetbrains:annotations:24.1.0'
-    patchedMinecraft('net.minecraft:launchwrapper:1.17.2') {
+    patchedMinecraft('net.minecraft:launchwrapper:1.12') {
         transitive = false
     }
 

libs/launchwrapper-1.17.2.jar

@@ -543,31 +543,31 @@ public static void init() {
                     .notConsumable(GTEMetaItems.SHAPE_MOLD_PRINTED_SILICON.getStackForm())
                     .fluidInputs(Materials.Silicon.getFluid(144))
                     .outputs(Mods.AppliedEnergistics2.getItem("material", 1, 20))
-                    .duration(200).EUt(VA[GTEValues.ae2VoltageTier - 1])
+                    .duration(200).EUt(VA[GTEValues.ae2VoltageTier])
                     .buildAndRegister();
 
             // Logic Circuit
             RecipeMaps.FLUID_SOLIDFICATION_RECIPES.recipeBuilder()
                     .notConsumable(GTEMetaItems.SHAPE_MOLD_LOGIC_PROCESSOR.getStackForm())
                     .fluidInputs(Materials.Gold.getFluid(144))
                     .outputs(Mods.AppliedEnergistics2.getItem("material", 1, 18))
-                    .duration(200).EUt(VA[GTEValues.ae2VoltageTier - 1])
+                    .duration(200).EUt(VA[GTEValues.ae2VoltageTier])
                     .buildAndRegister();
 
             // Calc Circuit
             RecipeMaps.FLUID_SOLIDFICATION_RECIPES.recipeBuilder()
                     .notConsumable(GTEMetaItems.SHAPE_MOLD_CALCULATION_PROCESSOR.getStackForm())
                     .fluidInputs(Materials.CertusQuartz.getFluid(144))
                     .outputs(Mods.AppliedEnergistics2.getItem("material", 1, 16))
-                    .duration(200).EUt(VA[GTEValues.ae2VoltageTier - 1])
+                    .duration(200).EUt(VA[GTEValues.ae2VoltageTier])
                     .buildAndRegister();
 
             // Engineer Circuit
             RecipeMaps.FLUID_SOLIDFICATION_RECIPES.recipeBuilder()
                     .notConsumable(GTEMetaItems.SHAPE_MOLD_ENGINEERING_PROCESSOR.getStackForm())
                     .fluidInputs(Materials.Diamond.getFluid(144))
                     .outputs(Mods.AppliedEnergistics2.getItem("material", 1, 17))
-                    .duration(200).EUt(VA[GTEValues.ae2VoltageTier - 1])
+                    .duration(200).EUt(VA[GTEValues.ae2VoltageTier])
                     .buildAndRegister();
         } else {
             // Silicon Processor Press

src/main/java/com/github/gtexpert/core/integration/ae/recipes/AEItemsRecipe.java

@@ -1,9 +1,18 @@
 package com.github.gtexpert.core.integration.deda;
 
+import static gregtech.api.GTValues.VA;
+
+import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
 
+import gregtech.api.recipes.ingredients.GTRecipeInput;
+import gregtech.api.recipes.ingredients.GTRecipeItemInput;
+import gregtech.api.recipes.ingredients.nbtmatch.NBTCondition;
+import gregtech.api.recipes.ingredients.nbtmatch.NBTMatcher;
+
 import gregicality.multiblocks.api.fluids.GCYMFluidStorageKeys;
 
+import com.github.gtexpert.core.api.GTEValues;
 import com.github.gtexpert.core.api.unification.material.GTEMaterials;
 
 /**
@@ -22,6 +31,10 @@ private DEDAConstants() {}
     public static final int DURATION_DRACONIC = 400;
     public static final int DURATION_CHAOTIC = 600;
 
+    public static int voltage(DraconicTier tier) {
+        return VA[GTEValues.dedaVoltageTier + tier.voltageOffset];
+    }
+
     public static FluidStack getCryotheum(DraconicTier tier) {
         return switch (tier) {
             case WYVERN -> GTEMaterials.Cryotheum.getFluid(16000);
@@ -38,6 +51,10 @@ public static FluidStack getPyrotheum(DraconicTier tier) {
         };
     }
 
+    public static GTRecipeInput inputWithAnyNBT(ItemStack stack) {
+        return new GTRecipeItemInput(stack).setNBTMatchingCondition(NBTMatcher.ANY, NBTCondition.ANY);
+    }
+
     /**
      * Draconic Evolution tool/armor tiers.
      */

src/main/java/com/github/gtexpert/core/integration/deda/DEDAConstants.java

@@ -22,20 +22,17 @@ public void register(@NotNull IModRegistry registry) {
             // Fusion categories
             String draconiumFusionCategory = GTValues.MODID + ":" +
                     GTEDraconicRecipeMaps.DRACONIUM_FUSION_RECIPES.unlocalizedName;
-            String awakenedFusionCategory = GTValues.MODID + ":" +
-                    GTEDraconicRecipeMaps.AWAKENED_DRACONIUM_FUSION_RECIPES.unlocalizedName;
 
             // Shared categories
             String tierUpCategory = GTValues.MODID + ":" +
                     GTEDraconicRecipeMaps.DRACONIC_FUSION_TIER_UP_RECIPES.unlocalizedName;
             String upgradeCategory = GTValues.MODID + ":" +
                     GTEDraconicRecipeMaps.DRACONIC_FUSION_UPGRADE_RECIPES.unlocalizedName;
 
-            // Register Fusion categories
-            registry.addRecipeCatalyst(DEDAMetaTileEntities.DRACONIUM_FUSION.getStackForm(),
-                    draconiumFusionCategory);
+            // Tier II can also process Tier I Fusion recipes
+            // (own RecipeMap catalysts are auto-registered by CEu)
             registry.addRecipeCatalyst(DEDAMetaTileEntities.AWAKENED_DRACONIUM_FUSION.getStackForm(),
-                    awakenedFusionCategory);
+                    draconiumFusionCategory);
 
             // Register TierUp category
             registry.addRecipeCatalyst(DEDAMetaTileEntities.DRACONIUM_FUSION.getStackForm(), tierUpCategory);

src/main/java/com/github/gtexpert/core/integration/deda/DEDARecipeHelper.java

@@ -0,0 +1,11 @@
+package com.github.gtexpert.core.integration.deda.recipemaps;
+
+import com.brandon3055.draconicevolution.api.fusioncrafting.IFusionRecipe;
+import com.github.bsideup.jabel.Desugar;
+
+/**
+ * Wrapper for draconic recipe info including the original Draconic Evolution recipe
+ * and machine tier requirement. Used by both TierUp and Upgrade recipes.
+ */
+@Desugar
+public record DraconicRecipeInfo(IFusionRecipe recipe, boolean requiresAwakenedCrafter) {}

src/main/java/com/github/gtexpert/core/integration/deda/provider/DEDAJEIProvider.java

@@ -0,0 +1,54 @@
+package com.github.gtexpert.core.integration.deda.recipemaps;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.resources.I18n;
+
+import gregtech.api.recipes.recipeproperties.RecipeProperty;
+
+public class DraconicRecipeProperty extends RecipeProperty<DraconicRecipeInfo> {
+
+    public static final String TIER_UP_KEY = "draconic_fusion_tier_up";
+    public static final String UPGRADE_KEY = "draconic_fusion_upgrade";
+
+    private static DraconicRecipeProperty TIER_UP_INSTANCE;
+    private static DraconicRecipeProperty UPGRADE_INSTANCE;
+
+    private final String langKeyPrefix;
+
+    private DraconicRecipeProperty(String key, String langKeyPrefix) {
+        super(key, DraconicRecipeInfo.class);
+        this.langKeyPrefix = langKeyPrefix;
+    }
+
+    public static DraconicRecipeProperty getTierUpInstance() {
+        if (TIER_UP_INSTANCE == null) {
+            TIER_UP_INSTANCE = new DraconicRecipeProperty(TIER_UP_KEY, "recipemap.draconic_fusion_tier_up");
+        }
+        return TIER_UP_INSTANCE;
+    }
+
+    public static DraconicRecipeProperty getUpgradeInstance() {
+        if (UPGRADE_INSTANCE == null) {
+            UPGRADE_INSTANCE = new DraconicRecipeProperty(UPGRADE_KEY, "recipemap.draconic_fusion_upgrade");
+        }
+        return UPGRADE_INSTANCE;
+    }
+
+    @Override
+    public void drawInfo(Minecraft minecraft, int x, int y, int color, Object value) {
+        DraconicRecipeInfo info = castValue(value);
+        String crafterKey = info.requiresAwakenedCrafter() ?
+                "recipemap.draconic_fusion.crafter.awakened" :
+                "recipemap.draconic_fusion.crafter.draconium";
+        // Draw 3 lines: crafter tier, property line 1, property line 2
+        // Compensate for getInfoHeight=30 by drawing at y-20, y-10, y
+        minecraft.fontRenderer.drawString(I18n.format(crafterKey), x, y - 20, color);
+        minecraft.fontRenderer.drawString(I18n.format(langKeyPrefix + ".property.1"), x, y - 10, color);
+        minecraft.fontRenderer.drawString(I18n.format(langKeyPrefix + ".property.2"), x, y, color);
+    }
+
+    @Override
+    public int getInfoHeight(Object value) {
+        return 30;
+    }
+}

src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/DraconicRecipeInfo.java

@@ -33,7 +33,8 @@ public class GTEDraconicRecipeMaps {
     @ZenProperty
     public static final RecipeMap<SimpleRecipeBuilder> AWAKENED_DRACONIUM_FUSION_RECIPES = new RecipeMapDraconicFusion(
             "awakened_draconium_fusion", 6, 3, 3, 1, new SimpleRecipeBuilder(), false,
-            DRACONIC_FUSION_TIER_UP_RECIPES, DRACONIC_FUSION_UPGRADE_RECIPES);
+            DRACONIC_FUSION_TIER_UP_RECIPES, DRACONIC_FUSION_UPGRADE_RECIPES,
+            (RecipeMapDraconicFusion) DRACONIUM_FUSION_RECIPES);
 
     static {
         DRACONIC_FUSION_TIER_UP_RECIPES

src/main/java/com/github/gtexpert/core/integration/deda/recipemaps/DraconicRecipeProperty.java

@@ -22,15 +22,27 @@ public class RecipeMapDraconicFusion extends RecipeMap<SimpleRecipeBuilder> {
 
     private final RecipeMapDraconicTierUp tierUpRecipeMap;
     private final RecipeMapDraconicUpgrade upgradeRecipeMap;
+    private final @Nullable RecipeMapDraconicFusion lowerTierMap;
 
     public RecipeMapDraconicFusion(@NotNull String unlocalizedName, int maxInputs, int maxOutputs, int maxFluidInputs,
                                    int maxFluidOutputs, @NotNull SimpleRecipeBuilder defaultRecipeBuilder,
                                    boolean isHidden,
                                    RecipeMapDraconicTierUp tierUpRecipeMap,
                                    RecipeMapDraconicUpgrade upgradeRecipeMap) {
+        this(unlocalizedName, maxInputs, maxOutputs, maxFluidInputs, maxFluidOutputs, defaultRecipeBuilder, isHidden,
+                tierUpRecipeMap, upgradeRecipeMap, null);
+    }
+
+    public RecipeMapDraconicFusion(@NotNull String unlocalizedName, int maxInputs, int maxOutputs, int maxFluidInputs,
+                                   int maxFluidOutputs, @NotNull SimpleRecipeBuilder defaultRecipeBuilder,
+                                   boolean isHidden,
+                                   RecipeMapDraconicTierUp tierUpRecipeMap,
+                                   RecipeMapDraconicUpgrade upgradeRecipeMap,
+                                   @Nullable RecipeMapDraconicFusion lowerTierMap) {
         super(unlocalizedName, maxInputs, maxOutputs, maxFluidInputs, maxFluidOutputs, defaultRecipeBuilder, isHidden);
         this.tierUpRecipeMap = tierUpRecipeMap;
         this.upgradeRecipeMap = upgradeRecipeMap;
+        this.lowerTierMap = lowerTierMap;
     }
 
     @Nullable
@@ -42,13 +54,29 @@ public Recipe findRecipe(long voltage, List<ItemStack> inputs, List<FluidStack>
             return fusionRecipe;
         }
 
-        // 2. Check TierUp recipes
+        // 2. Check lower-tier Fusion recipes
+        if (lowerTierMap != null) {
+            Recipe lowerTierRecipe = lowerTierMap.findOwnRecipe(voltage, inputs, fluidInputs, exactVoltage);
+            if (lowerTierRecipe != null) {
+                return lowerTierRecipe;
+            }
+        }
+
+        // 3. Check TierUp recipes
         Recipe tierUpRecipe = tierUpRecipeMap.findRecipe(voltage, inputs, fluidInputs, exactVoltage);
         if (tierUpRecipe != null) {
             return tierUpRecipe;
         }
 
-        // 3. Check Upgrade recipes
+        // 4. Check Upgrade recipes
         return upgradeRecipeMap.findRecipe(voltage, inputs, fluidInputs, exactVoltage);
     }
+
+    /**
+     * Searches only this map's own recipes, without delegating to TierUp/Upgrade/lowerTier.
+     */
+    @Nullable
+    Recipe findOwnRecipe(long voltage, List<ItemStack> inputs, List<FluidStack> fluidInputs, boolean exactVoltage) {
+        return super.findRecipe(voltage, inputs, fluidInputs, exactVoltage);
+    }
 }