Auto Format code

This commit is contained in:
modmuss50 2016-10-08 20:46:16 +01:00
parent 112b1657cf
commit 796df6c055
No known key found for this signature in database
GPG key ID: 773D17BE8BF49C82
503 changed files with 12260 additions and 16291 deletions

View file

@ -12,30 +12,25 @@ import techreborn.client.GuiHandler;
import techreborn.client.TechRebornCreativeTab;
import techreborn.tiles.generator.TileDieselGenerator;
public class BlockDieselGenerator extends BlockMachineBase implements IAdvancedRotationTexture
{
public class BlockDieselGenerator extends BlockMachineBase implements IAdvancedRotationTexture {
private final String prefix = "techreborn:blocks/machine/generators/";
public BlockDieselGenerator(Material material)
{
public BlockDieselGenerator(Material material) {
super();
setUnlocalizedName("techreborn.dieselgenerator");
setCreativeTab(TechRebornCreativeTab.instance);
}
@Override
public TileEntity createNewTileEntity(World world, int p_149915_2_)
{
public TileEntity createNewTileEntity(World world, int p_149915_2_) {
return new TileDieselGenerator();
}
@Override
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX,
float hitY, float hitZ)
{
if (fillBlockWithFluid(world, new BlockPos(x, y, z), player))
{
float hitY, float hitZ) {
if (fillBlockWithFluid(world, new BlockPos(x, y, z), player)) {
return true;
}
if (!player.isSneaking())
@ -44,26 +39,22 @@ public class BlockDieselGenerator extends BlockMachineBase implements IAdvancedR
}
@Override
public String getFront(boolean isActive)
{
public String getFront(boolean isActive) {
return prefix + "generator_machine_side";
}
@Override
public String getSide(boolean isActive)
{
public String getSide(boolean isActive) {
return prefix + "generator_machine_side";
}
@Override
public String getTop(boolean isActive)
{
public String getTop(boolean isActive) {
return prefix + "diesel_generator_top_off";
}
@Override
public String getBottom(boolean isActive)
{
public String getBottom(boolean isActive) {
return prefix + "generator_machine_bottom";
}

View file

@ -8,45 +8,38 @@ import reborncore.common.blocks.IAdvancedRotationTexture;
import techreborn.client.TechRebornCreativeTab;
import techreborn.tiles.generator.TileDragonEggSiphoner;
public class BlockDragonEggSiphoner extends BlockMachineBase implements IAdvancedRotationTexture
{
public class BlockDragonEggSiphoner extends BlockMachineBase implements IAdvancedRotationTexture {
private final String prefix = "techreborn:blocks/machine/generators/";
public BlockDragonEggSiphoner(Material material)
{
public BlockDragonEggSiphoner(Material material) {
super();
setUnlocalizedName("techreborn.dragoneggsiphoner");
setCreativeTab(TechRebornCreativeTab.instance);
}
@Override
public TileEntity createNewTileEntity(World world, int p_149915_2_)
{
public TileEntity createNewTileEntity(World world, int p_149915_2_) {
return new TileDragonEggSiphoner();
}
@Override
public String getFront(boolean isActive)
{
public String getFront(boolean isActive) {
return prefix + "dragon_egg_energy_siphon_side_off";
}
@Override
public String getSide(boolean isActive)
{
public String getSide(boolean isActive) {
return prefix + "dragon_egg_energy_siphon_side_off";
}
@Override
public String getTop(boolean isActive)
{
public String getTop(boolean isActive) {
return prefix + "dragon_egg_energy_siphon_top";
}
@Override
public String getBottom(boolean isActive)
{
public String getBottom(boolean isActive) {
return prefix + "generator_machine_bottom";
}

View file

@ -12,30 +12,25 @@ import techreborn.client.GuiHandler;
import techreborn.client.TechRebornCreativeTab;
import techreborn.tiles.generator.TileGasTurbine;
public class BlockGasTurbine extends BlockMachineBase implements IAdvancedRotationTexture
{
public class BlockGasTurbine extends BlockMachineBase implements IAdvancedRotationTexture {
private final String prefix = "techreborn:blocks/machine/generators/";
public BlockGasTurbine(Material material)
{
public BlockGasTurbine(Material material) {
super();
setUnlocalizedName("techreborn.gasTurbine");
setCreativeTab(TechRebornCreativeTab.instance);
}
@Override
public TileEntity createNewTileEntity(World world, int p_149915_2_)
{
public TileEntity createNewTileEntity(World world, int p_149915_2_) {
return new TileGasTurbine();
}
@Override
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX,
float hitY, float hitZ)
{
if (fillBlockWithFluid(world, new BlockPos(x, y, z), player))
{
float hitY, float hitZ) {
if (fillBlockWithFluid(world, new BlockPos(x, y, z), player)) {
return true;
}
if (!player.isSneaking())
@ -44,26 +39,22 @@ public class BlockGasTurbine extends BlockMachineBase implements IAdvancedRotati
}
@Override
public String getFront(boolean isActive)
{
public String getFront(boolean isActive) {
return prefix + "generator_machine_side";
}
@Override
public String getSide(boolean isActive)
{
public String getSide(boolean isActive) {
return prefix + "generator_machine_side";
}
@Override
public String getTop(boolean isActive)
{
public String getTop(boolean isActive) {
return prefix + "gas_generator_top";
}
@Override
public String getBottom(boolean isActive)
{
public String getBottom(boolean isActive) {
return prefix + "gas_generator_bottom";
}

View file

@ -10,62 +10,52 @@ import techreborn.client.GuiHandler;
import techreborn.client.TechRebornCreativeTab;
import techreborn.tiles.generator.TileGenerator;
public class BlockGenerator extends BlockMachineBase implements IRotationTexture
{
public class BlockGenerator extends BlockMachineBase implements IRotationTexture {
private final String prefix = "techreborn:blocks/machine/generators/";
public BlockGenerator()
{
public BlockGenerator() {
super();
setUnlocalizedName("techreborn.generator");
setCreativeTab(TechRebornCreativeTab.instance);
}
@Override
public TileEntity createNewTileEntity(World world, int p_149915_2_)
{
public TileEntity createNewTileEntity(World world, int p_149915_2_) {
return new TileGenerator();
}
@Override
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX,
float hitY, float hitZ)
{
if (!player.isSneaking())
{
float hitY, float hitZ) {
if (!player.isSneaking()) {
player.openGui(Core.INSTANCE, GuiHandler.generatorID, world, x, y, z);
}
return true;
}
@Override
public String getFrontOff()
{
public String getFrontOff() {
return prefix + "generator_front_off";
}
@Override
public String getFrontOn()
{
public String getFrontOn() {
return prefix + "generator_front_on";
}
@Override
public String getSide()
{
public String getSide() {
return prefix + "generator_machine_side";
}
@Override
public String getTop()
{
public String getTop() {
return prefix + "generator_machine_top";
}
@Override
public String getBottom()
{
public String getBottom() {
return prefix + "generator_machine_bottom";
}
}

View file

@ -8,45 +8,38 @@ import reborncore.common.blocks.IAdvancedRotationTexture;
import techreborn.client.TechRebornCreativeTab;
import techreborn.tiles.generator.TileHeatGenerator;
public class BlockHeatGenerator extends BlockMachineBase implements IAdvancedRotationTexture
{
public class BlockHeatGenerator extends BlockMachineBase implements IAdvancedRotationTexture {
private final String prefix = "techreborn:blocks/machine/generators/";
public BlockHeatGenerator(Material material)
{
public BlockHeatGenerator(Material material) {
super();
setUnlocalizedName("techreborn.heatgenerator");
setCreativeTab(TechRebornCreativeTab.instance);
}
@Override
public TileEntity createNewTileEntity(World world, int p_149915_2_)
{
public TileEntity createNewTileEntity(World world, int p_149915_2_) {
return new TileHeatGenerator();
}
@Override
public String getFront(boolean isActive)
{
public String getFront(boolean isActive) {
return prefix + "heat_generator_side";
}
@Override
public String getSide(boolean isActive)
{
public String getSide(boolean isActive) {
return prefix + "heat_generator_side";
}
@Override
public String getTop(boolean isActive)
{
public String getTop(boolean isActive) {
return prefix + "heat_generator_top";
}
@Override
public String getBottom(boolean isActive)
{
public String getBottom(boolean isActive) {
return prefix + "heat_generator_bottom";
}

View file

@ -5,39 +5,33 @@ import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.blocks.IAdvancedRotationTexture;
import techreborn.client.TechRebornCreativeTab;
public class BlockMagicEnergyAbsorber extends BlockMachineBase implements IAdvancedRotationTexture
{
public class BlockMagicEnergyAbsorber extends BlockMachineBase implements IAdvancedRotationTexture {
private final String prefix = "techreborn:blocks/machine/generators/";
public BlockMagicEnergyAbsorber(Material material)
{
public BlockMagicEnergyAbsorber(Material material) {
super();
setUnlocalizedName("techreborn.magicenergyabsorber");
setCreativeTab(TechRebornCreativeTab.instance);
}
@Override
public String getFront(boolean isActive)
{
public String getFront(boolean isActive) {
return prefix + "magic_energy_absorber_side";
}
@Override
public String getSide(boolean isActive)
{
public String getSide(boolean isActive) {
return prefix + "magic_energy_absorber_side";
}
@Override
public String getTop(boolean isActive)
{
public String getTop(boolean isActive) {
return prefix + "magic_energy_absorber_top";
}
@Override
public String getBottom(boolean isActive)
{
public String getBottom(boolean isActive) {
return prefix + "magic_energy_absorber_bottom";
}

View file

@ -5,39 +5,33 @@ import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.blocks.IAdvancedRotationTexture;
import techreborn.client.TechRebornCreativeTab;
public class BlockMagicEnergyConverter extends BlockMachineBase implements IAdvancedRotationTexture
{
public class BlockMagicEnergyConverter extends BlockMachineBase implements IAdvancedRotationTexture {
private final String prefix = "techreborn:blocks/machine/generators/";
public BlockMagicEnergyConverter(Material material)
{
public BlockMagicEnergyConverter(Material material) {
super();
setUnlocalizedName("techreborn.magicenergyconverter");
setCreativeTab(TechRebornCreativeTab.instance);
}
@Override
public String getFront(boolean isActive)
{
public String getFront(boolean isActive) {
return prefix + "magic_energy_converter_front_off";
}
@Override
public String getSide(boolean isActive)
{
public String getSide(boolean isActive) {
return prefix + "magic_energy_converter_side";
}
@Override
public String getTop(boolean isActive)
{
public String getTop(boolean isActive) {
return prefix + "magic_energy_converter_top";
}
@Override
public String getBottom(boolean isActive)
{
public String getBottom(boolean isActive) {
return prefix + "magic_energy_converter_bottom";
}

View file

@ -5,39 +5,33 @@ import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.blocks.IAdvancedRotationTexture;
import techreborn.client.TechRebornCreativeTab;
public class BlockPlasmaGenerator extends BlockMachineBase implements IAdvancedRotationTexture
{
public class BlockPlasmaGenerator extends BlockMachineBase implements IAdvancedRotationTexture {
private final String prefix = "techreborn:blocks/machine/generators/";
public BlockPlasmaGenerator(Material material)
{
public BlockPlasmaGenerator(Material material) {
super();
setUnlocalizedName("techreborn.plasmagenerator");
setCreativeTab(TechRebornCreativeTab.instance);
}
@Override
public String getFront(boolean isActive)
{
public String getFront(boolean isActive) {
return prefix + "plasma_generator_front";
}
@Override
public String getSide(boolean isActive)
{
public String getSide(boolean isActive) {
return prefix + "plasma_generator_side_off";
}
@Override
public String getTop(boolean isActive)
{
public String getTop(boolean isActive) {
return prefix + "plasma_generator_side_off";
}
@Override
public String getBottom(boolean isActive)
{
public String getBottom(boolean isActive) {
return prefix + "plasma_generator_side_off";
}
}

View file

@ -12,30 +12,25 @@ import techreborn.client.GuiHandler;
import techreborn.client.TechRebornCreativeTab;
import techreborn.tiles.generator.TileSemifluidGenerator;
public class BlockSemiFluidGenerator extends BlockMachineBase implements IAdvancedRotationTexture
{
public class BlockSemiFluidGenerator extends BlockMachineBase implements IAdvancedRotationTexture {
private final String prefix = "techreborn:blocks/machine/generators/";
public BlockSemiFluidGenerator(Material material)
{
public BlockSemiFluidGenerator(Material material) {
super();
setUnlocalizedName("techreborn.semifluidgenerator");
setCreativeTab(TechRebornCreativeTab.instance);
}
@Override
public TileEntity createNewTileEntity(World world, int p_149915_2_)
{
public TileEntity createNewTileEntity(World world, int p_149915_2_) {
return new TileSemifluidGenerator();
}
@Override
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX,
float hitY, float hitZ)
{
if (fillBlockWithFluid(world, new BlockPos(x, y, z), player))
{
float hitY, float hitZ) {
if (fillBlockWithFluid(world, new BlockPos(x, y, z), player)) {
return true;
}
if (!player.isSneaking())
@ -44,26 +39,22 @@ public class BlockSemiFluidGenerator extends BlockMachineBase implements IAdvanc
}
@Override
public String getFront(boolean isActive)
{
public String getFront(boolean isActive) {
return prefix + "semifluid_generator_side";
}
@Override
public String getSide(boolean isActive)
{
public String getSide(boolean isActive) {
return prefix + "semifluid_generator_side";
}
@Override
public String getTop(boolean isActive)
{
public String getTop(boolean isActive) {
return prefix + "generator_machine_top";
}
@Override
public String getBottom(boolean isActive)
{
public String getBottom(boolean isActive) {
return prefix + "generator_machine_bottom";
}

View file

@ -18,14 +18,12 @@ import techreborn.tiles.generator.TileSolarPanel;
/**
* Created by modmuss50 on 25/02/2016.
*/
public class BlockSolarPanel extends BaseTileBlock implements ITexturedBlock
{
public class BlockSolarPanel extends BaseTileBlock implements ITexturedBlock {
public static PropertyBool ACTIVE = PropertyBool.create("active");
private final String prefix = "techreborn:blocks/machine/generators/";
public BlockSolarPanel()
{
public BlockSolarPanel() {
super(Material.IRON);
setUnlocalizedName("techreborn.solarpanel");
setCreativeTab(TechRebornCreativeTab.instance);
@ -33,78 +31,67 @@ public class BlockSolarPanel extends BaseTileBlock implements ITexturedBlock
setHardness(2.0F);
}
protected BlockStateContainer createBlockState()
{
protected BlockStateContainer createBlockState() {
ACTIVE = PropertyBool.create("active");
return new BlockStateContainer(this, ACTIVE);
}
@Override
public IBlockState getStateFromMeta(int meta)
{
public IBlockState getStateFromMeta(int meta) {
return getDefaultState().withProperty(ACTIVE, meta != 0);
}
@Override
public int getMetaFromState(IBlockState state)
{
public int getMetaFromState(IBlockState state) {
return state.getValue(ACTIVE) ? 1 : 0;
}
@Override
public TileEntity createNewTileEntity(World worldIn, int meta)
{
public TileEntity createNewTileEntity(World worldIn, int meta) {
return new TileSolarPanel();
}
@Override public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Block neighborBlock)
{
if(worldIn.canBlockSeeSky(pos.up()) && !worldIn.isRaining() && !worldIn.isThundering()
&& worldIn.isDaytime()){
@Override
public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Block neighborBlock) {
if (worldIn.canBlockSeeSky(pos.up()) && !worldIn.isRaining() && !worldIn.isThundering()
&& worldIn.isDaytime()) {
worldIn.setBlockState(pos,
worldIn.getBlockState(pos).withProperty(BlockSolarPanel.ACTIVE, true));
}else{
worldIn.getBlockState(pos).withProperty(BlockSolarPanel.ACTIVE, true));
} else {
worldIn.setBlockState(pos,
worldIn.getBlockState(pos).withProperty(BlockSolarPanel.ACTIVE, false));
}
}
@Override public IBlockState onBlockPlaced(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY,
float hitZ, int meta, EntityLivingBase placer)
{
if(!worldIn.isRemote)
{
if (worldIn.canBlockSeeSky(pos.up()) && !worldIn.isRaining() && !worldIn.isThundering() && worldIn.isDaytime())
{
return this.getDefaultState().withProperty(ACTIVE, true);
} else
{
return this.getDefaultState().withProperty(ACTIVE, false);
}
}else{return this.getDefaultState().withProperty(ACTIVE, false);
worldIn.getBlockState(pos).withProperty(BlockSolarPanel.ACTIVE, false));
}
}
@Override
public String getTextureNameFromState(IBlockState state, EnumFacing side)
{
public IBlockState onBlockPlaced(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY,
float hitZ, int meta, EntityLivingBase placer) {
if (!worldIn.isRemote) {
if (worldIn.canBlockSeeSky(pos.up()) && !worldIn.isRaining() && !worldIn.isThundering() && worldIn.isDaytime()) {
return this.getDefaultState().withProperty(ACTIVE, true);
} else {
return this.getDefaultState().withProperty(ACTIVE, false);
}
} else {
return this.getDefaultState().withProperty(ACTIVE, false);
}
}
@Override
public String getTextureNameFromState(IBlockState state, EnumFacing side) {
boolean isActive = state.getValue(ACTIVE);
if (side == EnumFacing.UP)
{
if (side == EnumFacing.UP) {
return prefix + "solar_panel_top_" + (isActive ? "on" : "off");
} else if (side == EnumFacing.DOWN)
{
} else if (side == EnumFacing.DOWN) {
return prefix + "generator_machine_bottom";
}
return prefix + "solar_panel_side_" + (isActive ? "on" : "off");
}
@Override
public int amountOfStates()
{
public int amountOfStates() {
return 2;
}
}

View file

@ -11,30 +11,25 @@ import techreborn.client.GuiHandler;
import techreborn.client.TechRebornCreativeTab;
import techreborn.tiles.generator.TileThermalGenerator;
public class BlockThermalGenerator extends BlockMachineBase implements IAdvancedRotationTexture
{
public class BlockThermalGenerator extends BlockMachineBase implements IAdvancedRotationTexture {
private final String prefix = "techreborn:blocks/machine/generators/";
public BlockThermalGenerator()
{
public BlockThermalGenerator() {
super();
setUnlocalizedName("techreborn.thermalGenerator");
setCreativeTab(TechRebornCreativeTab.instance);
}
@Override
public TileEntity createNewTileEntity(World world, int p_149915_2_)
{
public TileEntity createNewTileEntity(World world, int p_149915_2_) {
return new TileThermalGenerator();
}
@Override
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX,
float hitY, float hitZ)
{
if (fillBlockWithFluid(world, new BlockPos(x, y, z), player))
{
float hitY, float hitZ) {
if (fillBlockWithFluid(world, new BlockPos(x, y, z), player)) {
return true;
}
if (!player.isSneaking())
@ -43,26 +38,22 @@ public class BlockThermalGenerator extends BlockMachineBase implements IAdvanced
}
@Override
public String getFront(boolean isActive)
{
public String getFront(boolean isActive) {
return isActive ? prefix + "thermal_generator_side_on" : prefix + "thermal_generator_side_off";
}
@Override
public String getSide(boolean isActive)
{
public String getSide(boolean isActive) {
return isActive ? prefix + "thermal_generator_side_on" : prefix + "thermal_generator_side_off";
}
@Override
public String getTop(boolean isActive)
{
public String getTop(boolean isActive) {
return isActive ? prefix + "thermal_generator_top_on" : prefix + "thermal_generator_top_off";
}
@Override
public String getBottom(boolean isActive)
{
public String getBottom(boolean isActive) {
return prefix + "generator_machine_bottom";
}
}

View file

@ -14,13 +14,11 @@ import techreborn.tiles.generator.TileWaterMill;
/**
* Created by modmuss50 on 25/02/2016.
*/
public class BlockWaterMill extends BaseTileBlock implements ITexturedBlock
{
public class BlockWaterMill extends BaseTileBlock implements ITexturedBlock {
private final String prefix = "techreborn:blocks/machine/generators/";
public BlockWaterMill()
{
public BlockWaterMill() {
super(Material.IRON);
setUnlocalizedName("techreborn.watermill");
setCreativeTab(TechRebornCreativeTab.instance);
@ -29,29 +27,24 @@ public class BlockWaterMill extends BaseTileBlock implements ITexturedBlock
}
@Override
public TileEntity createNewTileEntity(World worldIn, int meta)
{
public TileEntity createNewTileEntity(World worldIn, int meta) {
return new TileWaterMill();
}
@Override
public String getTextureNameFromState(IBlockState state, EnumFacing side)
{
public String getTextureNameFromState(IBlockState state, EnumFacing side) {
boolean isActive = false;
if (side == EnumFacing.UP)
{
if (side == EnumFacing.UP) {
return prefix + "generator_machine_bottom";// + (isActive ? "on" :
// "off");
} else if (side == EnumFacing.DOWN)
{
// "off");
} else if (side == EnumFacing.DOWN) {
return prefix + "generator_machine_bottom";
}
return prefix + "solar_panel_side_" + (isActive ? "on" : "off");
}
@Override
public int amountOfStates()
{
public int amountOfStates() {
return 2;
}
}

View file

@ -14,13 +14,11 @@ import techreborn.tiles.generator.TileWindMill;
/**
* Created by modmuss50 on 25/02/2016.
*/
public class BlockWindMill extends BaseTileBlock implements ITexturedBlock
{
public class BlockWindMill extends BaseTileBlock implements ITexturedBlock {
private final String prefix = "techreborn:blocks/machine/generators/";
public BlockWindMill()
{
public BlockWindMill() {
super(Material.IRON);
setUnlocalizedName("techreborn.windmill");
setCreativeTab(TechRebornCreativeTab.instance);
@ -29,29 +27,24 @@ public class BlockWindMill extends BaseTileBlock implements ITexturedBlock
}
@Override
public TileEntity createNewTileEntity(World worldIn, int meta)
{
public TileEntity createNewTileEntity(World worldIn, int meta) {
return new TileWindMill();
}
@Override
public String getTextureNameFromState(IBlockState state, EnumFacing side)
{
public String getTextureNameFromState(IBlockState state, EnumFacing side) {
boolean isActive = false;
if (side == EnumFacing.UP)
{
if (side == EnumFacing.UP) {
return prefix + "generator_machine_bottom";// + (isActive ? "on" :
// "off");
} else if (side == EnumFacing.DOWN)
{
// "off");
} else if (side == EnumFacing.DOWN) {
return prefix + "generator_machine_bottom";
}
return prefix + "solar_panel_side_" + (isActive ? "on" : "off");
}
@Override
public int amountOfStates()
{
public int amountOfStates() {
return 2;
}
}