diff --git a/assets/forbidden/textures/items/wand_rod_witchwood.png b/assets/forbidden/textures/items/wand_rod_witchwood.png index f36bf41..a9b5b14 100644 Binary files a/assets/forbidden/textures/items/wand_rod_witchwood.png and b/assets/forbidden/textures/items/wand_rod_witchwood.png differ diff --git a/assets/forbidden/textures/items/wand_rod_witchwood_staff.png b/assets/forbidden/textures/items/wand_rod_witchwood_staff.png index 7444695..2ec4453 100644 Binary files a/assets/forbidden/textures/items/wand_rod_witchwood_staff.png and b/assets/forbidden/textures/items/wand_rod_witchwood_staff.png differ diff --git a/assets/forbidden/textures/models/wand_rod_witchwood.png b/assets/forbidden/textures/models/wand_rod_witchwood.png index acf2e4c..171e9c1 100644 Binary files a/assets/forbidden/textures/models/wand_rod_witchwood.png and b/assets/forbidden/textures/models/wand_rod_witchwood.png differ diff --git a/src/com/spiteful/forbidden/DarkAspects.java b/src/com/spiteful/forbidden/DarkAspects.java index bf728ec..0a5ab55 100644 --- a/src/com/spiteful/forbidden/DarkAspects.java +++ b/src/com/spiteful/forbidden/DarkAspects.java @@ -140,8 +140,9 @@ public class DarkAspects list.add(GLUTTONY, 1); ThaumcraftApi.registerObjectTag(Item.cookie.itemID, -1, list); - list = ThaumcraftApiHelper.getObjectAspects(new ItemStack(Item.fireballCharge)); - list.add(WRATH, 1); + //list = ThaumcraftApiHelper.getObjectAspects(new ItemStack(Item.fireballCharge)); + list = new AspectList(); + list.add(Aspect.FIRE, 3).add(Aspect.ENTROPY, 1).add(Aspect.ENERGY, 1).add(WRATH, 1); ThaumcraftApi.registerObjectTag(Item.fireballCharge.itemID, 0, list); //list = ThaumcraftApiHelper.getObjectAspects(new ItemStack(Item.comparator)).copy(); diff --git a/src/com/spiteful/forbidden/Forbidden.java b/src/com/spiteful/forbidden/Forbidden.java index 8b1cb22..92e0453 100644 --- a/src/com/spiteful/forbidden/Forbidden.java +++ b/src/com/spiteful/forbidden/Forbidden.java @@ -31,7 +31,7 @@ import java.util.logging.Level; @Mod( modid = "ForbiddenMagic", name = "Forbidden Magic", - version = "0.34", + version = "0.35a", dependencies = "required-after:Thaumcraft;after:ThaumicTinkerer" ) @NetworkMod( diff --git a/src/com/spiteful/forbidden/blocks/BlockWrathCage.java b/src/com/spiteful/forbidden/blocks/BlockWrathCage.java index eb300c2..a9cd5a9 100644 --- a/src/com/spiteful/forbidden/blocks/BlockWrathCage.java +++ b/src/com/spiteful/forbidden/blocks/BlockWrathCage.java @@ -101,7 +101,10 @@ public class BlockWrathCage extends BlockContainer */ public void breakBlock(World par1World, int x, int y, int z, int par5, int par6) { - TileEntityWrathCage spawner = (TileEntityWrathCage)par1World.getBlockTileEntity(x, y, z); + TileEntityWrathCage spawner = null; + + if(par1World.getBlockTileEntity(x, y, z) instanceof TileEntityWrathCage) + spawner = (TileEntityWrathCage)par1World.getBlockTileEntity(x, y, z); if (spawner != null && spawner.getSpawnerLogic().isMobSet()) { diff --git a/src/mcmod.info b/src/mcmod.info index 46efaaa..316b7e8 100644 --- a/src/mcmod.info +++ b/src/mcmod.info @@ -2,9 +2,9 @@ { "modid" : "ForbiddenMagic", "name" : "Forbidden Magic", - "version" : "v0.34", + "version" : "v0.35a", "url" : "http://www.minecraftforum.net/topic/2305054-/", - "credits" : "Azanor, Flaxbeard, Killajoke, LycaonX, Nieue, Succubism, Vazkii, Dylan4ever, Nekosune, Kihira", + "credits" : "Azanor, joshiejack, Flaxbeard, Killajoke, LycaonX, Nieue, Succubism, Vazkii, Dylan4ever, Nekosune, Kihira", "authors": [ "SpitefulFox" ],