Merge remote-tracking branch 'origin/master'

This commit is contained in:
Tntrololol 2015-05-11 15:59:39 -05:00
commit 6a157f880e
4 changed files with 16 additions and 2 deletions

View file

@ -5,6 +5,7 @@ import net.minecraft.block.Block;
import net.minecraft.block.BlockContainer; import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.EnumCreatureType;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.MathHelper; import net.minecraft.util.MathHelper;
@ -17,6 +18,7 @@ public class BlockMachineBase extends BlockContainer{
super(Material.rock); super(Material.rock);
setCreativeTab(TechRebornCreativeTab.instance); setCreativeTab(TechRebornCreativeTab.instance);
setHardness(2f); setHardness(2f);
setStepSound(soundTypeMetal);
} }
@Override @Override
@ -94,4 +96,12 @@ public class BlockMachineBase extends BlockContainer{
} }
public boolean canCreatureSpawn(EnumCreatureType type, World world, int x,
int y, int z)
{
return false;
}
} }

View file

@ -10,6 +10,8 @@ import net.minecraftforge.oredict.OreDictionary;
import techreborn.client.container.ContainerAlloyFurnace; import techreborn.client.container.ContainerAlloyFurnace;
import techreborn.client.container.ContainerAlloySmelter; import techreborn.client.container.ContainerAlloySmelter;
import techreborn.client.container.ContainerBlastFurnace; import techreborn.client.container.ContainerBlastFurnace;
import techreborn.compat.nei.recipes.AlloySmelterRecipeHandler;
import techreborn.recipes.AlloySmelterRecipe;
import techreborn.tiles.TileAlloyFurnace; import techreborn.tiles.TileAlloyFurnace;
import techreborn.tiles.TileAlloySmelter; import techreborn.tiles.TileAlloySmelter;
import techreborn.tiles.TileBlastFurnace; import techreborn.tiles.TileBlastFurnace;
@ -27,7 +29,6 @@ public class GuiAlloyFurnace extends GuiContainer {
super(new ContainerAlloyFurnace(tileAlloyFurnace, player)); super(new ContainerAlloyFurnace(tileAlloyFurnace, player));
this.xSize = 176; this.xSize = 176;
this.ySize = 167; this.ySize = 167;
alloyfurnace = tileAlloyFurnace;
} }
@Override @Override
@ -58,5 +59,6 @@ public class GuiAlloyFurnace extends GuiContainer {
this.fontRendererObj.drawString( this.fontRendererObj.drawString(
I18n.format("container.inventory", new Object[0]), 8, I18n.format("container.inventory", new Object[0]), 8,
this.ySize - 96 + 2, 4210752); this.ySize - 96 + 2, 4210752);
} }
} }

View file

@ -55,5 +55,7 @@ public class GuiAlloySmelter extends GuiContainer {
this.fontRendererObj.drawString( this.fontRendererObj.drawString(
I18n.format("container.inventory", new Object[0]), 8, I18n.format("container.inventory", new Object[0]), 8,
this.ySize - 96 + 2, 4210752); this.ySize - 96 + 2, 4210752);
} }
} }

View file

@ -205,7 +205,7 @@ public class ModRecipes {
RecipeHanderer.addRecipe(new AssemblingMachineRecipe(new ItemStack(Items.coal), new ItemStack(Blocks.sand), new ItemStack(Items.diamond), 120, 5)); RecipeHanderer.addRecipe(new AssemblingMachineRecipe(new ItemStack(Items.coal), new ItemStack(Blocks.sand), new ItemStack(Items.diamond), 120, 5));
//TODO BORKEN //TODO BORKEN
// RecipeHanderer.addRecipe(new LatheRecipe(new ItemStack(Items.coal), new ItemStack(Items.diamond), 120, 5)); // RecipeHanderer.addRecipe(new LatheRecipe(new ItemStack(Items.coal), new ItemStack(Items.diamond), 120, 5));
RecipeHanderer.addRecipe(new IndustrialSawmillRecipe(new ItemStack(Items.coal), new ItemStack(Blocks.sand), new ItemStack(Items.diamond), null, null , 120, 5)); RecipeHanderer.addRecipe(new IndustrialSawmillRecipe(new ItemStack(Items.coal), new ItemStack(Blocks.sand), new ItemStack(Items.diamond), new ItemStack(Items.diamond), new ItemStack(Items.diamond) , 120, 5));
LogHelper.info("Machine Recipes Added"); LogHelper.info("Machine Recipes Added");
} }