mirror of
https://github.com/GTNewHorizons/ForbiddenMagic.git
synced 2026-11-20 12:09:50 +00:00
Alchemical wand cap added
This commit is contained in:
1 parent
e6742043b2
commit
675377e280
7 files changed
+80
-2
No files matched your search
@@ -30,12 +30,14 @@ item.WandCores.tainted.name=Tainted Rod
|
||||
item.WandCores.infernal.name=Infernal Rod
|
||||
item.WandCores.soul.name=Eldritch Rod
|
||||
item.WandCores.blood.name=Bloody Rod
|
||||
item.WandCaps.alchemical.name=Alchemical Cap
|
||||
item.Wand.tainted.rod=Tainted
|
||||
item.Wand.infernal.rod=Infernal
|
||||
item.Wand.neutronium.rod=Cosmic Neutronium
|
||||
item.Wand.soul.rod=Eldritch
|
||||
item.Wand.blood.rod=Blood
|
||||
item.Wand.orichalcum.cap=Orichalcum Studded
|
||||
item.Wand.alchemical.cap=Alchemically Crowned
|
||||
item.FMResource.0.name=Emerald Fragment
|
||||
item.FMResource.1.name=Shadow Ink
|
||||
item.MobCrystalEmpty.name=Blank Imprinting Crystal
|
||||
@@ -53,6 +55,7 @@ enchantment.cluster=Fiery Core
|
||||
enchantment.pigbane=Porcivore
|
||||
enchantment.greedy=Greedy
|
||||
enchantment.consuming=Consuming
|
||||
enchantment.educational=Educational
|
||||
#
|
||||
# Misc
|
||||
itemGroup.forbidden=Forbidden Magic
|
||||
@@ -139,4 +142,8 @@ forbidden.research_page.CONSUMING.1=Sick of having to empty your pack of worthle
|
||||
forbidden.research_name.PIGBANE=Enchantment: Porcivore
|
||||
forbidden.research_text.PIGBANE=Show those Zombie Pigmen who's at the top of the food chain!
|
||||
forbidden.research_page.PIGBANE.1=Zombie Pigmen think they're so great. They're always stomping around the Nether ganging up on innocent travelers. It's time someone put a stop to them.<BR><BR>Weapons with the Porcivore enchantment will do excessive amounts of damage to Pigs and Zombie Pigmen.
|
||||
#
|
||||
forbidden.research_name.EDUCATIONAL=Enchantment: Educational
|
||||
forbidden.research_text.EDUCATIONAL=Get a learn job!
|
||||
forbidden.research_page.EDUCATIONAL.1=You've created an enchantment to infuse a weapon with the very essence of knowledge and learning. Hammering such learning into monsters' heads will result in them dropping more experience than normal, depending on the level of enchantment.
|
||||
#
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 813 B |
@@ -0,0 +1,11 @@
|
||||
{
|
||||
"animation": {
|
||||
"frametime": 3,
|
||||
"frames": [
|
||||
0,
|
||||
1,
|
||||
2,
|
||||
1
|
||||
]
|
||||
}
|
||||
}
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 317 B |
@@ -22,6 +22,7 @@ public class ForbiddenItems
|
||||
public static Item arcaneCakeItem;
|
||||
public static Item taintShovel;
|
||||
public static Item wandCore;
|
||||
public static Item wandCap;
|
||||
public static Item resource;
|
||||
public static Item taintPickaxe;
|
||||
public static Item mobCrystal;
|
||||
@@ -37,6 +38,7 @@ public class ForbiddenItems
|
||||
public static WandRod WAND_ROD_SOUL;
|
||||
public static WandRod WAND_ROD_BLOOD;
|
||||
public static WandCap WAND_CAP_ORICHALCUM;
|
||||
public static WandCap WAND_CAP_ALCHEMICAL;
|
||||
|
||||
public static void addItems()
|
||||
{
|
||||
@@ -73,7 +75,9 @@ public class ForbiddenItems
|
||||
MinecraftForge.setToolClass(morphAxe, "axe", 4);
|
||||
|
||||
wandCore = new ItemWandCores(Config.wandCoreID).setUnlocalizedName("WandCores");
|
||||
GameRegistry.registerItem(wandCore, "WandCores");
|
||||
GameRegistry.registerItem(wandCore, "WandCores");
|
||||
wandCap = new ItemWandCaps(Config.wandCapID).setUnlocalizedName("WandCaps");
|
||||
GameRegistry.registerItem(wandCap, "WandCaps");
|
||||
WAND_ROD_TAINTED = new WandRod("tainted", 150, new ItemStack(wandCore, 1, 0), 12, new TaintedWandUpdate(), new ResourceLocation("forbidden", "textures/models/wand_rod_tainted.png"));
|
||||
WAND_ROD_INFERNAL = new WandRod("infernal", 150, new ItemStack(wandCore, 1, 1), 12, new InfernalWandUpdate(), new ResourceLocation("forbidden", "textures/models/wand_rod_infernal.png"));
|
||||
WAND_ROD_NEUTRONIUM = new WandRod("neutronium", 9001, new ItemStack(Block.bedrock, 1), 1000, new CreativeWandUpdate(), new ResourceLocation("forbidden", "textures/models/wand_rod_neutronium.png"));
|
||||
@@ -82,6 +86,7 @@ public class ForbiddenItems
|
||||
WAND_ROD_SOUL.setGlowing(true);
|
||||
WAND_ROD_BLOOD = new WandRod("blood", 100, new ItemStack(wandCore, 1, 3), 12, new BloodWandUpdate(), new ResourceLocation("forbidden", "textures/models/wand_rod_blood.png"));
|
||||
WAND_CAP_ORICHALCUM = new DarkWandCap("orichalcum", 0.0F, new ItemStack(Block.commandBlock, 1), 1000, new ResourceLocation("forbidden", "textures/models/wand_cap_orichalcum.png"));
|
||||
WAND_CAP_ALCHEMICAL = new DarkWandCap("alchemical", 0.95F, Arrays.asList(new Aspect[]{Aspect.WATER}), 0.8F, new ItemStack(wandCap, 1, 0), 7, new ResourceLocation("forbidden", "textures/models/wand_cap_alchemical.png"));
|
||||
|
||||
resource = new ItemResource(Config.resourceID).setUnlocalizedName("FMResource");
|
||||
GameRegistry.registerItem(resource, "FMResource");
|
||||
|
||||
@@ -0,0 +1,55 @@
|
||||
package com.spiteful.forbidden.items;
|
||||
|
||||
import com.spiteful.forbidden.Forbidden;
|
||||
import com.spiteful.forbidden.Compat;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import java.util.List;
|
||||
import net.minecraft.client.renderer.texture.IconRegister;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.Icon;
|
||||
import thaumcraft.api.ItemApi;
|
||||
import thaumcraft.api.wands.WandCap;
|
||||
import thaumcraft.api.wands.WandRod;
|
||||
import thaumcraft.common.items.wands.ItemWandCasting;
|
||||
|
||||
public class ItemWandCaps extends Item {
|
||||
|
||||
public final String[] types = {"alchemical"};
|
||||
public Icon[] icon;
|
||||
|
||||
|
||||
public ItemWandCaps(int par1) {
|
||||
super(par1);
|
||||
this.setMaxStackSize(64);
|
||||
this.setHasSubtypes(true);
|
||||
this.setMaxDamage(0);
|
||||
this.setCreativeTab(Forbidden.tab);
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void registerIcons(IconRegister ir) {
|
||||
icon = new Icon[types.length];
|
||||
for(int x = 0; x < types.length; x++)
|
||||
this.icon[x] = ir.registerIcon("forbidden:wand_cap_" + types[x]);
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public Icon getIconFromDamage(int meta) {
|
||||
return this.icon[meta];
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void getSubItems(int par1, CreativeTabs par2CreativeTabs, List par3List) {
|
||||
for(int x = 0; x < types.length; x++){
|
||||
par3List.add(new ItemStack(this, 1, x));
|
||||
}
|
||||
}
|
||||
|
||||
public String getUnlocalizedName(ItemStack par1ItemStack) {
|
||||
return super.getUnlocalizedName() + "." + types[par1ItemStack.getItemDamage()];
|
||||
}
|
||||
}
|
||||
@@ -69,7 +69,7 @@ public class ItemWandCores extends Item {
|
||||
if(Compat.bm)
|
||||
{
|
||||
ItemStack blood = ItemApi.getItem("itemWandCasting", 72);
|
||||
((ItemWandCasting)creative.getItem()).setCap(blood, (WandCap)WandCap.caps.get("thaumium"));
|
||||
((ItemWandCasting)creative.getItem()).setCap(blood, (WandCap)WandCap.caps.get("alchemical"));
|
||||
((ItemWandCasting)creative.getItem()).setRod(blood, (WandRod)WandRod.rods.get("blood"));
|
||||
par3List.add(blood);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user