X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp%2Fapp.cpp;h=1e82cab998b789e6a9be2fc62723defc2e012128;hb=d5ef462f3bd70a9717c1309466ce8d90b038c5cd;hp=4d2d2c098afa17bcde96083ddf384aeddacaa86b;hpb=2e3774eb3f2d5d23a08731175b168566457e2192;p=blank.git

diff --git a/src/app/app.cpp b/src/app/app.cpp
index 4d2d2c0..1e82cab 100644
--- a/src/app/app.cpp
+++ b/src/app/app.cpp
@@ -98,6 +98,8 @@ void HeadlessApplication::Run() {
 
 void HeadlessApplication::Loop(int dt) {
 	env.counter.EnterFrame();
+	HandleEvents();
+	if (!HasState()) return;
 	Update(dt);
 	CommitStates();
 	if (!HasState()) return;
@@ -335,8 +337,10 @@ void AssetLoader::LoadBlockTypes(const std::string &set_name, BlockTypeRegistry
 			} else if (name == "texture") {
 				in.ReadString(tex_name);
 				type.texture = tex_index.GetID(tex_name);
-			} else if (name == "color") {
-				in.ReadVec(type.color);
+			} else if (name == "rgb_mod") {
+				in.ReadVec(type.rgb_mod);
+			} else if (name == "hsl_mod") {
+				in.ReadVec(type.hsl_mod);
 			} else if (name == "outline") {
 				in.ReadVec(type.outline_color);
 			} else if (name == "label") {
@@ -349,6 +353,34 @@ void AssetLoader::LoadBlockTypes(const std::string &set_name, BlockTypeRegistry
 				type.collision = in.GetBool();
 			} else if (name == "collide_block") {
 				type.collide_block = in.GetBool();
+			} else if (name == "generate") {
+				type.generate = in.GetBool();
+			} else if (name == "min_solidity") {
+				type.min_solidity = in.GetFloat();
+			} else if (name == "mid_solidity") {
+				type.mid_solidity = in.GetFloat();
+			} else if (name == "max_solidity") {
+				type.max_solidity = in.GetFloat();
+			} else if (name == "min_humidity") {
+				type.min_humidity = in.GetFloat();
+			} else if (name == "mid_humidity") {
+				type.mid_humidity = in.GetFloat();
+			} else if (name == "max_humidity") {
+				type.max_humidity = in.GetFloat();
+			} else if (name == "min_temperature") {
+				type.min_temperature = in.GetFloat();
+			} else if (name == "mid_temperature") {
+				type.mid_temperature = in.GetFloat();
+			} else if (name == "max_temperature") {
+				type.max_temperature = in.GetFloat();
+			} else if (name == "min_richness") {
+				type.min_richness = in.GetFloat();
+			} else if (name == "mid_richness") {
+				type.mid_richness = in.GetFloat();
+			} else if (name == "max_richness") {
+				type.max_richness = in.GetFloat();
+			} else if (name == "commonness") {
+				type.commonness = in.GetFloat();
 			} else if (name == "shape") {
 				in.ReadIdentifier(shape_name);
 				if (shape_name == "block") {