diff options
| author | Raven Szewczyk <git@eigenraven.me> | 2023-02-07 10:08:13 +0000 |
|---|---|---|
| committer | Raven Szewczyk <git@eigenraven.me> | 2023-02-07 10:08:13 +0000 |
| commit | ddd9040627f1fc7ace5cd7fd1af7e1a9720016bd (patch) | |
| tree | 9932fba5af9b14e5e4d75d0bc02c73022212c479 /src/main/java/common/blocks | |
| parent | c9bae478b42acbbc96a4631226c3b19a99db1fc7 (diff) | |
| download | GT5-Unofficial-ddd9040627f1fc7ace5cd7fd1af7e1a9720016bd.tar.gz GT5-Unofficial-ddd9040627f1fc7ace5cd7fd1af7e1a9720016bd.tar.bz2 GT5-Unofficial-ddd9040627f1fc7ace5cd7fd1af7e1a9720016bd.zip | |
Apply spotless
Diffstat (limited to 'src/main/java/common/blocks')
18 files changed, 170 insertions, 121 deletions
diff --git a/src/main/java/common/blocks/BaseGTUpdateableBlock.java b/src/main/java/common/blocks/BaseGTUpdateableBlock.java index 77ee67469f..ef61327dd7 100644 --- a/src/main/java/common/blocks/BaseGTUpdateableBlock.java +++ b/src/main/java/common/blocks/BaseGTUpdateableBlock.java @@ -1,6 +1,5 @@ package common.blocks; -import gregtech.api.GregTech_API; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.Entity; @@ -8,10 +7,11 @@ import net.minecraft.entity.EnumCreatureType; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import gregtech.api.GregTech_API; + /** - * Any blocks that are used as structure parts for GregTech multi machines - * have to inherit from this class. Otherwise the checkMachine() method - * that verifies a machine's structure won't be called correctly. + * Any blocks that are used as structure parts for GregTech multi machines have to inherit from this class. Otherwise + * the checkMachine() method that verifies a machine's structure won't be called correctly. */ public abstract class BaseGTUpdateableBlock extends Block { diff --git a/src/main/java/common/blocks/Block_BeamTransmitter.java b/src/main/java/common/blocks/Block_BeamTransmitter.java index be29bde3fd..9ed0233322 100644 --- a/src/main/java/common/blocks/Block_BeamTransmitter.java +++ b/src/main/java/common/blocks/Block_BeamTransmitter.java @@ -1,14 +1,16 @@ package common.blocks; -import common.tileentities.TE_BeamTransmitter; -import cpw.mods.fml.common.registry.GameRegistry; import kekztech.KekzCore; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import common.tileentities.TE_BeamTransmitter; +import cpw.mods.fml.common.registry.GameRegistry; + public class Block_BeamTransmitter extends Block { private static final Block_BeamTransmitter INSTANCE = new Block_BeamTransmitter(); diff --git a/src/main/java/common/blocks/Block_ControlRod.java b/src/main/java/common/blocks/Block_ControlRod.java index 9849816a2a..3cbd544d50 100644 --- a/src/main/java/common/blocks/Block_ControlRod.java +++ b/src/main/java/common/blocks/Block_ControlRod.java @@ -1,11 +1,13 @@ package common.blocks; -import cpw.mods.fml.common.registry.GameRegistry; import kekztech.KekzCore; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; +import cpw.mods.fml.common.registry.GameRegistry; + public class Block_ControlRod extends BaseGTUpdateableBlock { private static final Block_ControlRod instance = new Block_ControlRod(); diff --git a/src/main/java/common/blocks/Block_GDCUnit.java b/src/main/java/common/blocks/Block_GDCUnit.java index c86a55f200..ebf2714d61 100644 --- a/src/main/java/common/blocks/Block_GDCUnit.java +++ b/src/main/java/common/blocks/Block_GDCUnit.java @@ -1,11 +1,13 @@ package common.blocks; -import cpw.mods.fml.common.registry.GameRegistry; import kekztech.KekzCore; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; +import cpw.mods.fml.common.registry.GameRegistry; + public class Block_GDCUnit extends BaseGTUpdateableBlock { private static final Block_GDCUnit instance = new Block_GDCUnit(); diff --git a/src/main/java/common/blocks/Block_IchorJar.java b/src/main/java/common/blocks/Block_IchorJar.java index e7cf3c77eb..88449b7e98 100644 --- a/src/main/java/common/blocks/Block_IchorJar.java +++ b/src/main/java/common/blocks/Block_IchorJar.java @@ -1,14 +1,9 @@ package common.blocks; -import common.itemBlocks.IB_IchorJar; -import common.tileentities.TE_IchorJar; -import common.tileentities.TE_IchorVoidJar; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.ArrayList; import java.util.Collections; import java.util.List; + import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -19,6 +14,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.Explosion; import net.minecraft.world.World; + import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.common.blocks.BlockJar; @@ -27,6 +23,14 @@ import thaumcraft.common.config.ConfigItems; import thaumcraft.common.items.ItemEssence; import thaumcraft.common.tiles.TileJarFillable; +import common.itemBlocks.IB_IchorJar; +import common.tileentities.TE_IchorJar; +import common.tileentities.TE_IchorVoidJar; + +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class Block_IchorJar extends BlockJar { private static final Block_IchorJar INSTANCE = new Block_IchorJar(); @@ -60,7 +64,7 @@ public class Block_IchorJar extends BlockJar { @Override @SideOnly(Side.CLIENT) - @SuppressWarnings({"unchecked"}) + @SuppressWarnings({ "unchecked" }) public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { par3List.add(new ItemStack(par1, 1, 0)); // Normal jar par3List.add(new ItemStack(par1, 1, 3)); // Void jar @@ -76,8 +80,8 @@ 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) { + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float f1, float f2, + 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 @@ -96,16 +100,12 @@ public class Block_IchorJar extends BlockJar { /** * Handle compatibility with Essentia Phials - * @param world - * Pass through from onBlockActivated() - * @param player - * Pass through from onBlockActivated() - * @param x - * Pass through from onBlockActivated() - * @param y - * Pass through from onBlockActivated() - * @param z - * Pass through from onBlockActivated() + * + * @param world Pass through from onBlockActivated() + * @param player Pass through from onBlockActivated() + * @param x Pass through from onBlockActivated() + * @param y Pass through from onBlockActivated() + * @param z Pass through from onBlockActivated() * @return Not sure tbh */ private boolean dealWithPhial(World world, EntityPlayer player, int x, int y, int z) { @@ -129,8 +129,13 @@ public class Block_IchorJar extends BlockJar { ((ItemEssence) ConfigItems.itemEssence).setAspects(filledPhial, phialContent); // 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)); + world.spawnEntityInWorld( + 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); @@ -154,12 +159,13 @@ public class Block_IchorJar extends BlockJar { heldItem.stackSize--; // 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))); + world.spawnEntityInWorld( + 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); @@ -186,8 +192,8 @@ public class Block_IchorJar extends BlockJar { super.breakBlock(world, x, y, z, par5, par6); } - private void breakBlockWarpy( - World world, int x, int y, int z, int fillAmount, int iterations, float explosionStrength) { + private void breakBlockWarpy(World world, int x, int y, int z, int fillAmount, int iterations, + 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); @@ -220,8 +226,8 @@ public class Block_IchorJar extends BlockJar { } @Override - public void onBlockHarvested( - World par1World, int par2, int par3, int par4, int par5, EntityPlayer par6EntityPlayer) {} + public void onBlockHarvested(World par1World, int par2, int par3, int par4, int par5, + EntityPlayer par6EntityPlayer) {} @Override public boolean canDropFromExplosion(Explosion e) { diff --git a/src/main/java/common/blocks/Block_ItemProxyCable.java b/src/main/java/common/blocks/Block_ItemProxyCable.java index 57b5fc6138..e693117d9b 100644 --- a/src/main/java/common/blocks/Block_ItemProxyCable.java +++ b/src/main/java/common/blocks/Block_ItemProxyCable.java @@ -1,18 +1,22 @@ package common.blocks; -import client.renderer.ConduitRenderer; -import common.itemBlocks.IB_ItemProxyCable; -import common.tileentities.TE_ItemProxyCable; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import kekztech.KekzCore; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import client.renderer.ConduitRenderer; + +import common.itemBlocks.IB_ItemProxyCable; +import common.tileentities.TE_ItemProxyCable; + +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class Block_ItemProxyCable extends Block { private static Block_ItemProxyCable instance = new Block_ItemProxyCable(); diff --git a/src/main/java/common/blocks/Block_ItemProxyEndpoint.java b/src/main/java/common/blocks/Block_ItemProxyEndpoint.java index 7c7712988d..41ae802b8e 100644 --- a/src/main/java/common/blocks/Block_ItemProxyEndpoint.java +++ b/src/main/java/common/blocks/Block_ItemProxyEndpoint.java @@ -1,10 +1,8 @@ package common.blocks; -import common.itemBlocks.IB_ItemProxyEndpoint; -import common.tileentities.TE_ItemProxyEndpoint; -import cpw.mods.fml.common.registry.GameRegistry; import kekztech.GuiHandler; import kekztech.KekzCore; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; @@ -12,6 +10,10 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import common.itemBlocks.IB_ItemProxyEndpoint; +import common.tileentities.TE_ItemProxyEndpoint; +import cpw.mods.fml.common.registry.GameRegistry; + public class Block_ItemProxyEndpoint extends Block { private static final Block_ItemProxyEndpoint instance = new Block_ItemProxyEndpoint(); @@ -34,8 +36,8 @@ public class Block_ItemProxyEndpoint extends Block { } @Override - public boolean onBlockActivated( - World world, int x, int y, int z, EntityPlayer player, int side, float lx, float ly, float lz) { + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float lx, float ly, + float lz) { if (world.isRemote) { return true; } diff --git a/src/main/java/common/blocks/Block_ItemProxySource.java b/src/main/java/common/blocks/Block_ItemProxySource.java index cb3c95bec0..65e9d6b0ef 100644 --- a/src/main/java/common/blocks/Block_ItemProxySource.java +++ b/src/main/java/common/blocks/Block_ItemProxySource.java @@ -1,10 +1,8 @@ package common.blocks; -import common.itemBlocks.IB_ItemProxySource; -import common.tileentities.TE_ItemProxySource; -import cpw.mods.fml.common.registry.GameRegistry; import kekztech.GuiHandler; import kekztech.KekzCore; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; @@ -12,6 +10,10 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import common.itemBlocks.IB_ItemProxySource; +import common.tileentities.TE_ItemProxySource; +import cpw.mods.fml.common.registry.GameRegistry; + public class Block_ItemProxySource extends Block { private static final Block_ItemProxySource instance = new Block_ItemProxySource(); @@ -34,8 +36,8 @@ public class Block_ItemProxySource extends Block { } @Override - public boolean onBlockActivated( - World world, int x, int y, int z, EntityPlayer player, int side, float lx, float ly, float lz) { + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float lx, float ly, + float lz) { if (world.isRemote) { return true; } diff --git a/src/main/java/common/blocks/Block_LapotronicEnergyUnit.java b/src/main/java/common/blocks/Block_LapotronicEnergyUnit.java index ff7e273a7b..2aff14cbf6 100644 --- a/src/main/java/common/blocks/Block_LapotronicEnergyUnit.java +++ b/src/main/java/common/blocks/Block_LapotronicEnergyUnit.java @@ -1,12 +1,7 @@ package common.blocks; -import common.itemBlocks.IB_LapotronicEnergyUnit; -import cpw.mods.fml.common.registry.GameRegistry; -import gregtech.api.enums.Textures; -import gregtech.api.interfaces.IIconContainer; -import gregtech.api.render.TextureFactory; -import gregtech.api.util.GT_Utility; import java.util.List; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -17,11 +12,20 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; +import common.itemBlocks.IB_LapotronicEnergyUnit; + +import cpw.mods.fml.common.registry.GameRegistry; +import gregtech.api.enums.Textures; +import gregtech.api.interfaces.IIconContainer; +import gregtech.api.render.TextureFactory; +import gregtech.api.util.GT_Utility; + public class Block_LapotronicEnergyUnit extends BaseGTUpdateableBlock { private static final Block_LapotronicEnergyUnit INSTANCE = new Block_LapotronicEnergyUnit(); public enum IconBaseSide implements IIconContainer { + INSTANCE; @Override @@ -107,7 +111,7 @@ public class Block_LapotronicEnergyUnit extends BaseGTUpdateableBlock { } @Override - @SuppressWarnings({"unchecked"}) + @SuppressWarnings({ "unchecked" }) public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { // Multi casing par3List.add(new ItemStack(par1, 1, 0)); diff --git a/src/main/java/common/blocks/Block_LargeHexPlate.java b/src/main/java/common/blocks/Block_LargeHexPlate.java index ab1ebc138e..9af1d22bc4 100644 --- a/src/main/java/common/blocks/Block_LargeHexPlate.java +++ b/src/main/java/common/blocks/Block_LargeHexPlate.java @@ -1,6 +1,5 @@ package common.blocks; -import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -8,6 +7,8 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; +import cpw.mods.fml.common.registry.GameRegistry; + public class Block_LargeHexPlate extends Block { private static final Block_LargeHexPlate INSTANCE = new Block_LargeHexPlate(); @@ -41,12 +42,12 @@ 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; - final int yMod = - y >= 0 ? Math.abs(y % 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; + final int xMod = x >= 0 ? Math.abs(x % 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; + final int zMod = z >= 0 ? Math.abs(z % 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_ReactorChamber_OFF.java b/src/main/java/common/blocks/Block_ReactorChamber_OFF.java index 6f70534a4a..4e3cd89318 100644 --- a/src/main/java/common/blocks/Block_ReactorChamber_OFF.java +++ b/src/main/java/common/blocks/Block_ReactorChamber_OFF.java @@ -1,11 +1,13 @@ package common.blocks; -import cpw.mods.fml.common.registry.GameRegistry; import kekztech.KekzCore; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; +import cpw.mods.fml.common.registry.GameRegistry; + public class Block_ReactorChamber_OFF extends BaseGTUpdateableBlock { private static Block_ReactorChamber_OFF instance = new Block_ReactorChamber_OFF(); diff --git a/src/main/java/common/blocks/Block_ReactorChamber_ON.java b/src/main/java/common/blocks/Block_ReactorChamber_ON.java index 66a3452bea..bbdd4179c5 100644 --- a/src/main/java/common/blocks/Block_ReactorChamber_ON.java +++ b/src/main/java/common/blocks/Block_ReactorChamber_ON.java @@ -1,11 +1,13 @@ package common.blocks; -import cpw.mods.fml.common.registry.GameRegistry; import kekztech.KekzCore; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; +import cpw.mods.fml.common.registry.GameRegistry; + public class Block_ReactorChamber_ON extends BaseGTUpdateableBlock { private static Block_ReactorChamber_ON instance = new Block_ReactorChamber_ON(); diff --git a/src/main/java/common/blocks/Block_SpaceElevator.java b/src/main/java/common/blocks/Block_SpaceElevator.java index 0e9cec70d7..286735767a 100644 --- a/src/main/java/common/blocks/Block_SpaceElevator.java +++ b/src/main/java/common/blocks/Block_SpaceElevator.java @@ -1,8 +1,7 @@ package common.blocks; -import common.itemBlocks.IB_SpaceElevator; -import cpw.mods.fml.common.registry.GameRegistry; import java.util.List; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -11,6 +10,9 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import common.itemBlocks.IB_SpaceElevator; +import cpw.mods.fml.common.registry.GameRegistry; + public class Block_SpaceElevator extends BaseGTUpdateableBlock { private static final Block_SpaceElevator INSTANCE = new Block_SpaceElevator(); @@ -42,7 +44,7 @@ public class Block_SpaceElevator extends BaseGTUpdateableBlock { } @Override - @SuppressWarnings({"unchecked"}) + @SuppressWarnings({ "unchecked" }) public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { par3List.add(new ItemStack(par1, 1, 0)); par3List.add(new ItemStack(par1, 1, 1)); diff --git a/src/main/java/common/blocks/Block_SpaceElevatorCapacitor.java b/src/main/java/common/blocks/Block_SpaceElevatorCapacitor.java index 509c8a681d..b6816ba7e8 100644 --- a/src/main/java/common/blocks/Block_SpaceElevatorCapacitor.java +++ b/src/main/java/common/blocks/Block_SpaceElevatorCapacitor.java @@ -1,10 +1,5 @@ package common.blocks; -import common.itemBlocks.IB_SpaceElevatorCapacitor; -import common.tileentities.TE_SpaceElevatorCapacitor; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -14,6 +9,13 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import common.itemBlocks.IB_SpaceElevatorCapacitor; +import common.tileentities.TE_SpaceElevatorCapacitor; + +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class Block_SpaceElevatorCapacitor extends BaseGTUpdateableBlock { private static final Block_SpaceElevatorCapacitor INSTANCE = new Block_SpaceElevatorCapacitor(); diff --git a/src/main/java/common/blocks/Block_SpaceElevatorTether.java b/src/main/java/common/blocks/Block_SpaceElevatorTether.java index 67a4061d62..e7d8a2e6c1 100644 --- a/src/main/java/common/blocks/Block_SpaceElevatorTether.java +++ b/src/main/java/common/blocks/Block_SpaceElevatorTether.java @@ -1,7 +1,5 @@ package common.blocks; -import common.tileentities.TE_SpaceElevatorTether; -import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -10,6 +8,9 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.World; +import common.tileentities.TE_SpaceElevatorTether; +import cpw.mods.fml.common.registry.GameRegistry; + public class Block_SpaceElevatorTether extends BaseGTUpdateableBlock { private static final Block_SpaceElevatorTether INSTANCE = new Block_SpaceElevatorTether(); diff --git a/src/main/java/common/blocks/Block_TFFTStorageField.java b/src/main/java/common/blocks/Block_TFFTStorageField.java index 36439548af..e36f15b4c6 100644 --- a/src/main/java/common/blocks/Block_TFFTStorageField.java +++ b/src/main/java/common/blocks/Block_TFFTStorageField.java @@ -1,14 +1,9 @@ package common.blocks; -import common.itemBlocks.IB_TFFTStorageField; -import common.tileentities.GTMTE_TFFT; -import cpw.mods.fml.common.registry.GameRegistry; -import gregtech.api.enums.Textures; -import gregtech.api.interfaces.IIconContainer; -import gregtech.api.render.TextureFactory; -import gregtech.api.util.GT_Utility; import java.util.List; + import kekztech.KekzCore; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -19,6 +14,15 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; +import common.itemBlocks.IB_TFFTStorageField; +import common.tileentities.GTMTE_TFFT; + +import cpw.mods.fml.common.registry.GameRegistry; +import gregtech.api.enums.Textures; +import gregtech.api.interfaces.IIconContainer; +import gregtech.api.render.TextureFactory; +import gregtech.api.util.GT_Utility; + public class Block_TFFTStorageField extends BaseGTUpdateableBlock { private static final Block_TFFTStorageField INSTANCE = new Block_TFFTStorageField(); @@ -26,6 +30,7 @@ public class Block_TFFTStorageField extends BaseGTUpdateableBlock { private static final IIcon[] textures = new IIcon[SUB_BLOCK_COUNT]; public enum TFFTCasingIcon implements IIconContainer { + INSTANCE; @Override @@ -48,7 +53,9 @@ public class Block_TFFTStorageField extends BaseGTUpdateableBlock { static { GT_Utility.addTexturePage((byte) 12); Textures.BlockIcons.setCasingTexture( - (byte) 12, (byte) 127, TextureFactory.of(Block_TFFTStorageField.TFFTCasingIcon.INSTANCE)); + (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 09a50f4b94..5ea0d7c072 100644 --- a/src/main/java/common/blocks/Block_ThaumiumReinforcedJar.java +++ b/src/main/java/common/blocks/Block_ThaumiumReinforcedJar.java @@ -1,13 +1,8 @@ package common.blocks; -import common.itemBlocks.IB_ThaumiumReinforcedJar; -import common.tileentities.TE_ThaumiumReinforcedJar; -import common.tileentities.TE_ThaumiumReinforcedVoidJar; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.ArrayList; import java.util.List; + import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -19,6 +14,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.Explosion; import net.minecraft.world.World; + import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.common.blocks.BlockJar; @@ -27,6 +23,14 @@ import thaumcraft.common.config.ConfigItems; import thaumcraft.common.items.ItemEssence; import thaumcraft.common.tiles.TileJarFillable; +import common.itemBlocks.IB_ThaumiumReinforcedJar; +import common.tileentities.TE_ThaumiumReinforcedJar; +import common.tileentities.TE_ThaumiumReinforcedVoidJar; + +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class Block_ThaumiumReinforcedJar extends BlockJar { private static final Block_ThaumiumReinforcedJar INSTANCE = new Block_ThaumiumReinforcedJar(); @@ -60,7 +64,7 @@ public class Block_ThaumiumReinforcedJar extends BlockJar { @Override @SideOnly(Side.CLIENT) - @SuppressWarnings({"unchecked"}) + @SuppressWarnings({ "unchecked" }) public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { par3List.add(new ItemStack(par1, 1, 0)); // Normal jar par3List.add(new ItemStack(par1, 1, 3)); // Void jar @@ -88,8 +92,8 @@ public class Block_ThaumiumReinforcedJar extends BlockJar { super.breakBlock(world, x, y, z, par5, par6); } - private void breakBlockWarpy( - World world, int x, int y, int z, int fillAmount, int iterations, float explosionStrength) { + private void breakBlockWarpy(World world, int x, int y, int z, int fillAmount, int iterations, + 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); @@ -117,8 +121,8 @@ 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) { + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float f1, float f2, + 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 @@ -137,16 +141,12 @@ public class Block_ThaumiumReinforcedJar extends BlockJar { /** * Handle compatibility with Essentia Phials - * @param world - * Pass through from onBlockActivated() - * @param player - * Pass through from onBlockActivated() - * @param x - * Pass through from onBlockActivated() - * @param y - * Pass through from onBlockActivated() - * @param z - * Pass through from onBlockActivated() + * + * @param world Pass through from onBlockActivated() + * @param player Pass through from onBlockActivated() + * @param x Pass through from onBlockActivated() + * @param y Pass through from onBlockActivated() + * @param z Pass through from onBlockActivated() * @return Not sure tbh */ private boolean dealWithPhial(World world, EntityPlayer player, |
