fix some configuration bugs

FactoryCraft/BlockType.h

@@ -115,7 +115,7 @@ public:
         zType->setNeedsClientInstance(
             zJson->zValue("needsClientInstance")->asBool()->getBool());
         zType->setLightSource(
-            zJson->zValue("lightSource")->asNumber()->getNumber());
+            zJson->zValue("lightSource")->asBool()->getBool());
         zType->setName(zJson->zValue("name")->asString()->getString());
         zType->setNeedModelSubscription(
             zJson->zValue("needModelSubscription")->asBool()->getBool());

FactoryCraft/Grass.cpp

@@ -28,11 +28,7 @@ void GrassBlock::filterPassingLight(unsigned char rgb[3]) const
 
 GrassBlockType::GrassBlockType()
     : AdditionalItemSpawningBlockType()
-{
-    setTransparent(true);
-    setPassable(true);
-    setSpeedModifier(0.5f);
-}
+{}
 
 ItemType* GrassBlockType::createItemType() const
 {

FactoryCraft/JsonExpression.cpp

@@ -691,62 +691,62 @@ void JFloatOperatorBoolExpressionFactory::fromJson(
     Framework::Text op = zJson->zValue("operator")->asString()->getString();
     if (op.istGleich(">"))
     {
-        return zResult->setOperator(
+        zResult->setOperator(
             ">", [](float a, float b) { return a > b; });
     }
     else if (op.istGleich("<"))
     {
-        return zResult->setOperator(
+        zResult->setOperator(
             "<", [](float a, float b) { return a < b; });
     }
     else if (op.istGleich(">="))
     {
-        return zResult->setOperator(
+        zResult->setOperator(
             ">=", [](float a, float b) { return a >= b; });
     }
     else if (op.istGleich("<="))
     {
-        return zResult->setOperator(
+        zResult->setOperator(
             "<=", [](float a, float b) { return a <= b; });
     }
     else if (op.istGleich("=="))
     {
-        return zResult->setOperator(
+        zResult->setOperator(
             "==", [](float a, float b) { return a == b; });
     }
     else if (op.istGleich("!="))
     {
-        return zResult->setOperator(
+        zResult->setOperator(
             "!=", [](float a, float b) { return a != b; });
     }
     else if (op.istGleich(">i"))
     {
-        return zResult->setOperator(
+        zResult->setOperator(
             ">i", [](float a, float b) { return (int)a > (int)b; });
     }
     else if (op.istGleich("<i"))
     {
-        return zResult->setOperator(
+        zResult->setOperator(
             "<i", [](float a, float b) { return (int)a < (int)b; });
     }
     else if (op.istGleich(">=i"))
     {
-        return zResult->setOperator(
+        zResult->setOperator(
             ">=i", [](float a, float b) { return (int)a >= (int)b; });
     }
     else if (op.istGleich("<=i"))
     {
-        return zResult->setOperator(
+        zResult->setOperator(
             "<=i", [](float a, float b) { return (int)a <= (int)b; });
     }
     else if (op.istGleich("==i"))
     {
-        return zResult->setOperator(
+        zResult->setOperator(
             "==i", [](float a, float b) { return (int)a == (int)b; });
     }
     else if (op.istGleich("!=i"))
     {
-        return zResult->setOperator(
+        zResult->setOperator(
             "!=i", [](float a, float b) { return (int)a != (int)b; });
     }
     for (Framework::JSON::JSONValue* value :

FactoryCraft/NoBlock.cpp

@@ -9,7 +9,7 @@ NoBlockBlockType::NoBlockBlockType(const Block* defaultB, Framework::Text name)
     setInitialMaxHP(1);
     setLightSource(false);
     setName(name);
-    setNeedModelSubscription(false);
+    setNeedsClientInstance(false);
     setMapColor(0);
     setHardness(0.f);
 }

Windows Version/data/blocks/blockTypes.json

@@ -412,6 +412,9 @@
       ],
       "transparent": true
     },
+    "transparent": true,
+    "passable": true,
+    "speedModifier": 0.5,
     "mapColor": "0x5076C011",
     "spawns": [
       {