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

Migrate SuperSolarPanels items to Coremod #1164

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Migrate SuperSolarPanels items to Coremod #1164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 8 additions & 1 deletion src/main/java/com/dreammaster/gthandler/CustomItemList.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,14 @@ public enum CustomItemList implements IItemContainer {
ChevronHarmonic,
FramePartHarmonic,
StargateDustAncients,
StargateCrystalAncients;
StargateCrystalAncients,
SolarLightSplitter,
EnderQuantumComponent,
BlueSpectralComponent,
GreenSpectralComponent,
RedSpectralComponent,

;

private ItemStack mStack;
private boolean mHasNotBeenSet = true;
Expand Down
5 changes: 5 additions & 0 deletions src/main/java/com/dreammaster/gthandler/GT_Loader_Items.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,6 +449,11 @@ private void registerItems() {
CustomItemList.FramePartHarmonic.set(NHItemList.FramePartHarmonic.getIS());
CustomItemList.StargateDustAncients.set(NHItemList.StargateDustAncients.getIS());
CustomItemList.StargateCrystalAncients.set(NHItemList.StargateCrystalAncients.getIS());
CustomItemList.SolarLightSplitter.set(NHItemList.SolarLightSplitter.getIS());
CustomItemList.EnderQuantumComponent.set(NHItemList.EnderQuantumComponent.getIS());
CustomItemList.BlueSpectralComponent.set(NHItemList.BlueSpectralComponent.getIS());
CustomItemList.GreenSpectralComponent.set(NHItemList.GreenSpectralComponent.getIS());
CustomItemList.RedSpectralComponent.set(NHItemList.RedSpectralComponent.getIS());
}

private void registerTooltips() {
Expand Down
27 changes: 12 additions & 15 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 @@ -1152,20 +1152,18 @@ public void run() {
.itemOutputs(GTModHandler.getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 1, 2))
.duration(30 * SECONDS).eut(TierEU.RECIPE_EV).addTo(assemblerRecipes);
}

// Solar Light Splitter
if (SuperSolarPanels.isModLoaded()) {
GTValues.RA.stdBuilder()
.itemInputs(
NHItemList.BlueSpectralComponent.getIS(3),
NHItemList.RedSpectralComponent.getIS(3),
NHItemList.GreenSpectralComponent.getIS(3),
GTUtility.getIntegratedCircuit(1))
.itemOutputs(NHItemList.SolarLightSplitter.getIS()).duration(5 * SECONDS).eut(TierEU.RECIPE_HV)
.addTo(assemblerRecipes);

GTValues.RA.stdBuilder()
.itemInputs(
GTModHandler.getModItem(SuperSolarPanels.ID, "bluecomponent", 3L, 0),
GTModHandler.getModItem(SuperSolarPanels.ID, "redcomponent", 3L, 0),
GTModHandler.getModItem(SuperSolarPanels.ID, "greencomponent", 3L, 0),
GTUtility.getIntegratedCircuit(1))
.itemOutputs(GTModHandler.getModItem(SuperSolarPanels.ID, "solarsplitter", 1L, 0))
.duration(5 * SECONDS).eut(TierEU.RECIPE_HV).addTo(assemblerRecipes);
}
// Heat Exchangers

