diff --git a/src/main/java/vazkii/botania/api/BotaniaAPI.java b/src/main/java/vazkii/botania/api/BotaniaAPI.java index eb0d0508c..96acba8b5 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPI.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPI.java @@ -19,6 +19,7 @@ import java.util.Map; import java.util.Set; import net.minecraft.block.Block; +import net.minecraft.entity.Entity; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.EnumRarity; @@ -89,6 +90,7 @@ public final class BotaniaAPI { public static Set looniumBlacklist = new LinkedHashSet(); public static Set paintableBlocks = new LinkedHashSet(); public static Set magnetBlacklist = new LinkedHashSet(); + public static Set> gravityRodBlacklist = new LinkedHashSet>(); public static ArmorMaterial manasteelArmorMaterial = EnumHelper.addArmorMaterial("MANASTEEL", 16, new int[] { 2, 6, 5, 2 }, 18); public static ToolMaterial manasteelToolMaterial = EnumHelper.addToolMaterial("MANASTEEL", 3, 300, 6.2F, 2F, 20); @@ -311,6 +313,22 @@ public final class BotaniaAPI { return paintable; } + /* + * Blacklists an Entity from being affected by the Rod of the Shaded Mesa. + * Pass in the class for the Entity, e.g. EntityCow.class + */ + public static void blacklistEntityFromGravityRod(Class entity) { + gravityRodBlacklist.add(entity); + } + + /* + * Checks if the provided Entity is contained in the Blacklist. + * Pass in the class for the Entity, e.g. entity.getClass() + */ + public static boolean isEntityBlacklistedFromGravityRod(Class entity) { + return gravityRodBlacklist.contains(entity); + } + /** * Blacklists an item from being pulled by the Ring of Magnetization. * Short.MAX_VALUE can be used as the stack's damage for a wildcard. diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java index 34b254266..08e2b8f13 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java @@ -22,6 +22,7 @@ import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; +import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.IManaProficiencyArmor; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; @@ -80,11 +81,12 @@ public class ItemGravityRod extends ItemMod implements IManaUsingItem { int targetID = ItemNBTHelper.getInt(stack, TAG_TARGET, -1); int ticksCooldown = ItemNBTHelper.getInt(stack, TAG_TICKS_COOLDOWN, 0); double length = ItemNBTHelper.getDouble(stack, TAG_DIST, -1); + if(ticksCooldown == 0) { Entity item = null; if(targetID != -1 && player.worldObj.getEntityByID(targetID) != null) { Entity taritem = player.worldObj.getEntityByID(targetID); - + boolean found = false; Vector3 target = Vector3.fromEntityCenter(player); List entities = new ArrayList(); @@ -123,38 +125,43 @@ public class ItemGravityRod extends ItemMod implements IManaUsingItem { } } - if(ManaItemHandler.requestManaExactForTool(stack, player, COST, true) && item != null) { - if(item instanceof EntityItem) - ((EntityItem)item).delayBeforeCanPickup = 5; + if(item != null) { + if(BotaniaAPI.isEntityBlacklistedFromGravityRod(item.getClass())) + return stack; + + if(ManaItemHandler.requestManaExactForTool(stack, player, COST, true)) { + if(item instanceof EntityItem) + ((EntityItem)item).delayBeforeCanPickup = 5; - if(item instanceof EntityLivingBase) { - EntityLivingBase targetEntity = (EntityLivingBase)item; - targetEntity.fallDistance = 0.0F; - if(targetEntity.getActivePotionEffect(Potion.moveSlowdown) == null) - targetEntity.addPotionEffect(new PotionEffect(Potion.moveSlowdown.id, 2, 3, true)); + if(item instanceof EntityLivingBase) { + EntityLivingBase targetEntity = (EntityLivingBase)item; + targetEntity.fallDistance = 0.0F; + if(targetEntity.getActivePotionEffect(Potion.moveSlowdown) == null) + targetEntity.addPotionEffect(new PotionEffect(Potion.moveSlowdown.id, 2, 3, true)); + } + + Vector3 target3 = Vector3.fromEntityCenter(player); + target3.add(new Vector3(player.getLookVec()).multiply(length)); + target3.y += 0.5; + if(item instanceof EntityItem) + target3.y += 0.25; + + for(int i = 0; i < 4; i++) { + float r = 0.5F + (float) Math.random() * 0.5F; + float b = 0.5F + (float) Math.random() * 0.5F; + float s = 0.2F + (float) Math.random() * 0.1F; + float m = 0.1F; + float xm = ((float) Math.random() - 0.5F) * m; + float ym = ((float) Math.random() - 0.5F) * m; + float zm = ((float) Math.random() - 0.5F) * m; + Botania.proxy.wispFX(world, item.posX + item.width / 2, item.posY + item.height / 2, item.posZ + item.width / 2, r, 0F, b, s, xm, ym, zm); + } + + setEntityMotionFromVector(item, target3, 0.3333333F); + + ItemNBTHelper.setInt(stack, TAG_TARGET, item.getEntityId()); + ItemNBTHelper.setDouble(stack, TAG_DIST, length); } - - Vector3 target3 = Vector3.fromEntityCenter(player); - target3.add(new Vector3(player.getLookVec()).multiply(length)); - target3.y += 0.5; - if(item instanceof EntityItem) - target3.y += 0.25; - - for(int i = 0; i < 4; i++) { - float r = 0.5F + (float) Math.random() * 0.5F; - float b = 0.5F + (float) Math.random() * 0.5F; - float s = 0.2F + (float) Math.random() * 0.1F; - float m = 0.1F; - float xm = ((float) Math.random() - 0.5F) * m; - float ym = ((float) Math.random() - 0.5F) * m; - float zm = ((float) Math.random() - 0.5F) * m; - Botania.proxy.wispFX(world, item.posX + item.width / 2, item.posY + item.height / 2, item.posZ + item.width / 2, r, 0F, b, s, xm, ym, zm); - } - - setEntityMotionFromVector(item, target3, 0.3333333F); - - ItemNBTHelper.setInt(stack, TAG_TARGET, item.getEntityId()); - ItemNBTHelper.setDouble(stack, TAG_DIST, length); } if(item != null) @@ -186,6 +193,7 @@ public class ItemGravityRod extends ItemMod implements IManaUsingItem { int targetID = ItemNBTHelper.getInt(stack, TAG_TARGET, -1); ItemNBTHelper.getDouble(stack, TAG_DIST, -1); Entity item = null; + if(targetID != -1 && player.worldObj.getEntityByID(targetID) != null) { Entity taritem = player.worldObj.getEntityByID(targetID);