mirror of
https://github.com/GTNewHorizons/Tainted-Magic.git
synced 2026-11-21 04:22:21 +00:00
Tiny cleanup
This commit is contained in:
1 parent
fde65b16b8
commit
df2d97bd55
3 files changed
+8
-18
No files matched your search
@@ -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();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -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));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -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 =
|
||||
|
||||
Reference in new issue
Block a user