diff options
Diffstat (limited to 'YWD/src/main/java/fyresmodjam/blocks')
5 files changed, 171 insertions, 429 deletions
diff --git a/YWD/src/main/java/fyresmodjam/blocks/BlockCrystal.java b/YWD/src/main/java/fyresmodjam/blocks/BlockCrystal.java index 24d76d2..a62827b 100755 --- a/YWD/src/main/java/fyresmodjam/blocks/BlockCrystal.java +++ b/YWD/src/main/java/fyresmodjam/blocks/BlockCrystal.java @@ -51,14 +51,12 @@ public class BlockCrystal extends BlockContainer { @Override
@SideOnly(Side.CLIENT)
- public boolean shouldSideBeRendered(IBlockAccess blockAccess,
- int i, int i2, int i3, int i4) {
+ public boolean shouldSideBeRendered(IBlockAccess blockAccess, int i, int i2, int i3, int i4) {
return false;
}
@Override
- public ItemStack getPickBlock(MovingObjectPosition object,
- World par1World, int par2, int par3, int par4) {
+ public ItemStack getPickBlock(MovingObjectPosition object, World par1World, int par2, int par3, int par4) {
return new ItemStack(ModjamMod.crystalItem);
}
@@ -68,11 +66,9 @@ public class BlockCrystal extends BlockContainer { }
@Override
- public void onBlockPlacedBy(World par1World, int par2, int par3,
- int par4, EntityLivingBase par5EntityLivingBase,
+ public void onBlockPlacedBy(World par1World, int par2, int par3, int par4, EntityLivingBase par5EntityLivingBase,
ItemStack par6ItemStack) {
- par1World.setBlockMetadataWithNotify(par2, par3, par4,
- par6ItemStack.getItemDamage(), 0);
+ par1World.setBlockMetadataWithNotify(par2, par3, par4, par6ItemStack.getItemDamage(), 0);
}
@Override
diff --git a/YWD/src/main/java/fyresmodjam/blocks/BlockCrystalStand.java b/YWD/src/main/java/fyresmodjam/blocks/BlockCrystalStand.java index 9855dd4..67bcc4b 100755 --- a/YWD/src/main/java/fyresmodjam/blocks/BlockCrystalStand.java +++ b/YWD/src/main/java/fyresmodjam/blocks/BlockCrystalStand.java @@ -39,8 +39,7 @@ public class BlockCrystalStand extends BlockContainer { @Override
@SideOnly(Side.CLIENT)
- public boolean shouldSideBeRendered(IBlockAccess blockAccess,
- int i, int i2, int i3, int i4) {
+ public boolean shouldSideBeRendered(IBlockAccess blockAccess, int i, int i2, int i3, int i4) {
return false;
}
}
diff --git a/YWD/src/main/java/fyresmodjam/blocks/BlockMysteryMushroom.java b/YWD/src/main/java/fyresmodjam/blocks/BlockMysteryMushroom.java index e738c94..c2baf95 100755 --- a/YWD/src/main/java/fyresmodjam/blocks/BlockMysteryMushroom.java +++ b/YWD/src/main/java/fyresmodjam/blocks/BlockMysteryMushroom.java @@ -21,14 +21,13 @@ import net.minecraftforge.common.util.ForgeDirection; public class BlockMysteryMushroom extends BlockFlower {
- public IIcon icon;
- public IIcon overlay;
+ public IIcon icon;
+ public IIcon overlay;
public BlockMysteryMushroom() {
super(0);
float f = 0.2F;
- setBlockBounds(0.5F - f, 0.0F, 0.5F - f, 0.5F + f,
- f * 2.0F, 0.5F + f);
+ setBlockBounds(0.5F - f, 0.0F, 0.5F - f, 0.5F + f, f * 2.0F, 0.5F + f);
setTickRandomly(true);
setCreativeTab(null);
}
@@ -36,10 +35,8 @@ public class BlockMysteryMushroom extends BlockFlower { @Override
@SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister par1IconRegister) {
- icon = par1IconRegister
- .registerIcon("fyresmodjam:mushroomBlock");
- overlay = par1IconRegister.registerIcon(
- "fyresmodjam:mushroomBlock_overlay");
+ icon = par1IconRegister.registerIcon("fyresmodjam:mushroomBlock");
+ overlay = par1IconRegister.registerIcon("fyresmodjam:mushroomBlock_overlay");
blockIcon = icon;
}
@@ -50,8 +47,7 @@ public class BlockMysteryMushroom extends BlockFlower { }
@Override
- public void updateTick(World par1World, int par2, int par3,
- int par4, Random par5Random) {
+ public void updateTick(World par1World, int par2, int par3, int par4, Random par5Random) {
if (par5Random.nextInt(25) == 0) {
byte b0 = 4;
int l = 5;
@@ -60,13 +56,9 @@ public class BlockMysteryMushroom extends BlockFlower { int k1;
for (i1 = par2 - b0; i1 <= par2 + b0; ++i1) {
- for (j1 = par4 - b0; j1 <= par4
- + b0; ++j1) {
- for (k1 = par3 - 1; k1 <= par3
- + 1; ++k1) {
- if (par1World.getBlock(i1,
- k1,
- j1) == this) {
+ for (j1 = par4 - b0; j1 <= par4 + b0; ++j1) {
+ for (k1 = par3 - 1; k1 <= par3 + 1; ++k1) {
+ if (par1World.getBlock(i1, k1, j1) == this) {
--l;
if (l <= 0) {
@@ -78,55 +70,37 @@ public class BlockMysteryMushroom extends BlockFlower { }
i1 = par2 + par5Random.nextInt(3) - 1;
- j1 = par3 + par5Random.nextInt(2)
- - par5Random.nextInt(2);
+ j1 = par3 + par5Random.nextInt(2) - par5Random.nextInt(2);
k1 = par4 + par5Random.nextInt(3) - 1;
for (int l1 = 0; l1 < 4; ++l1) {
- if (par1World.isAirBlock(i1, j1, k1)
- && canBlockStay(par1World,
- i1, j1,
- k1)) {
+ if (par1World.isAirBlock(i1, j1, k1) && canBlockStay(par1World, i1, j1, k1)) {
par2 = i1;
par3 = j1;
par4 = k1;
}
i1 = par2 + par5Random.nextInt(3) - 1;
- j1 = par3 + par5Random.nextInt(2)
- - par5Random.nextInt(2);
+ j1 = par3 + par5Random.nextInt(2) - par5Random.nextInt(2);
k1 = par4 + par5Random.nextInt(3) - 1;
}
- if (par1World.isAirBlock(i1, j1, k1)
- && canBlockStay(par1World, i1, j1,
- k1)) {
- par1World.setBlock(i1, j1, k1, this,
- par1World.getBlockMetadata(
- par2, par3,
- par4),
- 2);
+ if (par1World.isAirBlock(i1, j1, k1) && canBlockStay(par1World, i1, j1, k1)) {
+ par1World.setBlock(i1, j1, k1, this, par1World.getBlockMetadata(par2, par3, par4), 2);
}
}
}
@Override
- public boolean canPlaceBlockAt(World par1World, int par2, int par3,
- int par4) {
- return super.canPlaceBlockAt(par1World, par2, par3, par4)
- && canBlockStay(par1World, par2, par3,
- par4);
+ public boolean canPlaceBlockAt(World par1World, int par2, int par3, int par4) {
+ return super.canPlaceBlockAt(par1World, par2, par3, par4) && canBlockStay(par1World, par2, par3, par4);
}
@Override
- public boolean canBlockStay(World par1World, int par2, int par3,
- int par4) {
+ public boolean canBlockStay(World par1World, int par2, int par3, int par4) {
if (par3 >= 0 && par3 < 256) {
- Block soil = par1World.getBlock(par2, par3 - 1,
- par4);
- return (soil != null && soil.canSustainPlant(
- par1World, par2, par3 - 1, par4,
- ForgeDirection.UP, this));
+ Block soil = par1World.getBlock(par2, par3 - 1, par4);
+ return (soil != null && soil.canSustainPlant(par1World, par2, par3 - 1, par4, ForgeDirection.UP, this));
} else {
return false;
}
@@ -134,8 +108,7 @@ public class BlockMysteryMushroom extends BlockFlower { @Override
@SideOnly(Side.CLIENT)
- public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs,
- List par3List) {
+ public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) {
for (int i = 0; i < 13; i++) {
par3List.add(new ItemStack(par1, 1, i));
}
@@ -148,11 +121,8 @@ public class BlockMysteryMushroom extends BlockFlower { @Override
@SideOnly(Side.CLIENT)
- public int colorMultiplier(IBlockAccess par1IBlockAccess, int par2,
- int par3, int par4) {
- return NewPacketHandler.mushroomColors[par1IBlockAccess
- .getBlockMetadata(par2, par3,
- par4)][renderPass];
+ public int colorMultiplier(IBlockAccess par1IBlockAccess, int par2, int par3, int par4) {
+ return NewPacketHandler.mushroomColors[par1IBlockAccess.getBlockMetadata(par2, par3, par4)][renderPass];
}
public static int renderPass;
@@ -164,14 +134,12 @@ public class BlockMysteryMushroom extends BlockFlower { }
@Override
- public ItemStack getPickBlock(MovingObjectPosition object,
- World par1World, int par2, int par3, int par4) {
+ public ItemStack getPickBlock(MovingObjectPosition object, World par1World, int par2, int par3, int par4) {
return new ItemStack(ModjamMod.mysteryMushroom);
}
@Override
- public Item getItemDropped(int p_149650_1_, Random p_149650_2_,
- int p_149650_3_) {
+ public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_) {
return ModjamMod.mysteryMushroom;
}
diff --git a/YWD/src/main/java/fyresmodjam/blocks/BlockPillar.java b/YWD/src/main/java/fyresmodjam/blocks/BlockPillar.java index a80d099..07eebbe 100755 --- a/YWD/src/main/java/fyresmodjam/blocks/BlockPillar.java +++ b/YWD/src/main/java/fyresmodjam/blocks/BlockPillar.java @@ -35,8 +35,7 @@ public class BlockPillar extends BlockContainer { @Override
@SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister par1IconRegister) {
- blockIcon = par1IconRegister
- .registerIcon("fyresmodjam:pillar");
+ blockIcon = par1IconRegister.registerIcon("fyresmodjam:pillar");
}
public int idDropped(int par1, Random par2Random, int par3) {
@@ -44,24 +43,19 @@ public class BlockPillar extends BlockContainer { }
@Override
- public int getDamageValue(World par1World, int par2, int par3,
- int par4) {
+ public int getDamageValue(World par1World, int par2, int par3, int par4) {
int damage = 0;
if (ConfigData.showAllPillarsInCreative) {
- int meta = par1World.getBlockMetadata(par2, par3,
- par4);
- TileEntity te = par1World.getTileEntity(par2,
- par3 - (meta == 1 ? 1 : 0), par4);
+ int meta = par1World.getBlockMetadata(par2, par3, par4);
+ TileEntity te = par1World.getTileEntity(par2, par3 - (meta == 1 ? 1 : 0), par4);
if (te != null && te instanceof TileEntityPillar) {
TileEntityPillar pte = (TileEntityPillar) te;
int i = 0;
- for (String blessingName : BlessingUtils.playerBlessings
- .keySet()) {
- if (pte.blessing.equals(
- blessingName)) {
+ for (String blessingName : BlessingUtils.playerBlessings.keySet()) {
+ if (pte.blessing.equals(blessingName)) {
damage = i + 1;
break;
}
@@ -75,65 +69,45 @@ public class BlockPillar extends BlockContainer { }
@Override
- public ItemStack getPickBlock(MovingObjectPosition object,
- World par1World, int par2, int par3, int par4) {
+ public ItemStack getPickBlock(MovingObjectPosition object, World par1World, int par2, int par3, int par4) {
return new ItemStack(ModjamMod.itemPillar);
}
@Override
- public boolean canHarvestBlock(EntityPlayer par1EntityPlayer,
- int par2) {
+ public boolean canHarvestBlock(EntityPlayer par1EntityPlayer, int par2) {
return false;
}
@Override
- public boolean onBlockActivated(World par1World, int par2,
- int par3, int par4, EntityPlayer par5EntityPlayer,
+ public boolean onBlockActivated(World par1World, int par2, int par3, int par4, EntityPlayer par5EntityPlayer,
int par6, float par7, float par8, float par9) {
- if (par1World.getBlockMetadata(par2, par3, par4)
- % 2 == 1) {
+ if (par1World.getBlockMetadata(par2, par3, par4) % 2 == 1) {
par3--;
}
TileEntity te = par1World.getTileEntity(par2, par3, par4);
- if (par5EntityPlayer.getHeldItem() == null
- || par5EntityPlayer.getHeldItem()
- .getItem() == null
- || par5EntityPlayer.getHeldItem()
- .getItemDamage() != 1
- || par5EntityPlayer.getHeldItem()
- .getItem() != ModjamMod.sceptre) {
- if (te != null && te instanceof TileEntityPillar
- && (!BlessingUtils.hasBlessing(
- par5EntityPlayer)
- || !BlessingUtils
- .hasBlessing(par5EntityPlayer,
- ((TileEntityPillar) te).blessing))) {
+ if (par5EntityPlayer.getHeldItem() == null || par5EntityPlayer.getHeldItem().getItem() == null
+ || par5EntityPlayer.getHeldItem().getItemDamage() != 1
+ || par5EntityPlayer.getHeldItem().getItem() != ModjamMod.sceptre) {
+ if (te != null && te instanceof TileEntityPillar && (!BlessingUtils.hasBlessing(par5EntityPlayer)
+ || !BlessingUtils.hasBlessing(par5EntityPlayer, ((TileEntityPillar) te).blessing))) {
boolean skip = false;
- for (int i = 0; i < par1World.loadedEntityList
- .size(); i++) {
- Entity e = (Entity) par1World.loadedEntityList
- .get(i);
+ for (int i = 0; i < par1World.loadedEntityList.size(); i++) {
+ Entity e = (Entity) par1World.loadedEntityList.get(i);
if (e instanceof EntityMob) {
- double xDiff = par2
- - e.posX;
- double yDiff = par3
- - e.posY;
- double zDiff = par4
- - e.posZ;
+ double xDiff = par2 - e.posX;
+ double yDiff = par3 - e.posY;
+ double zDiff = par4 - e.posZ;
if (Math.abs(yDiff) > 4) {
continue;
}
- double dist = Math.sqrt(
- xDiff * xDiff + yDiff
- * yDiff
- + zDiff * zDiff);
+ double dist = Math.sqrt(xDiff * xDiff + yDiff * yDiff + zDiff * zDiff);
if (dist <= 14) {
skip = true;
@@ -143,42 +117,21 @@ public class BlockPillar extends BlockContainer { if (!skip) {
if (((TileEntityPillar) te).blessing != null) {
- EntityStatHelper.giveStat(
- par5EntityPlayer,
- "Blessing",
- ((TileEntityPillar) te).blessing);
- EntityStatHelper.giveStat(
- par5EntityPlayer,
- "BlessingActive",
- false);
- EntityStatHelper.giveStat(
- par5EntityPlayer,
- "BlessingCounter",
- 0);
- EntityStatHelper.giveStat(
- par5EntityPlayer,
- "BlessingCooldown",
- 0);
+ EntityStatHelper.giveStat(par5EntityPlayer, "Blessing", ((TileEntityPillar) te).blessing);
+ EntityStatHelper.giveStat(par5EntityPlayer, "BlessingActive", false);
+ EntityStatHelper.giveStat(par5EntityPlayer, "BlessingCounter", 0);
+ EntityStatHelper.giveStat(par5EntityPlayer, "BlessingCooldown", 0);
if (!par1World.isRemote) {
- par1World.playSoundAtEntity(
- par5EntityPlayer,
- "fyresmodjam:pillarActivated",
- 1.0F,
- 1.0F);
- NewPacketHandler.SEND_MESSAGE
- .sendToPlayer(par5EntityPlayer,
- "Activated "
- + BlessingUtils.getBlessingInstance(
- ((TileEntityPillar) te).blessing)
- .customName()
- + ".");
+ par1World.playSoundAtEntity(par5EntityPlayer, "fyresmodjam:pillarActivated", 1.0F, 1.0F);
+ NewPacketHandler.SEND_MESSAGE.sendToPlayer(par5EntityPlayer, "Activated "
+ + BlessingUtils.getBlessingInstance(((TileEntityPillar) te).blessing).customName()
+ + ".");
}
}
} else if (!par1World.isRemote) {
- NewPacketHandler.SEND_MESSAGE
- .sendToPlayer(par5EntityPlayer,
- "\u00A7cCannot activate pillar with monsters nearby!");
+ NewPacketHandler.SEND_MESSAGE.sendToPlayer(par5EntityPlayer,
+ "\u00A7cCannot activate pillar with monsters nearby!");
}
}
} else if (!par1World.isRemote) {
@@ -188,10 +141,8 @@ public class BlockPillar extends BlockContainer { TileEntityPillar pte = (TileEntityPillar) te;
int i = 0;
- for (String blessingName : BlessingUtils.playerBlessings
- .keySet()) {
- if (pte.blessing.equals(
- blessingName)) {
+ for (String blessingName : BlessingUtils.playerBlessings.keySet()) {
+ if (pte.blessing.equals(blessingName)) {
damage = i + 1;
break;
}
@@ -203,15 +154,11 @@ public class BlockPillar extends BlockContainer { if (!par5EntityPlayer.capabilities.isCreativeMode) {
par5EntityPlayer.getHeldItem().stackSize--;
}
- par1World.spawnEntityInWorld(new EntityItem(
- par1World, par2 + 0.5F,
- par3 + 0.5F, par4 + 0.5F,
- new ItemStack(ModjamMod.itemPillar,
- 1, damage)));
+ par1World.spawnEntityInWorld(new EntityItem(par1World, par2 + 0.5F, par3 + 0.5F, par4 + 0.5F,
+ new ItemStack(ModjamMod.itemPillar, 1, damage)));
par1World.setBlockToAir(par2, par3, par4);
- NewPacketHandler.SEND_MESSAGE.sendToPlayer(
- par5EntityPlayer,
+ NewPacketHandler.SEND_MESSAGE.sendToPlayer(par5EntityPlayer,
"\u00A7e\u00A7oThe pillar deconstructs before you.");
}
@@ -219,71 +166,45 @@ public class BlockPillar extends BlockContainer { }
@Override
- public void onNeighborBlockChange(World par1World, int par2,
- int par3, int par4, Block par5) {
- super.onNeighborBlockChange(par1World, par2, par3, par4,
- par5);
+ public void onNeighborBlockChange(World par1World, int par2, int par3, int par4, Block par5) {
+ super.onNeighborBlockChange(par1World, par2, par3, par4, par5);
- if (!par1World.isRemote
- && !WorldGenTrapsTowersAndMore.genning) {
- int i1 = par1World.getBlockMetadata(par2, par3,
- par4);
+ if (!par1World.isRemote && !WorldGenTrapsTowersAndMore.genning) {
+ int i1 = par1World.getBlockMetadata(par2, par3, par4);
if (i1 % 2 == 0) {
- if (par1World.isAirBlock(par2, par3 + 1,
- par4)
- || par1World.getBlock(par2,
- par3 + 1,
- par4) != par1World
- .getBlock(par2, par3,
- par4)) {
- par1World.setBlockToAir(par2, par3,
- par4);
+ if (par1World.isAirBlock(par2, par3 + 1, par4)
+ || par1World.getBlock(par2, par3 + 1, par4) != par1World.getBlock(par2, par3, par4)) {
+ par1World.setBlockToAir(par2, par3, par4);
}
- } else if (par1World.isAirBlock(par2, par3 - 1,
- par4)
- || par1World.getBlock(par2,
- par3 - 1,
- par4) != par1World
- .getBlock(par2, par3,
- par4)) {
+ } else if (par1World.isAirBlock(par2, par3 - 1, par4)
+ || par1World.getBlock(par2, par3 - 1, par4) != par1World.getBlock(par2, par3, par4)) {
par1World.setBlockToAir(par2, par3, par4);
}
}
}
@Override
- public boolean canPlaceBlockAt(World par1World, int par2, int par3,
- int par4) {
+ public boolean canPlaceBlockAt(World par1World, int par2, int par3, int par4) {
return par3 >= 255 ? false
- : (super.canPlaceBlockAt(par1World, par2,
- par3, par4)
- && super.canPlaceBlockAt(
- par1World,
- par2,
- par3 + 1,
- par4));
+ : (super.canPlaceBlockAt(par1World, par2, par3, par4)
+ && super.canPlaceBlockAt(par1World, par2, par3 + 1, par4));
}
@Override
- public void setBlockBoundsBasedOnState(
- IBlockAccess par1IBlockAccess, int par2, int par3,
- int par4) {
- int l = par1IBlockAccess.getBlockMetadata(par2, par3,
- par4);
+ public void setBlockBoundsBasedOnState(IBlockAccess par1IBlockAccess, int par2, int par3, int par4) {
+ int l = par1IBlockAccess.getBlockMetadata(par2, par3, par4);
if (l % 2 == 0) {
setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 2.0F, 1.0F);
} else {
- setBlockBounds(0.0F, -1.0F, 0.0F, 1.0F, 1.0F,
- 1.0F);
+ setBlockBounds(0.0F, -1.0F, 0.0F, 1.0F, 1.0F, 1.0F);
}
}
@Override
@SideOnly(Side.CLIENT)
- public boolean shouldSideBeRendered(IBlockAccess par1IBlockAccess,
- int par2, int par3, int par4, int par5) {
+ public boolean shouldSideBeRendered(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) {
return false;
}
@@ -308,16 +229,13 @@ public class BlockPillar extends BlockContainer { }
@Override
- public void onBlockHarvested(World par1World, int par2, int par3,
- int par4, int par5,
+ public void onBlockHarvested(World par1World, int par2, int par3, int par4, int par5,
EntityPlayer par6EntityPlayer) {
- if (par6EntityPlayer.capabilities.isCreativeMode
- && par5 >= 2 && par1World.getBlock(par2,
- par3 - 1, par4) == this) {
+ if (par6EntityPlayer.capabilities.isCreativeMode && par5 >= 2
+ && par1World.getBlock(par2, par3 - 1, par4) == this) {
par1World.setBlockToAir(par2, par3 - 1, par4);
} else {
- super.onBlockHarvested(par1World, par2, par3, par4,
- par5, par6EntityPlayer);
+ super.onBlockHarvested(par1World, par2, par3, par4, par5, par6EntityPlayer);
}
}
@@ -331,21 +249,14 @@ public class BlockPillar extends BlockContainer { return block.getLightValue(world, x, y, z);
}
- if (ConfigData.pillarGlow && net.minecraft.client.Minecraft
- .getMinecraft().theWorld != null
- && net.minecraft.client.Minecraft
- .getMinecraft().theWorld.isRemote) {
- EntityPlayer player = net.minecraft.client.Minecraft
- .getMinecraft().thePlayer;
-
- boolean blessingMatches = te instanceof TileEntityPillar
- && ((TileEntityPillar) te).blessing != null
- && BlessingUtils.hasBlessing(
- player,
- ((TileEntityPillar) te).blessing);
-
- if (player != null && te != null
- && blessingMatches) {
+ if (ConfigData.pillarGlow && net.minecraft.client.Minecraft.getMinecraft().theWorld != null
+ && net.minecraft.client.Minecraft.getMinecraft().theWorld.isRemote) {
+ EntityPlayer player = net.minecraft.client.Minecraft.getMinecraft().thePlayer;
+
+ boolean blessingMatches = te instanceof TileEntityPillar && ((TileEntityPillar) te).blessing != null
+ && BlessingUtils.hasBlessing(player, ((TileEntityPillar) te).blessing);
+
+ if (player != null && te != null && blessingMatches) {
return 4;
}
}
diff --git a/YWD/src/main/java/fyresmodjam/blocks/BlockTrap.java b/YWD/src/main/java/fyresmodjam/blocks/BlockTrap.java index 1de921a..cecfa63 100755 --- a/YWD/src/main/java/fyresmodjam/blocks/BlockTrap.java +++ b/YWD/src/main/java/fyresmodjam/blocks/BlockTrap.java @@ -53,8 +53,7 @@ public class BlockTrap extends BlockContainer implements IShearable { @Override
@SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister par1IconRegister) {
- blockIcon = par1IconRegister
- .registerIcon("fyresmodjam:spikes2");
+ blockIcon = par1IconRegister.registerIcon("fyresmodjam:spikes2");
}
public int idDropped(int par1, Random par2Random, int par3) {
@@ -62,31 +61,24 @@ public class BlockTrap extends BlockContainer implements IShearable { }
@Override
- public ItemStack getPickBlock(MovingObjectPosition object,
- World par1World, int par2, int par3, int par4) {
+ public ItemStack getPickBlock(MovingObjectPosition object, World par1World, int par2, int par3, int par4) {
return new ItemStack(ModjamMod.blockTrap);
}
@Override
- public boolean canHarvestBlock(EntityPlayer par1EntityPlayer,
- int par2) {
+ public boolean canHarvestBlock(EntityPlayer par1EntityPlayer, int par2) {
return false;
}
@Override
- public boolean onBlockActivated(World par1World, int par2,
- int par3, int par4, EntityPlayer par5EntityPlayer,
+ public boolean onBlockActivated(World par1World, int par2, int par3, int par4, EntityPlayer par5EntityPlayer,
int par6, float par7, float par8, float par9) {
if (par5EntityPlayer.getHeldItem() == null) {
- TileEntity te = par1World.getTileEntity(par2, par3,
- par4);
+ TileEntity te = par1World.getTileEntity(par2, par3, par4);
- if (!par5EntityPlayer.isSneaking() && te != null
- && te instanceof TileEntityTrap
+ if (!par5EntityPlayer.isSneaking() && te != null && te instanceof TileEntityTrap
&& ((TileEntityTrap) te).placedBy != null
- && ((TileEntityTrap) te).placedBy
- .equals(par5EntityPlayer
- .getCommandSenderName())) {
+ && ((TileEntityTrap) te).placedBy.equals(par5EntityPlayer.getCommandSenderName())) {
if (!par1World.isRemote) {
((TileEntityTrap) te).setting++;
if (((TileEntityTrap) te).setting >= TileEntityTrap.settings.length) {
@@ -95,18 +87,12 @@ public class BlockTrap extends BlockContainer implements IShearable { te.markDirty();
- NewPacketHandler.SEND_MESSAGE
- .sendToPlayer(par5EntityPlayer,
- "\u00A7e\u00A7oSet to: "
- + TileEntityTrap.settings[((TileEntityTrap) te).setting]
- + ".");
+ NewPacketHandler.SEND_MESSAGE.sendToPlayer(par5EntityPlayer,
+ "\u00A7e\u00A7oSet to: " + TileEntityTrap.settings[((TileEntityTrap) te).setting] + ".");
}
} else if (par1World.isRemote) {
- NewPacketHandler.DISARM_TRAP.sendToServer(
- par2, par3, par4,
- BlessingUtils.hasBlessing(
- par5EntityPlayer,
- "BlessingMechanic"));
+ NewPacketHandler.DISARM_TRAP.sendToServer(par2, par3, par4,
+ BlessingUtils.hasBlessing(par5EntityPlayer, "BlessingMechanic"));
}
}
@@ -115,8 +101,7 @@ public class BlockTrap extends BlockContainer implements IShearable { @Override
@SideOnly(Side.CLIENT)
- public boolean shouldSideBeRendered(IBlockAccess par1IBlockAccess,
- int par2, int par3, int par4, int par5) {
+ public boolean shouldSideBeRendered(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) {
return false;
}
@@ -141,164 +126,88 @@ public class BlockTrap extends BlockContainer implements IShearable { }
@Override
- public void addCollisionBoxesToList(World par1World, int par2,
- int par3, int par4,
- AxisAlignedBB par5AxisAlignedBB, List par6List,
- Entity par7Entity) {
+ public void addCollisionBoxesToList(World par1World, int par2, int par3, int par4, AxisAlignedBB par5AxisAlignedBB,
+ List par6List, Entity par7Entity) {
}
@Override
- public AxisAlignedBB getCollisionBoundingBoxFromPool(
- World par1World, int par2, int par3, int par4) {
- return super.getCollisionBoundingBoxFromPool(par1World,
- par2, par3, par4);
+ public AxisAlignedBB getCollisionBoundingBoxFromPool(World par1World, int par2, int par3, int par4) {
+ return super.getCollisionBoundingBoxFromPool(par1World, par2, par3, par4);
}
@Override
@SideOnly(Side.CLIENT)
- public MovingObjectPosition collisionRayTrace(World par1World,
- int par2, int par3, int par4, Vec3 par5Vec3,
+ public MovingObjectPosition collisionRayTrace(World par1World, int par2, int par3, int par4, Vec3 par5Vec3,
Vec3 par6Vec3) {
EntityPlayer player = Minecraft.getMinecraft().thePlayer;
TileEntity te = par1World.getTileEntity(par2, par3, par4);
return (player != null && te instanceof TileEntityTrap
- && (((TileEntityTrap) te).placedBy != null
- || !NewPacketHandler.trapsDisabled)
- && (player.getCommandSenderName().equals(
- ((TileEntityTrap) te).placedBy)
- || player.isSneaking()
- || (BlessingUtils
- .hasBlessing(player,
- "MarkScouting")))) ? super.collisionRayTrace(
- par1World,
- par2,
- par3,
- par4,
- par5Vec3,
- par6Vec3)
- : null;
+ && (((TileEntityTrap) te).placedBy != null || !NewPacketHandler.trapsDisabled)
+ && (player.getCommandSenderName().equals(((TileEntityTrap) te).placedBy) || player.isSneaking()
+ || (BlessingUtils.hasBlessing(player, "MarkScouting"))))
+ ? super.collisionRayTrace(par1World, par2, par3, par4, par5Vec3, par6Vec3)
+ : null;
}
@Override
- public void onEntityCollidedWithBlock(World par1World, int par2,
- int par3, int par4, Entity par5Entity) {
+ public void onEntityCollidedWithBlock(World par1World, int par2, int par3, int par4, Entity par5Entity) {
TileEntity te = par1World.getTileEntity(par2, par3, par4);
boolean b1 = (((TileEntityTrap) te).placedBy == null
- || !par5Entity.getCommandSenderName()
- .equals(((TileEntityTrap) te).placedBy));
+ || !par5Entity.getCommandSenderName().equals(((TileEntityTrap) te).placedBy));
boolean b2 = ((TileEntityTrap) te).setting != 3
- && (!(par5Entity instanceof EntityPlayer)
- || ((TileEntityTrap) te).setting < 2);
- boolean b3 = (ConfigData.spawnTraps
- || ((TileEntityTrap) te).placedBy != null);
- boolean b4 = ((par5Entity instanceof EntityPlayer
- && !((EntityPlayer) par5Entity).capabilities.isCreativeMode)
+ && (!(par5Entity instanceof EntityPlayer) || ((TileEntityTrap) te).setting < 2);
+ boolean b3 = (ConfigData.spawnTraps || ((TileEntityTrap) te).placedBy != null);
+ boolean b4 = ((par5Entity instanceof EntityPlayer && !((EntityPlayer) par5Entity).capabilities.isCreativeMode)
|| par5Entity instanceof EntityMob);
- if (!par1World.isRemote && par5Entity.ridingEntity == null
- && te != null
- && te instanceof TileEntityTrap && b1 && b2
- && b3 && b4) {
+ if (!par1World.isRemote && par5Entity.ridingEntity == null && te != null && te instanceof TileEntityTrap && b1
+ && b2 && b3 && b4) {
- int type = par1World.getBlockMetadata(par2, par3,
- par4);
+ int type = par1World.getBlockMetadata(par2, par3, par4);
boolean scout = BlessingUtils.hasBlessing(par5Entity, "MarkScouting");
if (par5Entity instanceof EntityPlayer) {
if (type % trapTypes == 0) {
- par5Entity.attackEntityFrom(
- DamageSource.cactus,
- 8.0F + (scout ? 2.0F
- : 0.0F));
- if (ModjamMod.r.nextInt(8 - (scout
- ? 2
- : 0)) == 0) {
+ par5Entity.attackEntityFrom(DamageSource.cactus, 8.0F + (scout ? 2.0F : 0.0F));
+ if (ModjamMod.r.nextInt(8 - (scout ? 2 : 0)) == 0) {
((EntityLivingBase) par5Entity)
- .addPotionEffect(
- new PotionEffect(
- Potion.poison.id,
- 100 + (scout ? 25
- : 0),
- 1));
+ .addPotionEffect(new PotionEffect(Potion.poison.id, 100 + (scout ? 25 : 0), 1));
}
} else if (type % trapTypes == 1) {
if (!par5Entity.isBurning()) {
- par5Entity.setFire(10
- + (scout ? 2
- : 0));
+ par5Entity.setFire(10 + (scout ? 2 : 0));
}
} else if (type % trapTypes == 2) {
((EntityLivingBase) par5Entity)
- .addPotionEffect(
- new PotionEffect(
- Potion.blindness.id,
- 200 + (scout ? 50
- : 0),
- 1));
+ .addPotionEffect(new PotionEffect(Potion.blindness.id, 200 + (scout ? 50 : 0), 1));
((EntityLivingBase) par5Entity)
- .addPotionEffect(
- new PotionEffect(
- Potion.moveSlowdown.id,
- 200 + (scout ? 50
- : 0),
- 1));
+ .addPotionEffect(new PotionEffect(Potion.moveSlowdown.id, 200 + (scout ? 50 : 0), 1));
}
- if (CommonTickHandler.worldData
- .getDisadvantage()
- .equals("Explosive Traps")) {
- par5Entity.worldObj.setBlockToAir(
- par2, par3, par4);
- par5Entity.worldObj
- .createExplosion(
- null,
- par2 + 0.5F,
- par3 + 0.5F,
- par4 + 0.5F,
- 1.33F,
- true);
+ if (CommonTickHandler.worldData.getDisadvantage().equals("Explosive Traps")) {
+ par5Entity.worldObj.setBlockToAir(par2, par3, par4);
+ par5Entity.worldObj.createExplosion(null, par2 + 0.5F, par3 + 0.5F, par4 + 0.5F, 1.33F, true);
}
par1World.setBlockToAir(par2, par3, par4);
- NewPacketHandler.SEND_MESSAGE.sendToPlayer(
- (EntityPlayer) par5Entity,
- "\u00A7c\u00A7oYou triggered a "
- + ItemTrap.names[type
- % trapTypes].toLowerCase()
- + "!");
+ NewPacketHandler.SEND_MESSAGE.sendToPlayer((EntityPlayer) par5Entity,
+ "\u00A7c\u00A7oYou triggered a " + ItemTrap.names[type % trapTypes].toLowerCase() + "!");
} else {
if (type % trapTypes == 0) {
- par5Entity.attackEntityFrom(
- DamageSource.cactus,
- 2.0F);
+ par5Entity.attackEntityFrom(DamageSource.cactus, 2.0F);
if (ModjamMod.r.nextInt(32) == 0) {
- ((EntityLivingBase) par5Entity)
- .addPotionEffect(
- new PotionEffect(
- Potion.poison.id,
- 100,
- 1));
+ ((EntityLivingBase) par5Entity).addPotionEffect(new PotionEffect(Potion.poison.id, 100, 1));
}
} else if (type % trapTypes == 1) {
if (!par5Entity.isBurning()) {
par5Entity.setFire(5);
}
} else if (type % trapTypes == 2) {
- ((EntityLivingBase) par5Entity)
- .addPotionEffect(
- new PotionEffect(
- Potion.blindness.id,
- 100,
- 1));
- ((EntityLivingBase) par5Entity)
- .addPotionEffect(
- new PotionEffect(
- Potion.moveSlowdown.id,
- 100,
- 1));
+ ((EntityLivingBase) par5Entity).addPotionEffect(new PotionEffect(Potion.blindness.id, 100, 1));
+ ((EntityLivingBase) par5Entity).addPotionEffect(new PotionEffect(Potion.moveSlowdown.id, 100, 1));
}
}
@@ -306,42 +215,28 @@ public class BlockTrap extends BlockContainer implements IShearable { }
@Override
- public void onNeighborBlockChange(World par1World, int par2,
- int par3, int par4, Block par5) {
- super.onNeighborBlockChange(par1World, par2, par3, par4,
- par5);
-
- if (!par1World.isRemote && !par1World.isSideSolid(par2,
- par3 - 1, par4, ForgeDirection.SOUTH,
- true)) {
+ public void onNeighborBlockChange(World par1World, int par2, int par3, int par4, Block par5) {
+ super.onNeighborBlockChange(par1World, par2, par3, par4, par5);
+
+ if (!par1World.isRemote && !par1World.isSideSolid(par2, par3 - 1, par4, ForgeDirection.SOUTH, true)) {
par1World.setBlockToAir(par2, par3, par4);
- TileEntity te = par1World.getTileEntity(par2, par3,
- par4);
- if ((ConfigData.spawnTraps || (te != null
- && te instanceof TileEntityTrap
- && ((TileEntityTrap) te).placedBy != null))
+ TileEntity te = par1World.getTileEntity(par2, par3, par4);
+ if ((ConfigData.spawnTraps
+ || (te != null && te instanceof TileEntityTrap && ((TileEntityTrap) te).placedBy != null))
&& CommonTickHandler.worldData != null
- && CommonTickHandler.worldData
- .getDisadvantage()
- .equals("Explosive Traps")) {
- par1World.createExplosion(null,
- par2 + 0.5F, par3 + 0.5F,
- par4 + 0.5F, 1.33F, true);
+ && CommonTickHandler.worldData.getDisadvantage().equals("Explosive Traps")) {
+ par1World.createExplosion(null, par2 + 0.5F, par3 + 0.5F, par4 + 0.5F, 1.33F, true);
}
}
}
@Override
- public boolean isReplaceable(IBlockAccess world, int x, int y,
- int z) {
+ public boolean isReplaceable(IBlockAccess world, int x, int y, int z) {
TileEntity te = world.getTileEntity(x, y, z);
return super.isReplaceable(world, x, y, z)
- || (((world instanceof World
- && ((World) world).isRemote)
- ? NewPacketHandler.trapsDisabled
- : !ConfigData.spawnTraps)
- && (te == null || !(te instanceof TileEntityTrap)
- || ((TileEntityTrap) te).placedBy == null));
+ || (((world instanceof World && ((World) world).isRemote) ? NewPacketHandler.trapsDisabled
+ : !ConfigData.spawnTraps)
+ && (te == null || !(te instanceof TileEntityTrap) || ((TileEntityTrap) te).placedBy == null));
}
@Override
@@ -352,9 +247,7 @@ public class BlockTrap extends BlockContainer implements IShearable { @Override
public boolean canPlaceBlockAt(World world, int x, int y, int z) {
- return super.canPlaceBlockAt(world, x, y, z)
- && (y == 0 || world.getBlock(x, y - 1,
- z) != ModjamMod.blockTrap);
+ return super.canPlaceBlockAt(world, x, y, z) && (y == 0 || world.getBlock(x, y - 1, z) != ModjamMod.blockTrap);
}
@Override
@@ -364,63 +257,48 @@ public class BlockTrap extends BlockContainer implements IShearable { @Override
@SideOnly(Side.CLIENT)
- public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs,
- List par3List) {
+ public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) {
for (int i = 0; i < trapTypes; i++) {
par3List.add(new ItemStack(par1, 1, i));
}
}
@Override
- public void onBlockPlacedBy(World par1World, int par2, int par3,
- int par4, EntityLivingBase par5EntityLivingBase,
+ public void onBlockPlacedBy(World par1World, int par2, int par3, int par4, EntityLivingBase par5EntityLivingBase,
ItemStack par6ItemStack) {
- super.onBlockPlacedBy(par1World, par2, par3, par4,
- par5EntityLivingBase, par6ItemStack);
+ super.onBlockPlacedBy(par1World, par2, par3, par4, par5EntityLivingBase, par6ItemStack);
- par1World.setBlockMetadataWithNotify(par2, par3, par4,
- par6ItemStack.getItemDamage(), 0);
+ par1World.setBlockMetadataWithNotify(par2, par3, par4, par6ItemStack.getItemDamage(), 0);
- if (par5EntityLivingBase != null
- && par5EntityLivingBase instanceof EntityPlayer) {
+ if (par5EntityLivingBase != null && par5EntityLivingBase instanceof EntityPlayer) {
EntityPlayer player = (EntityPlayer) par5EntityLivingBase;
- if (!player.capabilities.isCreativeMode
- || NewPacketHandler.trapsDisabled) {
- TileEntity te = par1World.getTileEntity(
- par2, par3, par4);
+ if (!player.capabilities.isCreativeMode || NewPacketHandler.trapsDisabled) {
+ TileEntity te = par1World.getTileEntity(par2, par3, par4);
if (te != null && te instanceof TileEntityTrap) {
- ((TileEntityTrap) te).placedBy = player
- .getCommandSenderName();
+ ((TileEntityTrap) te).placedBy = player.getCommandSenderName();
}
}
}
}
@Override
- public boolean isShearable(ItemStack item,
- IBlockAccess blockAccess, int x, int y, int z) {
+ public boolean isShearable(ItemStack item, IBlockAccess blockAccess, int x, int y, int z) {
return true;
}
@Override
- public ArrayList<ItemStack> onSheared(ItemStack item,
- IBlockAccess blockAccess, int x, int y, int z,
- int fortune) {
+ public ArrayList<ItemStack> onSheared(ItemStack item, IBlockAccess blockAccess, int x, int y, int z, int fortune) {
if (blockAccess instanceof World) {
World world = (World) blockAccess;
world.setBlockToAir(x, y, z);
if (!world.isRemote) {
- MinecraftServer server = FMLCommonHandler
- .instance()
- .getMinecraftServerInstance();
+ MinecraftServer server = FMLCommonHandler.instance().getMinecraftServerInstance();
for (int i = 0; i < server.worldServers.length; i++) {
- WorldServer s = FMLCommonHandler
- .instance()
- .getMinecraftServerInstance().worldServers[i];
+ WorldServer s = FMLCommonHandler.instance().getMinecraftServerInstance().worldServers[i];
if (s == null) {
continue;
@@ -433,11 +311,8 @@ public class BlockTrap extends BlockContainer implements IShearable { EntityPlayer player = (EntityPlayer) o;
- if (item.equals(player
- .getHeldItem())) {
- NewPacketHandler.SEND_MESSAGE
- .sendToPlayer(player,
- "\u00A7e\u00A7oYou disarmed the trap.");
+ if (item.equals(player.getHeldItem())) {
+ NewPacketHandler.SEND_MESSAGE.sendToPlayer(player, "\u00A7e\u00A7oYou disarmed the trap.");
}
}
}
@@ -450,17 +325,10 @@ public class BlockTrap extends BlockContainer implements IShearable { }
@Override
- public float getPlayerRelativeBlockHardness(
- EntityPlayer par1EntityPlayer, World par2World,
- int par3, int par4, int par5) {
- return (par1EntityPlayer.getHeldItem() != null
- && par1EntityPlayer.getHeldItem()
- .getItem() == Items.shears)
- ? 1.0F
- : getBlockHardness(
- par2World,
- par3,
- par4,
- par5);
+ public float getPlayerRelativeBlockHardness(EntityPlayer par1EntityPlayer, World par2World, int par3, int par4,
+ int par5) {
+ return (par1EntityPlayer.getHeldItem() != null && par1EntityPlayer.getHeldItem().getItem() == Items.shears)
+ ? 1.0F
+ : getBlockHardness(par2World, par3, par4, par5);
}
}
|