diff --git a/src/main/java/info/jbcs/minecraft/chisel/Chisel.java b/src/main/java/info/jbcs/minecraft/chisel/Chisel.java index 724338c2..7d97f52b 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/Chisel.java +++ b/src/main/java/info/jbcs/minecraft/chisel/Chisel.java @@ -105,6 +105,15 @@ public class Chisel config = new Configuration(configFile); config.load(); + tabChisel = new CreativeTabs("tabChisel") + { + @Override + public Item getTabIconItem() + { + return chisel; + } + }; + chisel = (ItemChisel) new ItemChisel(Carving.chisel).setTextureName("chisel:chisel").setCreativeTab(CreativeTabs.tabTools); GameRegistry.registerItem(chisel, "chisel"); @@ -133,20 +142,11 @@ public class Chisel particlesTickrate = config.get("client", "particleTickrate", 1, "Particle tick rate. Greater value = less particles.").getInt(1); oldPillars = config.get("client", "pillarOldGraphics", false, "Use old pillar textures").getBoolean(false); disableCTM = !config.get("client", "connectedTextures", true, "Enable connected textures").getBoolean(true); - blockDescriptions = config.get("client", "tooltipsUseBlockDescriptions", true, "Make variations of blocks have the same name, and use the description in tooltip to distinguish them.").getBoolean(true); + blockDescriptions = config.get("cslient", "tooltipsUseBlockDescriptions", true, "Make variations of blocks have the same name, and use the description in tooltip to distinguish them.").getBoolean(true); chiselStoneToCobbleBricks = config.get("general", "chiselStoneToCobbleBricks", true, "Chisel stone to cobblestone and bricks by left-click.").getBoolean(true); enableChiseling = config.get("general", "enableChiselingLeftClicking", false, "Change blocks to another block using the Chisel and left-click.").getBoolean(false); ghostCloud = config.get("general", "doesCloudRenderLikeGhost", true).getBoolean(true); - tabChisel = new CreativeTabs("tabChisel") - { - @Override - public Item getTabIconItem() - { - return chisel; - } - }; - ChiselBlocks.load(); proxy.preInit(); diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockSpikes.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockSpikes.java index 44e1323e..165ca889 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockSpikes.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockSpikes.java @@ -40,16 +40,7 @@ public class BlockSpikes extends Block if(FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT) return; -// int damage = (int) (entity.motionY*10); -// if(damage!=0) -// System.out.println(damage); - double dy = entity.posY - entity.prevPosY; - if(dy != 0) - System.out.println(dy); - -// System.out.println(entity.speedInAir); - GeneralChiselClient.speedupPlayer(world, entity, Chisel.concreteVelocity); } diff --git a/src/main/java/info/jbcs/minecraft/chisel/carving/Carving.java b/src/main/java/info/jbcs/minecraft/chisel/carving/Carving.java index af147c8b..7d71fa64 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/carving/Carving.java +++ b/src/main/java/info/jbcs/minecraft/chisel/carving/Carving.java @@ -132,7 +132,8 @@ public class Carving CarvingGroup group = getGroup(name); CarvingGroup blockGroup = carvingGroupsByVariation.get(key(block, metadata)); - if(blockGroup != null || blockGroup == group) return null; + if(blockGroup != null || blockGroup == group) + return null; CarvingVariation variation = new CarvingVariation(block, metadata, order); group.variations.add(variation); diff --git a/src/main/java/info/jbcs/minecraft/chisel/item/ItemChisel.java b/src/main/java/info/jbcs/minecraft/chisel/item/ItemChisel.java index cbcf382a..d5663df5 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/item/ItemChisel.java +++ b/src/main/java/info/jbcs/minecraft/chisel/item/ItemChisel.java @@ -144,7 +144,6 @@ public class ItemChisel extends ItemTool if(!world.isRemote || chiselHasBlockInside) { - System.out.println("Changing to " + Item.itemRegistry.getNameForObject(result) + ":" + chiselTarget.getItemDamage()); world.setBlock(x, y, z, Block.getBlockFromItem(result), targetMeta, updateValue); } diff --git a/src/main/java/info/jbcs/minecraft/chisel/item/ItemMarbleSlab.java b/src/main/java/info/jbcs/minecraft/chisel/item/ItemMarbleSlab.java index 67650229..f6d9effc 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/item/ItemMarbleSlab.java +++ b/src/main/java/info/jbcs/minecraft/chisel/item/ItemMarbleSlab.java @@ -15,9 +15,6 @@ public class ItemMarbleSlab extends ItemCarvable super(block); } - /** - * Returns true if the given ItemBlock can be placed on the given side of the given block position. - */ @Override public boolean func_150936_a(World world, int x, int y, int z, int side, EntityPlayer player, ItemStack stack) { @@ -48,10 +45,8 @@ public class ItemMarbleSlab extends ItemCarvable Block targetBlock = world.getBlock(x, y, z); int meta = world.getBlockMetadata(x, y, z); - if((targetBlock.equals(block) || targetBlock.equals(block.top)) && meta == stack.getItemDamage()) - return true; + return (targetBlock.equals(block) || targetBlock.equals(block.top)) && meta == stack.getItemDamage() || world.canPlaceEntityOnSide(block, x, y, z, false, side, (Entity) null, stack); - return world.canPlaceEntityOnSide(block, x, y, z, false, side, (Entity) null, stack); }