push

src/main/java/com/kitsu/medievalcraft/block/ModBlocks.java

@@ -110,7 +110,7 @@ public class ModBlocks {
 	//MACHINES
 	public static Block formtable;
 	//public static Block newForge;
-	public static Block testForge;
+	//public static Block testForge;
 	public static Block forgeAnvil;
 	public static Block waterFilter;
 	public static Block shelfFour;
@@ -139,11 +139,11 @@ public class ModBlocks {
 	public static Block tanWaterCrucible;
 	public static Block slackWaterCrucible;
 	
-
 	public static final void init() {
 		
 		GameRegistry.registerBlock(testBlock = new TestBlock("testBlock", Material.rock), "testBlock");
-		Fluid fluidSmoke = new Fluid("blocksmoke").setDensity(-1000).setTemperature(310).setGaseous(true).setBlock(blockSmoke).setViscosity(1200);
+		
+		Fluid fluidSmoke = new Fluid("blocksmoke").setDensity(-1000).setTemperature(310).setGaseous(true).setBlock(blockSmoke).setViscosity(0);
 		FluidRegistry.registerFluid(fluidSmoke);
 		blockSmoke = new BlockSmoke(fluidSmoke, Material.water).setBlockName("blockSmoke");
 		GameRegistry.registerBlock(blockSmoke, Main.MODID + "_" + blockSmoke.getUnlocalizedName().substring(5));
@@ -174,7 +174,7 @@ public class ModBlocks {
 		GameRegistry.registerBlock(wootzOre = new WootzOre("wootzOre", Material.rock), "wootzOre");
 		
 		GameRegistry.registerBlock(formtable = new formTable("formTable", Material.wood), "formTable");
-		GameRegistry.registerBlock(testForge = new TestForge("TestForge", Material.iron), "TestForge");
+		//GameRegistry.registerBlock(testForge = new TestForge("TestForge", Material.iron), "TestForge");
 		GameRegistry.registerBlock(forgeAnvil = new ForgeAnvil("forgeAnvil", Material.iron), "forgeAnvil");
 		GameRegistry.registerBlock(waterFilter = new WaterFilter("waterFilter", Material.iron), "waterFilter");
 		//GameRegistry.registerBlock(sandFilter = new SandFilter("sandFilter", Material.wood), "sandFilter");

src/main/java/com/kitsu/medievalcraft/block/fluid/BlockSmoke.java

@@ -60,28 +60,28 @@ public class BlockSmoke extends BlockFluidFinite{
 		super.randomDisplayTick(world, x, y, z, random);
 
 		if (random.nextInt(6) == 0) {
-			world.spawnParticle("cloud", x + 0.5D, y + 0.2D, z + 0.5D, 0.0D, 0.0D, 0.0D);
-			world.spawnParticle("largesmoke", x + 0.5D, y + 0.2D, z + 0.5D, 0.0D, 0.0D, 0.0D);
+			world.spawnParticle("cloud", x + 0.5D, y + 0.5D, z + 0.5D, 0.0D, 0.2D, 0.0D);
+			world.spawnParticle("largesmoke", x + 0.5D, y + 0.5D, z + 0.5D, 0.0D, 0.2D, 0.0D);
 		}	
 		if (random.nextInt(6) == 1) {
-			world.spawnParticle("cloud", x + 0.5D, y + 0.8D, z + 0.5D, 0.0D, 0.0D, 0.0D);
-			world.spawnParticle("largesmoke", x + 0.5D, y + 0.8D, z + 0.5D, 0.0D, 0.0D, 0.0D);
+			world.spawnParticle("cloud", x + 0.8D, y + 0.5D, z + 0.5D, 0.0D, 0.2D, 0.0D);
+			world.spawnParticle("largesmoke", x + 0.8D, y + 0.5D, z + 0.5D, 0.0D, 0.2D, 0.0D);
 		}
 		if (random.nextInt(6) == 2) {	
-			world.spawnParticle("cloud", x + 0.2D, y + 0.5D, z + 0.5D, 0.0D, 0.0D, 0.0D);
-			world.spawnParticle("largesmoke", x + 0.2D, y + 0.5D, z + 0.5D, 0.0D, 0.0D, 0.0D);
+			world.spawnParticle("cloud", x + 0.2D, y + 0.5D, z + 0.5D, 0.0D, 0.2D, 0.0D);
+			world.spawnParticle("largesmoke", x + 0.2D, y + 0.5D, z + 0.5D, 0.0D, 0.2D, 0.0D);
 		}	
 		if (random.nextInt(6) == 3) {
-			world.spawnParticle("cloud", x + 0.8D, y + 0.5D, z + 0.5D, 0.0D, 0.0D, 0.0D);
-			world.spawnParticle("largesmoke", x + 0.8D, y + 0.5D, z + 0.5D, 0.0D, 0.0D, 0.0D);
+			world.spawnParticle("cloud", x + 0.5D, y + 0.5D, z + 0.8D, 0.0D, 0.2D, 0.0D);
+			world.spawnParticle("largesmoke", x + 0.5D, y + 0.5D, z + 0.8D, 0.0D, 0.2D, 0.0D);
 		}
 		if (random.nextInt(6) == 4) {	
-			world.spawnParticle("cloud", x + 0.5D, y + 0.5D, z + 0.2D, 0.0D, 0.0D, 0.0D);
-			world.spawnParticle("largesmoke", x + 0.5D, y + 0.5D, z + 0.2D, 0.0D, 0.0D, 0.0D);
+			world.spawnParticle("cloud", x + 0.5D, y + 0.5D, z + 0.2D, 0.0D, 0.2D, 0.0D);
+			world.spawnParticle("largesmoke", x + 0.5D, y + 0.5D, z + 0.2D, 0.0D, 0.2D, 0.0D);
 		}
 		if (random.nextInt(6) == 5) {
-			world.spawnParticle("cloud", x + 0.5D, y + 0.5D, z + 0.8D, 0.0D, 0.0D, 0.0D);
-			world.spawnParticle("largesmoke", x + 0.5D, y + 0.5D, z + 0.8D, 0.0D, 0.0D, 0.0D);
+			world.spawnParticle("cloud", x + 0.8D, y + 0.5D, z + 0.2D, 0.0D, 0.2D, 0.0D);
+			world.spawnParticle("largesmoke", x + 0.8D, y + 0.5D, z + 0.2D, 0.0D, 0.2D, 0.0D);
 		}
 	}
 

src/main/java/com/kitsu/medievalcraft/block/ingots/IngotBase.java

@@ -67,6 +67,7 @@ public abstract class IngotBase extends BlockContainer {
 
 	@Override
 	public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int aa, float bb, float cc, float ff){
+		//System.out.println(this.getUnlocalizedName());
 		if(player.inventory.getCurrentItem().getItem()!=ModItems.forgeHammer){
 			int a = player.inventory.currentItem;
 			if(player.inventory.getStackInSlot(a)!=null){

src/main/java/com/kitsu/medievalcraft/block/machines/ForgeAnvil.java

@@ -30,13 +30,6 @@ public class ForgeAnvil extends BlockContainer{
 
 	private final Random random = new Random();
 
-	@SideOnly(Side.CLIENT)
-	private IIcon iconSide;
-	@SideOnly(Side.CLIENT)
-	private IIcon iconTop;
-	@SideOnly(Side.CLIENT)
-	private IIcon iconBot;
-
 	public ForgeAnvil(String unlocalizedName, Material mat) {
 		super(mat);
 		this.setBlockName(unlocalizedName);
@@ -48,19 +41,6 @@ public class ForgeAnvil extends BlockContainer{
 
 	}
 
-	@SideOnly(Side.CLIENT)
-	public void registerBlockIcons(IIconRegister iconRegister) {
-	}
-	
-
-
-	@Override
-	@SideOnly(Side.CLIENT)
-	public IIcon getIcon(int side, int metadata) {
-
-		return side == 1 ? this.iconTop : (side == 0 ? this.iconBot : (side != metadata ? this.blockIcon : this.iconSide));
-	}
-
 	@Override
 	public TileEntity createNewTileEntity(World world, int i) {
 		return new TileEntityAnvilForge();

src/main/java/com/kitsu/medievalcraft/block/machines/TestForge.java

@@ -80,11 +80,12 @@ public class TestForge extends BlockContainer {
     }
     
 	public Item getItemDropped(int par1, Random random, int par3) {
-		return Item.getItemFromBlock(ModBlocks.testForge);
+		return null;
 	}
 
 	public Item getItem(World world, int par2, int par3, int par4) {
-		return Item.getItemFromBlock(ModBlocks.testForge);
+		//return Item.getItemFromBlock(ModBlocks.testForge);
+		return null;
 	}
 
 	@Override

src/main/java/com/kitsu/medievalcraft/compat/FuelHandler.java

@@ -16,8 +16,8 @@ public class FuelHandler implements IFuelHandler
         //MagnumOpus.logger.info("fuel handler: " + fuel);
 
         /** Mod Real Fuel Items **/
-        if      ( stack.isItemEqual(new ItemStack(ModItems.itemShit)) ) { return 600; }
-        else if ( stack.isItemEqual(new ItemStack(ModBlocks.shitblock)) ) { return 3200; }
+        if      ( stack.isItemEqual(new ItemStack(ModItems.itemShit)) ) { return 150; }
+        else if ( stack.isItemEqual(new ItemStack(ModBlocks.shitblock)) ) { return 1500; }
         
 
         /** that is all **/

src/main/java/com/kitsu/medievalcraft/renderer/blocks/machine/ForgeRenderer.java

@@ -42,8 +42,6 @@ public class ForgeRenderer extends TileEntitySpecialRenderer {
 		GL11.glPushMatrix();
 		GL11.glTranslatef((float) x, (float) y, (float) z);
 
-		
-
 		if(tileEntity.getStackInSlot(1) != null){
 			entItem1 = new EntityItem(tileEntity.getWorldObj(), x, y, z, tileEntity.getStackInSlot(1));
 			GL11.glPushMatrix();
@@ -95,7 +93,6 @@ public class ForgeRenderer extends TileEntitySpecialRenderer {
 			loc = TEXTURE;
 		}
 
-
 		FMLClientHandler.instance().getClient().renderEngine.bindTexture(loc);
 		renderBlock(tileEntity, tile.getWorldObj(), tile.xCoord,tile.yCoord, tile.zCoord, ModBlocks.forge);
 		GL11.glPopMatrix();

src/main/java/com/kitsu/medievalcraft/renderer/itemrenderer/machines/IRFirebox.java

@@ -124,7 +124,7 @@ public class IRFirebox implements IItemRenderer {
 		
 		case ENTITY: {
 			GL11.glPushMatrix();
-			//GL11.glScalef(1.75F, 1.75F, 1.75F);
+			GL11.glScalef(0.5F, 1.0F, 0.5F);
 			GL11.glTranslatef(0.0F, 0.5F, 0.0F);
 		
 			Minecraft.getMinecraft().renderEngine.bindTexture(TEXTURE);

src/main/java/com/kitsu/medievalcraft/tileents/ingots/TileDamascus.java

@@ -10,6 +10,7 @@ public class TileDamascus extends TileIngotBase{
 		this.hot = false;
 		
 		this.heatTicks = 500;
+		this.heatBase = 500;
 	}
 
 }

src/main/java/com/kitsu/medievalcraft/tileents/ingots/TileIngotBase.java

@@ -36,7 +36,7 @@ public class TileIngotBase extends TileEntity implements AnvilUtil{
 		int y = this.yCoord;
 		int z = this.zCoord;
 		if(!world.isRemote){
-			System.out.println(this.heatTicks);
+			//System.out.println(this.heatTicks);
 			if(this.heatTicks<=0){
 				world.setBlockMetadataWithNotify(x, y, z, 1, 2);
 				this.hot=true;

src/main/java/com/kitsu/medievalcraft/tileents/ingots/TileIronPlate.java

@@ -9,6 +9,7 @@ public class TileIronPlate extends TileIngotBase{
 		this.hits = 0;
 		this.hot = false;
 		this.heatTicks = 450;
+		this.heatBase = 450;
 	}
 
 }

src/main/java/com/kitsu/medievalcraft/tileents/ingots/TileLapisIngot.java

@@ -9,7 +9,9 @@ public class TileLapisIngot extends TileIngotBase{
 		this.hits = 0;
 		this.hot = false;
 		this.coolTicks = 300;
+		this.coolBase = 300;
 		this.heatTicks = 600;
+		this.heatBase = 600;
 	}
 
 }

src/main/java/com/kitsu/medievalcraft/tileents/ingots/TileMyIronIngot.java

@@ -8,9 +8,6 @@ public class TileMyIronIngot extends TileIngotBase{
 		super(nameCustom);
 		this.hits = 0;
 		this.hot = false;
-		this.heatBase = 50;
-		this.heatTicks = 50;
-		this.coolBase = 50;
 	}
 
 }

src/main/java/com/kitsu/medievalcraft/tileents/ingots/TileRedstoneIngot.java

@@ -9,7 +9,9 @@ public class TileRedstoneIngot extends TileIngotBase{
 		this.hits = 0;
 		this.hot = false;
 		this.coolTicks = 300;
+		this.coolBase = 300;
 		this.heatTicks = 600;
+		this.heatBase = 600;
 	}
 
 }

src/main/java/com/kitsu/medievalcraft/tileents/machine/TileForge.java

@@ -22,6 +22,7 @@ import net.minecraft.network.play.server.S35PacketUpdateTileEntity;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 
+import com.kitsu.medievalcraft.block.ModBlocks;
 import com.kitsu.medievalcraft.block.ingots.IngotBase;
 import com.kitsu.medievalcraft.tileents.ingots.TileIngotBase;
 
@@ -331,28 +332,32 @@ public class TileForge extends TileEntity implements IInventory{
 		return getItemBurnTime(stack) > 0;
 	}
 
-	//Main.sNet.sendToAll(new MsgPacketOn(tileEnt.isBurning));
-	//Main.sNet.sendToAll(new MsgPacketForgeX(tileEnt.xCoord));
-	//Main.sNet.sendToAll(new MsgPacketForgeY(tileEnt.yCoord));
-	//Main.sNet.sendToAll(new MsgPacketForgeZ(tileEnt.zCoord));
-	//Main.sNet.sendToAll(new MsgPacketBurning(tileEnt.isOn));
-
 	private void forgeMaint(World world, int x, int y, int z){
 		if(this.getStackInSlot(0)==null){
 			if(world.getBlockMetadata(x, y, z)>=4&&world.getBlockMetadata(x, y, z)<=7){
 				world.setBlockMetadataWithNotify(x, y, z, world.getBlockMetadata(x, y, z)-4, 2);
 			}
 		}
+		if(this.getStackInSlot(0)==null){
+			if(world.getBlockMetadata(x, y, z)>7){
+				world.setBlockMetadataWithNotify(x, y, z, world.getBlockMetadata(x, y, z)-8, 2);
+			}
+		}
 		if(this.getStackInSlot(1)==null){
 			if(world.getBlockMetadata(x, y, z)>=8){
 				world.setBlockMetadataWithNotify(x, y, z, world.getBlockMetadata(x, y, z)-4, 2);
 			}
 		}
 		if(world.getBlockMetadata(x, y, z)>3&&world.getBlockMetadata(x, y, z)<8){
-			if(this.getStackInSlot(1)!=null){
+			if(this.getStackInSlot(1)!=null && (world.canBlockSeeTheSky(x, y+1, z)==true)){
 				world.setBlockMetadataWithNotify(x, y, z, world.getBlockMetadata(x, y, z)+4, 2);
 			}
 		}
+		if(world.getBlockMetadata(x, y, z)>7){
+			if(world.rand.nextInt(5)==1){
+				world.setBlock(x, y+2, z, ModBlocks.blockSmoke, 0, 2);
+			}
+		}
 	}
 }
 

src/main/resources/assets/kitsumedievalcraft/lang/en_US.lang

@@ -169,6 +169,7 @@ item.itemSmallBarrelLid.name
 item.halfSplitBoard.name=Half Split Board
 item.woodPulp.name=Wood Pulp
 item.charcoalFilter.name=Charcoal Filter
+item.slottedTongs.name=Stone Tongs
 
 tile.shitBlock.name=Shit Block
 tile.formTable.name=Form Table