Skip to content

Commit

Permalink
Switch space assembler module tier to metadata (#1157)
Browse files Browse the repository at this point in the history
  • Loading branch information
@serenibyss
serenibyss authored Jan 12, 2025
1 parent 24a9507 commit 0f97687
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 35 deletions.
4 changes: 2 additions & 2 deletions dependencies.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ dependencies {
compileOnly("com.github.GTNewHorizons:AkashicTome:1.2.0:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:Avaritia:1.59:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:twilightforest:2.7.2:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.5.18:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.5.20:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:Mantle:0.5.0:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.13.3-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:WitcheryExtras:1.3.0:dev") { transitive = false }
Expand All @@ -22,7 +22,7 @@ dependencies {
compileOnly rfg.deobf("curse.maven:extra-utilities-225561:2264384")
compileOnly("TGregworks:TGregworks:1.7.10-GTNH-1.0.26:deobf") { transitive = false }
compileOnly("com.github.GTNewHorizons:amunra:0.8.0:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:Galacticraft:3.3.1-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:Galacticraft:3.3.2-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:ForestryMC:4.10.1:dev") { transitive = false }
compileOnlyApi("com.github.GTNewHorizons:Mobs-Info:0.5.0-GTNH:dev")

Expand Down
71 changes: 38 additions & 33 deletions src/main/java/com/dreammaster/gthandler/recipes/SpaceAssemblerRecipes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@ public void run() {
GGMaterial.atomicSeparationCatalyst.getMolten(64 * 144),
Materials.Tartarite.getMolten(64 * 144),
Materials.Longasssuperconductornameforuvwire.getMolten(64 * 144))
.itemOutputs(ItemList.Black_Hole_Opener.get(1)).specialValue(1).duration(120 * SECONDS)
.eut(TierEU.RECIPE_UHV).addTo(IGRecipeMaps.spaceAssemblerRecipes);
.itemOutputs(ItemList.Black_Hole_Opener.get(1)).metadata(IGRecipeMaps.MODULE_TIER, 1)
.duration(120 * SECONDS).eut(TierEU.RECIPE_UHV).addTo(IGRecipeMaps.spaceAssemblerRecipes);

GTValues.RA.stdBuilder()
.itemInputs(
Expand All @@ -100,8 +100,8 @@ public void run() {
Materials.Osmiridium.getMolten(64 * 144),
Materials.Ledox.getMolten(64 * 144),
Materials.CallistoIce.getMolten(64 * 144))
.itemOutputs(ItemList.Black_Hole_Closer.get(1)).specialValue(1).duration(120 * SECONDS)
.eut(TierEU.RECIPE_UHV).addTo(IGRecipeMaps.spaceAssemblerRecipes);
.itemOutputs(ItemList.Black_Hole_Closer.get(1)).metadata(IGRecipeMaps.MODULE_TIER, 1)
.duration(120 * SECONDS).eut(TierEU.RECIPE_UHV).addTo(IGRecipeMaps.spaceAssemblerRecipes);

// Optically Perfected CPU
GTValues.RA.stdBuilder()
Expand All @@ -115,7 +115,7 @@ public void run() {
GGMaterial.atomicSeparationCatalyst.get(OrePrefixes.screw, 4),
GGMaterial.preciousMetalAlloy.get(OrePrefixes.screw, 4))
.fluidInputs(new FluidStack(solderUEV, 288)).itemOutputs(ItemList.Optically_Perfected_CPU.get(1L))
.specialValue(1).duration(20 * SECONDS).eut(TierEU.RECIPE_UHV)
.metadata(IGRecipeMaps.MODULE_TIER, 1).duration(20 * SECONDS).eut(TierEU.RECIPE_UHV)
.addTo(IGRecipeMaps.spaceAssemblerRecipes);

GTValues.RA.stdBuilder()
Expand All @@ -131,7 +131,7 @@ public void run() {
// Enriched Naquadah Alloy screw
GGMaterial.enrichedNaquadahAlloy.get(OrePrefixes.screw, 8))
.fluidInputs(new FluidStack(solderUEV, 576)).itemOutputs(ItemList.Optically_Perfected_CPU.get(4L))
.specialValue(2).duration(20 * SECONDS).eut(TierEU.RECIPE_UEV)
.metadata(IGRecipeMaps.MODULE_TIER, 2).duration(20 * SECONDS).eut(TierEU.RECIPE_UEV)
.addTo(IGRecipeMaps.spaceAssemblerRecipes);

GTValues.RA.stdBuilder()
Expand All @@ -147,7 +147,7 @@ public void run() {
// Shirabon screw
GGMaterial.shirabon.get(OrePrefixes.screw, 16))
.fluidInputs(new FluidStack(solderUEV, 1152)).itemOutputs(ItemList.Optically_Perfected_CPU.get(16L))
.specialValue(2).duration(20 * SECONDS).eut(TierEU.RECIPE_UIV)
.metadata(IGRecipeMaps.MODULE_TIER, 2).duration(20 * SECONDS).eut(TierEU.RECIPE_UIV)
.addTo(IGRecipeMaps.spaceAssemblerRecipes);

// Alternate Energy Orb Cluster Recipe
Expand All @@ -165,7 +165,7 @@ public void run() {
ItemList.Circuit_Parts_TransistorASMD.get(8L),
GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.Platinum, 64))
.fluidInputs(new FluidStack(solderIndalloy, 720)).itemOutputs(ItemList.Energy_LapotronicOrb2.get(1))
.specialValue(1).duration(50 * SECONDS).eut(TierEU.RECIPE_ZPM)
.metadata(IGRecipeMaps.MODULE_TIER, 1).duration(50 * SECONDS).eut(TierEU.RECIPE_ZPM)
.addTo(IGRecipeMaps.spaceAssemblerRecipes);

// Alternate Energy Module Recipe
Expand All @@ -183,7 +183,7 @@ public void run() {
ItemList.Circuit_Parts_TransistorXSMD.get(8L),
GTOreDictUnificator.get("wireFineHypogen", 48))
.fluidInputs(new FluidStack(solderUEV, 720)).itemOutputs(ItemList.Energy_Module.get(1))
.specialValue(1).duration(50 * SECONDS).eut(TierEU.RECIPE_UV)
.metadata(IGRecipeMaps.MODULE_TIER, 1).duration(50 * SECONDS).eut(TierEU.RECIPE_UV)
.addTo(IGRecipeMaps.spaceAssemblerRecipes);

// Advanced Radiation Proof Plate
Expand All @@ -197,8 +197,9 @@ public void run() {
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Osmiridium, 16L),
GTOreDictUnificator.get(OrePrefixes.plate, Materials.VibrantAlloy, 16L))
.fluidInputs(new FluidStack(solderIndalloy, (32 * 144)), Materials.Lead.getMolten(64 * 144L))
.itemOutputs(new ItemStack(Loaders.advancedRadiationProtectionPlate, 4, 0)).specialValue(1)
.duration(50 * SECONDS).eut(TierEU.RECIPE_ZPM).addTo(IGRecipeMaps.spaceAssemblerRecipes);
.itemOutputs(new ItemStack(Loaders.advancedRadiationProtectionPlate, 4, 0))
.metadata(IGRecipeMaps.MODULE_TIER, 1).duration(50 * SECONDS).eut(TierEU.RECIPE_ZPM)
.addTo(IGRecipeMaps.spaceAssemblerRecipes);

// Alternate Energy Cluster Recipe
GTValues.RA.stdBuilder()
Expand All @@ -217,7 +218,7 @@ public void run() {
ItemList.Circuit_Parts_TransistorXSMD.get(32L),
GTOreDictUnificator.get(OrePrefixes.wireGt01, MaterialsUEVplus.SpaceTime, 12L))
.fluidInputs(new FluidStack(solderUEV, 1440)).itemOutputs(ItemList.Energy_Cluster.get(1))
.specialValue(1).duration(50 * SECONDS).eut(TierEU.RECIPE_UHV)
.metadata(IGRecipeMaps.MODULE_TIER, 1).duration(50 * SECONDS).eut(TierEU.RECIPE_UHV)
.addTo(IGRecipeMaps.spaceAssemblerRecipes);

// Alternate Ultimate Battery Recipe
Expand All @@ -243,8 +244,8 @@ public void run() {
new FluidStack(solderUEV, 2880),
MaterialsUEVplus.WhiteDwarfMatter.getMolten(576),
MaterialsUEVplus.BlackDwarfMatter.getMolten(576))
.itemOutputs(ItemList.ZPM2.get(1)).specialValue(2).duration(50 * SECONDS).eut(TierEU.RECIPE_UEV)
.addTo(IGRecipeMaps.spaceAssemblerRecipes);
.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()) {
// Optically Compatible Memory
Expand All @@ -256,8 +257,8 @@ public void run() {
GTOreDictUnificator.get(OrePrefixes.screw, Materials.Infinity, 8L),
getModItem(SuperSolarPanels.ID, "solarsplitter", 1L, 0)) // Solar Light Splitter
.fluidInputs(new FluidStack(solderUEV, 288))
.itemOutputs(ItemList.Optically_Compatible_Memory.get(2)).specialValue(1).duration(20 * SECONDS)
.eut(TierEU.RECIPE_UHV).addTo(IGRecipeMaps.spaceAssemblerRecipes);
.itemOutputs(ItemList.Optically_Compatible_Memory.get(2)).metadata(IGRecipeMaps.MODULE_TIER, 1)
.duration(20 * SECONDS).eut(TierEU.RECIPE_UHV).addTo(IGRecipeMaps.spaceAssemblerRecipes);

GTValues.RA.stdBuilder().itemInputs(
getModItem(OpenComputers.ID, "item", 4L, 39), // Memory tier 3.5
Expand All @@ -267,8 +268,8 @@ public void run() {
GTOreDictUnificator.get(OrePrefixes.screw, Materials.Infinity, 16L),
getModItem(SuperSolarPanels.ID, "solarsplitter", 4L, 0)) // Solar Light Splitter
.fluidInputs(new FluidStack(solderUEV, 576))
.itemOutputs(ItemList.Optically_Compatible_Memory.get(8)).specialValue(2).duration(20 * SECONDS)
.eut(TierEU.RECIPE_UEV).addTo(IGRecipeMaps.spaceAssemblerRecipes);
.itemOutputs(ItemList.Optically_Compatible_Memory.get(8)).metadata(IGRecipeMaps.MODULE_TIER, 2)
.duration(20 * SECONDS).eut(TierEU.RECIPE_UEV).addTo(IGRecipeMaps.spaceAssemblerRecipes);

GTValues.RA.stdBuilder().itemInputs(
getModItem(OpenComputers.ID, "item", 16L, 39), // Memory tier 3.5
Expand All @@ -278,7 +279,7 @@ public void run() {
GTOreDictUnificator.get(OrePrefixes.screw, Materials.Infinity, 32L),
getModItem(SuperSolarPanels.ID, "solarsplitter", 16L, 0)) // Solar Light Splitter
.fluidInputs(new FluidStack(solderUEV, 1152))
.itemOutputs(ItemList.Optically_Compatible_Memory.get(32)).specialValue(2)
.itemOutputs(ItemList.Optically_Compatible_Memory.get(32)).metadata(IGRecipeMaps.MODULE_TIER, 2)
.duration(20 * SECONDS).eut(TierEU.RECIPE_UIV).addTo(IGRecipeMaps.spaceAssemblerRecipes);

// Advanced Stocking Input Hatch (ME)
Expand All @@ -293,8 +294,8 @@ public void run() {
// Hyper-Acceleration Card
getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 4L, 56))
.fluidInputs(new FluidStack(solderUEV, 2304))
.itemOutputs(ItemList.Hatch_Input_ME_Advanced.get(1)).specialValue(1).duration(15 * SECONDS)
.eut(TierEU.RECIPE_UHV).addTo(IGRecipeMaps.spaceAssemblerRecipes);
.itemOutputs(ItemList.Hatch_Input_ME_Advanced.get(1)).metadata(IGRecipeMaps.MODULE_TIER, 1)
.duration(15 * SECONDS).eut(TierEU.RECIPE_UHV).addTo(IGRecipeMaps.spaceAssemblerRecipes);
}

if (OpenComputers.isModLoaded()) {
Expand All @@ -308,8 +309,9 @@ public void run() {
GTOreDictUnificator.get(OrePrefixes.circuit, Materials.UV, 1L),
GTOreDictUnificator.get(OrePrefixes.foil, Materials.VanadiumGallium, 64L))
.fluidInputs(new FluidStack(solderIndalloy, 1152))
.itemOutputs(getModItem(OpenComputers.ID, "item", 64L, 39)).specialValue(1)
.duration(10 * SECONDS).eut(TierEU.RECIPE_UV).addTo(IGRecipeMaps.spaceAssemblerRecipes);
.itemOutputs(getModItem(OpenComputers.ID, "item", 64L, 39))
.metadata(IGRecipeMaps.MODULE_TIER, 1).duration(10 * SECONDS).eut(TierEU.RECIPE_UV)
.addTo(IGRecipeMaps.spaceAssemblerRecipes);
}

if (AppliedEnergistics2.isModLoaded() && AE2FluidCraft.isModLoaded()) {
Expand All @@ -325,7 +327,7 @@ public void run() {
getModItem(AE2FluidCraft.ID, "part_fluid_pattern_terminal_ex", 1))
.fluidInputs(new FluidStack(solderUEV, 9216))
.itemOutputs(getModItem(AppliedEnergistics2.ID, "tile.BlockPatternOptimizationMatrix", 1))
.specialValue(1).duration(5 * MINUTES).eut(TierEU.RECIPE_UHV)
.metadata(IGRecipeMaps.MODULE_TIER, 1).duration(5 * MINUTES).eut(TierEU.RECIPE_UHV)
.addTo(IGRecipeMaps.spaceAssemblerRecipes);
}

Expand Down Expand Up @@ -353,8 +355,8 @@ public void run() {
MaterialsUEVplus.Eternity.getNanite(4))
.fluidInputs(MaterialsUEVplus.Eternity.getMolten(36864))
.itemOutputs(getModItem(AppliedEnergistics2.ID, "item.ItemExtremeStorageCell.Universe", 1))
.specialValue(3).nbtSensitive().duration(1 * MINUTES).eut(TierEU.RECIPE_UXV)
.addTo(IGRecipeMaps.spaceAssemblerRecipes);
.metadata(IGRecipeMaps.MODULE_TIER, 3).nbtSensitive().duration(1 * MINUTES)
.eut(TierEU.RECIPE_UXV).addTo(IGRecipeMaps.spaceAssemblerRecipes);

// Digital Singularity ME Storage Cell
GTValues.RA.stdBuilder()
Expand All @@ -367,7 +369,7 @@ public void run() {
GTOreDictUnificator.get(OrePrefixes.block, Materials.CosmicNeutronium, 12L))
.fluidInputs(new FluidStack(solderUEV, 2304))
.itemOutputs(getModItem(AppliedEnergistics2.ID, "item.ItemExtremeStorageCell.Singularity", 1))
.specialValue(1).duration(10 * SECONDS).eut(TierEU.RECIPE_UHV)
.metadata(IGRecipeMaps.MODULE_TIER, 1).duration(10 * SECONDS).eut(TierEU.RECIPE_UHV)
.addTo(IGRecipeMaps.spaceAssemblerRecipes);
}

Expand All @@ -384,8 +386,9 @@ public void run() {
MaterialsUEVplus.MagMatter.getNanite(4),
MaterialsUEVplus.Eternity.getNanite(4))
.fluidInputs(MaterialsUEVplus.Eternity.getMolten(36864))
.itemOutputs(getModItem(AE2FluidCraft.ID, "fluid_storage.Universe", 1)).specialValue(3)
.duration(1 * MINUTES).eut(TierEU.RECIPE_UXV).addTo(IGRecipeMaps.spaceAssemblerRecipes);
.itemOutputs(getModItem(AE2FluidCraft.ID, "fluid_storage.Universe", 1))
.metadata(IGRecipeMaps.MODULE_TIER, 3).duration(1 * MINUTES).eut(TierEU.RECIPE_UXV)
.addTo(IGRecipeMaps.spaceAssemblerRecipes);

// ME Fluid Digital Singularity Storage Cell
GTValues.RA.stdBuilder()
Expand All @@ -398,8 +401,9 @@ public void run() {
getModItem(Avaritia.ID, "Resource", 4, 5),
GTOreDictUnificator.get(OrePrefixes.block, Materials.CosmicNeutronium, 12L))
.fluidInputs(new FluidStack(solderUEV, 2304))
.itemOutputs(getModItem(AE2FluidCraft.ID, "fluid_storage.singularity", 1, 0)).specialValue(1)
.duration(10 * SECONDS).eut(TierEU.RECIPE_UHV).addTo(IGRecipeMaps.spaceAssemblerRecipes);
.itemOutputs(getModItem(AE2FluidCraft.ID, "fluid_storage.singularity", 1, 0))
.metadata(IGRecipeMaps.MODULE_TIER, 1).duration(10 * SECONDS).eut(TierEU.RECIPE_UHV)
.addTo(IGRecipeMaps.spaceAssemblerRecipes);

// ME Essentia Digital Singularity Storage Cell
if (ThaumicEnergistics.isModLoaded()) {
Expand All @@ -412,8 +416,9 @@ public void run() {
getModItem(Avaritia.ID, "Resource", 4, 5),
GTOreDictUnificator.get(OrePrefixes.block, Materials.CosmicNeutronium, 12L))
.fluidInputs(new FluidStack(solderUEV, 2304))
.itemOutputs(getModItem(ThaumicEnergistics.ID, "storage.essentia", 1, 10)).specialValue(1)
.duration(10 * SECONDS).eut(TierEU.RECIPE_UHV).addTo(IGRecipeMaps.spaceAssemblerRecipes);
.itemOutputs(getModItem(ThaumicEnergistics.ID, "storage.essentia", 1, 10))
.metadata(IGRecipeMaps.MODULE_TIER, 1).duration(10 * SECONDS).eut(TierEU.RECIPE_UHV)
.addTo(IGRecipeMaps.spaceAssemblerRecipes);
}
}
}
Expand Down

0 comments on commit 0f97687

Please sign in to comment.