Add back wool slabs

This commit is contained in:
Alexander committed 2014-04-08 18:34:28 -04:00
1 parent 34ef094351
commit 70c66ac29a
5 files changed
+37 -15

No files matched your search

@@ -205,10 +205,10 @@ public class TContent implements IFuelHandler
TRepo.meatBlock = new MeatBlock().setBlockName("tconstruct.meatblock");
TRepo.glueBlock = new GlueBlock().setBlockName("GlueBlock").setCreativeTab(TConstructRegistry.blockTab);
//TRepo.woolSlab1 = new SlabBase(Material.cloth, Blocks.wool, 0, 8).setBlockName("cloth");
//TRepo.woolSlab1.setStepSound(Block.soundTypeCloth).setCreativeTab(CreativeTabs.tabDecorations);
//TRepo.woolSlab2 = new SlabBase(Material.cloth, Blocks.wool, 8, 8).setBlockName("cloth");
//TRepo.woolSlab2.setStepSound(Block.soundTypeCloth).setCreativeTab(CreativeTabs.tabDecorations);
TRepo.woolSlab1 = new SlabBase(Material.cloth, Blocks.wool, 0, 8).setBlockName("cloth");
TRepo.woolSlab1.setStepSound(Block.soundTypeCloth).setCreativeTab(CreativeTabs.tabDecorations);
TRepo.woolSlab2 = new SlabBase(Material.cloth, Blocks.wool, 8, 8).setBlockName("cloth");
TRepo.woolSlab2.setStepSound(Block.soundTypeCloth).setCreativeTab(CreativeTabs.tabDecorations);
// Smeltery
TRepo.smeltery = new SmelteryBlock().setBlockName("Smeltery");
@@ -152,8 +152,8 @@ public class TRecipes
GameRegistry.registerBlock(TRepo.glueBlock, "GlueBlock");
OreDictionary.registerOre("blockRubber", new ItemStack(TRepo.glueBlock));
//GameRegistry.registerBlock(TRepo.woolSlab1, WoolSlab1Item.class, "WoolSlab1");
//GameRegistry.registerBlock(TRepo.woolSlab2, WoolSlab2Item.class, "WoolSlab2");
GameRegistry.registerBlock(TRepo.woolSlab1, WoolSlab1Item.class, "WoolSlab1");
GameRegistry.registerBlock(TRepo.woolSlab2, WoolSlab2Item.class, "WoolSlab2");
// Smeltery stuff
GameRegistry.registerBlock(TRepo.smeltery, SmelteryItemBlock.class, "Smeltery");
@@ -833,7 +833,7 @@ public class TRecipes
GameRegistry.addRecipe(new ItemStack(TRepo.searedSlab, 6, 7), "bbb", 'b', new ItemStack(TRepo.smeltery, 1, 11));
// Wool Slab Recipes
/**for (int sc = 0; sc <= 7; sc++)
for (int sc = 0; sc <= 7; sc++)
{
GameRegistry.addRecipe(new ItemStack(TRepo.woolSlab1, 6, sc), "www", 'w', new ItemStack(Blocks.wool, 1, sc));
GameRegistry.addRecipe(new ItemStack(TRepo.woolSlab2, 6, sc), "www", 'w', new ItemStack(Blocks.wool, 1, sc + 8));
@@ -841,7 +841,7 @@ public class TRecipes
GameRegistry.addShapelessRecipe(new ItemStack(Blocks.wool, 1, sc), new ItemStack(TRepo.woolSlab1, 1, sc), new ItemStack(TRepo.woolSlab1, 1, sc));
GameRegistry.addShapelessRecipe(new ItemStack(Blocks.wool, 1, sc + 8), new ItemStack(TRepo.woolSlab2, 1, sc), new ItemStack(TRepo.woolSlab2, 1, sc));
}
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(Blocks.wool, 1, 0), "slabCloth", "slabCloth"));*/
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(Blocks.wool, 1, 0), "slabCloth", "slabCloth"));
// Trap Recipes
GameRegistry.addRecipe(new ItemStack(TRepo.punji, 5, 0), "b b", " b ", "b b", 'b', new ItemStack(Items.reeds));
GameRegistry.addRecipe(new ItemStack(TRepo.barricadeSpruce, 1, 0), "b", "b", 'b', new ItemStack(Blocks.log, 1, 1));
@@ -1035,8 +1035,8 @@ public class TRecipes
ensureOreIsRegistered("nuggetGold", new ItemStack(Items.gold_nugget));
OreDictionary.registerOre("nuggetPigIron", new ItemStack(TRepo.materials, 1, 35));
//OreDictionary.registerOre("slabCloth", new ItemStack(TRepo.woolSlab1, 1, Short.MAX_VALUE));
//OreDictionary.registerOre("slabCloth", new ItemStack(TRepo.woolSlab2, 1, Short.MAX_VALUE));
OreDictionary.registerOre("slabCloth", new ItemStack(TRepo.woolSlab1, 1, Short.MAX_VALUE));
OreDictionary.registerOre("slabCloth", new ItemStack(TRepo.woolSlab2, 1, Short.MAX_VALUE));
ensureOreIsRegistered("stoneMossy", new ItemStack(Blocks.stonebrick, 1, 1));
ensureOreIsRegistered("stoneMossy", new ItemStack(Blocks.mossy_cobblestone));
+2 -2
View File
@@ -131,8 +131,8 @@ public class TRepo
public static Block speedSlab;
public static Block meatBlock;
//public static Block woolSlab1;
//public static Block woolSlab2;
public static Block woolSlab1;
public static Block woolSlab2;
public static Block glueBlock;
// Traps
@@ -1,12 +1,13 @@
package tconstruct.items.blocks;
import mantle.blocks.abstracts.MultiItemBlock;
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemDye;
import net.minecraft.item.ItemStack;
import net.minecraft.util.MathHelper;
import net.minecraft.world.World;
import mantle.blocks.abstracts.MultiItemBlock;
public class WoolSlab1Item extends MultiItemBlock
{
@@ -20,6 +21,13 @@ public class WoolSlab1Item extends MultiItemBlock
setMaxDamage(0);
setHasSubtypes(true);
}
@Override
public String getUnlocalizedName (ItemStack par1ItemStack)
{
int i = MathHelper.clamp_int(par1ItemStack.getItemDamage(), 0, 7);
return super.getUnlocalizedName() + "." + ItemDye.field_150923_a[7 - i] + ".slab";
}
@Override
public boolean onItemUse (ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ)
@@ -1,12 +1,13 @@
package tconstruct.items.blocks;
import mantle.blocks.abstracts.MultiItemBlock;
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemDye;
import net.minecraft.item.ItemStack;
import net.minecraft.util.MathHelper;
import net.minecraft.world.World;
import mantle.blocks.abstracts.MultiItemBlock;
public class WoolSlab2Item extends MultiItemBlock
{
@@ -15,11 +16,24 @@ public class WoolSlab2Item extends MultiItemBlock
public WoolSlab2Item(Block b)
{
super(b, "", "slab", ItemDye.field_150923_a);
this.setSpecialIndex(7, 7);
this.setSpecialIndex(0, 7);
this.block = b;
setMaxDamage(0);
setHasSubtypes(true);
}
@Override
public int getMetadata (int meta)
{
return meta;
}
@Override
public String getUnlocalizedName (ItemStack par1ItemStack)
{
int i = MathHelper.clamp_int(par1ItemStack.getItemDamage(), 7, 15);
return super.getUnlocalizedName() + "." + ItemDye.field_150923_a[15 - i] + ".slab";
}
@Override
public boolean onItemUse (ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ)