Some tree blocks (WIP)

src/main/java/ru/betterend/blocks/BlockProperties.java

@@ -16,6 +16,7 @@ public class BlockProperties {
 	public static final IntProperty ROTATION = IntProperty.of("rotation", 0, 3);
 	public static final BooleanProperty NATURAL = BooleanProperty.of("natural");
 	public static final IntProperty FULLNESS = IntProperty.of("fullness", 0, 3);
+	public static final IntProperty COLOR = IntProperty.of("color", 0, 7);
 	
 	public static enum TripleShape implements StringIdentifiable {
 		TOP("top"),

src/main/java/ru/betterend/blocks/CapsacisCapBlock.java

@@ -0,0 +1,35 @@
+package ru.betterend.blocks;
+
+import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.Blocks;
+import net.minecraft.block.MaterialColor;
+import net.minecraft.item.ItemPlacementContext;
+import net.minecraft.state.StateManager;
+import net.minecraft.state.property.IntProperty;
+import ru.betterend.blocks.basis.BaseBlock;
+import ru.betterend.noise.OpenSimplexNoise;
+import ru.betterend.util.MHelper;
+
+public class CapsacisCapBlock extends BaseBlock {
+	public static final IntProperty COLOR = IntProperty.of("color", 0, 7);
+	private static final OpenSimplexNoise NOISE = new OpenSimplexNoise(0);
+	
+	public CapsacisCapBlock(MaterialColor color) {
+		super(FabricBlockSettings.copyOf(Blocks.NETHER_WART_BLOCK).materialColor(color));
+	}
+	
+	@Override
+	public BlockState getPlacementState(ItemPlacementContext ctx) {
+		double px = ctx.getBlockPos().getX() * 0.1;
+		double py = ctx.getBlockPos().getY() * 0.1;
+		double pz = ctx.getBlockPos().getZ() * 0.1;
+		return this.getDefaultState().with(COLOR, MHelper.floor(NOISE.eval(px, py, pz) * 3.5 + 4));
+	}
+	
+	@Override
+	protected void appendProperties(StateManager.Builder<Block, BlockState> stateManager) {
+		stateManager.add(COLOR);
+	}
+}

src/main/java/ru/betterend/blocks/HelixTreeLeavesBlock.java

@@ -30,7 +30,7 @@ import ru.betterend.registry.EndBlocks;
 import ru.betterend.util.MHelper;
 
 public class HelixTreeLeavesBlock extends BaseBlock implements IColorProvider {
-	public static final IntProperty COLOR = IntProperty.of("color", 0, 7);
+	public static final IntProperty COLOR = BlockProperties.COLOR;
 	private static final OpenSimplexNoise NOISE = new OpenSimplexNoise(0);
 	
 	public HelixTreeLeavesBlock() {

src/main/java/ru/betterend/blocks/JellyshroomCapBlock.java

@@ -30,7 +30,7 @@ import ru.betterend.patterns.Patterns;
 import ru.betterend.util.MHelper;
 
 public class JellyshroomCapBlock extends SlimeBlock implements IRenderTypeable, BlockPatterned, IColorProvider {
-	public static final IntProperty COLOR = IntProperty.of("color", 0, 7);
+	public static final IntProperty COLOR = BlockProperties.COLOR;
 	private static final OpenSimplexNoise NOISE = new OpenSimplexNoise(0);
 	private final Vec3i colorStart;
 	private final Vec3i colorEnd;

src/main/java/ru/betterend/blocks/UmbrellaTreeMembraneBlock.java

@@ -32,7 +32,7 @@ import ru.betterend.registry.EndBlocks;
 import ru.betterend.util.MHelper;
 
 public class UmbrellaTreeMembraneBlock extends SlimeBlock implements IRenderTypeable, BlockPatterned {
-	public static final IntProperty COLOR = IntProperty.of("color", 0, 7);
+	public static final IntProperty COLOR = BlockProperties.COLOR;
 	private static final OpenSimplexNoise NOISE = new OpenSimplexNoise(0);
 	
 	public UmbrellaTreeMembraneBlock() {

src/main/java/ru/betterend/registry/EndBlocks.java

@@ -20,6 +20,7 @@ import ru.betterend.blocks.BulbVineBlock;
 import ru.betterend.blocks.BulbVineLanternBlock;
 import ru.betterend.blocks.BulbVineLanternColoredBlock;
 import ru.betterend.blocks.BulbVineSeedBlock;
+import ru.betterend.blocks.CapsacisCapBlock;
 import ru.betterend.blocks.CharniaBlock;
 import ru.betterend.blocks.ChorusGrassBlock;
 import ru.betterend.blocks.DenseEmeraldIceBlock;
@@ -192,6 +193,24 @@ public class EndBlocks {
 	public static final Block JELLYSHROOM_CAP_PURPLE = registerBlock("jellyshroom_cap_purple", new JellyshroomCapBlock(217, 142, 255, 164, 0, 255));
 	public static final WoodenMaterial JELLYSHROOM = new WoodenMaterial("jellyshroom", MaterialColor.PURPLE, MaterialColor.LIGHT_BLUE);
 	
+	// Tree from original concept (+ modifications)
+	public static final Block CAPSACIS_SAPLING = registerBlock("capsacis_sapling", new UmbrellaTreeSaplingBlock());
+	public static final Block CAPSACIS_CAP_BLACK = registerBlock("capsacis_cap_black", new CapsacisCapBlock(MaterialColor.BLACK));
+	public static final Block CAPSACIS_CAP_WHITE = registerBlock("capsacis_cap_white", new CapsacisCapBlock(MaterialColor.WHITE));
+	public static final Block CAPSACIS_CAP_MAGENTA = registerBlock("capsacis_cap_magenta", new CapsacisCapBlock(MaterialColor.MAGENTA));
+	public static final WoodenMaterial CAPSACIS = new WoodenMaterial("capsacis", MaterialColor.PURPLE, MaterialColor.LIGHT_BLUE);
+	
+	// Small ecosystem tree
+	public static final WoodenMaterial INANIS = new WoodenMaterial("inanis", MaterialColor.PURPLE, MaterialColor.LIGHT_BLUE);
+	
+	// Tree from Yuki's ide
+	public static final Block CEMINUS_SAPLING = registerBlock("ceminus_sapling", new UmbrellaTreeSaplingBlock());
+	public static final Block CEMINUS_GRID = registerBlock("ceminus_grid", new UmbrellaTreeMembraneBlock());
+	public static final WoodenMaterial CEMINUS = new WoodenMaterial("ceminus", MaterialColor.PURPLE, MaterialColor.LIGHT_BLUE);
+	
+	// For megacolonies
+	public static final Block VOID_COLONY_MEMBRANE = registerBlock("void_colony_membrane", new UmbrellaTreeMembraneBlock());
+	
 	// Small Plants //
 	public static final Block UMBRELLA_MOSS = registerBlock("umbrella_moss", new UmbrellaMossBlock());
 	public static final Block UMBRELLA_MOSS_TALL = registerBlock("umbrella_moss_tall", new UmbrellaMossTallBlock());