Merge branch 'master' into tico-zinc

GTNewHorizons · Jan 25, 2025 · c5ba520 · c5ba520
2 parents dfccfe1 + 427e4d6
commit c5ba520
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 31 deletions.
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -1,18 +1,18 @@
 // Add your dependencies here
 
 dependencies {
-    api("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.93:dev")
+    api("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.97:dev")
     api("com.github.GTNewHorizons:Yamcl:0.6.0:dev")
     api("com.github.GTNewHorizons:Baubles:1.0.4:dev")
 
-    implementation("com.github.GTNewHorizons:GTNHLib:0.6.3:dev")
+    implementation("com.github.GTNewHorizons:GTNHLib:0.6.5:dev")
 
     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.4:dev") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.5.28:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.5.29:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:Mantle:0.5.0:dev") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.13.7-GTNH:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.13.8-GTNH:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:WitcheryExtras:1.3.0:dev") { transitive = false }
     compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") { transitive = false }
     compileOnly rfg.deobf("curse.maven:witchery-69673:2234410")

diff --git a/src/main/java/com/dreammaster/scripts/ScriptAvaritiaAddons.java b/src/main/java/com/dreammaster/scripts/ScriptAvaritiaAddons.java
@@ -3,7 +3,9 @@
 import static gregtech.api.enums.Mods.AppliedEnergistics2;
 import static gregtech.api.enums.Mods.Avaritia;
 import static gregtech.api.enums.Mods.AvaritiaAddons;
+import static gregtech.api.enums.Mods.Botania;
 import static gregtech.api.enums.Mods.EternalSingularity;
+import static gregtech.api.enums.Mods.ForbiddenMagic;
 import static gregtech.api.enums.Mods.GregTech;
 import static gregtech.api.enums.Mods.IronChests;
 import static gregtech.api.enums.Mods.UniversalSingularities;
@@ -38,7 +40,6 @@
 import gregtech.api.util.GTUtility;
 import vazkii.botania.common.item.ModItems;
 import vazkii.botania.common.item.block.ItemBlockSpecialFlower;
-import vazkii.botania.common.lib.LibBlockNames;
 
 public class ScriptAvaritiaAddons implements IScriptLoader {
 
@@ -132,47 +133,49 @@ public void loadRecipes() {
         // Asgardandelion
         ExtremeCraftingManager.getInstance().addExtremeShapedOreRecipe(
                 ItemBlockSpecialFlower.ofType("asgardandelion"),
-                "R0D0G0E0M",
-                "000iii000",
-                "d0i876i0n",
-                "00iAZai00",
-                "T0i5B4i0r",
-                "010iii010",
+                "RXDXGXEXM",
+                "X009i900X",
+                "d0957490n",
+                "X0iAZai0X",
+                "T098B690r",
+                "X109i901X",
                 "t1102011H",
-                "001121100",
-                "e0K131S0m",
+                "X0112110X",
+                "eXK131SXm",
                 'R',
-                ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_ARCANE_ROSE),
+                getModItem(Botania.ID, "corporeaSpark", 1, 1),
                 'D',
-                ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_DANDELIFEON),
+                getModItem(Botania.ID, "rune", 1, 10),
                 'G',
-                ItemBlockSpecialFlower.ofType("beegonia"),
+                getModItem(Botania.ID, "rune", 1, 9),
                 'E',
-                ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_ENTROPINNYUM),
+                getModItem(Botania.ID, "rune", 1, 11),
                 'M',
-                ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_MUNCHDEW),
+                getModItem(ForbiddenMagic.ID, "WandCores", 1, 11),
                 'd',
-                ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_DAYBLOOM),
+                getModItem(Botania.ID, "rune", 1, 12),
                 'n',
-                ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_NIGHTSHADE),
+                getModItem(Botania.ID, "rune", 1, 13),
                 'T',
-                ItemBlockSpecialFlower.ofType("soarleander"),
+                getModItem(Botania.ID, "rune", 1, 14),
                 'r',
-                ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_RAFFLOWSIA),
+                getModItem(Botania.ID, "rune", 1, 15),
                 't',
-                ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_THERMALILY),
+                getModItem(Botania.ID, "rune", 1, 3),
                 'H',
-                ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_HYDROANGEAS),
+                getModItem(Botania.ID, "rune", 1, 6),
                 'e',
-                ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_ENDOFLAME),
+                getModItem(ForbiddenMagic.ID, "WandCores", 1, 7),
                 'K',
-                ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_KEKIMURUS),
+                getModItem(Botania.ID, "rune", 1, 5),
+                'X',
+                getModItem(Botania.ID, "bifrostPermPane", 1, 0),
                 '3',
                 new ItemStack(ModItems.blackLotus, 1, 1),
                 'S',
-                ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_SPECTROLUS),
+                getModItem(Botania.ID, "rune", 1, 4),
                 'm',
-                ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_NARSLIMMUS),
+                getModItem(Botania.ID, "lightRelay", 1, 1),
                 'Z',
                 new ItemStack(LudicrousBlocks.infinitato),
                 '1',
@@ -192,11 +195,13 @@ public void loadRecipes() {
                 '5',
                 "plateLivingrock",
                 '6',
-                "plateElvenElementium",
+                getModItem(ForbiddenMagic.ID, "WandCaps", 1, 5),
                 '7',
-                "plateManasteel",
+                getModItem(ForbiddenMagic.ID, "WandCaps", 1, 3),
                 '8',
-                "plateTerrasteel");
+                getModItem(ForbiddenMagic.ID, "WandCaps", 1, 2),
+                '9',
+                "nuggetInfinity");
         // Infinity Egg (Witchery)
         if (Config.witch) {