Considerably cleanup the codeside implementation of lattices

dev
Arona Jones 2015-11-05 19:25:01 +00:00
parent f79b968198
commit 1d683bc5f4
31 changed files with 13 additions and 303 deletions

View File

@ -28,7 +28,7 @@ import cpw.mods.fml.relauncher.SideOnly;
import boilerplate.common.baseclasses.blocks.BaseMetadataBlock;
import steamcraft.client.lib.RenderIDs;
import steamcraft.common.Steamcraft;
import steamcraft.common.init.InitBlocks;
import steamcraft.common.lib.LibInfo;
import steamcraft.common.lib.ModInfo;
/**
@ -38,10 +38,12 @@ import steamcraft.common.lib.ModInfo;
public class BlockMetalLattice extends BaseMetadataBlock
{
public IIcon[] icon = new IIcon[8];
String textureSuffix;
public BlockMetalLattice()
public BlockMetalLattice(String suffix)
{
super(Material.iron);
this.textureSuffix = suffix;
this.setHardness(1.5F);
this.setResistance(5.0F);
this.setStepSound(Block.soundTypeMetal);
@ -62,14 +64,8 @@ public class BlockMetalLattice extends BaseMetadataBlock
@SideOnly(Side.CLIENT)
public void registerBlockIcons(final IIconRegister ir)
{
this.icon[0] = ir.registerIcon(ModInfo.PREFIX + "metal/" + "blockAluminumLattice");
this.icon[1] = ir.registerIcon(ModInfo.PREFIX + "metal/" + "blockCopperLattice");
this.icon[2] = ir.registerIcon(ModInfo.PREFIX + "metal/" + "blockTinLattice");
this.icon[3] = ir.registerIcon(ModInfo.PREFIX + "metal/" + "blockZincLattice");
this.icon[4] = ir.registerIcon(ModInfo.PREFIX + "metal/" + "blockBrassLattice");
this.icon[5] = ir.registerIcon(ModInfo.PREFIX + "metal/" + "blockBronzeLattice");
this.icon[6] = ir.registerIcon(ModInfo.PREFIX + "metal/" + "blockSteelLattice");
this.icon[7] = ir.registerIcon(ModInfo.PREFIX + "metal/" + "blockCastIronLattice");
for (int i = 0; i < this.icon.length; i++)
this.icon[i] = ir.registerIcon(ModInfo.PREFIX + "frame/" + "block" + LibInfo.metals[i] + textureSuffix);
}
@SuppressWarnings({ "rawtypes", "unchecked" })
@ -78,7 +74,7 @@ public class BlockMetalLattice extends BaseMetadataBlock
public void getSubBlocks(final Item item, final CreativeTabs tab, final List l)
{
for (int var4 = 0; var4 < this.icon.length; ++var4)
l.add(new ItemStack(InitBlocks.blockMetalLattice, 1, var4));
l.add(new ItemStack(this, 1, var4));
}
@Override

View File

@ -1,57 +0,0 @@
/**
* This class was created by BrassGoggledCoders modding team.
* This class is available as part of the Steamcraft 2 Mod for Minecraft.
*
* Steamcraft 2 is open-source and is distributed under the MMPL v1.0 License.
* (http://www.mod-buildcraft.com/MMPL-1.0.txt)
*
* Steamcraft 2 is based on the original Steamcraft Mod created by Proloe.
* Steamcraft (c) Proloe 2011
* (http://www.minecraftforum.net/topic/251532-181-steamcraft-source-code-releasedmlv054wip/)
*
*/
package steamcraft.common.blocks;
import java.util.List;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import steamcraft.common.init.InitBlocks;
import steamcraft.common.lib.ModInfo;
/**
* @author warlordjones
*
*/
public class BlockMetalLatticeThin extends BlockMetalLattice
{
@Override
@SideOnly(Side.CLIENT)
public void registerBlockIcons(final IIconRegister ir)
{
this.icon[0] = ir.registerIcon(ModInfo.PREFIX + "metal/" + "blockAluminumLatticeThin");
this.icon[1] = ir.registerIcon(ModInfo.PREFIX + "metal/" + "blockCopperLatticeThin");
this.icon[2] = ir.registerIcon(ModInfo.PREFIX + "metal/" + "blockTinLatticeThin");
this.icon[3] = ir.registerIcon(ModInfo.PREFIX + "metal/" + "blockZincLatticeThin");
this.icon[4] = ir.registerIcon(ModInfo.PREFIX + "metal/" + "blockBrassLatticeThin");
this.icon[5] = ir.registerIcon(ModInfo.PREFIX + "metal/" + "blockBronzeLatticeThin");
this.icon[6] = ir.registerIcon(ModInfo.PREFIX + "metal/" + "blockSteelLatticeThin");
this.icon[7] = ir.registerIcon(ModInfo.PREFIX + "metal/" + "blockCastIronLatticeThin");
}
@SuppressWarnings({ "rawtypes", "unchecked" })
@Override
@SideOnly(Side.CLIENT)
public void getSubBlocks(final Item item, final CreativeTabs tab, final List l)
{
for (int var4 = 0; var4 < this.icon.length; ++var4)
l.add(new ItemStack(InitBlocks.blockMetalLatticeThin, 1, var4));
}
}

