From ab3de491988220f39378124c8925e392b4c99bb4 Mon Sep 17 00:00:00 2001 From: mezz Date: Mon, 19 Sep 2016 19:46:00 -0700 Subject: [PATCH] Make IArmorApiarist into a capability --- .../apiculture/ApicultureCapabilities.java | 13 +++++ .../api/apiculture/IArmorApiarist.java | 13 +++-- .../apiculture/ArmorApiaristHelper.java | 16 +++--- .../forestry/apiculture/PluginApiculture.java | 7 +++ .../capabilities/ArmorApiarist.java | 20 ++++++++ .../apiculture/items/ItemArmorApiarist.java | 51 ++++++++++++------- .../forestry/apiculture/items/ItemSmoker.java | 28 ++++++++-- .../core/capabilities/NullStorage.java | 17 +++++++ 8 files changed, 133 insertions(+), 32 deletions(-) create mode 100644 src/main/java/forestry/api/apiculture/ApicultureCapabilities.java create mode 100644 src/main/java/forestry/apiculture/capabilities/ArmorApiarist.java create mode 100644 src/main/java/forestry/core/capabilities/NullStorage.java diff --git a/src/main/java/forestry/api/apiculture/ApicultureCapabilities.java b/src/main/java/forestry/api/apiculture/ApicultureCapabilities.java new file mode 100644 index 000000000..2608aa485 --- /dev/null +++ b/src/main/java/forestry/api/apiculture/ApicultureCapabilities.java @@ -0,0 +1,13 @@ +package forestry.api.apiculture; + +import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.common.capabilities.CapabilityInject; + +public class ApicultureCapabilities { + /** + * Capability for {@link IArmorApiarist}. + * The {@link Capability#getDefaultInstance()} will always protect the wearer with no side effects. + */ + @CapabilityInject(IArmorApiarist.class) + public static Capability ARMOR_APIARIST; +} diff --git a/src/main/java/forestry/api/apiculture/IArmorApiarist.java b/src/main/java/forestry/api/apiculture/IArmorApiarist.java index f6b38c020..9a33499be 100644 --- a/src/main/java/forestry/api/apiculture/IArmorApiarist.java +++ b/src/main/java/forestry/api/apiculture/IArmorApiarist.java @@ -5,21 +5,24 @@ ******************************************************************************/ package forestry.api.apiculture; +import javax.annotation.Nullable; + import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; /** - * When implemented by armor piece items, allows them to act as apiarist's armor. + * When implemented as a capability by armor items, protects the wearer from negative bee effects. + * @see ApicultureCapabilities#ARMOR_APIARIST */ public interface IArmorApiarist { /** * Called when the apiarist's armor acts as protection against an attack. * - * @param entity Entity being attacked - * @param armor Armor item - * @param cause Optional cause of attack, such as a bee effect identifier + * @param entity Entity being attacked + * @param armor Armor item + * @param cause Optional cause of attack, such as a bee effect identifier * @param doProtect Whether or not to actually do the side effects of protection * @return Whether or not the armor should protect the player from that attack */ - boolean protectEntity(EntityLivingBase entity, ItemStack armor, String cause, boolean doProtect); + boolean protectEntity(EntityLivingBase entity, ItemStack armor, @Nullable String cause, boolean doProtect); } diff --git a/src/main/java/forestry/apiculture/ArmorApiaristHelper.java b/src/main/java/forestry/apiculture/ArmorApiaristHelper.java index a019fdcae..e5238813b 100644 --- a/src/main/java/forestry/apiculture/ArmorApiaristHelper.java +++ b/src/main/java/forestry/apiculture/ArmorApiaristHelper.java @@ -10,13 +10,13 @@ ******************************************************************************/ package forestry.apiculture; +import forestry.api.apiculture.ApicultureCapabilities; +import forestry.api.apiculture.IArmorApiarist; +import forestry.api.apiculture.IArmorApiaristHelper; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import forestry.api.apiculture.IArmorApiarist; -import forestry.api.apiculture.IArmorApiaristHelper; - public class ArmorApiaristHelper implements IArmorApiaristHelper { @Override @@ -25,12 +25,16 @@ public class ArmorApiaristHelper implements IArmorApiaristHelper { return false; } - Item item = stack.getItem(); - if (!(item instanceof IArmorApiarist)) { + final Item item = stack.getItem(); + final IArmorApiarist armorApiarist; + if (item instanceof IArmorApiarist) { // legacy + armorApiarist = (IArmorApiarist) item; + } else if (stack.hasCapability(ApicultureCapabilities.ARMOR_APIARIST, null)) { + armorApiarist = stack.getCapability(ApicultureCapabilities.ARMOR_APIARIST, null); + } else { return false; } - IArmorApiarist armorApiarist = (IArmorApiarist) item; return armorApiarist.protectEntity(entity, stack, cause, doProtect); } diff --git a/src/main/java/forestry/apiculture/PluginApiculture.java b/src/main/java/forestry/apiculture/PluginApiculture.java index a21fa9e34..1c13ea9de 100644 --- a/src/main/java/forestry/apiculture/PluginApiculture.java +++ b/src/main/java/forestry/apiculture/PluginApiculture.java @@ -22,6 +22,7 @@ import forestry.Forestry; import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.EnumBeeType; import forestry.api.apiculture.FlowerManager; +import forestry.api.apiculture.IArmorApiarist; import forestry.api.apiculture.IBeekeepingMode; import forestry.api.apiculture.hives.HiveManager; import forestry.api.apiculture.hives.IHiveRegistry.HiveType; @@ -36,6 +37,7 @@ import forestry.api.storage.StorageManager; import forestry.apiculture.blocks.BlockAlvearyType; import forestry.apiculture.blocks.BlockCandle; import forestry.apiculture.blocks.BlockRegistryApiculture; +import forestry.apiculture.capabilities.ArmorApiarist; import forestry.apiculture.commands.CommandBee; import forestry.apiculture.entities.EntityMinecartApiary; import forestry.apiculture.entities.EntityMinecartBeehouse; @@ -72,6 +74,7 @@ import forestry.apiculture.worldgen.HiveRegistry; import forestry.core.ISaveEventHandler; import forestry.core.PluginCore; import forestry.core.PluginFluids; +import forestry.core.capabilities.NullStorage; import forestry.core.config.Config; import forestry.core.config.Constants; import forestry.core.config.LocalizedConfiguration; @@ -106,6 +109,7 @@ import net.minecraft.world.storage.loot.LootTableList; import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.common.BiomeDictionary; import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.common.capabilities.CapabilityManager; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fml.common.FMLCommonHandler; @@ -161,6 +165,9 @@ public class PluginApiculture extends BlankForestryPlugin { BeeManager.beeRoot.registerBeekeepingMode(BeekeepingMode.hard); BeeManager.beeRoot.registerBeekeepingMode(BeekeepingMode.hardcore); BeeManager.beeRoot.registerBeekeepingMode(BeekeepingMode.insane); + + // Capabilities + CapabilityManager.INSTANCE.register(IArmorApiarist.class, new NullStorage<>(), () -> ArmorApiarist.INSTANCE); } @Override diff --git a/src/main/java/forestry/apiculture/capabilities/ArmorApiarist.java b/src/main/java/forestry/apiculture/capabilities/ArmorApiarist.java new file mode 100644 index 000000000..77ad86166 --- /dev/null +++ b/src/main/java/forestry/apiculture/capabilities/ArmorApiarist.java @@ -0,0 +1,20 @@ +package forestry.apiculture.capabilities; + +import javax.annotation.Nullable; + +import forestry.api.apiculture.IArmorApiarist; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.item.ItemStack; + +public class ArmorApiarist implements IArmorApiarist { + public static final ArmorApiarist INSTANCE = new ArmorApiarist(); + + protected ArmorApiarist() { + + } + + @Override + public boolean protectEntity(EntityLivingBase entity, ItemStack armor, @Nullable String cause, boolean doProtect) { + return true; + } +} diff --git a/src/main/java/forestry/apiculture/items/ItemArmorApiarist.java b/src/main/java/forestry/apiculture/items/ItemArmorApiarist.java index 2d3362631..a0810dd1e 100755 --- a/src/main/java/forestry/apiculture/items/ItemArmorApiarist.java +++ b/src/main/java/forestry/apiculture/items/ItemArmorApiarist.java @@ -10,26 +10,30 @@ ******************************************************************************/ package forestry.apiculture.items; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.EntityEquipmentSlot; -import net.minecraft.item.Item; -import net.minecraft.item.ItemArmor; -import net.minecraft.item.ItemStack; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import forestry.api.apiculture.IArmorApiarist; +import forestry.api.apiculture.ApicultureCapabilities; import forestry.api.core.IArmorNaturalist; import forestry.api.core.IItemModelRegister; import forestry.api.core.IModelManager; import forestry.api.core.Tabs; import forestry.apiculture.PluginApiculture; import forestry.core.config.Constants; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.EntityEquipmentSlot; +import net.minecraft.item.Item; +import net.minecraft.item.ItemArmor; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumFacing; +import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.common.capabilities.ICapabilityProvider; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; -public class ItemArmorApiarist extends ItemArmor implements IArmorApiarist, IArmorNaturalist, IItemModelRegister { +public class ItemArmorApiarist extends ItemArmor implements IArmorNaturalist, IItemModelRegister { public ItemArmorApiarist(EntityEquipmentSlot equipmentSlotIn) { super(ArmorMaterial.LEATHER, 0, equipmentSlotIn); @@ -57,14 +61,27 @@ public class ItemArmorApiarist extends ItemArmor implements IArmorApiarist, IArm return false; } - @Override - public boolean protectEntity(EntityLivingBase entity, ItemStack armor, String cause, boolean doProtect) { - return true; - } - @Override public boolean canSeePollination(EntityPlayer player, ItemStack armor, boolean doSee) { return armorType == EntityEquipmentSlot.HEAD; } + @Nonnull + @Override + public ICapabilityProvider initCapabilities(ItemStack stack, NBTTagCompound nbt) { + return new ICapabilityProvider() { + @Override + public boolean hasCapability(Capability capability, @Nullable EnumFacing facing) { + return capability == ApicultureCapabilities.ARMOR_APIARIST; + } + + @Override + public T getCapability(Capability capability, @Nullable EnumFacing facing) { + if (capability == ApicultureCapabilities.ARMOR_APIARIST) { + return capability.getDefaultInstance(); + } + return null; + } + }; + } } diff --git a/src/main/java/forestry/apiculture/items/ItemSmoker.java b/src/main/java/forestry/apiculture/items/ItemSmoker.java index 88de9418a..e1b233bca 100644 --- a/src/main/java/forestry/apiculture/items/ItemSmoker.java +++ b/src/main/java/forestry/apiculture/items/ItemSmoker.java @@ -1,6 +1,9 @@ package forestry.apiculture.items; -import forestry.api.apiculture.IArmorApiarist; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + +import forestry.api.apiculture.ApicultureCapabilities; import forestry.api.apiculture.IHiveTile; import forestry.api.core.Tabs; import forestry.core.items.ItemForestry; @@ -9,6 +12,7 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; @@ -18,8 +22,10 @@ import net.minecraft.util.EnumHandSide; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; +import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.common.capabilities.ICapabilityProvider; -public class ItemSmoker extends ItemForestry implements IArmorApiarist { +public class ItemSmoker extends ItemForestry { public ItemSmoker() { super(Tabs.tabApiculture); setMaxStackSize(1); @@ -102,8 +108,22 @@ public class ItemSmoker extends ItemForestry implements IArmorApiarist { return 32; } + @Nonnull @Override - public boolean protectEntity(EntityLivingBase entity, ItemStack armor, String cause, boolean doProtect) { - return true; + public ICapabilityProvider initCapabilities(ItemStack stack, NBTTagCompound nbt) { + return new ICapabilityProvider() { + @Override + public boolean hasCapability(Capability capability, @Nullable EnumFacing facing) { + return capability == ApicultureCapabilities.ARMOR_APIARIST; + } + + @Override + public T getCapability(Capability capability, @Nullable EnumFacing facing) { + if (capability == ApicultureCapabilities.ARMOR_APIARIST) { + return capability.getDefaultInstance(); + } + return null; + } + }; } } diff --git a/src/main/java/forestry/core/capabilities/NullStorage.java b/src/main/java/forestry/core/capabilities/NullStorage.java new file mode 100644 index 000000000..a755ef119 --- /dev/null +++ b/src/main/java/forestry/core/capabilities/NullStorage.java @@ -0,0 +1,17 @@ +package forestry.core.capabilities; + +import net.minecraft.nbt.NBTBase; +import net.minecraft.util.EnumFacing; +import net.minecraftforge.common.capabilities.Capability; + +public class NullStorage implements Capability.IStorage { + @Override + public NBTBase writeNBT(Capability capability, T instance, EnumFacing side) { + return null; + } + + @Override + public void readNBT(Capability capability, T instance, EnumFacing side, NBTBase nbt) { + + } +}