Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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.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 }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,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 {

Expand Down Expand Up @@ -118,8 +119,20 @@ 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<ItemStack> itemDropList = block
.getDrops(par2World, posX + i, posY + j, posZ + k, meta, fortuneLvl);
ArrayList<ItemStack> itemDropList;
if (AlchemicalWizardry.isGregTechLoaded && block instanceof GTBlockOre) {
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);
}

if (itemDropList != null) {
for (ItemStack stack : itemDropList)
Expand Down