Skip to content

Commit

Permalink
part 2 of conversion to multiItemBlock
Browse files Browse the repository at this point in the history
  • Loading branch information
progwml6 committed Dec 19, 2013
1 parent 2ed4c11 commit 51e0833
Show file tree
Hide file tree
Showing 24 changed files with 93 additions and 335 deletions.
2 changes: 1 addition & 1 deletion build.properties
@@ -1,6 +1,6 @@
minecraft_version=1.6.4
forge_version=9.11.1.964
mantle_version=a2891a
mantle_version=2e4958
FMP_version=1.0.0.211
CCLIB_version=1.0.0.44
NEI_version=1.6.1.8
4 changes: 2 additions & 2 deletions src/main/java/tconstruct/items/blocks/GlassPaneItem.java
Expand Up @@ -4,11 +4,11 @@

public class GlassPaneItem extends MultiItemBlock
{
public static final String blockTypes[] = { "pure.pane", "soul.pane", "soul.pure.pane" };
public static final String blockTypes[] = { "pure", "soul", "soul.pure" };

public GlassPaneItem(int id)
{
super(id, "block.glass", blockTypes);
super(id, "block.glass", "pane", blockTypes);
setMaxDamage(0);
setHasSubtypes(true);
}
Expand Down
20 changes: 4 additions & 16 deletions src/main/java/tconstruct/items/blocks/MetalItemBlock.java
Expand Up @@ -2,34 +2,22 @@

import java.util.List;

import mantle.blocks.abstracts.MultiItemBlock;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.util.MathHelper;
import net.minecraft.util.StatCollector;

public class MetalItemBlock extends ItemBlock
public class MetalItemBlock extends MultiItemBlock
{
public static final String blockType[] = { "Cobalt", "Ardite", "Manyullyn", "Copper", "Bronze", "Tin", "Aluminum", "AlBrass", "Alumite", "Steel", "Ender" };
public static final String blockTypes[] = { "Cobalt", "Ardite", "Manyullyn", "Copper", "Bronze", "Tin", "Aluminum", "AlBrass", "Alumite", "Steel", "Ender" };

public MetalItemBlock(int id)
{
super(id);
super(id, "StorageMetals", blockTypes);
setMaxDamage(0);
setHasSubtypes(true);
}

public int getMetadata (int meta)
{
return meta;
}

public String getUnlocalizedName (ItemStack itemstack)
{
int pos = MathHelper.clamp_int(itemstack.getItemDamage(), 0, blockType.length - 1);
return (new StringBuilder()).append("StorageMetals.").append(blockType[pos]).toString();
}

@Override
public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4)
{
Expand Down
18 changes: 4 additions & 14 deletions src/main/java/tconstruct/items/blocks/MetalOreItemBlock.java
Expand Up @@ -2,34 +2,24 @@

import java.util.List;

import mantle.blocks.abstracts.MultiItemBlock;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.MathHelper;

public class MetalOreItemBlock extends ItemBlock
public class MetalOreItemBlock extends MultiItemBlock
{
public static final String blockType[] = { "NetherSlag", "Cobalt", "Ardite", "Copper", "Tin", "Aluminum", "Slag" };
public static final String blockTypes[] = { "NetherSlag", "Cobalt", "Ardite", "Copper", "Tin", "Aluminum", "Slag" };

public MetalOreItemBlock(int id)
{
super(id);
super(id, "MetalOre", blockTypes);
setMaxDamage(0);
setHasSubtypes(true);
}

public int getMetadata (int meta)
{
return meta;
}

public String getUnlocalizedName (ItemStack itemstack)
{
int pos = MathHelper.clamp_int(itemstack.getItemDamage(), 0, blockType.length - 1);
return (new StringBuilder()).append("MetalOre.").append(blockType[pos]).toString();
}

public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4)
{
if (stack.hasTagCompound())
Expand Down
20 changes: 4 additions & 16 deletions src/main/java/tconstruct/items/blocks/MultiBrickFancyItem.java
Expand Up @@ -2,37 +2,25 @@

import java.util.List;

import mantle.blocks.abstracts.MultiItemBlock;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.util.MathHelper;
import net.minecraft.util.StatCollector;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

public class MultiBrickFancyItem extends ItemBlock
public class MultiBrickFancyItem extends MultiItemBlock
{
static String blockType[] = { "obsidian", "sandstone", "netherrack", "stone.refined", "iron", "gold", "lapis", "diamond", "redstone", "bone", "slime", "blueslime", "endstone", "obsidian.ingot",
static String blockTypes[] = { "obsidian", "sandstone", "netherrack", "stone.refined", "iron", "gold", "lapis", "diamond", "redstone", "bone", "slime", "blueslime", "endstone", "obsidian.ingot",
"stone", "stone.road" };

public MultiBrickFancyItem(int id)
{
super(id);
super(id, "block.fancybrick", blockTypes);
setMaxDamage(0);
setHasSubtypes(true);
}

public int getMetadata (int meta)
{
return meta;
}

public String getUnlocalizedName (ItemStack itemstack)
{
int pos = MathHelper.clamp_int(itemstack.getItemDamage(), 0, blockType.length - 1);
return (new StringBuilder()).append("block.fancybrick.").append(blockType[pos]).toString();
}

@Override
@SideOnly(Side.CLIENT)
public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4)
Expand Down
18 changes: 4 additions & 14 deletions src/main/java/tconstruct/items/blocks/MultiBrickItem.java
Expand Up @@ -2,6 +2,7 @@

import java.util.List;

import mantle.blocks.abstracts.MultiItemBlock;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
Expand All @@ -10,29 +11,18 @@
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

public class MultiBrickItem extends ItemBlock
public class MultiBrickItem extends MultiItemBlock
{
static String blockType[] = { "obsidian", "sandstone", "netherrack", "stone.refined", "iron", "gold", "lapis", "diamond", "redstone", "bone", "slime", "blueslime", "endstone", "obsidian.ingot",
static String blockTypes[] = { "obsidian", "sandstone", "netherrack", "stone.refined", "iron", "gold", "lapis", "diamond", "redstone", "bone", "slime", "blueslime", "endstone", "obsidian.ingot",
"stone.road", "stone.refined.road" };

public MultiBrickItem(int id)
{
super(id);
super(id, "block.brick", blockTypes);
setMaxDamage(0);
setHasSubtypes(true);
}

public int getMetadata (int meta)
{
return meta;
}

public String getUnlocalizedName (ItemStack itemstack)
{
int pos = MathHelper.clamp_int(itemstack.getItemDamage(), 0, blockType.length - 1);
return (new StringBuilder()).append("block.brick.").append(blockType[pos]).toString();
}

@Override
@SideOnly(Side.CLIENT)
public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4)
Expand Down
19 changes: 4 additions & 15 deletions src/main/java/tconstruct/items/blocks/OreberryBushItem.java
Expand Up @@ -3,26 +3,25 @@
import java.util.List;

import tconstruct.common.TRepo;

import mantle.blocks.abstracts.MultiItemBlock;
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.util.MathHelper;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.IPlantable;
import net.minecraft.util.StatCollector;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

public class OreberryBushItem extends ItemBlock
public class OreberryBushItem extends MultiItemBlock
{
public int blockID;
public static final String blockTypes[] = { "iron", "gold", "copper", "tin", "iron", "gold", "copper", "tin", "iron", "gold", "copper", "tin", "iron", "gold", "copper", "tin" };

public OreberryBushItem(int id)
{
super(id);
super(id, "block.oreberry", blockTypes);
blockID = id + 256;
setHasSubtypes(true);
}
Expand Down Expand Up @@ -60,16 +59,6 @@ else if (player.canPlayerEdit(x, y, z, side, stack) && player.canPlayerEdit(x, y
return false;
}

/* Block name in inventory */
@Override
public String getUnlocalizedName (ItemStack itemstack)
{
int pos = MathHelper.clamp_int(itemstack.getItemDamage(), 0, blockType.length - 1);
return (new StringBuilder()).append("block.oreberry.").append(blockType[pos]).toString();
}

public static final String blockType[] = { "iron", "gold", "copper", "tin", "iron", "gold", "copper", "tin", "iron", "gold", "copper", "tin", "iron", "gold", "copper", "tin" };

@Override
@SideOnly(Side.CLIENT)
public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4)
Expand Down
17 changes: 4 additions & 13 deletions src/main/java/tconstruct/items/blocks/OreberryBushSecondItem.java
Expand Up @@ -3,7 +3,7 @@
import java.util.List;

import tconstruct.common.TRepo;

import mantle.blocks.abstracts.MultiItemBlock;
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemBlock;
Expand All @@ -16,13 +16,14 @@
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

public class OreberryBushSecondItem extends ItemBlock
public class OreberryBushSecondItem extends MultiItemBlock
{
public int blockID;
public static final String blockTypes[] = { "aluminum", "essence", "", "", "aluminum", "essence", "", "", "aluminum", "essence", "", "", "aluminum", "essence", "", "" };

public OreberryBushSecondItem(int id)
{
super(id);
super(id, "block.oreberry", blockTypes);
blockID = id + 256;
setHasSubtypes(true);
}
Expand Down Expand Up @@ -64,16 +65,6 @@ else if (player.canPlayerEdit(x, y, z, side, stack) && player.canPlayerEdit(x, y
return false;
}

/* Block name in inventory */
@Override
public String getUnlocalizedName (ItemStack itemstack)
{
int pos = MathHelper.clamp_int(itemstack.getItemDamage(), 0, blockType.length - 1);
return (new StringBuilder()).append("block.oreberry.").append(blockType[pos]).toString();
}

public static final String blockType[] = { "aluminum", "essence", "", "", "aluminum", "essence", "", "", "aluminum", "essence", "", "", "aluminum", "essence", "", "" };

@Override
@SideOnly(Side.CLIENT)
public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4)
Expand Down
17 changes: 4 additions & 13 deletions src/main/java/tconstruct/items/blocks/SearedSlabItem.java
@@ -1,28 +1,19 @@
package tconstruct.items.blocks;

import mantle.blocks.abstracts.MultiItemBlock;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.util.MathHelper;

public class SearedSlabItem extends ItemBlock
public class SearedSlabItem extends MultiItemBlock
{
public static final String blockType[] = { "brick", "stone", "cobble", "paver", "road", "fancy", "square", "creeper" };
public static final String blockTypes[] = { "brick", "stone", "cobble", "paver", "road", "fancy", "square", "creeper" };

public SearedSlabItem(int id)
{
super(id);
super(id, "block.searedstone.slab", blockTypes);
setMaxDamage(0);
setHasSubtypes(true);
}

public int getMetadata (int meta)
{
return meta;
}

public String getUnlocalizedName (ItemStack itemstack)
{
int pos = MathHelper.clamp_int(itemstack.getItemDamage(), 0, blockType.length - 1);
return (new StringBuilder()).append("block.searedstone.slab.").append(blockType[pos]).toString();
}
}
20 changes: 4 additions & 16 deletions src/main/java/tconstruct/items/blocks/SearedTableItemBlock.java
@@ -1,28 +1,16 @@
package tconstruct.items.blocks;

import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.util.MathHelper;
import mantle.blocks.abstracts.MultiItemBlock;

public class SearedTableItemBlock extends ItemBlock
public class SearedTableItemBlock extends MultiItemBlock
{
public static final String blockType[] = { "Table", "Faucet", "Basin" };
public static final String blockTypes[] = { "Table", "Faucet", "Basin" };

public SearedTableItemBlock(int id)
{
super(id);
super(id, "SearedBlock", blockTypes);
setMaxDamage(0);
setHasSubtypes(true);
}

public int getMetadata (int meta)
{
return meta;
}

public String getUnlocalizedName (ItemStack itemstack)
{
int pos = MathHelper.clamp_int(itemstack.getItemDamage(), 0, blockType.length - 1);
return (new StringBuilder()).append("SearedBlock.").append(blockType[pos]).toString();
}
}
25 changes: 4 additions & 21 deletions src/main/java/tconstruct/items/blocks/SlimeGelItemBlock.java
@@ -1,33 +1,16 @@
package tconstruct.items.blocks;

import java.util.List;
import mantle.blocks.abstracts.MultiItemBlock;

import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.util.MathHelper;

public class SlimeGelItemBlock extends ItemBlock
public class SlimeGelItemBlock extends MultiItemBlock
{
public static final String blockType[] = { "blue", "green", "purple", "magma", "yellow", "red", "metal" };
public static final String blockTypes[] = { "blue", "green", "purple", "magma", "yellow", "red", "metal" };

public SlimeGelItemBlock(int id)
{
super(id);
super(id, "block.slime.congealed", blockTypes);
setMaxDamage(0);
setHasSubtypes(true);
}

public int getMetadata (int meta)
{
return meta;
}

public String getUnlocalizedName (ItemStack itemstack)
{
int pos = MathHelper.clamp_int(itemstack.getItemDamage(), 0, blockType.length - 1);
return (new StringBuilder()).append("block.slime.congealed.").append(blockType[pos]).toString();
}
}

0 comments on commit 51e0833

Please sign in to comment.