Remove golden laurel in favour of vanilla totem

This commit is contained in:
Vincent Lee committed 2017-01-23 11:48:41 -06:00
1 parent 9017e6ad85
commit 4e9109f9bd
20 files changed
+2 -172

No files matched your search

@@ -256,7 +256,6 @@ public final class BotaniaCreativeTab extends CreativeTabs {
addItem(ModItems.unholyCloak);
addItem(ModItems.balanceCloak);
addItem(ModItems.goddessCharm);
addItem(ModItems.goldLaurel);
addItem(ModItems.divaCharm);
addItem(ModItems.thirdEye);
addItem(ModItems.flightTiara);
@@ -118,7 +118,6 @@ public final class ModCraftingRecipes {
public static IRecipe recipeKnocbackBelt;
public static IRecipe recipeIcePendant;
public static IRecipe recipeFirePendant;
public static IRecipe recipeGoldenLaurel;
public static IRecipe recipeTinyPlanetBlock;
public static IRecipe recipeAlchemyCatalyst;
public static IRecipe recipeOpenCrate;
@@ -783,14 +782,6 @@ public final class ModCraftingRecipes {
'F', LibOreDict.RUNE[1]);
recipeFirePendant = BotaniaAPI.getLatestAddedRecipe();
// Golden Laurel Crown Recipe
addOreDictRecipe(new ItemStack(ModItems.goldLaurel),
"G G", "LEL", "LLL",
'G', "ingotGold",
'L', "treeLeaves",
'E', LibOreDict.LIFE_ESSENCE);
recipeGoldenLaurel = BotaniaAPI.getLatestAddedRecipe();
// Tiny Planet Block Recipe
addOreDictRecipe(new ItemStack(ModBlocks.tinyPlanet),
"SSS", "SPS", "SSS",
@@ -44,7 +44,6 @@ import vazkii.botania.common.item.equipment.bauble.ItemDivaCharm;
import vazkii.botania.common.item.equipment.bauble.ItemDodgeRing;
import vazkii.botania.common.item.equipment.bauble.ItemFlightTiara;
import vazkii.botania.common.item.equipment.bauble.ItemGoddessCharm;
import vazkii.botania.common.item.equipment.bauble.ItemGoldenLaurel;
import vazkii.botania.common.item.equipment.bauble.ItemGreaterAuraRing;
import vazkii.botania.common.item.equipment.bauble.ItemGreaterMagnetRing;
import vazkii.botania.common.item.equipment.bauble.ItemGreaterManaRing;
@@ -169,7 +168,6 @@ public final class ModItems {
public static Item knockbackBelt;
public static Item icePendant;
public static Item lavaPendant;
public static Item goldLaurel;
public static Item magnetRing;
public static Item waterRing;
public static Item miningRing;
@@ -324,7 +322,6 @@ public final class ModItems {
knockbackBelt = new ItemKnockbackBelt();
icePendant = new ItemIcePendant();
lavaPendant = new ItemLavaPendant();
goldLaurel = new ItemGoldenLaurel();
magnetRing = new ItemMagnetRing();
waterRing = new ItemWaterRing();
miningRing = new ItemMiningRing();
@@ -1,83 +0,0 @@
/**
* This class was created by <Vazkii>. 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 @ [Apr 27, 2014, 8:49:01 PM (GMT)]
*/
package vazkii.botania.common.item.equipment.bauble;
import baubles.api.BaubleType;
import baubles.api.BaublesApi;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.MobEffects;
import net.minecraft.inventory.EntityEquipmentSlot;
import net.minecraft.item.ItemStack;
import net.minecraft.potion.PotionEffect;
import net.minecraft.util.SoundCategory;
import net.minecraft.util.text.TextComponentTranslation;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.entity.living.LivingDeathEvent;
import net.minecraftforge.fml.common.eventhandler.EventPriority;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import vazkii.botania.api.item.IBaubleRender;
import vazkii.botania.api.sound.BotaniaSoundEvents;
import vazkii.botania.common.lib.LibItemNames;
public class ItemGoldenLaurel extends ItemBauble implements IBaubleRender {
public ItemGoldenLaurel() {
super(LibItemNames.GOLDEN_LAUREL);
MinecraftForge.EVENT_BUS.register(this);
}
@SubscribeEvent(priority = EventPriority.HIGHEST)
public void onPlayerDeath(LivingDeathEvent event) {
if(event.getEntityLiving() instanceof EntityPlayer) {
EntityPlayer player = (EntityPlayer) event.getEntityLiving();
ItemStack headgear = BaublesApi.getBaublesHandler(player).getStackInSlot(4);
if(!headgear.isEmpty() && headgear.getItem() == this) {
event.setCanceled(true);
player.setHealth(player.getMaxHealth());
player.addPotionEffect(new PotionEffect(MobEffects.RESISTANCE, 300, 6));
player.sendMessage(new TextComponentTranslation("botaniamisc.savedByLaurel"));
player.world.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.goldenLaurel, SoundCategory.PLAYERS, 1F, 0.3F);
BaublesApi.getBaublesHandler(player).setStackInSlot(4, ItemStack.EMPTY);
}
}
}
@Override
public BaubleType getBaubleType(ItemStack itemstack) {
return BaubleType.HEAD;
}
@Override
@SideOnly(Side.CLIENT)
public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) {
if(type == RenderType.HEAD) {
boolean armor = !player.getItemStackFromSlot(EntityEquipmentSlot.HEAD).isEmpty();
Helper.translateToHeadLevel(player);
Helper.defaultTransforms();
Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
GlStateManager.translate(0F, -3.2F, -1.825F);
GlStateManager.rotate(-90F, 0F, 1F, 0F);
GlStateManager.scale(1.625F, 1.625F, 1.625F);
GlStateManager.rotate(-80F, 1F, 0F, 0F);
if(armor) {
GlStateManager.scale(1.1F, 1.1F, 1.1F);
}
Minecraft.getMinecraft().getRenderItem().renderItem(stack, ItemCameraTransforms.TransformType.NONE);
}
}
}
@@ -236,7 +236,6 @@ public final class LexiconData {
public static LexiconEntry knockbacklBelt;
public static LexiconEntry icePendant;
public static LexiconEntry lavaPendant;
public static LexiconEntry goldLaurel;
public static LexiconEntry waterRing;
public static LexiconEntry miningRing;
public static LexiconEntry magnetRing;
@@ -1177,10 +1176,6 @@ public final class LexiconData {
lavaPendant.setLexiconPages(new PageText("0"),
new PageCraftingRecipe("1", ModCraftingRecipes.recipeFirePendant));
goldLaurel = new AlfheimLexiconEntry(LibLexicon.BAUBLE_GOLDEN_LAUREL, categoryBaubles);
goldLaurel.setLexiconPages(new PageText("0"),
new PageCraftingRecipe("1", ModCraftingRecipes.recipeGoldenLaurel));
waterRing = new BasicLexiconEntry(LibLexicon.BAUBLE_WATER_RING, categoryBaubles);
waterRing.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeWaterRing));
@@ -53,7 +53,6 @@ public final class LibItemNames {
public static final String KNOCKBACK_BELT = "knockbackBelt";
public static final String ICE_PENDANT = "icePendant";
public static final String LAVA_PENDANT = "lavaPendant";
public static final String GOLDEN_LAUREL = "goldenLaurel";
public static final String MAGNET_RING = "magnetRing";
public static final String WATER_RING = "waterRing";
public static final String MINING_RING = "miningRing";