From 2b63d88b21e2c7ac52639acd91acbc2fe169e563 Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Tue, 31 Mar 2015 21:09:47 +0100 Subject: [PATCH] LEGEN... wait for it... DARY --- .../java/vazkii/botania/api/BotaniaAPI.java | 3 +++ .../common/item/block/IRarityBlock.java | 20 +++++++++++++++++++ .../common/item/relic/ItemExcaliber.java | 7 +++++++ .../botania/common/item/relic/ItemRelic.java | 7 +++++++ .../common/item/relic/ItemRelicBauble.java | 7 +++++++ 5 files changed, 44 insertions(+) create mode 100644 src/main/java/vazkii/botania/common/item/block/IRarityBlock.java diff --git a/src/main/java/vazkii/botania/api/BotaniaAPI.java b/src/main/java/vazkii/botania/api/BotaniaAPI.java index f0e086681..ba16ca6f7 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPI.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPI.java @@ -21,6 +21,7 @@ import java.util.Set; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.init.Items; +import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; import net.minecraft.item.Item.ToolMaterial; import net.minecraft.item.ItemArmor.ArmorMaterial; @@ -83,6 +84,8 @@ public final class BotaniaAPI { public static ArmorMaterial terrasteelArmorMaterial = EnumHelper.addArmorMaterial("TERRASTEEL", 34, new int[] {3, 8, 6, 3}, 26); public static ToolMaterial terrasteelToolMaterial = EnumHelper.addToolMaterial("TERRASTEEL", 4, 2300, 9F, 3F, 26); + public static EnumRarity rarityRelic = EnumHelper.addRarity("RELIC", EnumChatFormatting.GOLD, "Relic"); + public static KnowledgeType basicKnowledge, elvenKnowledge; // All of these categories are initialized during botania's PreInit stage. diff --git a/src/main/java/vazkii/botania/common/item/block/IRarityBlock.java b/src/main/java/vazkii/botania/common/item/block/IRarityBlock.java new file mode 100644 index 000000000..c580b9289 --- /dev/null +++ b/src/main/java/vazkii/botania/common/item/block/IRarityBlock.java @@ -0,0 +1,20 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [Mar 31, 2015, 9:00:38 PM (GMT)] + */ +package vazkii.botania.common.item.block; + +import net.minecraft.item.EnumRarity; +import net.minecraft.item.ItemStack; + +public interface IRarityBlock { + + public EnumRarity getRarity(ItemStack stack); + +} diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemExcaliber.java b/src/main/java/vazkii/botania/common/item/relic/ItemExcaliber.java index 4da4837b3..c4f317870 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemExcaliber.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemExcaliber.java @@ -18,6 +18,7 @@ import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityThrowable; +import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; @@ -28,6 +29,7 @@ import net.minecraft.util.DamageSource; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import net.minecraftforge.common.util.EnumHelper; +import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.item.IRelic; import vazkii.botania.api.mana.BurstProperties; @@ -194,5 +196,10 @@ public class ItemExcaliber extends ItemManasteelSword implements IRelic, ILensEf public boolean doParticles(IManaBurst burst, ItemStack stack) { return true; } + + @Override + public EnumRarity getRarity(ItemStack p_77613_1_) { + return BotaniaAPI.rarityRelic; + } } diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java b/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java index d6027c74c..6e35e72d0 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java @@ -15,12 +15,14 @@ import java.util.List; import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; import net.minecraft.util.DamageSource; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.IRelic; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.ItemMod; @@ -118,5 +120,10 @@ public class ItemRelic extends ItemMod implements IRelic { public void setBindAchievement(Achievement achievement) { this.achievement = achievement; } + + @Override + public EnumRarity getRarity(ItemStack p_77613_1_) { + return BotaniaAPI.rarityRelic; + } } diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java b/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java index 9611689b5..9a56ec262 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemRelicBauble.java @@ -15,9 +15,11 @@ import java.util.List; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; import net.minecraft.world.World; +import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.IRelic; import vazkii.botania.common.item.equipment.bauble.ItemBauble; @@ -76,4 +78,9 @@ public abstract class ItemRelicBauble extends ItemBauble implements IRelic { this.achievement = achievement; } + @Override + public EnumRarity getRarity(ItemStack p_77613_1_) { + return BotaniaAPI.rarityRelic; + } + }