From e7499424d60e8eeb1358a58fcfd4e209fea3cba1 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Sat, 22 Oct 2016 12:13:58 +0100 Subject: [PATCH] Invisibility Cloak --- .../vazkii/botania/common/brew/ModBrews.java | 2 +- .../common/core/BotaniaCreativeTab.java | 1 + .../vazkii/botania/common/item/ModItems.java | 5 +- .../bauble/ItemInvisibilityCloak.java | 59 ++++++++++++++++++ .../botania/common/lib/LibItemNames.java | 1 + .../resources/assets/botania/lang/en_US.lang | 1 + .../assets/botania/models/block/_make.bat | 41 ++++++++++++ .../assets/botania/models/item/_make.bat | 27 ++++++++ .../models/item/invisibilityCloak.json | 6 ++ .../{invisCloak.png => invisibilityCloak.png} | Bin 10 files changed, 141 insertions(+), 2 deletions(-) create mode 100644 src/main/java/vazkii/botania/common/item/equipment/bauble/ItemInvisibilityCloak.java create mode 100644 src/main/resources/assets/botania/models/block/_make.bat create mode 100644 src/main/resources/assets/botania/models/item/_make.bat create mode 100644 src/main/resources/assets/botania/models/item/invisibilityCloak.json rename src/main/resources/assets/botania/textures/items/{invisCloak.png => invisibilityCloak.png} (100%) diff --git a/src/main/java/vazkii/botania/common/brew/ModBrews.java b/src/main/java/vazkii/botania/common/brew/ModBrews.java index 5444c175d..aaa77e216 100644 --- a/src/main/java/vazkii/botania/common/brew/ModBrews.java +++ b/src/main/java/vazkii/botania/common/brew/ModBrews.java @@ -54,7 +54,7 @@ public class ModBrews { resistance = new BrewMod(LibBrewNames.RESISTANCE, 0xB44E17, 4000, new PotionEffect(MobEffects.RESISTANCE, 1800, 1)); fireResistance = new BrewMod(LibBrewNames.FIRE_RESISTANCE, 0xF86900, 4000, new PotionEffect(MobEffects.FIRE_RESISTANCE, 9600, 0)); waterBreathing = new BrewMod(LibBrewNames.WATER_BREATHING, 0x84A7CF, 4000, new PotionEffect(MobEffects.WATER_BREATHING, 9600, 0)); - invisibility = new BrewMod(LibBrewNames.INVISIBILITY, 0xAEAEAE, 8000, new PotionEffect(MobEffects.INVISIBILITY, 9600, 0)); + invisibility = new BrewMod(LibBrewNames.INVISIBILITY, 0xAEAEAE, 8000, new PotionEffect(MobEffects.INVISIBILITY, 9600, 0)).setNotBloodPendantInfusable(); nightVision = new BrewMod(LibBrewNames.NIGHT_VISION, 0x7C4BEB, 4000, new PotionEffect(MobEffects.NIGHT_VISION, 9600, 0)); absorption = new BrewMod(LibBrewNames.ABSORPTION, 0xF2EB23, 7000, new PotionEffect(MobEffects.ABSORPTION, 1800, 3)).setNotBloodPendantInfusable().setNotIncenseInfusable(); diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index 83798a2fa..68d4cd6a1 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -249,6 +249,7 @@ public final class BotaniaCreativeTab extends CreativeTabs { addItem(ModItems.icePendant); addItem(ModItems.lavaPendant); addItem(ModItems.superLavaPendant); + addItem(ModItems.invisibilityCloak); addItem(ModItems.holyCloak); addItem(ModItems.unholyCloak); addItem(ModItems.balanceCloak); diff --git a/src/main/java/vazkii/botania/common/item/ModItems.java b/src/main/java/vazkii/botania/common/item/ModItems.java index 9d9ecd36a..1a0e23ef6 100644 --- a/src/main/java/vazkii/botania/common/item/ModItems.java +++ b/src/main/java/vazkii/botania/common/item/ModItems.java @@ -48,6 +48,7 @@ import vazkii.botania.common.item.equipment.bauble.ItemGreaterMagnetRing; import vazkii.botania.common.item.equipment.bauble.ItemGreaterManaRing; import vazkii.botania.common.item.equipment.bauble.ItemHolyCloak; import vazkii.botania.common.item.equipment.bauble.ItemIcePendant; +import vazkii.botania.common.item.equipment.bauble.ItemInvisibilityCloak; import vazkii.botania.common.item.equipment.bauble.ItemItemFinder; import vazkii.botania.common.item.equipment.bauble.ItemKnockbackBelt; import vazkii.botania.common.item.equipment.bauble.ItemLavaPendant; @@ -269,6 +270,7 @@ public final class ModItems { public static Item speedUpBelt; public static Item baubleBox; public static Item dodgeRing; + public static Item invisibilityCloak; public static void init() { lexicon = new ItemLexicon(); @@ -418,7 +420,8 @@ public final class ModItems { speedUpBelt = new ItemSpeedUpBelt(); baubleBox = new ItemBaubleBox(); dodgeRing = new ItemDodgeRing(); - + invisibilityCloak = new ItemInvisibilityCloak(); + OreDictionary.registerOre(LibOreDict.LEXICON, lexicon); for(int i = 0; i < 16; i++) { OreDictionary.registerOre(LibOreDict.PETAL[i], new ItemStack(petal, 1, i)); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemInvisibilityCloak.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemInvisibilityCloak.java new file mode 100644 index 000000000..6ad4a35e6 --- /dev/null +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemInvisibilityCloak.java @@ -0,0 +1,59 @@ +/** + * 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 @ [22/10/2016, 11:51:06 (GMT)] + */ +package vazkii.botania.common.item.equipment.bauble; + +import baubles.api.BaubleType; +import baubles.api.BaublesApi; +import net.minecraft.block.material.Material; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.MobEffects; +import net.minecraft.item.ItemStack; +import net.minecraft.potion.PotionEffect; +import vazkii.botania.api.mana.IManaUsingItem; +import vazkii.botania.api.mana.ManaItemHandler; +import vazkii.botania.common.lib.LibItemNames; + +public class ItemInvisibilityCloak extends ItemBauble implements IManaUsingItem { + + public ItemInvisibilityCloak() { + super(LibItemNames.INVISIBILITY_CLOAK); + } + + @Override + public BaubleType getBaubleType(ItemStack arg0) { + return BaubleType.BODY; + } + + @Override + public void onUnequipped(ItemStack stack, EntityLivingBase player) { + PotionEffect effect = player.getActivePotionEffect(MobEffects.INVISIBILITY); + if(effect != null && player instanceof EntityPlayer && effect.getAmplifier() == -42 && ManaItemHandler.requestManaExact(stack, (EntityPlayer) player, 2, true)) + player.removePotionEffect(MobEffects.INVISIBILITY); + } + + @Override + public void onWornTick(ItemStack stack, EntityLivingBase player) { + super.onWornTick(stack, player); + + PotionEffect effect = player.getActivePotionEffect(MobEffects.NIGHT_VISION); + if(effect == null) { + PotionEffect neweffect = new PotionEffect(MobEffects.INVISIBILITY, Integer.MAX_VALUE, -42, true, true); + player.addPotionEffect(neweffect); + } + } + + @Override + public boolean usesMana(ItemStack stack) { + return true; + } + +} diff --git a/src/main/java/vazkii/botania/common/lib/LibItemNames.java b/src/main/java/vazkii/botania/common/lib/LibItemNames.java index 0deec6971..6bdf297f2 100644 --- a/src/main/java/vazkii/botania/common/lib/LibItemNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibItemNames.java @@ -161,6 +161,7 @@ public final class LibItemNames { public static final String SPEED_UP_BELT = "speedUpBelt"; public static final String BAUBLE_BOX = "baubleBox"; public static final String DODGE_RING = "dodgeRing"; + public static final String INVISIBILITY_CLOAK = "invisibilityCloak"; public static final String[] LENS_NAMES = new String[] { "lensNormal", diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 3b98c96c1..5b34d51b7 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -1604,6 +1604,7 @@ item.botania:speedUpBelt.name=Planestrider's Sash item.botania:baubleBox.name=Bauble Case item.botania:manaPowder.name=Mana Powder item.botania:dodgeRing.name=Ring of Dexterous Motion +item.botania:invisibilityCloak.name=Invisibility Cloak # BREW NAMES botania.brew.fallback=Fallback diff --git a/src/main/resources/assets/botania/models/block/_make.bat b/src/main/resources/assets/botania/models/block/_make.bat new file mode 100644 index 000000000..c4fb5a65f --- /dev/null +++ b/src/main/resources/assets/botania/models/block/_make.bat @@ -0,0 +1,41 @@ +@echo off +:: Vazkii's JSON creator for blocks +:: Put in your /resources/assets/%modid%/models/block +:: Makes basic block JSON files as well as the acossiated item and simple blockstate +:: Can make multiple blocks at once +:: +:: Usage: +:: _make (block name 1) (block name 2) (block name x) +:: +:: Change this to your mod's ID +set modid=botania + +setlocal enabledelayedexpansion + +for %%x in (%*) do ( + echo Making %%x.json block + ( + echo { + echo "parent": "block/cube_all", + echo "textures": { + echo "all": "%modid%:blocks/%%x" + echo } + echo } + ) > %%x.json + + echo Making %%x.json item + ( + echo { + echo "parent": "%modid%:block/%%x" + echo } + ) > ../item/%%x.json + + echo Making %%x.json blockstate + ( + echo { + echo "variants": { + echo "normal": { "model": "%modid%:%%x" } + echo } + echo } + ) > ../../blockstates/%%x.json +) diff --git a/src/main/resources/assets/botania/models/item/_make.bat b/src/main/resources/assets/botania/models/item/_make.bat new file mode 100644 index 000000000..1a576ffaa --- /dev/null +++ b/src/main/resources/assets/botania/models/item/_make.bat @@ -0,0 +1,27 @@ +@echo off +:: Vazkii's JSON creator for items +:: Put in your /resources/assets/%modid%/models/item +:: Makes basic item JSON files +:: Requires a _standard_item.json to be present for parenting +:: Can make multiple items at once +:: +:: Usage: +:: _make (item name 1) (item name 2) (item name x) +:: +:: Change this to your mod's ID +set modid=botania + +setlocal enabledelayedexpansion + +for %%x in (%*) do ( + echo Making %%x.json + ( + echo { + echo "parent": "item/generated", + echo "textures": { + echo "layer0": "%modid%:items/%%x" + echo } + echo } + ) > %%x.json + +) \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/invisibilityCloak.json b/src/main/resources/assets/botania/models/item/invisibilityCloak.json new file mode 100644 index 000000000..539b58b1b --- /dev/null +++ b/src/main/resources/assets/botania/models/item/invisibilityCloak.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/invisibilityCloak" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/textures/items/invisCloak.png b/src/main/resources/assets/botania/textures/items/invisibilityCloak.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/invisCloak.png rename to src/main/resources/assets/botania/textures/items/invisibilityCloak.png