diff --git a/build.properties b/build.properties index aba5803b247..04a622964c7 100644 --- a/build.properties +++ b/build.properties @@ -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 diff --git a/src/main/java/tconstruct/items/blocks/CastingChannelItem.java b/src/main/java/tconstruct/items/blocks/CastingChannelItem.java index 401beda2dd6..7c8db3e6487 100644 --- a/src/main/java/tconstruct/items/blocks/CastingChannelItem.java +++ b/src/main/java/tconstruct/items/blocks/CastingChannelItem.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 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(); - } } diff --git a/src/main/java/tconstruct/items/blocks/CraftedSoilItemBlock.java b/src/main/java/tconstruct/items/blocks/CraftedSoilItemBlock.java index 2993737d884..51ec02464e6 100644 --- a/src/main/java/tconstruct/items/blocks/CraftedSoilItemBlock.java +++ b/src/main/java/tconstruct/items/blocks/CraftedSoilItemBlock.java @@ -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 diff --git a/src/main/java/tconstruct/items/blocks/CraftingSlabItemBlock.java b/src/main/java/tconstruct/items/blocks/CraftingSlabItemBlock.java index f4668fe71eb..ffb21732460 100644 --- a/src/main/java/tconstruct/items/blocks/CraftingSlabItemBlock.java +++ b/src/main/java/tconstruct/items/blocks/CraftingSlabItemBlock.java @@ -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); } } diff --git a/src/main/java/tconstruct/items/blocks/GlassBlockItem.java b/src/main/java/tconstruct/items/blocks/GlassBlockItem.java index 29546b1c6b0..2dbf89dc9e6 100644 --- a/src/main/java/tconstruct/items/blocks/GlassBlockItem.java +++ b/src/main/java/tconstruct/items/blocks/GlassBlockItem.java @@ -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) diff --git a/src/main/java/tconstruct/items/blocks/GlassPaneItem.java b/src/main/java/tconstruct/items/blocks/GlassPaneItem.java index 00edd252476..767ebd7b06c 100644 --- a/src/main/java/tconstruct/items/blocks/GlassPaneItem.java +++ b/src/main/java/tconstruct/items/blocks/GlassPaneItem.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 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(); - } } diff --git a/src/main/java/tconstruct/items/blocks/GravelOreItem.java b/src/main/java/tconstruct/items/blocks/GravelOreItem.java index 2bca15dbd52..2e3067c7d89 100644 --- a/src/main/java/tconstruct/items/blocks/GravelOreItem.java +++ b/src/main/java/tconstruct/items/blocks/GravelOreItem.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 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(); - } } diff --git a/src/main/java/tconstruct/items/blocks/LavaTankItemBlock.java b/src/main/java/tconstruct/items/blocks/LavaTankItemBlock.java index 1c20c2ebc06..93b4ac87b63 100644 --- a/src/main/java/tconstruct/items/blocks/LavaTankItemBlock.java +++ b/src/main/java/tconstruct/items/blocks/LavaTankItemBlock.java @@ -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; @@ -9,27 +10,18 @@ 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) { diff --git a/src/main/java/tconstruct/items/blocks/SoilSlabItem.java b/src/main/java/tconstruct/items/blocks/SoilSlabItem.java index 92f3e3d02b8..45b5449d17d 100644 --- a/src/main/java/tconstruct/items/blocks/SoilSlabItem.java +++ b/src/main/java/tconstruct/items/blocks/SoilSlabItem.java @@ -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)