From 199a8120a213291d7ab8d28d242615facf8e8367 Mon Sep 17 00:00:00 2001 From: Jeremy Diamond Date: Sun, 29 Jun 2014 19:42:33 -0700 Subject: [PATCH] blah blah blah blah --- .../textures/items/wand_rod_witchwood.png | Bin 346 -> 346 bytes .../textures/items/wand_rod_witchwood_staff.png | Bin 178 -> 279 bytes .../textures/models/wand_rod_witchwood.png | Bin 222 -> 589 bytes src/com/spiteful/forbidden/DarkAspects.java | 5 +++-- src/com/spiteful/forbidden/Forbidden.java | 2 +- .../forbidden/blocks/BlockWrathCage.java | 5 ++++- src/mcmod.info | 4 ++-- 7 files changed, 10 insertions(+), 6 deletions(-) diff --git a/assets/forbidden/textures/items/wand_rod_witchwood.png b/assets/forbidden/textures/items/wand_rod_witchwood.png index f36bf41208fd34bb0363d79939357d6be4e765c9..a9b5b14a3dac0c1bfd09a5afdce176547071c94a 100644 GIT binary patch delta 225 zcmV<703QF^0@?zQJPHl~01FNQK)&HYkw!^>P=o;&77-F-Nc5}t?`<3PAE%@7X-@X9 z`rnzi@_$Bf<9}!K0PKd~G5}=rvaVxb%>j-{q`3g38D?{|X8~@_Ab%md0OV(ohMs~o z|1(3H{)f3{{s)QS1;_?~G%xRlI6J~U=RZu2C<8#w2H6bK46+&7V7vyvqN*%z64=>H zpa4S;SiA;+Z0;>w3lD8V2qr)00000NkvXXu0mjfygOZ> delta 225 zcmV<703QF^0@?zQJPHp001FQRlKBIrkw!^>NRR;+77-R=i14%h?`miCAE%@7X^sl8 z`(KwA{68+(;lI6w9(F@;833|*Zf81JvzL=8X)XY1hS?nKWrbTa$Y01V0QniDp&>uy ze|(7Je?M3A{~$5E0NDVL=J{P2U}pzP7$mYhvPFNs9H^?z z)5S5w!aq4dfjOnk;%Qq~7{6g*m#vxZ zw_m?2bE0m&y}ak><*D-{vVck%OM?7@862M7NCR>#JzX3_IIbr*FdSpkc)WovBw;yo zi{d;^Q4OI6gO<>ROm2)BOs)ouqAMIGG3zn9t|$$XW(;uSp2EgZ$;SRor?7Jt&=dww LS3j3^P6Ay<0nG%E7=H)`0001UdV2H#0004VQb$4nuFf3k00004XF*Lt006O%3;baP z00009a7bBm000id000id0mpBsWB>pF8gxZibW?9;ba!ELWdKlNX>N2bPDNB8b~7$D zE-^7j^FlWO00F#7L_t(oN9~r|NLTnS>1<^OGk?phw6e_1QqjspJ0FRn zlMzKx5JXVWMM3X4@eK*Rz(^Nc7}na}%s2o4ueEngjq`I9a1?M9_*LL2{UU{#vg9Hs zQi|P3)rDD}Je6$tSn|^svKGCp9)PRPE&Z+I;%kqHr^&C?9PCQ6rWJ59&M{=5bw+A>_dX~-joh$^m z6o3HE1&TWT)!L^$z)AK^r>5cR)R_hm8`$3zzwH5-a%=ux8&iv+U5O5^D9~}{)gGW+ z_)^(ZWBXcoPafD;C4}cIAL{*IfaK`5K4XRXDL`f>C4c!8(-TPS;3%2{>?NPn0vgAL z3OY3aT+5RKS$lw;g-1OF$jj1NhH%Oa=fTkh~39N4jG605s#)BY+go_zyt9Giwh(^9lf-b0<^){2f#F05qj| zE%&yB^f~Nf1#4@g*B-#z92AOX?uJhNAQ@;2>snvyvIj6vxzpgkEARtgVnyhnVvdvm O0000L_G^L0|P^2NcwRgB@y5g;tHf)EEFyEW&G?_?TzIPG$bP2wUlLrF0D;* z1j;d%1o;IsI6S+N2IQ1@x;TbtoIiVZBX5g=fJIN(KM` 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" ],