From 9cc439d774df6e8fb49e5d42a7ce349f46edb788 Mon Sep 17 00:00:00 2001 From: Sen Date: Sat, 21 Jun 2025 19:06:58 +0200 Subject: [PATCH] block cleanup #8 --- .../common/block/foliage/BlockFarmland.java | 1 - .../java/common/block/foliage/BlockGrass.java | 1 - .../common/block/foliage/BlockMushroom.java | 1 - .../java/common/init/CraftingRegistry.java | 2 +- .../java/common/init/SmeltingRegistry.java | 1 - .../java/common/init/UniverseRegistry.java | 1 - .../src/main/java/server/biome/BiomeMesa.java | 2 - .../main/java/server/biome/BiomeSavanna.java | 1 - .../main/java/server/biome/BiomeTaiga.java | 1 - .../src/main/java/server/biome/GenBiome.java | 1 - .../server/worldgen/caves/MapGenCaves.java | 1 - .../structure/StructureScattered.java | 105 +++++++++--------- .../structure/StructureStronghold.java | 1 - .../worldgen/structure/StructureVillage.java | 4 +- .../server/worldgen/tree/WorldGenPine.java | 1 - 15 files changed, 55 insertions(+), 69 deletions(-) diff --git a/common/src/main/java/common/block/foliage/BlockFarmland.java b/common/src/main/java/common/block/foliage/BlockFarmland.java index 4af89744..1a442cca 100755 --- a/common/src/main/java/common/block/foliage/BlockFarmland.java +++ b/common/src/main/java/common/block/foliage/BlockFarmland.java @@ -2,7 +2,6 @@ package common.block.foliage; import common.block.Block; import common.block.Material; -import common.block.natural.BlockDirt; import common.entity.Entity; import common.entity.types.EntityLiving; import common.init.Blocks; diff --git a/common/src/main/java/common/block/foliage/BlockGrass.java b/common/src/main/java/common/block/foliage/BlockGrass.java index 060c88f5..dfe3d458 100755 --- a/common/src/main/java/common/block/foliage/BlockGrass.java +++ b/common/src/main/java/common/block/foliage/BlockGrass.java @@ -3,7 +3,6 @@ package common.block.foliage; import common.biome.IBiome; import common.block.Block; import common.block.Material; -import common.block.natural.BlockDirt; import common.color.Colorizer; import common.init.Blocks; import common.item.CheatTab; diff --git a/common/src/main/java/common/block/foliage/BlockMushroom.java b/common/src/main/java/common/block/foliage/BlockMushroom.java index 14f92db8..a770839c 100755 --- a/common/src/main/java/common/block/foliage/BlockMushroom.java +++ b/common/src/main/java/common/block/foliage/BlockMushroom.java @@ -2,7 +2,6 @@ package common.block.foliage; import common.biome.IBiome; import common.block.Block; -import common.block.natural.BlockDirt; import common.init.Blocks; import common.model.Model; import common.model.ModelProvider; diff --git a/common/src/main/java/common/init/CraftingRegistry.java b/common/src/main/java/common/init/CraftingRegistry.java index f1144f0c..df17265a 100755 --- a/common/src/main/java/common/init/CraftingRegistry.java +++ b/common/src/main/java/common/init/CraftingRegistry.java @@ -160,7 +160,7 @@ public abstract class CraftingRegistry add(new ItemStack(Blocks.furnace), "###", "# #", "###", '#', Blocks.cobblestone); add(new ItemStack(Blocks.sandstone), "##", "##", '#', Blocks.sand); add(new ItemStack(Blocks.sandstone_smooth, 4), "##", "##", '#', Blocks.sandstone); - add(new ItemStack(Blocks.quartz_block_y, 2), "#", "#", '#', Blocks.quartz_block); + add(new ItemStack(Blocks.quartz_pillar, 2), "#", "#", '#', Blocks.quartz_block); add(new ItemStack(Blocks.stonebrick, 4), "##", "##", '#', Blocks.stone); addShapeless(new ItemStack(Blocks.stonebrick_mossy), Blocks.stonebrick, Blocks.vine); addShapeless(new ItemStack(Blocks.mossy_cobblestone, 1), Blocks.cobblestone, Blocks.vine); diff --git a/common/src/main/java/common/init/SmeltingRegistry.java b/common/src/main/java/common/init/SmeltingRegistry.java index 8624457f..7c208767 100755 --- a/common/src/main/java/common/init/SmeltingRegistry.java +++ b/common/src/main/java/common/init/SmeltingRegistry.java @@ -4,7 +4,6 @@ import java.util.Map; import java.util.Map.Entry; import common.block.Block; -import common.block.artificial.BlockStoneBrick; import common.collect.Maps; import common.color.DyeColor; import common.item.Item; diff --git a/common/src/main/java/common/init/UniverseRegistry.java b/common/src/main/java/common/init/UniverseRegistry.java index a0e3914e..2d7cff48 100755 --- a/common/src/main/java/common/init/UniverseRegistry.java +++ b/common/src/main/java/common/init/UniverseRegistry.java @@ -7,7 +7,6 @@ import java.util.Map.Entry; import common.biome.Biome; import common.block.artificial.BlockWool; import common.block.foliage.LeavesType; -import common.block.natural.BlockSand; import common.collect.Lists; import common.collect.Maps; import common.collect.Sets; diff --git a/server/src/main/java/server/biome/BiomeMesa.java b/server/src/main/java/server/biome/BiomeMesa.java index e939ce04..bb6426ed 100755 --- a/server/src/main/java/server/biome/BiomeMesa.java +++ b/server/src/main/java/server/biome/BiomeMesa.java @@ -6,8 +6,6 @@ import common.biome.Biome; import common.block.Block; import common.block.artificial.BlockWool; import common.block.natural.BlockColoredClay; -import common.block.natural.BlockDirt; -import common.block.natural.BlockSand; import common.color.DyeColor; import common.init.Blocks; import common.rng.PerlinGen; diff --git a/server/src/main/java/server/biome/BiomeSavanna.java b/server/src/main/java/server/biome/BiomeSavanna.java index 273481f9..c54f905e 100755 --- a/server/src/main/java/server/biome/BiomeSavanna.java +++ b/server/src/main/java/server/biome/BiomeSavanna.java @@ -2,7 +2,6 @@ package server.biome; import common.biome.Biome; import common.block.foliage.BlockDoublePlant; -import common.block.natural.BlockDirt; import common.entity.animal.EntityHorse; import common.init.Blocks; import common.rng.Random; diff --git a/server/src/main/java/server/biome/BiomeTaiga.java b/server/src/main/java/server/biome/BiomeTaiga.java index c7206d52..6d138fbb 100755 --- a/server/src/main/java/server/biome/BiomeTaiga.java +++ b/server/src/main/java/server/biome/BiomeTaiga.java @@ -3,7 +3,6 @@ package server.biome; import common.biome.Biome; import common.block.foliage.BlockDoublePlant; import common.block.foliage.BlockTallGrass; -import common.block.natural.BlockDirt; import common.entity.animal.EntityWolf; import common.init.Blocks; import common.rng.Random; diff --git a/server/src/main/java/server/biome/GenBiome.java b/server/src/main/java/server/biome/GenBiome.java index ccfae42d..b940ae0f 100755 --- a/server/src/main/java/server/biome/GenBiome.java +++ b/server/src/main/java/server/biome/GenBiome.java @@ -8,7 +8,6 @@ import common.block.artificial.BlockWool; import common.block.foliage.BlockFlower; import common.block.foliage.BlockSapling; import common.block.foliage.BlockTallGrass; -import common.block.natural.BlockSand; import common.color.DyeColor; import common.entity.animal.EntityBat; import common.entity.animal.EntityChicken; diff --git a/server/src/main/java/server/worldgen/caves/MapGenCaves.java b/server/src/main/java/server/worldgen/caves/MapGenCaves.java index 10f3ee1c..e8684b27 100755 --- a/server/src/main/java/server/worldgen/caves/MapGenCaves.java +++ b/server/src/main/java/server/worldgen/caves/MapGenCaves.java @@ -3,7 +3,6 @@ package server.worldgen.caves; import common.block.Block; import common.block.artificial.BlockWool; import common.block.natural.BlockColoredClay; -import common.block.natural.BlockSand; import common.color.DyeColor; import common.init.Blocks; import common.rng.Random; diff --git a/server/src/main/java/server/worldgen/structure/StructureScattered.java b/server/src/main/java/server/worldgen/structure/StructureScattered.java index b0571a4a..1c5b1e12 100755 --- a/server/src/main/java/server/worldgen/structure/StructureScattered.java +++ b/server/src/main/java/server/worldgen/structure/StructureScattered.java @@ -1,7 +1,6 @@ package server.worldgen.structure; import common.block.artificial.BlockFlowerPot; -import common.block.artificial.BlockStoneBrick; import common.block.foliage.BlockFlower; import common.block.natural.BlockSandStone; import common.block.tech.BlockLever; @@ -96,29 +95,29 @@ public class StructureScattered this.setBlockState(worldIn, Blocks.sandstone_stairs.getStateFromMeta(l), this.scatteredFeatureSizeX - 1, 10, 2, structureBoundingBoxIn); this.fillWithBlocks(worldIn, structureBoundingBoxIn, 8, 0, 0, 12, 4, 4, Blocks.sandstone.getState(), Blocks.air.getState(), false); this.fillWithBlocks(worldIn, structureBoundingBoxIn, 9, 1, 0, 11, 3, 4, Blocks.air.getState(), Blocks.air.getState(), false); - this.setBlockState(worldIn, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.getMetadata()), 9, 1, 1, structureBoundingBoxIn); - this.setBlockState(worldIn, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.getMetadata()), 9, 2, 1, structureBoundingBoxIn); - this.setBlockState(worldIn, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.getMetadata()), 9, 3, 1, structureBoundingBoxIn); - this.setBlockState(worldIn, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.getMetadata()), 10, 3, 1, structureBoundingBoxIn); - this.setBlockState(worldIn, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.getMetadata()), 11, 3, 1, structureBoundingBoxIn); - this.setBlockState(worldIn, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.getMetadata()), 11, 2, 1, structureBoundingBoxIn); - this.setBlockState(worldIn, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.getMetadata()), 11, 1, 1, structureBoundingBoxIn); + this.setBlockState(worldIn, Blocks.smooth_sandstone.getState(), 9, 1, 1, structureBoundingBoxIn); + this.setBlockState(worldIn, Blocks.smooth_sandstone.getState(), 9, 2, 1, structureBoundingBoxIn); + this.setBlockState(worldIn, Blocks.smooth_sandstone.getState(), 9, 3, 1, structureBoundingBoxIn); + this.setBlockState(worldIn, Blocks.smooth_sandstone.getState(), 10, 3, 1, structureBoundingBoxIn); + this.setBlockState(worldIn, Blocks.smooth_sandstone.getState(), 11, 3, 1, structureBoundingBoxIn); + this.setBlockState(worldIn, Blocks.smooth_sandstone.getState(), 11, 2, 1, structureBoundingBoxIn); + this.setBlockState(worldIn, Blocks.smooth_sandstone.getState(), 11, 1, 1, structureBoundingBoxIn); this.fillWithBlocks(worldIn, structureBoundingBoxIn, 4, 1, 1, 8, 3, 3, Blocks.sandstone.getState(), Blocks.air.getState(), false); this.fillWithBlocks(worldIn, structureBoundingBoxIn, 4, 1, 2, 8, 2, 2, Blocks.air.getState(), Blocks.air.getState(), false); this.fillWithBlocks(worldIn, structureBoundingBoxIn, 12, 1, 1, 16, 3, 3, Blocks.sandstone.getState(), Blocks.air.getState(), false); this.fillWithBlocks(worldIn, structureBoundingBoxIn, 12, 1, 2, 16, 2, 2, Blocks.air.getState(), Blocks.air.getState(), false); this.fillWithBlocks(worldIn, structureBoundingBoxIn, 5, 4, 5, this.scatteredFeatureSizeX - 6, 4, this.scatteredFeatureSizeZ - 6, Blocks.sandstone.getState(), Blocks.sandstone.getState(), false); this.fillWithBlocks(worldIn, structureBoundingBoxIn, 9, 4, 9, 11, 4, 11, Blocks.air.getState(), Blocks.air.getState(), false); - this.fillWithBlocks(worldIn, structureBoundingBoxIn, 8, 1, 8, 8, 3, 8, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.getMetadata()), Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.getMetadata()), false); - this.fillWithBlocks(worldIn, structureBoundingBoxIn, 12, 1, 8, 12, 3, 8, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.getMetadata()), Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.getMetadata()), false); - this.fillWithBlocks(worldIn, structureBoundingBoxIn, 8, 1, 12, 8, 3, 12, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.getMetadata()), Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.getMetadata()), false); - this.fillWithBlocks(worldIn, structureBoundingBoxIn, 12, 1, 12, 12, 3, 12, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.getMetadata()), Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.getMetadata()), false); + this.fillWithBlocks(worldIn, structureBoundingBoxIn, 8, 1, 8, 8, 3, 8, Blocks.smooth_sandstone.getState(), Blocks.smooth_sandstone.getState(), false); + this.fillWithBlocks(worldIn, structureBoundingBoxIn, 12, 1, 8, 12, 3, 8, Blocks.smooth_sandstone.getState(), Blocks.smooth_sandstone.getState(), false); + this.fillWithBlocks(worldIn, structureBoundingBoxIn, 8, 1, 12, 8, 3, 12, Blocks.smooth_sandstone.getState(), Blocks.smooth_sandstone.getState(), false); + this.fillWithBlocks(worldIn, structureBoundingBoxIn, 12, 1, 12, 12, 3, 12, Blocks.smooth_sandstone.getState(), Blocks.smooth_sandstone.getState(), false); this.fillWithBlocks(worldIn, structureBoundingBoxIn, 1, 1, 5, 4, 4, 11, Blocks.sandstone.getState(), Blocks.sandstone.getState(), false); this.fillWithBlocks(worldIn, structureBoundingBoxIn, this.scatteredFeatureSizeX - 5, 1, 5, this.scatteredFeatureSizeX - 2, 4, 11, Blocks.sandstone.getState(), Blocks.sandstone.getState(), false); this.fillWithBlocks(worldIn, structureBoundingBoxIn, 6, 7, 9, 6, 7, 11, Blocks.sandstone.getState(), Blocks.sandstone.getState(), false); this.fillWithBlocks(worldIn, structureBoundingBoxIn, this.scatteredFeatureSizeX - 7, 7, 9, this.scatteredFeatureSizeX - 7, 7, 11, Blocks.sandstone.getState(), Blocks.sandstone.getState(), false); - this.fillWithBlocks(worldIn, structureBoundingBoxIn, 5, 5, 9, 5, 7, 11, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.getMetadata()), Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.getMetadata()), false); - this.fillWithBlocks(worldIn, structureBoundingBoxIn, this.scatteredFeatureSizeX - 6, 5, 9, this.scatteredFeatureSizeX - 6, 7, 11, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.getMetadata()), Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.getMetadata()), false); + this.fillWithBlocks(worldIn, structureBoundingBoxIn, 5, 5, 9, 5, 7, 11, Blocks.smooth_sandstone.getState(), Blocks.smooth_sandstone.getState(), false); + this.fillWithBlocks(worldIn, structureBoundingBoxIn, this.scatteredFeatureSizeX - 6, 5, 9, this.scatteredFeatureSizeX - 6, 7, 11, Blocks.smooth_sandstone.getState(), Blocks.smooth_sandstone.getState(), false); this.setBlockState(worldIn, Blocks.air.getState(), 5, 5, 10, structureBoundingBoxIn); this.setBlockState(worldIn, Blocks.air.getState(), 5, 6, 10, structureBoundingBoxIn); this.setBlockState(worldIn, Blocks.air.getState(), 6, 6, 10, structureBoundingBoxIn); @@ -146,10 +145,10 @@ public class StructureScattered for (int k1 = 5; k1 <= 17; k1 += 2) { - this.setBlockState(worldIn, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.getMetadata()), 4, 1, k1, structureBoundingBoxIn); - this.setBlockState(worldIn, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.CHISELED.getMetadata()), 4, 2, k1, structureBoundingBoxIn); - this.setBlockState(worldIn, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.getMetadata()), this.scatteredFeatureSizeX - 5, 1, k1, structureBoundingBoxIn); - this.setBlockState(worldIn, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.CHISELED.getMetadata()), this.scatteredFeatureSizeX - 5, 2, k1, structureBoundingBoxIn); + this.setBlockState(worldIn, Blocks.smooth_sandstone.getState(), 4, 1, k1, structureBoundingBoxIn); + this.setBlockState(worldIn, Blocks.carved_sandstone.getState(), 4, 2, k1, structureBoundingBoxIn); + this.setBlockState(worldIn, Blocks.smooth_sandstone.getState(), this.scatteredFeatureSizeX - 5, 1, k1, structureBoundingBoxIn); + this.setBlockState(worldIn, Blocks.carved_sandstone.getState(), this.scatteredFeatureSizeX - 5, 2, k1, structureBoundingBoxIn); } this.setBlockState(worldIn, Blocks.orange_clay.getState(), 10, 0, 7, structureBoundingBoxIn); @@ -168,83 +167,83 @@ public class StructureScattered for (int j3 = 0; j3 <= this.scatteredFeatureSizeX - 1; j3 += this.scatteredFeatureSizeX - 1) { - this.setBlockState(worldIn, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.getMetadata()), j3, 2, 1, structureBoundingBoxIn); + this.setBlockState(worldIn, Blocks.smooth_sandstone.getState(), j3, 2, 1, structureBoundingBoxIn); this.setBlockState(worldIn, Blocks.orange_clay.getState(), j3, 2, 2, structureBoundingBoxIn); - this.setBlockState(worldIn, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.getMetadata()), j3, 2, 3, structureBoundingBoxIn); - this.setBlockState(worldIn, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.getMetadata()), j3, 3, 1, structureBoundingBoxIn); + this.setBlockState(worldIn, Blocks.smooth_sandstone.getState(), j3, 2, 3, structureBoundingBoxIn); + this.setBlockState(worldIn, Blocks.smooth_sandstone.getState(), j3, 3, 1, structureBoundingBoxIn); this.setBlockState(worldIn, Blocks.orange_clay.getState(), j3, 3, 2, structureBoundingBoxIn); - this.setBlockState(worldIn, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.getMetadata()), j3, 3, 3, structureBoundingBoxIn); + this.setBlockState(worldIn, Blocks.smooth_sandstone.getState(), j3, 3, 3, structureBoundingBoxIn); this.setBlockState(worldIn, Blocks.orange_clay.getState(), j3, 4, 1, structureBoundingBoxIn); - this.setBlockState(worldIn, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.CHISELED.getMetadata()), j3, 4, 2, structureBoundingBoxIn); + this.setBlockState(worldIn, Blocks.carved_sandstone.getState(), j3, 4, 2, structureBoundingBoxIn); this.setBlockState(worldIn, Blocks.orange_clay.getState(), j3, 4, 3, structureBoundingBoxIn); - this.setBlockState(worldIn, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.getMetadata()), j3, 5, 1, structureBoundingBoxIn); + this.setBlockState(worldIn, Blocks.smooth_sandstone.getState(), j3, 5, 1, structureBoundingBoxIn); this.setBlockState(worldIn, Blocks.orange_clay.getState(), j3, 5, 2, structureBoundingBoxIn); - this.setBlockState(worldIn, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.getMetadata()), j3, 5, 3, structureBoundingBoxIn); + this.setBlockState(worldIn, Blocks.smooth_sandstone.getState(), j3, 5, 3, structureBoundingBoxIn); this.setBlockState(worldIn, Blocks.orange_clay.getState(), j3, 6, 1, structureBoundingBoxIn); - this.setBlockState(worldIn, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.CHISELED.getMetadata()), j3, 6, 2, structureBoundingBoxIn); + this.setBlockState(worldIn, Blocks.carved_sandstone.getState(), j3, 6, 2, structureBoundingBoxIn); this.setBlockState(worldIn, Blocks.orange_clay.getState(), j3, 6, 3, structureBoundingBoxIn); this.setBlockState(worldIn, Blocks.orange_clay.getState(), j3, 7, 1, structureBoundingBoxIn); this.setBlockState(worldIn, Blocks.orange_clay.getState(), j3, 7, 2, structureBoundingBoxIn); this.setBlockState(worldIn, Blocks.orange_clay.getState(), j3, 7, 3, structureBoundingBoxIn); - this.setBlockState(worldIn, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.getMetadata()), j3, 8, 1, structureBoundingBoxIn); - this.setBlockState(worldIn, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.getMetadata()), j3, 8, 2, structureBoundingBoxIn); - this.setBlockState(worldIn, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.getMetadata()), j3, 8, 3, structureBoundingBoxIn); + this.setBlockState(worldIn, Blocks.smooth_sandstone.getState(), j3, 8, 1, structureBoundingBoxIn); + this.setBlockState(worldIn, Blocks.smooth_sandstone.getState(), j3, 8, 2, structureBoundingBoxIn); + this.setBlockState(worldIn, Blocks.smooth_sandstone.getState(), j3, 8, 3, structureBoundingBoxIn); } for (int k3 = 2; k3 <= this.scatteredFeatureSizeX - 3; k3 += this.scatteredFeatureSizeX - 3 - 2) { - this.setBlockState(worldIn, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.getMetadata()), k3 - 1, 2, 0, structureBoundingBoxIn); + this.setBlockState(worldIn, Blocks.smooth_sandstone.getState(), k3 - 1, 2, 0, structureBoundingBoxIn); this.setBlockState(worldIn, Blocks.orange_clay.getState(), k3, 2, 0, structureBoundingBoxIn); - this.setBlockState(worldIn, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.getMetadata()), k3 + 1, 2, 0, structureBoundingBoxIn); - this.setBlockState(worldIn, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.getMetadata()), k3 - 1, 3, 0, structureBoundingBoxIn); + this.setBlockState(worldIn, Blocks.smooth_sandstone.getState(), k3 + 1, 2, 0, structureBoundingBoxIn); + this.setBlockState(worldIn, Blocks.smooth_sandstone.getState(), k3 - 1, 3, 0, structureBoundingBoxIn); this.setBlockState(worldIn, Blocks.orange_clay.getState(), k3, 3, 0, structureBoundingBoxIn); - this.setBlockState(worldIn, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.getMetadata()), k3 + 1, 3, 0, structureBoundingBoxIn); + this.setBlockState(worldIn, Blocks.smooth_sandstone.getState(), k3 + 1, 3, 0, structureBoundingBoxIn); this.setBlockState(worldIn, Blocks.orange_clay.getState(), k3 - 1, 4, 0, structureBoundingBoxIn); - this.setBlockState(worldIn, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.CHISELED.getMetadata()), k3, 4, 0, structureBoundingBoxIn); + this.setBlockState(worldIn, Blocks.carved_sandstone.getState(), k3, 4, 0, structureBoundingBoxIn); this.setBlockState(worldIn, Blocks.orange_clay.getState(), k3 + 1, 4, 0, structureBoundingBoxIn); - this.setBlockState(worldIn, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.getMetadata()), k3 - 1, 5, 0, structureBoundingBoxIn); + this.setBlockState(worldIn, Blocks.smooth_sandstone.getState(), k3 - 1, 5, 0, structureBoundingBoxIn); this.setBlockState(worldIn, Blocks.orange_clay.getState(), k3, 5, 0, structureBoundingBoxIn); - this.setBlockState(worldIn, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.getMetadata()), k3 + 1, 5, 0, structureBoundingBoxIn); + this.setBlockState(worldIn, Blocks.smooth_sandstone.getState(), k3 + 1, 5, 0, structureBoundingBoxIn); this.setBlockState(worldIn, Blocks.orange_clay.getState(), k3 - 1, 6, 0, structureBoundingBoxIn); - this.setBlockState(worldIn, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.CHISELED.getMetadata()), k3, 6, 0, structureBoundingBoxIn); + this.setBlockState(worldIn, Blocks.carved_sandstone.getState(), k3, 6, 0, structureBoundingBoxIn); this.setBlockState(worldIn, Blocks.orange_clay.getState(), k3 + 1, 6, 0, structureBoundingBoxIn); this.setBlockState(worldIn, Blocks.orange_clay.getState(), k3 - 1, 7, 0, structureBoundingBoxIn); this.setBlockState(worldIn, Blocks.orange_clay.getState(), k3, 7, 0, structureBoundingBoxIn); this.setBlockState(worldIn, Blocks.orange_clay.getState(), k3 + 1, 7, 0, structureBoundingBoxIn); - this.setBlockState(worldIn, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.getMetadata()), k3 - 1, 8, 0, structureBoundingBoxIn); - this.setBlockState(worldIn, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.getMetadata()), k3, 8, 0, structureBoundingBoxIn); - this.setBlockState(worldIn, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.getMetadata()), k3 + 1, 8, 0, structureBoundingBoxIn); + this.setBlockState(worldIn, Blocks.smooth_sandstone.getState(), k3 - 1, 8, 0, structureBoundingBoxIn); + this.setBlockState(worldIn, Blocks.smooth_sandstone.getState(), k3, 8, 0, structureBoundingBoxIn); + this.setBlockState(worldIn, Blocks.smooth_sandstone.getState(), k3 + 1, 8, 0, structureBoundingBoxIn); } - this.fillWithBlocks(worldIn, structureBoundingBoxIn, 8, 4, 0, 12, 6, 0, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.getMetadata()), Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.getMetadata()), false); + this.fillWithBlocks(worldIn, structureBoundingBoxIn, 8, 4, 0, 12, 6, 0, Blocks.smooth_sandstone.getState(), Blocks.smooth_sandstone.getState(), false); this.setBlockState(worldIn, Blocks.air.getState(), 8, 6, 0, structureBoundingBoxIn); this.setBlockState(worldIn, Blocks.air.getState(), 12, 6, 0, structureBoundingBoxIn); this.setBlockState(worldIn, Blocks.orange_clay.getState(), 9, 5, 0, structureBoundingBoxIn); - this.setBlockState(worldIn, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.CHISELED.getMetadata()), 10, 5, 0, structureBoundingBoxIn); + this.setBlockState(worldIn, Blocks.carved_sandstone.getState(), 10, 5, 0, structureBoundingBoxIn); this.setBlockState(worldIn, Blocks.orange_clay.getState(), 11, 5, 0, structureBoundingBoxIn); - this.fillWithBlocks(worldIn, structureBoundingBoxIn, 8, -14, 8, 12, -11, 12, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.getMetadata()), Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.getMetadata()), false); - this.fillWithBlocks(worldIn, structureBoundingBoxIn, 8, -10, 8, 12, -10, 12, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.CHISELED.getMetadata()), Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.CHISELED.getMetadata()), false); - this.fillWithBlocks(worldIn, structureBoundingBoxIn, 8, -9, 8, 12, -9, 12, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.getMetadata()), Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.getMetadata()), false); + this.fillWithBlocks(worldIn, structureBoundingBoxIn, 8, -14, 8, 12, -11, 12, Blocks.smooth_sandstone.getState(), Blocks.smooth_sandstone.getState(), false); + this.fillWithBlocks(worldIn, structureBoundingBoxIn, 8, -10, 8, 12, -10, 12, Blocks.carved_sandstone.getState(), Blocks.carved_sandstone.getState(), false); + this.fillWithBlocks(worldIn, structureBoundingBoxIn, 8, -9, 8, 12, -9, 12, Blocks.smooth_sandstone.getState(), Blocks.smooth_sandstone.getState(), false); this.fillWithBlocks(worldIn, structureBoundingBoxIn, 8, -8, 8, 12, -1, 12, Blocks.sandstone.getState(), Blocks.sandstone.getState(), false); this.fillWithBlocks(worldIn, structureBoundingBoxIn, 9, -11, 9, 11, -1, 11, Blocks.air.getState(), Blocks.air.getState(), false); this.setBlockState(worldIn, Blocks.stone_pressure_plate.getState(), 10, -11, 10, structureBoundingBoxIn); this.fillWithBlocks(worldIn, structureBoundingBoxIn, 9, -13, 9, 11, -13, 11, Blocks.tnt.getState(), Blocks.air.getState(), false); this.setBlockState(worldIn, Blocks.air.getState(), 8, -11, 10, structureBoundingBoxIn); this.setBlockState(worldIn, Blocks.air.getState(), 8, -10, 10, structureBoundingBoxIn); - this.setBlockState(worldIn, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.CHISELED.getMetadata()), 7, -10, 10, structureBoundingBoxIn); - this.setBlockState(worldIn, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.getMetadata()), 7, -11, 10, structureBoundingBoxIn); + this.setBlockState(worldIn, Blocks.carved_sandstone.getState(), 7, -10, 10, structureBoundingBoxIn); + this.setBlockState(worldIn, Blocks.smooth_sandstone.getState(), 7, -11, 10, structureBoundingBoxIn); this.setBlockState(worldIn, Blocks.air.getState(), 12, -11, 10, structureBoundingBoxIn); this.setBlockState(worldIn, Blocks.air.getState(), 12, -10, 10, structureBoundingBoxIn); - this.setBlockState(worldIn, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.CHISELED.getMetadata()), 13, -10, 10, structureBoundingBoxIn); - this.setBlockState(worldIn, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.getMetadata()), 13, -11, 10, structureBoundingBoxIn); + this.setBlockState(worldIn, Blocks.carved_sandstone.getState(), 13, -10, 10, structureBoundingBoxIn); + this.setBlockState(worldIn, Blocks.smooth_sandstone.getState(), 13, -11, 10, structureBoundingBoxIn); this.setBlockState(worldIn, Blocks.air.getState(), 10, -11, 8, structureBoundingBoxIn); this.setBlockState(worldIn, Blocks.air.getState(), 10, -10, 8, structureBoundingBoxIn); - this.setBlockState(worldIn, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.CHISELED.getMetadata()), 10, -10, 7, structureBoundingBoxIn); - this.setBlockState(worldIn, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.getMetadata()), 10, -11, 7, structureBoundingBoxIn); + this.setBlockState(worldIn, Blocks.carved_sandstone.getState(), 10, -10, 7, structureBoundingBoxIn); + this.setBlockState(worldIn, Blocks.smooth_sandstone.getState(), 10, -11, 7, structureBoundingBoxIn); this.setBlockState(worldIn, Blocks.air.getState(), 10, -11, 12, structureBoundingBoxIn); this.setBlockState(worldIn, Blocks.air.getState(), 10, -10, 12, structureBoundingBoxIn); - this.setBlockState(worldIn, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.CHISELED.getMetadata()), 10, -10, 13, structureBoundingBoxIn); - this.setBlockState(worldIn, Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.getMetadata()), 10, -11, 13, structureBoundingBoxIn); + this.setBlockState(worldIn, Blocks.carved_sandstone.getState(), 10, -10, 13, structureBoundingBoxIn); + this.setBlockState(worldIn, Blocks.smooth_sandstone.getState(), 10, -11, 13, structureBoundingBoxIn); for (Facing enumfacing : Facing.Plane.HORIZONTAL) { diff --git a/server/src/main/java/server/worldgen/structure/StructureStronghold.java b/server/src/main/java/server/worldgen/structure/StructureStronghold.java index ba604729..e2ceef52 100755 --- a/server/src/main/java/server/worldgen/structure/StructureStronghold.java +++ b/server/src/main/java/server/worldgen/structure/StructureStronghold.java @@ -4,7 +4,6 @@ import java.util.List; import java.util.Map; import common.block.artificial.BlockSlab; -import common.block.artificial.BlockStoneBrick; import common.collect.Lists; import common.collect.Maps; import common.entity.npc.EntityHaunter; diff --git a/server/src/main/java/server/worldgen/structure/StructureVillage.java b/server/src/main/java/server/worldgen/structure/StructureVillage.java index d88fb768..6b275e7a 100755 --- a/server/src/main/java/server/worldgen/structure/StructureVillage.java +++ b/server/src/main/java/server/worldgen/structure/StructureVillage.java @@ -1643,12 +1643,12 @@ public class StructureVillage if (p_175847_1_.getBlock() == Blocks.cobblestone) { - return Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.DEFAULT.getMetadata()); + return Blocks.sandstone.getState(); } if (p_175847_1_.getBlock() == Blocks.oak_planks) { - return Blocks.sandstone.getStateFromMeta(BlockSandStone.EnumType.SMOOTH.getMetadata()); + return Blocks.smooth_sandstone.getState(); } if (p_175847_1_.getBlock() == Blocks.oak_stairs) diff --git a/server/src/main/java/server/worldgen/tree/WorldGenPine.java b/server/src/main/java/server/worldgen/tree/WorldGenPine.java index 9f424a93..c48176c7 100755 --- a/server/src/main/java/server/worldgen/tree/WorldGenPine.java +++ b/server/src/main/java/server/worldgen/tree/WorldGenPine.java @@ -2,7 +2,6 @@ package server.worldgen.tree; import common.block.Block; import common.block.Material; -import common.block.natural.BlockDirt; import common.init.Blocks; import common.init.WoodType; import common.rng.Random;