Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Convert solar panel recipes #1161

Merged
merged 6 commits into from
Jan 14, 2025
Merged

Convert solar panel recipes #1161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fa6bfe7
Convert advanced solar panel
FourIsTheNumber Jan 13, 2025
e610fa4
Convert super solar panel
FourIsTheNumber Jan 13, 2025
df9856c
solar helmets
FourIsTheNumber Jan 14, 2025
fcf97ef
dyson
FourIsTheNumber Jan 14, 2025
76b8ac6
recycling panels
FourIsTheNumber Jan 14, 2025
701bcc2
Merge branch 'master' into gtsolars
serenibyss Jan 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
192 changes: 116 additions & 76 deletions src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9506,102 +9506,142 @@ 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);
}

// --- Super Solar Panel
if (SuperSolarPanels.isModLoaded()) {

// Conversion recipes to gt solars
GTValues.RA.stdBuilder()
.itemInputs(
ItemList.Hull_IV.get(1L),
ItemList.Cover_SolarPanel_IV.get(1L),
ItemList.Robot_Arm_IV.get(1L),
ItemList.BatteryHull_IV_Full.get(1L),
GTUtility.getIntegratedCircuit(2))
.itemOutputs(GTModHandler.getModItem(SuperSolarPanels.ID, "SpectralSolarPanel", 1L, 0))
.fluidInputs(tMat.getMolten(1440 * tMultiplier / 2L)).duration(1 * MINUTES + 20 * SECONDS)
.eut(TierEU.RECIPE_LuV).addTo(assemblerRecipes);
.itemInputs(GTModHandler.getModItem(SuperSolarPanels.ID, "SpectralSolarPanel", 1L, 0))
.itemOutputs(ItemList.Machine_IV_SolarPanel.get(1L)).duration(1 * SECONDS).eut(TierEU.RECIPE_LV)
.addTo(assemblerRecipes);

GTValues.RA.stdBuilder()
.itemInputs(
ItemList.Hull_LuV.get(1L),
ItemList.Cover_SolarPanel_LuV.get(1L),
ItemList.Robot_Arm_LuV.get(1L),
ItemList.BatteryHull_LuV_Full.get(1L),
GTUtility.getIntegratedCircuit(2))
.itemOutputs(GTModHandler.getModItem(SuperSolarPanels.ID, "SingularSolarPanel", 1L, 0))
.fluidInputs(tMat.getMolten(1728 * tMultiplier / 2L)).duration(1 * MINUTES + 30 * SECONDS)
.eut(TierEU.RECIPE_ZPM).addTo(assemblerRecipes);
.itemInputs(GTModHandler.getModItem(SuperSolarPanels.ID, "SingularSolarPanel", 1L, 0))
.itemOutputs(ItemList.Machine_LuV_SolarPanel.get(1L)).duration(1 * SECONDS)
.eut(TierEU.RECIPE_LV).addTo(assemblerRecipes);

GTValues.RA.stdBuilder()
.itemInputs(
ItemList.Hull_ZPM.get(1L),
ItemList.Cover_SolarPanel_ZPM.get(1L),
ItemList.Robot_Arm_ZPM.get(1L),
ItemList.BatteryHull_ZPM_Full.get(1L),
GTUtility.getIntegratedCircuit(2))
.itemOutputs(GTModHandler.getModItem(SuperSolarPanels.ID, "AdminSolarPanel", 1L, 0))
.fluidInputs(tMat.getMolten(2016 * tMultiplier / 2L)).duration(1 * MINUTES + 40 * SECONDS)
.eut(TierEU.RECIPE_UV).addTo(assemblerRecipes);
.itemInputs(GTModHandler.getModItem(SuperSolarPanels.ID, "AdminSolarPanel", 1L, 0))
.itemOutputs(ItemList.Machine_ZPM_SolarPanel.get(1L)).duration(1 * SECONDS)
.eut(TierEU.RECIPE_LV).addTo(assemblerRecipes);

GTValues.RA.stdBuilder()
.itemInputs(
ItemList.Hull_UV.get(1L),
ItemList.Cover_SolarPanel_UV.get(1L),
ItemList.Robot_Arm_UV.get(1L),
ItemList.BatteryHull_UV_Full.get(1L),
GTUtility.getIntegratedCircuit(2))
.itemOutputs(GTModHandler.getModItem(SuperSolarPanels.ID, "PhotonicSolarPanel", 1L, 0))
.fluidInputs(tMat.getMolten(2304 * tMultiplier / 2L)).duration(1 * MINUTES + 50 * SECONDS)
.eut(TierEU.RECIPE_UHV).addTo(assemblerRecipes);

.itemInputs(GTModHandler.getModItem(SuperSolarPanels.ID, "PhotonicSolarPanel", 1L, 0))
.itemOutputs(ItemList.Machine_UV_SolarPanel.get(1L)).duration(1 * SECONDS).eut(TierEU.RECIPE_LV)
.addTo(assemblerRecipes);
}

