Mod simple structures

build.zig

@@ -135,10 +135,12 @@ fn addModFeatures(b: *std.Build, exe: *std.Build.Step.Compile) !void {
 	exe.step.dependOn(step);
 
 	try addModFeatureModule(b, exe, "rotation");
+	try addModFeatureModule(b, exe, "simple_structures");
 }
 
 pub fn makeModFeaturesStep(step: *std.Build.Step, _: std.Build.Step.MakeOptions) anyerror!void {
 	try makeModFeature(step, "rotation");
+	try makeModFeature(step, "simple_structures");
 }
 
 fn createLaunchConfig() !void {

src/server/terrain/simple_structures/Boulder.zig → mods/cubyz/simple_structures/boulder.zig

@@ -13,8 +13,6 @@ const Vec3f = vec.Vec3f;
 const Vec3i = vec.Vec3i;
 const NeverFailingAllocator = main.heap.NeverFailingAllocator;
 
-pub const id = "cubyz:boulder";
-
 pub const generationMode = .floor;
 
 const Boulder = @This();

src/server/terrain/simple_structures/FallenTree.zig → mods/cubyz/simple_structures/fallen_tree.zig

@@ -13,8 +13,6 @@ const Vec3f = vec.Vec3f;
 const Vec3i = vec.Vec3i;
 const NeverFailingAllocator = main.heap.NeverFailingAllocator;
 
-pub const id = "cubyz:fallen_tree";
-
 pub const generationMode = .floor;
 
 const FallenTree = @This();

src/server/terrain/simple_structures/FlowerPatch.zig → mods/cubyz/simple_structures/flower_patch.zig

@@ -13,8 +13,6 @@ const Vec3f = vec.Vec3f;
 const Vec3i = vec.Vec3i;
 const NeverFailingAllocator = main.heap.NeverFailingAllocator;
 
-pub const id = "cubyz:flower_patch";
-
 pub const generationMode = .floor;
 
 const FlowerPatch = @This();

src/server/terrain/simple_structures/GroundPatch.zig → mods/cubyz/simple_structures/ground_patch.zig

@@ -13,8 +13,6 @@ const Vec3f = vec.Vec3f;
 const Vec3i = vec.Vec3i;
 const NeverFailingAllocator = main.heap.NeverFailingAllocator;
 
-pub const id = "cubyz:ground_patch";
-
 pub const generationMode = .floor;
 
 const GroundPatch = @This();

src/server/terrain/simple_structures/SbbGen.zig → mods/cubyz/simple_structures/sbb.zig

@@ -13,7 +13,6 @@ const Neighbor = main.chunk.Neighbor;
 const ServerChunk = main.chunk.ServerChunk;
 const NeverFailingAllocator = main.heap.NeverFailingAllocator;
 
-pub const id = "cubyz:sbb";
 pub const generationMode = .floor;
 
 const SbbGen = @This();

src/server/terrain/simple_structures/SimpleTreeModel.zig → mods/cubyz/simple_structures/simple_tree.zig

@@ -13,8 +13,6 @@ const Vec3f = vec.Vec3f;
 const Vec3i = vec.Vec3i;
 const NeverFailingAllocator = main.heap.NeverFailingAllocator;
 
-pub const id = "cubyz:simple_tree";
-
 const SimpleTreeModel = @This();
 
 pub const generationMode = .floor;

src/server/terrain/simple_structures/SimpleVegetation.zig → mods/cubyz/simple_structures/simple_vegetation.zig

@@ -13,8 +13,6 @@ const Vec3f = vec.Vec3f;
 const Vec3i = vec.Vec3i;
 const NeverFailingAllocator = main.heap.NeverFailingAllocator;
 
-pub const id = "cubyz:simple_vegetation";
-
 pub const generationMode = .floor;
 
 const SimpleVegetation = @This();

src/server/terrain/simple_structures/Stalagmite.zig → mods/cubyz/simple_structures/stalagmite.zig

@@ -13,8 +13,6 @@ const Vec3f = vec.Vec3f;
 const Vec3i = vec.Vec3i;
 const NeverFailingAllocator = main.heap.NeverFailingAllocator;
 
-pub const id = "cubyz:stalagmite";
-
 pub const generationMode = .floor_and_ceiling;
 
 const Stalagmite = @This();

src/server/terrain/biomes.zig

@@ -53,7 +53,7 @@ pub const SimpleStructureModel = struct { // MARK: SimpleStructureModel
 
 	var modelRegistry: std.StringHashMapUnmanaged(VTable) = .{};
 
-	pub fn registerGenerator(comptime Generator: type) void {
+	pub fn registerGenerator(comptime Generator: type, comptime generatorName: []const u8) void {
 		var self: VTable = undefined;
 		self.loadModel = main.utils.castFunctionReturnToAnyopaque(Generator.loadModel);
 		self.generate = main.utils.castFunctionSelfToAnyopaque(Generator.generate);
@@ -63,7 +63,7 @@ pub const SimpleStructureModel = struct { // MARK: SimpleStructureModel
 			}
 		}.hash);
 		self.generationMode = Generator.generationMode;
-		modelRegistry.put(main.globalArena.allocator, Generator.id, self) catch unreachable;
+		modelRegistry.put(main.globalArena.allocator, generatorName, self) catch unreachable;
 	}
 
 	fn getHash(self: SimpleStructureModel) u64 {
@@ -623,9 +623,9 @@ const TransitionBiome = struct {
 var unfinishedTransitionBiomes: std.StringHashMapUnmanaged([]UnfinishedTransitionBiomeData) = .{};
 
 pub fn init() void {
-	const list = @import("simple_structures/_list.zig");
+	const list = @import("simple_structures");
 	inline for(@typeInfo(list).@"struct".decls) |decl| {
-		SimpleStructureModel.registerGenerator(@field(list, decl.name));
+		SimpleStructureModel.registerGenerator(@field(list, decl.name), decl.name);
 	}
 }