Merge remote-tracking branch 'origin/migrate-dyson' into dev

GTNewHorizons · Dec 23, 2024 · b845e03 · b845e03
2 parents d0e8d40 + 160781c
commit b845e03
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/main/java/tectech/loader/recipe/Godforge.java b/src/main/java/tectech/loader/recipe/Godforge.java
@@ -1,7 +1,7 @@
 package tectech.loader.recipe;
 
 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.util.GTModHandler.getModItem;
 import static gregtech.api.util.GTRecipeBuilder.BUCKETS;
 import static gregtech.api.util.GTRecipeBuilder.INGOTS;
@@ -690,7 +690,7 @@ public void run() {
         magmatterItemsForNEI.addAll(exoticModuleMagmatterItemMap.keySet());
 
         // Godforge upgrade materials
-        if (EternalSingularity.isModLoaded() && GalaxySpace.isModLoaded()) {
+        if (EternalSingularity.isModLoaded() && GTNHIntergalactic.isModLoaded()) {
             ForgeOfGodsUpgrade.START.addExtraCost(
                 GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.SuperconductorUIVBase, 64),
                 ItemList.SuperconductorComposite.get(32),
@@ -712,7 +712,7 @@ public void run() {
                 CustomItemList.Godforge_StellarEnergySiphonCasing.get(8),
                 GregtechItemList.FusionComputer_UV3.get(8),
                 GregtechItemList.Casing_Fusion_Internal2.get(64),
-                getModItem(GalaxySpace.ID, "item.DysonSwarmParts", 64, 3),
+                getModItem(GTNHIntergalactic.ID, "item.DysonSwarmParts", 64, 3),
                 MaterialsAlloy.QUANTUM.getPlateDense(48),
                 MaterialsElements.STANDALONE.RHUGNOR.getGear(32),
                 getModItem(EternalSingularity.ID, "eternal_singularity", 16L),

diff --git a/src/main/java/tectech/loader/recipe/ResearchStationAssemblyLine.java b/src/main/java/tectech/loader/recipe/ResearchStationAssemblyLine.java
@@ -9,8 +9,8 @@
 import static gregtech.api.enums.Mods.DraconicEvolution;
 import static gregtech.api.enums.Mods.EternalSingularity;
 import static gregtech.api.enums.Mods.ExtraUtilities;
+import static gregtech.api.enums.Mods.GTNHIntergalactic;
 import static gregtech.api.enums.Mods.GalacticraftAmunRa;
-import static gregtech.api.enums.Mods.GalaxySpace;
 import static gregtech.api.enums.Mods.GraviSuite;
 import static gregtech.api.enums.Mods.IndustrialCraft2;
 import static gregtech.api.enums.Mods.NewHorizonsCoreMod;
@@ -2417,7 +2417,7 @@ private void addEOHRecipes() {
         {
             TTRecipeAdder.addResearchableAssemblylineRecipe(
                 // Dyson Swarm Module Deployment Unit Base Casing
-                getModItem(GalaxySpace.ID, "dysonswarmparts", 1, 2),
+                getModItem(GTNHIntergalactic.ID, "dysonswarmparts", 1, 2),
                 256_000_000, // total comp
                 16_384, // comp/s
                 (int) TierEU.RECIPE_MAX, // eu/t
@@ -2773,9 +2773,9 @@ private void addEOHRecipes() {
 
                         plateList[absoluteTier],
                         // Dyson Swarm Module Deployment Unit Base Casing
-                        getModItem(GalaxySpace.ID, "dysonswarmparts", (absoluteTier + 1) * 4, 2),
+                        getModItem(GTNHIntergalactic.ID, "dysonswarmparts", (absoluteTier + 1) * 4, 2),
                         // Dyson Swarm Energy Receiver Dish Block
-                        getModItem(GalaxySpace.ID, "dysonswarmparts", (absoluteTier + 1) * 4, 1),
+                        getModItem(GTNHIntergalactic.ID, "dysonswarmparts", (absoluteTier + 1) * 4, 1),
                         ItemList.AcceleratorUV.get((absoluteTier + 1) * 4),
 
                         ItemList.Energy_Module.get(absoluteTier + 1), GTOreDictUnificator
@@ -2853,7 +2853,7 @@ private void addEOHRecipes() {
                                 spatialCasings[absoluteTier],
                                 baseCasing,
                                 // Dyson Swarm Module.
-                                getModItem(GalaxySpace.ID, "item.DysonSwarmParts", 4 * (absoluteTier + 1), 0),
+                                getModItem(GTNHIntergalactic.ID, "item.DysonSwarmParts", 4 * (absoluteTier + 1), 0),
 
                                 GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.SuperconductorUMVBase, 4 * (absoluteTier + 1)),
                                 GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.SuperconductorUIVBase, 4 * (absoluteTier + 1)),
@@ -3534,7 +3534,7 @@ private void addWirelessEnergyRecipes() {
                 researchAmperage * 16,
                 new Object[] { laserTargets_UXV[i], new ItemStack(compactFusionCoil, 1, 4),
                     // Dyson Swarm Module Deployment Unit Superconducting Magnet
-                    getModItem(GalaxySpace.ID, "dysonswarmparts", 1, 4),
+                    getModItem(GTNHIntergalactic.ID, "dysonswarmparts", 1, 4),
                     CustomItemList.Machine_Multi_Transformer.get(1), CustomItemList.eM_Power.get(64),
                     GTOreDictUnificator.get(OrePrefixes.wireGt16, MaterialsUEVplus.SpaceTime, 64),
                     GTOreDictUnificator.get(OrePrefixes.plateDense, MaterialsUEVplus.Eternity, 32),