From fc58f5346c229be454efa1cd3ca3af960b7400a1 Mon Sep 17 00:00:00 2001
From: __felix__ <134875831+felixfour@users.noreply.github.com>
Date: Wed, 29 Jul 2026 11:52:12 -0400
Subject: [PATCH] fix loader check (#144)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .../WayofTime/alchemicalWizardry/AlchemicalWizardry.java     | 4 ++--
 .../alchemicalWizardry/common/items/BoundPickaxe.java        | 3 ++-
 .../common/rituals/RitualEffectMagnetic.java                 | 2 +-
 .../alchemicalWizardry/common/summoning/meteor/Meteor.java   | 5 +++--
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java b/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java
index dd0d925f..b0476f2d 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java
@@ -479,7 +479,7 @@ public class AlchemicalWizardry {
     public static int ritualWeakCostThunderstorm;
     public static int ritualWeakCostZombie;
 
-    public static boolean isGregTechLoaded;
+    public static boolean isGregTech5UnofficialNewHorizonsLoaded;
     public static boolean isThaumcraftLoaded;
     public static boolean isForestryLoaded;
     public static boolean isBotaniaLoaded;
@@ -3246,7 +3246,7 @@ public class AlchemicalWizardry {
     @EventHandler
     public void postInit(FMLPostInitializationEvent event) {
         proxy.registerPostSideObjects();
-        isGregTechLoaded = Loader.isModLoaded("gregtech");
+        isGregTech5UnofficialNewHorizonsLoaded = Loader.isModLoaded("gregtech_nh");
         isEndlessIdsLoaded = Loader.isModLoaded("endlessids");
         // TODO Thaumcraft Integration
         if (Loader.isModLoaded("Thaumcraft")) {
diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundPickaxe.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundPickaxe.java
index b7f2b6bc..941ff6b7 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundPickaxe.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundPickaxe.java
@@ -125,7 +125,8 @@ public class BoundPickaxe extends ItemPickaxe implements IBindable {
                         dropMultiset.add(new ItemType(block, meta));
                     } else {
                         ArrayList<ItemStack> itemDropList;
-                        if (AlchemicalWizardry.isGregTechLoaded && block instanceof GTBlockOre ore) {
+                        if (AlchemicalWizardry.isGregTech5UnofficialNewHorizonsLoaded
+                                && block instanceof GTBlockOre ore) {
                             itemDropList = ore.getDropsForPlayer(world, x, y, z, meta, fortuneLvl, player);
                         } else {
                             itemDropList = block.getDrops(world, x, y, z, meta, fortuneLvl);
diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectMagnetic.java b/src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectMagnetic.java
index 124ef72b..937d9f3b 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectMagnetic.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectMagnetic.java
@@ -36,7 +36,7 @@ public class RitualEffectMagnetic extends RitualEffect {
     public static boolean isBlockOre(Block block, int meta) {
         // Special case for lit redstone ore
         if (block instanceof BlockOre || block instanceof BlockRedstoneOre
-                || (AlchemicalWizardry.isGregTechLoaded && block instanceof GTBlockOre)) {
+                || (AlchemicalWizardry.isGregTech5UnofficialNewHorizonsLoaded && block instanceof GTBlockOre)) {
             return true;
         }
 
diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/summoning/meteor/Meteor.java b/src/main/java/WayofTime/alchemicalWizardry/common/summoning/meteor/Meteor.java
index 4766f362..af62fbe4 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/common/summoning/meteor/Meteor.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/summoning/meteor/Meteor.java
@@ -160,7 +160,8 @@ public class Meteor {
                 if (blockStack != null && blockStack.getItem() instanceof ItemBlock) {
                     ((ItemBlock) blockStack.getItem())
                             .placeBlockAt(blockStack, null, world, x, y, z, 0, 0, 0, 0, blockStack.getItemDamage());
-                    if (AlchemicalWizardry.isGregTechLoaded) setGTOresNaturalIfNeeded(world, x, y, z);
+                    if (AlchemicalWizardry.isGregTech5UnofficialNewHorizonsLoaded)
+                        setGTOresNaturalIfNeeded(world, x, y, z);
                     world.markBlockForUpdate(x, y, z);
                     break;
                 }
@@ -230,7 +231,7 @@ public class Meteor {
         this.fillerChance = Math.max(0f, Math.min(100f * (1 - ((float) getTotalListWeight(ores) / maxWeight)), 100.0f));
     }
 
-    @Optional.Method(modid = "gregtech")
+    @Optional.Method(modid = "gregtech_nh")
     private static void setGTOresNaturalIfNeeded(World world, int x, int y, int z) {
         try (OreInfo<?> info = OreManager.getOreInfo(world, x, y, z)) {
             if (info == null) return;