GTValues.RA.stdBuilder()
.itemInputs(
GTUtility.getIntegratedCircuit(21),
Expand Down Expand Up @@ -2309,15 +2307,14 @@ public void run() {
.duration(5 * SECONDS).eut(TierEU.RECIPE_LV).addTo(assemblerRecipes);

// Ender-Quantum Component
if (SuperSolarPanels.isModLoaded() && (AdvancedSolarPanel.isModLoaded())) {
if (AdvancedSolarPanel.isModLoaded()) {
GTValues.RA.stdBuilder()
.itemInputs(
GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.InfinityCatalyst, 1),
GTModHandler.getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 4, 3),
Materials.ElectrumFlux.getPlates(4))
.itemOutputs(GTModHandler.getModItem(SuperSolarPanels.ID, "enderquantumcomponent", 1, 0))
.duration(10 * SECONDS).eut(TierEU.RECIPE_HV).addTo(assemblerRecipes);

.itemOutputs(NHItemList.EnderQuantumComponent.getIS()).duration(10 * SECONDS).eut(TierEU.RECIPE_HV)
.addTo(assemblerRecipes);
}

// 16A Zpm to LuV transformer
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/com/dreammaster/gthandler/recipes/DTPFRecipes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import com.dreammaster.block.BlockList;
import com.dreammaster.gthandler.CustomItemList;
import com.dreammaster.gthandler.DTPFCalculator;
import com.dreammaster.item.NHItemList;

import goodgenerator.items.GGMaterial;
import goodgenerator.util.ItemRefer;
Expand Down Expand Up @@ -482,7 +483,7 @@ public void run() {
GTOreDictUnificator.get(OrePrefixes.stick, MaterialsUEVplus.TranscendentMetal, 8L),
MaterialsAlloy.BOTMIUM.getPlate(24),
MaterialsAlloy.ARCANITE.getScrew(16),
GTModHandler.getModItem(SuperSolarPanels.ID, "enderquantumcomponent", 1L))
NHItemList.EnderQuantumComponent.getIS())
.itemOutputs(ItemList.Tesseract.get(8)).fluidInputs(MaterialsUEVplus.ExcitedDTEC.getFluid(1000))
.fluidOutputs(MaterialsUEVplus.DimensionallyTranscendentResidue.getFluid(1000))
.duration(40 * SECONDS).eut(128_000_000).metadata(COIL_HEAT, eternal_heat)
Expand Down
22 changes: 9 additions & 13 deletions src/main/java/com/dreammaster/gthandler/recipes/LaserEngraverRecipes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import static gregtech.api.enums.Mods.GalacticraftCore;
import static gregtech.api.enums.Mods.OpenComputers;
import static gregtech.api.enums.Mods.SuperSolarPanels;
import static gregtech.api.recipe.RecipeMaps.laserEngraverRecipes;
import static gregtech.api.util.GTRecipeBuilder.MINUTES;
import static gregtech.api.util.GTRecipeBuilder.SECONDS;
Expand Down Expand Up @@ -177,18 +176,15 @@ public void run() {
Fluid oganesson = FluidRegistry.getFluid("oganesson") != null ? FluidRegistry.getFluid("oganesson")
: FluidRegistry.getFluid("radon");

if (SuperSolarPanels.isModLoaded()) {
// Photonically Enhanced Wafer
GTValues.RA.stdBuilder().itemInputs(
ItemList.Circuit_Silicon_Wafer6.get(1L), // Photonically Prepared Wafer
Materials.Glowstone.getNanite(1),
GTModHandler.getModItem(SuperSolarPanels.ID, "solarsplitter", 0L, 0) // Solar Light Splitter
).itemOutputs(ItemList.Circuit_Silicon_Wafer7.get(1L))
.fluidInputs(Materials.Tin.getPlasma(1000L), new FluidStack(oganesson, 4000))
.fluidOutputs(Materials.Tin.getMolten(1000L)).duration(10 * SECONDS).eut(7_864_320)
.requiresCleanRoom().addTo(laserEngraverRecipes);

}
// Photonically Enhanced Wafer
GTValues.RA.stdBuilder().itemInputs(
ItemList.Circuit_Silicon_Wafer6.get(1L), // Photonically Prepared Wafer
Materials.Glowstone.getNanite(1),
NHItemList.SolarLightSplitter.getIS(0) // Solar Light Splitter
).itemOutputs(ItemList.Circuit_Silicon_Wafer7.get(1L))
.fluidInputs(Materials.Tin.getPlasma(1000L), new FluidStack(oganesson, 4000))
.fluidOutputs(Materials.Tin.getMolten(1000L)).duration(10 * SECONDS).eut(7_864_320).requiresCleanRoom()
.addTo(laserEngraverRecipes);

GTValues.RA.stdBuilder()
.itemInputs(
Expand Down
13 changes: 5 additions & 8 deletions src/main/java/com/dreammaster/gthandler/recipes/SpaceAssemblerRecipes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
import static gregtech.api.enums.Mods.GTNHIntergalactic;
import static gregtech.api.enums.Mods.IndustrialCraft2;
import static gregtech.api.enums.Mods.OpenComputers;
import static gregtech.api.enums.Mods.SuperSolarPanels;
import static gregtech.api.enums.Mods.Thaumcraft;
import static gregtech.api.enums.Mods.ThaumicEnergistics;
import static gregtech.api.util.GTModHandler.getModItem;
Expand All @@ -23,6 +22,7 @@
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;

import com.dreammaster.item.NHItemList;
import com.gtnewhorizons.gtnhintergalactic.recipe.IGRecipeMaps;

import goodgenerator.items.GGMaterial;
Expand Down Expand Up @@ -249,16 +249,15 @@ public void run() {
.itemOutputs(ItemList.ZPM2.get(1)).metadata(IGRecipeMaps.MODULE_TIER, 2).duration(50 * SECONDS)
.eut(TierEU.RECIPE_UEV).addTo(IGRecipeMaps.spaceAssemblerRecipes);

if (OpenComputers.isModLoaded() && SuperSolarPanels.isModLoaded()) {
if (OpenComputers.isModLoaded()) {
// Optically Compatible Memory
GTValues.RA.stdBuilder().itemInputs(
getModItem(OpenComputers.ID, "item", 1L, 39), // Memory tier 3.5
ItemList.Circuit_Chip_Optical.get(1L),
CustomItemList.DATApipe.get(4L),
GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUEV, 4L),
GTOreDictUnificator.get(OrePrefixes.screw, Materials.Infinity, 8L),
getModItem(SuperSolarPanels.ID, "solarsplitter", 1L, 0)) // Solar Light Splitter
.fluidInputs(new FluidStack(solderUEV, 288))
NHItemList.SolarLightSplitter.getIS()).fluidInputs(new FluidStack(solderUEV, 288))
.itemOutputs(ItemList.Optically_Compatible_Memory.get(2)).metadata(IGRecipeMaps.MODULE_TIER, 1)
.duration(20 * SECONDS).eut(TierEU.RECIPE_UHV).addTo(IGRecipeMaps.spaceAssemblerRecipes);

Expand All @@ -268,8 +267,7 @@ public void run() {
CustomItemList.DATApipe.get(16L),
GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUIV, 4L),
GTOreDictUnificator.get(OrePrefixes.screw, Materials.Infinity, 16L),
getModItem(SuperSolarPanels.ID, "solarsplitter", 4L, 0)) // Solar Light Splitter
.fluidInputs(new FluidStack(solderUEV, 576))
NHItemList.SolarLightSplitter.getIS(4)).fluidInputs(new FluidStack(solderUEV, 576))
.itemOutputs(ItemList.Optically_Compatible_Memory.get(8)).metadata(IGRecipeMaps.MODULE_TIER, 2)
.duration(20 * SECONDS).eut(TierEU.RECIPE_UEV).addTo(IGRecipeMaps.spaceAssemblerRecipes);

Expand All @@ -279,8 +277,7 @@ public void run() {
CustomItemList.DATApipe.get(64L),
GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUMV, 4L),
GTOreDictUnificator.get(OrePrefixes.screw, Materials.Infinity, 32L),
getModItem(SuperSolarPanels.ID, "solarsplitter", 16L, 0)) // Solar Light Splitter
.fluidInputs(new FluidStack(solderUEV, 1152))
NHItemList.SolarLightSplitter.getIS(16)).fluidInputs(new FluidStack(solderUEV, 1152))
.itemOutputs(ItemList.Optically_Compatible_Memory.get(32)).metadata(IGRecipeMaps.MODULE_TIER, 2)
.duration(20 * SECONDS).eut(TierEU.RECIPE_UIV).addTo(IGRecipeMaps.spaceAssemblerRecipes);
}
Expand Down
5 changes: 5 additions & 0 deletions src/main/java/com/dreammaster/item/NHItemList.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -576,6 +576,11 @@ public enum NHItemList {
FramePartHarmonic(new ModSimpleBaseItem("HarmonicFramePart", ModTabList.ModSpaceTab)),
StargateDustAncients(new ModSimpleBaseItem("StargateDustAncients", ModTabList.ModSpaceTab)),
StargateCrystalAncients(new ModSimpleBaseItem("StargateCrystalAncients", ModTabList.ModSpaceTab)),
SolarLightSplitter(new ModSimpleBaseItem("SolarLightSplitter", ModTabList.ModSolarTab)),
EnderQuantumComponent(new ModSimpleBaseItem("EnderQuantumComponent", ModTabList.ModSolarTab)),
BlueSpectralComponent(new ModSimpleBaseItem("BlueSpectralComponent", ModTabList.ModSolarTab)),
GreenSpectralComponent(new ModSimpleBaseItem("GreenSpectralComponent", ModTabList.ModSolarTab)),
RedSpectralComponent(new ModSimpleBaseItem("RedSpectralComponent", ModTabList.ModSolarTab)),

// Do not delete this
EndOfList(null);
Expand Down
Loading
Loading