Skip to content

Commit

Permalink
fix a few things
Browse files Browse the repository at this point in the history
  • Loading branch information
progwml6 committed Feb 2, 2014
1 parent a8c1f32 commit f6ba851
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
3 changes: 1 addition & 2 deletions src/main/java/tconstruct/client/TProxyClient.java
Expand Up @@ -198,7 +198,7 @@ public static boolean classMatches (Object paramObject, String paramString)

public void registerTickHandler ()
{
TickRegistry.registerTickHandler(new TClientTickHandler(), Side.CLIENT);
new TClientTickHandler();
// TickRegistry.registerTickHandler(new TimeTicker(), Side.CLIENT);
// TickRegistry.registerTickHandler(new TCommonTickHandler(),
// Side.CLIENT);
Expand Down Expand Up @@ -716,7 +716,6 @@ void addRenderMappings ()
public void registerKeys ()
{
controlInstance = new TControls();
TickRegistry.registerTickHandler(controlInstance, Side.CLIENT);
uploadKeyBindingsToGame(Minecraft.getMinecraft().gameSettings, controlInstance);

TabRegistry.registerTab(new InventoryTabVanilla());
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/tconstruct/items/blocks/BarricadeItem.java
Expand Up @@ -39,7 +39,7 @@ public boolean onItemUse (ItemStack stack, EntityPlayer player, World world, int
side = 1;
}
else if (b != Blocks.vine && b != Blocks.tallgrass && b != Blocks.deadbush
&& (b == null || !b.isBlockReplaceable(world, x, y, z)))
&& (b == null || !b.func_149742_c(world, x, y, z)))
{
if (side == 0)
{
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/tconstruct/worldgen/SlimeTreeGen.java
Expand Up @@ -167,7 +167,7 @@ void placeTrunk (World world, int xPos, int yPos, int zPos, int height)
protected void setBlockAndMetadata (World world, int x, int y, int z, Block block, int blockMeta)
{
Block blockWorld = world.func_147439_a(x, y, z);
if (blockWorld == null || blockWorld == Blocks.air || blockWorld.isBlockReplaceable(world, x, y, z))
if (blockWorld == null || blockWorld == Blocks.air || blockWorld.func_149742_c(world, x, y, z))
{
if (this.notify)
{
Expand Down

0 comments on commit f6ba851

Please sign in to comment.