Formatting + set proper frame drop for advanced machines

This commit is contained in:
drcrazy 2018-04-28 13:16:50 +03:00
parent 649a6bf67f
commit 45669e8aa9
43 changed files with 149 additions and 98 deletions

View file

@ -48,7 +48,7 @@ public class BlockComputerCube extends BlockMachineBase {
public BlockComputerCube() {
super();
this.setUnlocalizedName("techreborn.computercube");
this.setCreativeTab(TechRebornCreativeTab.instance);
setCreativeTab(TechRebornCreativeTab.instance);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier2_machines"));
}

View file

@ -51,7 +51,7 @@ public class BlockFusionControlComputer extends BlockMachineBase {
public BlockFusionControlComputer() {
super();
this.setCreativeTab(TechRebornCreativeTab.instance);
setCreativeTab(TechRebornCreativeTab.instance);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators"));
}
@ -104,4 +104,9 @@ public class BlockFusionControlComputer extends BlockMachineBase {
public TileEntity createNewTileEntity(final World world, final int meta) {
return new TileFusionControlComputer();
}
@Override
public boolean isAdvanced() {
return true;
}
}

View file

@ -40,12 +40,9 @@ import techreborn.tiles.generator.TileDieselGenerator;
*/
public class BlockDieselGenerator extends BlockMachineBase {
/**
*
*/
public BlockDieselGenerator() {
super();
this.setCreativeTab(TechRebornCreativeTab.instance);
setCreativeTab(TechRebornCreativeTab.instance);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators"));
}

View file

@ -38,7 +38,7 @@ public class BlockDragonEggSyphon extends BlockMachineBase {
public BlockDragonEggSyphon() {
super();
this.setCreativeTab(TechRebornCreativeTab.instance);
setCreativeTab(TechRebornCreativeTab.instance);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators"));
}
@ -51,5 +51,4 @@ public class BlockDragonEggSyphon extends BlockMachineBase {
public IMachineGuiHandler getGui() {
return null;
}
}

View file

@ -39,7 +39,7 @@ public class BlockGasTurbine extends BlockMachineBase {
public BlockGasTurbine() {
super();
this.setCreativeTab(TechRebornCreativeTab.instance);
setCreativeTab(TechRebornCreativeTab.instance);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators"));
}
@ -52,5 +52,4 @@ public class BlockGasTurbine extends BlockMachineBase {
public IMachineGuiHandler getGui() {
return EGui.GAS_TURBINE;
}
}

View file

@ -47,7 +47,6 @@ public class BlockLightningRod extends BlockMachineBase {
return new TileLightningRod();
}
@Override
public IMachineGuiHandler getGui() {
return null;

View file

@ -56,5 +56,4 @@ public class BlockMagicEnergyAbsorber extends BlockMachineBase {
public IMachineGuiHandler getGui() {
return null;
}
}

View file

@ -40,9 +40,6 @@ import techreborn.tiles.generator.TilePlasmaGenerator;
*/
public class BlockPlasmaGenerator extends BlockMachineBase {
/**
*
*/
public BlockPlasmaGenerator() {
super();
setCreativeTab(TechRebornCreativeTab.instance);

View file

@ -39,7 +39,7 @@ public class BlockSemiFluidGenerator extends BlockMachineBase {
public BlockSemiFluidGenerator() {
super();
this.setCreativeTab(TechRebornCreativeTab.instance);
setCreativeTab(TechRebornCreativeTab.instance);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators"));
}

View file

@ -39,7 +39,7 @@ public class BlockSolidFuelGenerator extends BlockMachineBase {
public BlockSolidFuelGenerator() {
super();
this.setCreativeTab(TechRebornCreativeTab.instance);
setCreativeTab(TechRebornCreativeTab.instance);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators"));
}

View file

@ -39,7 +39,7 @@ public class BlockThermalGenerator extends BlockMachineBase {
public BlockThermalGenerator() {
super();
this.setCreativeTab(TechRebornCreativeTab.instance);
setCreativeTab(TechRebornCreativeTab.instance);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators"));
}

View file

@ -50,5 +50,4 @@ public class BlockWaterMill extends BaseTileBlock {
public TileEntity createNewTileEntity(World worldIn, int meta) {
return new TileWaterMill();
}
}

View file

@ -39,6 +39,7 @@ import java.util.ArrayList;
import java.util.List;
public class BlockAdjustableSU extends BlockEnergyStorage {
public BlockAdjustableSU() {
super("AESU", EGui.AESU.ordinal());
}

View file

@ -42,9 +42,9 @@ import java.util.List;
* Created by modmuss50 on 14/03/2016.
*/
public class BlockHighVoltageSU extends BlockEnergyStorage {
public BlockHighVoltageSU() {
super("high_voltage_su", EGui.HIGH_VOLTAGE_SU.ordinal());
this.setHardness(2f);
}
@Override

View file

@ -35,6 +35,7 @@ import techreborn.client.EGui;
import techreborn.tiles.idsu.TileInterdimensionalSU;
public class BlockInterdimensionalSU extends BlockEnergyStorage {
public BlockInterdimensionalSU() {
super("IDSU", EGui.IDSU.ordinal());
}

View file

@ -30,6 +30,7 @@ import techreborn.client.EGui;
import techreborn.tiles.lesu.TileLapotronicSU;
public class BlockLapotronicSU extends BlockEnergyStorage {
public BlockLapotronicSU() {
super("LESU", EGui.LESU.ordinal());
}

View file

@ -33,6 +33,7 @@ import techreborn.tiles.storage.TileLowVoltageSU;
* Created by modmuss50 on 14/03/2016.
*/
public class BlockLowVoltageSU extends BlockEnergyStorage {
public BlockLowVoltageSU() {
super("low_voltage_su", EGui.LOW_VOLTAGE_SU.ordinal());
}

View file

@ -42,6 +42,7 @@ import java.util.List;
* Created by modmuss50 on 14/03/2016.
*/
public class BlockMediumVoltageSU extends BlockEnergyStorage {
public BlockMediumVoltageSU() {
super("medium_voltage_su", EGui.MEDIUM_VOLTAGE_SU.ordinal());
}

View file

@ -46,7 +46,7 @@ public class BlockIronAlloyFurnace extends BlockMachineBase {
public BlockIronAlloyFurnace() {
super();
this.setCreativeTab(TechRebornCreativeTab.instance);
setCreativeTab(TechRebornCreativeTab.instance);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier0_machines"));
}

View file

@ -51,7 +51,7 @@ public class BlockIronFurnace extends BlockMachineBase {
public BlockIronFurnace() {
super();
this.setCreativeTab(TechRebornCreativeTab.instance);
setCreativeTab(TechRebornCreativeTab.instance);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier0_machines"));
}

View file

@ -39,7 +39,7 @@ public class BlockAlloySmelter extends BlockMachineBase {
public BlockAlloySmelter() {
super();
this.setCreativeTab(TechRebornCreativeTab.instance);
setCreativeTab(TechRebornCreativeTab.instance);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier1_machines"));
}

View file

@ -39,7 +39,7 @@ public class BlockCompressor extends BlockMachineBase {
public BlockCompressor() {
super();
this.setCreativeTab(TechRebornCreativeTab.instance);
setCreativeTab(TechRebornCreativeTab.instance);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier1_machines"));
}

View file

@ -39,7 +39,7 @@ public class BlockElectricFurnace extends BlockMachineBase {
public BlockElectricFurnace() {
super();
this.setCreativeTab(TechRebornCreativeTab.instance);
setCreativeTab(TechRebornCreativeTab.instance);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier1_machines"));
}

View file

@ -39,7 +39,7 @@ public class BlockExtractor extends BlockMachineBase {
public BlockExtractor() {
super();
this.setCreativeTab(TechRebornCreativeTab.instance);
setCreativeTab(TechRebornCreativeTab.instance);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier1_machines"));
}

View file

@ -39,7 +39,7 @@ public class BlockGrinder extends BlockMachineBase {
public BlockGrinder() {
super();
this.setCreativeTab(TechRebornCreativeTab.instance);
setCreativeTab(TechRebornCreativeTab.instance);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier1_machines"));
}

View file

@ -74,64 +74,18 @@ public class BlockPlayerDetector extends BlockMachineBase {
public BlockPlayerDetector() {
super(true);
setCreativeTab(TechRebornCreativeTab.instance);
setHardness(2f);
this.setDefaultState(this.getDefaultState().withProperty(TYPE, "all"));
for (int i = 0; i < types.length; i++) {
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, i, "machines/tier1_machines").setInvVariant("type=" + types[i]));
}
}
@Override
public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) {
return new ItemStack(ModBlocks.PLAYER_DETECTOR, 1, typeNamesList.indexOf(state.getValue(TYPE)));
}
@Override
public Item getItemDropped(IBlockState state, Random rand, int fortune) {
return Item.getItemFromBlock(this);
}
@Override
@SideOnly(Side.CLIENT)
public void getSubBlocks(CreativeTabs creativeTabs, NonNullList<ItemStack> list) {
for (int meta = 0; meta < types.length; meta++) {
list.add(new ItemStack(this, 1, meta));
}
}
// BlockMachineBase
@Override
public TileEntity createNewTileEntity(final World world, final int meta) {
return new TilePlayerDectector();
}
@Override
public boolean canConnectRedstone(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) {
return true;
}
@Override
public boolean canProvidePower(IBlockState state) {
return true;
}
@Override
public int getWeakPower(IBlockState blockState, IBlockAccess blockAccess, BlockPos pos, EnumFacing side) {
TileEntity entity = blockAccess.getTileEntity(pos);
if (entity instanceof TilePlayerDectector) {
return ((TilePlayerDectector) entity).isProvidingPower() ? 15 : 0;
}
return 0;
}
@Override
public int getStrongPower(IBlockState blockState, IBlockAccess blockAccess, BlockPos pos, EnumFacing side) {
TileEntity entity = blockAccess.getTileEntity(pos);
if (entity instanceof TilePlayerDectector) {
return ((TilePlayerDectector) entity).isProvidingPower() ? 15 : 0;
}
return 0;
}
@Override
public void onBlockPlacedBy(World worldIn, BlockPos pos, IBlockState state, EntityLivingBase placer,
ItemStack stack) {
@ -141,7 +95,7 @@ public class BlockPlayerDetector extends BlockMachineBase {
((TilePlayerDectector) tile).owenerUdid = placer.getUniqueID().toString();
}
}
@Override
public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn,
EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) {
@ -194,7 +148,7 @@ public class BlockPlayerDetector extends BlockMachineBase {
}
return true;
}
@Override
protected BlockStateContainer createBlockState() {
TYPE = new PropertyString("type", types);
@ -218,4 +172,51 @@ public class BlockPlayerDetector extends BlockMachineBase {
public IMachineGuiHandler getGui() {
return null;
}
// Block
@Override
public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player) {
return new ItemStack(ModBlocks.PLAYER_DETECTOR, 1, typeNamesList.indexOf(state.getValue(TYPE)));
}
@Override
public Item getItemDropped(IBlockState state, Random rand, int fortune) {
return Item.getItemFromBlock(this);
}
@Override
@SideOnly(Side.CLIENT)
public void getSubBlocks(CreativeTabs creativeTabs, NonNullList<ItemStack> list) {
for (int meta = 0; meta < types.length; meta++) {
list.add(new ItemStack(this, 1, meta));
}
}
@Override
public boolean canConnectRedstone(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) {
return true;
}
@Override
public boolean canProvidePower(IBlockState state) {
return true;
}
@Override
public int getWeakPower(IBlockState blockState, IBlockAccess blockAccess, BlockPos pos, EnumFacing side) {
TileEntity entity = blockAccess.getTileEntity(pos);
if (entity instanceof TilePlayerDectector) {
return ((TilePlayerDectector) entity).isProvidingPower() ? 15 : 0;
}
return 0;
}
@Override
public int getStrongPower(IBlockState blockState, IBlockAccess blockAccess, BlockPos pos, EnumFacing side) {
TileEntity entity = blockAccess.getTileEntity(pos);
if (entity instanceof TilePlayerDectector) {
return ((TilePlayerDectector) entity).isProvidingPower() ? 15 : 0;
}
return 0;
}
}

View file

@ -39,7 +39,7 @@ public class BlockRecycler extends BlockMachineBase {
public BlockRecycler() {
super();
this.setCreativeTab(TechRebornCreativeTab.instance);
setCreativeTab(TechRebornCreativeTab.instance);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier1_machines"));
}
@ -51,6 +51,5 @@ public class BlockRecycler extends BlockMachineBase {
@Override
public IMachineGuiHandler getGui() {
return EGui.RECYCLER;
}
}
}

View file

@ -39,7 +39,7 @@ public class BlockRollingMachine extends BlockMachineBase {
public BlockRollingMachine() {
super();
this.setCreativeTab(TechRebornCreativeTab.instance);
setCreativeTab(TechRebornCreativeTab.instance);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier1_machines"));
}

View file

@ -39,7 +39,7 @@ public class BlockScrapboxinator extends BlockMachineBase {
public BlockScrapboxinator() {
super();
this.setCreativeTab(TechRebornCreativeTab.instance);
setCreativeTab(TechRebornCreativeTab.instance);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier1_machines"));
}
@ -52,5 +52,4 @@ public class BlockScrapboxinator extends BlockMachineBase {
public IMachineGuiHandler getGui() {
return EGui.SCRAPBOXINATOR;
}
}

View file

@ -39,7 +39,7 @@ public class BlockChargeOMat extends BlockMachineBase {
public BlockChargeOMat() {
super();
this.setCreativeTab(TechRebornCreativeTab.instance);
setCreativeTab(TechRebornCreativeTab.instance);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier2_machines"));
}
@ -52,4 +52,9 @@ public class BlockChargeOMat extends BlockMachineBase {
public IMachineGuiHandler getGui() {
return EGui.CHARGEBENCH;
}
@Override
public boolean isAdvanced() {
return true;
}
}

View file

@ -39,7 +39,7 @@ public class BlockChemicalReactor extends BlockMachineBase {
public BlockChemicalReactor() {
super();
this.setCreativeTab(TechRebornCreativeTab.instance);
setCreativeTab(TechRebornCreativeTab.instance);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier2_machines"));
}
@ -52,4 +52,9 @@ public class BlockChemicalReactor extends BlockMachineBase {
public IMachineGuiHandler getGui() {
return EGui.CHEMICAL_REACTOR;
}
@Override
public boolean isAdvanced() {
return true;
}
}

View file

@ -50,7 +50,7 @@ public class BlockDigitalChest extends BlockMachineBase {
public BlockDigitalChest() {
super();
this.setUnlocalizedName("techreborn.digitalChest");
this.setCreativeTab(TechRebornCreativeTab.instance);
setCreativeTab(TechRebornCreativeTab.instance);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier2_machines"));
}
@ -80,4 +80,9 @@ public class BlockDigitalChest extends BlockMachineBase {
public IMachineGuiHandler getGui() {
return EGui.DIGITAL_CHEST;
}
@Override
public boolean isAdvanced() {
return true;
}
}

View file

@ -39,7 +39,7 @@ public class BlockImplosionCompressor extends BlockMachineBase {
public BlockImplosionCompressor() {
super();
this.setCreativeTab(TechRebornCreativeTab.instance);
setCreativeTab(TechRebornCreativeTab.instance);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier2_machines"));
}
@ -52,4 +52,9 @@ public class BlockImplosionCompressor extends BlockMachineBase {
public IMachineGuiHandler getGui() {
return EGui.IMPLOSION_COMPRESSOR;
}
@Override
public boolean isAdvanced() {
return true;
}
}

View file

@ -39,7 +39,7 @@ public class BlockIndustrialBlastFurnace extends BlockMachineBase {
public BlockIndustrialBlastFurnace() {
super();
this.setCreativeTab(TechRebornCreativeTab.instance);
setCreativeTab(TechRebornCreativeTab.instance);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier2_machines"));
}

View file

@ -39,7 +39,7 @@ public class BlockIndustrialCentrifuge extends BlockMachineBase {
public BlockIndustrialCentrifuge() {
super();
this.setCreativeTab(TechRebornCreativeTab.instance);
setCreativeTab(TechRebornCreativeTab.instance);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier2_machines"));
}
@ -52,4 +52,9 @@ public class BlockIndustrialCentrifuge extends BlockMachineBase {
public IMachineGuiHandler getGui() {
return EGui.CENTRIFUGE;
}
@Override
public boolean isAdvanced() {
return true;
}
}

View file

@ -39,7 +39,7 @@ public class BlockIndustrialElectrolyzer extends BlockMachineBase {
public BlockIndustrialElectrolyzer() {
super();
this.setCreativeTab(TechRebornCreativeTab.instance);
setCreativeTab(TechRebornCreativeTab.instance);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier2_machines"));
}
@ -52,4 +52,9 @@ public class BlockIndustrialElectrolyzer extends BlockMachineBase {
public IMachineGuiHandler getGui() {
return EGui.INDUSTRIAL_ELECTROLYZER;
}
@Override
public boolean isAdvanced() {
return true;
}
}

View file

@ -39,7 +39,7 @@ public class BlockIndustrialGrinder extends BlockMachineBase {
public BlockIndustrialGrinder() {
super();
this.setCreativeTab(TechRebornCreativeTab.instance);
setCreativeTab(TechRebornCreativeTab.instance);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier2_machines"));
}
@ -52,4 +52,9 @@ public class BlockIndustrialGrinder extends BlockMachineBase {
public IMachineGuiHandler getGui() {
return EGui.INDUSTRIAL_GRINDER;
}
@Override
public boolean isAdvanced() {
return true;
}
}

View file

@ -39,7 +39,7 @@ public class BlockIndustrialSawmill extends BlockMachineBase {
public BlockIndustrialSawmill() {
super();
this.setCreativeTab(TechRebornCreativeTab.instance);
setCreativeTab(TechRebornCreativeTab.instance);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier2_machines"));
}
@ -52,4 +52,9 @@ public class BlockIndustrialSawmill extends BlockMachineBase {
public IMachineGuiHandler getGui() {
return EGui.SAWMILL;
}
@Override
public boolean isAdvanced() {
return true;
}
}

View file

@ -52,4 +52,9 @@ public class BlockVacuumFreezer extends BlockMachineBase {
public IMachineGuiHandler getGui() {
return EGui.VACUUM_FREEZER;
}
@Override
public boolean isAdvanced() {
return true;
}
}

View file

@ -39,7 +39,7 @@ public class BlockChunkLoader extends BlockMachineBase {
public BlockChunkLoader() {
super();
this.setCreativeTab(TechRebornCreativeTab.instance);
setCreativeTab(TechRebornCreativeTab.instance);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier3_machines"));
}
@ -52,4 +52,9 @@ public class BlockChunkLoader extends BlockMachineBase {
public IMachineGuiHandler getGui() {
return EGui.CHUNK_LOADER;
}
@Override
public boolean isAdvanced() {
return true;
}
}

View file

@ -39,7 +39,7 @@ public class BlockMatterFabricator extends BlockMachineBase {
public BlockMatterFabricator() {
super();
this.setCreativeTab(TechRebornCreativeTab.instance);
setCreativeTab(TechRebornCreativeTab.instance);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier3_machines"));
}

View file

@ -50,8 +50,7 @@ public class BlockQuantumChest extends BlockMachineBase {
public BlockQuantumChest() {
super();
this.setUnlocalizedName("techreborn.quantumChest");
this.setCreativeTab(TechRebornCreativeTab.instance);
this.setHardness(2.0F);
setCreativeTab(TechRebornCreativeTab.instance);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier3_machines"));
}

View file

@ -39,8 +39,7 @@ public class BlockQuantumTank extends BlockMachineBase {
public BlockQuantumTank() {
super();
this.setHardness(2.0F);
this.setCreativeTab(TechRebornCreativeTab.instance);
setCreativeTab(TechRebornCreativeTab.instance);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier3_machines"));
}
@ -53,4 +52,9 @@ public class BlockQuantumTank extends BlockMachineBase {
public IMachineGuiHandler getGui() {
return EGui.QUANTUM_TANK;
}
@Override
public boolean isAdvanced() {
return true;
}
}