aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/common/blocks
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/common/blocks')
-rw-r--r--src/main/java/common/blocks/Block_IchorJar.java25
-rw-r--r--src/main/java/common/blocks/Block_LargeHexPlate.java6
-rw-r--r--src/main/java/common/blocks/Block_TFFTStorageField.java6
-rw-r--r--src/main/java/common/blocks/Block_ThaumiumReinforcedJar.java25
4 files changed, 25 insertions, 37 deletions
diff --git a/src/main/java/common/blocks/Block_IchorJar.java b/src/main/java/common/blocks/Block_IchorJar.java
index 7a8596eb0d..a82f9862f0 100644
--- a/src/main/java/common/blocks/Block_IchorJar.java
+++ b/src/main/java/common/blocks/Block_IchorJar.java
@@ -80,7 +80,7 @@ public class Block_IchorJar extends BlockJar {
@Override
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float f1, float f2,
- float f3) {
+ float f3) {
// Call parent method to handle jar emptying, labels stuff etc
super.onBlockActivated(world, x, y, z, player, side, f1, f2, f3);
// Interact with Essentia Phials if the player holds one
@@ -129,12 +129,7 @@ public class Block_IchorJar extends BlockJar {
// Drop on ground if there's no inventory space
if (!player.inventory.addItemStackToInventory(filledPhial)) {
world.spawnEntityInWorld(
- new EntityItem(
- world,
- (float) x + 0.5F,
- (float) y + 0.5F,
- (float) z + 0.5F,
- filledPhial));
+ new EntityItem(world, (float) x + 0.5F, (float) y + 0.5F, (float) z + 0.5F, filledPhial));
}
world.playSoundAtEntity(player, "game.neutral.swim", 0.25F, 1.0F);
@@ -159,12 +154,12 @@ public class Block_IchorJar extends BlockJar {
// Drop on ground if there's no inventory space
if (!player.inventory.addItemStackToInventory(new ItemStack(ConfigItems.itemEssence, 1, 0))) {
world.spawnEntityInWorld(
- new EntityItem(
- world,
- (float) x + 0.5F,
- (float) y + 0.5F,
- (float) z + 0.5F,
- new ItemStack(ConfigItems.itemEssence, 1, 0)));
+ new EntityItem(
+ world,
+ (float) x + 0.5F,
+ (float) y + 0.5F,
+ (float) z + 0.5F,
+ new ItemStack(ConfigItems.itemEssence, 1, 0)));
}
world.playSoundAtEntity(player, "game.neutral.swim", 0.25F, 1.0F);
@@ -192,7 +187,7 @@ public class Block_IchorJar extends BlockJar {
}
private void breakBlockWarpy(World world, int x, int y, int z, int fillAmount, int iterations,
- float explosionStrength) {
+ float explosionStrength) {
if (fillAmount > 0) {
// Create a decent explosion in the center of the block (TNT has strength 4.0F)
world.createExplosion(null, x + 0.5D, y + 0.5D, z + 0.5D, explosionStrength, false);
@@ -226,7 +221,7 @@ public class Block_IchorJar extends BlockJar {
@Override
public void onBlockHarvested(World par1World, int par2, int par3, int par4, int par5,
- EntityPlayer par6EntityPlayer) {}
+ EntityPlayer par6EntityPlayer) {}
@Override
public boolean canDropFromExplosion(Explosion e) {
diff --git a/src/main/java/common/blocks/Block_LargeHexPlate.java b/src/main/java/common/blocks/Block_LargeHexPlate.java
index 9af1d22bc4..ac8174ff34 100644
--- a/src/main/java/common/blocks/Block_LargeHexPlate.java
+++ b/src/main/java/common/blocks/Block_LargeHexPlate.java
@@ -43,11 +43,11 @@ public class Block_LargeHexPlate extends Block {
@Override
public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) {
final int xMod = x >= 0 ? Math.abs(x % BATCH_SIZE)
- : Math.abs((Math.abs(x) % BATCH_SIZE) - BATCH_SIZE) % BATCH_SIZE;
+ : Math.abs((Math.abs(x) % BATCH_SIZE) - BATCH_SIZE) % BATCH_SIZE;
final int yMod = y >= 0 ? Math.abs(y % BATCH_SIZE)
- : Math.abs((Math.abs(y) % BATCH_SIZE) - BATCH_SIZE) % BATCH_SIZE;
+ : Math.abs((Math.abs(y) % BATCH_SIZE) - BATCH_SIZE) % BATCH_SIZE;
final int zMod = z >= 0 ? Math.abs(z % BATCH_SIZE)
- : Math.abs((Math.abs(z) % BATCH_SIZE) - BATCH_SIZE) % BATCH_SIZE;
+ : Math.abs((Math.abs(z) % BATCH_SIZE) - BATCH_SIZE) % BATCH_SIZE;
if (side == 0 || side == 1) {
return parts[xMod][zMod];
diff --git a/src/main/java/common/blocks/Block_TFFTStorageField.java b/src/main/java/common/blocks/Block_TFFTStorageField.java
index 46ecd8ee62..069dd40dca 100644
--- a/src/main/java/common/blocks/Block_TFFTStorageField.java
+++ b/src/main/java/common/blocks/Block_TFFTStorageField.java
@@ -51,10 +51,8 @@ public class Block_TFFTStorageField extends BaseGTUpdateableBlock {
// I guess glodblock won't mind
static {
GT_Utility.addTexturePage((byte) 12);
- Textures.BlockIcons.setCasingTexture(
- (byte) 12,
- (byte) 127,
- TextureFactory.of(Block_TFFTStorageField.TFFTCasingIcon.INSTANCE));
+ Textures.BlockIcons
+ .setCasingTexture((byte) 12, (byte) 127, TextureFactory.of(Block_TFFTStorageField.TFFTCasingIcon.INSTANCE));
}
private Block_TFFTStorageField() {
diff --git a/src/main/java/common/blocks/Block_ThaumiumReinforcedJar.java b/src/main/java/common/blocks/Block_ThaumiumReinforcedJar.java
index e089e2a1c2..3c91ac6d0d 100644
--- a/src/main/java/common/blocks/Block_ThaumiumReinforcedJar.java
+++ b/src/main/java/common/blocks/Block_ThaumiumReinforcedJar.java
@@ -92,7 +92,7 @@ public class Block_ThaumiumReinforcedJar extends BlockJar {
}
private void breakBlockWarpy(World world, int x, int y, int z, int fillAmount, int iterations,
- float explosionStrength) {
+ float explosionStrength) {
if (fillAmount > 0) {
// Create a decent explosion in the center of the block (TNT has strength 4.0F)
world.createExplosion(null, x + 0.5D, y + 0.5D, z + 0.5D, explosionStrength, false);
@@ -121,7 +121,7 @@ public class Block_ThaumiumReinforcedJar extends BlockJar {
@Override
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float f1, float f2,
- float f3) {
+ float f3) {
// Call parent method to handle jar emptying, labels stuff etc
super.onBlockActivated(world, x, y, z, player, side, f1, f2, f3);
// Interact with Essentia Phials if the player holds one
@@ -170,12 +170,7 @@ public class Block_ThaumiumReinforcedJar extends BlockJar {
// Drop on ground if there's no inventory space
if (!player.inventory.addItemStackToInventory(filledPhial)) {
world.spawnEntityInWorld(
- new EntityItem(
- world,
- (float) x + 0.5F,
- (float) y + 0.5F,
- (float) z + 0.5F,
- filledPhial));
+ new EntityItem(world, (float) x + 0.5F, (float) y + 0.5F, (float) z + 0.5F, filledPhial));
}
world.playSoundAtEntity(player, "game.neutral.swim", 0.25F, 1.0F);
@@ -200,12 +195,12 @@ public class Block_ThaumiumReinforcedJar extends BlockJar {
// Drop on ground if there's no inventory space
if (!player.inventory.addItemStackToInventory(new ItemStack(ConfigItems.itemEssence, 1, 0))) {
world.spawnEntityInWorld(
- new EntityItem(
- world,
- (float) x + 0.5F,
- (float) y + 0.5F,
- (float) z + 0.5F,
- new ItemStack(ConfigItems.itemEssence, 1, 0)));
+ new EntityItem(
+ world,
+ (float) x + 0.5F,
+ (float) y + 0.5F,
+ (float) z + 0.5F,
+ new ItemStack(ConfigItems.itemEssence, 1, 0)));
}
world.playSoundAtEntity(player, "game.neutral.swim", 0.25F, 1.0F);
@@ -248,7 +243,7 @@ public class Block_ThaumiumReinforcedJar extends BlockJar {
@Override
public void onBlockHarvested(World par1World, int par2, int par3, int par4, int par5,
- EntityPlayer par6EntityPlayer) {}
+ EntityPlayer par6EntityPlayer) {}
@Override
public boolean canDropFromExplosion(Explosion e) {