Skip to content

Commit

Permalink
part 1 of converting to using MultiItemBlock where appropriate
Browse files Browse the repository at this point in the history
  • Loading branch information
@progwml6
progwml6 committed Dec 19, 2013
1 parent dcd1949 commit d65baae
Show file tree
Hide file tree
Showing 9 changed files with 40 additions and 118 deletions.
2 changes: 1 addition & 1 deletion build.properties
View file
@@ -1,6 +1,6 @@
minecraft_version=1.6.4
forge_version=9.11.1.964
mantle_version=40158a
mantle_version=a2891a
FMP_version=1.0.0.211
CCLIB_version=1.0.0.44
NEI_version=1.6.1.8
25 changes: 4 additions & 21 deletions src/main/java/tconstruct/items/blocks/CastingChannelItem.java
View file
@@ -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 CastingChannelItem extends ItemBlock
public class CastingChannelItem extends MultiItemBlock
{
public static final String blockType[] = { "Channel" };
public static final String blockTypes[] = { "Channel" };

public CastingChannelItem(int id)
{
super(id);
super(id, "Smeltery", 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("Smeltery.").append(blockType[pos]).toString();
}
}
20 changes: 8 additions & 12 deletions src/main/java/tconstruct/items/blocks/CraftedSoilItemBlock.java
View file
Expand Up @@ -4,34 +4,30 @@

import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
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 CraftedSoilItemBlock extends ItemBlock
public class CraftedSoilItemBlock extends MultiItemBlock
{
public static final String blockType[] = { "Slime", "Grout", "BlueSlime", "GraveyardSoil", "ConsecratedSoil", "blue", "dirt", "Grout" };
public static final String blockTypes[] = { "Slime", "Grout", "BlueSlime", "GraveyardSoil", "ConsecratedSoil", "blue", "dirt", "Grout" };

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

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

@Override
public String getUnlocalizedName (ItemStack itemstack)
{
int pos = MathHelper.clamp_int(itemstack.getItemDamage(), 0, blockType.length - 1);
int pos = MathHelper.clamp_int(itemstack.getItemDamage(), 0, this.blockType.length - 1);
if (pos <= 4)
return (new StringBuilder()).append("CraftedSoil.").append(blockType[pos]).toString();
return (new StringBuilder()).append("block.slime.soil.").append(blockType[pos]).toString();
return super.getUnlocalizedName(itemstack);
return (new StringBuilder()).append("block.slime.soil.").append(this.blockType[pos]).toString();
}

@Override
Expand Down
19 changes: 7 additions & 12 deletions src/main/java/tconstruct/items/blocks/CraftingSlabItemBlock.java
View file
@@ -1,33 +1,28 @@
package tconstruct.items.blocks;

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

public class CraftingSlabItemBlock extends ItemBlock
public class CraftingSlabItemBlock extends MultiItemBlock
{
public static final String blockType[] = { "tile.CraftingStation", "Crafter", "Parts", "PatternShaper", "PatternChest", "tile.ToolForge" };
public static final String blockTypes[] = { "tile.CraftingStation", "Crafter", "Parts", "PatternShaper", "PatternChest", "tile.ToolForge" };

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

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

@Override
public String getUnlocalizedName (ItemStack itemstack)
{
int pos = MathHelper.clamp_int(itemstack.getItemDamage(), 0, blockType.length - 1);
int pos = MathHelper.clamp_int(itemstack.getItemDamage(), 0, this.blockType.length - 1);
if (pos == 0 || pos == 5)
{
return blockType[pos];
return this.blockType[pos];
}
return (new StringBuilder()).append("ToolStation.").append(blockType[pos]).toString();
return super.getUnlocalizedName(itemstack);
}
}
20 changes: 4 additions & 16 deletions src/main/java/tconstruct/items/blocks/GlassBlockItem.java
View file
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.nbt.NBTTagCompound;
import net.minecraft.util.MathHelper;

public class GlassBlockItem extends ItemBlock
public class GlassBlockItem extends MultiItemBlock
{
public static final String blockType[] = { "glass.pure" };//, "glass.soul", "glass.soul.pure" };
public static final String blockTypes[] = { "pure" };//, "soul", "soul.pure" };

public GlassBlockItem(int id)
{
super(id);
super(id, "block.glass", 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.").append(blockType[pos]).toString();
}

public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4)
{
if (stack.hasTagCompound() && stack.getItemDamage() == 0)
Expand Down
20 changes: 4 additions & 16 deletions src/main/java/tconstruct/items/blocks/GlassPaneItem.java
View file
@@ -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 GlassPaneItem extends ItemBlock
public class GlassPaneItem extends MultiItemBlock
{
public static final String blockType[] = { "glass.pure", "glass.soul", "glass.soul.pure" };
public static final String blockTypes[] = { "pure.pane", "soul.pane", "soul.pure.pane" };

public GlassPaneItem(int id)
{
super(id);
super(id, "block.glass", 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.").append(blockType[pos]).append(".pane").toString();
}
}
17 changes: 4 additions & 13 deletions src/main/java/tconstruct/items/blocks/GravelOreItem.java
View file
@@ -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 GravelOreItem extends ItemBlock
public class GravelOreItem extends MultiItemBlock
{
public static final String blockType[] = { "iron", "gold", "copper", "tin", "aluminum", "cobalt" };
public static final String blockTypes[] = { "iron", "gold", "copper", "tin", "aluminum", "cobalt" };

public GravelOreItem(int id)
{
super(id);
super(id, "block.ore.gravel", 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.ore.gravel.").append(blockType[pos]).toString();
}
}
16 changes: 4 additions & 12 deletions src/main/java/tconstruct/items/blocks/LavaTankItemBlock.java
View file
Expand Up @@ -2,34 +2,26 @@

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;
import net.minecraft.util.StatCollector;

public class LavaTankItemBlock extends ItemBlock
public class LavaTankItemBlock extends MultiItemBlock
{
public static final String blockType[] = { "Tank", "Gague", "Window" };
public static final String blockTypes[] = { "Tank", "Gague", "Window" };

public LavaTankItemBlock(int id)
{
super(id);
super(id, "LavaTank", 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("LavaTank.").append(blockType[pos]).toString();
}

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/SoilSlabItem.java
View file
Expand Up @@ -2,36 +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 SoilSlabItem extends ItemBlock
public class SoilSlabItem extends MultiItemBlock
{
public static final String blockType[] = { "grass", "dirt", "mycelium", "slime", "grout", "blueslime", "graveyardsoil", "consecratedsoil" };
public static final String blockTypes[] = { "grass", "dirt", "mycelium", "slime", "grout", "blueslime", "graveyardsoil", "consecratedsoil" };

public SoilSlabItem(int id)
{
super(id);
super(id, "block.soil.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.soil.slab.").append(blockType[pos]).toString();
}

@Override
@SideOnly(Side.CLIENT)
public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4)
Expand Down

0 comments on commit d65baae

Please sign in to comment.