mirror of
https://github.com/GTNewHorizons/ForbiddenMagic.git
synced 2026-11-19 19:49:50 +00:00
Add Equivalent Rod Placeholder Item (#16)
This commit is contained in:
1 parent
4216eb9c9e
commit
1b2f2a5337
6 files changed
+40
-40
No files matched your search
@@ -12,8 +12,6 @@ import cpw.mods.fml.common.registry.VillagerRegistry.IVillageTradeHandler;
|
||||
import fox.spiteful.forbidden.items.ForbiddenItems;
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import thaumcraft.api.aspects.AspectList;
|
||||
import thaumcraft.api.wands.WandCap;
|
||||
import thaumcraft.api.wands.WandRod;
|
||||
import thaumcraft.common.config.ConfigItems;
|
||||
import thaumcraft.common.items.wands.ItemWandCasting;
|
||||
|
||||
@@ -75,8 +73,8 @@ public class VillagerHereticManager implements IVillageTradeHandler {
|
||||
new ItemStack(Items.glowstone_dust, 8 + random.nextInt(9))));
|
||||
|
||||
ItemStack wand = new ItemStack(ConfigItems.itemWandCasting, 1, 36);
|
||||
((ItemWandCasting) wand.getItem()).setCap(wand, (WandCap) WandCap.caps.get("iron"));
|
||||
((ItemWandCasting) wand.getItem()).setRod(wand, (WandRod) WandRod.rods.get("profane"));
|
||||
((ItemWandCasting) wand.getItem()).setCap(wand, ConfigItems.WAND_CAP_IRON);
|
||||
((ItemWandCasting) wand.getItem()).setRod(wand, ForbiddenItems.WAND_ROD_PROFANE);
|
||||
((ItemWandCasting) wand.getItem()).storeAllVis(
|
||||
wand,
|
||||
new AspectList().add(Aspect.FIRE, 5000).add(Aspect.WATER, 5000).add(Aspect.EARTH, 5000)
|
||||
|
||||
@@ -201,7 +201,7 @@ public class ForbiddenItems {
|
||||
WAND_ROD_EQUIVALENT = new WandRod(
|
||||
"equivalent",
|
||||
100,
|
||||
new ItemStack(wandCore, 1, 11),
|
||||
new ItemStack(wandCore, 1, 14),
|
||||
12,
|
||||
new ResourceLocation("forbidden", "textures/models/wand_rod_equivalent.png"));
|
||||
WAND_ROD_PROFANE = new WandRod(
|
||||
|
||||
@@ -13,10 +13,9 @@ import cpw.mods.fml.relauncher.SideOnly;
|
||||
import fox.spiteful.forbidden.Config;
|
||||
import fox.spiteful.forbidden.Forbidden;
|
||||
import fox.spiteful.forbidden.compat.Compat;
|
||||
import fox.spiteful.forbidden.items.ForbiddenItems;
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import thaumcraft.api.aspects.AspectList;
|
||||
import thaumcraft.api.wands.WandCap;
|
||||
import thaumcraft.api.wands.WandRod;
|
||||
import thaumcraft.common.config.ConfigItems;
|
||||
import thaumcraft.common.items.wands.ItemWandCasting;
|
||||
|
||||
@@ -24,7 +23,7 @@ public class ItemWandCores extends Item {
|
||||
|
||||
public final String[] types = { "tainted", "infernal", "soul", "blood", "witchwood", "profane", "blood_inert",
|
||||
"livingwood", "livingwood_inert", "blood_staff", "witchwood_staff", "dreamwood", "dreamwood_inert",
|
||||
"dreamwood_staff" };
|
||||
"dreamwood_staff", "equivalent" };
|
||||
public IIcon[] icon;
|
||||
|
||||
public ItemWandCores() {
|
||||
@@ -55,24 +54,24 @@ public class ItemWandCores extends Item {
|
||||
}
|
||||
|
||||
ItemStack wand = new ItemStack(ConfigItems.itemWandCasting, 1, 72);
|
||||
((ItemWandCasting) wand.getItem()).setCap(wand, (WandCap) WandCap.caps.get("thaumium"));
|
||||
((ItemWandCasting) wand.getItem()).setRod(wand, (WandRod) WandRod.rods.get("tainted"));
|
||||
((ItemWandCasting) wand.getItem()).setCap(wand, ConfigItems.WAND_CAP_THAUMIUM);
|
||||
((ItemWandCasting) wand.getItem()).setRod(wand, ForbiddenItems.WAND_ROD_TAINTED);
|
||||
list.add(wand);
|
||||
wand = new ItemStack(ConfigItems.itemWandCasting, 1, 72);
|
||||
((ItemWandCasting) wand.getItem()).setCap(wand, (WandCap) WandCap.caps.get("thaumium"));
|
||||
((ItemWandCasting) wand.getItem()).setRod(wand, (WandRod) WandRod.rods.get("infernal"));
|
||||
((ItemWandCasting) wand.getItem()).setCap(wand, ConfigItems.WAND_CAP_THAUMIUM);
|
||||
((ItemWandCasting) wand.getItem()).setRod(wand, ForbiddenItems.WAND_ROD_INFERNAL);
|
||||
list.add(wand);
|
||||
wand = new ItemStack(ConfigItems.itemWandCasting, 1, 2000);
|
||||
((ItemWandCasting) wand.getItem()).setCap(wand, (WandCap) WandCap.caps.get("orichalcum"));
|
||||
((ItemWandCasting) wand.getItem()).setRod(wand, (WandRod) WandRod.rods.get("neutronium"));
|
||||
((ItemWandCasting) wand.getItem()).setCap(wand, ForbiddenItems.WAND_CAP_ORICHALCUM);
|
||||
((ItemWandCasting) wand.getItem()).setRod(wand, ForbiddenItems.WAND_ROD_NEUTRONIUM);
|
||||
list.add(wand);
|
||||
wand = new ItemStack(ConfigItems.itemWandCasting, 1, 2000);
|
||||
((ItemWandCasting) wand.getItem()).setCap(wand, (WandCap) WandCap.caps.get("orichalcum"));
|
||||
((ItemWandCasting) wand.getItem()).setRod(wand, (WandRod) WandRod.rods.get("neutronium_staff"));
|
||||
((ItemWandCasting) wand.getItem()).setCap(wand, ForbiddenItems.WAND_CAP_ORICHALCUM);
|
||||
((ItemWandCasting) wand.getItem()).setRod(wand, ForbiddenItems.STAFF_ROD_NEUTRONIUM);
|
||||
list.add(wand);
|
||||
wand = new ItemStack(ConfigItems.itemWandCasting, 1, 36);
|
||||
((ItemWandCasting) wand.getItem()).setCap(wand, (WandCap) WandCap.caps.get("iron"));
|
||||
((ItemWandCasting) wand.getItem()).setRod(wand, (WandRod) WandRod.rods.get("profane"));
|
||||
((ItemWandCasting) wand.getItem()).setCap(wand, ConfigItems.WAND_CAP_IRON);
|
||||
((ItemWandCasting) wand.getItem()).setRod(wand, ForbiddenItems.WAND_ROD_PROFANE);
|
||||
((ItemWandCasting) wand.getItem()).storeAllVis(
|
||||
wand,
|
||||
new AspectList().add(Aspect.FIRE, 5000).add(Aspect.WATER, 5000).add(Aspect.EARTH, 5000)
|
||||
@@ -80,46 +79,48 @@ public class ItemWandCores extends Item {
|
||||
list.add(wand);
|
||||
if (Compat.bm && Config.crossWand) {
|
||||
wand = new ItemStack(ConfigItems.itemWandCasting, 1, 84);
|
||||
((ItemWandCasting) wand.getItem()).setCap(wand, (WandCap) WandCap.caps.get("alchemical"));
|
||||
((ItemWandCasting) wand.getItem()).setRod(wand, (WandRod) WandRod.rods.get("blood"));
|
||||
((ItemWandCasting) wand.getItem()).setCap(wand, ForbiddenItems.WAND_CAP_ALCHEMICAL);
|
||||
((ItemWandCasting) wand.getItem()).setRod(wand, ForbiddenItems.WAND_ROD_BLOOD);
|
||||
list.add(wand);
|
||||
wand = new ItemStack(ConfigItems.itemWandCasting, 1, 168);
|
||||
((ItemWandCasting) wand.getItem()).setCap(wand, (WandCap) WandCap.caps.get("alchemical"));
|
||||
((ItemWandCasting) wand.getItem()).setRod(wand, (WandRod) WandRod.rods.get("blood_staff"));
|
||||
((ItemWandCasting) wand.getItem()).setCap(wand, ForbiddenItems.WAND_CAP_ALCHEMICAL);
|
||||
((ItemWandCasting) wand.getItem()).setRod(wand, ForbiddenItems.STAFF_ROD_BLOOD);
|
||||
list.add(wand);
|
||||
}
|
||||
if (Compat.am2 && Config.crossWand) {
|
||||
wand = new ItemStack(ConfigItems.itemWandCasting, 1, 72);
|
||||
((ItemWandCasting) wand.getItem()).setCap(wand, (WandCap) WandCap.caps.get("vinteum"));
|
||||
((ItemWandCasting) wand.getItem()).setRod(wand, (WandRod) WandRod.rods.get("witchwood"));
|
||||
((ItemWandCasting) wand.getItem()).setCap(wand, ForbiddenItems.WAND_CAP_VINTEUM);
|
||||
((ItemWandCasting) wand.getItem()).setRod(wand, ForbiddenItems.WAND_ROD_WITCHWOOD);
|
||||
list.add(wand);
|
||||
wand = new ItemStack(ConfigItems.itemWandCasting, 1, 144);
|
||||
((ItemWandCasting) wand.getItem()).setCap(wand, (WandCap) WandCap.caps.get("vinteum"));
|
||||
((ItemWandCasting) wand.getItem()).setRod(wand, (WandRod) WandRod.rods.get("witchwood_staff"));
|
||||
((ItemWandCasting) wand.getItem()).setCap(wand, ForbiddenItems.WAND_CAP_VINTEUM);
|
||||
((ItemWandCasting) wand.getItem()).setRod(wand, ForbiddenItems.STAFF_ROD_WITCHWOOD);
|
||||
list.add(wand);
|
||||
}
|
||||
if (Compat.botan && Config.crossWand) {
|
||||
wand = new ItemStack(ConfigItems.itemWandCasting, 1, 84);
|
||||
((ItemWandCasting) wand.getItem()).setCap(wand, (WandCap) WandCap.caps.get("manasteel"));
|
||||
((ItemWandCasting) wand.getItem()).setRod(wand, (WandRod) WandRod.rods.get("livingwood"));
|
||||
((ItemWandCasting) wand.getItem()).setCap(wand, ForbiddenItems.WAND_CAP_MANASTEEL);
|
||||
((ItemWandCasting) wand.getItem()).setRod(wand, ForbiddenItems.WAND_ROD_LIVINGWOOD);
|
||||
list.add(wand);
|
||||
wand = new ItemStack(ConfigItems.itemWandCasting, 1, 84);
|
||||
((ItemWandCasting) wand.getItem()).setCap(wand, (WandCap) WandCap.caps.get("elementium"));
|
||||
((ItemWandCasting) wand.getItem()).setRod(wand, (WandRod) WandRod.rods.get("dreamwood"));
|
||||
((ItemWandCasting) wand.getItem()).setCap(wand, ForbiddenItems.WAND_CAP_ELEMENTIUM);
|
||||
((ItemWandCasting) wand.getItem()).setRod(wand, ForbiddenItems.WAND_ROD_DREAMWOOD);
|
||||
list.add(wand);
|
||||
wand = new ItemStack(ConfigItems.itemWandCasting, 1, 144);
|
||||
((ItemWandCasting) wand.getItem()).setCap(wand, (WandCap) WandCap.caps.get("elementium"));
|
||||
((ItemWandCasting) wand.getItem()).setRod(wand, (WandRod) WandRod.rods.get("dreamwood_staff"));
|
||||
((ItemWandCasting) wand.getItem()).setCap(wand, ForbiddenItems.WAND_CAP_ELEMENTIUM);
|
||||
((ItemWandCasting) wand.getItem()).setRod(wand, ForbiddenItems.STAFF_ROD_DREAMWOOD);
|
||||
list.add(wand);
|
||||
wand = new ItemStack(ConfigItems.itemWandCasting, 1, 1);
|
||||
((ItemWandCasting) wand.getItem()).setCap(wand, (WandCap) WandCap.caps.get("terrasteel"));
|
||||
((ItemWandCasting) wand.getItem()).setRod(wand, (WandRod) WandRod.rods.get("wood"));
|
||||
((ItemWandCasting) wand.getItem()).setCap(wand, ForbiddenItems.WAND_CAP_TERRASTEEL);
|
||||
((ItemWandCasting) wand.getItem()).setRod(wand, ConfigItems.WAND_ROD_WOOD);
|
||||
list.add(wand);
|
||||
}
|
||||
if (Compat.ee3 && Config.crossWand) {
|
||||
wand = new ItemStack(ConfigItems.itemWandCasting, 1, 84);
|
||||
((ItemWandCasting) wand.getItem()).setCap(wand, ConfigItems.WAND_CAP_VOID);
|
||||
((ItemWandCasting) wand.getItem()).setRod(wand, ForbiddenItems.WAND_ROD_EQUIVALENT);
|
||||
list.add(wand);
|
||||
}
|
||||
wand = new ItemStack(ConfigItems.itemWandCasting, 1, 84);
|
||||
((ItemWandCasting) wand.getItem()).setCap(wand, (WandCap) WandCap.caps.get("void"));
|
||||
((ItemWandCasting) wand.getItem()).setRod(wand, (WandRod) WandRod.rods.get("equivalent"));
|
||||
list.add(wand);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -4,9 +4,9 @@ import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
|
||||
import fox.spiteful.forbidden.items.ForbiddenItems;
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import thaumcraft.api.wands.IWandRodOnUpdate;
|
||||
import thaumcraft.api.wands.WandRod;
|
||||
import thaumcraft.common.Thaumcraft;
|
||||
import thaumcraft.common.items.wands.ItemWandCasting;
|
||||
|
||||
@@ -37,7 +37,7 @@ public class ProfaneWandUpdate implements IWandRodOnUpdate {
|
||||
}
|
||||
|
||||
if (tag.getInteger("contract") <= 0) {
|
||||
((ItemWandCasting) itemstack.getItem()).setRod(itemstack, WandRod.rods.get("profaned"));
|
||||
((ItemWandCasting) itemstack.getItem()).setRod(itemstack, ForbiddenItems.WAND_ROD_PROFANED);
|
||||
Thaumcraft.addStickyWarpToPlayer(player, 1);
|
||||
player.worldObj.spawnParticle(
|
||||
"largeexplode",
|
||||
|
||||
@@ -84,6 +84,7 @@ item.WandCores.witchwood_staff.name=Witchwood Staff Core
|
||||
item.WandCores.dreamwood.name=Dreamwood Rod
|
||||
item.WandCores.dreamwood_inert.name=Silent Dreamwood Rod
|
||||
item.WandCores.dreamwood_staff.name=Dreamwood Staff Core
|
||||
item.WandCores.equivalent.name=§kAlchemical§r Rod
|
||||
item.WandCaps.name=Wand Cap
|
||||
item.WandCaps.alchemical.name=Alchemical Cap
|
||||
item.WandCaps.vinteum.name=Vinteum Cap
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 258 B |
Reference in new issue
Block a user