// 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(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);

GTValues.RA.stdBuilder()
.itemInputs(
ItemList.Hull_IV.get(1L),
ItemList.Cover_SolarPanel_IV.get(1L),
ItemList.Robot_Arm_IV.get(1L),
ItemList.BatteryHull_IV_Full.get(1L),
GTUtility.getIntegratedCircuit(2))
.itemOutputs(ItemList.Machine_IV_SolarPanel.get(1L))
.fluidInputs(tMat.getMolten(1440 * tMultiplier / 2L)).duration(1 * MINUTES + 20 * SECONDS)
.eut(TierEU.RECIPE_LuV).addTo(assemblerRecipes);

GTValues.RA.stdBuilder()
.itemInputs(
ItemList.Hull_LuV.get(1L),
ItemList.Cover_SolarPanel_LuV.get(1L),
ItemList.Robot_Arm_LuV.get(1L),
ItemList.BatteryHull_LuV_Full.get(1L),
GTUtility.getIntegratedCircuit(2))
.itemOutputs(ItemList.Machine_LuV_SolarPanel.get(1L))
.fluidInputs(tMat.getMolten(1728 * tMultiplier / 2L)).duration(1 * MINUTES + 30 * SECONDS)
.eut(TierEU.RECIPE_ZPM).addTo(assemblerRecipes);

GTValues.RA.stdBuilder()
.itemInputs(
ItemList.Hull_ZPM.get(1L),
ItemList.Cover_SolarPanel_ZPM.get(1L),
ItemList.Robot_Arm_ZPM.get(1L),
ItemList.BatteryHull_ZPM_Full.get(1L),
GTUtility.getIntegratedCircuit(2))
.itemOutputs(ItemList.Machine_ZPM_SolarPanel.get(1L))
.fluidInputs(tMat.getMolten(2016 * tMultiplier / 2L)).duration(1 * MINUTES + 40 * SECONDS)
.eut(TierEU.RECIPE_UV).addTo(assemblerRecipes);

GTValues.RA.stdBuilder()
.itemInputs(
ItemList.Hull_UV.get(1L),
ItemList.Cover_SolarPanel_UV.get(1L),
ItemList.Robot_Arm_UV.get(1L),
ItemList.BatteryHull_UV_Full.get(1L),
GTUtility.getIntegratedCircuit(2))
.itemOutputs(ItemList.Machine_UV_SolarPanel.get(1L))
.fluidInputs(tMat.getMolten(2304 * tMultiplier / 2L)).duration(1 * MINUTES + 50 * SECONDS)
.eut(TierEU.RECIPE_UHV).addTo(assemblerRecipes);

// solar 1EU

