diff --git a/src/main/java/taintedmagic/common/blocks/tile/TileLumos.java b/src/main/java/taintedmagic/common/blocks/tile/TileLumos.java index 6430328..5c8731f 100644 --- a/src/main/java/taintedmagic/common/blocks/tile/TileLumos.java +++ b/src/main/java/taintedmagic/common/blocks/tile/TileLumos.java @@ -1,19 +1,11 @@ package taintedmagic.common.blocks.tile; -import baubles.api.BaublesApi; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import taintedmagic.common.blocks.BlockLumos; -import taintedmagic.common.items.equipment.ItemLumosRing; -import taintedmagic.common.registry.ItemRegistry; import thaumcraft.client.fx.ParticleEngine; import thaumcraft.client.fx.particles.FXSparkle; -import thaumcraft.common.items.wands.ItemWandCasting; public class TileLumos extends TileEntity { @@ -24,10 +16,8 @@ public class TileLumos extends TileEntity { @Override public void updateEntity () { - if (this.getBlockType() instanceof BlockLumos) { - if (worldObj.rand.nextInt(15) == 0 && worldObj.isRemote) { - spawnParticles(); - } + if (getBlockType() instanceof BlockLumos && worldObj.rand.nextInt(15) == 0 && worldObj.isRemote) { + spawnParticles(); } } diff --git a/src/main/java/taintedmagic/common/handler/TMEventHandler.java b/src/main/java/taintedmagic/common/handler/TMEventHandler.java index 6589a05..d0bbad9 100644 --- a/src/main/java/taintedmagic/common/handler/TMEventHandler.java +++ b/src/main/java/taintedmagic/common/handler/TMEventHandler.java @@ -77,8 +77,8 @@ public class TMEventHandler { boolean lumos = false; final IInventory baub = BaublesApi.getBaubles(player); - if ( (baub.getStackInSlot(1) != null && baub.getStackInSlot(1).getItem() instanceof ItemLumosRing) - || (baub.getStackInSlot(2) != null && baub.getStackInSlot(2).getItem() instanceof ItemLumosRing)) { + if (baub.getStackInSlot(1) != null && baub.getStackInSlot(1).getItem() instanceof ItemLumosRing + || baub.getStackInSlot(2) != null && baub.getStackInSlot(2).getItem() instanceof ItemLumosRing) { lumos = true; } else if (player.getHeldItem() != null && player.getHeldItem().getItem() instanceof ItemWandCasting) { @@ -232,8 +232,8 @@ public class TMEventHandler { */ @SubscribeEvent public void playerLoggedIn (final PlayerEvent.PlayerLoggedInEvent event) { - if (UpdateHandler.updateStatus != null) { - event.player.addChatMessage(new ChatComponentText(UpdateHandler.updateStatus)); + if (UpdateHandler.message != null) { + event.player.addChatMessage(new ChatComponentText(UpdateHandler.message)); } } diff --git a/src/main/java/taintedmagic/common/registry/ItemRegistry.java b/src/main/java/taintedmagic/common/registry/ItemRegistry.java index a76b869..88dde69 100644 --- a/src/main/java/taintedmagic/common/registry/ItemRegistry.java +++ b/src/main/java/taintedmagic/common/registry/ItemRegistry.java @@ -153,8 +153,8 @@ public class ItemRegistry { .setUnlocalizedName("ItemVoidFortressChestplate"); GameRegistry.registerItem(ItemVoidFortressChestplate, "ItemVoidFortressChestplate"); - ItemVoidFortressLeggings = new ItemVoidFortressArmor(TMMaterials.ARMOR_VOIDFORTRESS, 4, 2) - .setUnlocalizedName("ItemVoidFortressLeggings"); + ItemVoidFortressLeggings = + new ItemVoidFortressArmor(TMMaterials.ARMOR_VOIDFORTRESS, 4, 2).setUnlocalizedName("ItemVoidFortressLeggings"); GameRegistry.registerItem(ItemVoidFortressLeggings, "ItemVoidFortressLeggings"); ItemVoidwalkerBoots =