From f6ba85188654080da75cdfc8c0a0891d162b7da8 Mon Sep 17 00:00:00 2001 From: Progwml6 Date: Sun, 2 Feb 2014 12:14:42 -0500 Subject: [PATCH] fix a few things --- src/main/java/tconstruct/client/TProxyClient.java | 3 +-- src/main/java/tconstruct/items/blocks/BarricadeItem.java | 2 +- src/main/java/tconstruct/worldgen/SlimeTreeGen.java | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/tconstruct/client/TProxyClient.java b/src/main/java/tconstruct/client/TProxyClient.java index b8e0b114b17..04f1f3ccb05 100644 --- a/src/main/java/tconstruct/client/TProxyClient.java +++ b/src/main/java/tconstruct/client/TProxyClient.java @@ -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); @@ -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()); diff --git a/src/main/java/tconstruct/items/blocks/BarricadeItem.java b/src/main/java/tconstruct/items/blocks/BarricadeItem.java index 636aaf5f812..2d272ff9c3c 100644 --- a/src/main/java/tconstruct/items/blocks/BarricadeItem.java +++ b/src/main/java/tconstruct/items/blocks/BarricadeItem.java @@ -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) { diff --git a/src/main/java/tconstruct/worldgen/SlimeTreeGen.java b/src/main/java/tconstruct/worldgen/SlimeTreeGen.java index 49110438c16..c7cc2415057 100644 --- a/src/main/java/tconstruct/worldgen/SlimeTreeGen.java +++ b/src/main/java/tconstruct/worldgen/SlimeTreeGen.java @@ -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) {