sen/tcr
sen/tcr
1
0
Fork 0
Code Issues Pull requests Activity

block cleanup #10

Browse source
This commit is contained in:
Sen 2025-06-21 19:59:52 +02:00
parent 18d4ea7167
commit 518300e68f
Signed by: sen
GPG key ID: 3AC50A6F47D1B722
23 changed files with 541 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

2
server/src/main/java/server/biome/BiomeJungle.java
View file

@ -62,7 +62,7 @@ public class BiomeJungle extends GenBiome
*/
public FeatureGenerator getRandomWorldGenForGrass(Random rand)
{
return rand.chance(4) ? new WorldGenTallGrass(Blocks.large_fern) : new WorldGenTallGrass(Blocks.tallgrass);
return rand.chance(4) ? new WorldGenTallGrass(Blocks.fern) : new WorldGenTallGrass(Blocks.tallgrass);
}
public void decorate(WorldServer worldIn, Random rand, BlockPos pos)

18
server/src/main/java/server/clipboard/ReorderRegistry.java
View file

@ -7,8 +7,10 @@ import java.util.Set;
import common.block.Block;
import common.block.artificial.BlockBed;
import common.block.artificial.BlockCarpet;
import common.block.artificial.BlockDoor;
import common.block.artificial.BlockFlowerPot;
import common.block.foliage.BlockDoublePlant;
import common.block.foliage.BlockFlower;
import common.color.DyeColor;
import common.init.BlockRegistry;
@ -98,8 +100,12 @@ public abstract class ReorderRegistry {
PLACE_LAST.add(Blocks.powered_comparator);
PLACE_LAST.add(Blocks.activator_rail);
PLACE_LAST.add(Blocks.iron_trapdoor);
PLACE_LAST.add(Blocks.carpet);
PLACE_LAST.add(Blocks.double_plant);
for(BlockCarpet block : BlockCarpet.CARPETS) {
PLACE_LAST.add(block);
}
for(BlockDoublePlant block : BlockDoublePlant.PLANTS) {
PLACE_LAST.add(block);
}
PLACE_LAST.add(Blocks.daylight_detector_inverted);
// shouldPlaceLast.add(Blocks.daylight_detector);
PLACE_LAST.add(Blocks.blue_mushroom);
@ -213,8 +219,12 @@ public abstract class ReorderRegistry {
addAttach(Blocks.heavy_weighted_pressure_plate, Facing.DOWN);
addAttach(Blocks.comparator, Facing.DOWN);
addAttach(Blocks.powered_comparator, Facing.DOWN);
addAttach(Blocks.carpet, Facing.DOWN);
addAttach(Blocks.double_plant, Facing.DOWN);
for(BlockCarpet block : BlockCarpet.CARPETS) {
addAttach(block, Facing.DOWN);
}
for(BlockDoublePlant block : BlockDoublePlant.PLANTS) {
addAttach(block, Facing.DOWN);
}
addAttach(Blocks.banner, Facing.DOWN);
addCardinals(Blocks.wall_banner, 4, 2, 5, 3);
addAttach(Blocks.oak_door, Facing.DOWN);

6
server/src/main/java/server/worldgen/structure/StructureScattered.java
View file

@ -551,9 +551,9 @@ public class StructureScattered
this.setBlockState(worldIn, Blocks.mossy_cobblestone.getState(), 8, -3, 5, structureBoundingBoxIn);
this.fillWithRandomizedBlocks(worldIn, structureBoundingBoxIn, 9, -1, 1, 9, -1, 5, false, randomIn, junglePyramidsRandomScatteredStones);
this.fillWithAir(worldIn, structureBoundingBoxIn, 8, -3, 8, 10, -1, 10);
this.setBlockState(worldIn, Blocks.stonebrick_chiseled.getState(), 8, -2, 11, structureBoundingBoxIn);
this.setBlockState(worldIn, Blocks.stonebrick_chiseled.getState(), 9, -2, 11, structureBoundingBoxIn);
this.setBlockState(worldIn, Blocks.stonebrick_chiseled.getState(), 10, -2, 11, structureBoundingBoxIn);
this.setBlockState(worldIn, Blocks.carved_stonebrick.getState(), 8, -2, 11, structureBoundingBoxIn);
this.setBlockState(worldIn, Blocks.carved_stonebrick.getState(), 9, -2, 11, structureBoundingBoxIn);
this.setBlockState(worldIn, Blocks.carved_stonebrick.getState(), 10, -2, 11, structureBoundingBoxIn);
this.setBlockState(worldIn, Blocks.lever.getStateFromMeta(BlockLever.getMetadataForFacing(Facing.getFront(this.getMetadataWithOffset(Blocks.lever, Facing.NORTH.getIndex())))), 8, -2, 12, structureBoundingBoxIn);
this.setBlockState(worldIn, Blocks.lever.getStateFromMeta(BlockLever.getMetadataForFacing(Facing.getFront(this.getMetadataWithOffset(Blocks.lever, Facing.NORTH.getIndex())))), 9, -2, 12, structureBoundingBoxIn);
this.setBlockState(worldIn, Blocks.lever.getStateFromMeta(BlockLever.getMetadataForFacing(Facing.getFront(this.getMetadataWithOffset(Blocks.lever, Facing.NORTH.getIndex())))), 10, -2, 12, structureBoundingBoxIn);

4
server/src/main/java/server/worldgen/structure/StructureStronghold.java
View file

@ -1348,11 +1348,11 @@ public class StructureStronghold
if (f < 0.2F)
{
this.blockstate = Blocks.stonebrick_cracked.getState();
this.blockstate = Blocks.cracked_stonebrick.getState();
}
else if (f < 0.5F)
{
this.blockstate = Blocks.stonebrick_mossy.getState();
this.blockstate = Blocks.mossy_stonebrick.getState();
}
// else if (f < 0.55F)
// {

2
server/src/main/java/server/worldgen/structure/StructureVillage.java
View file

@ -1477,7 +1477,7 @@ public class StructureVillage
this.setBlockState(worldIn, Blocks.oak_fence.getState(), 1, 0, 0, structureBoundingBoxIn);
this.setBlockState(worldIn, Blocks.oak_fence.getState(), 1, 1, 0, structureBoundingBoxIn);
this.setBlockState(worldIn, Blocks.oak_fence.getState(), 1, 2, 0, structureBoundingBoxIn);
this.setBlockState(worldIn, Blocks.wool.getStateFromMeta(DyeColor.WHITE.getDyeDamage()), 1, 3, 0, structureBoundingBoxIn);
this.setBlockState(worldIn, Blocks.white_wool.getState(), 1, 3, 0, structureBoundingBoxIn);
boolean flag = this.coordBaseMode == Facing.EAST || this.coordBaseMode == Facing.NORTH;
this.setBlockState(worldIn, Blocks.torch.getState().withProperty(BlockTorch.FACING, this.coordBaseMode.rotateY()), flag ? 2 : 0, 3, 0, structureBoundingBoxIn);
this.setBlockState(worldIn, Blocks.torch.getState().withProperty(BlockTorch.FACING, this.coordBaseMode), 1, 3, 1, structureBoundingBoxIn);