From 093f25894974bd9abe6d32884d7fb7cd4ac94d4c Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Fri, 14 Oct 2016 21:48:23 +0100 Subject: [PATCH] Cloak of balance! --- .../botania/client/lib/LibResources.java | 2 + .../common/core/BotaniaCreativeTab.java | 1 + .../common/crafting/ModCraftingRecipes.java | 9 +++ .../vazkii/botania/common/item/ModItems.java | 3 + .../equipment/bauble/ItemBalanceCloak.java | 71 ++++++++++++++++++ .../botania/common/lexicon/LexiconData.java | 3 +- .../botania/common/lib/LibItemNames.java | 1 + .../resources/assets/botania/lang/en_US.lang | 8 +- .../botania/models/item/balanceCloak.json | 6 ++ .../items/{ => unused}/cirrusAmulet0.png | Bin .../items/{ => unused}/cirrusAmulet1.png | Bin .../items/{ => unused}/cirrusAmulet2.png | Bin .../items/{ => unused}/nimbusAmulet0.png | Bin .../items/{ => unused}/nimbusAmulet1.png | Bin .../items/{ => unused}/nimbusAmulet2.png | Bin 15 files changed, 100 insertions(+), 4 deletions(-) create mode 100644 src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBalanceCloak.java create mode 100644 src/main/resources/assets/botania/models/item/balanceCloak.json rename src/main/resources/assets/botania/textures/items/{ => unused}/cirrusAmulet0.png (100%) rename src/main/resources/assets/botania/textures/items/{ => unused}/cirrusAmulet1.png (100%) rename src/main/resources/assets/botania/textures/items/{ => unused}/cirrusAmulet2.png (100%) rename src/main/resources/assets/botania/textures/items/{ => unused}/nimbusAmulet0.png (100%) rename src/main/resources/assets/botania/textures/items/{ => unused}/nimbusAmulet1.png (100%) rename src/main/resources/assets/botania/textures/items/{ => unused}/nimbusAmulet2.png (100%) diff --git a/src/main/java/vazkii/botania/client/lib/LibResources.java b/src/main/java/vazkii/botania/client/lib/LibResources.java index a909148b4..ecdfa2336 100644 --- a/src/main/java/vazkii/botania/client/lib/LibResources.java +++ b/src/main/java/vazkii/botania/client/lib/LibResources.java @@ -103,8 +103,10 @@ public final class LibResources { public static final String MODEL_KNOCKBACK_BELT = PREFIX_MODEL + "knockbackBelt.png"; public static final String MODEL_HOLY_CLOAK = PREFIX_MODEL + "holyCloak.png"; public static final String MODEL_UNHOLY_CLOAK = PREFIX_MODEL + "unholyCloak.png"; + public static final String MODEL_BALANCE_CLOAK = PREFIX_MODEL + "balanceCloak.png"; public static final String MODEL_HOLY_CLOAK_GLOW = PREFIX_MODEL + "holyCloakGlow.png"; public static final String MODEL_UNHOLY_CLOAK_GLOW = PREFIX_MODEL + "unholyCloakGlow.png"; + public static final String MODEL_BALANCE_CLOAK_GLOW = PREFIX_MODEL + "balanceCloakGlow.png"; public static final String MODEL_CORPOREA_INDEX = PREFIX_MODEL + "corporeaIndex.png"; public static final String MODEL_INVISIBLE_ARMOR = PREFIX_MODEL + "invisibleArmor.png"; public static final String MODEL_PINK_WITHER = PREFIX_MODEL + "pinkWither.png"; diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index eb2b65a55..83798a2fa 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -251,6 +251,7 @@ public final class BotaniaCreativeTab extends CreativeTabs { addItem(ModItems.superLavaPendant); addItem(ModItems.holyCloak); addItem(ModItems.unholyCloak); + addItem(ModItems.balanceCloak); addItem(ModItems.goldLaurel); addItem(ModItems.divaCharm); addItem(ModItems.flightTiara); diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index ff91f92ba..576f6b20f 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -218,6 +218,7 @@ public final class ModCraftingRecipes { public static IRecipe recipeMissileRod; public static IRecipe recipeHolyCloak; public static IRecipe recipeUnholyCloak; + public static IRecipe recipeBalanceCloak; public static IRecipe recipeCraftingHalo; public static List recipesLensFlash; public static IRecipe recipePrism; @@ -1463,6 +1464,14 @@ public final class ModCraftingRecipes { 'S', LibOreDict.LIFE_ESSENCE); recipeUnholyCloak = BotaniaAPI.getLatestAddedRecipe(); + // Cloak of Balance Recipe + addOreDictRecipe(new ItemStack(ModItems.balanceCloak), + "WWW", "RWR", "RSR", + 'W', new ItemStack(Blocks.WOOL, 1, 8), + 'R', "gemEmerald", + 'S', LibOreDict.LIFE_ESSENCE); + recipeBalanceCloak = BotaniaAPI.getLatestAddedRecipe(); + // Assembly Halo Recipe addOreDictRecipe(new ItemStack(ModItems.craftingHalo), " P ", "ICI", " I ", diff --git a/src/main/java/vazkii/botania/common/item/ModItems.java b/src/main/java/vazkii/botania/common/item/ModItems.java index 7670e8e8a..9d9ecd36a 100644 --- a/src/main/java/vazkii/botania/common/item/ModItems.java +++ b/src/main/java/vazkii/botania/common/item/ModItems.java @@ -36,6 +36,7 @@ import vazkii.botania.common.item.equipment.armor.terrasteel.ItemTerrasteelChest import vazkii.botania.common.item.equipment.armor.terrasteel.ItemTerrasteelHelm; import vazkii.botania.common.item.equipment.armor.terrasteel.ItemTerrasteelLegs; import vazkii.botania.common.item.equipment.bauble.ItemAuraRing; +import vazkii.botania.common.item.equipment.bauble.ItemBalanceCloak; import vazkii.botania.common.item.equipment.bauble.ItemBaubleCosmetic; import vazkii.botania.common.item.equipment.bauble.ItemBloodPendant; import vazkii.botania.common.item.equipment.bauble.ItemDivaCharm; @@ -213,6 +214,7 @@ public final class ModItems { public static Item missileRod; public static Item holyCloak; public static Item unholyCloak; + public static Item balanceCloak; public static Item craftingHalo; public static Item blackLotus; public static Item monocle; @@ -361,6 +363,7 @@ public final class ModItems { missileRod = new ItemMissileRod(); holyCloak = new ItemHolyCloak(); unholyCloak = new ItemUnholyCloak(); + balanceCloak = new ItemBalanceCloak(); craftingHalo = new ItemCraftingHalo(); blackLotus = new ItemBlackLotus(); monocle = new ItemMonocle(); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBalanceCloak.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBalanceCloak.java new file mode 100644 index 000000000..f3fe57271 --- /dev/null +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBalanceCloak.java @@ -0,0 +1,71 @@ +/** + * 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 @ [14/10/2016, 19:55:51 (GMT)] + */ +package vazkii.botania.common.item.equipment.bauble; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.DamageSource; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.SoundCategory; +import net.minecraftforge.event.entity.living.LivingHurtEvent; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import vazkii.botania.api.sound.BotaniaSoundEvents; +import vazkii.botania.client.lib.LibResources; +import vazkii.botania.common.Botania; +import vazkii.botania.common.lib.LibItemNames; + +public class ItemBalanceCloak extends ItemHolyCloak { + + private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_BALANCE_CLOAK); + private static final ResourceLocation textureGlow = new ResourceLocation(LibResources.MODEL_BALANCE_CLOAK_GLOW); + + public ItemBalanceCloak() { + super(LibItemNames.BALANCE_CLOAK); + } + + public boolean effectOnDamage(LivingHurtEvent event, EntityPlayer player, ItemStack stack) { + if(!event.getSource().isMagicDamage()) { + event.setAmount(event.getAmount() / 2); + + if(event.getSource().getEntity() != null) + event.getSource().getEntity().attackEntityFrom(DamageSource.causeIndirectMagicDamage(player, player), event.getAmount()); + + if(event.getAmount() > player.getHealth()) + event.setAmount(player.getHealth() - 1); + + player.worldObj.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.holyCloak, SoundCategory.PLAYERS, 1F, 1F); + for(int i = 0; i < 30; i++) { + double x = player.posX + Math.random() * player.width * 2 - player.width; + double y = player.posY + Math.random() * player.height; + double z = player.posZ + Math.random() * player.width * 2 - player.width; + boolean green = Math.random() > 0.5; + Botania.proxy.sparkleFX(x, y, z, 0.3F, green ? 1F : 0.3F, green ? 0.3F : 1F, 0.8F + (float) Math.random() * 0.4F, 3); + } + return true; + } + + return false; + } + + @Override + @SideOnly(Side.CLIENT) + ResourceLocation getCloakTexture() { + return texture; + } + + @Override + @SideOnly(Side.CLIENT) + ResourceLocation getCloakGlowTexture() { + return textureGlow; + } + +} diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index 8bbd55bb8..2a6d734ed 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -1208,7 +1208,8 @@ public final class LexiconData { judgementCloaks = new AlfheimLexiconEntry(LibLexicon.BAUBLE_JUDGEMENT_CLOAKS, categoryBaubles); judgementCloaks.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeHolyCloak), - new PageCraftingRecipe("3", ModCraftingRecipes.recipeUnholyCloak)); + new PageCraftingRecipe("3", ModCraftingRecipes.recipeUnholyCloak), + new PageCraftingRecipe("4", ModCraftingRecipes.recipeBalanceCloak)); monocle = new BasicLexiconEntry(LibLexicon.BAUBLE_MONOCLE, categoryBaubles); monocle.setPriority().setLexiconPages(new PageText("0"), new PageText("2"), diff --git a/src/main/java/vazkii/botania/common/lib/LibItemNames.java b/src/main/java/vazkii/botania/common/lib/LibItemNames.java index 09d322381..0deec6971 100644 --- a/src/main/java/vazkii/botania/common/lib/LibItemNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibItemNames.java @@ -106,6 +106,7 @@ public final class LibItemNames { public static final String MISSILE_ROD = "missileRod"; public static final String HOLY_CLOAK = "holyCloak"; public static final String UNHOLY_CLOAK = "unholyCloak"; + public static final String BALANCE_CLOAK = "balanceCloak"; public static final String CRAFTING_HALO = "craftingHalo"; public static final String BLACK_LOTUS = "blackLotus"; public static final String MONOCLE = "monocle"; diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index c79c5f4f4..3b98c96c1 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -1487,6 +1487,7 @@ item.botania:redString.name=Red String item.botania:missileRod.name=Rod of the Unstable Reservoir item.botania:holyCloak.name=Cloak of Virtue item.botania:unholyCloak.name=Cloak of Sin +item.botania:balanceCloak.name=Cloak of Balance item.botania:craftingHalo.name=Assembly Halo item.botania:autocraftingHalo.name=Manufactory Halo item.botania:blackLotus0.name=Black Lotus @@ -3486,11 +3487,12 @@ botania.page.bloodPendant2=Always potted up # -- CLOAKS OF JUDGEMENT botania.entry.judgementCloaks=Cloaks of Judgement -botania.tagline.judgementCloaks=Cloaks of Virtue and Sin to judge opponents -botania.page.judgementCloaks0=The &1Cloaks of Judgement&0 are a pair of cloaks that can be worn instead of a belt (and thus, they go in the Belt slot). Their strength triggers when their wearer takes damage. After that, they'll go in a ten second recharge period in which their effects won't trigger. -botania.page.judgementCloaks1=The &1Cloak of Virtue&0 will, when active, block the full extent of a piece of damage taken. This does not apply to magic damage.
The &1Cloak of Sin&0 will damage all nearby hostile mobs for the same amount of damage that was taken. +botania.tagline.judgementCloaks=Cloaks to judge opponents +botania.page.judgementCloaks0=The &1Cloaks of Judgement&0 are a set of cloaks that can be worn in the body slot. Their strength triggers when their wearer takes damage. After that, they'll go in a ten second recharge period in which their effects won't trigger. +botania.page.judgementCloaks1=The &1Cloak of Virtue&0 will, when active, block the full extent of a piece of damage taken.
The &1Cloak of Sin&0 will damage all nearby hostile mobs for the same amount of damage that was taken.
The &1Cloak of Balance&0 will evenly split the damage between the attacker and the target. It also prevents the target from dying. botania.page.judgementCloaks2=A Holy Mantle botania.page.judgementCloaks3=Taste Vengeance! +botania.page.judgementCloaks4=Pain split # -- MANASEER MONOCLE botania.entry.monocle=Manaseer Monocle diff --git a/src/main/resources/assets/botania/models/item/balanceCloak.json b/src/main/resources/assets/botania/models/item/balanceCloak.json new file mode 100644 index 000000000..6d76e4bef --- /dev/null +++ b/src/main/resources/assets/botania/models/item/balanceCloak.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/balanceCloak" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/textures/items/cirrusAmulet0.png b/src/main/resources/assets/botania/textures/items/unused/cirrusAmulet0.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/cirrusAmulet0.png rename to src/main/resources/assets/botania/textures/items/unused/cirrusAmulet0.png diff --git a/src/main/resources/assets/botania/textures/items/cirrusAmulet1.png b/src/main/resources/assets/botania/textures/items/unused/cirrusAmulet1.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/cirrusAmulet1.png rename to src/main/resources/assets/botania/textures/items/unused/cirrusAmulet1.png diff --git a/src/main/resources/assets/botania/textures/items/cirrusAmulet2.png b/src/main/resources/assets/botania/textures/items/unused/cirrusAmulet2.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/cirrusAmulet2.png rename to src/main/resources/assets/botania/textures/items/unused/cirrusAmulet2.png diff --git a/src/main/resources/assets/botania/textures/items/nimbusAmulet0.png b/src/main/resources/assets/botania/textures/items/unused/nimbusAmulet0.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/nimbusAmulet0.png rename to src/main/resources/assets/botania/textures/items/unused/nimbusAmulet0.png diff --git a/src/main/resources/assets/botania/textures/items/nimbusAmulet1.png b/src/main/resources/assets/botania/textures/items/unused/nimbusAmulet1.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/nimbusAmulet1.png rename to src/main/resources/assets/botania/textures/items/unused/nimbusAmulet1.png diff --git a/src/main/resources/assets/botania/textures/items/nimbusAmulet2.png b/src/main/resources/assets/botania/textures/items/unused/nimbusAmulet2.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/nimbusAmulet2.png rename to src/main/resources/assets/botania/textures/items/unused/nimbusAmulet2.png