From b001b200493391b5727205a3e58cbce8bba5bdde Mon Sep 17 00:00:00 2001 From: KitsuShadow Date: Mon, 6 Jul 2015 23:22:12 -0400 Subject: [PATCH] Double Check Crafting --- .classpath | 118 +++++++++--------- .../2.0/taskArtifacts/cache.properties.lock | Bin 17 -> 17 bytes .gradle/2.0/taskArtifacts/fileHashes.bin | Bin 247824 -> 247824 bytes .gradle/2.0/taskArtifacts/fileSnapshots.bin | Bin 1473082 -> 1473082 bytes .gradle/2.0/taskArtifacts/taskArtifacts.bin | Bin 31523 -> 31523 bytes .gradle/gradle.log | 2 +- .settings/org.eclipse.jdt.core.prefs | 2 +- .../medievalcraft/block/machines/Forge.class | Bin 12539 -> 12757 bytes .../block/machines/TestForge.class | Bin 6652 -> 6620 bytes .../blocks/machine/ForgeRenderer.class | Bin 4541 -> 4601 bytes .../tileents/machine/TileForge.class | Bin 10016 -> 9852 bytes .../medievalcraft/block/machines/Forge.java | 105 +++++++++------- .../block/machines/SolidFilter.java | 40 +----- .../block/machines/TestForge.java | 4 +- .../blocks/machine/ForgeRenderer.java | 10 +- .../tileents/machine/TileForge.java | 26 +++- 16 files changed, 147 insertions(+), 160 deletions(-) diff --git a/.classpath b/.classpath index 770a4f99..c3151cc0 100644 --- a/.classpath +++ b/.classpath @@ -4,63 +4,63 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.gradle/2.0/taskArtifacts/cache.properties.lock b/.gradle/2.0/taskArtifacts/cache.properties.lock index 04c2ea5982af07a649fa369c71ccf17542d68357..44915c065ba0a3061f9f4fb5ce92f537f005f23d 100644 GIT binary patch literal 17 VcmZS9*&j0BY(s1MvU= diff --git a/.gradle/2.0/taskArtifacts/fileHashes.bin b/.gradle/2.0/taskArtifacts/fileHashes.bin index da91365f7c53130e8690fc413d5a44fbc88b602c..74baf615d80c6080b48d8fc1cba51a3c1373fd12 100644 GIT binary patch delta 125 zcmbO*fq%jT{)R1#7iC0J5}bB0fPv3m5cQ<}ip%uEct+*v9I}k&NYadnAZh80m(QmM z%Q9}#QWRj@_P@9)YRC2!XUHoEr71M)d z88>Mu2{K$Uo1!F}qb_Idx7~RE12t;~21Y-Gc}&?L4bneE+x6ubftYE#z8v$zl>q7L BA7B6g diff --git a/.gradle/2.0/taskArtifacts/fileSnapshots.bin b/.gradle/2.0/taskArtifacts/fileSnapshots.bin index cd82bb50d14f3379d20f5a3f36bf71e8edb0ce00..b80c0c4830971415f5013a7fb33924c25dd8de7f 100644 GIT binary patch delta 340 zcmdn>C34r7$O$r9zS|iX7$krg2m)pRi7+se!6y?)heOx_?|^jSL^lnVhv%M6*w{E% zeBuQD$#N2p1U5T;-|c9(AswR5-)ORcWFY_L{f{Hwo3DlH)t($7X(4c>uy3-_Q+Zy9 zpwEHH9g+%@4@f3Vwveh2U}gw2b=j1}29fmjn!G|PW3q;{fq>?ECXc6y$0tK|1x^l- z4w$?HDB)!_J+&|7j3q?Ef8pi_(h-c4Gh}&Km?An(O-_&%VOd(ocnr))`L^pV$juuk zC<`|Sc(ez2Faj|X5HkZY3lOscF&hxG12G2>a{@6J5OV`D4-oSLF&_}~1F--Q3j(na S5DNpb2oQ^I5AYCsWe5Na&t&!h delta 340 zcmdn>C34r7$O$r9K7kAj3=%*L1OeJWA{5MI@HYa|;ZXKMAYC-kO@rk_K;*TJjdR5( zPT-#`C-F#N^}Q<>{P%~{K-BqepDZ95IJr_%fARrI34!|_?s86^N=*<+p97OGNM;Cp z$z0`T)tG(?s>5rtfmFlf6H*BRik5ZzTu-acg-8Uvo2(#hF}Xn6L%`~zQD{k*`+le~ znUgn2TWpdEU=*l7#@{CH*J%RPF=KLqtO&~#=58A>qjbH*B{1Wd`h_1LH*cJvEZiL6 z(H`Kz2*gZ4%nZaVK+FonY(UHo#2i4(3B+7L%nigmK+Frod_c?(!~#Gp2*g4_EDXdV NKrFgFz(eenApi>GWAOk0 diff --git a/.gradle/2.0/taskArtifacts/taskArtifacts.bin b/.gradle/2.0/taskArtifacts/taskArtifacts.bin index df7c8d83c2f183316bda3fd751ba0e58e3f2178f..53323a1c07e189d02e99aa34c21babda2aecbe4a 100644 GIT binary patch delta 166 zcmZ4djdAfe#tm13gqAZ4uMFgQILl}WUywm~CgTj=$^V1hC+`e4+k7oZl2L;J2-YZ= z{y1aIz`*z#h#!M6b3TV%NScjpbCbkm(H|EopYNH>7@{|s*Dq=Fj;bawgK~0>l43lNm$wCiD6UPHqVe z0P9`youRQBtamX`-)tbB#k^TGT#!+)^1+8(8yO9z4CBu;{RJ+09helNKlyIB=;W+$ TV@{B@UiH(CwQkmn_^Jc|_Ub)r diff --git a/.gradle/gradle.log b/.gradle/gradle.log index 970f888d..7d52b4d2 100644 --- a/.gradle/gradle.log +++ b/.gradle/gradle.log @@ -12,4 +12,4 @@ BUILD SUCCESSFUL -Total time: 9.254 secs +Total time: 7.332 secs diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 15ed9034..378f6e5d 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,5 +1,5 @@ # -#Mon Jul 06 01:21:49 EDT 2015 +#Mon Jul 06 13:18:27 EDT 2015 org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.compliance=1.6 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve diff --git a/bin/com/kitsu/medievalcraft/block/machines/Forge.class b/bin/com/kitsu/medievalcraft/block/machines/Forge.class index 8e3e331ae02656e4b8d3b0c4a78c273c366785af..d680f9c8f4380cf999a58e916dd146a63743db8f 100644 GIT binary patch literal 12757 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 delta 6163 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 MLDY}v7r4|<2iW*TwiAW5Bl^|%5N}Cn(0)mZ= z*ay>zg{{Wlynsc(*>AO)Gjs3E+`ITEzP>cUB0>P1ce*BCC?r%OFwEt9xk;)?rUjjWsUFoS>yI_^tmCtRp}{1ZOtD3cZR+eW z&n_$Mu}YHz_Bp1-DTkcVW?HwGvz*K@tDPq1g$Ht$UK!w6dgDgFr0TnpYw2T7v0(9& jdpwPBLXRb_X@D>?!mK0QC zwqoF$Y$qsLug;LqV8Bq!V8&3wV9!v-;L1?W;KxwS5YAA;5XDf-panEF24XgYC4&`^ z2egIZF~b=KMlkCM!&3$(FzXq^W(H<3>p76c0%pAcvRJ{amkj$E*cjLuLKsdlL;z_; ipjodNHcJB?eio>JlY#j!g8>sGA0N=%*FXU#hBp8#!YShb diff --git a/bin/com/kitsu/medievalcraft/tileents/machine/TileForge.class b/bin/com/kitsu/medievalcraft/tileents/machine/TileForge.class index 7f8213c7dad9ce171174f5af0c369356cace1dcc..97a7a828f45a2e22c3697df1384a630451f6f812 100644 GIT binary patch literal 9852 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 I3*^4P0r?mPVgLXD literal 10016 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 Rg~W}l%V~!kWjjkA{}cIcOM(CZ diff --git a/src/main/java/com/kitsu/medievalcraft/block/machines/Forge.java b/src/main/java/com/kitsu/medievalcraft/block/machines/Forge.java index d5512853..eab63522 100644 --- a/src/main/java/com/kitsu/medievalcraft/block/machines/Forge.java +++ b/src/main/java/com/kitsu/medievalcraft/block/machines/Forge.java @@ -38,6 +38,7 @@ import com.kitsu.medievalcraft.tileents.machine.TileForge; import com.kitsu.medievalcraft.util.CustomTab; import com.kitsu.medievalcraft.util.TileForgePlaceables; +import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -76,44 +77,45 @@ public class Forge extends BlockContainer implements TileForgePlaceables{ public void randomDisplayTick(World world, int x, int y, int z, Random rand) { super.randomDisplayTick(world, x, y, z, random); - if(this.furnaceParts==true){ - world.spawnParticle("fire", (double)locX, (double)locY+1f, (double)locZ, 0.0D, 0.0D, 0.0D); - world.spawnParticle("flame", (double)locX, (double)locY+1f, (double)locZ, 0.0D, 0.0D, 0.0D); - world.spawnParticle("smoke", (double)locX, (double)locY+1f, (double)locZ, 0.0D, 0.0D, 0.0D); - } - //if(x==locX&&y==locY&&z==locZ){ - /*if(this.furnaceParts == true){ - int l; - float f; - float f1; - float f2; - for (l = 0; l < 3; ++l) - { - f = (float)(locX+0.25) + (rand.nextFloat()/2); - f1 = (float)locY + rand.nextFloat() * 0.4F + 0.3F; - f2 = (float)(locZ+0.25) + (rand.nextFloat()/2); - world.spawnParticle("fire", (double)f, (double)f1, (double)f2, 0.0D, 0.0D, 0.0D); - world.spawnParticle("flame", (double)f, (double)f1, (double)f2, 0.0D, 0.0D, 0.0D); - //world.spawnParticle("smoke", (double)f, (double)f1, (double)f2, 0.0D, 0.0D, 0.0D); - } + + if(world.getBlockMetadata(x, y, z)>=4&&world.getBlockMetadata(x, y, z)<=7){ + int l; + float f; + float f1; + float f2; + for (l = 0; l < 3; ++l) + { + f = (float)(x+0.25) + (rand.nextFloat()/2); + f1 = (float)y + rand.nextFloat() * 0.4F + 0.3F; + f2 = (float)(z+0.25) + (rand.nextFloat()/2); + world.spawnParticle("fire", (double)f, (double)f1, (double)f2, 0.0D, 0.0D, 0.0D); + world.spawnParticle("flame", (double)f, (double)f1, (double)f2, 0.0D, 0.0D, 0.0D); } - if(this.coalParts == true){ - int l; - float f; - float f1; - float f2; - for (l = 0; l < 3; ++l) - { - f = (float)(locX+0.25) + (rand.nextFloat()/2); - //f1 = (float)y + rand.nextFloat() * 0.4F + 0.3F; - f1 = locY; - f2 = (float)(locZ+0.25) + (rand.nextFloat()/2); - world.spawnParticle("fire", (double)f, (double)f1, (double)f2, 0.0D, 0.0D, 0.0D); - world.spawnParticle("flame", (double)f, (double)f1, (double)f2, 0.0D, 0.0D, 0.0D); - //world.spawnParticle("smoke", (double)f, (double)f1, (double)f2, 0.0D, 0.0D, 0.0D); - } - }*/ - //} + } + if(world.getBlockMetadata(x, y, z)>=8){ + int l; + float f; + float f1; + float f2; + for (l = 0; l < 3; ++l) + { + f = (float)(x+0.25) + (rand.nextFloat()/2); + //f1 = (float)y + rand.nextFloat() * 0.4F + 0.3F; + f1 = y+1.1f; + f2 = (float)(z+0.25) + (rand.nextFloat()/2); + world.spawnParticle("fire", (double)f, (double)f1, (double)f2, 0.0D, 0.0D, 0.0D); + world.spawnParticle("flame", (double)f, (double)f1, (double)f2, 0.0D, 0.0D, 0.0D); + world.spawnParticle("smoke", (double)f, (double)f1, (double)f2, 0.0D, 0.0D, 0.0D); + } + for (l = 0; l < 3; ++l) + { + f = (float)(x+0.25) + (rand.nextFloat()/2); + f1 = (float)y + rand.nextFloat() * 0.4F + 0.3F; + f2 = (float)(z+0.25) + (rand.nextFloat()/2); + world.spawnParticle("fire", (double)f, (double)f1, (double)f2, 0.0D, 0.0D, 0.0D); + world.spawnParticle("flame", (double)f, (double)f1, (double)f2, 0.0D, 0.0D, 0.0D); + } + } } public static int determineOrientation(World p_150071_0_, int p_150071_1_, int p_150071_2_, int p_150071_3_, EntityLivingBase p_150071_4_) @@ -132,7 +134,15 @@ public class Forge extends BlockContainer implements TileForgePlaceables{ @Override public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack p_149689_6_) { int l = determineOrientation(world, x, y, z, player); + if(l==1){ + l=5; + } + if(l==0){ + l=5; + } + l=l-2; world.setBlockMetadataWithNotify(x, y, z, l, 2); + System.out.println(l); world.markBlockForUpdate(x, y, z); } @@ -147,26 +157,25 @@ public class Forge extends BlockContainer implements TileForgePlaceables{ public boolean onBlockActivated (World world, int x, int y, int z, EntityPlayer player, int q, float a, float b, float c) { TileForge tileEnt = (TileForge) world.getTileEntity(x, y, z); - if(world.isRemote){ MovingObjectPosition mop = Minecraft.getMinecraft().renderViewEntity.rayTrace(5, 1.0F); c = (int)mop.sideHit; Main.sNet.sendToServer(new MsgPacketForge((int) c)); } + System.out.println(sideMeta + " " + world.getBlockMetadata(x, y, z)); if(!world.isRemote){ if(player.inventory.getCurrentItem()!=null){ if((player.inventory.getCurrentItem().getItem()==Item.getItemFromBlock(Blocks.torch))|| (player.inventory.getCurrentItem().getItem()==Items.flint_and_steel)|| - (player.inventory.getCurrentItem().getItem()==ModItems.fireBow) - ){ - tileEnt.isBurning=true; - 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)); + (player.inventory.getCurrentItem().getItem()==ModItems.fireBow)){ + if(world.getBlockMetadata(x, y, z)<=3){ + world.setBlockMetadataWithNotify(x, y, z, world.getBlockMetadata(x, y, z)+4, 2); + } + tileEnt.markForUpdate(); if(tileEnt.getStackInSlot(1)!=null){ - tileEnt.isOn=true; - Main.sNet.sendToAll(new MsgPacketBurning(tileEnt.isOn)); + 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); + } } } } @@ -212,7 +221,7 @@ public class Forge extends BlockContainer implements TileForgePlaceables{ return true; } } - if(sideMeta == world.getBlockMetadata(x, y, z)){ + if(sideMeta-2 == world.getBlockMetadata(x, y, z)||sideMeta == world.getBlockMetadata(x, y, z)-4||sideMeta == world.getBlockMetadata(x, y, z)-8){ if(player.inventory.getCurrentItem()!=null){ if(tileEnt.getStackInSlot(0)==null){ System.out.println(); diff --git a/src/main/java/com/kitsu/medievalcraft/block/machines/SolidFilter.java b/src/main/java/com/kitsu/medievalcraft/block/machines/SolidFilter.java index 1a175898..605dfde2 100644 --- a/src/main/java/com/kitsu/medievalcraft/block/machines/SolidFilter.java +++ b/src/main/java/com/kitsu/medievalcraft/block/machines/SolidFilter.java @@ -125,42 +125,4 @@ public class SolidFilter extends BlockContainer { public boolean isOpaqueCube() { return false; } -} - - - - - -/*public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int p_149727_6_, float p_149727_7_, float p_149727_8_, float p_149727_9_){ -//System.out.println(Minecraft.getMinecraft().objectMouseOver.blockX); -//System.out.println(Minecraft.getMinecraft().objectMouseOver.blockY); -//System.out.println(Minecraft.getMinecraft().objectMouseOver.blockZ); -//System.out.println(x + ":" + y + ":" + z); -//int newX = Minecraft.getMinecraft().objectMouseOver.blockX; -//int newY = Minecraft.getMinecraft().objectMouseOver.blockY; -//int newZ = Minecraft.getMinecraft().objectMouseOver.blockZ; -TileEntitySandFilter tileSand = (TileEntitySandFilter) world.getTileEntity(x, y, z); -if(!world.isRemote){ -//--------REMOVES THE FILTER FROM THE SLOT IF THE PLAYER IS SNEAKING------------------// - if(tileSand.getStackInSlot(0)!=null){ - int a = player.inventory.currentItem; - if((player.inventory.getStackInSlot(a)==null)&&(player.isSneaking())){ - player.inventory.setInventorySlotContents(a, tileSand.getStackInSlot(0)); - tileSand.setInventorySlotContents(0, null); - world.setBlock(x, y, z, ModBlocks.sandFilterEmpty, 0, 2); - } - } - if(tileSand.getStackInSlot(0)!=null){ - int a = player.inventory.currentItem; - if((player.inventory.getStackInSlot(a)==null)&&(!player.isSneaking())){ - if(world.getBlock(x, y+1, z).equals(Blocks.sand)){ - int h = tileSand.tag.getInteger("FILTERHITS"); - tileSand.tag.setInteger("FILTERHITS", h+1); - player.worldObj.playSoundAtEntity(player, "step.sand", 0.5F, 0.5F); - tileSand.getStackInSlot(0).setItemDamage(tileSand.getStackInSlot(0).getItemDamage()+1); - } - } - } -} -return true; -}*/ \ No newline at end of file +} \ No newline at end of file diff --git a/src/main/java/com/kitsu/medievalcraft/block/machines/TestForge.java b/src/main/java/com/kitsu/medievalcraft/block/machines/TestForge.java index b2545b2e..77798e66 100644 --- a/src/main/java/com/kitsu/medievalcraft/block/machines/TestForge.java +++ b/src/main/java/com/kitsu/medievalcraft/block/machines/TestForge.java @@ -94,9 +94,9 @@ public class TestForge extends BlockContainer { super.randomDisplayTick(world, x, y, z, random); TileEntityTestForge tileEnt = (TileEntityTestForge) world.getTileEntity(x, y, z); - if(tileEnt.isRunning == true){ + /*if(tileEnt.isRunning == true){ - } + }*/ /*Block test = world.getBlock(x, y+1, z); if (test == TestForgeCrafting.blockToCheck.get(0) || test == TestForgeCrafting.blockToCheck.get(1) || test == TestForgeCrafting.blockToCheck.get(2) || test == TestForgeCrafting.blockToCheck.get(3) || test == TestForgeCrafting.blockToCheck.get(4)) { diff --git a/src/main/java/com/kitsu/medievalcraft/renderer/blocks/machine/ForgeRenderer.java b/src/main/java/com/kitsu/medievalcraft/renderer/blocks/machine/ForgeRenderer.java index 171c2efd..54edb25b 100644 --- a/src/main/java/com/kitsu/medievalcraft/renderer/blocks/machine/ForgeRenderer.java +++ b/src/main/java/com/kitsu/medievalcraft/renderer/blocks/machine/ForgeRenderer.java @@ -106,16 +106,16 @@ public class ForgeRenderer extends TileEntitySpecialRenderer { GL11.glScalef(scale, scale, scale); GL11.glTranslatef(1.0F, 1.0F, 1.0F); int dir = world.getBlockMetadata(i, j, k); - //System.out.println(dir); - if(dir == 4){ + + if(dir == 2||dir == 6||dir == 10){ GL11.glRotated(-180F, 0.0, 1.0F, 0.0F); } - if(dir == 5){ + if(dir == 3||dir == 7||dir == 11){ } - if(dir == 2){ + if(dir == 0||dir == 4||dir == 8){ GL11.glRotated(90F, 0.0, 1.0F, 0.0F); } - if(dir == 3){ + if(dir == 1||dir == 5||dir == 9){ GL11.glRotated(-90F, 0.0, 1.0F, 0.0F); } diff --git a/src/main/java/com/kitsu/medievalcraft/tileents/machine/TileForge.java b/src/main/java/com/kitsu/medievalcraft/tileents/machine/TileForge.java index c0a9b47b..63e417a2 100644 --- a/src/main/java/com/kitsu/medievalcraft/tileents/machine/TileForge.java +++ b/src/main/java/com/kitsu/medievalcraft/tileents/machine/TileForge.java @@ -1,5 +1,7 @@ package com.kitsu.medievalcraft.tileents.machine; +import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; @@ -22,6 +24,10 @@ import net.minecraft.world.World; import com.kitsu.medievalcraft.Main; import com.kitsu.medievalcraft.block.ingots.IngotBase; +import com.kitsu.medievalcraft.packethandle.forge.MsgPacketBurning; +import com.kitsu.medievalcraft.packethandle.forge.MsgPacketForgeX; +import com.kitsu.medievalcraft.packethandle.forge.MsgPacketForgeY; +import com.kitsu.medievalcraft.packethandle.forge.MsgPacketForgeZ; import com.kitsu.medievalcraft.packethandle.forge.MsgPacketOn; import com.kitsu.medievalcraft.tileents.ingots.TileIngotBase; @@ -35,6 +41,7 @@ public class TileForge extends TileEntity implements IInventory{ public boolean isOn; public boolean isBurning; private int ticks; + private Random rand; public TileForge(){ this.inv = new ItemStack[2]; @@ -205,7 +212,7 @@ public class TileForge extends TileEntity implements IInventory{ @Override public void updateEntity() { - World world = getWorldObj(); + World world = this.getWorldObj(); int x = this.xCoord; int y = this.yCoord; int z = this.zCoord; @@ -215,6 +222,7 @@ public class TileForge extends TileEntity implements IInventory{ fireboxFuelDec(world, x, y, z,this.getStackInSlot(0), this.ticks); fireboxFuelDec2(world, x, y, z,this.getStackInSlot(1), this.ticks); } + if (worldObj.isRemote) return; } @@ -327,15 +335,23 @@ 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){ - this.isOn = false; - this.isBurning = false; - Main.sNet.sendToAll(new MsgPacketOn(this.isBurning)); + 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(1)==null){ - this.isOn = false; + if(world.getBlockMetadata(x, y, z)>=8){ + world.setBlockMetadataWithNotify(x, y, z, world.getBlockMetadata(x, y, z)-4, 2); + } } } }