View File

@ -1,56 +0,0 @@
/**
* This class was created by BrassGoggledCoders modding team.
* This class is available as part of the Steamcraft 2 Mod for Minecraft.
*
* Steamcraft 2 is open-source and is distributed under the MMPL v1.0 License.
* (http://www.mod-buildcraft.com/MMPL-1.0.txt)
*
* Steamcraft 2 is based on the original Steamcraft Mod created by Proloe.
* Steamcraft (c) Proloe 2011
* (http://www.minecraftforum.net/topic/251532-181-steamcraft-source-code-releasedmlv054wip/)
*
*/
package steamcraft.common.blocks;
import java.util.List;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import steamcraft.common.init.InitBlocks;
import steamcraft.common.lib.ModInfo;
/**
* @author warlordjones
*
*/
public class BlockMossyMetalLattice extends BlockMetalLattice
{
@Override
@SideOnly(Side.CLIENT)
public void registerBlockIcons(final IIconRegister ir)
{
this.icon[0] = ir.registerIcon(ModInfo.PREFIX + "metal/" + "blockMossyAluminumLattice");
this.icon[1] = ir.registerIcon(ModInfo.PREFIX + "metal/" + "blockMossyCopperLattice");
this.icon[2] = ir.registerIcon(ModInfo.PREFIX + "metal/" + "blockMossyTinLattice");
this.icon[3] = ir.registerIcon(ModInfo.PREFIX + "metal/" + "blockMossyZincLattice");
this.icon[4] = ir.registerIcon(ModInfo.PREFIX + "metal/" + "blockMossyBrassLattice");
this.icon[5] = ir.registerIcon(ModInfo.PREFIX + "metal/" + "blockMossyBronzeLattice");
this.icon[6] = ir.registerIcon(ModInfo.PREFIX + "metal/" + "blockMossySteelLattice");
this.icon[7] = ir.registerIcon(ModInfo.PREFIX + "metal/" + "blockMossyCastIronLattice");
}
@SuppressWarnings({ "rawtypes", "unchecked" })
@Override
@SideOnly(Side.CLIENT)
public void getSubBlocks(final Item item, final CreativeTabs tab, final List l)
{
for (int var4 = 0; var4 < this.icon.length; ++var4)
l.add(new ItemStack(InitBlocks.blockMossyMetalLattice, 1, var4));
}
}

View File

@ -1,56 +0,0 @@
/**
* This class was created by BrassGoggledCoders modding team.
* This class is available as part of the Steamcraft 2 Mod for Minecraft.
*
* Steamcraft 2 is open-source and is distributed under the MMPL v1.0 License.
* (http://www.mod-buildcraft.com/MMPL-1.0.txt)
*
* Steamcraft 2 is based on the original Steamcraft Mod created by Proloe.
* Steamcraft (c) Proloe 2011
* (http://www.minecraftforum.net/topic/251532-181-steamcraft-source-code-releasedmlv054wip/)
*
*/
package steamcraft.common.blocks;
import java.util.List;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import steamcraft.common.init.InitBlocks;
import steamcraft.common.lib.ModInfo;
/**
* @author warlordjones
*
*/
public class BlockMossyMetalLatticeThin extends BlockMetalLattice
{
@Override
@SideOnly(Side.CLIENT)
public void registerBlockIcons(final IIconRegister ir)
{
this.icon[0] = ir.registerIcon(ModInfo.PREFIX + "metal/" + "blockMossyAluminumLatticeThin");
this.icon[1] = ir.registerIcon(ModInfo.PREFIX + "metal/" + "blockMossyCopperLatticeThin");
this.icon[2] = ir.registerIcon(ModInfo.PREFIX + "metal/" + "blockMossyTinLatticeThin");
this.icon[3] = ir.registerIcon(ModInfo.PREFIX + "metal/" + "blockMossyZincLatticeThin");
this.icon[4] = ir.registerIcon(ModInfo.PREFIX + "metal/" + "blockMossyBrassLatticeThin");
this.icon[5] = ir.registerIcon(ModInfo.PREFIX + "metal/" + "blockMossyBronzeLatticeThin");
this.icon[6] = ir.registerIcon(ModInfo.PREFIX + "metal/" + "blockMossySteelLatticeThin");
this.icon[7] = ir.registerIcon(ModInfo.PREFIX + "metal/" + "blockMossyCastIronLatticeThin");
}
@SuppressWarnings({ "rawtypes", "unchecked" })
@Override
@SideOnly(Side.CLIENT)
public void getSubBlocks(final Item item, final CreativeTabs tab, final List l)
{
for (int var4 = 0; var4 < this.icon.length; ++var4)
l.add(new ItemStack(InitBlocks.blockMossyMetalLatticeThin, 1, var4));
}
}

