eliminate some hard refs to curio api

This commit is contained in:
Vincent Lee authored and Vincent Lee committed 2019-06-02 12:44:22 -07:00
1 parent 1d4c65a7c4
commit 0c1643fe45
12 files changed
+66 -61

No files matched your search

@@ -81,7 +81,7 @@ public final class BaubleRenderHandler implements LayerRenderer<EntityPlayer> {
}
}
});
GlStateManager.popMatrix();
}
@SuppressWarnings("deprecation")
@@ -90,17 +90,17 @@ public final class HUDHandler {
if(event.getType() == ElementType.HEALTH && Botania.curiosLoaded) {
profiler.startSection("botania-hud");
CuriosAPI.FinderData result = CuriosAPI.getCurioEquipped(ModItems.flightTiara, mc.player);
if(result != null) {
ItemStack tiara = CurioIntegration.findOrEmpty(ModItems.flightTiara, mc.player);
if(!tiara.isEmpty())
profiler.startSection("flugelTiara");
ItemFlightTiara.renderHUD(mc.player, result.getStack());
ItemFlightTiara.renderHUD(mc.player, tiara);
profiler.endSection();
}
result = CuriosAPI.getCurioEquipped(ModItems.dodgeRing, mc.player);
if(result != null) {
ItemStack dodgeRing = CurioIntegration.findOrEmpty(ModItems.dodgeRing, mc.player);
if(!dodgeRing.isEmpty()) {
profiler.startSection("dodgeRing");
ItemDodgeRing.renderHUD(mc.player, result.getStack(), event.getPartialTicks());
ItemDodgeRing.renderHUD(mc.player, dodgeRing, event.getPartialTicks());
profiler.endSection();
}
@@ -35,8 +35,10 @@ import top.theillusivec4.curios.api.CuriosAPI;
import vazkii.botania.api.item.AccessoryRenderHelper;
import vazkii.botania.api.mana.IManaUsingItem;
import vazkii.botania.api.mana.ManaItemHandler;
import vazkii.botania.common.Botania;
import vazkii.botania.common.block.subtile.functional.SubTileHeiseiDream;
import vazkii.botania.common.core.handler.ModSounds;
import vazkii.botania.common.integration.curios.CurioIntegration;
import vazkii.botania.common.integration.curios.RenderableCurio;
import vazkii.botania.common.item.ModItems;
import vazkii.botania.common.network.PacketBotaniaEffect;
@@ -56,10 +58,9 @@ public class ItemDivaCharm extends ItemBauble implements IManaUsingItem {
Runnable lambda = () -> {
EntityLiving target = (EntityLiving) event.getEntityLiving();
EntityPlayer player = (EntityPlayer) event.getSource().getImmediateSource();
CuriosAPI.FinderData result = CuriosAPI.getCurioEquipped(ModItems.divaCharm, player);
ItemStack amulet = Botania.curiosLoaded ? CurioIntegration.findOrEmpty(ModItems.divaCharm, player) : ItemStack.EMPTY;
if(result != null) {
ItemStack amulet = result.getStack();
if(!amulet.isEmpty()) {
final int cost = 250;
if(ManaItemHandler.requestManaExact(amulet, player, cost, false)) {
final int range = 20;
@@ -25,9 +25,11 @@ import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.items.IItemHandler;
import top.theillusivec4.curios.api.CuriosAPI;
import vazkii.botania.client.core.handler.ClientTickHandler;
import vazkii.botania.common.Botania;
import vazkii.botania.common.core.helper.ItemNBTHelper;
import vazkii.botania.common.core.helper.Vector3;
import vazkii.botania.common.integration.curios.BaseCurio;
import vazkii.botania.common.integration.curios.CurioIntegration;
import vazkii.botania.common.item.ModItems;
import vazkii.botania.common.lib.LibItemNames;
import vazkii.botania.common.lib.LibMisc;
@@ -52,12 +54,8 @@ public class ItemDodgeRing extends ItemBauble {
public static void onKeyDown(InputEvent.KeyInputEvent event) {
Minecraft mc = Minecraft.getInstance();
CuriosAPI.FinderData result = CuriosAPI.getCurioEquipped(ModItems.dodgeRing, mc.player);
if(result == null) {
return;
}
ItemStack ringStack = result.getStack();
if(ItemNBTHelper.getInt(ringStack, TAG_DODGE_COOLDOWN, 0) > 0)
ItemStack ringStack = Botania.curiosLoaded ? CurioIntegration.findOrEmpty(ModItems.dodgeRing, mc.player) : ItemStack.EMPTY;
if(ringStack.isEmpty() || ItemNBTHelper.getInt(ringStack, TAG_DODGE_COOLDOWN, 0) > 0)
return;
int threshold = 4;
@@ -52,6 +52,7 @@ import vazkii.botania.common.core.handler.ModSounds;
import vazkii.botania.common.core.helper.ItemNBTHelper;
import vazkii.botania.common.core.helper.StringObfuscator;
import vazkii.botania.common.core.helper.Vector3;
import vazkii.botania.common.integration.curios.CurioIntegration;
import vazkii.botania.common.integration.curios.RenderableCurio;
import vazkii.botania.common.item.ModItems;
@@ -108,8 +109,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem {
public void updatePlayerFlyStatus(LivingUpdateEvent event) {
if(event.getEntityLiving() instanceof EntityPlayer) {
EntityPlayer player = (EntityPlayer) event.getEntityLiving();
CuriosAPI.FinderData result = CuriosAPI.getCurioEquipped(ModItems.flightTiara, player);
ItemStack tiara = result == null ? ItemStack.EMPTY : result.getStack();
ItemStack tiara = Botania.curiosLoaded ? CurioIntegration.findOrEmpty(ModItems.flightTiara, player) : ItemStack.EMPTY;
int left = ItemNBTHelper.getInt(tiara, TAG_TIME_LEFT, MAX_FLY_TIME);
if(playersWithFlight.contains(playerStr(player))) {
@@ -208,9 +208,8 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem {
}
private boolean shouldPlayerHaveFlight(EntityPlayer player) {
CuriosAPI.FinderData result = CuriosAPI.getCurioEquipped(ModItems.flightTiara, player);
if(result != null) {
ItemStack armor = result.getStack();
ItemStack armor = Botania.curiosLoaded ? CurioIntegration.findOrEmpty(ModItems.flightTiara, player) : ItemStack.EMPTY;
if(!armor.isEmpty()) {
int left = ItemNBTHelper.getInt(armor, TAG_TIME_LEFT, MAX_FLY_TIME);
boolean flying = ItemNBTHelper.getBoolean(armor, TAG_FLYING, false);
return (left > (flying ? 0 : MAX_FLY_TIME / 10) || player.inventory.hasItemStack(new ItemStack(ModItems.flugelEye))) && ManaItemHandler.requestManaExact(armor, player, getCost(armor, left), false);
@@ -28,6 +28,8 @@ import top.theillusivec4.curios.api.CuriosAPI;
import vazkii.botania.api.item.AccessoryRenderHelper;
import vazkii.botania.api.mana.IManaUsingItem;
import vazkii.botania.api.mana.ManaItemHandler;
import vazkii.botania.common.Botania;
import vazkii.botania.common.integration.curios.CurioIntegration;
import vazkii.botania.common.integration.curios.RenderableCurio;
import vazkii.botania.common.item.ModItems;
import vazkii.botania.common.lib.LibMisc;
@@ -50,8 +52,8 @@ public class ItemGoddessCharm extends ItemBauble implements IManaUsingItem {
List<EntityPlayer> players = event.getWorld().getEntitiesWithinAABB(EntityPlayer.class, new AxisAlignedBB(vec.x, vec.y, vec.z, vec.x, vec.y, vec.z).grow(8));
for(EntityPlayer player : players) {
CuriosAPI.FinderData result = CuriosAPI.getCurioEquipped(ModItems.goddessCharm, player);
if(result != null && ManaItemHandler.requestManaExact(result.getStack(), player, COST, true)) {
ItemStack charm = Botania.curiosLoaded ? CurioIntegration.findOrEmpty(ModItems.goddessCharm, player) : ItemStack.EMPTY;
if(!charm.isEmpty() && ManaItemHandler.requestManaExact(charm, player, COST, true)) {
event.getAffectedBlocks().clear();
return;
}
@@ -30,6 +30,7 @@ import vazkii.botania.client.model.ModelCloak;
import vazkii.botania.common.Botania;
import vazkii.botania.common.core.handler.ModSounds;
import vazkii.botania.common.core.helper.ItemNBTHelper;
import vazkii.botania.common.integration.curios.CurioIntegration;
import vazkii.botania.common.integration.curios.RenderableCurio;
public class ItemHolyCloak extends ItemBauble {
@@ -51,18 +52,17 @@ public class ItemHolyCloak extends ItemBauble {
private void onPlayerDamage(LivingHurtEvent event) {
if(event.getEntityLiving() instanceof EntityPlayer && !event.getSource().canHarmInCreative()) {
EntityPlayer player = (EntityPlayer) event.getEntityLiving();
CuriosAPI.FinderData result = CuriosAPI.getCurioEquipped(s -> s.getItem() instanceof ItemHolyCloak, player);
ItemStack stack = Botania.curiosLoaded ? CurioIntegration.findOrEmpty(s -> s.getItem() instanceof ItemHolyCloak, player) : ItemStack.EMPTY;
if(result != null && !isInEffect(result.getStack())) {
ItemStack belt = result.getStack();
ItemHolyCloak cloak = (ItemHolyCloak) belt.getItem();
int cooldown = getCooldown(belt);
if(!stack.isEmpty() && !isInEffect(stack)) {
ItemHolyCloak cloak = (ItemHolyCloak) stack.getItem();
int cooldown = getCooldown(stack);
// Used to prevent StackOverflows with mobs that deal damage when damaged
setInEffect(belt, true);
if(cooldown == 0 && cloak.effectOnDamage(event, player, belt))
setCooldown(belt, cloak.getCooldownTime(belt));
setInEffect(belt, false);
setInEffect(stack, true);
if(cooldown == 0 && cloak.effectOnDamage(event, player, stack))
setCooldown(stack, cloak.getCooldownTime(stack));
setInEffect(stack, false);
}
}
}
@@ -35,6 +35,7 @@ import vazkii.botania.common.core.helper.ItemNBTHelper;
import vazkii.botania.common.core.helper.MathHelper;
import vazkii.botania.common.core.helper.Vector3;
import vazkii.botania.common.integration.curios.BaseCurio;
import vazkii.botania.common.integration.curios.CurioIntegration;
import vazkii.botania.common.lib.LibItemNames;
import vazkii.botania.common.lib.LibMisc;
@@ -61,9 +62,9 @@ public class ItemMagnetRing extends ItemBauble {
}
private void onTossItem(ItemTossEvent event) {
CuriosAPI.FinderData result = CuriosAPI.getCurioEquipped(this, event.getPlayer());
if(result != null) {
setCooldown(result.getStack(), 100);
ItemStack ring = Botania.curiosLoaded ? CurioIntegration.findOrEmpty(this, event.getPlayer()) : ItemStack.EMPTY;
if(!ring.isEmpty()) {
setCooldown(ring, 100);
}
}
@@ -36,6 +36,8 @@ import vazkii.botania.api.item.AccessoryRenderHelper;
import vazkii.botania.api.item.IBurstViewerBauble;
import vazkii.botania.api.item.ICosmeticAttachable;
import vazkii.botania.api.item.ICosmeticBauble;
import vazkii.botania.common.Botania;
import vazkii.botania.common.integration.curios.CurioIntegration;
import vazkii.botania.common.integration.curios.RenderableCurio;
import vazkii.botania.common.item.ModItems;
@@ -104,20 +106,17 @@ public class ItemMonocle extends ItemBauble implements IBurstViewerBauble, ICosm
}
public static boolean hasMonocle(EntityPlayer player) {
CuriosAPI.FinderData result = CuriosAPI.getCurioEquipped(ModItems.monocle, player);
if(result != null) {
ItemStack stack = result.getStack();
if(!stack.isEmpty()) {
Item item = stack.getItem();
if(item instanceof IBurstViewerBauble)
return true;
ItemStack stack = Botania.curiosLoaded ? CurioIntegration.findOrEmpty(ModItems.monocle, player) : ItemStack.EMPTY;
if(!stack.isEmpty()) {
Item item = stack.getItem();
if(item instanceof IBurstViewerBauble)
return true;
if(item instanceof ICosmeticAttachable) {
ICosmeticAttachable attach = (ICosmeticAttachable) item;
ItemStack cosmetic = attach.getCosmeticItem(stack);
if(cosmetic != null && cosmetic.getItem() instanceof IBurstViewerBauble)
return true;
}
if(item instanceof ICosmeticAttachable) {
ICosmeticAttachable attach = (ICosmeticAttachable) item;
ItemStack cosmetic = attach.getCosmeticItem(stack);
if(cosmetic != null && cosmetic.getItem() instanceof IBurstViewerBauble)
return true;
}
}
@@ -29,6 +29,8 @@ import vazkii.botania.api.item.AccessoryRenderHelper;
import vazkii.botania.api.mana.IManaUsingItem;
import vazkii.botania.api.mana.ManaItemHandler;
import vazkii.botania.client.lib.LibResources;
import vazkii.botania.common.Botania;
import vazkii.botania.common.integration.curios.CurioIntegration;
import vazkii.botania.common.integration.curios.RenderableCurio;
import java.util.ArrayList;
@@ -65,10 +67,9 @@ public class ItemTravelBelt extends ItemBauble implements IManaUsingItem {
public void updatePlayerStepStatus(LivingUpdateEvent event) {
if(event.getEntityLiving() instanceof EntityPlayer) {
EntityPlayer player = (EntityPlayer) event.getEntityLiving();
CuriosAPI.FinderData result = CuriosAPI.getCurioEquipped(s -> s.getItem() instanceof ItemTravelBelt, player);
ItemStack belt = Botania.curiosLoaded ? CurioIntegration.findOrEmpty(s -> s.getItem() instanceof ItemTravelBelt, player) : ItemStack.EMPTY;
String s = playerStr(player);
ItemStack belt = result == null ? ItemStack.EMPTY : result.getStack();
if(playersWithStepup.contains(s)) {
if(shouldPlayerHaveStepup(player)) {
ItemTravelBelt beltItem = (ItemTravelBelt) belt.getItem();
@@ -111,18 +112,18 @@ public class ItemTravelBelt extends ItemBauble implements IManaUsingItem {
public void onPlayerJump(LivingJumpEvent event) {
if(event.getEntityLiving() instanceof EntityPlayer) {
EntityPlayer player = (EntityPlayer) event.getEntityLiving();
CuriosAPI.FinderData result = CuriosAPI.getCurioEquipped(s -> s.getItem() instanceof ItemTravelBelt, player);
ItemStack belt = CurioIntegration.findOrEmpty(s -> s.getItem() instanceof ItemTravelBelt, player);
if(result != null && ManaItemHandler.requestManaExact(result.getStack(), player, COST, false)) {
player.motionY += ((ItemTravelBelt) result.getStack().getItem()).jump;
player.fallDistance = -((ItemTravelBelt) result.getStack().getItem()).fallBuffer;
if(!belt.isEmpty() && ManaItemHandler.requestManaExact(belt, player, COST, false)) {
player.motionY += ((ItemTravelBelt) belt.getItem()).jump;
player.fallDistance = -((ItemTravelBelt) belt.getItem()).fallBuffer;
}
}
}
private boolean shouldPlayerHaveStepup(EntityPlayer player) {
CuriosAPI.FinderData result = CuriosAPI.getCurioEquipped(s -> s.getItem() instanceof ItemTravelBelt, player);
return result != null && ManaItemHandler.requestManaExact(result.getStack(), player, COST, false);
ItemStack result = Botania.curiosLoaded ? CurioIntegration.findOrEmpty(s -> s.getItem() instanceof ItemTravelBelt, player) : ItemStack.EMPTY;
return !result.isEmpty() && ManaItemHandler.requestManaExact(result, player, COST, false);
}
@SubscribeEvent
@@ -18,7 +18,9 @@ import net.minecraft.potion.PotionEffect;
import top.theillusivec4.curios.api.CuriosAPI;
import vazkii.botania.api.mana.IManaUsingItem;
import vazkii.botania.api.mana.ManaItemHandler;
import vazkii.botania.common.Botania;
import vazkii.botania.common.integration.curios.BaseCurio;
import vazkii.botania.common.integration.curios.CurioIntegration;
import vazkii.botania.common.item.ModItems;
public class ItemWaterRing extends ItemBauble implements IManaUsingItem {
@@ -40,8 +42,8 @@ public class ItemWaterRing extends ItemBauble implements IManaUsingItem {
if(living.isInWaterOrBubbleColumn()) {
if(living instanceof EntityPlayer) {
// only activate for one ring at a time
CuriosAPI.FinderData result = CuriosAPI.getCurioEquipped(ModItems.waterRing, living);
if(result == null || result.getStack() != stack)
ItemStack result = CurioIntegration.findOrEmpty(ModItems.waterRing, living);
if(result != stack)
return;
}
@@ -25,7 +25,9 @@ import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.items.IItemHandler;
import top.theillusivec4.curios.api.CuriosAPI;
import vazkii.botania.common.Botania;
import vazkii.botania.common.core.handler.ConfigHandler;
import vazkii.botania.common.integration.curios.CurioIntegration;
import vazkii.botania.common.integration.curios.RelicCurio;
import vazkii.botania.common.item.ModItems;
import vazkii.botania.common.lib.LibItemNames;
@@ -75,12 +77,12 @@ public class ItemOdinRing extends ItemRelicBauble {
@SubscribeEvent
public static void onPlayerAttacked(LivingAttackEvent event) {
if(event.getEntityLiving() instanceof EntityPlayer) {
if(Botania.curiosLoaded && event.getEntityLiving() instanceof EntityPlayer) {
EntityPlayer player = (EntityPlayer) event.getEntityLiving();
boolean negate = damageNegations.contains(event.getSource().damageType)
|| (ConfigHandler.COMMON.ringOfOdinFireResist.get() && fireNegations.contains(event.getSource().damageType));
CuriosAPI.FinderData result = CuriosAPI.getCurioEquipped(ModItems.odinRing, player);
if(result != null && negate)
boolean hasRing = !CurioIntegration.findOrEmpty(ModItems.odinRing, player).isEmpty();
if(hasRing && negate)
event.setCanceled(true);
}
}