From 609ffad199e8187a4c1bf32ff1eacf8622fba130 Mon Sep 17 00:00:00 2001 From: mikle Date: Sat, 3 Jan 2026 15:03:51 +0400 Subject: [PATCH 1/4] Allow fortune to work with GT ores using Bound Pickaxe right click. --- dependencies.gradle | 3 ++- .../common/items/BoundPickaxe.java | 12 ++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 13d534d9b6..bb25b57b51 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -26,7 +26,8 @@ dependencies { api("com.github.GTNewHorizons:waila:1.9.2:dev") api("com.github.GTNewHorizons:NotEnoughItems:2.8.15-GTNH:dev") - compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.52.45:dev") {transitive = false } + compileOnly("com.github.GTNewHorizons:GTNHLib:0.8.41:dev") {transitive = false } + compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.52.185:dev") {transitive = false } compileOnly("com.github.GTNewHorizons:Botania:1.13.3-GTNH:api") {transitive = false } compileOnly("com.github.GTNewHorizons:ForestryMC:4.10.17:api") {transitive = false } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundPickaxe.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundPickaxe.java index e9ac86d0c1..af1df3a074 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundPickaxe.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundPickaxe.java @@ -3,6 +3,7 @@ import java.util.ArrayList; import java.util.List; +import gregtech.common.blocks.GTBlockOre; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.enchantment.EnchantmentHelper; @@ -118,8 +119,15 @@ public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, Enti .canSilkHarvest(par2World, par3EntityPlayer, posX + i, posY + j, posZ + k, meta)) { dropMultiset.add(new ItemType(block, meta)); } else { - ArrayList itemDropList = block - .getDrops(par2World, posX + i, posY + j, posZ + k, meta, fortuneLvl); + ArrayList itemDropList; + if (AlchemicalWizardry.isGregTechLoaded && block instanceof GTBlockOre) { + itemDropList = ((GTBlockOre) block) + .getDropsFortune(par2World, posX + i, posY + j, posZ + k, meta, fortuneLvl, par3EntityPlayer); + } + else{ + itemDropList = block + .getDrops(par2World, posX + i, posY + j, posZ + k, meta, fortuneLvl); + } if (itemDropList != null) { for (ItemStack stack : itemDropList) From a4efe90341d89eb47f566c9a61d32a8039fbfd64 Mon Sep 17 00:00:00 2001 From: mikle Date: Sat, 3 Jan 2026 16:36:57 +0400 Subject: [PATCH 2/4] Method name change --- .../WayofTime/alchemicalWizardry/common/items/BoundPickaxe.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundPickaxe.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundPickaxe.java index af1df3a074..3cc2f6f206 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundPickaxe.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundPickaxe.java @@ -122,7 +122,7 @@ public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, Enti ArrayList itemDropList; if (AlchemicalWizardry.isGregTechLoaded && block instanceof GTBlockOre) { itemDropList = ((GTBlockOre) block) - .getDropsFortune(par2World, posX + i, posY + j, posZ + k, meta, fortuneLvl, par3EntityPlayer); + .getDropsForPlayer(par2World, posX + i, posY + j, posZ + k, meta, fortuneLvl, par3EntityPlayer); } else{ itemDropList = block From 2a163a4ce68d176aa7d90f05231de864bee8fa8e Mon Sep 17 00:00:00 2001 From: mikle Date: Sun, 4 Jan 2026 11:49:37 +0400 Subject: [PATCH 3/4] dep bump --- dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.gradle b/dependencies.gradle index bb25b57b51..db55612971 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -27,7 +27,7 @@ dependencies { api("com.github.GTNewHorizons:NotEnoughItems:2.8.15-GTNH:dev") compileOnly("com.github.GTNewHorizons:GTNHLib:0.8.41:dev") {transitive = false } - compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.52.185:dev") {transitive = false } + compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.52.187:dev") {transitive = false } compileOnly("com.github.GTNewHorizons:Botania:1.13.3-GTNH:api") {transitive = false } compileOnly("com.github.GTNewHorizons:ForestryMC:4.10.17:api") {transitive = false } From ddabb40c94cf5f30cd576c14c64aee9d7344f680 Mon Sep 17 00:00:00 2001 From: mikle Date: Sun, 4 Jan 2026 11:52:55 +0400 Subject: [PATCH 4/4] another one bites the spotless --- .../common/items/BoundPickaxe.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundPickaxe.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundPickaxe.java index 3cc2f6f206..d27f05c4bb 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundPickaxe.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundPickaxe.java @@ -3,7 +3,6 @@ import java.util.ArrayList; import java.util.List; -import gregtech.common.blocks.GTBlockOre; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.enchantment.EnchantmentHelper; @@ -29,6 +28,7 @@ import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import gregtech.common.blocks.GTBlockOre; public class BoundPickaxe extends ItemPickaxe implements IBindable { @@ -121,10 +121,15 @@ public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, Enti } else { ArrayList itemDropList; if (AlchemicalWizardry.isGregTechLoaded && block instanceof GTBlockOre) { - itemDropList = ((GTBlockOre) block) - .getDropsForPlayer(par2World, posX + i, posY + j, posZ + k, meta, fortuneLvl, par3EntityPlayer); - } - else{ + itemDropList = ((GTBlockOre) block).getDropsForPlayer( + par2World, + posX + i, + posY + j, + posZ + k, + meta, + fortuneLvl, + par3EntityPlayer); + } else { itemDropList = block .getDrops(par2World, posX + i, posY + j, posZ + k, meta, fortuneLvl); }