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

add slabs and stairs

Browse source
This commit is contained in:
Sen 2025-08-04 11:33:17 +02:00
parent e115ca1707
commit c27619e538
Signed by: sen
GPG key ID: 3AC50A6F47D1B722
51 changed files with 364 additions and 423 deletions
Download patch file Download diff file Expand all files Collapse all files

2
server/src/main/java/server/init/UniverseRegistry.java
View file

@ -501,6 +501,8 @@ public abstract class UniverseRegistry extends DimensionRegistry {
// public static final WeightedList<RngSpawn> MAGEHUT_MOBS = new WeightedList<RngSpawn>(new RngSpawn(EntityMage.class, 1, 1, 1));
// public static final WeightedList<RngSpawn> FORTRESS_MOBS = new WeightedList<RngSpawn>(new RngSpawn(EntityDarkMage.class, 10, 2, 3),
// new RngSpawn(EntityTiefling.class, 5, 4, 4), new RngSpawn(EntityUndead.class, 10, 4, 4));
// addOre(Blocks.cheese.getState(), 8, 8, 12, 24, 52, false)
public static void register() { // TODO: add mushroom 0.2F, 0.3F .addSpawn(EntityDwarf.class, 8, 4, 8)
register("space", "Der Weltraum", Space.INSTANCE);

10
server/src/main/java/server/world/Converter.java
View file

@ -49,7 +49,7 @@ import common.block.foliage.BlockPotato;
import common.block.foliage.BlockReed;
import common.block.foliage.BlockStem;
import common.block.foliage.BlockVine;
import common.block.foliage.BlockWart;
import common.block.foliage.BlockSoulGrass;
import common.block.liquid.BlockLiquid;
import common.block.natural.BlockColoredClay;
import common.block.natural.BlockFire;
@ -938,10 +938,10 @@ public abstract class Converter {
mapBlock(Blocks.blood_brick_stairs.getState().withProperty(BlockStairs.FACING, Facing.WEST).withProperty(BlockStairs.HALF, EnumHalf.TOP), 114, 5, 13);
mapBlock(Blocks.blood_brick_stairs.getState().withProperty(BlockStairs.FACING, Facing.SOUTH).withProperty(BlockStairs.HALF, EnumHalf.TOP), 114, 6, 14);
mapBlock(Blocks.blood_brick_stairs.getState().withProperty(BlockStairs.FACING, Facing.NORTH).withProperty(BlockStairs.HALF, EnumHalf.TOP), 114, 7, 15);
mapBlock(Blocks.soul_grass.getState().withProperty(BlockWart.AGE, 0), 115);
mapBlock(Blocks.soul_grass.getState().withProperty(BlockWart.AGE, 1), 115, 1);
mapBlock(Blocks.soul_grass.getState().withProperty(BlockWart.AGE, 2), 115, 2);
mapBlock(Blocks.soul_grass.getState().withProperty(BlockWart.AGE, 3), 115, 3);
mapBlock(Blocks.soul_grass.getState().withProperty(BlockSoulGrass.AGE, 0), 115);
mapBlock(Blocks.soul_grass.getState().withProperty(BlockSoulGrass.AGE, 1), 115, 1);
mapBlock(Blocks.soul_grass.getState().withProperty(BlockSoulGrass.AGE, 2), 115, 2);
mapBlock(Blocks.soul_grass.getState().withProperty(BlockSoulGrass.AGE, 3), 115, 3);
mapBlock(Blocks.enchanting_table, 116);
mapBlock(Blocks.brewing_stand, 117);
mapBlock(Blocks.cauldron.getState().withProperty(BlockCauldron.LEVEL, 0), 118);

2
server/src/main/java/server/world/WorldServer.java
View file

@ -2580,7 +2580,7 @@ public final class WorldServer extends AWorldServer {
break;
case TIAN:
worldgenerator = new WorldGenBigTree(true, Blocks.tian_log.getState(), WoodType.TIAN)
worldgenerator = new WorldGenBigTree(true, Blocks.tian_wood_log.getState(), WoodType.TIAN)
.setHeightLimit(6, 20);
break;

2
server/src/main/java/server/worldgen/populator/PopulatorBlackened.java
View file

@ -9,7 +9,7 @@ import server.worldgen.tree.WorldGenBaseTree;
import server.worldgen.tree.WorldGenTree;
public class PopulatorBlackened extends PopulatorBasic {
protected final WorldGenTree treeGen = new WorldGenBaseTree(false, Blocks.blackwood_log.getState(), WoodType.BLACKWOOD);
protected final WorldGenTree treeGen = new WorldGenBaseTree(false, Blocks.black_wood_log.getState(), WoodType.BLACKWOOD);
public PopulatorBlackened() {
this.treesPerChunk = 3;

15
server/src/main/java/server/worldgen/populator/PopulatorCheese.java
View file

@ -1,15 +0,0 @@
package server.worldgen.populator;
import common.init.Blocks;
import common.rng.Random;
import common.util.BlockPos;
import server.world.WorldServer;
import server.worldgen.FeatureOres;
public class PopulatorCheese extends PopulatorBasic {
private FeatureOres cheeseGenerator = new FeatureOres(Blocks.moon_cheese.getState(), 8, 8, 12, 24, 52, false);
public void decorate(WorldServer worldIn, Random rand, BlockPos pos) {
this.cheeseGenerator.generate(worldIn, rand, pos);
}
}

8
server/src/main/java/server/worldgen/populator/PopulatorTian.java
View file

@ -17,12 +17,12 @@ public class PopulatorTian extends PopulatorBasic
{
protected FeatureGenerator spikeGen = new WorldGenSpikes(Blocks.tian_soil, 128, 2, 3, Blocks.obsidian.getState(), true);
protected FeatureGenerator mushroomBlueGen = new WorldGenMushroom(Blocks.blue_mushroom);
protected WorldGenTree treeGen1 = new WorldGenBigTree(false, Blocks.tian_log.getState(), WoodType.TIAN)
protected WorldGenTree treeGen1 = new WorldGenBigTree(false, Blocks.tian_wood_log.getState(), WoodType.TIAN)
.setHeightLimit(6, 8);
protected WorldGenTree treeGen2 = new WorldGenBigTree(false, Blocks.tian_log.getState(), WoodType.TIAN)
protected WorldGenTree treeGen2 = new WorldGenBigTree(false, Blocks.tian_wood_log.getState(), WoodType.TIAN)
.setHeightLimit(14, 20);
protected WorldGenTree treeGen3 = new WorldGenBaseTree(false, Blocks.tian_log.getState(), WoodType.TIAN);
protected WorldGenTree treeGen4 = new WorldGenBigTree(false, Blocks.tian_log.getState(), WoodType.TIAN)
protected WorldGenTree treeGen3 = new WorldGenBaseTree(false, Blocks.tian_wood_log.getState(), WoodType.TIAN);
protected WorldGenTree treeGen4 = new WorldGenBigTree(false, Blocks.tian_wood_log.getState(), WoodType.TIAN)
.setHeightLimit(12, 15);
public PopulatorTian()