From 662a9e73262a122407f04ad65b4b73a1e6ceb0a5 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Thu, 29 Jan 2015 16:58:45 -0500 Subject: [PATCH] Fix some issues with ice/icestairs/icepillars/packedice (#189) --- .../com/cricketcraft/chisel/Features.java | 84 ++++----- .../chisel/block/BlockCarvableIce.java | 5 - .../chisel/block/BlockCarvableIcePillar.java | 164 +++++++++--------- .../chisel/block/BlockCarvablePackedIce.java | 3 +- .../block/BlockCarvablePackedIcePillar.java | 10 ++ .../chisel/block/CarvableStairsMaker.java | 2 +- .../chisel/init/ChiselBlocks.java | 16 +- .../resources/assets/chisel/lang/en_PT.lang | 32 ++-- .../resources/assets/chisel/lang/en_US.lang | 66 +++---- .../resources/assets/chisel/lang/fr_FR.lang | 32 ++-- .../resources/assets/chisel/lang/ko_KR.lang | 50 +++--- .../resources/assets/chisel/lang/ru_RU.lang | 64 +++---- .../resources/assets/chisel/lang/zh_CN.lang | 32 ++-- 13 files changed, 283 insertions(+), 277 deletions(-) diff --git a/src/main/java/com/cricketcraft/chisel/Features.java b/src/main/java/com/cricketcraft/chisel/Features.java index 5c475fb6..56fe9288 100644 --- a/src/main/java/com/cricketcraft/chisel/Features.java +++ b/src/main/java/com/cricketcraft/chisel/Features.java @@ -369,8 +369,8 @@ public enum Features { @Override void addBlocks() { - BlockMarbleCarpet carpet = (BlockMarbleCarpet) new BlockMarbleCarpet(Material.cloth).setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(2.0F).setResistance(10F) - .setStepSound(Block.soundTypeCloth); + BlockMarbleCarpet carpet = (BlockMarbleCarpet) new BlockMarbleCarpet(Material.cloth).setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(0.1F).setStepSound(Block.soundTypeCloth) + .setLightOpacity(0).setStepSound(Block.soundTypeCloth); carpet.carverHelper.setChiselBlockName("Carpet"); carpet.carverHelper.addVariation("tile.carpet.0.desc", 0, "carpet/white"); carpet.carverHelper.addVariation("tile.carpet.1.desc", 1, "carpet/orange"); @@ -1070,7 +1070,7 @@ public enum Features { @Override void addRecipes() { - GameRegistry.addRecipe(new ItemStack(ChiselBlocks.ice_pillar, 6, 1), "XX", "XX", "XX", 'X', new ItemStack(ChiselBlocks.ice, 1, OreDictionary.WILDCARD_VALUE)); + GameRegistry.addRecipe(new ItemStack(ChiselBlocks.ice_pillar, 6, 0), "XX", "XX", "XX", 'X', new ItemStack(ChiselBlocks.ice, 1, OreDictionary.WILDCARD_VALUE)); } }, @@ -1080,22 +1080,22 @@ public enum Features { void addBlocks() { CarvableStairsMaker makerIceStairs = new CarvableStairsMaker(Blocks.ice); makerIceStairs.carverHelper.setChiselBlockName("Ice Stairs"); - makerIceStairs.carverHelper.addVariation("tile.iceStairs.0.desc", 0, Blocks.ice); - makerIceStairs.carverHelper.addVariation("tile.iceStairs.1.desc", 1, "ice/a1-ice-light"); - makerIceStairs.carverHelper.addVariation("tile.iceStairs.2.desc", 2, "ice/a1-stonecobble-icecobble"); - makerIceStairs.carverHelper.addVariation("tile.iceStairs.3.desc", 3, "ice/a1-netherbrick-ice"); - makerIceStairs.carverHelper.addVariation("tile.iceStairs.4.desc", 4, "ice/a1-stonecobble-icebrick"); - makerIceStairs.carverHelper.addVariation("tile.iceStairs.5.desc", 5, "ice/a1-stonecobble-icebricksmall"); - makerIceStairs.carverHelper.addVariation("tile.iceStairs.6.desc", 6, "ice/a1-stonecobble-icedungeon"); - makerIceStairs.carverHelper.addVariation("tile.iceStairs.7.desc", 7, "ice/a1-stonecobble-icefour"); - makerIceStairs.carverHelper.addVariation("tile.iceStairs.8.desc", 8, "ice/a1-stonecobble-icefrench"); - makerIceStairs.carverHelper.addVariation("tile.iceStairs.9.desc", 9, "ice/sunkentiles"); - makerIceStairs.carverHelper.addVariation("tile.iceStairs.10.desc", 10, "ice/tiles"); - makerIceStairs.carverHelper.addVariation("tile.iceStairs.11.desc", 11, "ice/a1-stonecobble-icepanel"); - makerIceStairs.carverHelper.addVariation("tile.iceStairs.12.desc", 12, "ice/a1-stoneslab-ice"); - makerIceStairs.carverHelper.addVariation("tile.iceStairs.13.desc", 13, "ice/zelda"); - makerIceStairs.carverHelper.addVariation("tile.iceStairs.14.desc", 14, "ice/bismuth"); - makerIceStairs.carverHelper.addVariation("tile.iceStairs.15.desc", 15, "ice/poison"); + makerIceStairs.carverHelper.addVariation("tile.ice_stairs.0.desc", 0, Blocks.ice); + makerIceStairs.carverHelper.addVariation("tile.ice_stairs.1.desc", 1, "ice/a1-ice-light"); + makerIceStairs.carverHelper.addVariation("tile.ice_stairs.2.desc", 2, "ice/a1-stonecobble-icecobble"); + makerIceStairs.carverHelper.addVariation("tile.ice_stairs.3.desc", 3, "ice/a1-netherbrick-ice"); + makerIceStairs.carverHelper.addVariation("tile.ice_stairs.4.desc", 4, "ice/a1-stonecobble-icebrick"); + makerIceStairs.carverHelper.addVariation("tile.ice_stairs.5.desc", 5, "ice/a1-stonecobble-icebricksmall"); + makerIceStairs.carverHelper.addVariation("tile.ice_stairs.6.desc", 6, "ice/a1-stonecobble-icedungeon"); + makerIceStairs.carverHelper.addVariation("tile.ice_stairs.7.desc", 7, "ice/a1-stonecobble-icefour"); + makerIceStairs.carverHelper.addVariation("tile.ice_stairs.8.desc", 8, "ice/a1-stonecobble-icefrench"); + makerIceStairs.carverHelper.addVariation("tile.ice_stairs.9.desc", 9, "ice/sunkentiles"); + makerIceStairs.carverHelper.addVariation("tile.ice_stairs.10.desc", 10, "ice/tiles"); + makerIceStairs.carverHelper.addVariation("tile.ice_stairs.11.desc", 11, "ice/a1-stonecobble-icepanel"); + makerIceStairs.carverHelper.addVariation("tile.ice_stairs.12.desc", 12, "ice/a1-stoneslab-ice"); + makerIceStairs.carverHelper.addVariation("tile.ice_stairs.13.desc", 13, "ice/zelda"); + makerIceStairs.carverHelper.addVariation("tile.ice_stairs.14.desc", 14, "ice/bismuth"); + makerIceStairs.carverHelper.addVariation("tile.ice_stairs.15.desc", 15, "ice/poison"); makerIceStairs.create(new IStairsCreator() { @Override @@ -1681,13 +1681,13 @@ public enum Features { BlockCarvablePackedIcePillar packedice_pillar = (BlockCarvablePackedIcePillar) new BlockCarvablePackedIcePillar(Material.ice).setCreativeTab(ChiselTabs.tabOtherChiselBlocks) .setHardness(0.5F).setLightOpacity(3).setStepSound(Block.soundTypeGlass); packedice_pillar.carverHelper.setChiselBlockName("Packed Ice Pillar"); - packedice_pillar.carverHelper.addVariation("tile.packedicePillar.0.desc", 0, "icepillar/plainplain"); - packedice_pillar.carverHelper.addVariation("tile.packedicePillar.1.desc", 1, "icepillar/plaingreek"); - packedice_pillar.carverHelper.addVariation("tile.packedicePillar.2.desc", 2, "icepillar/greekplain"); - packedice_pillar.carverHelper.addVariation("tile.packedicePillar.3.desc", 3, "icepillar/greekgreek"); - packedice_pillar.carverHelper.addVariation("tile.packedicePillar.4.desc", 4, "icepillar/convexplain"); - packedice_pillar.carverHelper.addVariation("tile.packedicePillar.5.desc", 5, "icepillar/carved"); - packedice_pillar.carverHelper.addVariation("tile.packedicePillar.6.desc", 6, "icepillar/ornamental"); + packedice_pillar.carverHelper.addVariation("tile.packedice_pillar.0.desc", 0, "icepillar/plainplain"); + packedice_pillar.carverHelper.addVariation("tile.packedice_pillar.1.desc", 1, "icepillar/plaingreek"); + packedice_pillar.carverHelper.addVariation("tile.packedice_pillar.2.desc", 2, "icepillar/greekplain"); + packedice_pillar.carverHelper.addVariation("tile.packedice_pillar.3.desc", 3, "icepillar/greekgreek"); + packedice_pillar.carverHelper.addVariation("tile.packedice_pillar.4.desc", 4, "icepillar/convexplain"); + packedice_pillar.carverHelper.addVariation("tile.packedice_pillar.5.desc", 5, "icepillar/carved"); + packedice_pillar.carverHelper.addVariation("tile.packedice_pillar.6.desc", 6, "icepillar/ornamental"); packedice_pillar.carverHelper.registerAll(packedice_pillar, "packedice_pillar"); } }, @@ -1698,22 +1698,22 @@ public enum Features { void addBlocks() { CarvableStairsMaker makerPackedIceStairs = new CarvableStairsMaker(Blocks.packed_ice); makerPackedIceStairs.carverHelper.setChiselBlockName("Packed Ice Stairs"); - makerPackedIceStairs.carverHelper.addVariation("tile.packediceStairs.0.desc", 0, Blocks.packed_ice); - makerPackedIceStairs.carverHelper.addVariation("tile.packediceStairs.1.desc", 1, "ice/a1-ice-light"); - makerPackedIceStairs.carverHelper.addVariation("tile.packediceStairs.2.desc", 2, "ice/a1-stonecobble-icecobble"); - makerPackedIceStairs.carverHelper.addVariation("tile.packediceStairs.3.desc", 3, "ice/a1-netherbrick-ice"); - makerPackedIceStairs.carverHelper.addVariation("tile.packediceStairs.4.desc", 4, "ice/a1-stonecobble-icebrick"); - makerPackedIceStairs.carverHelper.addVariation("tile.packediceStairs.5.desc", 5, "ice/a1-stonecobble-icebricksmall"); - makerPackedIceStairs.carverHelper.addVariation("tile.packediceStairs.6.desc", 6, "ice/a1-stonecobble-icedungeon"); - makerPackedIceStairs.carverHelper.addVariation("tile.packediceStairs.7.desc", 7, "ice/a1-stonecobble-icefour"); - makerPackedIceStairs.carverHelper.addVariation("tile.packediceStairs.8.desc", 8, "ice/a1-stonecobble-icefrench"); - makerPackedIceStairs.carverHelper.addVariation("tile.packediceStairs.9.desc", 9, "ice/sunkentiles"); - makerPackedIceStairs.carverHelper.addVariation("tile.packediceStairs.10.desc", 10, "ice/tiles"); - makerPackedIceStairs.carverHelper.addVariation("tile.packediceStairs.11.desc", 11, "ice/a1-stonecobble-icepanel"); - makerPackedIceStairs.carverHelper.addVariation("tile.packediceStairs.12.desc", 12, "ice/a1-stoneslab-ice"); - makerPackedIceStairs.carverHelper.addVariation("tile.packediceStairs.13.desc", 13, "ice/zelda"); - makerPackedIceStairs.carverHelper.addVariation("tile.packediceStairs.14.desc", 14, "ice/bismuth"); - makerPackedIceStairs.carverHelper.addVariation("tile.packediceStairs.15.desc", 15, "ice/poison"); + makerPackedIceStairs.carverHelper.addVariation("tile.packedice_stairs.0.desc", 0, Blocks.packed_ice); + makerPackedIceStairs.carverHelper.addVariation("tile.packedice_stairs.1.desc", 1, "ice/a1-ice-light"); + makerPackedIceStairs.carverHelper.addVariation("tile.packedice_stairs.2.desc", 2, "ice/a1-stonecobble-icecobble"); + makerPackedIceStairs.carverHelper.addVariation("tile.packedice_stairs.3.desc", 3, "ice/a1-netherbrick-ice"); + makerPackedIceStairs.carverHelper.addVariation("tile.packedice_stairs.4.desc", 4, "ice/a1-stonecobble-icebrick"); + makerPackedIceStairs.carverHelper.addVariation("tile.packedice_stairs.5.desc", 5, "ice/a1-stonecobble-icebricksmall"); + makerPackedIceStairs.carverHelper.addVariation("tile.packedice_stairs.6.desc", 6, "ice/a1-stonecobble-icedungeon"); + makerPackedIceStairs.carverHelper.addVariation("tile.packedice_stairs.7.desc", 7, "ice/a1-stonecobble-icefour"); + makerPackedIceStairs.carverHelper.addVariation("tile.packedice_stairs.8.desc", 8, "ice/a1-stonecobble-icefrench"); + makerPackedIceStairs.carverHelper.addVariation("tile.packedice_stairs.9.desc", 9, "ice/sunkentiles"); + makerPackedIceStairs.carverHelper.addVariation("tile.packedice_stairs.10.desc", 10, "ice/tiles"); + makerPackedIceStairs.carverHelper.addVariation("tile.packedice_stairs.11.desc", 11, "ice/a1-stonecobble-icepanel"); + makerPackedIceStairs.carverHelper.addVariation("tile.packedice_stairs.12.desc", 12, "ice/a1-stoneslab-ice"); + makerPackedIceStairs.carverHelper.addVariation("tile.packedice_stairs.13.desc", 13, "ice/zelda"); + makerPackedIceStairs.carverHelper.addVariation("tile.packedice_stairs.14.desc", 14, "ice/bismuth"); + makerPackedIceStairs.carverHelper.addVariation("tile.packedice_stairs.15.desc", 15, "ice/poison"); makerPackedIceStairs.create(new IStairsCreator() { @Override diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableIce.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableIce.java index 28316e04..1a45be8b 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableIce.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableIce.java @@ -32,11 +32,6 @@ public class BlockCarvableIce extends BlockIce implements ICarvable { return carverHelper.getIcon(side, metadata); } - @Override - public int damageDropped(int i) { - return 0; - } - @Override public void registerBlockIcons(IIconRegister register) { carverHelper.registerBlockIcons("Chisel", this, register); diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableIcePillar.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableIcePillar.java index 1038f18d..ed3c1753 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableIcePillar.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableIcePillar.java @@ -10,6 +10,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.stats.StatList; +import net.minecraft.util.Facing; import net.minecraft.world.EnumSkyBlock; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -23,99 +24,96 @@ public class BlockCarvableIcePillar extends BlockCarvablePillar { super(m); this.slipperiness = 0.98F; this.setTickRandomly(true); + setStained(true); } - /** - * Returns which pass should this block be rendered on. 0 for solids and 1 for alpha - */ - @SideOnly(Side.CLIENT) - public int getRenderBlockPass() - { - return 1; - } - /** - * Returns true if the given side of this block type should be rendered, if the adjacent block is at the given - * coordinates. Args: blockAccess, x, y, z, side - */ - @SideOnly(Side.CLIENT) - public boolean shouldSideBeRendered(IBlockAccess p_149646_1_, int p_149646_2_, int p_149646_3_, int p_149646_4_, int p_149646_5_) - { - return super.shouldSideBeRendered(p_149646_1_, p_149646_2_, p_149646_3_, p_149646_4_, 1 - p_149646_5_); - } + @Override + public boolean isOpaqueCube() { + return false; + } + + /** + * Returns true if the given side of this block type should be rendered, if the adjacent block is at the given coordinates. Args: blockAccess, x, y, z, side + */ + @SideOnly(Side.CLIENT) + public boolean shouldSideBeRendered(IBlockAccess p_149646_1_, int p_149646_2_, int p_149646_3_, int p_149646_4_, int p_149646_5_) + { + Block block = p_149646_1_.getBlock(p_149646_2_, p_149646_3_, p_149646_4_); + return block == this ? false : super.shouldSideBeRendered(p_149646_1_, p_149646_2_, p_149646_3_, p_149646_4_, p_149646_5_); + } - /** - * Called when the player destroys a block with an item that can harvest it. (i, j, k) are the coordinates of the - * block and l is the block's subtype/damage. - */ - public void harvestBlock(World p_149636_1_, EntityPlayer p_149636_2_, int p_149636_3_, int p_149636_4_, int p_149636_5_, int p_149636_6_) - { - p_149636_2_.addStat(StatList.mineBlockStatArray[Block.getIdFromBlock(this)], 1); - p_149636_2_.addExhaustion(0.025F); + /** + * Called when the player destroys a block with an item that can harvest it. (i, j, k) are the coordinates of the block and l is the block's subtype/damage. + */ + public void harvestBlock(World p_149636_1_, EntityPlayer p_149636_2_, int p_149636_3_, int p_149636_4_, int p_149636_5_, int p_149636_6_) + { + p_149636_2_.addStat(StatList.mineBlockStatArray[Block.getIdFromBlock(this)], 1); + p_149636_2_.addExhaustion(0.025F); - if (this.canSilkHarvest(p_149636_1_, p_149636_2_, p_149636_3_, p_149636_4_, p_149636_5_, p_149636_6_) && EnchantmentHelper.getSilkTouchModifier(p_149636_2_)) - { - ArrayList items = new ArrayList(); - ItemStack itemstack = this.createStackedBlock(p_149636_6_); + if (this.canSilkHarvest(p_149636_1_, p_149636_2_, p_149636_3_, p_149636_4_, p_149636_5_, p_149636_6_) && EnchantmentHelper.getSilkTouchModifier(p_149636_2_)) + { + ArrayList items = new ArrayList(); + ItemStack itemstack = this.createStackedBlock(p_149636_6_); - if (itemstack != null) items.add(itemstack); + if (itemstack != null) + items.add(itemstack); - ForgeEventFactory.fireBlockHarvesting(items, p_149636_1_, this, p_149636_3_, p_149636_4_, p_149636_5_, p_149636_6_, 0, 1.0f, true, p_149636_2_); - for (ItemStack is : items) - this.dropBlockAsItem(p_149636_1_, p_149636_3_, p_149636_4_, p_149636_5_, is); - } - else - { - if (p_149636_1_.provider.isHellWorld) - { - p_149636_1_.setBlockToAir(p_149636_3_, p_149636_4_, p_149636_5_); - return; - } + ForgeEventFactory.fireBlockHarvesting(items, p_149636_1_, this, p_149636_3_, p_149636_4_, p_149636_5_, p_149636_6_, 0, 1.0f, true, p_149636_2_); + for (ItemStack is : items) + this.dropBlockAsItem(p_149636_1_, p_149636_3_, p_149636_4_, p_149636_5_, is); + } + else + { + if (p_149636_1_.provider.isHellWorld) + { + p_149636_1_.setBlockToAir(p_149636_3_, p_149636_4_, p_149636_5_); + return; + } - int i1 = EnchantmentHelper.getFortuneModifier(p_149636_2_); - harvesters.set(p_149636_2_); - this.dropBlockAsItem(p_149636_1_, p_149636_3_, p_149636_4_, p_149636_5_, p_149636_6_, i1); - harvesters.set(null); - Material material = p_149636_1_.getBlock(p_149636_3_, p_149636_4_ - 1, p_149636_5_).getMaterial(); + int i1 = EnchantmentHelper.getFortuneModifier(p_149636_2_); + harvesters.set(p_149636_2_); + this.dropBlockAsItem(p_149636_1_, p_149636_3_, p_149636_4_, p_149636_5_, p_149636_6_, i1); + harvesters.set(null); + Material material = p_149636_1_.getBlock(p_149636_3_, p_149636_4_ - 1, p_149636_5_).getMaterial(); - if (material.blocksMovement() || material.isLiquid()) - { - p_149636_1_.setBlock(p_149636_3_, p_149636_4_, p_149636_5_, Blocks.flowing_water); - } - } - } + if (material.blocksMovement() || material.isLiquid()) + { + p_149636_1_.setBlock(p_149636_3_, p_149636_4_, p_149636_5_, Blocks.flowing_water); + } + } + } - /** - * Returns the quantity of items to drop on block destruction. - */ - public int quantityDropped(Random p_149745_1_) - { - return 0; - } + /** + * Returns the quantity of items to drop on block destruction. + */ + public int quantityDropped(Random p_149745_1_) + { + return 0; + } - /** - * Ticks the block if it's been scheduled - */ - public void updateTick(World p_149674_1_, int p_149674_2_, int p_149674_3_, int p_149674_4_, Random p_149674_5_) - { - if (p_149674_1_.getSavedLightValue(EnumSkyBlock.Block, p_149674_2_, p_149674_3_, p_149674_4_) > 11 - this.getLightOpacity()) - { - if (p_149674_1_.provider.isHellWorld) - { - p_149674_1_.setBlockToAir(p_149674_2_, p_149674_3_, p_149674_4_); - return; - } + /** + * Ticks the block if it's been scheduled + */ + public void updateTick(World p_149674_1_, int p_149674_2_, int p_149674_3_, int p_149674_4_, Random p_149674_5_) + { + if (p_149674_1_.getSavedLightValue(EnumSkyBlock.Block, p_149674_2_, p_149674_3_, p_149674_4_) > 11 - this.getLightOpacity()) + { + if (p_149674_1_.provider.isHellWorld) + { + p_149674_1_.setBlockToAir(p_149674_2_, p_149674_3_, p_149674_4_); + return; + } - this.dropBlockAsItem(p_149674_1_, p_149674_2_, p_149674_3_, p_149674_4_, p_149674_1_.getBlockMetadata(p_149674_2_, p_149674_3_, p_149674_4_), 0); - p_149674_1_.setBlock(p_149674_2_, p_149674_3_, p_149674_4_, Blocks.water); - } - } + this.dropBlockAsItem(p_149674_1_, p_149674_2_, p_149674_3_, p_149674_4_, p_149674_1_.getBlockMetadata(p_149674_2_, p_149674_3_, p_149674_4_), 0); + p_149674_1_.setBlock(p_149674_2_, p_149674_3_, p_149674_4_, Blocks.water); + } + } - /** - * Returns the mobility information of the block, 0 = free, 1 = can't push but can move over, 2 = total immobility - * and stop pistons - */ - public int getMobilityFlag() - { - return 0; - } + /** + * Returns the mobility information of the block, 0 = free, 1 = can't push but can move over, 2 = total immobility and stop pistons + */ + public int getMobilityFlag() + { + return 0; + } } diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePackedIce.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePackedIce.java index 073ed517..224871af 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePackedIce.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePackedIce.java @@ -1,6 +1,7 @@ package com.cricketcraft.chisel.block; import java.util.List; +import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -33,7 +34,7 @@ public class BlockCarvablePackedIce extends Block implements ICarvable { } @Override - public int damageDropped(int i) { + public int quantityDropped(int meta, int fortune, Random random) { return 0; } diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePackedIcePillar.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePackedIcePillar.java index f6546a4d..25a7aea2 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePackedIcePillar.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePackedIcePillar.java @@ -8,4 +8,14 @@ public class BlockCarvablePackedIcePillar extends BlockCarvablePillar { super(m); this.slipperiness = 0.98F; } + + @Override + public boolean isOpaqueCube() { + return false; + } + + @Override + public int getRenderBlockPass() { + return 1; + } } diff --git a/src/main/java/com/cricketcraft/chisel/block/CarvableStairsMaker.java b/src/main/java/com/cricketcraft/chisel/block/CarvableStairsMaker.java index 524a8b9d..cf73c0d8 100644 --- a/src/main/java/com/cricketcraft/chisel/block/CarvableStairsMaker.java +++ b/src/main/java/com/cricketcraft/chisel/block/CarvableStairsMaker.java @@ -30,7 +30,7 @@ public class CarvableStairsMaker { String n = name + "." + i; blocks[i] = creator == null ? new BlockCarvableStairs(blockBase, i * 2, carverHelper) : creator.create(blockBase, i * 2, carverHelper); - blocks[i].setBlockName(n); + blocks[i].setBlockName("chisel." + n); GameRegistry.registerBlock(blocks[i], ItemCarvable.class, n); for (int meta = 0; meta < 2 && i * 2 + meta < carverHelper.variations.size(); meta++) { diff --git a/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java b/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java index 72325254..49d0e78a 100644 --- a/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java +++ b/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java @@ -110,14 +110,14 @@ public final class ChiselBlocks { public static final BlockCarvable thaumium = null; public static final BlockCarvable tallow = null; - public static final BlockCarvable copper = null; - public static final BlockCarvable bronze = null; - public static final BlockCarvable aluminum = null; - public static final BlockCarvable lead = null; - public static final BlockCarvable silver = null; - public static final BlockCarvable steel = null; - public static final BlockCarvable tin = null; - public static final BlockCarvable uranium = null; + public static final BlockCarvable copperblock = null; + public static final BlockCarvable bronzeblock = null; + public static final BlockCarvable aluminumblock = null; + public static final BlockCarvable leadblock = null; + public static final BlockCarvable silverblock = null; + public static final BlockCarvable steelblock = null; + public static final BlockCarvable tinblock = null; + public static final BlockCarvable uraniumblock = null; public static final BlockCarvable bloodRune = null; public static final BlockCarvable bloodBrick = null; diff --git a/src/main/resources/assets/chisel/lang/en_PT.lang b/src/main/resources/assets/chisel/lang/en_PT.lang index afcf8dc8..6fdff855 100644 --- a/src/main/resources/assets/chisel/lang/en_PT.lang +++ b/src/main/resources/assets/chisel/lang/en_PT.lang @@ -619,22 +619,22 @@ tile.chisel.ice_stairs.4.name=Ice Stairs tile.chisel.ice_stairs.5.name=Ice Stairs tile.chisel.ice_stairs.6.name=Ice Stairs tile.chisel.ice_stairs.7.name=Ice Stairs -tile.iceStairs.0.desc=Ice Stairs -tile.iceStairs.1.desc=Rough Ice Stairs -tile.iceStairs.2.desc=Cobble-Ice Stairs -tile.iceStairs.3.desc=Large rough Ice Brick Stairs -tile.iceStairs.4.desc=Large Ice Brick Stairs -tile.iceStairs.5.desc=Small Ice Brick Stairs -tile.iceStairs.6.desc=Swaggy Ice Wall Stairs -tile.iceStairs.7.desc=Large Ice Tile Stairs -tile.iceStairs.8.desc=Swaggy Ice Tile Stairs -tile.iceStairs.9.desc=Sunken Ice Tile Stairs -tile.iceStairs.10.desc=DisordeBlood Red Ice Tile Stairs -tile.iceStairs.11.desc=Ice Panel Stairs -tile.iceStairs.12.desc=Ice Double Slab Stairs -tile.iceStairs.13.desc=Ice Zelda Stairs -tile.iceStairs.14.desc=Ice Bismuth Stairs -tile.iceStairs.15.desc=Ice Poison Stairs +tile.ice_stairs.0.desc=Ice Stairs +tile.ice_stairs.1.desc=Rough Ice Stairs +tile.ice_stairs.2.desc=Cobble-Ice Stairs +tile.ice_stairs.3.desc=Large rough Ice Brick Stairs +tile.ice_stairs.4.desc=Large Ice Brick Stairs +tile.ice_stairs.5.desc=Small Ice Brick Stairs +tile.ice_stairs.6.desc=Swaggy Ice Wall Stairs +tile.ice_stairs.7.desc=Large Ice Tile Stairs +tile.ice_stairs.8.desc=Swaggy Ice Tile Stairs +tile.ice_stairs.9.desc=Sunken Ice Tile Stairs +tile.ice_stairs.10.desc=DisordeBlood Red Ice Tile Stairs +tile.ice_stairs.11.desc=Ice Panel Stairs +tile.ice_stairs.12.desc=Ice Double Slab Stairs +tile.ice_stairs.13.desc=Ice Zelda Stairs +tile.ice_stairs.14.desc=Ice Bismuth Stairs +tile.ice_stairs.15.desc=Ice Poison Stairs #Obsidian tile.chisel.obsidian.name=Obsidian diff --git a/src/main/resources/assets/chisel/lang/en_US.lang b/src/main/resources/assets/chisel/lang/en_US.lang index 34fa6127..dd67c1c3 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -771,6 +771,7 @@ tile.icePillar.2.desc=Greek Ice Pillar with Plain Capstone tile.icePillar.3.desc=Greek Ice Pillar with Greek Capstone tile.icePillar.4.desc=Carved Ice Pillar Capstone tile.icePillar.5.desc=Ornamental Ice Pillar Capstone +tile.icePillar.6.desc=Inscribed Ice Pillar #Ice Stairs tile.chisel.ice_stairs.name=Ice Stairs @@ -782,22 +783,22 @@ tile.chisel.ice_stairs.4.name=Ice Stairs tile.chisel.ice_stairs.5.name=Ice Stairs tile.chisel.ice_stairs.6.name=Ice Stairs tile.chisel.ice_stairs.7.name=Ice Stairs -tile.iceStairs.0.desc=Ice Stairs -tile.iceStairs.1.desc=Rough Ice Stairs -tile.iceStairs.2.desc=Cobble-Ice Stairs -tile.iceStairs.3.desc=Large rough Ice Brick Stairs -tile.iceStairs.4.desc=Large Ice Brick Stairs -tile.iceStairs.5.desc=Small Ice Brick Stairs -tile.iceStairs.6.desc=Fancy Ice Wall Stairs -tile.iceStairs.7.desc=Large Ice Tile Stairs -tile.iceStairs.8.desc=Fancy Ice Tile Stairs -tile.iceStairs.9.desc=Sunken Ice Tile Stairs -tile.iceStairs.10.desc=Disordered Ice Tile Stairs -tile.iceStairs.11.desc=Ice Panel Stairs -tile.iceStairs.12.desc=Ice Double Slab Stairs -tile.iceStairs.13.desc=Ice Zelda Stairs -tile.iceStairs.14.desc=Ice Bismuth Stairs -tile.iceStairs.15.desc=Ice Poison Stairs +tile.ice_stairs.0.desc=Ice Stairs +tile.ice_stairs.1.desc=Rough Ice Stairs +tile.ice_stairs.2.desc=Cobble-Ice Stairs +tile.ice_stairs.3.desc=Large rough Ice Brick Stairs +tile.ice_stairs.4.desc=Large Ice Brick Stairs +tile.ice_stairs.5.desc=Small Ice Brick Stairs +tile.ice_stairs.6.desc=Fancy Ice Wall Stairs +tile.ice_stairs.7.desc=Large Ice Tile Stairs +tile.ice_stairs.8.desc=Fancy Ice Tile Stairs +tile.ice_stairs.9.desc=Sunken Ice Tile Stairs +tile.ice_stairs.10.desc=Disordered Ice Tile Stairs +tile.ice_stairs.11.desc=Ice Panel Stairs +tile.ice_stairs.12.desc=Ice Double Slab Stairs +tile.ice_stairs.13.desc=Ice Zelda Stairs +tile.ice_stairs.14.desc=Ice Bismuth Stairs +tile.ice_stairs.15.desc=Ice Poison Stairs #Packed Ice tile.chisel.packedice.name=Packed Ice @@ -825,6 +826,7 @@ tile.packedice_pillar.2.desc=Greek Packed Ice Pillar with Plain Capstone tile.packedice_pillar.3.desc=Greek Packed Ice Pillar with Greek Capstone tile.packedice_pillar.4.desc=Carved Packed Ice Pillar Capstone tile.packedice_pillar.5.desc=Ornamental Packed Ice Pillar Capstone +tile.packedice_pillar.6.desc=Inscribed Packed Ice Pillar #Packed Ice Stairs tile.chisel.packedice_stairs.name=Packed Ice Stairs @@ -836,22 +838,22 @@ tile.chisel.packedice_stairs.4.name=Packed Ice Stairs tile.chisel.packedice_stairs.5.name=Packed Ice Stairs tile.chisel.packedice_stairs.6.name=Packed Ice Stairs tile.chisel.packedice_stairs.7.name=Packed Ice Stairs -tile.packediceStairs.0.desc=Packed Ice Stairs -tile.packediceStairs.1.desc=Rough Packed Ice Stairs -tile.packediceStairs.2.desc=Cobble-Packed Ice Stairs -tile.packediceStairs.3.desc=Large rough Packed Ice Brick Stairs -tile.packediceStairs.4.desc=Large Packed Ice Brick Stairs -tile.packediceStairs.5.desc=Small Packed Ice Brick Stairs -tile.packediceStairs.6.desc=Fancy Packed Ice Wall Stairs -tile.packediceStairs.7.desc=Large Packed Ice Tile Stairs -tile.packediceStairs.8.desc=Fancy Packed Ice Tile Stairs -tile.packediceStairs.9.desc=Sunken Packed Ice Tile Stairs -tile.packediceStairs.10.desc=Disordered Packed Ice Tile Stairs -tile.packediceStairs.11.desc=Packed Ice Panel Stairs -tile.packediceStairs.12.desc=Packed Ice Double Slab Stairs -tile.packediceStairs.13.desc=Packed Ice Zelda Stairs -tile.packediceStairs.14.desc=Packed Ice Bismuth Stairs -tile.packediceStairs.15.desc=Packed Ice Poison Stairs +tile.packedice_stairs.0.desc=Packed Ice Stairs +tile.packedice_stairs.1.desc=Rough Packed Ice Stairs +tile.packedice_stairs.2.desc=Cobble-Packed Ice Stairs +tile.packedice_stairs.3.desc=Large rough Packed Ice Brick Stairs +tile.packedice_stairs.4.desc=Large Packed Ice Brick Stairs +tile.packedice_stairs.5.desc=Small Packed Ice Brick Stairs +tile.packedice_stairs.6.desc=Fancy Packed Ice Wall Stairs +tile.packedice_stairs.7.desc=Large Packed Ice Tile Stairs +tile.packedice_stairs.8.desc=Fancy Packed Ice Tile Stairs +tile.packedice_stairs.9.desc=Sunken Packed Ice Tile Stairs +tile.packedice_stairs.10.desc=Disordered Packed Ice Tile Stairs +tile.packedice_stairs.11.desc=Packed Ice Panel Stairs +tile.packedice_stairs.12.desc=Packed Ice Double Slab Stairs +tile.packedice_stairs.13.desc=Packed Ice Zelda Stairs +tile.packedice_stairs.14.desc=Packed Ice Bismuth Stairs +tile.packedice_stairs.15.desc=Packed Ice Poison Stairs #Obsidian tile.chisel.obsidian.name=Obsidian diff --git a/src/main/resources/assets/chisel/lang/fr_FR.lang b/src/main/resources/assets/chisel/lang/fr_FR.lang index 07315070..714789ff 100644 --- a/src/main/resources/assets/chisel/lang/fr_FR.lang +++ b/src/main/resources/assets/chisel/lang/fr_FR.lang @@ -714,22 +714,22 @@ tile.chisel.ice_stairs.4.name=Escaliers de glace tile.chisel.ice_stairs.5.name=Escaliers de glace tile.chisel.ice_stairs.6.name=Escaliers de glace tile.chisel.ice_stairs.7.name=Escaliers de glace -tile.iceStairs.0.desc=Ice Stairs -tile.iceStairs.1.desc=Rough Ice Stairs -tile.iceStairs.2.desc=Cobble-Ice Stairs -tile.iceStairs.3.desc=Large rough Ice Brick Stairs -tile.iceStairs.4.desc=Large Ice Brick Stairs -tile.iceStairs.5.desc=Small Ice Brick Stairs -tile.iceStairs.6.desc=Fancy Ice Wall Stairs -tile.iceStairs.7.desc=Large Ice Tile Stairs -tile.iceStairs.8.desc=Fancy Ice Tile Stairs -tile.iceStairs.9.desc=Sunken Ice Tile Stairs -tile.iceStairs.10.desc=Disordered Ice Tile Stairs -tile.iceStairs.11.desc=Ice Panel Stairs -tile.iceStairs.12.desc=Ice Double Slab Stairs -tile.iceStairs.13.desc=Ice Zelda Stairs -tile.iceStairs.14.desc=Ice Bismuth Stairs -tile.iceStairs.15.desc=Ice Poison Stairs +tile.ice_stairs.0.desc=Ice Stairs +tile.ice_stairs.1.desc=Rough Ice Stairs +tile.ice_stairs.2.desc=Cobble-Ice Stairs +tile.ice_stairs.3.desc=Large rough Ice Brick Stairs +tile.ice_stairs.4.desc=Large Ice Brick Stairs +tile.ice_stairs.5.desc=Small Ice Brick Stairs +tile.ice_stairs.6.desc=Fancy Ice Wall Stairs +tile.ice_stairs.7.desc=Large Ice Tile Stairs +tile.ice_stairs.8.desc=Fancy Ice Tile Stairs +tile.ice_stairs.9.desc=Sunken Ice Tile Stairs +tile.ice_stairs.10.desc=Disordered Ice Tile Stairs +tile.ice_stairs.11.desc=Ice Panel Stairs +tile.ice_stairs.12.desc=Ice Double Slab Stairs +tile.ice_stairs.13.desc=Ice Zelda Stairs +tile.ice_stairs.14.desc=Ice Bismuth Stairs +tile.ice_stairs.15.desc=Ice Poison Stairs #Obsidian tile.chisel.obsidian.name=Obsidienne diff --git a/src/main/resources/assets/chisel/lang/ko_KR.lang b/src/main/resources/assets/chisel/lang/ko_KR.lang index 3fc6f578..5e853dc4 100644 --- a/src/main/resources/assets/chisel/lang/ko_KR.lang +++ b/src/main/resources/assets/chisel/lang/ko_KR.lang @@ -533,31 +533,31 @@ tile.icePillar.14.desc=Greek Ice Pillar Ornate Base tile.icePillar.15.desc=Plain Ice Pillar Ornate Base #Ice Stairs -tile.chisel.iceStairs.name=얼음 계단 -tile.chisel.iceStairs.0.name=얼음 계단 -tile.chisel.iceStairs.1.name=얼음 계단 -tile.chisel.iceStairs.2.name=얼음 계단 -tile.chisel.iceStairs.3.name=얼음 계단 -tile.chisel.iceStairs.4.name=얼음 계단 -tile.chisel.iceStairs.5.name=얼음 계단 -tile.chisel.iceStairs.6.name=얼음 계단 -tile.chisel.iceStairs.7.name=얼음 계단 -tile.iceStairs.0.desc=얼음 계단 -tile.iceStairs.1.desc=Rough 스태인드 글라스 -tile.iceStairs.2.desc=Cobble-스태인드 글라스 -tile.iceStairs.3.desc=Large rough Ice Brick Stairs -tile.iceStairs.4.desc=Large Ice Brick Stairs -tile.iceStairs.5.desc=Small Ice Brick Stairs -tile.iceStairs.6.desc=Fancy Ice Wall Stairs -tile.iceStairs.7.desc=Large Ice Tile Stairs -tile.iceStairs.8.desc=Fancy Ice Tile Stairs -tile.iceStairs.9.desc=Sunken Ice Tile Stairs -tile.iceStairs.10.desc=Disordered Ice Tile Stairs -tile.iceStairs.11.desc=Ice Panel Stairs -tile.iceStairs.12.desc=Ice Double Slab Stairs -tile.iceStairs.13.desc=Ice Zelda Stairs -tile.iceStairs.14.desc=Ice Bismuth Stairs -tile.iceStairs.15.desc=Ice Poison Stairs +tile.chisel.ice_stairs.name=얼음 계단 +tile.chisel.ice_stairs.0.name=얼음 계단 +tile.chisel.ice_stairs.1.name=얼음 계단 +tile.chisel.ice_stairs.2.name=얼음 계단 +tile.chisel.ice_stairs.3.name=얼음 계단 +tile.chisel.ice_stairs.4.name=얼음 계단 +tile.chisel.ice_stairs.5.name=얼음 계단 +tile.chisel.ice_stairs.6.name=얼음 계단 +tile.chisel.ice_stairs.7.name=얼음 계단 +tile.ice_stairs.0.desc=얼음 계단 +tile.ice_stairs.1.desc=Rough 스태인드 글라스 +tile.ice_stairs.2.desc=Cobble-스태인드 글라스 +tile.ice_stairs.3.desc=Large rough Ice Brick Stairs +tile.ice_stairs.4.desc=Large Ice Brick Stairs +tile.ice_stairs.5.desc=Small Ice Brick Stairs +tile.ice_stairs.6.desc=Fancy Ice Wall Stairs +tile.ice_stairs.7.desc=Large Ice Tile Stairs +tile.ice_stairs.8.desc=Fancy Ice Tile Stairs +tile.ice_stairs.9.desc=Sunken Ice Tile Stairs +tile.ice_stairs.10.desc=Disordered Ice Tile Stairs +tile.ice_stairs.11.desc=Ice Panel Stairs +tile.ice_stairs.12.desc=Ice Double Slab Stairs +tile.ice_stairs.13.desc=Ice Zelda Stairs +tile.ice_stairs.14.desc=Ice Bismuth Stairs +tile.ice_stairs.15.desc=Ice Poison Stairs #Obsidian tile.chisel.obsidian.name=흑요석 diff --git a/src/main/resources/assets/chisel/lang/ru_RU.lang b/src/main/resources/assets/chisel/lang/ru_RU.lang index 1514ed7c..1c0cecbd 100644 --- a/src/main/resources/assets/chisel/lang/ru_RU.lang +++ b/src/main/resources/assets/chisel/lang/ru_RU.lang @@ -776,22 +776,22 @@ tile.chisel.ice_stairs.4.name=Ледяные ступеньки tile.chisel.ice_stairs.5.name=Ледяные ступеньки tile.chisel.ice_stairs.6.name=Ледяные ступеньки tile.chisel.ice_stairs.7.name=Ледяные ступеньки -tile.iceStairs.0.desc=Ледяные ступеньки -tile.iceStairs.1.desc=Необработанные ледяные ступеньки -tile.iceStairs.2.desc=Булыжниковые ледяные ступеньки -tile.iceStairs.3.desc=Ступеньки из большого необработанного ледяного кирпича -tile.iceStairs.4.desc=Ступеньки из большого ледяного кирпича -tile.iceStairs.5.desc=Ступеньки из маленького ледяного кирпича -tile.iceStairs.6.desc=Ступеньки из красивой ледяной стены -tile.iceStairs.7.desc=Ступеньки из большой ледяной плитки -tile.iceStairs.8.desc=Ступеньки из красивой ледяной плитки -tile.iceStairs.9.desc=Ступеньки из осевшей ледяной плитки -tile.iceStairs.10.desc=Ступеньки из нарушенной ледяной плитки -tile.iceStairs.11.desc=Ступеньки из ледяной панели -tile.iceStairs.12.desc=Ступеньки из ледяной плиты -tile.iceStairs.13.desc=Ступеньки из льда Зельда -tile.iceStairs.14.desc=Ступеньки из ледяного висмута -tile.iceStairs.15.desc=Ступеньки из ледяного яда +tile.ice_stairs.0.desc=Ледяные ступеньки +tile.ice_stairs.1.desc=Необработанные ледяные ступеньки +tile.ice_stairs.2.desc=Булыжниковые ледяные ступеньки +tile.ice_stairs.3.desc=Ступеньки из большого необработанного ледяного кирпича +tile.ice_stairs.4.desc=Ступеньки из большого ледяного кирпича +tile.ice_stairs.5.desc=Ступеньки из маленького ледяного кирпича +tile.ice_stairs.6.desc=Ступеньки из красивой ледяной стены +tile.ice_stairs.7.desc=Ступеньки из большой ледяной плитки +tile.ice_stairs.8.desc=Ступеньки из красивой ледяной плитки +tile.ice_stairs.9.desc=Ступеньки из осевшей ледяной плитки +tile.ice_stairs.10.desc=Ступеньки из нарушенной ледяной плитки +tile.ice_stairs.11.desc=Ступеньки из ледяной панели +tile.ice_stairs.12.desc=Ступеньки из ледяной плиты +tile.ice_stairs.13.desc=Ступеньки из льда Зельда +tile.ice_stairs.14.desc=Ступеньки из ледяного висмута +tile.ice_stairs.15.desc=Ступеньки из ледяного яда #Packed Ice tile.chisel.packedice.name=Плотный лёд @@ -830,22 +830,22 @@ tile.chisel.packedice_stairs.4.name=Ступеньки из плотного л tile.chisel.packedice_stairs.5.name=Ступеньки из плотного льда tile.chisel.packedice_stairs.6.name=Ступеньки из плотного льда tile.chisel.packedice_stairs.7.name=Ступеньки из плотного льда -tile.packediceStairs.0.desc=Ступеньки из плотного льда -tile.packediceStairs.1.desc=Ступеньки из грубого плотного льда -tile.packediceStairs.2.desc=Ступеньки из булыжникового плотного льда -tile.packediceStairs.3.desc=Ступеньки из больших грубых кирпичей плотного льда -tile.packediceStairs.4.desc=Ступеньки из больших кирпичей плотного льда -tile.packediceStairs.5.desc=Ступеньки из маленьких кирпичей плотного льда -tile.packediceStairs.6.desc=Ступеньки из красивой стеклянной стены -tile.packediceStairs.7.desc=Ступеньки из больших плиток плотного льда -tile.packediceStairs.8.desc=Ступеньки из красивых плиток плотного льда -tile.packediceStairs.9.desc=Ступеньки из осевших плиток плотного льда -tile.packediceStairs.10.desc=Ступеньки из неупорядоченных плиток плотного льда -tile.packediceStairs.11.desc=Ступеньки из панели плотного льда -tile.packediceStairs.12.desc=Ступеньки из двойной плиты плотного льда -tile.packediceStairs.13.desc=Ступеньки из блока плотного льда Зельда -tile.packediceStairs.14.desc=Ступеньки из висмутового блока плотного льда -tile.packediceStairs.15.desc=Ступеньки из ядовитого блока плотного льда +tile.packedice_stairs.0.desc=Ступеньки из плотного льда +tile.packedice_stairs.1.desc=Ступеньки из грубого плотного льда +tile.packedice_stairs.2.desc=Ступеньки из булыжникового плотного льда +tile.packedice_stairs.3.desc=Ступеньки из больших грубых кирпичей плотного льда +tile.packedice_stairs.4.desc=Ступеньки из больших кирпичей плотного льда +tile.packedice_stairs.5.desc=Ступеньки из маленьких кирпичей плотного льда +tile.packedice_stairs.6.desc=Ступеньки из красивой стеклянной стены +tile.packedice_stairs.7.desc=Ступеньки из больших плиток плотного льда +tile.packedice_stairs.8.desc=Ступеньки из красивых плиток плотного льда +tile.packedice_stairs.9.desc=Ступеньки из осевших плиток плотного льда +tile.packedice_stairs.10.desc=Ступеньки из неупорядоченных плиток плотного льда +tile.packedice_stairs.11.desc=Ступеньки из панели плотного льда +tile.packedice_stairs.12.desc=Ступеньки из двойной плиты плотного льда +tile.packedice_stairs.13.desc=Ступеньки из блока плотного льда Зельда +tile.packedice_stairs.14.desc=Ступеньки из висмутового блока плотного льда +tile.packedice_stairs.15.desc=Ступеньки из ядовитого блока плотного льда #Obsidian tile.chisel.obsidian.name=Обсидиан diff --git a/src/main/resources/assets/chisel/lang/zh_CN.lang b/src/main/resources/assets/chisel/lang/zh_CN.lang index 6e12646f..cd71a181 100644 --- a/src/main/resources/assets/chisel/lang/zh_CN.lang +++ b/src/main/resources/assets/chisel/lang/zh_CN.lang @@ -584,22 +584,22 @@ tile.chisel.ice_stairs.4.name=冰楼梯 tile.chisel.ice_stairs.5.name=冰楼梯 tile.chisel.ice_stairs.6.name=冰楼梯 tile.chisel.ice_stairs.7.name=冰楼梯 -tile.iceStairs.0.desc=冰楼梯 -tile.iceStairs.1.desc=粗砌冰楼梯 -tile.iceStairs.2.desc=圆石状楼梯 -tile.iceStairs.3.desc=大块粗砌冰砖楼梯 -tile.iceStairs.4.desc=粗砌冰砖楼梯 -tile.iceStairs.5.desc=细砌冰砖楼梯 -tile.iceStairs.6.desc=光滑冰砖楼梯 -tile.iceStairs.7.desc=粗砌冰瓷砖楼梯 -tile.iceStairs.8.desc=光滑的冰瓷砖楼梯 -tile.iceStairs.9.desc=凹面冰瓷砖楼梯 -tile.iceStairs.10.desc=杂乱砌成的冰瓷砖楼梯 -tile.iceStairs.11.desc=整面錾制楼梯 -tile.iceStairs.12.desc=双层冰台阶搭建的楼梯 -tile.iceStairs.13.desc=塞尔达冰楼梯 -tile.iceStairs.14.desc=铋纹冰楼梯 -tile.iceStairs.15.desc=罪恶的冰楼梯 +tile.ice_stairs.0.desc=冰楼梯 +tile.ice_stairs.1.desc=粗砌冰楼梯 +tile.ice_stairs.2.desc=圆石状楼梯 +tile.ice_stairs.3.desc=大块粗砌冰砖楼梯 +tile.ice_stairs.4.desc=粗砌冰砖楼梯 +tile.ice_stairs.5.desc=细砌冰砖楼梯 +tile.ice_stairs.6.desc=光滑冰砖楼梯 +tile.ice_stairs.7.desc=粗砌冰瓷砖楼梯 +tile.ice_stairs.8.desc=光滑的冰瓷砖楼梯 +tile.ice_stairs.9.desc=凹面冰瓷砖楼梯 +tile.ice_stairs.10.desc=杂乱砌成的冰瓷砖楼梯 +tile.ice_stairs.11.desc=整面錾制楼梯 +tile.ice_stairs.12.desc=双层冰台阶搭建的楼梯 +tile.ice_stairs.13.desc=塞尔达冰楼梯 +tile.ice_stairs.14.desc=铋纹冰楼梯 +tile.ice_stairs.15.desc=罪恶的冰楼梯 #Obsidian tile.chisel.obsidian.name=黑曜石