blah blah blah blah

This commit is contained in:
Jeremy Diamond committed 2014-06-29 19:42:33 -07:00
1 parent 98987f060e
commit 199a8120a2
7 files changed
+10 -6

No files matched your search

Binary file not shown.

Before

Width:  |  Height:  |  Size: 346 B

After

Width:  |  Height:  |  Size: 346 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 178 B

After

Width:  |  Height:  |  Size: 279 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 222 B

After

Width:  |  Height:  |  Size: 589 B

+3 -2
View File
@@ -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();
+1 -1
View File
@@ -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(
@@ -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())
{
+2 -2
View File
@@ -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"
],