diff --git a/common/src/main/java/common/block/Block.java b/common/src/main/java/common/block/Block.java index e8006013..bac9f6cd 100755 --- a/common/src/main/java/common/block/Block.java +++ b/common/src/main/java/common/block/Block.java @@ -180,7 +180,6 @@ public class Block { private int encouragement; private int flammability; private float hardness; - private float resistance; private float radiation; private float slipperiness; protected double minX; @@ -385,15 +384,8 @@ public class Block { return this; } - public final Block setResistance(float resistance) { - this.resistance = resistance * 3.0F; - return this; - } - public final Block setHardness(float hardness) { this.hardness = hardness; - if(this.resistance < hardness * 5.0F) - this.resistance = hardness * 5.0F; return this; } @@ -525,10 +517,6 @@ public class Block { return this.hardness; } - public final float getRawResistance() { - return this.resistance; - } - public final boolean isTicked() { return this.ticked; } @@ -774,10 +762,6 @@ public class Block { return 10; } - public final float getResistance() { - return this.resistance; - } - public boolean canPlace(World world, LocalPos pos, Facing side) { return this.canPlace(world, pos); } diff --git a/common/src/main/java/common/block/artificial/BlockSlab.java b/common/src/main/java/common/block/artificial/BlockSlab.java index 1b034c2a..7d40fe65 100755 --- a/common/src/main/java/common/block/artificial/BlockSlab.java +++ b/common/src/main/java/common/block/artificial/BlockSlab.java @@ -55,7 +55,6 @@ public class BlockSlab extends Block implements Directional { this.setOpacity(255); this.base = base; this.setHardness(this.base.getRawHardness()); - this.setResistance(this.base.getRawResistance() / 3.0F); 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 93f9bd90..48d9abde 100755 --- a/common/src/main/java/common/block/artificial/BlockStairs.java +++ b/common/src/main/java/common/block/artificial/BlockStairs.java @@ -53,7 +53,6 @@ public class BlockStairs extends Block implements Rotatable this.setDefaultState(this.getBaseState().withProperty(FACING, Facing.NORTH).withProperty(HALF, BlockStairs.EnumHalf.BOTTOM).withProperty(SHAPE, BlockStairs.EnumShape.STRAIGHT)); this.base = base; this.setHardness(this.base.getRawHardness()); - this.setResistance(this.base.getRawResistance() / 3.0F); 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 5b3795f6..91f8bab9 100755 --- a/common/src/main/java/common/block/artificial/BlockWall.java +++ b/common/src/main/java/common/block/artificial/BlockWall.java @@ -43,7 +43,6 @@ public class BlockWall extends Block this.texture = texture; 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.setTab(modelBlock.getTab()); WALLS.add(this); } diff --git a/common/src/main/java/common/block/natural/BlockCompressable.java b/common/src/main/java/common/block/natural/BlockCompressable.java index ab4c1ed5..87e065c4 100644 --- a/common/src/main/java/common/block/natural/BlockCompressable.java +++ b/common/src/main/java/common/block/natural/BlockCompressable.java @@ -26,7 +26,7 @@ public class BlockCompressable extends Block { density *= 10; } this.density = density; - this.setHardness(5.0F).setResistance(10.0F); + this.setHardness(5.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 2cc07920..d91803b4 100644 --- a/common/src/main/java/common/block/natural/BlockCyber.java +++ b/common/src/main/java/common/block/natural/BlockCyber.java @@ -10,7 +10,6 @@ public class BlockCyber extends Block { super(Material.SOLID); this.setTab(CheatTab.ROCK); this.setHardness(1.25F); - this.setResistance(7.0F); this.setDisplay("CYBER"); } diff --git a/common/src/main/java/common/init/BlockRegistry.java b/common/src/main/java/common/init/BlockRegistry.java index ebc8ecb1..bd62a718 100755 --- a/common/src/main/java/common/init/BlockRegistry.java +++ b/common/src/main/java/common/init/BlockRegistry.java @@ -129,33 +129,33 @@ 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).setDisplay("Stein")); - Block bedrock = register("bedrock", (new BlockBedrock()).setHardness(1000.0F).setResistance(100000.0F) + Block stone = register("stone", (new BlockStone()).setHardness(1.5F).setDisplay("Stein")); + Block bedrock = register("bedrock", (new BlockBedrock()).setHardness(1000.0F) .setDisplay("Grundgestein").setTab(CheatTab.ROCK).setMiningTool(Equipment.PICKAXE, 6)); - 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 rock = register("rock", (new Block(Material.SOLID)).setHardness(2.0F).setDisplay("Felsen").setTab(CheatTab.ROCK)); + Block smooth_rock = register("smooth_rock", (new Block(Material.SOLID)).setHardness(2.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) + Block cell_rock = register("cell_rock", (new Block(Material.LOOSE)).setHardness(1.0F) .setDisplay("Zellstein").setTab(CheatTab.ROCK)); - Block moon_rock = register("moon_rock", (new Block(Material.SOLID)).setHardness(2.5F).setResistance(10.0F) + Block moon_rock = register("moon_rock", (new Block(Material.SOLID)).setHardness(2.5F) .setDisplay("Mondgestein").setTab(CheatTab.ROCK)); - Block cobblestone = (new Block(Material.SOLID)).setHardness(2.0F).setResistance(10.0F) + Block cobblestone = (new Block(Material.SOLID)).setHardness(2.0F) .setDisplay("Bruchstein").setTab(CheatTab.ROCK); register("cobblestone", cobblestone); - Block mossy_cobblestone = (new Block(Material.SOLID)).setHardness(2.0F).setResistance(10.0F) + Block mossy_cobblestone = (new Block(Material.SOLID)).setHardness(2.0F) .setDisplay("Bemooster Bruchstein").setTab(CheatTab.ROCK); register("mossy_cobblestone", mossy_cobblestone); Block sandstone = (new BlockSandStone("normal")).setHardness(0.8F).setDisplay("Sandstein"); register("sandstone", sandstone); Block smooth_sandstone; 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) + Block obsidian = register("obsidian", (new BlockObsidian()).setHardness(50.0F) .setDisplay("Obsidian").setMiningTool(Equipment.PICKAXE, 3)); 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 hardened_clay = register("hardened_clay", (new BlockHardenedClay()).setHardness(1.25F).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) + colored_clay[color.ordinal()] = register(color.getName() + "_clay", (new BlockColoredClay(color)).setHardness(1.25F) .setDisplay(color.getDisplay() + " gefärbter Ton")); } Block cyber; @@ -172,8 +172,8 @@ public abstract class BlockRegistry { 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).setDisplay("Schwarzstein")); - Block blackened_cobble = register("blackened_cobble", (new Block(Material.SOLID)).setHardness(2.0F).setResistance(10.0F) + Block blackened_stone = register("blackened_stone", (new BlockBlackenedStone()).setHardness(1.5F).setDisplay("Schwarzstein")); + Block blackened_cobble = register("blackened_cobble", (new Block(Material.SOLID)).setHardness(2.0F) .setDisplay("Schwarzbruchstein").setTab(CheatTab.ROCK)); @@ -195,16 +195,16 @@ public abstract class BlockRegistry { for(MetalType metal : MetalType.values()) { // String loc = metal.name.substring(0, 1).toUpperCase() + metal.name.substring(1); - register(metal.name + "_ore", (new BlockMetalOre(metal)).setHardness(3.0F).setResistance(5.0F) + register(metal.name + "_ore", (new BlockMetalOre(metal)).setHardness(3.0F) .setDisplay(metal.display + "erz").setMiningTool(Equipment.PICKAXE, 1)); } 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) + register(ore.name + "_ore", (new BlockOre()).setHardness(3.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) + register(mineral.name + "_ore", (new BlockOre()).setHardness(3.0F) .setDisplay(mineral.displayOre).setMiningTool(Equipment.PICKAXE, 1)); } @@ -223,10 +223,10 @@ public abstract class BlockRegistry { Block swamp; 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) + register("tian", (tian = new Block(Material.SOLID)).setHardness(2.0F) .setDisplay("Tian").setTab(CheatTab.NATURE)); Block tian_soil; - register("tian_soil", (tian_soil = new BlockTianSoil()).setHardness(2.0F).setResistance(15.0F) + register("tian_soil", (tian_soil = new BlockTianSoil()).setHardness(2.0F) .setDisplay("Tianerde").setTab(CheatTab.NATURE)); Block blackened_dirt; register("blackened_dirt", (blackened_dirt = new BlockBlackenedDirt()).setHardness(0.5F).setDisplay("Schwarzerde").setMiningTool(Equipment.SHOVEL)); @@ -235,7 +235,7 @@ public abstract class BlockRegistry { Block slime_block; register("slime_block", (slime_block = new BlockSlime()).setDisplay("Schleimblock")); Block cheese; - register("cheese", (cheese = new BlockTreasure(Material.SOFT)).setHardness(1.5F).setResistance(5.0F) + register("cheese", (cheese = new BlockTreasure(Material.SOFT)).setHardness(1.5F) .setDisplay("Käse").setTab(CheatTab.NATURE)); @@ -290,15 +290,15 @@ public abstract class BlockRegistry { 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) + Block planks = (new Block(Material.WOOD)).setHardness(2.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).setDisplay(wood.getDisplay() + "holzzaun").setFlammable(5, 20)); - register(wood.getName() + "_fence_gate", (new BlockFenceGate(wood)).setHardness(2.0F).setResistance(5.0F) + .setHardness(2.0F).setDisplay(wood.getDisplay() + "holzzaun").setFlammable(5, 20)); + register(wood.getName() + "_fence_gate", (new BlockFenceGate(wood)).setHardness(2.0F) .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)); @@ -336,7 +336,7 @@ public abstract class BlockRegistry { 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) + register("dragon_egg", (new BlockDragonEgg()).setHardness(3.0F) .setLight(0x1f001f).setDisplay("Drachenei").setTab(CheatTab.DECORATION)); 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())); @@ -364,7 +364,7 @@ public abstract class BlockRegistry { } register(PortalType.FLOOR.getName() + "_portal", (new BlockFloorPortal(Material.PORTAL)).setHardness(0.0F).setDisplay(PortalType.FLOOR.getDisplay())); register("portal_frame", (new BlockPortalFrame()).setLight(0x1f002f).setHardness(5.0F) - .setDisplay("Portalrahmen").setResistance(2000.0F).setTab(CheatTab.TECHNOLOGY)); + .setDisplay("Portalrahmen").setTab(CheatTab.TECHNOLOGY)); register("farmland", (new BlockFarmland()).setHardness(0.6F).setDisplay("Ackerboden").setMiningTool(Equipment.SHOVEL).setTab(CheatTab.PLANTS)); register("wheats", (new BlockCrops()).setDisplay("Getreide")); @@ -374,7 +374,7 @@ public abstract class BlockRegistry { for(MetalType metal : MetalType.values()) { // String loc = metal.name.substring(0, 1).toUpperCase() + metal.name.substring(1); - register(metal.name + "_block", (new BlockMetalBlock(metal)).setHardness(5.0F).setResistance(10.0F) + register(metal.name + "_block", (new BlockMetalBlock(metal)).setHardness(5.0F) .setDisplay(metal.display + "block").setMiningTool(Equipment.PICKAXE, 1)); } for(OreType ore : OreType.values()) { @@ -483,54 +483,54 @@ 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).setDisplay("Eisengitter")); + register("iron_bars", (new BlockPane(Material.SOLID)).setHardness(5.0F).setDisplay("Eisengitter")); - Block brick_block = (new Block(Material.SOLID)).setHardness(2.0F).setResistance(10.0F) + Block brick_block = (new Block(Material.SOLID)).setHardness(2.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) + Block stonebrick = (new Block(Material.SOLID)).setHardness(1.5F) .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).setDisplay("Bemooste Steinziegel").setTab(CheatTab.BLOCKS)); + register("mossy_stonebrick", (mossy_stonebrick = new Block(Material.SOLID)).setHardness(1.5F).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).setDisplay("Rissige Steinziegel").setTab(CheatTab.BLOCKS)); + register("cracked_stonebrick", (cracked_stonebrick = new Block(Material.SOLID)).setHardness(1.5F).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).setDisplay("Gemeißelte Steinziegel").setTab(CheatTab.BLOCKS)); + register("carved_stonebrick", (new Block(Material.SOLID)).setHardness(1.5F).setDisplay("Gemeißelte Steinziegel").setTab(CheatTab.BLOCKS)); - Block blood_brick = (new Block(Material.SOLID)).setHardness(2.0F).setResistance(10.0F) + Block blood_brick = (new Block(Material.SOLID)).setHardness(2.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) + register("blood_brick_fence", (new BlockFence(Material.SOLID, "blood_brick")).setHardness(2.0F) .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) + Block black_brick = (new Block(Material.SOLID)).setHardness(2.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) + register("black_brick_fence", (new BlockFence(Material.SOLID, "black_brick")).setHardness(2.0F) .setDisplay("Schwarzer Ziegelzaun")); - Block concrete = (new Block(Material.SOLID)).setHardness(2.0F).setResistance(10.0F).setDisplay("Beton").setTab(CheatTab.BLOCKS); + Block concrete = (new Block(Material.SOLID)).setHardness(2.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) + Block block = (new Block(Material.SOLID)).setHardness(2.0F) .setDisplay(deco.display).setTab(CheatTab.BLOCKS); register(deco.name, block); register(deco.name + "_slab", (new BlockSlab(block)).setDisplay(deco.display + " - Stufe")); @@ -541,8 +541,8 @@ public abstract class BlockRegistry { 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).setDisplay("Chunk-Lade-Kern")); - register("mob_spawner", (new BlockMobSpawner()).setHardness(3.0F).setResistance(8.0F).setDisplay("Mob-Spawner")); + register("core", new BlockCore().setHardness(1.5F).setDisplay("Chunk-Lade-Kern")); + register("mob_spawner", (new BlockMobSpawner()).setHardness(3.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")); @@ -567,9 +567,9 @@ 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).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).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("enchanting_table", (new BlockEnchantmentTable()).setHardness(5.0F).setDisplay("Zaubertisch")); register("brewing_stand", (new BlockBrewingStand()).setHardness(0.5F).setLight(0x1f1f18).setDisplay("Braustand").setTab(CheatTab.TECHNOLOGY)); register("cauldron", (new BlockCauldron()).setHardness(2.0F).setDisplay("Kessel").setTab(CheatTab.TECHNOLOGY)); register("effect_generator", (new BlockEffectGenerator()).setDisplay("Effektgenerator").setLight(0xffffff)); @@ -582,7 +582,7 @@ 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) + register("warp_chest", (new BlockWarpChest()).setHardness(22.5F) .setDisplay("Warptruhe").setLight(0x7f00af)); for(int z = 0; z < BlockTNT.TNTS.length; z++) { @@ -596,9 +596,9 @@ public abstract class BlockRegistry { register("sticky_piston_head", (new BlockPistonHead(true)).setDisplay("Klebriger Kolben")); 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("pipe", (new BlockItemPipe()).setHardness(3.0F).setDisplay("Rohr")); + register("suction_pipe", (new BlockSuctionPipe()).setHardness(3.0F).setDisplay("Saugrohr")); + register("tian_reactor", (new BlockTianReactor()).setHardness(3.0F).setDisplay("Tianreaktor")); register("rail", (new BlockRail()).setHardness(0.7F).setDisplay("Schiene").setMiningTool(Equipment.PICKAXE, 0)); diff --git a/server/src/main/java/server/world/WorldServer.java b/server/src/main/java/server/world/WorldServer.java index ab74c571..d535b7ca 100755 --- a/server/src/main/java/server/world/WorldServer.java +++ b/server/src/main/java/server/world/WorldServer.java @@ -939,7 +939,7 @@ public final class WorldServer extends AWorldServer { private boolean destroyBlock(LocalPos pos, float power, EntityLiving source) { State state = this.getState(pos); Block block = state.getBlock(); - if(block != Blocks.air && (block.getMaterial().isLiquid() || power - (block.getResistance() / 5.0F + 0.3F) * 0.3F > 0.0F)) { + if(block != Blocks.air && (block.getMaterial().isLiquid() || power - (block.getRawHardness() + 0.3F) * 0.3F > 0.0F)) { if(block.canExplosionDrop() && this.rand.floatv() <= 1.0F / (power * power)) block.drop(this, pos, state, 0); this.setState(pos, Blocks.air.getState(), 2);