View File

@ -1,56 +0,0 @@
/**
* This class was created by BrassGoggledCoders modding team.
* This class is available as part of the Steamcraft 2 Mod for Minecraft.
*
* Steamcraft 2 is open-source and is distributed under the MMPL v1.0 License.
* (http://www.mod-buildcraft.com/MMPL-1.0.txt)
*
* Steamcraft 2 is based on the original Steamcraft Mod created by Proloe.
* Steamcraft (c) Proloe 2011
* (http://www.minecraftforum.net/topic/251532-181-steamcraft-source-code-releasedmlv054wip/)
*
*/
package steamcraft.common.blocks;
import java.util.List;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import steamcraft.common.init.InitBlocks;
import steamcraft.common.lib.ModInfo;
/**
* @author warlordjones
*
*/
public class BlockRustyMetalLattice extends BlockMetalLattice
{
@Override
@SideOnly(Side.CLIENT)
public void registerBlockIcons(final IIconRegister ir)
{
this.icon[0] = ir.registerIcon(ModInfo.PREFIX + "metal/" + "blockRustyAluminumLattice");
this.icon[1] = ir.registerIcon(ModInfo.PREFIX + "metal/" + "blockRustyCopperLattice");
this.icon[2] = ir.registerIcon(ModInfo.PREFIX + "metal/" + "blockRustyTinLattice");
this.icon[3] = ir.registerIcon(ModInfo.PREFIX + "metal/" + "blockRustyZincLattice");
this.icon[4] = ir.registerIcon(ModInfo.PREFIX + "metal/" + "blockRustyBrassLattice");
this.icon[5] = ir.registerIcon(ModInfo.PREFIX + "metal/" + "blockRustyBronzeLattice");
this.icon[6] = ir.registerIcon(ModInfo.PREFIX + "metal/" + "blockRustySteelLattice");
this.icon[7] = ir.registerIcon(ModInfo.PREFIX + "metal/" + "blockRustyCastIronLattice");
}
@SuppressWarnings({ "rawtypes", "unchecked" })
@Override
@SideOnly(Side.CLIENT)
public void getSubBlocks(final Item item, final CreativeTabs tab, final List l)
{
for (int var4 = 0; var4 < this.icon.length; ++var4)
l.add(new ItemStack(InitBlocks.blockRustyMetalLattice, 1, var4));
}
}

View File

@ -1,56 +0,0 @@
/**
* This class was created by BrassGoggledCoders modding team.
* This class is available as part of the Steamcraft 2 Mod for Minecraft.
*
* Steamcraft 2 is open-source and is distributed under the MMPL v1.0 License.
* (http://www.mod-buildcraft.com/MMPL-1.0.txt)
*
* Steamcraft 2 is based on the original Steamcraft Mod created by Proloe.
* Steamcraft (c) Proloe 2011
* (http://www.minecraftforum.net/topic/251532-181-steamcraft-source-code-releasedmlv054wip/)
*
*/
package steamcraft.common.blocks;
import java.util.List;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import steamcraft.common.init.InitBlocks;
import steamcraft.common.lib.ModInfo;
/**
* @author warlordjones
*
*/
public class BlockRustyMetalLatticeThin extends BlockMetalLattice
{
@Override
@SideOnly(Side.CLIENT)
public void registerBlockIcons(final IIconRegister ir)
{
this.icon[0] = ir.registerIcon(ModInfo.PREFIX + "metal/" + "blockRustyAluminumLatticeThin");
this.icon[1] = ir.registerIcon(ModInfo.PREFIX + "metal/" + "blockRustyCopperLatticeThin");
this.icon[2] = ir.registerIcon(ModInfo.PREFIX + "metal/" + "blockRustyTinLatticeThin");
this.icon[3] = ir.registerIcon(ModInfo.PREFIX + "metal/" + "blockRustyZincLatticeThin");
this.icon[4] = ir.registerIcon(ModInfo.PREFIX + "metal/" + "blockRustyBrassLatticeThin");
this.icon[5] = ir.registerIcon(ModInfo.PREFIX + "metal/" + "blockRustyBronzeLatticeThin");
this.icon[6] = ir.registerIcon(ModInfo.PREFIX + "metal/" + "blockRustySteelLatticeThin");
this.icon[7] = ir.registerIcon(ModInfo.PREFIX + "metal/" + "blockRustyCastIronLatticeThin");
}
@SuppressWarnings({ "rawtypes", "unchecked" })
@Override
@SideOnly(Side.CLIENT)
public void getSubBlocks(final Item item, final CreativeTabs tab, final List l)
{
for (int var4 = 0; var4 < this.icon.length; ++var4)
l.add(new ItemStack(InitBlocks.blockRustyMetalLatticeThin, 1, var4));
}
}

