Skip to content

Commit

Permalink
Fix DS Parts Recipes (#1128)
Browse files Browse the repository at this point in the history
  • Loading branch information
@glowredman
glowredman authored Dec 29, 2024
1 parent 2b2f38d commit 3c64665
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 20 deletions.
2 changes: 1 addition & 1 deletion 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.1.9:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:Avaritia:1.57:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:twilightforest:2.7.1:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.5.8:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.5.10:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:Mantle:0.4.2:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.13.1-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:WitcheryExtras:1.2.3:dev") { transitive = false }
Expand Down
32 changes: 16 additions & 16 deletions src/main/java/com/dreammaster/gthandler/recipes/AssemblingLineRecipes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import static gregtech.api.enums.Mods.Avaritia;
import static gregtech.api.enums.Mods.Computronics;
import static gregtech.api.enums.Mods.EternalSingularity;
import static gregtech.api.enums.Mods.GalaxySpace;
import static gregtech.api.enums.Mods.GTNHIntergalactic;
import static gregtech.api.enums.Mods.GraviSuite;
import static gregtech.api.enums.Mods.OpenComputers;
import static gregtech.api.enums.Mods.SGCraft;
Expand Down Expand Up @@ -43,6 +43,7 @@
import net.minecraftforge.fluids.FluidStack;

import com.dreammaster.gthandler.CustomItemList;
import com.gtnewhorizons.gtnhintergalactic.item.IGItems;

import appeng.api.AEApi;
import bartworks.common.loaders.ItemRegistry;
Expand Down Expand Up @@ -340,21 +341,20 @@ public void run() {
30 * SECONDS,
(int) TierEU.RECIPE_UEV);

if (GalaxySpace.isModLoaded()) {
if (GTNHIntergalactic.isModLoaded()) {
// Dyson Swarm Module
TTRecipeAdder.addResearchableAssemblylineRecipe(
GTModHandler.getModItem(OpenComputers.ID, "item", 1, 91),
192_000,
512,
(int) TierEU.RECIPE_UEV,
16,
new Object[] { ItemList.Cover_SolarPanel_LuV.get(4),
GTModHandler.getModItem(GalaxySpace.ID, "item.DysonSwarmParts", 8, 3),
new Object[] { ItemList.Cover_SolarPanel_LuV.get(4), new ItemStack(IGItems.DysonSwarmItems, 8, 3),
new Object[] { OrePrefixes.circuit.get(Materials.UHV), 2L },
ItemList.Circuit_Chip_QPIC.get(2), ItemList.Emitter_UEV.get(1), ItemList.Sensor_UEV.get(1),
GTModHandler.getModItem(OpenComputers.ID, "item", 4, 91) },
new FluidStack[] { new FluidStack(solderUEV, 18_432) },
GTModHandler.getModItem(GalaxySpace.ID, "item.DysonSwarmParts", 64, 0),
new ItemStack(IGItems.DysonSwarmItems, 64, 0),
5 * SECONDS,
(int) TierEU.RECIPE_UHV);

Expand All @@ -372,18 +372,18 @@ public void run() {
new FluidStack[] { new FluidStack(FluidRegistry.getFluid("liquid helium"), 50_000),
Materials.SuperCoolant.getFluid(16_000), new FluidStack(solderUEV, 11_520),
Materials.UUMatter.getFluid(8_000) },
GTModHandler.getModItem(GalaxySpace.ID, "dysonswarmparts", 4, 0),
GTModHandler.getModItem(GTNHIntergalactic.ID, "dysonswarmparts", 4, 0),
40 * SECONDS,
(int) TierEU.RECIPE_UEV);

// Dyson Swarm Energy Receiver Dish Block
TTRecipeAdder.addResearchableAssemblylineRecipe(
GTModHandler.getModItem(GalaxySpace.ID, "item.DysonSwarmParts", 1, 3),
new ItemStack(IGItems.DysonSwarmItems, 1, 3),
192000,
512,
(int) TierEU.RECIPE_UHV,
32,
new ItemStack[] { GTModHandler.getModItem(GalaxySpace.ID, "item.DysonSwarmParts", 64, 3),
new ItemStack[] { new ItemStack(IGItems.DysonSwarmItems, 64, 3),
ItemRefer.Advanced_Radiation_Protection_Plate.get(64), ItemList.Reactor_Coolant_Sp_6.get(1),
ItemList.Reactor_Coolant_Sp_6.get(1), ItemList.Reactor_Coolant_Sp_6.get(1),
ItemList.Reactor_Coolant_Sp_6.get(1),
Expand All @@ -392,7 +392,7 @@ public void run() {
new FluidStack[] { MaterialsElements.STANDALONE.RHUGNOR.getFluidStack(40),
Materials.SuperCoolant.getFluid(16_000), new FluidStack(solderUEV, 11_520),
Materials.UUMatter.getFluid(8_000) },
GTModHandler.getModItem(GalaxySpace.ID, "dysonswarmparts", 3, 1),
GTModHandler.getModItem(GTNHIntergalactic.ID, "dysonswarmparts", 3, 1),
30 * SECONDS,
(int) TierEU.RECIPE_UEV);

Expand All @@ -410,7 +410,7 @@ public void run() {
new FluidStack[] { MaterialsUEVplus.DimensionallyShiftedSuperfluid.getFluid(50000),
Materials.SuperCoolant.getFluid(16_000), new FluidStack(solderUEV, 11_520),
Materials.UUMatter.getFluid(8_000) },
GTModHandler.getModItem(GalaxySpace.ID, "dysonswarmparts", 4, 2),
GTModHandler.getModItem(GTNHIntergalactic.ID, "dysonswarmparts", 4, 2),
40 * SECONDS,
(int) TierEU.RECIPE_UEV);

Expand All @@ -428,7 +428,7 @@ public void run() {
new FluidStack[] { MaterialsUEVplus.DimensionallyShiftedSuperfluid.getFluid(50_000),
Materials.SuperCoolant.getFluid(16_000), new FluidStack(solderUEV, 11520),
Materials.UUMatter.getFluid(8_000) },
GTModHandler.getModItem(GalaxySpace.ID, "dysonswarmparts", 1, 3),
GTModHandler.getModItem(GTNHIntergalactic.ID, "dysonswarmparts", 1, 3),
10 * SECONDS,
(int) TierEU.RECIPE_UEV);

Expand All @@ -446,7 +446,7 @@ public void run() {
new FluidStack[] { MaterialsElements.STANDALONE.RHUGNOR.getFluidStack(40),
Materials.SuperCoolant.getFluid(16_000), new FluidStack(solderUEV, 11_520),
Materials.UUMatter.getFluid(8_000) },
GTModHandler.getModItem(GalaxySpace.ID, "dysonswarmparts", 4, 4),
GTModHandler.getModItem(GTNHIntergalactic.ID, "dysonswarmparts", 4, 4),
40 * SECONDS,
(int) TierEU.RECIPE_UEV);

Expand All @@ -462,7 +462,7 @@ public void run() {
tectech.thing.CustomItemList.Machine_Multi_Computer.get(4), },
new FluidStack[] { Materials.SuperCoolant.getFluid(32_000), new FluidStack(solderUEV, 11_520),
Materials.UUMatter.getFluid(8_000) },
GTModHandler.getModItem(GalaxySpace.ID, "dysonswarmparts", 8, 5),
GTModHandler.getModItem(GTNHIntergalactic.ID, "dysonswarmparts", 8, 5),
80 * SECONDS,
(int) TierEU.RECIPE_UEV);

Expand All @@ -480,7 +480,7 @@ public void run() {
CustomItemList.MicaInsulatorFoil.get(64), CustomItemList.MicaInsulatorFoil.get(64) },
new FluidStack[] { Materials.RadoxPolymer.getMolten(3_456), Materials.SuperCoolant.getFluid(16_000),
new FluidStack(solderUEV, 11_520), Materials.UUMatter.getFluid(8_000) },
GTModHandler.getModItem(GalaxySpace.ID, "dysonswarmparts", 4, 6),
GTModHandler.getModItem(GTNHIntergalactic.ID, "dysonswarmparts", 4, 6),
40 * SECONDS,
(int) TierEU.RECIPE_UEV);

Expand All @@ -498,7 +498,7 @@ public void run() {
CustomItemList.MicaInsulatorFoil.get(64), CustomItemList.MicaInsulatorFoil.get(64) },
new FluidStack[] { Materials.RadoxPolymer.getMolten(3_240), Materials.SuperCoolant.getFluid(16_000),
new FluidStack(solderUEV, 11_520), Materials.UUMatter.getFluid(8_000) },
GTModHandler.getModItem(GalaxySpace.ID, "dysonswarmparts", 4, 7),
GTModHandler.getModItem(GTNHIntergalactic.ID, "dysonswarmparts", 4, 7),
40 * SECONDS,
(int) TierEU.RECIPE_UEV);

Expand All @@ -514,7 +514,7 @@ public void run() {
GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.SuperconductorUEVBase, 4), },
new FluidStack[] { Materials.RadoxPolymer.getMolten(144), Materials.SuperCoolant.getFluid(16_000),
new FluidStack(solderUEV, 11_520), Materials.UUMatter.getFluid(8_000) },
GTModHandler.getModItem(GalaxySpace.ID, "dysonswarmparts", 1, 8),
GTModHandler.getModItem(GTNHIntergalactic.ID, "dysonswarmparts", 1, 8),
10 * SECONDS,
(int) TierEU.RECIPE_UEV);

Expand Down
8 changes: 6 additions & 2 deletions src/main/java/com/dreammaster/scripts/ScriptAmunRa.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.dreammaster.scripts;

import static gregtech.api.enums.Mods.AdvancedSolarPanel;
import static gregtech.api.enums.Mods.GTNHIntergalactic;
import static gregtech.api.enums.Mods.GTPlusPlus;
import static gregtech.api.enums.Mods.GalacticraftAmunRa;
import static gregtech.api.enums.Mods.GalacticraftCore;
Expand Down Expand Up @@ -37,6 +38,8 @@
import net.minecraftforge.oredict.ShapedOreRecipe;
import net.minecraftforge.oredict.ShapelessOreRecipe;

import com.gtnewhorizons.gtnhintergalactic.item.IGItems;

import cpw.mods.fml.common.Optional;
import cpw.mods.fml.common.registry.GameRegistry;
import de.katzenpapst.amunra.block.ARBlocks;
Expand Down Expand Up @@ -68,6 +71,7 @@ public List<String> getDependencies() {
GalaxySpace.ID,
GoodGenerator.ID,
GraviSuite.ID,
GTNHIntergalactic.ID,
GTPlusPlus.ID,
IronChests.ID,
RandomThings.ID,
Expand All @@ -88,11 +92,11 @@ public void loadRecipes() {
final Block machines4 = GameRegistry.findBlock(GalacticraftAmunRa.ID, "tile.machines4");
final Block msBoosters1 = GameRegistry.findBlock(GalacticraftAmunRa.ID, "tile.msBoosters1");
final Block airLockFrame = GameRegistry.findBlock(GalacticraftCore.ID, "tile.airLockFrame");
final Block machineFrames = GameRegistry.findBlock(GalaxySpace.ID, "machineframes");
final Block machineFrames = GameRegistry.findBlock(GTNHIntergalactic.ID, "machineframes");

final Item baseItem = GameRegistry.findItem(GalacticraftAmunRa.ID, "item.baseItem");
final Item basicItem = GameRegistry.findItem(GalacticraftCore.ID, "item.basicItem");
final Item dysonSwarmParts = GameRegistry.findItem(GalaxySpace.ID, "item.DysonSwarmParts");
final Item dysonSwarmParts = IGItems.DysonSwarmItems;
final Item advancedRadiationProtectionPlate = GameRegistry
.findItem(GoodGenerator.ID, "advancedRadiationProtectionPlate");
final Item simpleItem = GameRegistry.findItem(GraviSuite.ID, "itemSimpleItem");
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/dreammaster/scripts/ScriptGalaxySpace.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ public void loadRecipes() {
.itemInputs(
BlockList.NeutroniumPlatedReinforcedStone.getIS(),
WerkstoffLoader.HDCS.get(OrePrefixes.plate, 8))
.itemOutputs(getIGItem("dysonswarmparts", 1, 9))
.itemOutputs(new ItemStack(IGItems.DysonSwarmItems, 1, 9))
.fluidInputs(FluidRegistry.getFluidStack("molten.adamantium alloy", 144)).duration(25 * SECONDS)
.eut(TierEU.RECIPE_LuV).addTo(assemblerRecipes);
GTValues.RA.stdBuilder()
Expand Down

0 comments on commit 3c64665

Please sign in to comment.