lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Attempted to fix the Ritual of Magnetism for TileEntity ores.

Browse source
This commit is contained in:
WayofTime 2016-07-02 15:36:38 -04:00
parent b4ff6d5d2f
commit dd3c241fd7
1 changed files with 29 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
src/main/java/WayofTime/bloodmagic/ritual/RitualMagnetic.java
View file

@ -1,11 +1,9 @@
package WayofTime.bloodmagic.ritual; package WayofTime.bloodmagic.ritual;
import WayofTime.bloodmagic.api.BlockStack; import java.util.ArrayList;
import WayofTime.bloodmagic.api.Constants; import java.util.HashMap;
import WayofTime.bloodmagic.api.ritual.*; import java.util.Map;
import WayofTime.bloodmagic.api.saving.SoulNetwork;
import WayofTime.bloodmagic.api.util.helper.NetworkHelper;
import WayofTime.bloodmagic.util.Utils;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.BlockOre; import net.minecraft.block.BlockOre;
import net.minecraft.block.BlockRedstoneOre; import net.minecraft.block.BlockRedstoneOre;
@ -16,10 +14,16 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.OreDictionary;
import WayofTime.bloodmagic.api.BlockStack;
import java.util.ArrayList; import WayofTime.bloodmagic.api.Constants;
import java.util.HashMap; import WayofTime.bloodmagic.api.ritual.AreaDescriptor;
import java.util.Map; import WayofTime.bloodmagic.api.ritual.EnumRuneType;
import WayofTime.bloodmagic.api.ritual.IMasterRitualStone;
import WayofTime.bloodmagic.api.ritual.Ritual;
import WayofTime.bloodmagic.api.ritual.RitualComponent;
import WayofTime.bloodmagic.api.saving.SoulNetwork;
import WayofTime.bloodmagic.api.util.helper.NetworkHelper;
import WayofTime.bloodmagic.util.Utils;
public class RitualMagnetic extends Ritual public class RitualMagnetic extends Ritual
{ {
@ -60,8 +64,18 @@ public class RitualMagnetic extends Ritual
private static boolean computeIsItemOre(BlockStack type) private static boolean computeIsItemOre(BlockStack type)
{ {
ItemStack itemStack = new ItemStack(type.getBlock(), type.getMeta()); ItemStack stack = new ItemStack(type.getBlock(), type.getMeta());
for (int id : OreDictionary.getOreIDs(itemStack)) return isBlockOre(stack);
}
public static boolean isBlockOre(ItemStack stack)
{
if (stack == null)
{
return false;
}
for (int id : OreDictionary.getOreIDs(stack))
{ {
String oreName = OreDictionary.getOreName(id); String oreName = OreDictionary.getOreName(id);
if (oreName.contains("ore")) if (oreName.contains("ore"))
@ -127,9 +141,10 @@ public class RitualMagnetic extends Ritual
BlockPos newPos = pos.add(i, j, k); BlockPos newPos = pos.add(i, j, k);
IBlockState state = world.getBlockState(newPos); IBlockState state = world.getBlockState(newPos);
Block block = state.getBlock(); Block block = state.getBlock();
int meta = block.getMetaFromState(state); ItemStack checkStack = block.getPickBlock(state, null, world, pos, null);
// int meta = block.getMetaFromState(state);
if (isBlockOre(block, meta)) if (isBlockOre(checkStack))
{ {
Utils.swapLocations(world, newPos, world, replacement); Utils.swapLocations(world, newPos, world, replacement);
network.syphon(getRefreshCost()); network.syphon(getRefreshCost());