View File

@ -62,18 +62,13 @@ import steamcraft.common.blocks.BlockLightSlate;
import steamcraft.common.blocks.BlockMeltingIce;
import steamcraft.common.blocks.BlockMetal;
import steamcraft.common.blocks.BlockMetalLattice;
import steamcraft.common.blocks.BlockMetalLatticeThin;
import steamcraft.common.blocks.BlockMossyMetal;
import steamcraft.common.blocks.BlockMossyMetalLattice;
import steamcraft.common.blocks.BlockMossyMetalLatticeThin;
import steamcraft.common.blocks.BlockMotionSensor;
import steamcraft.common.blocks.BlockMud;
import steamcraft.common.blocks.BlockPlankStack;
import steamcraft.common.blocks.BlockPlating;
import steamcraft.common.blocks.BlockPolishedPlanks;
import steamcraft.common.blocks.BlockRustyMetal;
import steamcraft.common.blocks.BlockRustyMetalLattice;
import steamcraft.common.blocks.BlockRustyMetalLatticeThin;
import steamcraft.common.blocks.BlockSiren;
import steamcraft.common.blocks.BlockSkyrail;
import steamcraft.common.blocks.BlockSlate;
@ -471,18 +466,18 @@ public class InitBlocks
blockMossyMetalPlate = new BlockPlating(blockMossyMetal).setBlockName("blockMossyMetalPlate");
registerBlock(blockMossyMetalPlate, BaseItemBlockWithMetadata.class, "BlockMossyMetalPlating", 8);
blockMetalLattice = new BlockMetalLattice().setBlockName("blockMetalLattice");
blockMetalLattice = new BlockMetalLattice("Lattice").setBlockName("blockMetalLattice");
registerBlock(blockMetalLattice, BaseItemBlockWithMetadata.class, "BlockMetalLattice", 8);
blockRustyMetalLattice = new BlockRustyMetalLattice().setBlockName("blockRustyMetalLattice");
blockRustyMetalLattice = new BlockMetalLattice("LatticeRusty").setBlockName("blockRustyMetalLattice");
registerBlock(blockRustyMetalLattice, BaseItemBlockWithMetadata.class, "BlockRustyMetalLattice", 8);
blockMossyMetalLattice = new BlockMossyMetalLattice().setBlockName("blockMossyMetalLattice");
blockMossyMetalLattice = new BlockMetalLattice("LatticeMossy").setBlockName("blockMossyMetalLattice");
registerBlock(blockMossyMetalLattice, BaseItemBlockWithMetadata.class, "BlockMossyMetalLattice", 8);
blockMetalLatticeThin = new BlockMetalLatticeThin().setBlockName("blockMetalLatticeThin");
blockMetalLatticeThin = new BlockMetalLattice("LatticeThin").setBlockName("blockMetalLatticeThin");
registerBlock(blockMetalLatticeThin, BaseItemBlockWithMetadata.class, "BlockMetalLatticeThin", 8);
blockRustyMetalLatticeThin = new BlockRustyMetalLatticeThin().setBlockName("blockRustyMetalLatticeThin");
blockRustyMetalLatticeThin = new BlockMetalLattice("LatticeThinRusty").setBlockName("blockRustyMetalLatticeThin");
registerBlock(blockRustyMetalLatticeThin, BaseItemBlockWithMetadata.class, "BlockRustyMetalLatticeThin", 8);
blockMossyMetalLatticeThin = new BlockMossyMetalLatticeThin().setBlockName("blockMossyMetalLatticeThin");
blockMossyMetalLatticeThin = new BlockMetalLattice("LatticeThinMossy").setBlockName("blockMossyMetalLatticeThin");
registerBlock(blockMossyMetalLatticeThin, BaseItemBlockWithMetadata.class, "BlockMossyMetalLatticeThin", 8);
blockUranium = new BlockUranium(Material.iron).setBlockName("blockUranium");

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.5 KiB