From f61b8041ad5ed4fb2bad09510de0f3fcf83eaedf Mon Sep 17 00:00:00 2001 From: Sen Date: Wed, 10 Sep 2025 11:48:18 +0200 Subject: [PATCH] remove block sound types --- .../main/java/client/renderer/Renderer.java | 4 +- .../client/renderer/texture/TextureMap.java | 18 ++ common/src/main/java/common/block/Block.java | 11 - .../src/main/java/common/block/SoundType.java | 13 - .../block/artificial/BlockMetalBlock.java | 2 - .../common/block/artificial/BlockSlab.java | 1 - .../common/block/artificial/BlockStairs.java | 1 - .../common/block/artificial/BlockWall.java | 1 - .../java/common/block/foliage/BlockCrops.java | 3 - .../block/foliage/BlockDoublePlant.java | 2 - .../common/block/foliage/BlockDryLeaves.java | 2 - .../common/block/foliage/BlockLeaves.java | 2 - .../java/common/block/foliage/BlockLog.java | 2 - .../block/natural/BlockCompressable.java | 3 +- .../java/common/block/natural/BlockCyber.java | 2 - .../common/block/natural/BlockMetalOre.java | 2 - .../java/common/block/tech/BlockChest.java | 2 - .../java/common/block/tech/BlockFurnace.java | 3 +- .../common/block/tech/BlockPistonBase.java | 2 - .../common/block/tech/BlockPistonHead.java | 2 - .../src/main/java/common/entity/Entity.java | 1 - .../common/entity/animal/EntityHorse.java | 1 - .../common/entity/types/EntityLiving.java | 1 - .../main/java/common/init/BlockRegistry.java | 280 +++++++++--------- 24 files changed, 162 insertions(+), 199 deletions(-) delete mode 100755 common/src/main/java/common/block/SoundType.java diff --git a/client/src/main/java/client/renderer/Renderer.java b/client/src/main/java/client/renderer/Renderer.java index 63b03412..71426fa1 100755 --- a/client/src/main/java/client/renderer/Renderer.java +++ b/client/src/main/java/client/renderer/Renderer.java @@ -3348,8 +3348,8 @@ public class Renderer { { int light = brightPos == null ? 0xffffffff : this.getLightColor(brightPos, null); IBakedModel model = this.manager.getModelForState(state); - Block block = state.getBlock(); - GL15.glRotatef(90.0F, 0.0F, 1.0F, 0.0F); +// GL15.glRotatef(90.0F, 0.0F, 1.0F, 0.0F); + GL15.glTranslatef(0.0F, 0.0F, -1.0F); for (Facing enumfacing : Facing.values()) { diff --git a/client/src/main/java/client/renderer/texture/TextureMap.java b/client/src/main/java/client/renderer/texture/TextureMap.java index e1eab820..f5d8b505 100755 --- a/client/src/main/java/client/renderer/texture/TextureMap.java +++ b/client/src/main/java/client/renderer/texture/TextureMap.java @@ -1,12 +1,15 @@ package client.renderer.texture; import java.awt.image.BufferedImage; +import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; import java.util.List; import java.util.Map; import java.util.Set; +import javax.imageio.ImageIO; + import java.util.Map.Entry; import client.init.RenderRegistry; @@ -19,6 +22,7 @@ import common.collect.Maps; import common.init.BlockRegistry; import common.log.Log; import common.model.TextureAnimation; +import common.util.Util; public class TextureMap extends Texture { @@ -158,6 +162,8 @@ public class TextureMap extends Texture TextureUtil.allocateTexture(this.getGlTextureId(), this.width = stitcher.getCurrentWidth(), this.height = stitcher.getCurrentHeight()); Map map = Maps.newHashMap(this.mapRegisteredSprites); + + BufferedImage img = Util.DEVMODE ? new BufferedImage(this.width, this.height, BufferedImage.TYPE_INT_ARGB) : null; for (Sprite textureatlassprite2 : stitcher.getStichSlots()) { @@ -171,6 +177,18 @@ public class TextureMap extends Texture { this.listAnimatedSprites.add(textureatlassprite2); } + + if(img != null) + img.setRGB(textureatlassprite2.getOriginX(), textureatlassprite2.getOriginY(), textureatlassprite2.getIconWidth(), textureatlassprite2.getIconHeight(), textureatlassprite2.getFrameTextureData(0), 0, textureatlassprite2.getIconWidth()); + } + + if(img != null) { + try { + ImageIO.write(img, "png", new File("atlas.png")); + } + catch(IOException e) { + Log.IO.error(e, "Konnte Bild nicht speichern"); + } } for (Sprite textureatlassprite3 : map.values()) diff --git a/common/src/main/java/common/block/Block.java b/common/src/main/java/common/block/Block.java index b13f2f30..e8006013 100755 --- a/common/src/main/java/common/block/Block.java +++ b/common/src/main/java/common/block/Block.java @@ -193,7 +193,6 @@ public class Block { private String display; private String[] description; private CheatTab tab; - private SoundType sound; private Equipment miningTool; private Item item; @@ -361,7 +360,6 @@ public class Block { public Block(Material material) { this.miningTool = material.getTool(); this.miningLevel = material.getTool() != null && material.getTool().isLevelled() ? 0 : -1; - this.sound = SoundType.STONE; this.slipperiness = 0.6F; this.material = material; this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); @@ -376,11 +374,6 @@ public class Block { this.saved = getStateList(this.savedProps, this.states); } - public final Block setSound(SoundType sound) { - this.sound = sound; - return this; - } - public final Block setOpacity(int opacity) { this.opacity = opacity; this.sumBrightness = this.translucent || this.opacity == 0; @@ -504,10 +497,6 @@ public class Block { return this.material; } - public final SoundType getSound() { - return this.sound; - } - public final ImmutableList getValidStates() { return this.states; } diff --git a/common/src/main/java/common/block/SoundType.java b/common/src/main/java/common/block/SoundType.java deleted file mode 100755 index 5b18b81e..00000000 --- a/common/src/main/java/common/block/SoundType.java +++ /dev/null @@ -1,13 +0,0 @@ -package common.block; - -public enum SoundType { - STONE, - WOOD, - GRAVEL, - SAND, - GRASS, - SNOW, - CLOTH, - SLIME, - GLASS; -} diff --git a/common/src/main/java/common/block/artificial/BlockMetalBlock.java b/common/src/main/java/common/block/artificial/BlockMetalBlock.java index 13e36254..2655bab0 100644 --- a/common/src/main/java/common/block/artificial/BlockMetalBlock.java +++ b/common/src/main/java/common/block/artificial/BlockMetalBlock.java @@ -5,7 +5,6 @@ import java.util.Map; import common.block.Block; import common.block.Material; -import common.block.SoundType; import common.entity.npc.Attribute; import common.entity.npc.EntityNPC; import common.init.MetalType; @@ -18,7 +17,6 @@ public class BlockMetalBlock extends Block { public BlockMetalBlock(MetalType metal) { super(Material.SOLID); this.metal = metal; - this.setSound(SoundType.STONE); this.setLight(metal.radioactivity > 0.0F ? 0x003f00 : 0x000000); this.setRadiation(metal.radioactivity * 2.0f); this.setTab(CheatTab.GEMS); diff --git a/common/src/main/java/common/block/artificial/BlockSlab.java b/common/src/main/java/common/block/artificial/BlockSlab.java index f300f86d..1b034c2a 100755 --- a/common/src/main/java/common/block/artificial/BlockSlab.java +++ b/common/src/main/java/common/block/artificial/BlockSlab.java @@ -56,7 +56,6 @@ public class BlockSlab extends Block implements Directional { this.base = base; this.setHardness(this.base.getRawHardness()); this.setResistance(this.base.getRawResistance() / 3.0F); - this.setSound(this.base.getSound()); this.textureTop = top; this.textureBottom = bottom; this.textureSide = side; diff --git a/common/src/main/java/common/block/artificial/BlockStairs.java b/common/src/main/java/common/block/artificial/BlockStairs.java index 4bc214d9..93f9bd90 100755 --- a/common/src/main/java/common/block/artificial/BlockStairs.java +++ b/common/src/main/java/common/block/artificial/BlockStairs.java @@ -54,7 +54,6 @@ public class BlockStairs extends Block implements Rotatable this.base = base; this.setHardness(this.base.getRawHardness()); this.setResistance(this.base.getRawResistance() / 3.0F); - this.setSound(this.base.getSound()); this.setOpacity(255); this.setTab(base.getTab()); this.downTex = down; diff --git a/common/src/main/java/common/block/artificial/BlockWall.java b/common/src/main/java/common/block/artificial/BlockWall.java index 4bef6a4a..5b3795f6 100755 --- a/common/src/main/java/common/block/artificial/BlockWall.java +++ b/common/src/main/java/common/block/artificial/BlockWall.java @@ -44,7 +44,6 @@ public class BlockWall extends Block this.setDefaultState(this.getBaseState().withProperty(UP, Boolean.valueOf(false)).withProperty(NORTH, Boolean.valueOf(false)).withProperty(EAST, Boolean.valueOf(false)).withProperty(SOUTH, Boolean.valueOf(false)).withProperty(WEST, Boolean.valueOf(false))); this.setHardness(modelBlock.getRawHardness()); this.setResistance(modelBlock.getRawResistance() / 3.0F); - this.setSound(modelBlock.getSound()); this.setTab(modelBlock.getTab()); WALLS.add(this); } diff --git a/common/src/main/java/common/block/foliage/BlockCrops.java b/common/src/main/java/common/block/foliage/BlockCrops.java index 4788fb0b..0c2c379f 100755 --- a/common/src/main/java/common/block/foliage/BlockCrops.java +++ b/common/src/main/java/common/block/foliage/BlockCrops.java @@ -1,7 +1,6 @@ package common.block.foliage; import common.block.Block; -import common.block.SoundType; import common.init.Blocks; import common.init.Items; import common.item.CheatTab; @@ -30,8 +29,6 @@ public class BlockCrops extends BlockBush implements IGrowable this.setBlockBounds(0.5F - f, 0.0F, 0.5F - f, 0.5F + f, 0.25F, 0.5F + f); this.setTab((CheatTab)null); this.setHardness(0.0F); - this.setSound(SoundType.GRASS); -// this.disableStats(); } /** diff --git a/common/src/main/java/common/block/foliage/BlockDoublePlant.java b/common/src/main/java/common/block/foliage/BlockDoublePlant.java index 0d5fd8c7..a1640ea5 100755 --- a/common/src/main/java/common/block/foliage/BlockDoublePlant.java +++ b/common/src/main/java/common/block/foliage/BlockDoublePlant.java @@ -2,7 +2,6 @@ package common.block.foliage; import common.block.Block; import common.block.Material; -import common.block.SoundType; import common.entity.npc.EntityNPC; import common.entity.types.EntityLiving; import common.init.Blocks; @@ -45,7 +44,6 @@ public class BlockDoublePlant extends BlockBush implements IGrowable this.type = type; this.setDefaultState(this.getBaseState().withProperty(HALF, BlockDoublePlant.EnumBlockHalf.LOWER)); this.setHardness(0.0F); - this.setSound(SoundType.GRASS); this.setFlammable(60, 100); PLANTS[type.ordinal()] = this; } diff --git a/common/src/main/java/common/block/foliage/BlockDryLeaves.java b/common/src/main/java/common/block/foliage/BlockDryLeaves.java index 5e64c4b8..224cb3fe 100755 --- a/common/src/main/java/common/block/foliage/BlockDryLeaves.java +++ b/common/src/main/java/common/block/foliage/BlockDryLeaves.java @@ -1,7 +1,6 @@ package common.block.foliage; import common.block.Material; -import common.block.SoundType; import common.init.Items; import common.item.CheatTab; import common.item.Item; @@ -18,7 +17,6 @@ public class BlockDryLeaves extends BlockLeavesBase this.setTab(CheatTab.PLANTS); this.setHardness(0.2F); this.setOpacity(1); - this.setSound(SoundType.GRASS); this.setFlammable(60, 100); } diff --git a/common/src/main/java/common/block/foliage/BlockLeaves.java b/common/src/main/java/common/block/foliage/BlockLeaves.java index 920024bb..509f05ea 100755 --- a/common/src/main/java/common/block/foliage/BlockLeaves.java +++ b/common/src/main/java/common/block/foliage/BlockLeaves.java @@ -4,7 +4,6 @@ import java.util.List; import common.block.Block; import common.block.Material; -import common.block.SoundType; import common.collect.Lists; import common.entity.npc.EntityNPC; import common.entity.types.EntityLiving; @@ -54,7 +53,6 @@ public class BlockLeaves extends BlockLeavesBase this.setTab(CheatTab.PLANTS); this.setHardness(0.2F); this.setOpacity(1); - this.setSound(SoundType.GRASS); this.setFlammable(30, 60); LEAVES.add(this); MAPPING[type.ordinal() * LeavesType.values().length + subType.ordinal()] = this; diff --git a/common/src/main/java/common/block/foliage/BlockLog.java b/common/src/main/java/common/block/foliage/BlockLog.java index b6ef95e6..d70d2baa 100755 --- a/common/src/main/java/common/block/foliage/BlockLog.java +++ b/common/src/main/java/common/block/foliage/BlockLog.java @@ -2,7 +2,6 @@ package common.block.foliage; import common.block.BlockRotatedPillar; import common.block.Material; -import common.block.SoundType; import common.entity.types.EntityLiving; import common.item.CheatTab; import common.model.Model; @@ -23,7 +22,6 @@ public class BlockLog extends BlockRotatedPillar this.setDefaultState(this.getBaseState().withProperty(AXIS, Facing.Axis.Y)); this.setTab(CheatTab.WOOD); this.setHardness(2.0F); - this.setSound(SoundType.WOOD); this.setFlammable(5, 5); } diff --git a/common/src/main/java/common/block/natural/BlockCompressable.java b/common/src/main/java/common/block/natural/BlockCompressable.java index 5235dfc0..ab4c1ed5 100644 --- a/common/src/main/java/common/block/natural/BlockCompressable.java +++ b/common/src/main/java/common/block/natural/BlockCompressable.java @@ -4,7 +4,6 @@ import java.util.List; import common.block.Block; import common.block.Material; -import common.block.SoundType; import common.entity.npc.EntityNPC; import common.item.ItemStack; import common.util.LocalPos; @@ -27,7 +26,7 @@ public class BlockCompressable extends Block { density *= 10; } this.density = density; - this.setHardness(5.0F).setResistance(10.0F).setSound(SoundType.STONE); + this.setHardness(5.0F).setResistance(10.0F); if(this.fuel > 0) this.setFlammable(5, 5); } diff --git a/common/src/main/java/common/block/natural/BlockCyber.java b/common/src/main/java/common/block/natural/BlockCyber.java index b5270baa..2cc07920 100644 --- a/common/src/main/java/common/block/natural/BlockCyber.java +++ b/common/src/main/java/common/block/natural/BlockCyber.java @@ -2,7 +2,6 @@ package common.block.natural; import common.block.Block; import common.block.Material; -import common.block.SoundType; import common.item.CheatTab; import common.util.Clientside; @@ -12,7 +11,6 @@ public class BlockCyber extends Block { this.setTab(CheatTab.ROCK); this.setHardness(1.25F); this.setResistance(7.0F); - this.setSound(SoundType.STONE); this.setDisplay("CYBER"); } diff --git a/common/src/main/java/common/block/natural/BlockMetalOre.java b/common/src/main/java/common/block/natural/BlockMetalOre.java index 6161a684..4a22aeeb 100644 --- a/common/src/main/java/common/block/natural/BlockMetalOre.java +++ b/common/src/main/java/common/block/natural/BlockMetalOre.java @@ -3,7 +3,6 @@ package common.block.natural; import java.util.List; import java.util.Map; -import common.block.SoundType; import common.entity.npc.Attribute; import common.entity.npc.EntityNPC; import common.init.MetalType; @@ -14,7 +13,6 @@ public class BlockMetalOre extends BlockOre { public BlockMetalOre(MetalType metal) { this.metal = metal; - this.setSound(SoundType.STONE); this.setLight(metal.radioactivity > 0.0F ? 0x003f00 : 0x000000); this.setRadiation(metal.radioactivity * 0.5f); } diff --git a/common/src/main/java/common/block/tech/BlockChest.java b/common/src/main/java/common/block/tech/BlockChest.java index 220fe25a..fdd4b1d3 100755 --- a/common/src/main/java/common/block/tech/BlockChest.java +++ b/common/src/main/java/common/block/tech/BlockChest.java @@ -6,7 +6,6 @@ import java.util.Map; import common.block.Block; import common.block.ITileEntityProvider; import common.block.Rotatable; -import common.block.SoundType; import common.collect.Maps; import common.block.Material; import common.entity.Entity; @@ -57,7 +56,6 @@ public class BlockChest extends Block implements ITileEntityProvider, Rotatable this.setTab(CheatTab.TECHNOLOGY); this.setBlockBounds(0.0625F, 0.0F, 0.0625F, 0.9375F, 0.875F, 0.9375F); this.setHardness(2.5F); - this.setSound(capacity <= 30 ? SoundType.WOOD : SoundType.STONE); CHESTS.put(this.capacity, this); } diff --git a/common/src/main/java/common/block/tech/BlockFurnace.java b/common/src/main/java/common/block/tech/BlockFurnace.java index 6f721dc6..ba23c625 100755 --- a/common/src/main/java/common/block/tech/BlockFurnace.java +++ b/common/src/main/java/common/block/tech/BlockFurnace.java @@ -3,7 +3,6 @@ package common.block.tech; import java.util.List; import common.block.Block; -import common.block.SoundType; import common.entity.npc.EntityNPC; import common.item.Item; import common.item.ItemStack; @@ -35,7 +34,7 @@ public class BlockFurnace extends BlockMachine { this.isBurning = isBurning; this.burnTime = burnTime; this.fuelEfficiency = fuelEfficiency; - this.setHardness(3.5F).setSound(SoundType.STONE); + this.setHardness(3.5F); if(this.isBurning) this.setLight(0xffffaf); } diff --git a/common/src/main/java/common/block/tech/BlockPistonBase.java b/common/src/main/java/common/block/tech/BlockPistonBase.java index e5a3850e..ea13f5b6 100755 --- a/common/src/main/java/common/block/tech/BlockPistonBase.java +++ b/common/src/main/java/common/block/tech/BlockPistonBase.java @@ -6,7 +6,6 @@ import common.block.Block; import common.block.Directional; import common.block.ITileEntityProvider; import common.block.Material; -import common.block.SoundType; import common.collect.Lists; import common.entity.Entity; import common.entity.types.EntityLiving; @@ -254,7 +253,6 @@ public class BlockPistonBase extends Block implements Directional super(Material.PISTON); this.setDefaultState(this.getBaseState().withProperty(FACING, Facing.NORTH).withProperty(EXTENDED, Boolean.valueOf(false))); this.isSticky = isSticky; - this.setSound(SoundType.STONE); this.setHardness(0.5F); this.setTab(CheatTab.TECHNOLOGY); } diff --git a/common/src/main/java/common/block/tech/BlockPistonHead.java b/common/src/main/java/common/block/tech/BlockPistonHead.java index 53a52daa..8e6eacde 100755 --- a/common/src/main/java/common/block/tech/BlockPistonHead.java +++ b/common/src/main/java/common/block/tech/BlockPistonHead.java @@ -5,7 +5,6 @@ import java.util.List; import common.block.Block; import common.block.Directional; import common.block.Material; -import common.block.SoundType; import common.entity.Entity; import common.init.Blocks; import common.init.Items; @@ -31,7 +30,6 @@ public class BlockPistonHead extends Block implements Directional { super(Material.PISTON); this.setDefaultState(this.getBaseState().withProperty(FACING, Facing.NORTH)); - this.setSound(SoundType.STONE); this.setHardness(0.5F); this.sticky = sticky; } diff --git a/common/src/main/java/common/entity/Entity.java b/common/src/main/java/common/entity/Entity.java index 193785a1..3290951f 100755 --- a/common/src/main/java/common/entity/Entity.java +++ b/common/src/main/java/common/entity/Entity.java @@ -4,7 +4,6 @@ import java.util.List; import common.block.Block; import common.block.Material; -import common.block.SoundType; import common.block.artificial.BlockFence; import common.block.artificial.BlockFenceGate; import common.block.artificial.BlockWall; diff --git a/common/src/main/java/common/entity/animal/EntityHorse.java b/common/src/main/java/common/entity/animal/EntityHorse.java index 63acf4c5..5661baa2 100755 --- a/common/src/main/java/common/entity/animal/EntityHorse.java +++ b/common/src/main/java/common/entity/animal/EntityHorse.java @@ -11,7 +11,6 @@ import common.ai.EntityAISwimming; import common.ai.EntityAIWander; import common.ai.EntityAIWatchClosest; import common.block.Block; -import common.block.SoundType; import common.collect.Lists; import common.effect.Effect; import common.entity.DamageSource; diff --git a/common/src/main/java/common/entity/types/EntityLiving.java b/common/src/main/java/common/entity/types/EntityLiving.java index ff72da6f..107cff5a 100755 --- a/common/src/main/java/common/entity/types/EntityLiving.java +++ b/common/src/main/java/common/entity/types/EntityLiving.java @@ -14,7 +14,6 @@ import common.ai.EntityLookHelper; import common.ai.EntityMoveHelper; import common.ai.EntitySenses; import common.block.Block; -import common.block.SoundType; import common.collect.Lists; import common.collect.Maps; import common.effect.Effect; diff --git a/common/src/main/java/common/init/BlockRegistry.java b/common/src/main/java/common/init/BlockRegistry.java index 496cda13..ebc8ecb1 100755 --- a/common/src/main/java/common/init/BlockRegistry.java +++ b/common/src/main/java/common/init/BlockRegistry.java @@ -129,51 +129,51 @@ public abstract class BlockRegistry { static void register() { register("air", air = (new BlockAir()).setDisplay("Luft")); - Block stone = register("stone", (new BlockStone()).setHardness(1.5F).setResistance(10.0F).setSound(SoundType.STONE).setDisplay("Stein")); - Block bedrock = register("bedrock", (new BlockBedrock()).setHardness(1000.0F).setResistance(100000.0F).setSound(SoundType.STONE) + Block stone = register("stone", (new BlockStone()).setHardness(1.5F).setResistance(10.0F).setDisplay("Stein")); + Block bedrock = register("bedrock", (new BlockBedrock()).setHardness(1000.0F).setResistance(100000.0F) .setDisplay("Grundgestein").setTab(CheatTab.ROCK).setMiningTool(Equipment.PICKAXE, 6)); - Block rock = register("rock", (new Block(Material.SOLID)).setHardness(2.0F).setResistance(15.0F).setSound(SoundType.STONE).setDisplay("Felsen").setTab(CheatTab.ROCK)); - Block smooth_rock = register("smooth_rock", (new Block(Material.SOLID)).setHardness(2.0F).setResistance(15.0F).setSound(SoundType.STONE).setDisplay("Glatter Felsen").setTab(CheatTab.ROCK)); - Block hellrock = register("hellrock", (new BlockHellRock()).setHardness(0.4F).setSound(SoundType.STONE).setDisplay("Höllenstein")); + Block rock = register("rock", (new Block(Material.SOLID)).setHardness(2.0F).setResistance(15.0F).setDisplay("Felsen").setTab(CheatTab.ROCK)); + Block smooth_rock = register("smooth_rock", (new Block(Material.SOLID)).setHardness(2.0F).setResistance(15.0F).setDisplay("Glatter Felsen").setTab(CheatTab.ROCK)); + Block hellrock = register("hellrock", (new BlockHellRock()).setHardness(0.4F).setDisplay("Höllenstein")); Block cell_rock = register("cell_rock", (new Block(Material.LOOSE)).setHardness(1.0F).setResistance(3.0F) - .setSound(SoundType.SLIME).setDisplay("Zellstein").setTab(CheatTab.ROCK)); + .setDisplay("Zellstein").setTab(CheatTab.ROCK)); Block moon_rock = register("moon_rock", (new Block(Material.SOLID)).setHardness(2.5F).setResistance(10.0F) - .setSound(SoundType.STONE).setDisplay("Mondgestein").setTab(CheatTab.ROCK)); - Block cobblestone = (new Block(Material.SOLID)).setHardness(2.0F).setResistance(10.0F).setSound(SoundType.STONE) + .setDisplay("Mondgestein").setTab(CheatTab.ROCK)); + Block cobblestone = (new Block(Material.SOLID)).setHardness(2.0F).setResistance(10.0F) .setDisplay("Bruchstein").setTab(CheatTab.ROCK); register("cobblestone", cobblestone); - Block mossy_cobblestone = (new Block(Material.SOLID)).setHardness(2.0F).setResistance(10.0F).setSound(SoundType.STONE) + Block mossy_cobblestone = (new Block(Material.SOLID)).setHardness(2.0F).setResistance(10.0F) .setDisplay("Bemooster Bruchstein").setTab(CheatTab.ROCK); register("mossy_cobblestone", mossy_cobblestone); - Block sandstone = (new BlockSandStone("normal")).setSound(SoundType.STONE).setHardness(0.8F).setDisplay("Sandstein"); + Block sandstone = (new BlockSandStone("normal")).setHardness(0.8F).setDisplay("Sandstein"); register("sandstone", sandstone); Block smooth_sandstone; - register("smooth_sandstone", (smooth_sandstone = new BlockSandStone("smooth")).setSound(SoundType.STONE).setHardness(0.8F).setDisplay("Glatter Sandstein")); - Block obsidian = register("obsidian", (new BlockObsidian()).setHardness(50.0F).setResistance(2000.0F).setSound(SoundType.STONE) + register("smooth_sandstone", (smooth_sandstone = new BlockSandStone("smooth")).setHardness(0.8F).setDisplay("Glatter Sandstein")); + Block obsidian = register("obsidian", (new BlockObsidian()).setHardness(50.0F).setResistance(2000.0F) .setDisplay("Obsidian").setMiningTool(Equipment.PICKAXE, 3)); - Block clay = register("clay", (new BlockClay()).setHardness(0.6F).setSound(SoundType.GRAVEL).setDisplay("Ton").setMiningTool(Equipment.SHOVEL)); - Block hardened_clay = register("hardened_clay", (new BlockHardenedClay()).setHardness(1.25F).setResistance(7.0F).setSound(SoundType.STONE).setDisplay("Gebrannter Ton")); + Block clay = register("clay", (new BlockClay()).setHardness(0.6F).setDisplay("Ton").setMiningTool(Equipment.SHOVEL)); + Block hardened_clay = register("hardened_clay", (new BlockHardenedClay()).setHardness(1.25F).setResistance(7.0F).setDisplay("Gebrannter Ton")); Block[] colored_clay = new Block[Color.values().length]; for(Color color : Color.values()) { colored_clay[color.ordinal()] = register(color.getName() + "_clay", (new BlockColoredClay(color)).setHardness(1.25F).setResistance(7.0F) - .setSound(SoundType.STONE).setDisplay(color.getDisplay() + " gefärbter Ton")); + .setDisplay(color.getDisplay() + " gefärbter Ton")); } Block cyber; register("cyber", cyber = new BlockCyber()); - register("sand", (new BlockFalling(Material.LOOSE)).setHardness(0.5F).setSound(SoundType.SAND).setDisplay("Sand").setMiningTool(Equipment.SHOVEL).setTab(CheatTab.NATURE)); - register("red_sand", (new BlockFalling(Material.LOOSE)).setHardness(0.5F).setSound(SoundType.SAND).setDisplay("Roter Sand").setMiningTool(Equipment.SHOVEL).setTab(CheatTab.NATURE)); - register("gravel", (new BlockGravel()).setHardness(0.6F).setSound(SoundType.GRAVEL).setDisplay("Kies").setMiningTool(Equipment.SHOVEL)); - register("ash", (new BlockFalling(Material.LOOSE)).setHardness(0.2F).setSound(SoundType.SAND).setDisplay("Asche") + register("sand", (new BlockFalling(Material.LOOSE)).setHardness(0.5F).setDisplay("Sand").setMiningTool(Equipment.SHOVEL).setTab(CheatTab.NATURE)); + register("red_sand", (new BlockFalling(Material.LOOSE)).setHardness(0.5F).setDisplay("Roter Sand").setMiningTool(Equipment.SHOVEL).setTab(CheatTab.NATURE)); + register("gravel", (new BlockGravel()).setHardness(0.6F).setDisplay("Kies").setMiningTool(Equipment.SHOVEL)); + register("ash", (new BlockFalling(Material.LOOSE)).setHardness(0.2F).setDisplay("Asche") .setTab(CheatTab.NATURE).setMiningTool(Equipment.SHOVEL)); - register("snow_layer", (new BlockSnow()).setHardness(0.1F).setSound(SoundType.SNOW).setDisplay("Schnee").setOpacity(0).setMiningTool(Equipment.SHOVEL)); - register("snow", (new BlockSnowBlock()).setHardness(0.2F).setSound(SoundType.SNOW).setDisplay("Schnee").setMiningTool(Equipment.SHOVEL)); - register("ice", (new BlockIce()).setHardness(0.5F).setOpacity(3).setSound(SoundType.GLASS).setDisplay("Eis").setMiningTool(Equipment.PICKAXE, 0)); - register("packed_ice", (new BlockPackedIce()).setHardness(0.5F).setSound(SoundType.GLASS).setDisplay("Packeis").setMiningTool(Equipment.PICKAXE, 0)); - register("soul_sand", (new BlockSoulSand()).setHardness(0.5F).setSound(SoundType.SAND).setDisplay("Seelensand").setMiningTool(Equipment.SHOVEL)); - register("glowstone", (new BlockGlowstone(Material.TRANSLUCENT)).setHardness(0.3F).setSound(SoundType.GLASS).setLight(0xffff3f) + register("snow_layer", (new BlockSnow()).setHardness(0.1F).setDisplay("Schnee").setOpacity(0).setMiningTool(Equipment.SHOVEL)); + register("snow", (new BlockSnowBlock()).setHardness(0.2F).setDisplay("Schnee").setMiningTool(Equipment.SHOVEL)); + register("ice", (new BlockIce()).setHardness(0.5F).setOpacity(3).setDisplay("Eis").setMiningTool(Equipment.PICKAXE, 0)); + register("packed_ice", (new BlockPackedIce()).setHardness(0.5F).setDisplay("Packeis").setMiningTool(Equipment.PICKAXE, 0)); + register("soul_sand", (new BlockSoulSand()).setHardness(0.5F).setDisplay("Seelensand").setMiningTool(Equipment.SHOVEL)); + register("glowstone", (new BlockGlowstone(Material.TRANSLUCENT)).setHardness(0.3F).setLight(0xffff3f) .setDisplay("Glowstone")); - Block blackened_stone = register("blackened_stone", (new BlockBlackenedStone()).setHardness(1.5F).setResistance(10.0F).setSound(SoundType.STONE).setDisplay("Schwarzstein")); - Block blackened_cobble = register("blackened_cobble", (new Block(Material.SOLID)).setHardness(2.0F).setResistance(10.0F).setSound(SoundType.STONE) + Block blackened_stone = register("blackened_stone", (new BlockBlackenedStone()).setHardness(1.5F).setResistance(10.0F).setDisplay("Schwarzstein")); + Block blackened_cobble = register("blackened_cobble", (new Block(Material.SOLID)).setHardness(2.0F).setResistance(10.0F) .setDisplay("Schwarzbruchstein").setTab(CheatTab.ROCK)); @@ -200,84 +200,84 @@ public abstract class BlockRegistry { } for(OreType ore : OreType.values()) { // String loc = ore.name.substring(0, 1).toUpperCase() + ore.name.substring(1); - register(ore.name + "_ore", (new BlockOre()).setHardness(3.0F).setResistance(5.0F).setSound(SoundType.STONE) + register(ore.name + "_ore", (new BlockOre()).setHardness(3.0F).setResistance(5.0F) .setDisplay(ore.display + "erz").setMiningTool(Equipment.PICKAXE, ore.material.getHarvestLevel() - 1)); } for(MineralType mineral : MineralType.values()) { - register(mineral.name + "_ore", (new BlockOre()).setHardness(3.0F).setResistance(5.0F).setSound(SoundType.STONE) + register(mineral.name + "_ore", (new BlockOre()).setHardness(3.0F).setResistance(5.0F) .setDisplay(mineral.displayOre).setMiningTool(Equipment.PICKAXE, 1)); } Block dirt; - register("dirt", (dirt = new Block(Material.LOOSE)).setHardness(0.5F).setSound(SoundType.GRAVEL).setDisplay("Erde").setMiningTool(Equipment.SHOVEL).setTab(CheatTab.NATURE)); + register("dirt", (dirt = new Block(Material.LOOSE)).setHardness(0.5F).setDisplay("Erde").setMiningTool(Equipment.SHOVEL).setTab(CheatTab.NATURE)); Block grass; - register("grass", (grass = new BlockGrass()).setHardness(0.6F).setSound(SoundType.GRASS).setDisplay("Gras").setMiningTool(Equipment.SHOVEL)); + register("grass", (grass = new BlockGrass()).setHardness(0.6F).setDisplay("Gras").setMiningTool(Equipment.SHOVEL)); Block coarse_dirt; - register("coarse_dirt", (coarse_dirt = new Block(Material.LOOSE)).setHardness(0.5F).setSound(SoundType.GRAVEL).setDisplay("Grobe Erde").setMiningTool(Equipment.SHOVEL).setTab(CheatTab.NATURE)); + register("coarse_dirt", (coarse_dirt = new Block(Material.LOOSE)).setHardness(0.5F).setDisplay("Grobe Erde").setMiningTool(Equipment.SHOVEL).setTab(CheatTab.NATURE)); Block podzol; - register("podzol", (podzol = new BlockPodzol()).setHardness(0.5F).setSound(SoundType.GRAVEL).setDisplay("Podsol").setMiningTool(Equipment.SHOVEL)); + register("podzol", (podzol = new BlockPodzol()).setHardness(0.5F).setDisplay("Podsol").setMiningTool(Equipment.SHOVEL)); Block mycelium; - register("mycelium", (mycelium = new BlockMycelium()).setHardness(0.6F).setSound(SoundType.GRASS).setDisplay("Myzel").setMiningTool(Equipment.SHOVEL)); + register("mycelium", (mycelium = new BlockMycelium()).setHardness(0.6F).setDisplay("Myzel").setMiningTool(Equipment.SHOVEL)); Block swamp; - register("swamp", (swamp = new BlockSwamp()).setHardness(0.6F).setSound(SoundType.GRASS).setDisplay("Sumpf").setMiningTool(Equipment.SHOVEL)); + register("swamp", (swamp = new BlockSwamp()).setHardness(0.6F).setDisplay("Sumpf").setMiningTool(Equipment.SHOVEL)); Block tian; - register("tian", (tian = new Block(Material.SOLID)).setHardness(2.0F).setResistance(15.0F).setSound(SoundType.STONE) + register("tian", (tian = new Block(Material.SOLID)).setHardness(2.0F).setResistance(15.0F) .setDisplay("Tian").setTab(CheatTab.NATURE)); Block tian_soil; - register("tian_soil", (tian_soil = new BlockTianSoil()).setHardness(2.0F).setResistance(15.0F).setSound(SoundType.STONE) + register("tian_soil", (tian_soil = new BlockTianSoil()).setHardness(2.0F).setResistance(15.0F) .setDisplay("Tianerde").setTab(CheatTab.NATURE)); Block blackened_dirt; - register("blackened_dirt", (blackened_dirt = new BlockBlackenedDirt()).setHardness(0.5F).setSound(SoundType.GRAVEL).setDisplay("Schwarzerde").setMiningTool(Equipment.SHOVEL)); + register("blackened_dirt", (blackened_dirt = new BlockBlackenedDirt()).setHardness(0.5F).setDisplay("Schwarzerde").setMiningTool(Equipment.SHOVEL)); Block blackened_soil; - register("blackened_soil", (blackened_soil = new BlockBlackenedSoil()).setHardness(0.6F).setSound(SoundType.GRASS).setDisplay("Schwarzgrund").setMiningTool(Equipment.SHOVEL)); + register("blackened_soil", (blackened_soil = new BlockBlackenedSoil()).setHardness(0.6F).setDisplay("Schwarzgrund").setMiningTool(Equipment.SHOVEL)); Block slime_block; - register("slime_block", (slime_block = new BlockSlime()).setDisplay("Schleimblock").setSound(SoundType.SLIME)); + register("slime_block", (slime_block = new BlockSlime()).setDisplay("Schleimblock")); Block cheese; register("cheese", (cheese = new BlockTreasure(Material.SOFT)).setHardness(1.5F).setResistance(5.0F) - .setSound(SoundType.CLOTH).setDisplay("Käse").setTab(CheatTab.NATURE)); + .setDisplay("Käse").setTab(CheatTab.NATURE)); for(BlockTallGrass.EnumType type : BlockTallGrass.EnumType.values()) { - register(type.getName(), (new BlockTallGrass(type)).setHardness(0.0F).setSound(SoundType.GRASS).setDisplay(type.getDisplay()).setMiningTool(Equipment.SHEARS)); + register(type.getName(), (new BlockTallGrass(type)).setHardness(0.0F).setDisplay(type.getDisplay()).setMiningTool(Equipment.SHEARS)); } - register("deadbush", (new BlockDeadBush()).setHardness(0.0F).setSound(SoundType.GRASS).setDisplay("Toter Busch")); + register("deadbush", (new BlockDeadBush()).setHardness(0.0F).setDisplay("Toter Busch")); for(BlockFlower.EnumFlowerType type : BlockFlower.EnumFlowerType.values()) { - register(type.getName(), (new BlockFlower(type)).setHardness(0.0F).setSound(SoundType.GRASS).setDisplay(type.getDisplay())); + register(type.getName(), (new BlockFlower(type)).setHardness(0.0F).setDisplay(type.getDisplay())); } for(BlockDoublePlant.EnumPlantType type : BlockDoublePlant.EnumPlantType.values()) { register(type.getName(), new BlockDoublePlant(type).setDisplay(type.getDisplay())); } - Block cactus = (new BlockCactus()).setHardness(0.4F).setSound(SoundType.CLOTH).setDisplay("Kaktus"); + Block cactus = (new BlockCactus()).setHardness(0.4F).setDisplay("Kaktus"); register("cactus", cactus); - register("reeds", (new BlockReed()).setHardness(0.0F).setSound(SoundType.GRASS).setDisplay("Zuckerrohr").setTab(CheatTab.PLANTS)); - register("vine", (new BlockVine(false)).setHardness(0.2F).setSound(SoundType.GRASS).setDisplay("Ranken").setMiningTool(Equipment.SHEARS)); - register("swamp_vine", (new BlockVine(true)).setHardness(0.2F).setSound(SoundType.GRASS).setDisplay("Sumpfranken").setMiningTool(Equipment.SHEARS)); - register("waterlily", (new BlockLilyPad()).setHardness(0.0F).setSound(SoundType.GRASS).setDisplay("Seerosenblatt")); + register("reeds", (new BlockReed()).setHardness(0.0F).setDisplay("Zuckerrohr").setTab(CheatTab.PLANTS)); + register("vine", (new BlockVine(false)).setHardness(0.2F).setDisplay("Ranken").setMiningTool(Equipment.SHEARS)); + register("swamp_vine", (new BlockVine(true)).setHardness(0.2F).setDisplay("Sumpfranken").setMiningTool(Equipment.SHEARS)); + register("waterlily", (new BlockLilyPad()).setHardness(0.0F).setDisplay("Seerosenblatt")); - Block brown_mushroom = (new BlockMushroom()).setHardness(0.0F).setSound(SoundType.GRASS).setLight(0x1f1f1f) + Block brown_mushroom = (new BlockMushroom()).setHardness(0.0F).setLight(0x1f1f1f) .setDisplay("Pilz"); register("brown_mushroom", brown_mushroom); register("brown_mushroom_block", (new BlockHugeMushroom(brown_mushroom)).setHardness(0.2F) - .setSound(SoundType.WOOD).setDisplay("Pilzblock").setTab(CheatTab.PLANTS)); - Block red_mushrooom = (new BlockMushroom()).setHardness(0.0F).setSound(SoundType.GRASS).setDisplay("Pilz"); + .setDisplay("Pilzblock").setTab(CheatTab.PLANTS)); + Block red_mushrooom = (new BlockMushroom()).setHardness(0.0F).setDisplay("Pilz"); register("red_mushroom", red_mushrooom); register("red_mushroom_block", (new BlockHugeMushroom(red_mushrooom)).setHardness(0.2F) - .setSound(SoundType.WOOD).setDisplay("Pilzblock").setTab(CheatTab.PLANTS)); - register("blue_mushroom", (new BlockBlueShroom()).setHardness(0.0F).setSound(SoundType.GRASS).setLight(0x00007f) + .setDisplay("Pilzblock").setTab(CheatTab.PLANTS)); + register("blue_mushroom", (new BlockBlueShroom()).setHardness(0.0F).setLight(0x00007f) .setDisplay("Tianpilz")); - Block pumpkin = (new BlockPumpkin()).setHardness(1.0F).setSound(SoundType.WOOD).setDisplay("Kürbis"); + Block pumpkin = (new BlockPumpkin()).setHardness(1.0F).setDisplay("Kürbis"); register("pumpkin", pumpkin); - register("pumpkin_stem", (new BlockStem(pumpkin)).setHardness(0.0F).setSound(SoundType.WOOD).setDisplay("Kürbisstamm")); - Block melon = (new BlockMelon()).setHardness(1.0F).setSound(SoundType.WOOD).setDisplay("Melone"); + register("pumpkin_stem", (new BlockStem(pumpkin)).setHardness(0.0F).setDisplay("Kürbisstamm")); + Block melon = (new BlockMelon()).setHardness(1.0F).setDisplay("Melone"); register("melon_block", melon); - register("melon_stem", (new BlockStem(melon)).setHardness(0.0F).setSound(SoundType.WOOD).setDisplay("Melonenstamm")); + register("melon_stem", (new BlockStem(melon)).setHardness(0.0F).setDisplay("Melonenstamm")); register("dry_leaves", (new BlockDryLeaves()).setDisplay("Vertrocknetes Laub")); @@ -287,86 +287,86 @@ public abstract class BlockRegistry { for(LeavesType type : LeavesType.values()) { register(wood.getName() + "_leaves_" + type.getName(), (new BlockLeaves(wood, type)).setDisplay(wood.getDisplay() + "laub (" + type.getDisplay() + ")")); } - register(wood.getName() + "_sapling", (new BlockSapling(wood)).setHardness(0.0F).setSound(SoundType.GRASS) + register(wood.getName() + "_sapling", (new BlockSapling(wood)).setHardness(0.0F) .setDisplay(wood.getDisplay() + "setzling")); register(wood.getName() + "_trunk", (new BlockSlab(log, wood.getName() + "_log_top", wood.getName() + "_log_top")).setDisplay(wood.getDisplay() + "holzscheibe")); - Block planks = (new Block(Material.WOOD)).setHardness(2.0F).setResistance(5.0F).setSound(SoundType.WOOD) + Block planks = (new Block(Material.WOOD)).setHardness(2.0F).setResistance(5.0F) .setDisplay(wood.getDisplay() + "holzbretter").setTab(CheatTab.WOOD).setFlammable(5, 20); register(wood.getName() + "_planks", planks); register(wood.getName() + "_stairs", (new BlockStairs(planks)) .setDisplay(wood.getDisplay() + "holztreppe").setFlammable(5, 20)); register(wood.getName() + "_slab", (new BlockSlab(planks)).setDisplay(wood.getDisplay() + "holzstufe").setFlammable(5, 20)); register(wood.getName() + "_fence", (new BlockFence(Material.WOOD, wood.getName() + "_planks")) - .setHardness(2.0F).setResistance(5.0F).setSound(SoundType.WOOD).setDisplay(wood.getDisplay() + "holzzaun").setFlammable(5, 20)); + .setHardness(2.0F).setResistance(5.0F).setDisplay(wood.getDisplay() + "holzzaun").setFlammable(5, 20)); register(wood.getName() + "_fence_gate", (new BlockFenceGate(wood)).setHardness(2.0F).setResistance(5.0F) - .setSound(SoundType.WOOD).setDisplay(wood.getDisplay() + "holzzauntor").setFlammable(5, 20)); - register(wood.getName() + "_door", (new BlockDoor(Material.WOOD)).setHardness(3.0F).setSound(SoundType.WOOD) + .setDisplay(wood.getDisplay() + "holzzauntor").setFlammable(5, 20)); + register(wood.getName() + "_door", (new BlockDoor(Material.WOOD)).setHardness(3.0F) .setDisplay(wood.getDisplay() + "holztür").setFlammable(5, 20)); } register("web", (new BlockWeb()).setOpacity(1).setHardness(4.0F).setDisplay("Spinnennetz")); - register("fire", (new BlockFire()).setHardness(0.0F).setLight(0xffffbf).setSound(SoundType.CLOTH).setDisplay("Feuer")); - register("black_fire", (new BlockBlackFire()).setHardness(0.0F).setLight(0x7f7f7f).setSound(SoundType.CLOTH).setDisplay("Dunkles Feuer")); - register("soul_fire", (new BlockSoulFire()).setHardness(0.0F).setLight(0x0000ff).setSound(SoundType.CLOTH).setDisplay("Feuer der Seelen")); + register("fire", (new BlockFire()).setHardness(0.0F).setLight(0xffffbf).setDisplay("Feuer")); + register("black_fire", (new BlockBlackFire()).setHardness(0.0F).setLight(0x7f7f7f).setDisplay("Dunkles Feuer")); + register("soul_fire", (new BlockSoulFire()).setHardness(0.0F).setLight(0x0000ff).setDisplay("Feuer der Seelen")); - register("glass", (new BlockGlass()).setHardness(0.3F).setSound(SoundType.GLASS).setDisplay("Glas")); + register("glass", (new BlockGlass()).setHardness(0.3F).setDisplay("Glas")); for(Color color : Color.values()) { - register(color.getName() + "_glass", (new BlockStainedGlass(color)).setHardness(0.3F).setSound(SoundType.GLASS).setDisplay(color.getDisplay() + " gefärbtes Glas")); + register(color.getName() + "_glass", (new BlockStainedGlass(color)).setHardness(0.3F).setDisplay(color.getDisplay() + " gefärbtes Glas")); } - register("glass_pane", (new BlockPane(Material.TRANSLUCENT)).setHardness(0.3F).setSound(SoundType.GLASS).setDisplay("Glasscheibe")); + register("glass_pane", (new BlockPane(Material.TRANSLUCENT)).setHardness(0.3F).setDisplay("Glasscheibe")); for(Color color : Color.values()) { - register(color.getName() + "_glass_pane", (new BlockStainedGlassPane(color)).setHardness(0.3F).setSound(SoundType.GLASS).setDisplay(color.getDisplay() + " gefärbte Glasscheibe")); + register(color.getName() + "_glass_pane", (new BlockStainedGlassPane(color)).setHardness(0.3F).setDisplay(color.getDisplay() + " gefärbte Glasscheibe")); } for(Color color : Color.values()) { - Block block = register(color.getName() + "_wool", (new BlockWool(color)).setHardness(0.8F).setSound(SoundType.CLOTH).setDisplay(color.getSubject(-1) + " Wolle").setMiningTool(Equipment.SHEARS)); + Block block = register(color.getName() + "_wool", (new BlockWool(color)).setHardness(0.8F).setDisplay(color.getSubject(-1) + " Wolle").setMiningTool(Equipment.SHEARS)); register(color.getName() + "_wool_slab", (new BlockSlab(block)).setDisplay(color.getSubject(-1) + " Wollstufe")); register(color.getName() + "_wool_stairs", (new BlockStairs(block)).setDisplay(color.getSubject(-1) + " Wolltreppe")); } for(Color color : Color.values()) { - register(color.getName() + "_carpet", (new BlockCarpet(color)).setHardness(0.1F).setSound(SoundType.CLOTH).setDisplay(color.getSubject(1) + " Teppich").setOpacity(0)); + register(color.getName() + "_carpet", (new BlockCarpet(color)).setHardness(0.1F).setDisplay(color.getSubject(1) + " Teppich").setOpacity(0)); } for(Color color : BlockBed.COLORS) { - register(color.getName() + "_bed", (new BlockBed(color)).setSound(SoundType.WOOD).setHardness(0.2F).setDisplay(color.getSubject(0) + " Bett")); + register(color.getName() + "_bed", (new BlockBed(color)).setHardness(0.2F).setDisplay(color.getSubject(0) + " Bett")); } - register("ladder", (new BlockLadder()).setHardness(0.4F).setSound(SoundType.WOOD).setDisplay("Leiter").setMiningTool(Equipment.AXE)); - register("bookshelf", (new BlockBookshelf()).setHardness(1.5F).setSound(SoundType.WOOD).setDisplay("Bücherregal")); - register("cake", (new BlockCake()).setHardness(0.5F).setSound(SoundType.CLOTH).setDisplay("Kuchen").setTab(CheatTab.DECORATION)); - register("dragon_egg", (new BlockDragonEgg()).setHardness(3.0F).setResistance(15.0F).setSound(SoundType.STONE) + register("ladder", (new BlockLadder()).setHardness(0.4F).setDisplay("Leiter").setMiningTool(Equipment.AXE)); + register("bookshelf", (new BlockBookshelf()).setHardness(1.5F).setDisplay("Bücherregal")); + register("cake", (new BlockCake()).setHardness(0.5F).setDisplay("Kuchen").setTab(CheatTab.DECORATION)); + register("dragon_egg", (new BlockDragonEgg()).setHardness(3.0F).setResistance(15.0F) .setLight(0x1f001f).setDisplay("Drachenei").setTab(CheatTab.DECORATION)); - register("flowerpot", (new BlockFlowerPot(null)).setHardness(0.0F).setSound(SoundType.STONE).setDisplay("Blumentopf").setTab(CheatTab.DECORATION)); - register("flowerpot_cactus", (new BlockFlowerPot(cactus)).setHardness(0.0F).setSound(SoundType.STONE).setDisplay("Blumentopf mit " + cactus.getDisplay())); + register("flowerpot", (new BlockFlowerPot(null)).setHardness(0.0F).setDisplay("Blumentopf").setTab(CheatTab.DECORATION)); + register("flowerpot_cactus", (new BlockFlowerPot(cactus)).setHardness(0.0F).setDisplay("Blumentopf mit " + cactus.getDisplay())); for(BlockFlower.EnumFlowerType type : BlockFlower.EnumFlowerType.values()) { - register("flowerpot_" + type.getName(), (new BlockFlowerPot(BlockFlower.getByType(type))).setHardness(0.0F).setSound(SoundType.STONE).setDisplay("Blumentopf mit " + type.getDisplay())); + register("flowerpot_" + type.getName(), (new BlockFlowerPot(BlockFlower.getByType(type))).setHardness(0.0F).setDisplay("Blumentopf mit " + type.getDisplay())); } - register("sponge", (new Block(Material.LOOSE)).setHardness(0.6F).setSound(SoundType.GRASS).setDisplay("Schwamm") + register("sponge", (new Block(Material.LOOSE)).setHardness(0.6F).setDisplay("Schwamm") .setTab(CheatTab.DECORATION)); - register("skull", (new BlockSkull()).setHardness(1.0F).setSound(SoundType.STONE).setDisplay("Schädel").setTab(CheatTab.DECORATION)); - register("hay_block", (new BlockHay()).setHardness(0.5F).setSound(SoundType.GRASS).setDisplay("Strohballen") + register("skull", (new BlockSkull()).setHardness(1.0F).setDisplay("Schädel").setTab(CheatTab.DECORATION)); + register("hay_block", (new BlockHay()).setHardness(0.5F).setDisplay("Strohballen") .setTab(CheatTab.DECORATION)); - register("sign", (new BlockStandingSign()).setHardness(1.0F).setSound(SoundType.WOOD).setDisplay("Schild")); - register("wall_sign", (new BlockWallSign()).setHardness(1.0F).setSound(SoundType.WOOD).setDisplay("Schild")); + register("sign", (new BlockStandingSign()).setHardness(1.0F).setDisplay("Schild")); + register("wall_sign", (new BlockWallSign()).setHardness(1.0F).setDisplay("Schild")); for(int density : new int[] {1, 2, 4}) { - BlockInactiveDisplay display = (BlockInactiveDisplay)new BlockInactiveDisplay(density).setHardness(1.0F).setSound(SoundType.STONE).setDisplay("Displaymodul (" + (density * 16) + + BlockInactiveDisplay display = (BlockInactiveDisplay)new BlockInactiveDisplay(density).setHardness(1.0F).setDisplay("Displaymodul (" + (density * 16) + "x" + (density * 16) + ")"); register("display" + (density == 1 ? "" : density), display); - register("display" + (density == 1 ? "" : density) + "_on", new BlockActiveDisplay(display).setHardness(1.0F).setSound(SoundType.STONE).setDisplay("Displaymodul (" + (density * 16) + + register("display" + (density == 1 ? "" : density) + "_on", new BlockActiveDisplay(display).setHardness(1.0F).setDisplay("Displaymodul (" + (density * 16) + "x" + (density * 16) + ")")); } for(PortalType portal : PortalType.values()) { if(portal != PortalType.FLOOR && portal != PortalType.VOID) - register(portal.getName() + "_portal", (new BlockPortal(portal)).setHardness(0.0F).setSound(SoundType.GLASS).setLight(0x1f1f1f).setDisplay(portal.getDisplay())); + register(portal.getName() + "_portal", (new BlockPortal(portal)).setHardness(0.0F).setLight(0x1f1f1f).setDisplay(portal.getDisplay())); } register(PortalType.FLOOR.getName() + "_portal", (new BlockFloorPortal(Material.PORTAL)).setHardness(0.0F).setDisplay(PortalType.FLOOR.getDisplay())); - register("portal_frame", (new BlockPortalFrame()).setSound(SoundType.GLASS).setLight(0x1f002f).setHardness(5.0F) + register("portal_frame", (new BlockPortalFrame()).setLight(0x1f002f).setHardness(5.0F) .setDisplay("Portalrahmen").setResistance(2000.0F).setTab(CheatTab.TECHNOLOGY)); - register("farmland", (new BlockFarmland()).setHardness(0.6F).setSound(SoundType.GRAVEL).setDisplay("Ackerboden").setMiningTool(Equipment.SHOVEL).setTab(CheatTab.PLANTS)); + register("farmland", (new BlockFarmland()).setHardness(0.6F).setDisplay("Ackerboden").setMiningTool(Equipment.SHOVEL).setTab(CheatTab.PLANTS)); register("wheats", (new BlockCrops()).setDisplay("Getreide")); register("carrots", (new BlockCarrot()).setDisplay("Karotten")); register("potatoes", (new BlockPotato()).setDisplay("Kartoffeln")); @@ -385,15 +385,15 @@ public abstract class BlockRegistry { } } for(MineralType mineral : MineralType.values()) { - Block block = (new BlockQuartz(mineral.name, false)).setSound(SoundType.STONE).setHardness(0.8F).setDisplay(mineral.displayBlock).setMiningTool(Equipment.PICKAXE, 1); + Block block = (new BlockQuartz(mineral.name, false)).setHardness(0.8F).setDisplay(mineral.displayBlock).setMiningTool(Equipment.PICKAXE, 1); register(mineral.name + "_block", block); register(mineral.name + "_slab", (new BlockSlab(block, mineral.name + "_bottom", mineral.name + "_top")).setDisplay(mineral.displaySlab).setMiningTool(Equipment.PICKAXE, 1)); register(mineral.name + "_stairs", (new BlockStairs(block, mineral.name + "_bottom", mineral.name + "_top")).setDisplay(mineral.displayStairs).setMiningTool(Equipment.PICKAXE, 1)); Block ornaments; - register(mineral.name + "_ornaments", (ornaments = new BlockQuartz(mineral.name, true)).setSound(SoundType.STONE).setHardness(0.8F).setDisplay(mineral.displayCarved).setMiningTool(Equipment.PICKAXE, 1)); + register(mineral.name + "_ornaments", (ornaments = new BlockQuartz(mineral.name, true)).setHardness(0.8F).setDisplay(mineral.displayCarved).setMiningTool(Equipment.PICKAXE, 1)); register(mineral.name + "_ornaments_slab", (new BlockSlab(ornaments, mineral.name + "_carved", mineral.name + "_carved_top")).setDisplay(mineral.displayCarvedSlab).setMiningTool(Equipment.PICKAXE, 1)); register(mineral.name + "_ornaments_stairs", (new BlockStairs(ornaments, mineral.name + "_carved", mineral.name + "_carved_top")).setDisplay(mineral.displayCarvedStairs).setMiningTool(Equipment.PICKAXE, 1)); - register(mineral.name + "_pillar", (new BlockQuartzPillar(mineral.name)).setSound(SoundType.STONE).setHardness(0.8F).setDisplay(mineral.displayPillar).setMiningTool(Equipment.PICKAXE, 1)); + register(mineral.name + "_pillar", (new BlockQuartzPillar(mineral.name)).setHardness(0.8F).setDisplay(mineral.displayPillar).setMiningTool(Equipment.PICKAXE, 1)); } register("stone_slab", (new BlockSlab(stone)).setDisplay("Steinstufe")); @@ -483,69 +483,69 @@ public abstract class BlockRegistry { register("cheese_slab", (new BlockSlab(cheese)).setDisplay("Käsestufe")); register("cheese_stairs", (new BlockStairs(cheese)).setDisplay("Käsetreppe")); - register("iron_bars", (new BlockPane(Material.SOLID)).setHardness(5.0F).setResistance(10.0F).setSound(SoundType.STONE).setDisplay("Eisengitter")); + register("iron_bars", (new BlockPane(Material.SOLID)).setHardness(5.0F).setResistance(10.0F).setDisplay("Eisengitter")); - Block brick_block = (new Block(Material.SOLID)).setHardness(2.0F).setResistance(10.0F).setSound(SoundType.STONE) + Block brick_block = (new Block(Material.SOLID)).setHardness(2.0F).setResistance(10.0F) .setDisplay("Ziegelsteine").setTab(CheatTab.BLOCKS); register("brick_block", brick_block); register("brick_slab", (new BlockSlab(brick_block)).setDisplay("Ziegelstufe")); register("brick_stairs", (new BlockStairs(brick_block)).setDisplay("Ziegeltreppe")); - Block stonebrick = (new Block(Material.SOLID)).setHardness(1.5F).setResistance(10.0F).setSound(SoundType.STONE) + Block stonebrick = (new Block(Material.SOLID)).setHardness(1.5F).setResistance(10.0F) .setDisplay("Steinziegel").setTab(CheatTab.BLOCKS); register("stonebrick", stonebrick); register("stonebrick_slab", (new BlockSlab(stonebrick)).setDisplay("Steinziegelstufe")); register("stonebrick_stairs", (new BlockStairs(stonebrick)).setDisplay("Steinziegeltreppe")); Block mossy_stonebrick; - register("mossy_stonebrick", (mossy_stonebrick = new Block(Material.SOLID)).setHardness(1.5F).setResistance(10.0F).setSound(SoundType.STONE).setDisplay("Bemooste Steinziegel").setTab(CheatTab.BLOCKS)); + register("mossy_stonebrick", (mossy_stonebrick = new Block(Material.SOLID)).setHardness(1.5F).setResistance(10.0F).setDisplay("Bemooste Steinziegel").setTab(CheatTab.BLOCKS)); register("mossy_stonebrick_slab", (new BlockSlab(mossy_stonebrick)).setDisplay("Bemooste Steinziegelstufe")); register("mossy_stonebrick_stairs", (new BlockStairs(mossy_stonebrick)).setDisplay("Bemooste Steinziegeltreppe")); Block cracked_stonebrick; - register("cracked_stonebrick", (cracked_stonebrick = new Block(Material.SOLID)).setHardness(1.5F).setResistance(10.0F).setSound(SoundType.STONE).setDisplay("Rissige Steinziegel").setTab(CheatTab.BLOCKS)); + register("cracked_stonebrick", (cracked_stonebrick = new Block(Material.SOLID)).setHardness(1.5F).setResistance(10.0F).setDisplay("Rissige Steinziegel").setTab(CheatTab.BLOCKS)); register("cracked_stonebrick_slab", (new BlockSlab(cracked_stonebrick)).setDisplay("Rissige Steinziegelstufe")); register("cracked_stonebrick_stairs", (new BlockStairs(cracked_stonebrick)).setDisplay("Rissige Steinziegeltreppe")); - register("carved_stonebrick", (new Block(Material.SOLID)).setHardness(1.5F).setResistance(10.0F).setSound(SoundType.STONE).setDisplay("Gemeißelte Steinziegel").setTab(CheatTab.BLOCKS)); + register("carved_stonebrick", (new Block(Material.SOLID)).setHardness(1.5F).setResistance(10.0F).setDisplay("Gemeißelte Steinziegel").setTab(CheatTab.BLOCKS)); - Block blood_brick = (new Block(Material.SOLID)).setHardness(2.0F).setResistance(10.0F).setSound(SoundType.STONE) + Block blood_brick = (new Block(Material.SOLID)).setHardness(2.0F).setResistance(10.0F) .setDisplay("Blutrote Ziegel").setTab(CheatTab.BLOCKS); register("blood_brick", blood_brick); register("blood_brick_slab", (new BlockSlab(blood_brick)).setDisplay("Blutrote Ziegelstufe")); register("blood_brick_fence", (new BlockFence(Material.SOLID, "blood_brick")).setHardness(2.0F).setResistance(10.0F) - .setSound(SoundType.STONE).setDisplay("Blutroter Ziegelzaun")); + .setDisplay("Blutroter Ziegelzaun")); register("blood_brick_stairs", (new BlockStairs(blood_brick)).setDisplay("Blutrote Ziegeltreppe")); - Block black_brick = (new Block(Material.SOLID)).setHardness(2.0F).setResistance(10.0F).setSound(SoundType.STONE) + Block black_brick = (new Block(Material.SOLID)).setHardness(2.0F).setResistance(10.0F) .setDisplay("Schwarze Ziegel").setTab(CheatTab.BLOCKS); register("black_brick", black_brick); register("black_brick_slab", (new BlockSlab(black_brick)).setDisplay("Schwarze Ziegelstufe")); register("black_brick_stairs", (new BlockStairs(black_brick)).setDisplay("Schwarze Ziegeltreppe")); register("black_brick_fence", (new BlockFence(Material.SOLID, "black_brick")).setHardness(2.0F).setResistance(10.0F) - .setSound(SoundType.STONE).setDisplay("Schwarzer Ziegelzaun")); + .setDisplay("Schwarzer Ziegelzaun")); - Block concrete = (new Block(Material.SOLID)).setHardness(2.0F).setResistance(10.0F).setSound(SoundType.STONE).setDisplay("Beton").setTab(CheatTab.BLOCKS); + Block concrete = (new Block(Material.SOLID)).setHardness(2.0F).setResistance(10.0F).setDisplay("Beton").setTab(CheatTab.BLOCKS); register("concrete", concrete); register("concrete_slab", (new BlockSlab(concrete)).setDisplay("Betonstufe")); register("concrete_stairs", (new BlockStairs(concrete)).setDisplay("Betontreppe")); for(DecoType deco : DecoType.values()) { Block block = (new Block(Material.SOLID)).setHardness(2.0F).setResistance(10.0F) - .setSound(SoundType.STONE).setDisplay(deco.display).setTab(CheatTab.BLOCKS); + .setDisplay(deco.display).setTab(CheatTab.BLOCKS); register(deco.name, block); register(deco.name + "_slab", (new BlockSlab(block)).setDisplay(deco.display + " - Stufe")); register(deco.name + "_stairs", (new BlockStairs(block)).setDisplay(deco.display + " - Treppe")); } - register("iron_door", (new BlockDoor(Material.SOLID)).setHardness(5.0F).setSound(SoundType.STONE).setDisplay("Eisentür")); - register("trapdoor", (new BlockTrapDoor(Material.WOOD)).setHardness(3.0F).setSound(SoundType.WOOD).setDisplay("Holzfalltür").setFlammable(5, 20)); - register("iron_trapdoor", (new BlockTrapDoor(Material.SOLID)).setHardness(5.0F).setSound(SoundType.STONE).setDisplay("Eisenfalltür")); + register("iron_door", (new BlockDoor(Material.SOLID)).setHardness(5.0F).setDisplay("Eisentür")); + register("trapdoor", (new BlockTrapDoor(Material.WOOD)).setHardness(3.0F).setDisplay("Holzfalltür").setFlammable(5, 20)); + register("iron_trapdoor", (new BlockTrapDoor(Material.SOLID)).setHardness(5.0F).setDisplay("Eisenfalltür")); - register("core", new BlockCore().setHardness(1.5F).setResistance(10.0F).setSound(SoundType.STONE).setDisplay("Chunk-Lade-Kern")); - register("mob_spawner", (new BlockMobSpawner()).setHardness(3.0F).setResistance(8.0F).setSound(SoundType.STONE).setDisplay("Mob-Spawner")); - register("workbench", (new BlockWorkbench(1)).setHardness(2.5F).setSound(SoundType.WOOD).setDisplay("Werkbank")); - register("construction_table", (new BlockWorkbench(2)).setHardness(2.5F).setSound(SoundType.WOOD).setDisplay("Konstruktionstisch")); - register("assembly_unit", (new BlockWorkbench(3)).setHardness(2.5F).setSound(SoundType.WOOD).setDisplay("Fertigungseinheit")); + register("core", new BlockCore().setHardness(1.5F).setResistance(10.0F).setDisplay("Chunk-Lade-Kern")); + register("mob_spawner", (new BlockMobSpawner()).setHardness(3.0F).setResistance(8.0F).setDisplay("Mob-Spawner")); + register("workbench", (new BlockWorkbench(1)).setHardness(2.5F).setDisplay("Werkbank")); + register("construction_table", (new BlockWorkbench(2)).setHardness(2.5F).setDisplay("Konstruktionstisch")); + register("assembly_unit", (new BlockWorkbench(3)).setHardness(2.5F).setDisplay("Fertigungseinheit")); BlockFurnace stone_furnace = (BlockFurnace)register("stone_furnace", new BlockFurnace(200, 100).setDisplay("Steinofen")); register("lit_stone_furnace", new BlockFurnace(stone_furnace)); @@ -567,7 +567,7 @@ public abstract class BlockRegistry { register("lit_black_metal_furnace", new BlockFurnace(black_metal_furnace)); for(int z = 0; z < BlockAnvil.ANVILS.length; z++) { - register("anvil" + (z == 0 ? "" : "_damaged_" + z), (new BlockAnvil(z)).setHardness(5.0F).setSound(SoundType.STONE).setResistance(2000.0F).setDisplay((z == 0 ? "" : (z == 1 ? "Leicht beschädigter " : "Stark beschädigter ")) + "Amboss")); + register("anvil" + (z == 0 ? "" : "_damaged_" + z), (new BlockAnvil(z)).setHardness(5.0F).setResistance(2000.0F).setDisplay((z == 0 ? "" : (z == 1 ? "Leicht beschädigter " : "Stark beschädigter ")) + "Amboss")); } register("enchanting_table", (new BlockEnchantmentTable()).setHardness(5.0F).setResistance(2000.0F).setDisplay("Zaubertisch")); register("brewing_stand", (new BlockBrewingStand()).setHardness(0.5F).setLight(0x1f1f18).setDisplay("Braustand").setTab(CheatTab.TECHNOLOGY)); @@ -582,56 +582,56 @@ public abstract class BlockRegistry { register("thetium_chest", new BlockChest(384).setDisplay("Thetiumtruhe")); register("black_metal_chest", new BlockChest(480).setDisplay("Schwarzmetalltruhe")); register("nichun_chest", new BlockChest(550).setDisplay("Nichuntruhe")); - register("warp_chest", (new BlockWarpChest()).setHardness(22.5F).setResistance(1000.0F).setSound(SoundType.STONE) + register("warp_chest", (new BlockWarpChest()).setHardness(22.5F).setResistance(1000.0F) .setDisplay("Warptruhe").setLight(0x7f00af)); for(int z = 0; z < BlockTNT.TNTS.length; z++) { - register("tnt" + (z == 0 ? "" : "_" + z), (new BlockTNT(z)).setHardness(0.0F).setSound(SoundType.GRASS).setDisplay("TNT" + Util.getTierSuffix(z))); + register("tnt" + (z == 0 ? "" : "_" + z), (new BlockTNT(z)).setHardness(0.0F).setDisplay("TNT" + Util.getTierSuffix(z))); } - register("nuke", (new BlockNuke()).setHardness(0.0F).setSound(SoundType.GRASS).setDisplay("T-17")); + register("nuke", (new BlockNuke()).setHardness(0.0F).setDisplay("T-17")); register("piston", (new BlockPistonBase(false)).setDisplay("Kolben")); register("sticky_piston", (new BlockPistonBase(true)).setDisplay("Klebriger Kolben")); register("piston_head", (new BlockPistonHead(false)).setDisplay("Kolben")); register("sticky_piston_head", (new BlockPistonHead(true)).setDisplay("Klebriger Kolben")); - register("dispenser", (new BlockDispenser(false)).setHardness(3.5F).setSound(SoundType.STONE).setDisplay("Werfer")); - register("dropper", (new BlockDispenser(true)).setHardness(3.5F).setSound(SoundType.STONE).setDisplay("Spender")); - register("pipe", (new BlockItemPipe()).setHardness(3.0F).setResistance(8.0F).setSound(SoundType.STONE).setDisplay("Rohr")); - register("suction_pipe", (new BlockSuctionPipe()).setHardness(3.0F).setResistance(8.0F).setSound(SoundType.STONE).setDisplay("Saugrohr")); - register("tian_reactor", (new BlockTianReactor()).setHardness(3.0F).setResistance(8.0F).setSound(SoundType.STONE).setDisplay("Tianreaktor")); + register("dispenser", (new BlockDispenser(false)).setHardness(3.5F).setDisplay("Werfer")); + register("dropper", (new BlockDispenser(true)).setHardness(3.5F).setDisplay("Spender")); + register("pipe", (new BlockItemPipe()).setHardness(3.0F).setResistance(8.0F).setDisplay("Rohr")); + register("suction_pipe", (new BlockSuctionPipe()).setHardness(3.0F).setResistance(8.0F).setDisplay("Saugrohr")); + register("tian_reactor", (new BlockTianReactor()).setHardness(3.0F).setResistance(8.0F).setDisplay("Tianreaktor")); - register("rail", (new BlockRail()).setHardness(0.7F).setSound(SoundType.STONE).setDisplay("Schiene").setMiningTool(Equipment.PICKAXE, 0)); + register("rail", (new BlockRail()).setHardness(0.7F).setDisplay("Schiene").setMiningTool(Equipment.PICKAXE, 0)); - register("lever", (new BlockLever()).setHardness(0.5F).setSound(SoundType.WOOD).setDisplay("Hebel")); + register("lever", (new BlockLever()).setHardness(0.5F).setDisplay("Hebel")); register("stone_pressure_plate", (new BlockPressurePlate(Material.SOLID, BlockPressurePlate.Sensitivity.MOBS)).setHardness(0.5F) - .setSound(SoundType.STONE).setDisplay("Steindruckplatte")); + .setDisplay("Steindruckplatte")); register("wooden_pressure_plate", (new BlockPressurePlate(Material.WOOD, BlockPressurePlate.Sensitivity.EVERYTHING)) - .setHardness(0.5F).setSound(SoundType.WOOD).setDisplay("Holzdruckplatte")); + .setHardness(0.5F).setDisplay("Holzdruckplatte")); register("light_weighted_pressure_plate", (new BlockPressurePlateWeighted(Material.SOLID, 15)).setHardness(0.5F) - .setSound(SoundType.WOOD).setDisplay("Wägeplatte (niedrige Gewichte)")); + .setDisplay("Wägeplatte (niedrige Gewichte)")); register("heavy_weighted_pressure_plate", (new BlockPressurePlateWeighted(Material.SOLID, 150)).setHardness(0.5F) - .setSound(SoundType.WOOD).setDisplay("Wägeplatte (hohe Gewichte)")); + .setDisplay("Wägeplatte (hohe Gewichte)")); - register("stone_button", (new BlockButton(false, 20, "stone")).setHardness(0.5F).setSound(SoundType.STONE).setDisplay("Knopf")); - register("wooden_button", (new BlockButton(true, 30, "oak_planks")).setHardness(0.5F).setSound(SoundType.WOOD).setDisplay("Knopf")); - register("red_button", (new BlockButton(true, 10, "red_button")).setHardness(0.5F).setSound(SoundType.STONE).setDisplay("Knopf")); + register("stone_button", (new BlockButton(false, 20, "stone")).setHardness(0.5F).setDisplay("Knopf")); + register("wooden_button", (new BlockButton(true, 30, "oak_planks")).setHardness(0.5F).setDisplay("Knopf")); + register("red_button", (new BlockButton(true, 10, "red_button")).setHardness(0.5F).setDisplay("Knopf")); - register("wire", (new BlockWire()).setHardness(0.0F).setSound(SoundType.STONE).setDisplay("Kabel").setTab(CheatTab.TECHNOLOGY)); + register("wire", (new BlockWire()).setHardness(0.0F).setDisplay("Kabel").setTab(CheatTab.TECHNOLOGY)); BlockUnlitTorch torch; - register("torch", (torch = new BlockUnlitTorch(0xffffffff)).setHardness(0.0F).setSound(SoundType.WOOD).setDisplay("Fackel")); - register("lit_torch", (new BlockLitTorch(torch)).setHardness(0.0F).setLight(0xefef9f).setSound(SoundType.WOOD).setDisplay("Fackel")); + register("torch", (torch = new BlockUnlitTorch(0xffffffff)).setHardness(0.0F).setDisplay("Fackel")); + register("lit_torch", (new BlockLitTorch(torch)).setHardness(0.0F).setLight(0xefef9f).setDisplay("Fackel")); BlockUnlitTorch tian_torch; - register("tian_torch", (tian_torch = new BlockUnlitTorch(0x7f00ff)).setHardness(0.0F).setSound(SoundType.WOOD).setDisplay("Tian-Fackel")); - register("lit_tian_torch", (new BlockLitTorch(tian_torch)).setHardness(0.0F).setLight(0xaf00ff).setSound(SoundType.WOOD) + register("tian_torch", (tian_torch = new BlockUnlitTorch(0x7f00ff)).setHardness(0.0F).setDisplay("Tian-Fackel")); + register("lit_tian_torch", (new BlockLitTorch(tian_torch)).setHardness(0.0F).setLight(0xaf00ff) .setDisplay("Tian-Fackel")); BlockUnlitTorch soul_torch; - register("soul_torch", (soul_torch = new BlockUnlitTorch(0x1f1fff)).setHardness(0.0F).setSound(SoundType.WOOD).setDisplay("Seelenfackel")); - register("lit_soul_torch", (new BlockLitTorch(soul_torch)).setHardness(0.0F).setLight(0x0000af).setSound(SoundType.WOOD) + register("soul_torch", (soul_torch = new BlockUnlitTorch(0x1f1fff)).setHardness(0.0F).setDisplay("Seelenfackel")); + register("lit_soul_torch", (new BlockLitTorch(soul_torch)).setHardness(0.0F).setLight(0x0000af) .setDisplay("Seelenfackel")); - register("lamp", (new BlockToggleableLight(false)).setHardness(0.3F).setSound(SoundType.GLASS) + register("lamp", (new BlockToggleableLight(false)).setHardness(0.3F) .setDisplay("Lampe").setTab(CheatTab.TECHNOLOGY)); - register("lit_lamp", (new BlockToggleableLight(true)).setHardness(0.3F).setSound(SoundType.GLASS).setDisplay("Lampe")); + register("lit_lamp", (new BlockToggleableLight(true)).setHardness(0.3F).setDisplay("Lampe")); register("hook", (new BlockHook()).setDisplay("Haken")); register("string", (new BlockString()).setDisplay("Seil").setTab(CheatTab.TECHNOLOGY));