Solar panels and buildscript cleanup

This commit is contained in:
fewizz committed 2016-05-25 17:22:04 +03:00
1 parent 0166b8b26c
commit bc0f99cd33
29 files changed
+613 -617

No files matched your search

+171 -118
View File
@@ -3,13 +3,20 @@ package emt.block;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import emt.EMT;
import emt.block.BlockBaseContainer.IconSet;
import emt.tile.TileEntityEMT;
import emt.tile.solar.air.TileEntityAirSolar;
import emt.tile.solar.air.TileEntityDoubleAirSolar;
import emt.tile.solar.air.TileEntityTripleAirSolar;
import emt.tile.solar.compressed.TileEntityCompressedSolar;
import emt.tile.solar.compressed.TileEntityDoubleCompressedSolar;
import emt.tile.solar.compressed.TileEntityTripleCompressedSolar;
import emt.tile.solar.dark.TileEntityDarkSolar;
import emt.tile.solar.dark.TileEntityDoubleDarkSolar;
import emt.tile.solar.dark.TileEntityTripleDarkSolar;
import emt.tile.solar.earth.TileEntityDoubleEarthSolar;
import emt.tile.solar.earth.TileEntityEarthSolar;
import emt.tile.solar.earth.TileEntityTripleEarthSolar;
import emt.tile.solar.fire.TileEntityDoubleFireSolar;
import emt.tile.solar.fire.TileEntityFireSolar;
import emt.tile.solar.fire.TileEntityTripleFireSolar;
@@ -26,151 +33,197 @@ import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import java.util.List;
public class BlockSolars extends BlockBaseContainer {
public BlockSolars(String name) {
super(name, Material.iron, soundTypeMetal, 4.0F);
public BlockSolars(String name, int countOfMetas, int instance) {
super(name, Material.iron, soundTypeMetal, countOfMetas, instance, 4.0F);
}
@Override
@SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister ri) {
this.top[0] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/solartop");
this.top[1] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/doublesolartop");
this.top[2] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/triplesolartop");
this.top[3] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/solartop");
this.top[4] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/doublesolartop");
this.top[5] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/triplesolartop");
this.top[6] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/solartop");
this.top[7] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/doublesolartop");
this.top[8] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/triplesolartop");
this.top[9] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/solartop");
this.top[10] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/doublesolartop");
this.top[11] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/triplesolartop");
this.top[12] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/solartop");
this.top[13] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/doublesolartop");
this.top[14] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/triplesolartop");
this.top[15] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/solartop");
public void registerBlockIcons(IIconRegister ir) {
IIcon solarTop = ir.registerIcon(EMT.TEXTURE_PATH + ":solars/solartop");
IIcon doubleSolarTop = ir.registerIcon(EMT.TEXTURE_PATH + ":solars/doublesolartop");
IIcon tripleSolarTop = ir.registerIcon(EMT.TEXTURE_PATH + ":solars/triplesolartop");
IIcon bottom = ir.registerIcon(EMT.TEXTURE_PATH + ":solars/bottom");
this.bottom[0] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/bottom");
this.bottom[1] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/bottom");
this.bottom[2] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/bottom");
this.bottom[3] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/bottom");
this.bottom[4] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/bottom");
this.bottom[5] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/bottom");
this.bottom[6] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/bottom");
this.bottom[7] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/bottom");
this.bottom[8] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/bottom");
this.bottom[9] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/bottom");
this.bottom[10] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/bottom");
this.bottom[11] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/bottom");
this.bottom[12] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/bottom");
this.bottom[13] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/bottom");
this.bottom[14] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/bottom");
this.bottom[15] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/bottom");
if(instance == 0) {
iconSets[0].top = solarTop;
iconSets[1].top = doubleSolarTop;
iconSets[2].top = tripleSolarTop;
iconSets[3].top = solarTop;
iconSets[4].top = doubleSolarTop;
iconSets[5].top = tripleSolarTop;
iconSets[6].top = solarTop;
iconSets[7].top = doubleSolarTop;
iconSets[8].top = tripleSolarTop;
iconSets[9].top = solarTop;
iconSets[10].top = doubleSolarTop;
iconSets[11].top = tripleSolarTop;
iconSets[12].top = solarTop;
iconSets[13].top = doubleSolarTop;
iconSets[14].top = tripleSolarTop;
iconSets[15].top = solarTop;
iconSets[0].bottom = bottom;
iconSets[1].bottom = bottom;
iconSets[2].bottom = bottom;
iconSets[3].bottom = bottom;
iconSets[4].bottom = bottom;
iconSets[5].bottom = bottom;
iconSets[6].bottom = bottom;
iconSets[7].bottom = bottom;
iconSets[8].bottom = bottom;
iconSets[9].bottom = bottom;
iconSets[10].bottom = bottom;
iconSets[11].bottom = bottom;
iconSets[12].bottom = bottom;
iconSets[13].bottom = bottom;
iconSets[14].bottom = bottom;
iconSets[15].bottom = bottom;
IIcon side = ir.registerIcon(EMT.TEXTURE_PATH + ":solars/side");
IIcon waterSide = ir.registerIcon(EMT.TEXTURE_PATH + ":solars/water/waterside");
IIcon darkSide = ir.registerIcon(EMT.TEXTURE_PATH + ":solars/dark/darkside");
IIcon orderSide = ir.registerIcon(EMT.TEXTURE_PATH + ":solars/order/orderside");
IIcon fireSide = ir.registerIcon(EMT.TEXTURE_PATH + ":solars/fire/fireside");
IIcon airSide = ir.registerIcon(EMT.TEXTURE_PATH + ":solars/air/airside");
iconSets[0].side = side;
iconSets[1].side = side;
iconSets[2].side = side;
iconSets[3].side = waterSide;
iconSets[4].side = waterSide;
iconSets[5].side = waterSide;
iconSets[6].side = darkSide;
iconSets[7].side = darkSide;
iconSets[8].side = darkSide;
iconSets[9].side = orderSide;
iconSets[10].side = orderSide;
iconSets[11].side = orderSide;
iconSets[12].side = fireSide;
iconSets[13].side = fireSide;
iconSets[14].side = fireSide;
iconSets[15].side = airSide;
}
if(instance == 1) {
iconSets[0].top = doubleSolarTop;
iconSets[1].top = tripleSolarTop;
iconSets[2].top = solarTop;
iconSets[3].top = doubleSolarTop;
iconSets[4].top = tripleSolarTop;
this.frontOff[0] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/side");
this.frontOff[1] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/side");
this.frontOff[2] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/side");
this.frontOff[3] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/water/waterside");
this.frontOff[4] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/water/waterside");
this.frontOff[5] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/water/waterside");
this.frontOff[6] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/dark/darkside");
this.frontOff[7] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/dark/darkside");
this.frontOff[8] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/dark/darkside");
this.frontOff[9] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/order/orderside");
this.frontOff[10] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/order/orderside");
this.frontOff[11] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/order/orderside");
this.frontOff[12] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/fire/fireside");
this.frontOff[13] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/fire/fireside");
this.frontOff[14] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/fire/fireside");
this.frontOff[15] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/air/airside");
iconSets[0].bottom = bottom;
iconSets[1].bottom = bottom;
iconSets[2].bottom = bottom;
iconSets[3].bottom = bottom;
iconSets[4].bottom = bottom;
this.side[0] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/side");
this.side[1] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/side");
this.side[2] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/side");
this.side[3] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/water/waterside");
this.side[4] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/water/waterside");
this.side[5] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/water/waterside");
this.side[6] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/dark/darkside");
this.side[7] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/dark/darkside");
this.side[8] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/dark/darkside");
this.side[9] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/order/orderside");
this.side[10] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/order/orderside");
this.side[11] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/order/orderside");
this.side[12] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/fire/fireside");
this.side[13] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/fire/fireside");
this.side[14] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/fire/fireside");
this.side[15] = ri.registerIcon(EMT.TEXTURE_PATH + ":solars/air/airside");
IIcon airSide = ir.registerIcon(EMT.TEXTURE_PATH + ":solars/air/airside");
IIcon earthSide = ir.registerIcon(EMT.TEXTURE_PATH + ":solars/earth/earthside");
iconSets[0].side = airSide;
iconSets[1].side = airSide;
iconSets[2].side = earthSide;
iconSets[3].side = earthSide;
iconSets[4].side = earthSide;
}
}
@SideOnly(Side.CLIENT)
public void getSubBlocks(Item id, CreativeTabs tab, List list) {
for (int i = 0; i <= 15; i++) {
list.add(new ItemStack(id, 1, i));
if (instance == 0) {
for (int meta = 0; meta < 16; meta++) {
list.add(new ItemStack(id, 1, meta));
}
}
if (instance == 1) {
for (int meta = 0; meta < 5; meta++) {
list.add(new ItemStack(id, 1, meta));
}
}
}
@Override
public IIcon getIcon(int side, int meta) {
if (side < 1) {
return iconSets[meta].bottom;
}
if (side == 1) {
return iconSets[meta].top;
}
return iconSets[meta].side;
}
@Override
public TileEntity createTileEntity(World world, int meta) {
if (meta == 0) {
return new TileEntityCompressedSolar();
if (instance == 0) {
switch (meta) {
case 0:
return new TileEntityCompressedSolar();
case 1:
return new TileEntityDoubleCompressedSolar();
case 2:
return new TileEntityTripleCompressedSolar();
case 3:
return new TileEntityWaterSolar();
case 4:
return new TileEntityDoubleWaterSolar();
case 5:
return new TileEntityTripleWaterSolar();
case 6:
return new TileEntityDarkSolar();
case 7:
return new TileEntityDoubleDarkSolar();
case 8:
return new TileEntityTripleDarkSolar();
case 9:
return new TileEntityOrderSolar();
case 10:
return new TileEntityDoubleOrderSolar();
case 11:
return new TileEntityTripleOrderSolar();
case 12:
return new TileEntityFireSolar();
case 13:
return new TileEntityDoubleFireSolar();
case 14:
return new TileEntityTripleFireSolar();
case 15:
return new TileEntityAirSolar();
}
}
if (meta == 1) {
return new TileEntityDoubleCompressedSolar();
}
if (meta == 2) {
return new TileEntityTripleCompressedSolar();
}
if (meta == 3) {
return new TileEntityWaterSolar();
}
if (meta == 4) {
return new TileEntityDoubleWaterSolar();
}
if (meta == 5) {
return new TileEntityTripleWaterSolar();
}
if (meta == 6) {
return new TileEntityDarkSolar();
}
if (meta == 7) {
return new TileEntityDoubleDarkSolar();
}
if (meta == 8) {
return new TileEntityTripleDarkSolar();
}
if (meta == 9) {
return new TileEntityOrderSolar();
}
if (meta == 10) {
return new TileEntityDoubleOrderSolar();
}
if (meta == 11) {
return new TileEntityTripleOrderSolar();
}
if (meta == 12) {
return new TileEntityFireSolar();
}
if (meta == 13) {
return new TileEntityDoubleFireSolar();
}
if (meta == 14) {
return new TileEntityTripleFireSolar();
}
if (meta == 15) {
return new TileEntityAirSolar();
if (instance == 1) {
switch (meta) {
case 0:
return new TileEntityDoubleAirSolar();
case 1:
return new TileEntityTripleAirSolar();
case 2:
return new TileEntityEarthSolar();
case 3:
return new TileEntityDoubleEarthSolar();
case 4:
return new TileEntityTripleEarthSolar();
}
}
return super.createTileEntity(world, meta);
}
@Override
public void breakBlock(World world, int x, int y, int z, Block par5, int par6) {
public void breakBlock(World world, int x, int y, int z, Block block, int meta) {
world.removeTileEntity(x, y, z);
super.breakBlock(world, x, y, z, par5, par6);
super.breakBlock(world, x, y, z, block, meta);
}
}