fix: implement condition inversion, fix json serialization for several conditions

Author: ItsMeBrianD

lang/constructs/worldgen/surface_rules/Condition_Biome.go

@@ -52,7 +52,7 @@ func (c BiomeCondition) ExportSymbol(symbol traversal.Symbol, rootDir *lib.FileT
 func (c BiomeCondition) MarshalJSON() ([]byte, error) {
 	return json.MarshalIndent(struct {
 		Type   SurfaceConditionKind  `json:"type"`
-		Biomes []traversal.Reference `json:"biomes"`
+		Biomes []traversal.Reference `json:"biome_is"`
 	}{
 		Type:   BiomeConditionKind,
 		Biomes: c.biomes,

lang/constructs/worldgen/surface_rules/Condition_Not.go

@@ -0,0 +1,31 @@
+package surface_rules
+
+import (
+	"encoding/json"
+
+	"github.com/minecraftmetascript/mms/lang/traversal"
+	"github.com/minecraftmetascript/mms/lib"
+)
+
+type NotCondition struct {
+	traversal.Construct
+	Invert traversal.Construct
+}
+
+func (c NotCondition) ExportSymbol(symbol traversal.Symbol, rootDir *lib.FileTreeLike) error {
+	return exportSurfaceCondition(symbol, rootDir, c)
+}
+
+func (c NotCondition) MarshalJSON() ([]byte, error) {
+	return json.MarshalIndent(struct {
+		Type   SurfaceConditionKind `json:"type"`
+		Invert traversal.Construct  `json:"invert"`
+	}{
+		Type:   NotConditionKind,
+		Invert: c.Invert,
+	}, "", "  ")
+}
+
+func InvertCondition(c traversal.Construct) NotCondition {
+	return NotCondition{Invert: c}
+}

lang/constructs/worldgen/surface_rules/Condition_VerticalGradient.go

@@ -61,8 +61,12 @@ func (c VerticalGradientCondition) ExportSymbol(symbol traversal.Symbol, rootDir
 
 func (c VerticalGradientCondition) MarshalJSON() ([]byte, error) {
 	return json.MarshalIndent(struct {
-		Type SurfaceConditionKind `json:"type"`
+		Type         SurfaceConditionKind      `json:"type"`
+		TrueAtBelow  primitives.VerticalAnchor `json:"true_at_and_below"`
+		FalseAtAbove primitives.VerticalAnchor `json:"false_at_and_above"`
 	}{
-		Type: VerticalGradientConditionKind,
+		Type:         VerticalGradientConditionKind,
+		TrueAtBelow:  c.TrueAtAndBelow,
+		FalseAtAbove: c.FalseAtAndAbove,
 	}, "", "  ")
 }

lang/constructs/worldgen/surface_rules/Condition_YAbove.go

@@ -55,8 +55,14 @@ func (c YAboveCondition) ExportSymbol(symbol traversal.Symbol, rootDir *lib.File
 
 func (c YAboveCondition) MarshalJSON() ([]byte, error) {
 	return json.MarshalIndent(struct {
-		Type SurfaceConditionKind `json:"type"`
+		Type       SurfaceConditionKind      `json:"type"`
+		Anchor     primitives.VerticalAnchor `json:"anchor"`
+		Multiplier int                       `json:"multiplier"`
+		Add        bool                      `json:"add_stone_depth"`
 	}{
-		Type: YAboveConditionKind,
+		Type:       YAboveConditionKind,
+		Anchor:     c.Anchor,
+		Multiplier: c.Multiplier,
+		Add:        c.Add,
 	}, "", "  ")
 }

lang/constructs/worldgen/surface_rules/SurfaceConditions.go

@@ -24,6 +24,7 @@ const (
 	VerticalGradientConditionKind SurfaceConditionKind = "minecraft:vertical_gradient"
 	AboveWaterConditionKind       SurfaceConditionKind = "minecraft:water"
 	YAboveConditionKind           SurfaceConditionKind = "minecraft:y_above"
+	NotConditionKind              SurfaceConditionKind = "minecraft:not"
 	ReferenceConditionKind        SurfaceConditionKind = "mms:__reference"
 )
 
@@ -36,11 +37,16 @@ func init() {
 			if sc := def.SurfaceCondition(); sc != nil {
 				if sc.GetChildCount() > 0 {
 					if prc, ok := sc.GetChild(0).(antlr.ParserRuleContext); ok {
-						return traversal.ConstructRegistry.Construct(
+						cond := traversal.ConstructRegistry.Construct(
 							prc,
 							currentNamespace,
 							scope,
 						)
+						if sc.Bang() != nil {
+							return InvertCondition(cond)
+						} else {
+							return cond
+						}
 					}
 				}
 			}
@@ -64,10 +70,6 @@ func exportSurfaceCondition(symbol traversal.Symbol, rootDir *lib.FileTreeLike,
 	return nil
 }
 
-func InvertCondition(condition traversal.Construct) traversal.Construct {
-	return condition
-}
-
 type BaseSurfaceCondition struct {
 	traversal.Construct
 	Negate bool