mirror of
https://github.com/GTNewHorizons/TinkersConstruct.git
synced 2026-11-19 03:49:29 +00:00
around 300 combined errors
This commit is contained in:
1 parent
ffd383dc41
commit
ee7bc7d7eb
30 files changed
+43
-61
No files matched your search
@@ -2,6 +2,7 @@ package tconstruct.items;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import mantle.world.WorldHelper;
|
||||
import net.minecraftforge.fluids.BlockFluidFinite;
|
||||
import tconstruct.TConstruct;
|
||||
import tconstruct.blocks.logic.LiquidTextureLogic;
|
||||
@@ -134,7 +135,7 @@ public class FilledBucket extends ItemBucket
|
||||
|
||||
public boolean tryPlaceContainedLiquid (World world, int clickX, int clickY, int clickZ, int type)
|
||||
{
|
||||
if (!world.isAirBlock(clickX, clickY, clickZ) && world.getBlockMaterial(clickX, clickY, clickZ).isSolid())
|
||||
if (!WorldHelper.isAirBlock(world, clickX, clickY, clickZ) && world.func_147439_a(clickX, clickY, clickZ).func_149688_o().isSolid())
|
||||
{
|
||||
return false;
|
||||
}
|
||||
@@ -156,7 +157,7 @@ public class FilledBucket extends ItemBucket
|
||||
}
|
||||
|
||||
@Override
|
||||
public void getSubItems (Item b, CreativeTabs tab, List list)
|
||||
public void func_150895_a (Item b, CreativeTabs tab, List list)
|
||||
{
|
||||
for (int i = 0; i < icons.length; i++)
|
||||
list.add(new ItemStack(b, 1, i));
|
||||
|
||||
@@ -98,7 +98,7 @@ public class TitleIcon extends Item
|
||||
}
|
||||
|
||||
@Override
|
||||
public void getSubItems (Item b, CreativeTabs tab, List list)
|
||||
public void func_150895_a (Item b, CreativeTabs tab, List list)
|
||||
{
|
||||
for (int i = 0; i < mobNames.length; i++)
|
||||
list.add(new ItemStack(b, 1, i));
|
||||
@@ -119,13 +119,13 @@ public class TitleIcon extends Item
|
||||
{
|
||||
if (!world.isRemote)
|
||||
{
|
||||
Block b = world.getBlock(posX, posY, posZ);
|
||||
Block b = world.func_147439_a(posX, posY, posZ);
|
||||
posX += Facing.offsetsXForSide[par7];
|
||||
posY += Facing.offsetsYForSide[par7];
|
||||
posZ += Facing.offsetsZForSide[par7];
|
||||
double d0 = 0.0D;
|
||||
|
||||
if (par7 == 1 && b != null && b.getRenderType() == 11)
|
||||
if (par7 == 1 && b != null && b.func_149645_b() == 11)
|
||||
{
|
||||
d0 = 0.5D;
|
||||
}
|
||||
@@ -150,13 +150,13 @@ public class TitleIcon extends Item
|
||||
|
||||
public static EntityLiving activateSpawnEgg (ItemStack stack, World world, double posX, double posY, double posZ, int par7)
|
||||
{
|
||||
Block b = world.getBlock((int) posX, (int) posY, (int) posZ);
|
||||
Block b = world.func_147439_a((int) posX, (int) posY, (int) posZ);
|
||||
posX += Facing.offsetsXForSide[par7];
|
||||
posY += Facing.offsetsYForSide[par7];
|
||||
posZ += Facing.offsetsZForSide[par7];
|
||||
double d0 = 0.0D;
|
||||
|
||||
if (par7 == 1 && b != null && b.getRenderType() == 11)
|
||||
if (par7 == 1 && b != null && b.func_149645_b() == 11)
|
||||
{
|
||||
d0 = 0.5D;
|
||||
}
|
||||
|
||||
@@ -95,7 +95,7 @@ public class BarricadeItem extends ItemBlock
|
||||
if (placeBlockAt(stack, player, world, x, y, z, side, hitX, hitY, hitZ, metadata))
|
||||
{
|
||||
world.playSoundEffect((double) ((float) x + 0.5F), (double) ((float) y + 0.5F), (double) ((float) z + 0.5F), block.field_149762_H.getPlaceSound(),
|
||||
(block.field_149762_H.getVolume() + 1.0F) / 2.0F, block.field_149762_H.getPitch() * 0.8F);
|
||||
(block.field_149762_H.func_150497_c() + 1.0F) / 2.0F, block.field_149762_H.getPitch() * 0.8F);
|
||||
--stack.stackSize;
|
||||
}
|
||||
|
||||
|
||||
@@ -50,7 +50,7 @@ public class OreberryBushItem extends MultiItemBlock
|
||||
if (!player.capabilities.isCreativeMode)
|
||||
stack.stackSize--;
|
||||
if (!world.isRemote)
|
||||
world.playAuxSFX(2001, x, y, z, blockID);
|
||||
world.playAuxSFX(2001, x, y, z, Block.func_149682_b(block));
|
||||
return true;
|
||||
}
|
||||
else
|
||||
|
||||
@@ -56,7 +56,7 @@ public class OreberryBushSecondItem extends MultiItemBlock
|
||||
if (!player.capabilities.isCreativeMode)
|
||||
stack.stackSize--;
|
||||
if (!world.isRemote)
|
||||
world.playAuxSFX(2001, x, y, z, blockID);
|
||||
world.playAuxSFX(2001, x, y, z, Block.func_149682_b(block));
|
||||
return true;
|
||||
}
|
||||
else
|
||||
|
||||
@@ -34,7 +34,7 @@ public class WoolSlab1Item extends MultiItemBlock
|
||||
if (world.func_147465_d(x, y, z, Blocks.wool, trueMeta, 3))
|
||||
{
|
||||
world.playSoundEffect((double) ((float) x + 0.5F), (double) ((float) y + 0.5F), (double) ((float) z + 0.5F), this.block.field_149762_H.getPlaceSound(),
|
||||
(this.block.field_149762_H.getVolume() + 1.0F) / 2.0F, this.block.field_149762_H.getPitch() * 0.8F);
|
||||
(this.block.field_149762_H.func_150497_c() + 1.0F) / 2.0F, this.block.field_149762_H.getPitch() * 0.8F);
|
||||
--stack.stackSize;
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -27,17 +27,17 @@ public class WoolSlab2Item extends MultiItemBlock
|
||||
@Override
|
||||
public boolean onItemUse (ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ)
|
||||
{
|
||||
int id = world.func_147439_a(x, y, z);
|
||||
Block block = world.func_147439_a(x, y, z);
|
||||
int meta = world.getBlockMetadata(x, y, z);
|
||||
int trueMeta = meta % 8;
|
||||
boolean flag = (id & 8) != 0;
|
||||
|
||||
if ((side == 1 && flag || side == 0 && !flag) && id == this.blockID && trueMeta == stack.getItemDamage())
|
||||
if ((side == 1 && flag || side == 0 && !flag) && block == this.block && trueMeta == stack.getItemDamage())
|
||||
{
|
||||
if (world.func_147465_d(x, y, z, Blocks.wool, trueMeta + 8, 3))
|
||||
{
|
||||
world.playSoundEffect((double) ((float) x + 0.5F), (double) ((float) y + 0.5F), (double) ((float) z + 0.5F), this.block.field_149762_H.getPlaceSound(),
|
||||
(this.block.field_149762_H.getVolume() + 1.0F) / 2.0F, this.block.field_149762_H.getPitch() * 0.8F);
|
||||
(this.block.field_149762_H.func_150497_c() + 1.0F) / 2.0F, this.block.field_149762_H.getPitch() * 0.8F);
|
||||
--stack.stackSize;
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -116,7 +116,7 @@ public class Chisel extends ToolCore
|
||||
AbilityHelper.damageTool(itemstack, 1, null, false);
|
||||
}
|
||||
}
|
||||
world.playAuxSFX(2001, x, y, z, blockID + (meta << 12));
|
||||
world.playAuxSFX(2001, x, y, z, Block.func_149682_b(block) + (meta << 12));
|
||||
entityplayer.swingItem();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -240,7 +240,7 @@ public class Excavator extends HarvestTool
|
||||
}
|
||||
}
|
||||
if (!world.isRemote)
|
||||
world.playAuxSFX(2001, x, y, z, blockID + (meta << 12));
|
||||
world.playAuxSFX(2001, x, y, z, Block.func_149682_b(block) + (meta << 12));
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@@ -337,7 +337,7 @@ public class Hammer extends HarvestTool
|
||||
}
|
||||
}
|
||||
if (!world.isRemote)
|
||||
world.playAuxSFX(2001, x, y, z, blockID + (meta << 12));
|
||||
world.playAuxSFX(2001, x, y, z, Block.func_149682_b(block) + (meta << 12));
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@@ -202,7 +202,7 @@ public class Scythe extends Weapon
|
||||
}
|
||||
}
|
||||
if (!world.isRemote)
|
||||
world.playAuxSFX(2001, x, y, z, blockID + (meta << 12));
|
||||
world.playAuxSFX(2001, x, y, z, Block.func_149682_b(blockB) + (meta << 12));
|
||||
return super.onBlockStartBreak(stack, x, y, z, player);
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user