Skip to content

fix loader check #144

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
UltraProdigy merged 6 commits into from
Jul 29, 2026
+8 −6
Merged

fix loader check #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
36311ae
fix loader check
felixfour Jul 29, 2026
f30d075
rename
felixfour Jul 29, 2026
dc6fb90
rename
felixfour Jul 29, 2026
5096d5f
rename
felixfour Jul 29, 2026
0b04c28
Spotless apply for branch fix-loader-check for #144 (#145)
github-actions[bot] Jul 29, 2026
b0ba972
fix optional method
felixfour Jul 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -3246,7 +3246,7 @@ public void load(FMLInitializationEvent event) {
@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")) {
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/WayofTime/alchemicalWizardry/common/items/BoundPickaxe.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,8 @@ public ItemStack onItemRightClick(ItemStack item, World world, EntityPlayer play
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);
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectMagnetic.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
5 changes: 3 additions & 2 deletions src/main/java/WayofTime/alchemicalWizardry/common/summoning/meteor/Meteor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,8 @@ private void setMeteorBlock(int x, int y, int z, World world, List<MeteorCompone
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;
}
Expand Down Expand Up @@ -230,7 +231,7 @@ private void maxWeightToFillerChance() {
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;
Expand Down