PixelGuys · tillpp · Nov 11, 2025 · Nov 11, 2025 · Nov 11, 2025 · Nov 11, 2025
diff --git a/assets/cubyz/blocks/baobab_branch.zig.zon b/assets/cubyz/blocks/baobab_branch.zig.zon
@@ -1,5 +1,8 @@
 .{
-	.tags = .{.choppable, .wood},
+	.tags = .{.choppable, .wood, .branch},
+	.onUpdate = .{
+		.type = .Decay,
+	},
 	.blockHealth = 4,
 	.drops = .{
 		.{.items = .{.auto}},

diff --git a/assets/cubyz/blocks/baobab_log.zig.zon b/assets/cubyz/blocks/baobab_log.zig.zon
@@ -1,5 +1,5 @@
 .{
-	.tags = .{.choppable, .wood},
+	.tags = .{.choppable, .wood, .log},
 	.blockHealth = 8,
 	.drops = .{
 		.{.items = .{"cubyz:log/baobab"}},

diff --git a/assets/cubyz/blocks/baobab_top.zig.zon b/assets/cubyz/blocks/baobab_top.zig.zon
@@ -1,5 +1,5 @@
 .{
-	.tags = .{.choppable, .wood},
+	.tags = .{.choppable, .wood, .log},
 	.blockHealth = 8,
 	.drops = .{
 		.{.items = .{"cubyz:log/baobab"}},

diff --git a/assets/cubyz/blocks/birch_branch.zig.zon b/assets/cubyz/blocks/birch_branch.zig.zon
@@ -1,5 +1,8 @@
 .{
-	.tags = .{.choppable, .wood},
+	.tags = .{.choppable, .wood, .branch},
+	.onUpdate = .{
+		.type = .Decay,
+	},
 	.blockHealth = 4,
 	.drops = .{
 		.{.items = .{.auto}},

diff --git a/assets/cubyz/blocks/birch_log.zig.zon b/assets/cubyz/blocks/birch_log.zig.zon
@@ -1,5 +1,5 @@
 .{
-	.tags = .{.choppable, .wood},
+	.tags = .{.choppable, .wood, .log},
 	.blockHealth = 8,
 	.drops = .{
 		.{.items = .{"cubyz:log/birch"}},

diff --git a/assets/cubyz/blocks/birch_top.zig.zon b/assets/cubyz/blocks/birch_top.zig.zon
@@ -1,5 +1,5 @@
 .{
-	.tags = .{.choppable, .wood},
+	.tags = .{.choppable, .wood, .log},
 	.blockHealth = 8,
 	.drops = .{
 		.{.items = .{"cubyz:log/birch"}},

diff --git a/assets/cubyz/blocks/bolete_branch.zig.zon b/assets/cubyz/blocks/bolete_branch.zig.zon
@@ -1,5 +1,8 @@
 .{
-	.tags = .{.choppable, .cuttable, .mushroom},
+	.tags = .{.choppable, .cuttable, .mushroom, .branch},
+	.onUpdate = .{
+		.type = .Decay,
+	},
 	.blockHealth = 2,
 	.drops = .{
 		.{.items = .{.auto}},

diff --git a/assets/cubyz/blocks/branch/leafy/_defaults.zig.zon b/assets/cubyz/blocks/branch/leafy/_defaults.zig.zon
@@ -1,5 +1,8 @@
 .{
-	.tags = .{.choppable, .cuttable, .leaf},
+	.tags = .{.choppable, .cuttable, .leaf, .branch},
+	.onUpdate = .{
+		.type = .Decay,
+	},
 	.blockHealth = 0.5,
 	.absorbedLight = 0x202830,
 	.alwaysViewThrough = true,

diff --git a/assets/cubyz/blocks/branch/palm.zig.zon b/assets/cubyz/blocks/branch/palm.zig.zon
@@ -1,5 +1,8 @@
 .{
-	.tags = .{.choppable, .wood},
+	.tags = .{.choppable, .wood, .branch},
+	.onUpdate = .{
+		.type = .Decay,
+	},
 	.blockHealth = 4,
 	.drops = .{
 		.{.items = .{.auto}},

diff --git a/assets/cubyz/blocks/cactus.zig.zon b/assets/cubyz/blocks/cactus.zig.zon
@@ -1,5 +1,5 @@
 .{
-	.tags = .{.choppable, .cuttable},
+	.tags = .{.choppable, .cuttable, .log},
 	.blockHealth = 5,
 	.drops = .{
 		.{.items = .{"cubyz:log/cactus"}},

diff --git a/assets/cubyz/blocks/cactus_arm.zig.zon b/assets/cubyz/blocks/cactus_arm.zig.zon
@@ -1,5 +1,8 @@
 .{
-	.tags = .{.choppable, .cuttable},
+	.tags = .{.choppable, .cuttable, .branch},
+	.onUpdate = .{
+		.type = .Decay,
+	},
 	.blockHealth = 2.5,
 	.drops = .{
 		.{.items = .{.auto}},

diff --git a/assets/cubyz/blocks/candy_cane/branch.zig.zon b/assets/cubyz/blocks/candy_cane/branch.zig.zon
@@ -1,5 +1,8 @@
 .{
 	.tags = .{.choppable, .wood},
+	.onUpdate = .{
+		.type = .Decay,
+	},
 	.blockHealth = 4,
 	.drops = .{
 		.{.items = .{.auto}},

diff --git a/assets/cubyz/blocks/glimmergill_branch.zig.zon b/assets/cubyz/blocks/glimmergill_branch.zig.zon
@@ -1,5 +1,8 @@
 .{
-	.tags = .{.choppable, .cuttable, .mushroom},
+	.tags = .{.choppable, .cuttable, .mushroom, .branch},
+	.onUpdate = .{
+		.type = .Decay,
+	},
 	.blockHealth = 2,
 	.drops = .{
 		.{.items = .{.auto}},

diff --git a/assets/cubyz/blocks/leaves/_defaults.zig.zon b/assets/cubyz/blocks/leaves/_defaults.zig.zon
@@ -1,6 +1,7 @@
 .{
 	.onUpdate = .{
-		.type = .leafDecay,
+		.type = .Decay,
+		.prevention = .{.log, .branch},
 	},
 	.rotation = "cubyz:decayable",
 	.tags = .{.cuttable, .leaf},

diff --git a/assets/cubyz/blocks/log/_defaults.zig.zon b/assets/cubyz/blocks/log/_defaults.zig.zon
@@ -1,5 +1,5 @@
 .{
-	.tags = .{.choppable, .wood},
+	.tags = .{.choppable, .wood, .log},
 	.blockHealth = 8,
 	.drops = .{
 		.{.items = .{.auto}},

diff --git a/assets/cubyz/blocks/mahogany_branch.zig.zon b/assets/cubyz/blocks/mahogany_branch.zig.zon
@@ -1,5 +1,8 @@
 .{
-	.tags = .{.choppable, .wood},
+	.tags = .{.choppable, .wood, .branch},
+	.onUpdate = .{
+		.type = .Decay,
+	},
 	.blockHealth = 4,
 	.drops = .{
 		.{.items = .{.auto}},

diff --git a/assets/cubyz/blocks/mahogany_log.zig.zon b/assets/cubyz/blocks/mahogany_log.zig.zon
@@ -1,5 +1,5 @@
 .{
-	.tags = .{.choppable, .wood},
+	.tags = .{.choppable, .wood, .log},
 	.blockHealth = 8,
 	.drops = .{
 		.{.items = .{"cubyz:log/mahogany"}},

diff --git a/assets/cubyz/blocks/mahogany_top.zig.zon b/assets/cubyz/blocks/mahogany_top.zig.zon
@@ -1,5 +1,5 @@
 .{
-	.tags = .{.choppable, .wood},
+	.tags = .{.choppable, .wood, .log},
 	.blockHealth = 8,
 	.drops = .{
 		.{.items = .{"cubyz:log/mahogany"}},

diff --git a/assets/cubyz/blocks/oak_branch.zig.zon b/assets/cubyz/blocks/oak_branch.zig.zon
@@ -1,5 +1,8 @@
 .{
-	.tags = .{.choppable, .wood},
+	.tags = .{.choppable, .wood, .branch},
+	.onUpdate = .{
+		.type = .Decay,
+	},
 	.blockHealth = 4,
 	.drops = .{
 		.{.items = .{.auto}},

diff --git a/assets/cubyz/blocks/oak_log.zig.zon b/assets/cubyz/blocks/oak_log.zig.zon
@@ -1,5 +1,5 @@
 .{
-	.tags = .{.choppable, .wood},
+	.tags = .{.choppable, .wood, .log},
 	.blockHealth = 8,
 	.drops = .{
 		.{.items = .{"cubyz:log/oak"}},

diff --git a/assets/cubyz/blocks/oak_top.zig.zon b/assets/cubyz/blocks/oak_top.zig.zon
@@ -1,5 +1,5 @@
 .{
-	.tags = .{.choppable, .wood},
+	.tags = .{.choppable, .wood, .log},
 	.blockHealth = 8,
 	.drops = .{
 		.{.items = .{"cubyz:log/oak"}},

diff --git a/assets/cubyz/blocks/pine_branch.zig.zon b/assets/cubyz/blocks/pine_branch.zig.zon
@@ -1,5 +1,8 @@
 .{
-	.tags = .{.choppable, .wood},
+	.tags = .{.choppable, .wood, .branch},
+	.onUpdate = .{
+		.type = .Decay,
+	},
 	.blockHealth = 4,
 	.drops = .{
 		.{.items = .{.auto}},

diff --git a/assets/cubyz/blocks/pine_log.zig.zon b/assets/cubyz/blocks/pine_log.zig.zon
@@ -1,5 +1,5 @@
 .{
-	.tags = .{.choppable, .wood},
+	.tags = .{.choppable, .wood, .log},
 	.blockHealth = 8,
 	.drops = .{
 		.{.items = .{"cubyz:log/pine"}},

diff --git a/assets/cubyz/blocks/pine_top.zig.zon b/assets/cubyz/blocks/pine_top.zig.zon
@@ -1,5 +1,5 @@
 .{
-	.tags = .{.choppable, .wood},
+	.tags = .{.choppable, .wood, .log},
 	.blockHealth = 8,
 	.drops = .{
 		.{.items = .{"cubyz:log/pine"}},

diff --git a/assets/cubyz/blocks/toadstool_branch.zig.zon b/assets/cubyz/blocks/toadstool_branch.zig.zon
@@ -1,5 +1,8 @@
 .{
-	.tags = .{.choppable, .cuttable, .mushroom},
+	.tags = .{.choppable, .cuttable, .mushroom, .branch},
+	.onUpdate = .{
+		.type = .Decay,
+	},
 	.blockHealth = 2,
 	.drops = .{
 		.{.items = .{.auto}},

diff --git a/assets/cubyz/blocks/willow_branch.zig.zon b/assets/cubyz/blocks/willow_branch.zig.zon
@@ -1,5 +1,8 @@
 .{
-	.tags = .{.choppable, .wood},
+	.tags = .{.choppable, .wood, .branch},
+	.onUpdate = .{
+		.type = .Decay,
+	},
 	.blockHealth = 4,
 	.drops = .{
 		.{.items = .{.auto}},

diff --git a/assets/cubyz/blocks/willow_log.zig.zon b/assets/cubyz/blocks/willow_log.zig.zon
@@ -1,5 +1,5 @@
 .{
-	.tags = .{.choppable, .wood},
+	.tags = .{.choppable, .wood, .log},
 	.blockHealth = 8,
 	.drops = .{
 		.{.items = .{"cubyz:log/willow"}},

diff --git a/assets/cubyz/blocks/willow_top.zig.zon b/assets/cubyz/blocks/willow_top.zig.zon
@@ -1,5 +1,5 @@
 .{
-	.tags = .{.choppable, .wood},
+	.tags = .{.choppable, .wood, .log},
 	.blockHealth = 8,
 	.drops = .{
 		.{.items = .{"cubyz:log/willow"}},

diff --git a/mods/cubyz/rotation/branch.zig b/mods/cubyz/rotation/branch.zig
@@ -33,11 +33,12 @@ const HashMapKey = struct {
 		return std.mem.eql(u8, val1.shellModelId, val2.shellModelId);
 	}
 };
-pub const BranchData = packed struct(u6) {
+pub const BranchData = packed struct(u7) {
 	enabledConnections: u6,
+	placedByHuman: u1,
 
 	pub inline fn init(blockData: u16) BranchData {
-		return .{.enabledConnections = @truncate(blockData)};
+		return .{.enabledConnections = @truncate(blockData), .placedByHuman = @truncate(blockData >> 6)};
 	}
 
 	pub inline fn isConnected(self: @This(), neighbor: Neighbor) bool {
@@ -352,7 +353,8 @@ pub fn generateData(
 		const targetVal = ((!neighborBlock.replacable() and (!neighborBlock.viewThrough() or canConnectToNeighbor)) and (canConnectToNeighbor or neighborModel.isNeighborOccluded[neighbor.?.reverse().toInt()]));
 		currentData.setConnection(neighbor.?, targetVal);
 
-		const result: u16 = currentData.enabledConnections;
+		currentData.placedByHuman = 1;
+		const result: u16 = @as(u7, @bitCast(currentData));
 		if(result == currentBlock.data) return false;
 
 		currentBlock.data = result;
@@ -375,7 +377,7 @@ pub fn updateData(block: *Block, neighbor: Neighbor, neighborBlock: Block) bool
 		currentData.setConnection(neighbor, false);
 	}
 
-	const result: u16 = currentData.enabledConnections;
+	const result: u16 = @as(u7, @bitCast(currentData));
 	if(result == block.data) return false;
 
 	block.data = result;

diff --git a/src/blocks.zig b/src/blocks.zig
@@ -75,7 +75,6 @@ var _absorption: [maxBlockCount]u32 = undefined;
 var _onInteract: [maxBlockCount]ClientBlockCallback = undefined;
 var _onBreak: [maxBlockCount]ServerBlockCallback = undefined;
 var _onUpdate: [maxBlockCount]ServerBlockCallback = undefined;
-var _decayProhibitor: [maxBlockCount]bool = undefined;
 var _mode: [maxBlockCount]*const RotationMode = undefined;
 var _modeData: [maxBlockCount]u16 = undefined;
 var _lodReplacement: [maxBlockCount]u16 = undefined;
@@ -142,7 +141,6 @@ pub fn register(_: []const u8, id: []const u8, zon: ZonElement) u16 {
 			break :blk .noop;
 		};
 	};
-	_decayProhibitor[size] = zon.get(bool, "decayProhibitor", false);
 
 	_transparent[size] = zon.get(bool, "transparent", false);
 	_collide[size] = zon.get(bool, "collide", true);
@@ -256,6 +254,13 @@ pub fn finishBlocks(zonElements: Assets.ZonHashMap) void {
 }
 
 pub fn reset() void {
+	for(0..size) |index| {
+		_onBreak[index].deinit();
+		_onTick[index].deinit();
+		_onInteract[index].deinit();
+		_onUpdate[index].deinit();
+		_onTouch[index].deinit();
+	}
 	size = 0;
 	ores = .{};
 	reverseIndices = .{};
@@ -419,9 +424,6 @@ pub const Block = packed struct { // MARK: Block
 	pub inline fn onUpdate(self: Block) ServerBlockCallback {
 		return _onUpdate[self.typ];
 	}
-	pub inline fn decayProhibitor(self: Block) bool {
-		return _decayProhibitor[self.typ];
-	}
 	pub inline fn mode(self: Block) *const RotationMode {
 		return _mode[self.typ];
 	}

diff --git a/src/callbacks/block/client/openWindow.zig b/src/callbacks/block/client/openWindow.zig
@@ -24,3 +24,4 @@ pub fn run(self: *@This(), _: main.callbacks.ClientBlockCallback.Params) main.ca
 	main.Window.setMouseGrabbed(false);
 	return .handled;
 }
+pub fn deinit(_: *@This()) void {}