From 07f5d823ddb95fabfa529e88d246bd9cb7437fd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Wi=C5=9Bniewski?= <argmaster.world@gmail.com>
Date: Sun, 23 Mar 2025 19:35:38 +0100
Subject: [PATCH] Add `pile` rotation mode (#1216)

* Add pile rotation mode

* Fix formatting issues

* Rename to .zig.zon

* Update textures to those provided by ikabood-kee

* Add gradual block breaking

* Adapt to new model and texture changes

* New duckweed textures

* Add configurable state count

* Rename to texturePile

* Add moreData storage

* Apply review suggestions

---------

Co-authored-by: Carrie <carriecapp9@gmail.com>
---
 assets/cubyz/blocks/duckweed.zig.zon        |  24 +++++
 assets/cubyz/blocks/textures/duckweed/0.png | Bin 0 -> 282 bytes
 assets/cubyz/blocks/textures/duckweed/1.png | Bin 0 -> 362 bytes
 assets/cubyz/blocks/textures/duckweed/2.png | Bin 0 -> 469 bytes
 assets/cubyz/blocks/textures/duckweed/3.png | Bin 0 -> 483 bytes
 assets/cubyz/items/textures/duckweed.png    | Bin 0 -> 306 bytes
 src/blocks.zig                              |   7 +-
 src/rotation.zig                            | 102 ++++++++++++++++++--
 8 files changed, 122 insertions(+), 11 deletions(-)
 create mode 100644 assets/cubyz/blocks/duckweed.zig.zon
 create mode 100644 assets/cubyz/blocks/textures/duckweed/0.png
 create mode 100644 assets/cubyz/blocks/textures/duckweed/1.png
 create mode 100644 assets/cubyz/blocks/textures/duckweed/2.png
 create mode 100644 assets/cubyz/blocks/textures/duckweed/3.png
 create mode 100644 assets/cubyz/items/textures/duckweed.png

diff --git a/assets/cubyz/blocks/duckweed.zig.zon b/assets/cubyz/blocks/duckweed.zig.zon
new file mode 100644
index 00000000..4ba7afd8
--- /dev/null
+++ b/assets/cubyz/blocks/duckweed.zig.zon
@@ -0,0 +1,24 @@
+.{
+	.tags = .{.leaf},
+	.blockHealth = 0.2,
+	.drops = .{
+		.{.items = .{.auto}},
+	},
+	.degradable = true,
+	.collide = false,
+	.alwaysViewThrough = true,
+	.absorbedLight = 0x000000,
+	.model = .{
+		.model = "cubyz:plane",
+		.states = 4,
+	},
+	.rotation = .texturePile,
+	.texture0 = "cubyz:duckweed/0",
+	.texture1 = "cubyz:duckweed/1",
+	.texture2 = "cubyz:duckweed/2",
+	.texture3 = "cubyz:duckweed/3",
+	.item = .{
+		.texture = "duckweed.png",
+	},
+	.lodReplacement = "cubyz:air",
+}
diff --git a/assets/cubyz/blocks/textures/duckweed/0.png b/assets/cubyz/blocks/textures/duckweed/0.png
new file mode 100644
index 0000000000000000000000000000000000000000..6d415a0aba4ea8a49e459376ad4ff018c550c262
GIT binary patch
literal 282
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`4?SHRLo9le6Amyc-TM0PcG{}{
z$5r{6eRinG#r!*VK=(k~<qsWYd;jwQK~GE00X7@0(*N~;KXf;$FejL;Te0WJi30}?
zBnU43G=J)R$;%8Stss@#X1@AgU;pRyfm7$t6jc236|t2_{P5+Xe;fb&fWv&#({|K%
zaOTD|ygYpP{gYR!JRqB^LtZ^9mF2cO$v%C*;f7Df!S_Qq%t%T&Fj;6L<BakN$(-+4
zb3XR-?W_B7^ut$XX0MV%k{h1<{QWq-P5AUXfw@i(<8EB6n<+RgVFP1~VUrN|kDR)K
dpVDE446`LtqQoXV(FS^!!PC{xWt~$(696r$e#QU*

literal 0
HcmV?d00001

diff --git a/assets/cubyz/blocks/textures/duckweed/1.png b/assets/cubyz/blocks/textures/duckweed/1.png
new file mode 100644
index 0000000000000000000000000000000000000000..adb3985833822eba1354bfd7c1eb3037b3a970c8
GIT binary patch
literal 362
zcmV-w0hRuVP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0003oNkl<ZIE|fB
zF^+;z5Pie4Hk-H{g2W1I8hegFxPeFbC*TO&fOrIZ8)~UYD8$76Yl23MnJvr^KKk9w
zzH<JbnfKm2z=AlP^I|z;+q=NAJ?zRezPyQbc%04|0O+?3f=C7IO$jTtrAP(b>h3**
zSIvTTTGH)!2LQOQ=mEe=ZTpT^chJoppWh$-zap;*0Gvn#hFORG75c;&)^5i~^CqjF
zB)ht~7?U?yMPcF_?#s4U4F7DRK>RrDuh?W2(XgmbjCEQXL*sPL<GL^`@|s-WVG=Nb
zHzh2VGahQ)m1jfZSklu}n_2%tq=G(iHuOOn##5Tbtas>xq)&`icL)=oi@YY?T%cj<
z9kcVM1V;iR@f5>~yr%K}BNg-v<!VNhZQFpyHHKKJErp5CKf%AI^Eae_0000007*qo
IM6N<$f`-|pxc~qF

literal 0
HcmV?d00001

diff --git a/assets/cubyz/blocks/textures/duckweed/2.png b/assets/cubyz/blocks/textures/duckweed/2.png
new file mode 100644
index 0000000000000000000000000000000000000000..5faf7a81ac839dd0f7848f00836f9d736afdd54f
GIT binary patch
literal 469
zcmV;`0V@89P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004;Nkl<ZIE{r;
zJC3735PgL|(#X=78*E~U$c~+m`v{hAz!5k>A7O5Qd<61Ih~3dh1YpT|8wrrHP;KC?
z-eN|p?TCK;UQzE=0e{ZX?D%MQtnYCW`8xo_N%R9F063&uZry-YxI}I&0l@yW;qccR
zS~uYH<BPONesoSR6aav$dpz%>7Xv_%mDIYyiw^15cjy|%?fO8RL_Dc1L|sU*@cji<
zwnLGXv_EYa00Qkxh&l@ZXx)Iyc5uyKxX4N>vXX*TxWw~5`iI-~0oO2eSkL>2#d-!;
z_b9T`cXvp)Ja=`E#d-z+$c?2qiP+Ws#FiH609!X;QcWiwClNpIBZ{n~quH@*7`d?|
zHgDGlK0m%*QxI?!E`94_D^4P=YzLW0ZY)){^Y3#B30NY0C%Af?w7oxVc(I;Mc0pV6
zA2OEj<nKrCLT)Vmlc=qo(+lbQ?fUSOnQO9m)a1%`zF_Ny9~LKM-P->wi6)4Xh;w5}
z_FHy9c0<HRvt#KJz$@^E5eSeQOX5p}I_=7KaCPs;d`>Uq>K?xVN01(L%y*W000000
LNkvXXu0mjf<Ga`B

literal 0
HcmV?d00001

diff --git a/assets/cubyz/blocks/textures/duckweed/3.png b/assets/cubyz/blocks/textures/duckweed/3.png
new file mode 100644
index 0000000000000000000000000000000000000000..c45b5c34e4e21bb0e19408f2c7f33bc12590574b
GIT binary patch
literal 483
zcmV<90UZ8`P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00051Nkl<ZIE`hK
zF>d295Jlg}Ya4+8nSFqy3E;}E)42B$jNHIS&<S(|-N48Z+^caNRRUZ@0@Tw26u~kK
zZnMLsci9LcIsgCpe<=J}yKL<M+U5$t^UIvJxl-hn0BrV4ce~t~E+!OtC7b=y0SLf0
zUAf+l#Ae1ZD+S>F<IS1ZCwe=25CwXEnFH{deu=*fa5|hH*Z|MCO;^q&g6$jtN+_W;
zfY{9F?FitRwHV;L{PDoI%bj1bnb9-)Vv`6ane&-`c{S=yY-SIt03v|f<?c7y=8Ekc
z+jQl$Z(9%kdpevYR2JEK@bc9_TMxdd$SYB~)5U~cwsx9WZ%4elyKL=j=RAleQ{<I|
zXX;1WT)AEDe`5sDgCeg)lTr3Cr7*QfP163u%i5X(DbeY07W4YVHeET{?3eCeMqL_d
zIC(lmwsY8eAW}!Ci^)Sg8krUpc_q5nHdk+Qq*=#i=8F`>B;p50UH>kBd?KgAStK-2
zr5&^Kzm~#xqJ$<9B3lm}vr=s5ytMa^H>ZUv-6Y~oEb>b9T|_GHn3WPfpfI+uZ&jxM
ZzXAUlE}mV$qI>`V002ovPDHLkV1mcy<M03g

literal 0
HcmV?d00001

diff --git a/assets/cubyz/items/textures/duckweed.png b/assets/cubyz/items/textures/duckweed.png
new file mode 100644
index 0000000000000000000000000000000000000000..370ad91e96820016029438e648046d00ad515279
GIT binary patch
literal 306
zcmV-20nPr2P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0002_Nkl<ZIE~$s
zF%E)25Jf+Rf&$GJuoQL@V<It8E?~HUr|?kTz|I?>7f=&}i80byh!z{ApdeWb1a<}O
zb()=-%>Mj0yTH$fA{OImkLUSnc2M&A9;MhUPRjdb08rl>u18*3k9Qm$gsNE1Zyz00
z1OR|VDVm0g>m>o9dab)!1OOOKY(De|u9pOlTUzuxPA0VVnS@g~5P1nzL8y+k&)|9l
zEJ_guF`7ozu+(uqg5xeOm|Il7aNZ}CWl9q)$}G408ca(=7?fh|zV>opb5W!rE+!0O
zbO$A?_<W|7iGD@M!?ZNXZg$$dZdT$MP0FE9ALkF_3IES!NZXYO^Z)<=07*qoM6N<$
Ef`(0d@&Et;

literal 0
HcmV?d00001

diff --git a/src/blocks.zig b/src/blocks.zig
index 8c04acb5..4e74d3d7 100644
--- a/src/blocks.zig
+++ b/src/blocks.zig
@@ -106,6 +106,7 @@ var _absorption: [maxBlockCount]u32 = undefined;
 /// GUI that is opened on click.
 var _gui: [maxBlockCount][]u8 = undefined;
 var _mode: [maxBlockCount]*RotationMode = undefined;
+var _modeData: [maxBlockCount]u16 = undefined;
 var _lodReplacement: [maxBlockCount]u16 = undefined;
 var _opaqueVariant: [maxBlockCount]u16 = undefined;
 var _friction: [maxBlockCount]f32 = undefined;
@@ -364,6 +365,10 @@ pub const Block = packed struct { // MARK: Block
 		return _mode[self.typ];
 	}
 
+	pub inline fn modeData(self: Block) u16 {
+		return _modeData[self.typ];
+	}
+
 	pub inline fn rotateZ(self: Block, angle: Degrees) Block {
 		return .{.typ = self.typ, .data = self.mode().rotateZ(self.data, angle)};
 	}
@@ -666,7 +671,7 @@ pub const meshes = struct { // MARK: meshes
 	}
 
 	pub fn register(assetFolder: []const u8, _: []const u8, zon: ZonElement) void {
-		_modelIndex[meshes.size] = _mode[meshes.size].createBlockModel(zon.getChild("model"));
+		_modelIndex[meshes.size] = _mode[meshes.size].createBlockModel(.{.typ = @intCast(meshes.size), .data = 0}, &_modeData[meshes.size], zon.getChild("model"));
 
 		// The actual model is loaded later, in the rendering thread.
 		// But textures can be loaded here:
diff --git a/src/rotation.zig b/src/rotation.zig
index acafccc2..028812e7 100644
--- a/src/rotation.zig
+++ b/src/rotation.zig
@@ -41,7 +41,7 @@ pub const RotationMode = struct { // MARK: RotationMode
 		fn generateData(_: *main.game.World, _: Vec3i, _: Vec3f, _: Vec3f, _: Vec3i, _: ?Neighbor, _: *Block, _: Block, blockPlacing: bool) bool {
 			return blockPlacing;
 		}
-		fn createBlockModel(zon: ZonElement) ModelIndex {
+		fn createBlockModel(_: Block, _: *u16, zon: ZonElement) ModelIndex {
 			return main.models.getModelIndex(zon.as([]const u8, "cubyz:cube"));
 		}
 		fn updateData(_: *Block, _: Neighbor, _: Block) bool {
@@ -126,7 +126,7 @@ pub const RotationMode = struct { // MARK: RotationMode
 	// Rotates block data counterclockwise around the Z axis.
 	rotateZ: *const fn(data: u16, angle: Degrees) u16 = DefaultFunctions.rotateZ,
 
-	createBlockModel: *const fn(zon: ZonElement) ModelIndex = &DefaultFunctions.createBlockModel,
+	createBlockModel: *const fn(block: Block, modeData: *u16, zon: ZonElement) ModelIndex = &DefaultFunctions.createBlockModel,
 
 	/// Updates the block data of a block in the world or places a block in the world.
 	/// return true if the placing was successful, false otherwise.
@@ -176,7 +176,7 @@ pub const RotationModes = struct {
 			rotatedModels.clearRetainingCapacity();
 		}
 
-		pub fn createBlockModel(zon: ZonElement) ModelIndex {
+		pub fn createBlockModel(_: Block, _: *u16, zon: ZonElement) ModelIndex {
 			const modelId = zon.as([]const u8, "cubyz:cube");
 			if(rotatedModels.get(modelId)) |modelIndex| return modelIndex;
 
@@ -235,7 +235,7 @@ pub const RotationModes = struct {
 			rotatedModels.clearRetainingCapacity();
 		}
 
-		pub fn createBlockModel(zon: ZonElement) ModelIndex {
+		pub fn createBlockModel(_: Block, _: *u16, zon: ZonElement) ModelIndex {
 			const modelId = zon.as([]const u8, "cubyz:cube");
 			if(rotatedModels.get(modelId)) |modelIndex| return modelIndex;
 
@@ -355,7 +355,7 @@ pub const RotationModes = struct {
 			}
 		}
 
-		pub fn createBlockModel(zon: ZonElement) ModelIndex {
+		pub fn createBlockModel(_: Block, _: *u16, zon: ZonElement) ModelIndex {
 			const modelId = zon.as([]const u8, "cubyz:cube");
 			if(fenceModels.get(modelId)) |modelIndex| return modelIndex;
 
@@ -638,7 +638,7 @@ pub const RotationModes = struct {
 			};
 		}
 
-		pub fn createBlockModel(zon: ZonElement) ModelIndex {
+		pub fn createBlockModel(_: Block, _: *u16, zon: ZonElement) ModelIndex {
 			const radius = zon.get(f32, "radius", 4);
 			if(branchModels.get(@bitCast(radius))) |modelIndex| return modelIndex;
 
@@ -900,7 +900,7 @@ pub const RotationModes = struct {
 			return mem[0..faces];
 		}
 
-		pub fn createBlockModel(_: ZonElement) ModelIndex {
+		pub fn createBlockModel(_: Block, _: *u16, _: ZonElement) ModelIndex {
 			if(modelIndex) |idx| return idx;
 			for(0..256) |i| {
 				var quads = main.List(main.models.QuadInfo).init(main.stackAllocator);
@@ -1142,7 +1142,7 @@ pub const RotationModes = struct {
 			rotatedModels.clearRetainingCapacity();
 		}
 
-		pub fn createBlockModel(zon: ZonElement) ModelIndex {
+		pub fn createBlockModel(_: Block, _: *u16, zon: ZonElement) ModelIndex {
 			const baseModelId: []const u8 = zon.get([]const u8, "base", "cubyz:cube");
 			const sideModelId: []const u8 = zon.get([]const u8, "side", "cubyz:cube");
 			const key: []const u8 = std.mem.concat(main.stackAllocator.allocator, u8, &.{baseModelId, sideModelId}) catch unreachable;
@@ -1362,7 +1362,7 @@ pub const RotationModes = struct {
 			rotatedModels.clearRetainingCapacity();
 		}
 
-		pub fn createBlockModel(zon: ZonElement) ModelIndex {
+		pub fn createBlockModel(_: Block, _: *u16, zon: ZonElement) ModelIndex {
 			const modelId = zon.as([]const u8, "cubyz:cube");
 			if(rotatedModels.get(modelId)) |modelIndex| return modelIndex;
 
@@ -1490,7 +1490,7 @@ pub const RotationModes = struct {
 			modelCache = null;
 		}
 
-		pub fn createBlockModel(zon: ZonElement) ModelIndex {
+		pub fn createBlockModel(_: Block, _: *u16, zon: ZonElement) ModelIndex {
 			const modelId = zon.as([]const u8, "cubyz:cube");
 			if(!std.mem.eql(u8, modelId, "cubyz:cube")) {
 				std.log.err("Ores can only be use on cube models.", .{modelId});
@@ -1540,6 +1540,88 @@ pub const RotationModes = struct {
 			currentData.data = 0;
 		}
 	};
+	pub const TexturePile = struct {
+		pub const id: []const u8 = "texturePile";
+		var rotatedModels: std.StringHashMap(ModelIndex) = undefined;
+
+		fn init() void {
+			rotatedModels = .init(main.globalAllocator.allocator);
+		}
+
+		fn deinit() void {
+			rotatedModels.deinit();
+		}
+
+		fn reset() void {
+			rotatedModels.clearRetainingCapacity();
+		}
+
+		fn transform(quad: *main.models.QuadInfo, data: u16) void {
+			quad.textureSlot = data%16;
+		}
+
+		pub fn createBlockModel(block: Block, modeData: *u16, zon: ZonElement) ModelIndex {
+			const modelId = zon.get([]const u8, "model", "cubyz:cube");
+			const stateCount = zon.get(u16, "states", 2);
+			const blockId = block.id();
+			if(stateCount <= 1) {
+				std.log.err("Block '{s}' uses texture pile with {} states. 'texturePile' should have at least 2 states, use 'no_rotation' instead", .{blockId, stateCount});
+			} else if(stateCount > 16) {
+				std.log.err("Block '{s}' uses texture pile with {} states. 'texturePile' can have at most 16 states.", .{blockId, stateCount});
+			}
+			modeData.* = stateCount;
+
+			if(rotatedModels.get(modelId)) |modelIndex| return modelIndex;
+
+			const baseModel = main.models.getModelIndex(modelId).model();
+
+			const modelIndex = baseModel.transformModel(transform, .{@as(u16, @intCast(0))});
+			for(1..16) |data| {
+				_ = baseModel.transformModel(transform, .{@as(u16, @intCast(data))});
+			}
+			rotatedModels.put(modelId, modelIndex) catch unreachable;
+			return modelIndex;
+		}
+
+		pub fn model(block: Block) ModelIndex {
+			return .{.index = blocks.meshes.modelIndexStart(block).index + @min(block.data, block.modeData() - 1)};
+		}
+
+		pub fn generateData(_: *main.game.World, _: Vec3i, _: Vec3f, _: Vec3f, _: Vec3i, _: ?Neighbor, currentData: *Block, _: Block, blockPlacing: bool) bool {
+			if(blockPlacing) {
+				currentData.data = 0;
+				return true;
+			}
+			if(currentData.data >= currentData.modeData() - 1) {
+				return false;
+			}
+			currentData.data = currentData.data + 1;
+			return true;
+		}
+
+		pub fn onBlockBreaking(_: ?main.items.Item, _: Vec3f, _: Vec3f, currentData: *Block) void {
+			if(currentData.data == 0) {
+				currentData.* = .{.typ = 0, .data = 0};
+			} else {
+				currentData.data = currentData.data - 1;
+			}
+		}
+
+		pub fn canBeChangedInto(oldBlock: Block, newBlock: Block, item: main.items.ItemStack, shouldDropSourceBlockOnSuccess: *bool) RotationMode.CanBeChangedInto {
+			switch(RotationMode.DefaultFunctions.canBeChangedInto(oldBlock, newBlock, item, shouldDropSourceBlockOnSuccess)) {
+				.no, .yes_costsDurability, .yes_dropsItems => return .no,
+				.yes, .yes_costsItems => {
+					const amountChange = @as(i32, newBlock.data) - if(oldBlock.typ == newBlock.typ) @as(i32, oldBlock.data) else 0;
+					if(amountChange <= 0) {
+						return .{.yes_dropsItems = @intCast(-amountChange)};
+					} else {
+						if(item.item == null or item.item.? != .baseItem or item.item.?.baseItem.block != newBlock.typ) return .no;
+						return .{.yes_costsItems = @intCast(amountChange)};
+					}
+				},
+			}
+		}
+	};
 };
 
 // MARK: init/register