mirror of
https://github.com/GTNewHorizons/BloodMagic.git
synced 2026-11-20 20:12:17 +00:00
Merge branch 'master' into alchemic-router-not-bad
This commit is contained in:
5 files changed
+17
-13
No files matched your search
@@ -23,6 +23,7 @@ import WayofTime.alchemicalWizardry.api.rituals.RitualEffect;
|
||||
import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;
|
||||
import WayofTime.alchemicalWizardry.common.ItemType;
|
||||
import WayofTime.alchemicalWizardry.common.block.BlockTeleposer;
|
||||
import gregtech.common.blocks.GTBlockOre;
|
||||
|
||||
public class RitualEffectMagnetic extends RitualEffect {
|
||||
|
||||
@@ -34,7 +35,10 @@ 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) return true;
|
||||
if (block instanceof BlockOre || block instanceof BlockRedstoneOre
|
||||
|| (AlchemicalWizardry.isGregTechLoaded && block instanceof GTBlockOre)) {
|
||||
return true;
|
||||
}
|
||||
|
||||
if (block == null || Item.getItemFromBlock(block) == null) return false;
|
||||
|
||||
|
||||
Reference in new issue
Block a user