This commit is contained in:
Jeremy Diamond committed 2014-08-08 21:52:44 -07:00
1 parent 3bc6904db5
commit 5e173ba77e
68 files changed
+252 -316

No files matched your search

+26 -18
View File
@@ -31,31 +31,39 @@ version = config.minecraft_version + "-" + config.mod_version
group= "com.github.spitefulfox.forbiddenmagic" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = "Forbidden Magic"
dependencies {
compile files("lib/Thaumcraft-deobf-1.7.2-4.1.1.12.jar")
}
minecraft {
version = config.minecraft_version + "-" + config.forge_version
version = "1.7.10-10.13.0.1180"
assetDir = "eclipse/assets"
}
processResources {
dependencies {
compile fileTree(dir: 'lib', include: '*.jar')
}
processResources
{
// this will ensure that this task is redone when the versions change.
inputs.property "version", project.version
inputs.property "mcversion", project.minecraft.version
// replace stuff in mcmod.info, nothing else
from(sourceSets.main.resources.srcDirs) {
include '**/*.info'
include '**/*.properties'
expand ([
'modid': project.archivesBaseName,
'mod_version': project.config.mod_version,
'minecraft_version': project.config.minecraft_version
])
include 'mcmod.info'
// replace version and mcversion
expand 'version':project.version, 'mcversion':project.minecraft.version
}
// copy everything else, thats not the mcmod.info
from(sourceSets.main.resources.srcDirs) {
exclude '**/*.info'
exclude '**/*.properties'
exclude 'mcmod.info'
}
}
}
task deobfJar(type: Jar) {
from sourceSets.main.output
classifier = 'deobf'
}
deobfJar.dependsOn classes
assemble.dependsOn deobfJar
+3 -3
View File
@@ -1,3 +1,3 @@
minecraft_version=1.7.2
forge_version=10.12.1.1103
mod_version=0.4b
minecraft_version=1.7.10
forge_version=10.13.0.1180
mod_version=0.5
@@ -1,49 +0,0 @@
package com.spiteful.forbidden.items.wands;
import java.util.ArrayList;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import thaumcraft.api.aspects.Aspect;
import thaumcraft.api.wands.IWandRodOnUpdate;
import thaumcraft.common.items.wands.ItemWandCasting;
import com.spiteful.forbidden.compat.Compat;
public class TotemWandUpdate implements IWandRodOnUpdate {
Aspect primals[] = Aspect.getPrimalAspects().toArray(new Aspect[0]);
@Override
public void onUpdate(ItemStack itemstack, EntityPlayer player) {
if (Compat.totes && Compat.fennCrystal != null && player.ticksExisted % 30 == 0) {
try {
ArrayList unfilled = new ArrayList();
for (int x = 0; x < primals.length; x++) {
if (((ItemWandCasting) itemstack.getItem()).getVis(itemstack, primals[x]) < ((ItemWandCasting) itemstack.getItem()).getMaxVis(itemstack)) {
unfilled.add(primals[x]);
}
}
if (unfilled.size() > 0 && siphonPlant(player))
((ItemWandCasting) itemstack.getItem()).addVis(itemstack, (Aspect) (unfilled.get(player.worldObj.rand.nextInt(unfilled.size()))), 1, true);
} catch (Exception e) {
return;
}
}
}
public boolean siphonPlant(EntityPlayer player) {
for (int x = 0; x < player.inventory.getSizeInventory(); ++x) {
ItemStack item = player.inventory.getStackInSlot(x);
if (item != null && item.getItem() == Compat.fennCrystal) {
if (item.getItemDamage() <= 995) {
item.setItemDamage(item.getItemDamage() + 5);
return true;
}
}
}
return false;
}
}
@@ -1,4 +1,4 @@
package com.spiteful.forbidden;
package fox.spiteful.forbidden;
public class CommonProxy {
@@ -1,4 +1,4 @@
package com.spiteful.forbidden;
package fox.spiteful.forbidden;
import java.io.File;
import java.util.HashMap;
@@ -1,4 +1,4 @@
package com.spiteful.forbidden;
package fox.spiteful.forbidden;
import java.util.Iterator;
@@ -12,8 +12,8 @@ import thaumcraft.api.ThaumcraftApiHelper;
import thaumcraft.api.aspects.Aspect;
import thaumcraft.api.aspects.AspectList;
import com.spiteful.forbidden.blocks.ForbiddenBlocks;
import com.spiteful.forbidden.items.ForbiddenItems;
import fox.spiteful.forbidden.blocks.ForbiddenBlocks;
import fox.spiteful.forbidden.items.ForbiddenItems;
public class DarkAspects {
public static Aspect NETHER;
@@ -1,4 +1,4 @@
package com.spiteful.forbidden;
package fox.spiteful.forbidden;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
@@ -1,10 +1,12 @@
package com.spiteful.forbidden;
package fox.spiteful.forbidden;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
import java.util.Random;
import fox.spiteful.forbidden.blocks.BlockBlackFlower;
import fox.spiteful.forbidden.items.ItemTaintPickaxe;
import net.minecraft.block.Block;
import net.minecraft.enchantment.Enchantment;
import net.minecraft.enchantment.EnchantmentHelper;
@@ -52,11 +54,9 @@ import thaumcraft.common.items.wands.ItemWandCasting;
import thaumcraft.common.lib.Utils;
import com.google.common.collect.Multimap;
import com.spiteful.forbidden.blocks.BlockBlackFlower;
import com.spiteful.forbidden.blocks.ForbiddenBlocks;
import com.spiteful.forbidden.enchantments.DarkEnchantments;
import com.spiteful.forbidden.items.ForbiddenItems;
import com.spiteful.forbidden.items.ItemTaintPickaxe;
import fox.spiteful.forbidden.blocks.ForbiddenBlocks;
import fox.spiteful.forbidden.enchantments.DarkEnchantments;
import fox.spiteful.forbidden.items.ForbiddenItems;
import cpw.mods.fml.common.eventhandler.Event.Result;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
@@ -1,4 +1,4 @@
package com.spiteful.forbidden;
package fox.spiteful.forbidden;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
@@ -1,13 +1,13 @@
package com.spiteful.forbidden;
package fox.spiteful.forbidden;
import net.minecraft.init.Blocks;
import net.minecraftforge.common.MinecraftForge;
import thaumcraft.api.wands.WandTriggerRegistry;
import com.spiteful.forbidden.blocks.ForbiddenBlocks;
import com.spiteful.forbidden.compat.Compat;
import com.spiteful.forbidden.enchantments.DarkEnchantments;
import com.spiteful.forbidden.items.ForbiddenItems;
import fox.spiteful.forbidden.blocks.ForbiddenBlocks;
import fox.spiteful.forbidden.compat.Compat;
import fox.spiteful.forbidden.enchantments.DarkEnchantments;
import fox.spiteful.forbidden.items.ForbiddenItems;
import cpw.mods.fml.common.Mod;
import cpw.mods.fml.common.Mod.EventHandler;
@@ -23,7 +23,7 @@ public class Forbidden {
public static Forbidden instance;
public static ForbiddenTab tab = new ForbiddenTab("forbidden");
public static ForbiddenTab crysTab;
@SidedProxy(clientSide = "com.spiteful.forbidden.client.ClientProxy", serverSide = "com.spiteful.forbidden.CommonProxy")
@SidedProxy(clientSide = "fox.spiteful.forbidden.client.ClientProxy", serverSide = "fox.spiteful.forbidden.CommonProxy")
public static CommonProxy proxy;
public static WandOverlord wandLord;
@@ -1,4 +1,4 @@
package com.spiteful.forbidden;
package fox.spiteful.forbidden;
import java.util.Iterator;
@@ -12,9 +12,9 @@ import thaumcraft.api.aspects.Aspect;
import thaumcraft.api.aspects.AspectList;
import thaumcraft.api.wands.WandCap;
import com.spiteful.forbidden.blocks.ForbiddenBlocks;
import com.spiteful.forbidden.enchantments.DarkEnchantments;
import com.spiteful.forbidden.items.ForbiddenItems;
import fox.spiteful.forbidden.blocks.ForbiddenBlocks;
import fox.spiteful.forbidden.enchantments.DarkEnchantments;
import fox.spiteful.forbidden.items.ForbiddenItems;
public class ForbiddenRecipes {
public static void addRecipes() {
@@ -1,12 +1,14 @@
package com.spiteful.forbidden;
package fox.spiteful.forbidden;
import java.util.HashMap;
import fox.spiteful.forbidden.blocks.ForbiddenBlocks;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.IRecipe;
import net.minecraft.util.ResourceLocation;
import thaumcraft.api.ItemApi;
import thaumcraft.api.ThaumcraftApi;
import thaumcraft.api.aspects.Aspect;
import thaumcraft.api.aspects.AspectList;
import thaumcraft.api.crafting.CrucibleRecipe;
@@ -16,8 +18,7 @@ import thaumcraft.api.crafting.InfusionRecipe;
import thaumcraft.api.research.ResearchCategories;
import thaumcraft.api.research.ResearchPage;
import com.spiteful.forbidden.blocks.ForbiddenBlocks;
import com.spiteful.forbidden.items.ForbiddenItems;
import fox.spiteful.forbidden.items.ForbiddenItems;
public class ForbiddenResearch {
public static HashMap recipes = new HashMap();
@@ -39,7 +40,7 @@ public class ForbiddenResearch {
(new DarkResearchItem("BLACKFLOWER", "FORBIDDEN", (new AspectList()).add(Aspect.PLANT, 3).add(Aspect.SENSES, 2).add(Aspect.DARKNESS, 4), -7, 4, 1, new ItemStack(ForbiddenBlocks.blackFlower, 1, 0))).setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.BLACKFLOWER.1"), new ResearchPage((CrucibleRecipe) recipes.get("BlackFlower")), new ResearchPage((IRecipe) recipes.get("BlackInk")) }).setAspectTriggers(new Aspect[] { Aspect.SENSES }).registerResearchItem();
(new DarkResearchItem("CRYSTALWELL", "FORBIDDEN", (new AspectList()).add(Aspect.MIND, 3).add(Aspect.CRYSTAL, 2).add(Aspect.MAGIC, 1), -9, 4, 1, new ItemStack(ForbiddenItems.crystalwell, 1, 0))).setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.CRYSTALWELL.1"), new ResearchPage((IArcaneRecipe) recipes.get("Crystalwell")) }).setParents(new String[] { "RESEARCH" }).setAspectTriggers(new Aspect[] { Aspect.MIND }).setConcealed().registerResearchItem();
ThaumcraftApi.addWarpToResearch("CRYSTALWELL", 1);
(new DarkResearchItem("CONSUMING", "FORBIDDEN", (new AspectList()).add(Aspect.VOID, 4).add(Aspect.ENTROPY, 3).add(Aspect.MAGIC, 2), -1, 2, 2, new ResourceLocation("forbidden", "textures/misc/consuming.png"))).setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.CONSUMING.1"), new ResearchPage((InfusionEnchantmentRecipe) recipes.get("Consuming")) }).setParents(new String[] { "INFAUXSIONENCHANTMENT" }).setSecondary().setConcealed().registerResearchItem();
(new DarkResearchItem("PIGBANE", "FORBIDDEN", (new AspectList()).add(Aspect.HUNGER, 3).add(Aspect.WEAPON, 4).add(Aspect.MAGIC, 2), -1, 3, 1, new ResourceLocation("forbidden", "textures/misc/pigbane.png"))).setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.PIGBANE.1"), new ResearchPage((InfusionEnchantmentRecipe) recipes.get("Pigbane")) }).setParents(new String[] { "INFAUXSIONENCHANTMENT" }).setSecondary().setConcealed().registerResearchItem();
(new DarkResearchItem("EDUCATIONAL", "FORBIDDEN", (new AspectList()).add(Aspect.MIND, 5).add(Aspect.WEAPON, 1).add(Aspect.MAGIC, 3), -1, 4, 2, new ResourceLocation("forbidden", "textures/misc/educational.png"))).setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.EDUCATIONAL.1"), new ResearchPage((InfusionEnchantmentRecipe) recipes.get("Educational")) }).setParents(new String[] { "INFAUXSIONENCHANTMENT" }).setSecondary().setConcealed().registerResearchItem();
@@ -56,9 +57,12 @@ public class ForbiddenResearch {
(new DarkResearchItem("HELLFIRE", "FORBIDDEN", (new AspectList()).add(Aspect.FIRE, 3).add(DarkAspects.NETHER, 4).add(Aspect.TRAVEL, 2), -5, 2, 1, new ItemStack(Blocks.fire))).setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.HELLFIRE.1") }).setRound().registerResearchItem();
(new DarkResearchItem("SKULLAXE", "FORBIDDEN", (new AspectList()).add(Aspect.WEAPON, 3).add(DarkAspects.WRATH, 4).add(DarkAspects.NETHER, 1), -8, 1, 2, new ItemStack(ForbiddenItems.skullAxe))).setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.SKULLAXE.1"), new ResearchPage((InfusionRecipe) recipes.get("SkullAxe")) }).setParents(new String[] { "THAUMIUM", "INFAUXSION" }).setConcealed().registerResearchItem();
ThaumcraftApi.addWarpToResearch("SKULLAXE", 1);
(new DarkResearchItem("ARCANECAKE", "FORBIDDEN", (new AspectList()).add(DarkAspects.GLUTTONY, 4).add(Aspect.HUNGER, 3).add(Aspect.CRAFT, 2), -8, 2, 3, new ItemStack(ForbiddenItems.arcaneCakeItem))).setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.ARCANECAKE.1"), new ResearchPage((InfusionRecipe) recipes.get("ArcaneCake")) }).setParents(new String[] { "INFAUXSION" }).setAspectTriggers(new Aspect[] { DarkAspects.GLUTTONY }).registerResearchItem();
(new DarkResearchItem("MORPHTOOLS", "FORBIDDEN", (new AspectList()).add(Aspect.TOOL, 2).add(DarkAspects.ENVY, 3).add(Aspect.EXCHANGE, 2), -5, 5, 4, new ItemStack(ForbiddenItems.morphPickaxe))).setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.MORPHTOOLS.1"), new ResearchPage((InfusionRecipe) recipes.get("MorphPick")), new ResearchPage((InfusionRecipe) recipes.get("MorphSword")), new ResearchPage((InfusionRecipe) recipes.get("MorphShovel")), new ResearchPage((InfusionRecipe) recipes.get("MorphAxe")) }).setParentsHidden(new String[] { "THAUMIUM", "INFUSIONENCHANTMENT" }).setParents(new String[] { "INFAUXSIONENCHANTMENT" }).setConcealed().registerResearchItem();
ThaumcraftApi.addWarpToResearch("MORPHTOOLS", 4);
(new DarkResearchItem("ROD_infernal", "FORBIDDEN", (new AspectList()).add(DarkAspects.NETHER, 4).add(Aspect.FIRE, 3).add(Aspect.TOOL, 1), -6, -3, 4, new ItemStack(ForbiddenItems.wandCore, 1, 1))).setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.ROD_infernal.1"), new ResearchPage((InfusionRecipe) recipes.get("WandRodInfernal")), new ResearchPage("forbidden.research_page.ROD_infernal.2") }).setParents(new String[] { "ROD_silverwood", "INFAUXSION" }).setConcealed().registerResearchItem();
ThaumcraftApi.addWarpToResearch("ROD_infernal", 2);
(new DarkResearchItem("CLUSTER", "FORBIDDEN", (new AspectList()).add(Aspect.METAL, 1).add(Aspect.FIRE, 4).add(DarkAspects.ENVY, 3), -7, 7, 3, new ResourceLocation("forbidden", "textures/misc/lucrative.png"))).setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.CLUSTER.1"), new ResearchPage((InfusionEnchantmentRecipe) recipes.get("Cluster")) }).setParents(new String[] { "MORPHTOOLS", "ELEMENTALPICK" }).setSecondary().setConcealed().registerResearchItem();
if (Config.greedyEnch)
(new DarkResearchItem("GREEDY", "FORBIDDEN", (new AspectList()).add(Aspect.MAGIC, 2).add(Aspect.WEAPON, 1).add(Aspect.GREED, 3), -1, 5, 4, new ResourceLocation("forbidden", "textures/misc/greedy.png"))).setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.GREEDY.1"), new ResearchPage((InfusionEnchantmentRecipe) recipes.get("Greedy")) }).setParents(new String[] { "INFAUXSIONENCHANTMENT" }).setConcealed().registerResearchItem();
@@ -69,7 +73,7 @@ public class ForbiddenResearch {
(new DarkResearchItem("WRATHCAGE", "FORBIDDEN", (new AspectList()).add(DarkAspects.WRATH, 5).add(Aspect.MECHANISM, 3).add(Aspect.BEAST, 2), -2, 0, 6, new ItemStack(ForbiddenBlocks.wrathCage))).setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.WRATHCAGE.1"), new ResearchPage((InfusionRecipe) recipes.get("WrathCage")), new ResearchPage("forbidden.research_page.WRATHCAGE.2"), new ResearchPage("forbidden.research_page.WRATHCAGE.3"), new ResearchPage((CrucibleRecipe) recipes.get("MobCrystal")) }).setParents(new String[] { "INFAUXSION" }).setParentsHidden(new String[] { "THAUMIUM", "DISTILESSENTIA" }).setConcealed().setSiblings(new String[] { "FORK" }).registerResearchItem();
else
(new DarkResearchItem("WRATHCAGE", "FORBIDDEN", (new AspectList()).add(DarkAspects.WRATH, 5).add(Aspect.MECHANISM, 3).add(Aspect.BEAST, 2), -2, 0, 6, new ItemStack(ForbiddenBlocks.wrathCage))).setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.WRATHCAGE.1"), new ResearchPage((InfusionRecipe) recipes.get("WrathCage")), new ResearchPage("forbidden.research_page.WRATHCAGE.3"), new ResearchPage((CrucibleRecipe) recipes.get("MobCrystal")) }).setParents(new String[] { "INFAUXSION" }).setParentsHidden(new String[] { "THAUMIUM", "DISTILESSENTIA" }).setConcealed().setSiblings(new String[] { "FORK" }).registerResearchItem();
ThaumcraftApi.addWarpToResearch("WRATHCAGE", 5);
}
(new DarkResearchItem("FORK", "FORBIDDEN", (new AspectList()), 0, 0, 0, new ItemStack(ForbiddenItems.fork))).setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.FORK.1"), new ResearchPage((InfusionRecipe) recipes.get("Fork")), new ResearchPage("WRATHCAGE", "forbidden.research_page.FORK.wc") }).setStub().setHidden().registerResearchItem();
@@ -80,5 +84,6 @@ public class ForbiddenResearch {
(new DarkResearchItem("TAINTSHOVEL", "FORBIDDEN", (new AspectList()).add(Aspect.CRYSTAL, 3).add(Aspect.TAINT, 2).add(Aspect.TOOL, 1), -7, 0, 3, new ItemStack(ForbiddenItems.taintShovel))).setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.TAINTSHOVEL.1"), new ResearchPage((InfusionRecipe) recipes.get("TaintShovel")), new ResearchPage("forbidden.research_page.TAINTSHOVEL.2") }).setParents(new String[] { "THAUMIUM", "INFAUXSION", "ETHEREALBLOOM" }).setConcealed().registerResearchItem();
(new DarkResearchItem("TAINTPICK", "FORBIDDEN", (new AspectList()).add(Aspect.TOOL, 2).add(Aspect.TAINT, 4).add(Aspect.ENTROPY, 3), -8, 0, 2, new ItemStack(ForbiddenItems.taintPickaxe))).setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.TAINTPICK.1"), new ResearchPage((InfusionRecipe) recipes.get("TaintPick")) }).setParents(new String[] { "THAUMIUM", "INFAUXSION" }).setConcealed().registerResearchItem();
(new DarkResearchItem("ROD_tainted", "FORBIDDEN", (new AspectList()).add(Aspect.MAGIC, 4).add(Aspect.TAINT, 5).add(Aspect.TOOL, 2), -7, -3, 4, new ItemStack(ForbiddenItems.wandCore, 1, 0))).setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.ROD_tainted.1"), new ResearchPage((InfusionRecipe) recipes.get("WandRodTainted")) }).setParents(new String[] { "ROD_silverwood", "TAINTSHOVEL", "INFAUXSION" }).setConcealed().registerResearchItem();
ThaumcraftApi.addWarpToResearch("ROD_tainted", 2);
}
}
@@ -1,9 +1,9 @@
package com.spiteful.forbidden;
package fox.spiteful.forbidden;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import com.spiteful.forbidden.items.ForbiddenItems;
import fox.spiteful.forbidden.items.ForbiddenItems;
public final class ForbiddenTab extends CreativeTabs {
private boolean crystal = false;
@@ -1,4 +1,4 @@
package com.spiteful.forbidden;
package fox.spiteful.forbidden;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.LogManager;
@@ -1,4 +1,4 @@
package com.spiteful.forbidden;
package fox.spiteful.forbidden;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
@@ -1,4 +1,4 @@
package com.spiteful.forbidden;
package fox.spiteful.forbidden;
import java.lang.reflect.Field;
@@ -1,4 +1,4 @@
package com.spiteful.forbidden.blocks;
package fox.spiteful.forbidden.blocks;
import java.util.Random;
@@ -50,7 +50,8 @@ public class BlockArcaneCake extends Block {
float f = 0.0625F;
float f1 = (float) (1 + l) / 12.0F;
float f2 = 0.5F;
return AxisAlignedBB.getAABBPool().getAABB((double) ((float) x + f1), (double) y, (double) ((float) z + f), (double) ((float) (x + 1) - f), (double) ((float) y + f2 - f), (double) ((float) (z + 1) - f));
//return AxisAlignedBB.getAABBPool().getAABB((double) ((float) x + f1), (double) y, (double) ((float) z + f), (double) ((float) (x + 1) - f), (double) ((float) y + f2 - f), (double) ((float) (z + 1) - f));
return AxisAlignedBB.getBoundingBox((double)((float)x + f1), (double)y, (double)((float)z + f), (double)((float)(x + 1) - f), (double)((float)y + f2 - f), (double)((float)(z + 1) - f));
}
@Override
@@ -65,7 +66,8 @@ public class BlockArcaneCake extends Block {
float f = 0.0625F;
float f1 = (float) (1 + l) / 12.0F;
float f2 = 0.5F;
return AxisAlignedBB.getAABBPool().getAABB((double) ((float) x + f1), (double) y, (double) ((float) z + f), (double) ((float) (x + 1) - f), (double) ((float) y + f2), (double) ((float) (z + 1) - f));
//return AxisAlignedBB.getAABBPool().getAABB((double) ((float) x + f1), (double) y, (double) ((float) z + f), (double) ((float) (x + 1) - f), (double) ((float) y + f2), (double) ((float) (z + 1) - f));
return AxisAlignedBB.getBoundingBox((double)((float)x + f1), (double)y, (double)((float)z + f), (double)((float)(x + 1) - f), (double)((float)y + f2), (double)((float)(z + 1) - f));
}
@SideOnly(Side.CLIENT)
@@ -1,8 +1,9 @@
package com.spiteful.forbidden.blocks;
package fox.spiteful.forbidden.blocks;
import java.util.List;
import java.util.Random;
import fox.spiteful.forbidden.Forbidden;
import net.minecraft.block.Block;
import net.minecraft.block.BlockFlower;
import net.minecraft.client.renderer.texture.IIconRegister;
@@ -13,8 +14,6 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
import com.spiteful.forbidden.Forbidden;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -1,11 +1,10 @@
package com.spiteful.forbidden.blocks;
package fox.spiteful.forbidden.blocks;
import fox.spiteful.forbidden.Forbidden;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.world.IBlockAccess;
import com.spiteful.forbidden.Forbidden;
public class BlockResource extends Block {
public BlockResource() {
super(Material.iron);
@@ -1,7 +1,9 @@
package com.spiteful.forbidden.blocks;
package fox.spiteful.forbidden.blocks;
import java.util.Random;
import fox.spiteful.forbidden.Forbidden;
import fox.spiteful.forbidden.tiles.TileEntityWrathCage;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
import net.minecraft.entity.item.EntityItem;
@@ -14,10 +16,8 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
import com.spiteful.forbidden.Config;
import com.spiteful.forbidden.Forbidden;
import com.spiteful.forbidden.items.ForbiddenItems;
import com.spiteful.forbidden.tiles.TileEntityWrathCage;
import fox.spiteful.forbidden.Config;
import fox.spiteful.forbidden.items.ForbiddenItems;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -1,11 +1,10 @@
package com.spiteful.forbidden.blocks;
package fox.spiteful.forbidden.blocks;
import fox.spiteful.forbidden.tiles.TileEntityWrathCage;
import net.minecraft.block.Block;
import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.OreDictionary;
import com.spiteful.forbidden.tiles.TileEntityWrathCage;
import cpw.mods.fml.common.registry.GameRegistry;
public class ForbiddenBlocks {
@@ -1,7 +1,7 @@
package com.spiteful.forbidden.client;
package fox.spiteful.forbidden.client;
import com.spiteful.forbidden.CommonProxy;
import com.spiteful.forbidden.tiles.TileEntityWrathCage;
import fox.spiteful.forbidden.CommonProxy;
import fox.spiteful.forbidden.tiles.TileEntityWrathCage;
import cpw.mods.fml.client.registry.ClientRegistry;
@@ -1,5 +1,7 @@
package com.spiteful.forbidden.client;
package fox.spiteful.forbidden.client;
import fox.spiteful.forbidden.tiles.TileEntityWrathCage;
import fox.spiteful.forbidden.tiles.WrathSpawnerLogic;
import net.minecraft.client.renderer.entity.RenderManager;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.entity.Entity;
@@ -7,9 +9,6 @@ import net.minecraft.tileentity.TileEntity;
import org.lwjgl.opengl.GL11;
import com.spiteful.forbidden.tiles.TileEntityWrathCage;
import com.spiteful.forbidden.tiles.WrathSpawnerLogic;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -1,7 +1,7 @@
package com.spiteful.forbidden.compat;
package fox.spiteful.forbidden.compat;
import static com.spiteful.forbidden.compat.Compat.bm;
import static com.spiteful.forbidden.compat.Compat.kami;
import fox.spiteful.forbidden.DarkAspects;
import fox.spiteful.forbidden.LogHandler;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
@@ -18,10 +18,8 @@ import thaumcraft.api.crafting.InfusionRecipe;
import thaumcraft.api.research.ResearchPage;
import WayofTime.alchemicalWizardry.api.altarRecipeRegistry.AltarRecipeRegistry;
import com.spiteful.forbidden.DarkAspects;
import com.spiteful.forbidden.DarkResearchItem;
import com.spiteful.forbidden.LogHandler;
import com.spiteful.forbidden.items.ForbiddenItems;
import fox.spiteful.forbidden.DarkResearchItem;
import fox.spiteful.forbidden.items.ForbiddenItems;
import cpw.mods.fml.common.FMLLog;
import cpw.mods.fml.common.registry.GameRegistry;
@@ -29,7 +27,6 @@ import cpw.mods.fml.common.registry.GameRegistry;
public class BloodMagic {
public static void stab() {
try {
ItemStack i;
AspectList list;
Item masterOrb = GameRegistry.findItem("AWWayofTime", "masterBloodOrb");
Item archmasterOrb = GameRegistry.findItem("AWWayofTime", "archmageBloodOrb");
@@ -49,20 +46,23 @@ public class BloodMagic {
InfusionRecipe blood_recipe = ThaumcraftApi.addInfusionCraftingRecipe("ROD_blood", new ItemStack(ForbiddenItems.wandCore, 1, 6), 2, (new AspectList()).add(Aspect.LIFE, 32).add(Aspect.MAGIC, 12).add(Aspect.WATER, 16), new ItemStack(masterOrb), new ItemStack[] { new ItemStack(magicales), new ItemStack(imbuedSlate), new ItemStack(imbuedSlate), new ItemStack(tennebrae), new ItemStack(sanctus), new ItemStack(aquasalus), new ItemStack(incendium), new ItemStack(terrae), new ItemStack(aether) });
(new DarkResearchItem("ROD_blood", "FORBIDDEN", "[BM]", (new AspectList()).add(Aspect.LIFE, 5).add(Aspect.WATER, 4).add(Aspect.WEAPON, 3), -5, -3, 3, new ItemStack(ForbiddenItems.wandCore, 1, 3))).setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.ROD_blood.1"), new ResearchPage(blood_recipe), new ResearchPage("forbidden.research_page.ROD_blood.2") }).setParents(new String[] { "ROD_silverwood", "INFAUXSION" }).setAspectTriggers(new Aspect[] { Aspect.LIFE }).setConcealed().registerResearchItem();
ThaumcraftApi.addWarpToResearch("ROD_blood", 3);
InfusionRecipe alchemical_recipe = ThaumcraftApi.addInfusionCraftingRecipe("CAP_alchemical", new ItemStack(ForbiddenItems.wandCap, 1, 0), 3, (new AspectList()).add(Aspect.LIFE, 12).add(Aspect.WATER, 6), ItemApi.getItem("itemWandCap", 1), new ItemStack[] { new ItemStack(magicales), new ItemStack(magicales), new ItemStack(magicales) });
(new DarkResearchItem("CAP_alchemical", "FORBIDDEN", "[BM]", (new AspectList()).add(Aspect.LIFE, 4).add(Aspect.TOOL, 1).add(Aspect.WATER, 3), -5, -5, 2, new ItemStack(ForbiddenItems.wandCap, 1, 0))).setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.CAP_alchemical.1"), new ResearchPage(alchemical_recipe) }).setParents(new String[] { "ROD_blood", "CAP_gold" }).setSecondary().setConcealed().registerResearchItem();
IArcaneRecipe bloodwell_recipe = ThaumcraftApi.addShapelessArcaneCraftingRecipe("BLOODWELL", new ItemStack(ForbiddenItems.bloodwell, 1, 0), (new AspectList()).add(Aspect.WATER, 10).add(Aspect.EARTH, 10), new Object[] { new ItemStack(Items.feather, 1, 0), new ItemStack(bloodBucket, 1, 0), new ItemStack(Items.glass_bottle, 1, 0), new ItemStack(crapOrb, 1, 0) });
(new DarkResearchItem("BLOODWELL", "FORBIDDEN", "[BM]", (new AspectList()).add(Aspect.LIFE, 5).add(Aspect.MIND, 4).add(Aspect.SENSES, 3), -10, 4, 1, new ItemStack(ForbiddenItems.bloodwell, 1, 0))).setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.BLOODWELL.1"), new ResearchPage(bloodwell_recipe) }).setParents(new String[] { "RESEARCH" }).setAspectTriggers(new Aspect[] { Aspect.LIFE }).setConcealed().registerResearchItem();
ThaumcraftApi.addWarpToResearch("BLOODWELL", 1);
IArcaneRecipe blood_staff = ThaumcraftApi.addArcaneCraftingRecipe("ROD_blood_staff", new ItemStack(ForbiddenItems.wandCore, 1, 9), (new AspectList()).add(Aspect.ENTROPY, 26).add(Aspect.FIRE, 26).add(Aspect.WATER, 26).add(Aspect.AIR, 26).add(Aspect.EARTH, 26).add(Aspect.ORDER, 26), new Object[] { "__D", "_B_", "B__", Character.valueOf('B'), new ItemStack(ForbiddenItems.wandCore, 1, 3), Character.valueOf('D'), new ItemStack(demonShard) });
(new DarkResearchItem("ROD_blood_staff", "FORBIDDEN", "[BM]", (new AspectList()).add(Aspect.LIFE, 8).add(Aspect.WATER, 7).add(Aspect.WEAPON, 6), -5, -7, 5, new ItemStack(ForbiddenItems.wandCore, 1, 9))).setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.ROD_blood_staff.1"), new ResearchPage(blood_staff) }).setParents(new String[] { "ROD_silverwood_staff", "ROD_blood" }).setSpecial().setConcealed().registerResearchItem();
if (kami) {
if (Compat.kami) {
try {
Item kamiResource = (Item) (Class.forName("vazkii.tinkerer.common.item.ModItems").getField("kamiResource").get(null));
//Item kamiResource = (Item) (Class.forName("thaumic.tinkerer.common.item.ModItems").getField("kamiResource").get(null));
Item kamiResource = GameRegistry.findItem("ThaumicTinkerer", "kamiResource");
InfusionRecipe divine_orb = ThaumcraftApi.addInfusionCraftingRecipe("DIVINEORB", new ItemStack(ForbiddenItems.bloodOrb, 1, 0), 12, (new AspectList()).add(Aspect.LIFE, 64).add(Aspect.MAGIC, 48).add(Aspect.WATER, 32).add(Aspect.VOID, 64), new ItemStack(archmasterOrb), new ItemStack[] { new ItemStack(kamiResource, 1, 0), new ItemStack(kamiResource, 1, 0), new ItemStack(kamiResource, 1, 0), new ItemStack(kamiResource, 1, 2), new ItemStack(kamiResource, 1, 2), new ItemStack(kamiResource, 1, 1), new ItemStack(kamiResource, 1, 6), new ItemStack(kamiResource, 1, 7), new ItemStack(ForbiddenItems.gluttonyShard) });
(new DarkResearchItem("DIVINEORB", "FORBIDDEN", "[BM] [TTKami]", (new AspectList()).add(Aspect.LIFE, 32).add(Aspect.VOID, 24).add(Aspect.CRYSTAL, 24).add(Aspect.MAGIC, 12), -9, 6, 6, new ItemStack(ForbiddenItems.bloodOrb, 1, 0))).setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.DIVINEORB.1"), new ResearchPage(divine_orb) }).setParents(new String[] { "ICHOR", "INFAUXSION", "ICHOR_CLOTH", "ICHORIUM" }).setAspectTriggers(new Aspect[] { Aspect.LIFE }).setConcealed().setSpecial().registerResearchItem();
@@ -137,7 +137,7 @@ public class BloodMagic {
aspectBloodItem("crepitous", -1, list);
} catch (Throwable e) {
LogHandler.log(Level.INFO, e, "Forbidden Magic tried to do some Blood Magic, but bled out.");
bm = false;
Compat.bm = false;
}
}
@@ -1,5 +1,7 @@
package com.spiteful.forbidden.compat;
package fox.spiteful.forbidden.compat;
import fox.spiteful.forbidden.DarkAspects;
import fox.spiteful.forbidden.LogHandler;
import net.minecraft.init.Blocks;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
@@ -20,11 +22,9 @@ import thaumcraft.api.crafting.InfusionRecipe;
import thaumcraft.api.research.ResearchPage;
import vazkii.botania.api.BotaniaAPI;
import com.spiteful.forbidden.DarkAspects;
import com.spiteful.forbidden.DarkResearchItem;
import com.spiteful.forbidden.LogHandler;
import com.spiteful.forbidden.enchantments.DarkEnchantments;
import com.spiteful.forbidden.items.ForbiddenItems;
import fox.spiteful.forbidden.DarkResearchItem;
import fox.spiteful.forbidden.enchantments.DarkEnchantments;
import fox.spiteful.forbidden.items.ForbiddenItems;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.registry.GameRegistry;
@@ -37,12 +37,10 @@ public class Compat {
public static boolean pb = false;
public static boolean bm = false;
public static boolean am2 = false;
public static boolean totes = false;
public static boolean botan = false;
public static boolean totes = false;
public static Item fennCrystal;
public static void initiate() {
public static void initiate() {
if (Loader.isModLoaded("ThaumicTinkerer"))
tt = true;
if (tt && Loader.isModLoaded("ThaumicTinkererKami"))
@@ -57,8 +55,6 @@ public class Compat {
bm = true;
if (Loader.isModLoaded("arsmagica2"))
am2 = true;
if (Loader.isModLoaded("totemic"))
totes = true;
if (Loader.isModLoaded("Botania"))
botan = true;
}
@@ -70,7 +66,7 @@ public class Compat {
if (tt) {
if (!kami) {
try {
kami = Class.forName("vazkii.tinkerer.common.core.handler.ConfigHandler").getField("enableKami").getBoolean(null);
kami = Class.forName("thaumic.tinkerer.common.core.handler.ConfigHandler").getField("enableKami").getBoolean(null);
} catch (Exception e) {
}
}
@@ -85,6 +81,7 @@ public class Compat {
InfusionEnchantmentRecipe eternal = ThaumcraftApi.addInfusionEnchantmentRecipe("ETERNAL", DarkEnchantments.eternal, 12, (new AspectList()).add(Aspect.CRAFT, 32).add(Aspect.TOOL, 64).add(DarkAspects.ENVY, 76).add(Aspect.MAGIC, 64), new ItemStack[] { new ItemStack(kamiResource, 1, 0), new ItemStack(kamiResource, 1, 2), new ItemStack(kamiResource, 1, 2), new ItemStack(kamiResource, 1, 2), new ItemStack(kamiResource, 1, 6), new ItemStack(ForbiddenItems.deadlyShards, 1, 1), new ItemStack(ForbiddenItems.deadlyShards, 1, 1), new ItemStack(ForbiddenItems.deadlyShards, 1, 1) });
(new DarkResearchItem("ETERNAL", "FORBIDDEN", "[TTKami]", (new AspectList()).add(Aspect.MAGIC, 16).add(Aspect.TOOL, 10).add(Aspect.CRAFT, 8).add(DarkAspects.ENVY, 32), -5, 7, 6, new ResourceLocation("forbidden", "textures/misc/eternal.png"))).setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.ETERNAL.1"), new ResearchPage(eternal) }).setParents(new String[] { "MORPHTOOLS", "ICHOR_TOOLS" }).setConcealed().registerResearchItem();
ThaumcraftApi.addWarpToResearch("ETERNAL", 5);
InfusionRecipe thoth = ThaumcraftApi.addInfusionCraftingRecipe("DIVINEWELL", new ItemStack(ForbiddenItems.divinewell, 1, 0), 5, (new AspectList()).add(Aspect.MIND, 32).add(Aspect.BEAST, 12).add(Aspect.EARTH, 16), ItemApi.getItem("itemInkwell", 0), new ItemStack[] { new ItemStack(kamiResource, 1, 2), new ItemStack(kamiResource, 1, 0), new ItemStack(kamiResource, 1, 0), new ItemStack(Blocks.bookshelf), new ItemStack(Blocks.bookshelf), new ItemStack(Blocks.bookshelf), ItemApi.getItem("itemResource", 5), ItemApi.getItem("itemResource", 5), ItemApi.getItem("itemResource", 5) });
(new DarkResearchItem("DIVINEWELL", "FORBIDDEN", "[TTKami]", (new AspectList()).add(Aspect.MIND, 6).add(Aspect.EARTH, 3).add(Aspect.MAGIC, 5), -11, 4, 3, new ItemStack(ForbiddenItems.divinewell, 1, 0))).setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.DIVINEWELL.1"), new ResearchPage(thoth) }).setParents(new String[] { "ICHORIUM" }).setConcealed().registerResearchItem();
@@ -254,31 +251,6 @@ public class Compat {
* }).setSpecial().setConcealed().registerResearchItem(); } catch
* (Exception e) { LogHandler.log(Level.INFO, e,
* "Forbidden Magic was slain by a Hecate."); am2 = false; } }
*
* if (totes) { try { Class totems =
* Class.forName("totemic_commons.pokefenn.ModItems"); fennCrystal =
* (Item) (totems.getField("chlorophyllCrystal").get(null)); Item
* subItems = (Item) (totems.getField("subItems").get(null));
*
* IArcaneRecipe totem_rod =
* ThaumcraftApi.addArcaneCraftingRecipe("ROD_totem", new
* ItemStack(ForbiddenItems.wandCore, 1, 5), (new
* AspectList()).add(Aspect.ENTROPY, 12).add(Aspect.FIRE,
* 12).add(Aspect.WATER, 12).add(Aspect.AIR, 12).add(Aspect.EARTH,
* 12).add(Aspect.ORDER, 12), new Object[] { "PF", "FP",
* Character.valueOf('F'), new ItemStack(subItems, 1, 2) }); (new
* DarkResearchItem("ROD_totem", "FORBIDDEN", "[T]", (new
* AspectList()).add(Aspect.TREE, 8).add(Aspect.MAGIC,
* 3).add(Aspect.PLANT, 6), -2, -3, 1, new
* ItemStack(ForbiddenItems.wandCore, 1, 5))).setPages(new
* ResearchPage[] { new
* ResearchPage("forbidden.research_page.ROD_totem.1"), new
* ResearchPage(totem_rod) }).setParents(new String[] { "ROD_greatwood"
* }).setConcealed().registerResearchItem();
*
* } catch (Exception e) { LogHandler.log(Level.INFO, e,
* "Forbidden Magic tried to catch Totemic with a pokeball, but didn't weaken it enough."
* ); totes = false; } }
*/
if (botan) {
@@ -292,6 +264,7 @@ public class Compat {
InfusionRecipe livingwood_rod = ThaumcraftApi.addInfusionCraftingRecipe("ROD_livingwood", new ItemStack(ForbiddenItems.wandCore, 1, 8), 3, (new AspectList()).add(Aspect.MAGIC, 16).add(Aspect.TREE, 32).add(Aspect.LIFE, 16).add(Aspect.SENSES, 8).add(Aspect.PLANT, 8), new ItemStack(livingLog), new ItemStack[] { new ItemStack(resource, 1, 2), new ItemStack(rune, 1, 8), new ItemStack(rune, 1, 0), new ItemStack(rune, 1, 1), new ItemStack(rune, 1, 2), new ItemStack(rune, 1, 3), new ItemStack(rune, 1, 4), new ItemStack(rune, 1, 5), new ItemStack(rune, 1, 6), new ItemStack(rune, 1, 7) });
(new DarkResearchItem("ROD_livingwood", "FORBIDDEN", "[B]", (new AspectList()).add(Aspect.TREE, 8).add(Aspect.MAGIC, 4).add(Aspect.PLANT, 6), -1, -3, 3, new ItemStack(ForbiddenItems.wandCore, 1, 7))).setPages(new ResearchPage[] { new ResearchPage("forbidden.research_page.ROD_livingwood.1"), new ResearchPage(livingwood_rod) }).setParents(new String[] { "ROD_silverwood", "INFAUXSION" }).setConcealed().registerResearchItem();
ThaumcraftApi.addWarpToResearch("ROD_livingwood", 3);
BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ForbiddenItems.wandCore, 1, 7), new ItemStack(ForbiddenItems.wandCore, 1, 8), 10000);
IArcaneRecipe manasteel_cap = ThaumcraftApi.addArcaneCraftingRecipe("CAP_manasteel", new ItemStack(ForbiddenItems.wandCap, 1, 4), (new AspectList()).add(Aspect.ENTROPY, 6).add(Aspect.FIRE, 6).add(Aspect.WATER, 6).add(Aspect.AIR, 6).add(Aspect.EARTH, 6).add(Aspect.ORDER, 6), new Object[] { "NNN", "N N", Character.valueOf('N'), new ItemStack(ForbiddenItems.resource, 1, 2) });
@@ -1,12 +1,12 @@
package com.spiteful.forbidden.enchantments;
package fox.spiteful.forbidden.enchantments;
import fox.spiteful.forbidden.compat.Compat;
import net.minecraft.enchantment.Enchantment;
import thaumcraft.api.aspects.Aspect;
import thaumcraft.api.aspects.AspectList;
import vazkii.tinkerer.common.enchantment.core.EnchantmentManager;
import thaumic.tinkerer.common.enchantment.core.EnchantmentManager;
import com.spiteful.forbidden.Config;
import com.spiteful.forbidden.compat.Compat;
import fox.spiteful.forbidden.Config;
public class DarkEnchantments {
public static Enchantment cluster;
@@ -1,11 +1,10 @@
package com.spiteful.forbidden.enchantments;
package fox.spiteful.forbidden.enchantments;
import fox.spiteful.forbidden.items.ItemMorphPickaxe;
import net.minecraft.enchantment.Enchantment;
import net.minecraft.enchantment.EnumEnchantmentType;
import net.minecraft.item.ItemStack;
import com.spiteful.forbidden.items.ItemMorphPickaxe;
public class EnchantmentCluster extends Enchantment {
public EnchantmentCluster(int id) {
super(id, 0, EnumEnchantmentType.digger);
@@ -1,4 +1,4 @@
package com.spiteful.forbidden.enchantments;
package fox.spiteful.forbidden.enchantments;
import net.minecraft.enchantment.Enchantment;
import net.minecraft.enchantment.EnumEnchantmentType;
@@ -1,4 +1,4 @@
package com.spiteful.forbidden.enchantments;
package fox.spiteful.forbidden.enchantments;
import net.minecraft.enchantment.Enchantment;
import net.minecraft.enchantment.EnumEnchantmentType;
@@ -1,4 +1,4 @@
package com.spiteful.forbidden.enchantments;
package fox.spiteful.forbidden.enchantments;
import net.minecraft.enchantment.Enchantment;
import net.minecraft.enchantment.EnumEnchantmentType;
@@ -1,13 +1,13 @@
package com.spiteful.forbidden.enchantments;
package fox.spiteful.forbidden.enchantments;
import fox.spiteful.forbidden.items.ItemMorphAxe;
import fox.spiteful.forbidden.items.ItemMorphPickaxe;
import fox.spiteful.forbidden.items.ItemMorphSword;
import net.minecraft.enchantment.Enchantment;
import net.minecraft.enchantment.EnumEnchantmentType;
import net.minecraft.item.ItemStack;
import com.spiteful.forbidden.items.ItemMorphAxe;
import com.spiteful.forbidden.items.ItemMorphPickaxe;
import com.spiteful.forbidden.items.ItemMorphShovel;
import com.spiteful.forbidden.items.ItemMorphSword;
import fox.spiteful.forbidden.items.ItemMorphShovel;
public class EnchantmentEternal extends Enchantment {
public EnchantmentEternal(int id) {
@@ -1,4 +1,4 @@
package com.spiteful.forbidden.enchantments;
package fox.spiteful.forbidden.enchantments;
import net.minecraft.enchantment.Enchantment;
import net.minecraft.enchantment.EnumEnchantmentType;
@@ -1,4 +1,4 @@
package com.spiteful.forbidden.enchantments;
package fox.spiteful.forbidden.enchantments;
import net.minecraft.enchantment.Enchantment;
import net.minecraft.enchantment.EnumEnchantmentType;
@@ -1,7 +1,8 @@
package com.spiteful.forbidden.items;
package fox.spiteful.forbidden.items;
import java.util.Arrays;
import fox.spiteful.forbidden.compat.Compat;
import net.minecraft.init.Blocks;
import net.minecraft.item.Item;
import net.minecraft.item.Item.ToolMaterial;
@@ -14,21 +15,19 @@ import thaumcraft.api.wands.StaffRod;
import thaumcraft.api.wands.WandCap;
import thaumcraft.api.wands.WandRod;
import com.spiteful.forbidden.Config;
import com.spiteful.forbidden.compat.Compat;
import com.spiteful.forbidden.items.wands.BloodStaffUpdate;
import com.spiteful.forbidden.items.wands.BloodWandUpdate;
import com.spiteful.forbidden.items.wands.CreativeWandUpdate;
import com.spiteful.forbidden.items.wands.DarkWandCap;
import com.spiteful.forbidden.items.wands.InfernalWandUpdate;
import com.spiteful.forbidden.items.wands.ItemWandCaps;
import com.spiteful.forbidden.items.wands.ItemWandCores;
import com.spiteful.forbidden.items.wands.ManaStaffUpdate;
import com.spiteful.forbidden.items.wands.ManaWandUpdate;
import com.spiteful.forbidden.items.wands.SoulWandUpdate;
import com.spiteful.forbidden.items.wands.TaintedWandUpdate;
import com.spiteful.forbidden.items.wands.TotemWandUpdate;
import com.spiteful.forbidden.items.wands.YandereWandUpdate;
import fox.spiteful.forbidden.Config;
import fox.spiteful.forbidden.items.wands.BloodStaffUpdate;
import fox.spiteful.forbidden.items.wands.BloodWandUpdate;
import fox.spiteful.forbidden.items.wands.CreativeWandUpdate;
import fox.spiteful.forbidden.items.wands.DarkWandCap;
import fox.spiteful.forbidden.items.wands.InfernalWandUpdate;
import fox.spiteful.forbidden.items.wands.ItemWandCaps;
import fox.spiteful.forbidden.items.wands.ItemWandCores;
import fox.spiteful.forbidden.items.wands.ManaStaffUpdate;
import fox.spiteful.forbidden.items.wands.ManaWandUpdate;
import fox.spiteful.forbidden.items.wands.SoulWandUpdate;
import fox.spiteful.forbidden.items.wands.TaintedWandUpdate;
import fox.spiteful.forbidden.items.wands.YandereWandUpdate;
import cpw.mods.fml.common.registry.GameRegistry;
@@ -134,7 +133,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_ROD_WITCHWOOD = new WandRod("witchwood", 100, new ItemStack(wandCore, 1, 4), 12, new ManaWandUpdate(), new ResourceLocation("forbidden", "textures/models/wand_rod_witchwood.png"));
WAND_ROD_TOTEM = new WandRod("totem", 50, new ItemStack(wandCore, 1, 5), 4, new TotemWandUpdate(), new ResourceLocation("forbidden", "textures/models/wand_rod_totem.png"));
WAND_ROD_TOTEM = new WandRod("totem", 50, new ItemStack(wandCore, 1, 5), 4, new ResourceLocation("forbidden", "textures/models/wand_rod_totem.png"));
WAND_ROD_LIVINGWOOD = new WandRod("livingwood", 100, new ItemStack(wandCore, 1, 7), 12, new YandereWandUpdate(), new ResourceLocation("forbidden", "textures/models/wand_rod_livingwood.png"));
STAFF_ROD_BLOOD = new StaffRod("blood", 50, new ItemStack(wandCore, 1, 9), 24, new BloodStaffUpdate(), new ResourceLocation("forbidden", "textures/models/wand_rod_blood.png"));
STAFF_ROD_NEUTRONIUM = new StaffRod("neutronium", 9002, new ItemStack(Blocks.bedrock, 1), 1000, new CreativeWandUpdate(), new ResourceLocation("forbidden", "textures/models/wand_rod_neutronium.png"));
@@ -1,5 +1,6 @@
package com.spiteful.forbidden.items;
package fox.spiteful.forbidden.items;
import fox.spiteful.forbidden.Forbidden;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.Entity;
@@ -9,8 +10,7 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import com.spiteful.forbidden.Forbidden;
import com.spiteful.forbidden.blocks.ForbiddenBlocks;
import fox.spiteful.forbidden.blocks.ForbiddenBlocks;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -1,7 +1,9 @@
package com.spiteful.forbidden.items;
package fox.spiteful.forbidden.items;
import java.util.List;
import fox.spiteful.forbidden.Forbidden;
import fox.spiteful.forbidden.compat.Compat;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
@@ -13,9 +15,6 @@ import thaumcraft.api.IScribeTools;
import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable;
import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;
import com.spiteful.forbidden.Forbidden;
import com.spiteful.forbidden.compat.Compat;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -1,5 +1,6 @@
package com.spiteful.forbidden.items;
package fox.spiteful.forbidden.items;
import fox.spiteful.forbidden.Forbidden;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.player.EntityPlayer;
@@ -11,8 +12,6 @@ import net.minecraft.util.IIcon;
import net.minecraft.world.World;
import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable;
import com.spiteful.forbidden.Forbidden;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -1,7 +1,8 @@
package com.spiteful.forbidden.items;
package fox.spiteful.forbidden.items;
import java.util.Iterator;
import fox.spiteful.forbidden.Forbidden;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
@@ -13,12 +14,12 @@ import thaumcraft.api.IScribeTools;
import thaumcraft.api.ItemApi;
import thaumcraft.api.aspects.Aspect;
import thaumcraft.common.Thaumcraft;
import thaumcraft.common.lib.network.PacketHandler;
import thaumcraft.common.lib.network.playerdata.PacketAspectPool;
import com.spiteful.forbidden.Forbidden;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import thaumcraft.common.lib.research.ResearchManager;
public class ItemCrystalwell extends Item implements IScribeTools {
@@ -50,14 +51,15 @@ public class ItemCrystalwell extends Item implements IScribeTools {
public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) {
if (stack.getItemDamage() >= 100) {
if (!world.isRemote) {
Iterator count = Aspect.getPrimalAspects().iterator();
while (count.hasNext()) {
Aspect aspect = (Aspect) count.next();
short amount = (short) (world.rand.nextInt(3) + 4);
Thaumcraft.proxy.playerKnowledge.addAspectPool(player.getDisplayName(), aspect, amount);
Thaumcraft.packetPipeline.sendTo(new PacketAspectPool(aspect.getTag(), Short.valueOf((short) amount), Short.valueOf(Thaumcraft.proxy.getPlayerKnowledge().getAspectPoolFor(player.getCommandSenderName(), aspect))), (EntityPlayerMP) player);
}
Aspect aspect;
short amount;
for(Iterator count = Aspect.getPrimalAspects().iterator(); count.hasNext(); PacketHandler.INSTANCE.sendTo(new PacketAspectPool(aspect.getTag(), Short.valueOf(amount), Short.valueOf(Thaumcraft.proxy.playerKnowledge.getAspectPoolFor(player.getCommandSenderName(), aspect))), (EntityPlayerMP)player))
{
aspect = (Aspect)count.next();
amount = (short)(world.rand.nextInt(4) + 4);
Thaumcraft.proxy.playerKnowledge.addAspectPool(player.getCommandSenderName(), aspect, amount);
ResearchManager.scheduleSave(player);
}
}
player.swingItem();
return ItemApi.getItem("itemInkwell", 100);
@@ -1,7 +1,8 @@
package com.spiteful.forbidden.items;
package fox.spiteful.forbidden.items;
import java.util.List;
import fox.spiteful.forbidden.Forbidden;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
@@ -9,8 +10,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import net.minecraft.util.MathHelper;
import com.spiteful.forbidden.Config;
import com.spiteful.forbidden.Forbidden;
import fox.spiteful.forbidden.Config;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -1,5 +1,6 @@
package com.spiteful.forbidden.items;
package fox.spiteful.forbidden.items;
import fox.spiteful.forbidden.Forbidden;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.player.EntityPlayer;
@@ -11,8 +12,7 @@ import net.minecraft.util.IIcon;
import net.minecraft.world.World;
import thaumcraft.api.IRepairable;
import com.spiteful.forbidden.Config;
import com.spiteful.forbidden.Forbidden;
import fox.spiteful.forbidden.Config;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -1,7 +1,9 @@
package com.spiteful.forbidden.items;
package fox.spiteful.forbidden.items;
import java.util.List;
import fox.spiteful.forbidden.Forbidden;
import fox.spiteful.forbidden.compat.Compat;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
@@ -13,9 +15,6 @@ import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable;
import WayofTime.alchemicalWizardry.api.items.interfaces.IBloodOrb;
import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;
import com.spiteful.forbidden.Forbidden;
import com.spiteful.forbidden.compat.Compat;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -1,13 +1,12 @@
package com.spiteful.forbidden.items;
package fox.spiteful.forbidden.items;
import fox.spiteful.forbidden.Forbidden;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import thaumcraft.api.IScribeTools;
import com.spiteful.forbidden.Forbidden;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -1,11 +1,10 @@
package com.spiteful.forbidden.items;
package fox.spiteful.forbidden.items;
import fox.spiteful.forbidden.Forbidden;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.item.ItemFood;
import net.minecraft.util.IIcon;
import com.spiteful.forbidden.Forbidden;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -1,7 +1,8 @@
package com.spiteful.forbidden.items;
package fox.spiteful.forbidden.items;
import java.util.List;
import fox.spiteful.forbidden.Forbidden;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
@@ -12,8 +13,7 @@ import net.minecraft.util.IIcon;
import net.minecraft.util.StatCollector;
import thaumcraft.api.aspects.Aspect;
import com.spiteful.forbidden.Config;
import com.spiteful.forbidden.Forbidden;
import fox.spiteful.forbidden.Config;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -1,5 +1,6 @@
package com.spiteful.forbidden.items;
package fox.spiteful.forbidden.items;
import fox.spiteful.forbidden.Forbidden;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.enchantment.EnchantmentHelper;
import net.minecraft.entity.player.EntityPlayer;
@@ -12,8 +13,7 @@ import net.minecraft.util.IIcon;
import net.minecraft.world.World;
import thaumcraft.api.IRepairable;
import com.spiteful.forbidden.Forbidden;
import com.spiteful.forbidden.enchantments.DarkEnchantments;
import fox.spiteful.forbidden.enchantments.DarkEnchantments;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -1,4 +1,4 @@
package com.spiteful.forbidden.items;
package fox.spiteful.forbidden.items;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.enchantment.EnchantmentHelper;
@@ -12,8 +12,8 @@ import net.minecraft.util.IIcon;
import net.minecraft.world.World;
import thaumcraft.api.IRepairable;
import com.spiteful.forbidden.Forbidden;
import com.spiteful.forbidden.enchantments.DarkEnchantments;
import fox.spiteful.forbidden.Forbidden;
import fox.spiteful.forbidden.enchantments.DarkEnchantments;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -1,5 +1,7 @@
package com.spiteful.forbidden.items;
package fox.spiteful.forbidden.items;
import fox.spiteful.forbidden.Forbidden;
import fox.spiteful.forbidden.enchantments.DarkEnchantments;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.enchantment.EnchantmentHelper;
import net.minecraft.entity.player.EntityPlayer;
@@ -12,9 +14,6 @@ import net.minecraft.util.IIcon;
import net.minecraft.world.World;
import thaumcraft.api.IRepairable;
import com.spiteful.forbidden.Forbidden;
import com.spiteful.forbidden.enchantments.DarkEnchantments;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -1,5 +1,6 @@
package com.spiteful.forbidden.items;
package fox.spiteful.forbidden.items;
import fox.spiteful.forbidden.Forbidden;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.enchantment.EnchantmentHelper;
import net.minecraft.entity.player.EntityPlayer;
@@ -12,8 +13,7 @@ import net.minecraft.util.IIcon;
import net.minecraft.world.World;
import thaumcraft.api.IRepairable;
import com.spiteful.forbidden.Forbidden;
import com.spiteful.forbidden.enchantments.DarkEnchantments;
import fox.spiteful.forbidden.enchantments.DarkEnchantments;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -1,7 +1,8 @@
package com.spiteful.forbidden.items;
package fox.spiteful.forbidden.items;
import java.util.List;
import fox.spiteful.forbidden.Forbidden;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.EntityLivingBase;
@@ -12,8 +13,6 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import net.minecraft.util.MathHelper;
import com.spiteful.forbidden.Forbidden;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -1,5 +1,6 @@
package com.spiteful.forbidden.items;
package fox.spiteful.forbidden.items;
import fox.spiteful.forbidden.Forbidden;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.EntityLivingBase;
@@ -17,8 +18,7 @@ import net.minecraft.util.DamageSource;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
import com.spiteful.forbidden.Config;
import com.spiteful.forbidden.Forbidden;
import fox.spiteful.forbidden.Config;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -1,5 +1,6 @@
package com.spiteful.forbidden.items;
package fox.spiteful.forbidden.items;
import fox.spiteful.forbidden.Forbidden;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.item.EnumRarity;
@@ -8,8 +9,7 @@ import net.minecraft.item.ItemSword;
import net.minecraft.util.IIcon;
import thaumcraft.api.IRepairable;
import com.spiteful.forbidden.Config;
import com.spiteful.forbidden.Forbidden;
import fox.spiteful.forbidden.Config;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -1,4 +1,4 @@
package com.spiteful.forbidden.items;
package fox.spiteful.forbidden.items;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.item.EnumRarity;
@@ -7,8 +7,8 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import thaumcraft.api.IRepairable;
import com.spiteful.forbidden.Config;
import com.spiteful.forbidden.Forbidden;
import fox.spiteful.forbidden.Config;
import fox.spiteful.forbidden.Forbidden;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -1,5 +1,6 @@
package com.spiteful.forbidden.items;
package fox.spiteful.forbidden.items;
import fox.spiteful.forbidden.Forbidden;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.player.EntityPlayer;
@@ -11,8 +12,7 @@ import net.minecraft.world.World;
import net.minecraftforge.common.ForgeHooks;
import thaumcraft.api.IRepairable;
import com.spiteful.forbidden.Config;
import com.spiteful.forbidden.Forbidden;
import fox.spiteful.forbidden.Config;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -1,4 +1,4 @@
package com.spiteful.forbidden.items.wands;
package fox.spiteful.forbidden.items.wands;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
@@ -7,7 +7,7 @@ import thaumcraft.api.wands.IWandRodOnUpdate;
import thaumcraft.common.items.wands.ItemWandCasting;
import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;
import com.spiteful.forbidden.compat.Compat;
import fox.spiteful.forbidden.compat.Compat;
public class BloodStaffUpdate implements IWandRodOnUpdate {
@@ -1,5 +1,6 @@
package com.spiteful.forbidden.items.wands;
package fox.spiteful.forbidden.items.wands;
import fox.spiteful.forbidden.compat.Compat;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import thaumcraft.api.aspects.Aspect;
@@ -7,8 +8,6 @@ import thaumcraft.api.wands.IWandRodOnUpdate;
import thaumcraft.common.items.wands.ItemWandCasting;
import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;
import com.spiteful.forbidden.compat.Compat;
public class BloodWandUpdate implements IWandRodOnUpdate {
Aspect primals[] = Aspect.getPrimalAspects().toArray(new Aspect[0]);
@@ -1,4 +1,4 @@
package com.spiteful.forbidden.items.wands;
package fox.spiteful.forbidden.items.wands;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
@@ -1,4 +1,4 @@
package com.spiteful.forbidden.items.wands;
package fox.spiteful.forbidden.items.wands;
import java.util.List;
@@ -1,4 +1,4 @@
package com.spiteful.forbidden.items.wands;
package fox.spiteful.forbidden.items.wands;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
@@ -1,15 +1,14 @@
package com.spiteful.forbidden.items.wands;
package fox.spiteful.forbidden.items.wands;
import java.util.List;
import fox.spiteful.forbidden.Forbidden;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import com.spiteful.forbidden.Forbidden;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -1,7 +1,8 @@
package com.spiteful.forbidden.items.wands;
package fox.spiteful.forbidden.items.wands;
import java.util.List;
import fox.spiteful.forbidden.Forbidden;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
@@ -12,8 +13,7 @@ import thaumcraft.api.wands.WandCap;
import thaumcraft.api.wands.WandRod;
import thaumcraft.common.items.wands.ItemWandCasting;
import com.spiteful.forbidden.Forbidden;
import com.spiteful.forbidden.compat.Compat;
import fox.spiteful.forbidden.compat.Compat;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -1,12 +1,11 @@
package com.spiteful.forbidden.items.wands;
package fox.spiteful.forbidden.items.wands;
import fox.spiteful.forbidden.compat.Compat;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import thaumcraft.api.aspects.Aspect;
import thaumcraft.api.wands.IWandRodOnUpdate;
import com.spiteful.forbidden.compat.Compat;
public class ManaStaffUpdate implements IWandRodOnUpdate {
Aspect primals[] = Aspect.getPrimalAspects().toArray(new Aspect[0]);
@@ -1,11 +1,11 @@
package com.spiteful.forbidden.items.wands;
package fox.spiteful.forbidden.items.wands;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import thaumcraft.api.aspects.Aspect;
import thaumcraft.api.wands.IWandRodOnUpdate;
import com.spiteful.forbidden.compat.Compat;
import fox.spiteful.forbidden.compat.Compat;
public class ManaWandUpdate implements IWandRodOnUpdate {
@@ -1,12 +1,11 @@
package com.spiteful.forbidden.items.wands;
package fox.spiteful.forbidden.items.wands;
import fox.spiteful.forbidden.compat.Compat;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import thaumcraft.api.aspects.Aspect;
import thaumcraft.api.wands.IWandRodOnUpdate;
import com.spiteful.forbidden.compat.Compat;
public class SoulWandUpdate implements IWandRodOnUpdate {
Aspect primals[] = Aspect.getPrimalAspects().toArray(new Aspect[0]);
@@ -1,4 +1,4 @@
package com.spiteful.forbidden.items.wands;
package fox.spiteful.forbidden.items.wands;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
@@ -6,7 +6,7 @@ import thaumcraft.api.aspects.Aspect;
import thaumcraft.api.wands.IWandRodOnUpdate;
import thaumcraft.common.items.wands.ItemWandCasting;
import com.spiteful.forbidden.Config;
import fox.spiteful.forbidden.Config;
public class TaintedWandUpdate implements IWandRodOnUpdate {
@@ -1,4 +1,4 @@
package com.spiteful.forbidden.items.wands;
package fox.spiteful.forbidden.items.wands;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
@@ -7,7 +7,7 @@ import thaumcraft.api.wands.IWandRodOnUpdate;
import thaumcraft.common.items.wands.ItemWandCasting;
import vazkii.botania.api.mana.ManaItemHandler;
import com.spiteful.forbidden.compat.Compat;
import fox.spiteful.forbidden.compat.Compat;
public class YandereWandUpdate implements IWandRodOnUpdate {
@@ -15,15 +15,15 @@ public class YandereWandUpdate implements IWandRodOnUpdate {
public void onUpdate(ItemStack itemstack, EntityPlayer player)
{
if(Compat.botan && player.ticksExisted % 40 == 0)
if(Compat.botan && player.ticksExisted % 40 == 0 && checkHotbar(itemstack, player))
{
try
{
int cost;
if(((ItemWandCasting)itemstack.getItem()).getCap(itemstack).getTag().equals("manasteel"))
cost = 1800;
cost = 900;
else
cost = 2000;
cost = 1000;
for(int x = 0;x < primals.length;x++)
{
@@ -42,5 +42,16 @@ public class YandereWandUpdate implements IWandRodOnUpdate {
}
}
private boolean checkHotbar(ItemStack stack, EntityPlayer player)
{
for(int x = 0; x < 9; ++x)
{
ItemStack item = player.inventory.getStackInSlot(x);
if(item == stack)
return true;
}
return false;
}
}
@@ -1,4 +1,4 @@
package com.spiteful.forbidden.tiles;
package fox.spiteful.forbidden.tiles;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.NetworkManager;
@@ -12,8 +12,8 @@ import thaumcraft.api.aspects.AspectList;
import thaumcraft.api.aspects.IAspectContainer;
import thaumcraft.api.aspects.IEssentiaTransport;
import com.spiteful.forbidden.Config;
import com.spiteful.forbidden.DarkAspects;
import fox.spiteful.forbidden.Config;
import fox.spiteful.forbidden.DarkAspects;
public class TileEntityWrathCage extends TileEntity implements IAspectContainer, IEssentiaTransport
@@ -1,4 +1,4 @@
package com.spiteful.forbidden.tiles;
package fox.spiteful.forbidden.tiles;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityList;
@@ -12,7 +12,7 @@ import net.minecraft.world.World;
import thaumcraft.api.aspects.Aspect;
import thaumcraft.common.Thaumcraft;
import com.spiteful.forbidden.Config;
import fox.spiteful.forbidden.Config;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -158,7 +158,8 @@ public class WrathSpawnerLogic {
return;
}
int j = this.getSpawnerWorld().getEntitiesWithinAABB(entity.getClass(), AxisAlignedBB.getAABBPool().getAABB((double) this.getSpawnerX(), (double) this.getSpawnerY(), (double) this.getSpawnerZ(), (double) (this.getSpawnerX() + 1), (double) (this.getSpawnerY() + 1), (double) (this.getSpawnerZ() + 1)).expand((double) (this.spawnRange * 2), 4.0D, (double) (this.spawnRange * 2))).size();
//int j = this.getSpawnerWorld().getEntitiesWithinAABB(entity.getClass(), AxisAlignedBB.getAABBPool().getAABB((double) this.getSpawnerX(), (double) this.getSpawnerY(), (double) this.getSpawnerZ(), (double) (this.getSpawnerX() + 1), (double) (this.getSpawnerY() + 1), (double) (this.getSpawnerZ() + 1)).expand((double) (this.spawnRange * 2), 4.0D, (double) (this.spawnRange * 2))).size();
int j = this.getSpawnerWorld().getEntitiesWithinAABB(entity.getClass(), AxisAlignedBB.getBoundingBox((double)this.getSpawnerX(), (double)this.getSpawnerY(), (double)this.getSpawnerZ(), (double)(this.getSpawnerX() + 1), (double)(this.getSpawnerY() + 1), (double)(this.getSpawnerZ() + 1)).expand((double)(this.spawnRange * 2), 4.0D, (double)(this.spawnRange * 2))).size();
if (j >= this.maxNearbyEntities) {
this.updateDelay();
+3 -3
View File
@@ -2,10 +2,10 @@
{
"modid" : "ForbiddenMagic",
"name" : "Forbidden Magic",
"version" : "${mod_version}",
"mcversion": "${minecraft_version}",
"version": "${version}",
"mcversion": "${mcversion}",
"url" : "http://www.minecraftforum.net/topic/2305054-/",
"credits" : "Azanor, Flaxbeard, Killajoke, LycaonX, Nieue, Succubism, Vazkii, Dylan4ever, Nekosune, Kihira",
"credits" : "Azanor, joshiejack, Killajoke, LycaonX, Nieue, Succubism, Vazkii, Dylan4ever, Nekosune, Kihira",
"authors": [
"SpitefulFox"
],