GTValues.RA.stdBuilder()
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/com/dreammaster/gthandler/recipes/AssemblingLineRecipes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
import static gregtech.api.enums.Mods.GraviSuite;
import static gregtech.api.enums.Mods.OpenComputers;
import static gregtech.api.enums.Mods.SGCraft;
import static gregtech.api.enums.Mods.SuperSolarPanels;
import static gregtech.api.util.GTModHandler.getModItem;
import static gregtech.api.util.GTRecipeBuilder.HOURS;
import static gregtech.api.util.GTRecipeBuilder.MINUTES;
Expand Down Expand Up @@ -500,7 +499,7 @@ public void run() {

// Dyson Swarm Controller
TTRecipeAdder.addResearchableAssemblylineRecipe(
GTModHandler.getModItem(SuperSolarPanels.ID, "PhotonicSolarPanel", 1),
ItemList.Machine_UV_SolarPanel.get(1),
192_000,
512,
(int) TierEU.RECIPE_UEV,
Expand Down
16 changes: 8 additions & 8 deletions src/main/java/com/dreammaster/scripts/ScriptAdvancedSolarPanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public void loadRecipes() {
addShapedRecipe(
getModItem(AdvancedSolarPanel.ID, "advanced_solar_helmet", 1, 0, missing),
"craftingToolWrench",
getModItem(AdvancedSolarPanel.ID, "BlockAdvSolarPanel", 1, 0, missing),
ItemList.Machine_LV_SolarPanel.get(1),
"craftingToolScrewdriver",
"circuitAdvanced",
getModItem(IndustrialCraft2.ID, "itemArmorNanoHelmet", 1, wildcard, missing),
Expand All @@ -48,7 +48,7 @@ public void loadRecipes() {
addShapedRecipe(
getModItem(AdvancedSolarPanel.ID, "hybrid_solar_helmet", 1, 0, missing),
"craftingToolWrench",
getModItem(AdvancedSolarPanel.ID, "BlockAdvSolarPanel", 1, 1, missing),
ItemList.Machine_MV_SolarPanel.get(1),
"craftingToolScrewdriver",
"circuitMaster",
getModItem(IndustrialCraft2.ID, "itemArmorQuantumHelmet", 1, wildcard, missing),
Expand All @@ -61,9 +61,9 @@ public void loadRecipes() {
"craftingToolWrench",
"circuitUltimate",
"craftingToolScrewdriver",
"craftingSolarPanelHV",
ItemList.Machine_HV_SolarPanel.get(1),
getModItem(AdvancedSolarPanel.ID, "hybrid_solar_helmet", 1, wildcard, missing),
"craftingSolarPanelHV",
ItemList.Machine_HV_SolarPanel.get(1),
"cableGt04VanadiumGallium",
ItemList.Transformer_IV_EV.get(1L),
"cableGt04VanadiumGallium");
Expand Down Expand Up @@ -92,31 +92,31 @@ public void loadRecipes() {
addShapedRecipe(
ItemList.Cover_SolarPanel_LV.get(1L),
"craftingToolCrowbar",
getModItem(AdvancedSolarPanel.ID, "BlockAdvSolarPanel", 1, 0, missing),
ItemList.Machine_LV_SolarPanel.get(1),
"craftingToolScrewdriver",
"craftingToolWrench",
"craftingToolHardHammer",
"craftingToolFile");
addShapedRecipe(
ItemList.Cover_SolarPanel_MV.get(1L),
"craftingToolCrowbar",
getModItem(AdvancedSolarPanel.ID, "BlockAdvSolarPanel", 1, 1, missing),
ItemList.Machine_MV_SolarPanel.get(1),
"craftingToolScrewdriver",
"craftingToolWrench",
"craftingToolHardHammer",
"craftingToolFile");
addShapedRecipe(
ItemList.Cover_SolarPanel_HV.get(1L),
"craftingToolCrowbar",
getModItem(AdvancedSolarPanel.ID, "BlockAdvSolarPanel", 1, 2, missing),
ItemList.Machine_HV_SolarPanel.get(1),
"craftingToolScrewdriver",
"craftingToolWrench",
"craftingToolHardHammer",
"craftingToolFile");
addShapedRecipe(
ItemList.Cover_SolarPanel_EV.get(1L),
"craftingToolCrowbar",
getModItem(AdvancedSolarPanel.ID, "BlockAdvSolarPanel", 1, 3, missing),
ItemList.Machine_EV_SolarPanel.get(1),
"craftingToolScrewdriver",
"craftingToolWrench",
"craftingToolHardHammer",
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/com/dreammaster/scripts/ScriptSuperSolarPanels.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,31 +34,31 @@ public void loadRecipes() {
addShapedRecipe(
ItemList.Cover_SolarPanel_IV.get(1L),
"craftingToolCrowbar",
getModItem(SuperSolarPanels.ID, "SpectralSolarPanel", 1, 0, missing),
ItemList.Machine_IV_SolarPanel.get(1),
"craftingToolScrewdriver",
"craftingToolWrench",
"craftingToolHardHammer",
"craftingToolFile");
addShapedRecipe(
ItemList.Cover_SolarPanel_LuV.get(1L),
"craftingToolCrowbar",
getModItem(SuperSolarPanels.ID, "SingularSolarPanel", 1, 0, missing),
ItemList.Machine_LuV_SolarPanel.get(1),
"craftingToolScrewdriver",
"craftingToolWrench",
"craftingToolHardHammer",
"craftingToolFile");
addShapedRecipe(
ItemList.Cover_SolarPanel_ZPM.get(1L),
"craftingToolCrowbar",
getModItem(SuperSolarPanels.ID, "AdminSolarPanel", 1, 0, missing),
ItemList.Machine_ZPM_SolarPanel.get(1),
"craftingToolScrewdriver",
"craftingToolWrench",
"craftingToolHardHammer",
"craftingToolFile");
addShapedRecipe(
ItemList.Cover_SolarPanel_UV.get(1L),
"craftingToolCrowbar",
getModItem(SuperSolarPanels.ID, "PhotonicSolarPanel", 1, 0, missing),
ItemList.Machine_UV_SolarPanel.get(1),
"craftingToolScrewdriver",
"craftingToolWrench",
"craftingToolHardHammer",
Expand Down
Loading