Convert advanced solar panel

GTNewHorizons · Jan 13, 2025 · fa6bfe7 · fa6bfe7
1 parent d8e8c78
commit fa6bfe7
Showing 1 changed file with 57 additions and 37 deletions.
diff --git a/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java
@@ -9513,52 +9513,72 @@ private void makeSolderingAlloyRecipes() {
             // --- Advanced Solar Panel
             if (AdvancedSolarPanel.isModLoaded()) {
 
+                // Conversion recipes to gt solars
                 GTValues.RA.stdBuilder()
-                        .itemInputs(
-                                ItemList.Hull_LV.get(1L),
-                                ItemList.Cover_SolarPanel_LV.get(1L),
-                                ItemList.Robot_Arm_LV.get(1L),
-                                ItemList.Battery_RE_LV_Lithium.get(1L),
-                                GTUtility.getIntegratedCircuit(2))
-                        .itemOutputs(GTModHandler.getModItem(AdvancedSolarPanel.ID, "BlockAdvSolarPanel", 1L, 0))
-                        .fluidInputs(tMat.getMolten(288L * tMultiplier / 2L)).duration(40 * SECONDS)
-                        .eut(TierEU.RECIPE_MV).addTo(assemblerRecipes);
+                        .itemInputs(GTModHandler.getModItem(AdvancedSolarPanel.ID, "BlockAdvSolarPanel", 1L, 0))
+                        .itemOutputs(ItemList.Machine_LV_SolarPanel.get(1L))
+                        .duration(1 * SECONDS).eut(TierEU.RECIPE_LV).addTo(assemblerRecipes);
 
                 GTValues.RA.stdBuilder()
-                        .itemInputs(
-                                ItemList.Hull_MV.get(1L),
-                                ItemList.Cover_SolarPanel_MV.get(1L),
-                                ItemList.Robot_Arm_MV.get(1L),
-                                ItemList.Battery_RE_MV_Lithium.get(1L),
-                                GTUtility.getIntegratedCircuit(2))
-                        .itemOutputs(GTModHandler.getModItem(AdvancedSolarPanel.ID, "BlockAdvSolarPanel", 1L, 1))
-                        .fluidInputs(tMat.getMolten(576L * tMultiplier / 2L)).duration(50 * SECONDS)
-                        .eut(TierEU.RECIPE_HV).addTo(assemblerRecipes);
+                        .itemInputs(GTModHandler.getModItem(AdvancedSolarPanel.ID, "BlockAdvSolarPanel", 1L, 1))
+                        .itemOutputs(ItemList.Machine_MV_SolarPanel.get(1L))
+                        .duration(1 * SECONDS).eut(TierEU.RECIPE_LV).addTo(assemblerRecipes);
 
                 GTValues.RA.stdBuilder()
-                        .itemInputs(
-                                ItemList.Hull_HV.get(1L),
-                                ItemList.Cover_SolarPanel_HV.get(1L),
-                                ItemList.Robot_Arm_HV.get(1L),
-                                ItemList.Battery_RE_HV_Lithium.get(1L),
-                                GTUtility.getIntegratedCircuit(2))
-                        .itemOutputs(GTModHandler.getModItem(AdvancedSolarPanel.ID, "BlockAdvSolarPanel", 1L, 2))
-                        .fluidInputs(tMat.getMolten(864L * tMultiplier / 2L)).duration(60 * SECONDS)
-                        .eut(TierEU.RECIPE_EV).addTo(assemblerRecipes);
+                        .itemInputs(GTModHandler.getModItem(AdvancedSolarPanel.ID, "BlockAdvSolarPanel", 1L, 2))
+                        .itemOutputs(ItemList.Machine_HV_SolarPanel.get(1L))
+                        .duration(1 * SECONDS).eut(TierEU.RECIPE_LV).addTo(assemblerRecipes);
 
                 GTValues.RA.stdBuilder()
-                        .itemInputs(
-                                ItemList.Hull_EV.get(1L),
-                                ItemList.Cover_SolarPanel_EV.get(1L),
-                                ItemList.Robot_Arm_EV.get(1L),
-                                ItemList.BatteryHull_EV_Full.get(1L),
-                                GTUtility.getIntegratedCircuit(2))
-                        .itemOutputs(GTModHandler.getModItem(AdvancedSolarPanel.ID, "BlockAdvSolarPanel", 1L, 3))
-                        .fluidInputs(tMat.getMolten(1152L * tMultiplier / 2L)).duration(1 * MINUTES + 10 * SECONDS)
-                        .eut(TierEU.RECIPE_IV).addTo(assemblerRecipes);
-
+                        .itemInputs(GTModHandler.getModItem(AdvancedSolarPanel.ID, "BlockAdvSolarPanel", 1L, 3))
+                        .itemOutputs(ItemList.Machine_EV_SolarPanel.get(1L))
+                        .duration(1 * SECONDS).eut(TierEU.RECIPE_LV).addTo(assemblerRecipes);
             }
 
+            GTValues.RA.stdBuilder()
+                    .itemInputs(
+                            ItemList.Hull_LV.get(1L),
+                            ItemList.Cover_SolarPanel_LV.get(1L),
+                            ItemList.Robot_Arm_LV.get(1L),
+                            ItemList.Battery_RE_LV_Lithium.get(1L),
+                            GTUtility.getIntegratedCircuit(2))
+                    .itemOutputs(ItemList.Machine_LV_SolarPanel.get(1L))
+                    .fluidInputs(tMat.getMolten(288L * tMultiplier / 2L)).duration(40 * SECONDS)
+                    .eut(TierEU.RECIPE_MV).addTo(assemblerRecipes);
+
+            GTValues.RA.stdBuilder()
+                    .itemInputs(
+                            ItemList.Hull_MV.get(1L),
+                            ItemList.Cover_SolarPanel_MV.get(1L),
+                            ItemList.Robot_Arm_MV.get(1L),
+                            ItemList.Battery_RE_MV_Lithium.get(1L),
+                            GTUtility.getIntegratedCircuit(2))
+                    .itemOutputs(ItemList.Machine_MV_SolarPanel.get(1L))
+                    .fluidInputs(tMat.getMolten(576L * tMultiplier / 2L)).duration(50 * SECONDS)
+                    .eut(TierEU.RECIPE_HV).addTo(assemblerRecipes);
+
+            GTValues.RA.stdBuilder()
+                    .itemInputs(
+                            ItemList.Hull_HV.get(1L),
+                            ItemList.Cover_SolarPanel_HV.get(1L),
+                            ItemList.Robot_Arm_HV.get(1L),
+                            ItemList.Battery_RE_HV_Lithium.get(1L),
+                            GTUtility.getIntegratedCircuit(2))
+                    .itemOutputs(ItemList.Machine_HV_SolarPanel.get(1L))
+                    .fluidInputs(tMat.getMolten(864L * tMultiplier / 2L)).duration(60 * SECONDS)
+                    .eut(TierEU.RECIPE_EV).addTo(assemblerRecipes);
+
+            GTValues.RA.stdBuilder()
+                    .itemInputs(
+                            ItemList.Hull_EV.get(1L),
+                            ItemList.Cover_SolarPanel_EV.get(1L),
+                            ItemList.Robot_Arm_EV.get(1L),
+                            ItemList.BatteryHull_EV_Full.get(1L),
+                            GTUtility.getIntegratedCircuit(2))
+                    .itemOutputs(ItemList.Machine_EV_SolarPanel.get(1L))
+                    .fluidInputs(tMat.getMolten(1152L * tMultiplier / 2L)).duration(1 * MINUTES + 10 * SECONDS)
+                    .eut(TierEU.RECIPE_IV).addTo(assemblerRecipes);
+
             // --- Super Solar Panel
             if (SuperSolarPanels.isModLoaded()) {