From d84560926cd9c411e6040a49e52303f86be55dfe Mon Sep 17 00:00:00 2001 From: mezz Date: Mon, 19 Sep 2016 20:17:56 -0700 Subject: [PATCH] Make IArmorNaturalist into a capability --- .../ArboricultureCapabilities.java | 14 ++++++ .../forestry/api/core/IArmorNaturalist.java | 17 ++++--- .../apiculture/items/ItemArmorApiarist.java | 16 +++---- .../arboriculture/PluginArboriculture.java | 9 +++- .../capabilities/ArmorNaturalist.java | 18 +++++++ .../core/items/ItemArmorNaturalist.java | 47 ++++++++++++++----- .../forestry/core/utils/GeneticsUtil.java | 29 +++++++----- 7 files changed, 108 insertions(+), 42 deletions(-) create mode 100644 src/main/java/forestry/api/arboriculture/ArboricultureCapabilities.java create mode 100644 src/main/java/forestry/arboriculture/capabilities/ArmorNaturalist.java diff --git a/src/main/java/forestry/api/arboriculture/ArboricultureCapabilities.java b/src/main/java/forestry/api/arboriculture/ArboricultureCapabilities.java new file mode 100644 index 000000000..713a82d64 --- /dev/null +++ b/src/main/java/forestry/api/arboriculture/ArboricultureCapabilities.java @@ -0,0 +1,14 @@ +package forestry.api.arboriculture; + +import forestry.api.core.IArmorNaturalist; +import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.common.capabilities.CapabilityInject; + +public class ArboricultureCapabilities { + /** + * Capability for {@link IArmorNaturalist}. + * The {@link Capability#getDefaultInstance()} will always show pollination with no side effects. + */ + @CapabilityInject(IArmorNaturalist.class) + public static Capability ARMOR_NATURALIST; +} diff --git a/src/main/java/forestry/api/core/IArmorNaturalist.java b/src/main/java/forestry/api/core/IArmorNaturalist.java index 3b7b8775b..25127aee1 100644 --- a/src/main/java/forestry/api/core/IArmorNaturalist.java +++ b/src/main/java/forestry/api/core/IArmorNaturalist.java @@ -5,20 +5,23 @@ ******************************************************************************/ package forestry.api.core; +import forestry.api.arboriculture.ArboricultureCapabilities; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +/** + * Naturalist armor allows players to see pollinated tree leaves. + * + * @see ArboricultureCapabilities#ARMOR_NATURALIST + */ public interface IArmorNaturalist { /** - * Called when the naturalist's armor acts as spectacles for seeing pollinated tree leaves/flowers. + * Called to see if this naturalist's armor allows for seeing pollinated tree leaves/flowers. * - * @param player - * Player doing the viewing - * @param armor - * Armor item - * @param doSee - * Whether or not to actually do the side effects of viewing + * @param player Player doing the viewing + * @param armor Armor item + * @param doSee Whether or not to actually do the side effects of viewing * @return true if the armor actually allows the player to see pollination. */ boolean canSeePollination(EntityPlayer player, ItemStack armor, boolean doSee); diff --git a/src/main/java/forestry/apiculture/items/ItemArmorApiarist.java b/src/main/java/forestry/apiculture/items/ItemArmorApiarist.java index a0810dd1e..6817f72eb 100755 --- a/src/main/java/forestry/apiculture/items/ItemArmorApiarist.java +++ b/src/main/java/forestry/apiculture/items/ItemArmorApiarist.java @@ -14,14 +14,13 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; import forestry.api.apiculture.ApicultureCapabilities; -import forestry.api.core.IArmorNaturalist; +import forestry.api.arboriculture.ArboricultureCapabilities; 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; @@ -33,7 +32,7 @@ import net.minecraftforge.common.capabilities.ICapabilityProvider; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -public class ItemArmorApiarist extends ItemArmor implements IArmorNaturalist, IItemModelRegister { +public class ItemArmorApiarist extends ItemArmor implements IItemModelRegister { public ItemArmorApiarist(EntityEquipmentSlot equipmentSlotIn) { super(ArmorMaterial.LEATHER, 0, equipmentSlotIn); @@ -61,17 +60,15 @@ public class ItemArmorApiarist extends ItemArmor implements IArmorNaturalist, II return false; } - @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) { + if (capability == ArboricultureCapabilities.ARMOR_NATURALIST) { + return armorType == EntityEquipmentSlot.HEAD; + } return capability == ApicultureCapabilities.ARMOR_APIARIST; } @@ -79,6 +76,9 @@ public class ItemArmorApiarist extends ItemArmor implements IArmorNaturalist, II public T getCapability(Capability capability, @Nullable EnumFacing facing) { if (capability == ApicultureCapabilities.ARMOR_APIARIST) { return capability.getDefaultInstance(); + } else if (capability == ArboricultureCapabilities.ARMOR_NATURALIST && + armorType == EntityEquipmentSlot.HEAD) { + return capability.getDefaultInstance(); } return null; } diff --git a/src/main/java/forestry/arboriculture/PluginArboriculture.java b/src/main/java/forestry/arboriculture/PluginArboriculture.java index 02acc79df..c9ec0adb4 100644 --- a/src/main/java/forestry/arboriculture/PluginArboriculture.java +++ b/src/main/java/forestry/arboriculture/PluginArboriculture.java @@ -15,8 +15,8 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; -import java.util.Set; import java.util.Map.Entry; +import java.util.Set; import forestry.api.arboriculture.EnumForestryWoodType; import forestry.api.arboriculture.EnumGermlingType; @@ -30,6 +30,7 @@ import forestry.api.arboriculture.TreeManager; import forestry.api.arboriculture.WoodBlockKind; import forestry.api.core.CamouflageManager; import forestry.api.core.ForestryAPI; +import forestry.api.core.IArmorNaturalist; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.ILeafTranslator; import forestry.api.genetics.ISaplingTranslator; @@ -41,6 +42,7 @@ import forestry.arboriculture.blocks.BlockPile; import forestry.arboriculture.blocks.BlockRegistryArboriculture; import forestry.arboriculture.blocks.log.BlockArbLog; import forestry.arboriculture.blocks.slab.BlockArbSlab; +import forestry.arboriculture.capabilities.ArmorNaturalist; import forestry.arboriculture.commands.CommandTree; import forestry.arboriculture.genetics.TreeBranchDefinition; import forestry.arboriculture.genetics.TreeDefinition; @@ -64,6 +66,7 @@ import forestry.arboriculture.tiles.TileLeaves; import forestry.arboriculture.tiles.TilePile; import forestry.arboriculture.tiles.TileSapling; import forestry.core.PluginCore; +import forestry.core.capabilities.NullStorage; import forestry.core.config.Config; import forestry.core.config.Constants; import forestry.core.fluids.Fluids; @@ -98,6 +101,7 @@ import net.minecraft.world.World; import net.minecraftforge.client.event.ModelBakeEvent; import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.common.capabilities.CapabilityManager; import net.minecraftforge.event.world.BlockEvent; import net.minecraftforge.fml.common.IFuelHandler; import net.minecraftforge.fml.common.SidedProxy; @@ -140,6 +144,9 @@ public class PluginArboriculture extends BlankForestryPlugin { TreeManager.treeRoot.registerTreekeepingMode(TreekeepingMode.hard); TreeManager.treeRoot.registerTreekeepingMode(TreekeepingMode.hardcore); TreeManager.treeRoot.registerTreekeepingMode(TreekeepingMode.insane); + + // Capabilities + CapabilityManager.INSTANCE.register(IArmorNaturalist.class, new NullStorage<>(), () -> ArmorNaturalist.INSTANCE); } @Override diff --git a/src/main/java/forestry/arboriculture/capabilities/ArmorNaturalist.java b/src/main/java/forestry/arboriculture/capabilities/ArmorNaturalist.java new file mode 100644 index 000000000..87219b114 --- /dev/null +++ b/src/main/java/forestry/arboriculture/capabilities/ArmorNaturalist.java @@ -0,0 +1,18 @@ +package forestry.arboriculture.capabilities; + +import forestry.api.core.IArmorNaturalist; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; + +public class ArmorNaturalist implements IArmorNaturalist { + public static final ArmorNaturalist INSTANCE = new ArmorNaturalist(); + + protected ArmorNaturalist() { + + } + + @Override + public boolean canSeePollination(EntityPlayer player, ItemStack armor, boolean doSee) { + return true; + } +} diff --git a/src/main/java/forestry/core/items/ItemArmorNaturalist.java b/src/main/java/forestry/core/items/ItemArmorNaturalist.java index f09548850..03a077013 100755 --- a/src/main/java/forestry/core/items/ItemArmorNaturalist.java +++ b/src/main/java/forestry/core/items/ItemArmorNaturalist.java @@ -10,23 +10,27 @@ ******************************************************************************/ package forestry.core.items; -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 javax.annotation.Nonnull; +import javax.annotation.Nullable; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import forestry.api.core.IArmorNaturalist; +import forestry.api.arboriculture.ArboricultureCapabilities; import forestry.api.core.IItemModelRegister; import forestry.api.core.IModelManager; import forestry.core.CreativeTabForestry; import forestry.core.config.Constants; +import net.minecraft.entity.Entity; +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 ItemArmorNaturalist extends ItemArmor implements IArmorNaturalist, IItemModelRegister { +public class ItemArmorNaturalist extends ItemArmor implements IItemModelRegister { public ItemArmorNaturalist() { super(ArmorMaterial.LEATHER, 0, EntityEquipmentSlot.HEAD); @@ -34,6 +38,7 @@ public class ItemArmorNaturalist extends ItemArmor implements IArmorNaturalist, setCreativeTab(CreativeTabForestry.tabForestry); } + @Nonnull @Override public String getArmorTexture(ItemStack stack, Entity entity, EntityEquipmentSlot slot, String type) { return Constants.MOD_ID + ":" + Constants.TEXTURE_NATURALIST_ARMOR_PRIMARY; @@ -50,9 +55,25 @@ public class ItemArmorNaturalist extends ItemArmor implements IArmorNaturalist, return false; } + @Nonnull @Override - public boolean canSeePollination(EntityPlayer player, ItemStack armor, boolean doSee) { - return armorType == EntityEquipmentSlot.HEAD; + public ICapabilityProvider initCapabilities(ItemStack stack, NBTTagCompound nbt) { + return new ICapabilityProvider() { + @Override + public boolean hasCapability(Capability capability, @Nullable EnumFacing facing) { + return capability == ArboricultureCapabilities.ARMOR_NATURALIST && + armorType == EntityEquipmentSlot.HEAD; + } + + @Override + public T getCapability(Capability capability, @Nullable EnumFacing facing) { + if (capability == ArboricultureCapabilities.ARMOR_NATURALIST && + armorType == EntityEquipmentSlot.HEAD) { + return capability.getDefaultInstance(); + } + return null; + } + }; } } diff --git a/src/main/java/forestry/core/utils/GeneticsUtil.java b/src/main/java/forestry/core/utils/GeneticsUtil.java index 2825b26a8..a13594387 100644 --- a/src/main/java/forestry/core/utils/GeneticsUtil.java +++ b/src/main/java/forestry/core/utils/GeneticsUtil.java @@ -14,17 +14,8 @@ import javax.annotation.Nullable; import java.util.HashSet; import java.util.Set; -import net.minecraft.block.Block; -import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - import com.mojang.authlib.GameProfile; - +import forestry.api.arboriculture.ArboricultureCapabilities; import forestry.api.arboriculture.EnumGermlingType; import forestry.api.arboriculture.ITree; import forestry.api.arboriculture.TreeManager; @@ -43,6 +34,14 @@ import forestry.api.lepidopterology.IButterflyNursery; import forestry.arboriculture.genetics.pollination.CheckPollinatableTree; import forestry.core.config.Config; import forestry.core.genetics.ItemGE; +import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; public class GeneticsUtil { @@ -56,12 +55,16 @@ public class GeneticsUtil { return false; } - Item armorItem = armorItemStack.getItem(); - if (!(armorItem instanceof IArmorNaturalist)) { + final Item armorItem = armorItemStack.getItem(); + final IArmorNaturalist armorNaturalist; + if (armorItem instanceof IArmorNaturalist) { // legacy + armorNaturalist = (IArmorNaturalist) armorItem; + } else if (armorItemStack.hasCapability(ArboricultureCapabilities.ARMOR_NATURALIST, null)) { + armorNaturalist = armorItemStack.getCapability(ArboricultureCapabilities.ARMOR_NATURALIST, null); + } else { return false; } - IArmorNaturalist armorNaturalist = (IArmorNaturalist) armorItem; return armorNaturalist.canSeePollination(player, armorItemStack, true); }