From 806dae35764a440d1642752f2763a2ddc31fa9ec Mon Sep 17 00:00:00 2001 From: Guillaume Mercier Date: Tue, 30 Apr 2024 04:14:29 -0400 Subject: [PATCH] Fix conflicting recipes for EOH dilation parts. (#280) - Simply rotates the order of the spectral components. This works out because it's always 3 tiers that end up conflicting. - T1-T2 all use white dwarf matter and mk2 fusions - T4-T5 all use black dwarf matter and mk3 fusions - T8-T9 all use MDCM and and mk4 fusions --- .../recipe/ResearchStationAssemblyLine.java | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/github/technus/tectech/loader/recipe/ResearchStationAssemblyLine.java b/src/main/java/com/github/technus/tectech/loader/recipe/ResearchStationAssemblyLine.java index ec96996f2..dc7b1772d 100644 --- a/src/main/java/com/github/technus/tectech/loader/recipe/ResearchStationAssemblyLine.java +++ b/src/main/java/com/github/technus/tectech/loader/recipe/ResearchStationAssemblyLine.java @@ -2857,6 +2857,16 @@ ME_Singularity, plateList[absoluteTier], getItemContainer("QuantumCircuit").get( CustomItemList.TimeAccelerationFieldGeneratorTier7.get(1), CustomItemList.TimeAccelerationFieldGeneratorTier8.get(1) }; + // Spectral Components + // Cycling should fix issues with conflicting recipes for T1-T2, T4-T5 & T7-T8 + final ItemStack[] spectralComponents = new ItemStack[] { + // Red Spectral Component + getModItem(SuperSolarPanels.ID, "redcomponent", 64), + // Green Spectral Component + getModItem(SuperSolarPanels.ID, "greencomponent", 64), + // Blue Spectral Component + getModItem(SuperSolarPanels.ID, "bluecomponent", 64) }; + for (int absoluteTier = 0; absoluteTier < 9; absoluteTier++) { TT_recipeAdder.addResearchableAssemblylineRecipe( @@ -2871,11 +2881,11 @@ ME_Singularity, plateList[absoluteTier], getItemContainer("QuantumCircuit").get( getItemContainer("QuantumCircuit").get(absoluteTier + 1), // Red Spectral Component - getModItem(SuperSolarPanels.ID, "redcomponent", 64), + spectralComponents[absoluteTier % spectralComponents.length], // Green Spectral Component - getModItem(SuperSolarPanels.ID, "greencomponent", 64), + spectralComponents[(absoluteTier + 1) % spectralComponents.length], // Blue Spectral Component - getModItem(SuperSolarPanels.ID, "bluecomponent", 64), + spectralComponents[(absoluteTier + 2) % spectralComponents.length], plateList[absoluteTier], // Dyson Swarm Module Deployment Unit Base Casing