moar fixy thingies

This commit is contained in:
Progwml6 committed 2014-01-30 20:34:22 -05:00
1 parent 4326ff3c64
commit bb98f77de4
26 files changed
+173 -139

No files matched your search

@@ -42,7 +42,7 @@ public class ConveyorBase extends MantleBlock
}
@Override
public void onEntityCollidedWithBlock (World world, int x, int y, int z, Entity entity)
public void func_149670_a (World world, int x, int y, int z, Entity entity)
{
if (!world.isBlockIndirectlyGettingPowered(x, y, z))
{
@@ -94,7 +94,7 @@ public class ConveyorBase extends MantleBlock
}
@Override
public void onBlockPlacedBy (World world, int x, int y, int z, EntityLivingBase entity, ItemStack stack)
public void func_149689_a (World world, int x, int y, int z, EntityLivingBase entity, ItemStack stack)
{
int face = MathHelper.floor_double((double) (entity.rotationYaw * 8.0F / 360.0F) + 0.5D) + (entity.isSneaking() ? 4 : 0) & 7;
int meta = world.getBlockMetadata(x, y, z) & 8;
@@ -94,9 +94,9 @@ public class EquipBlock extends InventoryBlock
}
}
public void onBlockPlacedBy (World par1World, int par2, int par3, int par4, EntityLivingBase par5EntityLivingBase, ItemStack par6ItemStack)
public void func_149689_a (World par1World, int par2, int par3, int par4, EntityLivingBase par5EntityLivingBase, ItemStack par6ItemStack)
{
super.onBlockPlacedBy(par1World, par2, par3, par4, par5EntityLivingBase, par6ItemStack);
super.func_149689_a(par1World, par2, par3, par4, par5EntityLivingBase, par6ItemStack);
int i3 = MathHelper.floor_double((par5EntityLivingBase.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3;
int newMeta = 0;
@@ -120,7 +120,7 @@ public class EquipBlock extends InventoryBlock
}
@Override
public void breakBlock (World par1World, int x, int y, int z, int par5, int meta)
public void func_149749_a (World par1World, int x, int y, int z, int par5, int meta)
{
TileEntity te = par1World.getBlockTileEntity(x, y, z);
@@ -165,7 +165,7 @@ public class EquipBlock extends InventoryBlock
}
}
super.breakBlock(par1World, x, y, z, par5, meta);
super.func_149749_a(par1World, x, y, z, par5, meta);
}
public int getLightValue (IBlockAccess world, int x, int y, int z)
@@ -17,7 +17,7 @@ public class GlueBlock extends TConstructBlock {
}
@Override
public void onEntityCollidedWithBlock (World world, int x, int y, int z, Entity entity)
public void func_149670_a (World world, int x, int y, int z, Entity entity)
{
entity.motionX *= 0.1;
entity.motionZ *= 0.1;
@@ -303,7 +303,7 @@ public class LavaTankBlock extends BlockContainer
}
@Override
public void onBlockPlacedBy (World world, int x, int y, int z, EntityLivingBase living, ItemStack stack)
public void func_149689_a (World world, int x, int y, int z, EntityLivingBase living, ItemStack stack)
{
if (stack.hasTagCompound())
{
@@ -8,6 +8,7 @@ import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Container;
import net.minecraft.inventory.ISidedInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.util.StatCollector;
import net.minecraft.world.World;
public class StencilTableLogic extends InventoryLogic implements ISidedInventory
@@ -120,4 +121,16 @@ public class StencilTableLogic extends InventoryLogic implements ISidedInventory
{
return false;
}
@Override
public String func_145825_b ()
{
return StatCollector.translateToLocal("toolstation.PatternShaper");
}
@Override
public boolean func_145818_k_ ()
{
return true;
}
}
@@ -193,5 +193,17 @@ public class TankAirLogic extends InventoryLogic implements IServantLogic, ISide
return new Packet132TileEntityData(field_145851_c, field_145848_d, field_145849_e, 1, tag);
}
@Override
public String func_145825_b ()
{
return this.func_145825_b();
}
@Override
public boolean func_145818_k_ ()
{
return false;
}
}
@@ -41,7 +41,7 @@ public class SlimeGel extends TConstructBlock
}
@Override
public void onEntityCollidedWithBlock (World world, int x, int y, int z, Entity entity)
public void func_149670_a (World world, int x, int y, int z, Entity entity)
{
if (entity.motionY < 0)
{
@@ -91,8 +91,8 @@ public class BarricadeBlock extends MantleBlock
if (meta % 4 != 3)
{
world.func_147465_d(x, y, z, this, meta + 1, 3);
this.onBlockPlacedBy(world, x, y, z, player, stack);
this.onPostBlockPlaced(world, x, y, z, meta);
this.func_149689_a(world, x, y, z, player, stack);
this.func_149714_e(world, x, y, z, meta);
Block var9 = this;
world.playSoundEffect(x + 0.5F, y + 0.5F, z + 0.5F, var9.field_149762_H.getStepSound(), (var9.field_149762_H.getVolume() + 1.0F) / 2.0F, var9.field_149762_H.getPitch() * 0.8F);
@@ -234,11 +234,11 @@ public class Landmine extends MantleBlock
{
if (par6 > 0)
{
par1World.notifyBlocksOfNeighborChange(par2, par3, par4, this);
par1World.notifyBlocksOfNeighborChange(par2, par3 - 1, par4, this);
par1World.func_147459_d(par2, par3, par4, this);
par1World.func_147459_d(par2, par3 - 1, par4, this);
}
super.breakBlock(par1World, par2, par3, par4, par5, par6);
super.func_149749_a(par1World, par2, par3, par4, par5, par6);
}
/**
@@ -34,7 +34,7 @@ public class Punji extends MantleBlock
}
@Override
public void onEntityCollidedWithBlock (World world, int x, int y, int z, Entity entity)
public void func_149670_a (World world, int x, int y, int z, Entity entity)
{
if (entity instanceof EntityLivingBase)
{