mirror of
https://github.com/GTNewHorizons/TinkersConstruct.git
synced 2026-11-19 03:49:29 +00:00
Fix the errors that were left, I commeneted our some code in SmelteryLogic for right now, Also changed the way ArrowEntity Sends the ChangeGameState
This commit is contained in:
1 parent
840e0cee04
commit
fffe2800bd
18 files changed
+45
-33
No files matched your search
@@ -37,6 +37,8 @@ public class OreberryBush extends BlockLeavesBase implements IPlantable
|
||||
public String[] oreTypes;
|
||||
public int itemMeat;
|
||||
private int subitems;
|
||||
@SideOnly(Side.CLIENT)
|
||||
protected int field_150127_b;
|
||||
|
||||
public OreberryBush(String[] textureNames, int meta, int sub, String[] oreTypes)
|
||||
{
|
||||
@@ -324,5 +326,12 @@ public class OreberryBush extends BlockLeavesBase implements IPlantable
|
||||
{
|
||||
return EnumPlantType.Cave;
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void func_150122_b(boolean p_150122_1_)
|
||||
{
|
||||
this.field_150121_P = p_150122_1_;
|
||||
this.field_150127_b = (p_150122_1_ ? 0 : 1);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -918,10 +918,11 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci
|
||||
if (servant.verifyMaster(this, field_145850_b, this.field_145851_c, this.field_145848_d, this.field_145849_e))
|
||||
tempBricks++;
|
||||
}
|
||||
else if (servant.setMaster(this.field_145851_c, this.field_145848_d, this.field_145849_e))
|
||||
// Temp comment out
|
||||
/*else if (servant.setMaster(this.field_145851_c, this.field_145848_d, this.field_145849_e))
|
||||
{
|
||||
tempBricks++;
|
||||
}
|
||||
}*/
|
||||
|
||||
if (te instanceof LavaTankLogic)
|
||||
{
|
||||
|
||||
@@ -61,7 +61,7 @@ public class ToolStationLogic extends InventoryLogic implements ISidedInventory
|
||||
if (this.getWorld() != null)
|
||||
{
|
||||
this.field_145847_g = this.getWorld().getBlockMetadata(this.field_145851_c, this.field_145848_d, this.field_145849_e);
|
||||
this.getWorld().markTileEntityChunkModified(this.field_145851_c, this.field_145848_d, this.field_145849_e, this);
|
||||
this.getWorld().func_147476_b(this.field_145851_c, this.field_145848_d, this.field_145849_e, this);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -5,6 +5,7 @@ import java.util.List;
|
||||
import java.util.Random;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockBush;
|
||||
import net.minecraft.block.BlockFlower;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
@@ -19,7 +20,7 @@ import tconstruct.library.TConstructRegistry;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
public class SlimeTallGrass extends BlockFlower implements IShearable
|
||||
public class SlimeTallGrass extends BlockBush implements IShearable
|
||||
{
|
||||
private static final String[] grassTypes = new String[] { "slimegrass_blue_tall" };
|
||||
@SideOnly(Side.CLIENT)
|
||||
@@ -99,7 +100,7 @@ public class SlimeTallGrass extends BlockFlower implements IShearable
|
||||
}
|
||||
|
||||
@Override
|
||||
public ArrayList<ItemStack> getBlockDropped (World world, int x, int y, int z, int meta, int fortune)
|
||||
public ArrayList<ItemStack> getDrops (World world, int x, int y, int z, int meta, int fortune)
|
||||
{
|
||||
ArrayList<ItemStack> ret = new ArrayList<ItemStack>();
|
||||
if (world.rand.nextInt(8) != 0)
|
||||
|
||||
Reference in new issue
Block a user