From ffe7b4ccc879f24cb492ac9e96cf61540ec98c8d Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 21 Dec 2015 13:01:33 -0600 Subject: [PATCH] API looks to be good again --- .../java/vazkii/botania/api/mana/spark/SparkHelper.java | 6 ++++-- src/main/java/vazkii/botania/api/wiki/WikiHooks.java | 8 ++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/java/vazkii/botania/api/mana/spark/SparkHelper.java b/src/main/java/vazkii/botania/api/mana/spark/SparkHelper.java index add3c3284..4cb1a48e7 100644 --- a/src/main/java/vazkii/botania/api/mana/spark/SparkHelper.java +++ b/src/main/java/vazkii/botania/api/mana/spark/SparkHelper.java @@ -12,6 +12,8 @@ package vazkii.botania.api.mana.spark; import java.util.List; +import com.google.common.base.Predicates; +import net.minecraft.entity.Entity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; @@ -25,8 +27,8 @@ public final class SparkHelper { public static List getEntitiesAround(Class clazz, World world, double x, double y, double z) { int r = SPARK_SCAN_RANGE; - List entities = world.getEntitiesWithinAABB(clazz, new AxisAlignedBB(x - r, y - r, z - r, x + r, y + r, z + r)); - return entities; + List entities = world.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(x - r, y - r, z - r, x + r, y + r, z + r), Predicates.instanceOf(clazz)); + return ((List) entities); } } diff --git a/src/main/java/vazkii/botania/api/wiki/WikiHooks.java b/src/main/java/vazkii/botania/api/wiki/WikiHooks.java index 56c4ef22b..e459bb911 100644 --- a/src/main/java/vazkii/botania/api/wiki/WikiHooks.java +++ b/src/main/java/vazkii/botania/api/wiki/WikiHooks.java @@ -14,8 +14,8 @@ import java.util.HashMap; import java.util.Map; import net.minecraft.block.Block; -import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.fml.common.registry.GameRegistry.UniqueIdentifier; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.common.registry.GameData; public class WikiHooks { @@ -24,8 +24,8 @@ public class WikiHooks { private static final Map modWikis = new HashMap(); public static IWikiProvider getWikiFor(Block block) { - UniqueIdentifier mod = GameRegistry.findUniqueIdentifierFor(block); - return getWikiFor(mod == null ? "" : mod.modId.toLowerCase()); + ResourceLocation mod = GameData.getBlockRegistry().getNameForObject(block); + return getWikiFor(mod == null ? "" : mod.getResourceDomain().toLowerCase()); } public static IWikiProvider getWikiFor(String mod) {