diff --git a/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json b/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json
index f8a400b2f..f4c24ff06 100644
--- a/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json
+++ b/kubejs/data/tfg/worldgen/biome/mars/amber_hills.json
@@ -54,9 +54,17 @@
 	],
 	"has_precipitation": false,
 	"spawn_costs": {
-		"ad_astra:martian_raptor": {
-			"charge": 0.2,
-			"energy_budget": 0.015
+		"endermanoverhaul:crimson_forest_enderman": {
+			"energy_budget": 0.15,
+			"charge": 0.7
+		},
+		"endermanoverhaul:warped_forest_enderman": {
+			"energy_budget": 0.15,
+			"charge": 0.7
+		},
+		"endermanoverhaul:badlands_enderman": {
+			"energy_budget": 0.15,
+			"charge": 0.7
 		}
 	},
 	"spawners": {
diff --git a/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json b/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json
index cf11f53bf..2e12af65d 100644
--- a/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json
+++ b/kubejs/data/tfg/worldgen/biome/mars/amber_plains.json
@@ -57,9 +57,17 @@
 	],
 	"has_precipitation": false,
 	"spawn_costs": {
-		"ad_astra:martian_raptor": {
-			"charge": 0.2,
-			"energy_budget": 0.015
+		"endermanoverhaul:crimson_forest_enderman": {
+			"energy_budget": 0.15,
+			"charge": 0.7
+		},
+		"endermanoverhaul:warped_forest_enderman": {
+			"energy_budget": 0.15,
+			"charge": 0.7
+		},
+		"endermanoverhaul:badlands_enderman": {
+			"energy_budget": 0.15,
+			"charge": 0.7
 		}
 	},
 	"spawners": {
diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_deep_desert.json b/kubejs/data/tfg/worldgen/biome/mars/martian_deep_desert.json
index 0be7126ab..70568b19b 100644
--- a/kubejs/data/tfg/worldgen/biome/mars/martian_deep_desert.json
+++ b/kubejs/data/tfg/worldgen/biome/mars/martian_deep_desert.json
@@ -48,10 +48,7 @@
 	],
 	"has_precipitation": false,
 	"spawn_costs": {
-		"ad_astra:martian_raptor": {
-			"charge": 0.2,
-			"energy_budget": 0.015
-		}
+		
 	},
 	"spawners": {
 		"ambient": [],
diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_dune_edge.json b/kubejs/data/tfg/worldgen/biome/mars/martian_dune_edge.json
index 0be7126ab..8728fe09f 100644
--- a/kubejs/data/tfg/worldgen/biome/mars/martian_dune_edge.json
+++ b/kubejs/data/tfg/worldgen/biome/mars/martian_dune_edge.json
@@ -48,9 +48,17 @@
 	],
 	"has_precipitation": false,
 	"spawn_costs": {
-		"ad_astra:martian_raptor": {
-			"charge": 0.2,
-			"energy_budget": 0.015
+		"endermanoverhaul:crimson_forest_enderman": {
+			"energy_budget": 0.15,
+			"charge": 0.7
+		},
+		"endermanoverhaul:warped_forest_enderman": {
+			"energy_budget": 0.15,
+			"charge": 0.7
+		},
+		"endermanoverhaul:badlands_enderman": {
+			"energy_budget": 0.15,
+			"charge": 0.7
 		}
 	},
 	"spawners": {
@@ -59,7 +67,12 @@
 		"creature": [],
 		"misc": [],
 		"monster": [
-		
+			{
+				"type": "endermanoverhaul:badlands_enderman",
+				"maxCount": 1,
+				"minCount": 1,
+				"weight": 100
+			}
 		],
 		"underground_water_creature": [],
 		"water_ambient": [],
diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_dunes.json b/kubejs/data/tfg/worldgen/biome/mars/martian_dunes.json
index 0be7126ab..70568b19b 100644
--- a/kubejs/data/tfg/worldgen/biome/mars/martian_dunes.json
+++ b/kubejs/data/tfg/worldgen/biome/mars/martian_dunes.json
@@ -48,10 +48,7 @@
 	],
 	"has_precipitation": false,
 	"spawn_costs": {
-		"ad_astra:martian_raptor": {
-			"charge": 0.2,
-			"energy_budget": 0.015
-		}
+		
 	},
 	"spawners": {
 		"ambient": [],
diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json b/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json
index 39fceacc2..158eec48f 100644
--- a/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json
+++ b/kubejs/data/tfg/worldgen/biome/mars/martian_mountains.json
@@ -54,9 +54,17 @@
 	],
 	"has_precipitation": false,
 	"spawn_costs": {
-		"ad_astra:martian_raptor": {
-			"charge": 0.2,
-			"energy_budget": 0.015
+		"endermanoverhaul:crimson_forest_enderman": {
+			"energy_budget": 0.15,
+			"charge": 0.7
+		},
+		"endermanoverhaul:warped_forest_enderman": {
+			"energy_budget": 0.15,
+			"charge": 0.7
+		},
+		"endermanoverhaul:badlands_enderman": {
+			"energy_budget": 0.15,
+			"charge": 0.7
 		}
 	},
 	"spawners": {
diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_oasis.json b/kubejs/data/tfg/worldgen/biome/mars/martian_oasis.json
index 1da76f314..88e556e5f 100644
--- a/kubejs/data/tfg/worldgen/biome/mars/martian_oasis.json
+++ b/kubejs/data/tfg/worldgen/biome/mars/martian_oasis.json
@@ -51,9 +51,17 @@
 	],
 	"has_precipitation": false,
 	"spawn_costs": {
-		"ad_astra:martian_raptor": {
-			"charge": 0.2,
-			"energy_budget": 0.015
+		"endermanoverhaul:crimson_forest_enderman": {
+			"energy_budget": 0.15,
+			"charge": 0.7
+		},
+		"endermanoverhaul:warped_forest_enderman": {
+			"energy_budget": 0.15,
+			"charge": 0.7
+		},
+		"endermanoverhaul:badlands_enderman": {
+			"energy_budget": 0.15,
+			"charge": 0.7
 		}
 	},
 	"spawners": {
diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_river.json b/kubejs/data/tfg/worldgen/biome/mars/martian_river.json
index 69e0e53c0..d066e2e6e 100644
--- a/kubejs/data/tfg/worldgen/biome/mars/martian_river.json
+++ b/kubejs/data/tfg/worldgen/biome/mars/martian_river.json
@@ -53,9 +53,17 @@
 	],
 	"has_precipitation": false,
 	"spawn_costs": {
-		"ad_astra:martian_raptor": {
-			"charge": 0.2,
-			"energy_budget": 0.015
+		"endermanoverhaul:crimson_forest_enderman": {
+			"energy_budget": 0.15,
+			"charge": 0.7
+		},
+		"endermanoverhaul:warped_forest_enderman": {
+			"energy_budget": 0.15,
+			"charge": 0.7
+		},
+		"endermanoverhaul:badlands_enderman": {
+			"energy_budget": 0.15,
+			"charge": 0.7
 		}
 	},
 	"spawners": {
diff --git a/kubejs/data/tfg/worldgen/biome/mars/martian_riverbed.json b/kubejs/data/tfg/worldgen/biome/mars/martian_riverbed.json
index a7e2e6ae5..332ba2e4b 100644
--- a/kubejs/data/tfg/worldgen/biome/mars/martian_riverbed.json
+++ b/kubejs/data/tfg/worldgen/biome/mars/martian_riverbed.json
@@ -54,9 +54,17 @@
 	],
 	"has_precipitation": false,
 	"spawn_costs": {
-		"ad_astra:martian_raptor": {
-			"charge": 0.2,
-			"energy_budget": 0.015
+		"endermanoverhaul:crimson_forest_enderman": {
+			"energy_budget": 0.15,
+			"charge": 0.7
+		},
+		"endermanoverhaul:warped_forest_enderman": {
+			"energy_budget": 0.15,
+			"charge": 0.7
+		},
+		"endermanoverhaul:badlands_enderman": {
+			"energy_budget": 0.15,
+			"charge": 0.7
 		}
 	},
 	"spawners": {
diff --git a/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json b/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json
index f8a400b2f..f4c24ff06 100644
--- a/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json
+++ b/kubejs/data/tfg/worldgen/biome/mars/rusticus_hills.json
@@ -54,9 +54,17 @@
 	],
 	"has_precipitation": false,
 	"spawn_costs": {
-		"ad_astra:martian_raptor": {
-			"charge": 0.2,
-			"energy_budget": 0.015
+		"endermanoverhaul:crimson_forest_enderman": {
+			"energy_budget": 0.15,
+			"charge": 0.7
+		},
+		"endermanoverhaul:warped_forest_enderman": {
+			"energy_budget": 0.15,
+			"charge": 0.7
+		},
+		"endermanoverhaul:badlands_enderman": {
+			"energy_budget": 0.15,
+			"charge": 0.7
 		}
 	},
 	"spawners": {
diff --git a/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json b/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json
index cf11f53bf..2e12af65d 100644
--- a/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json
+++ b/kubejs/data/tfg/worldgen/biome/mars/rusticus_plains.json
@@ -57,9 +57,17 @@
 	],
 	"has_precipitation": false,
 	"spawn_costs": {
-		"ad_astra:martian_raptor": {
-			"charge": 0.2,
-			"energy_budget": 0.015
+		"endermanoverhaul:crimson_forest_enderman": {
+			"energy_budget": 0.15,
+			"charge": 0.7
+		},
+		"endermanoverhaul:warped_forest_enderman": {
+			"energy_budget": 0.15,
+			"charge": 0.7
+		},
+		"endermanoverhaul:badlands_enderman": {
+			"energy_budget": 0.15,
+			"charge": 0.7
 		}
 	},
 	"spawners": {
diff --git a/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json b/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json
index f8a400b2f..f4c24ff06 100644
--- a/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json
+++ b/kubejs/data/tfg/worldgen/biome/mars/sangnum_hills.json
@@ -54,9 +54,17 @@
 	],
 	"has_precipitation": false,
 	"spawn_costs": {
-		"ad_astra:martian_raptor": {
-			"charge": 0.2,
-			"energy_budget": 0.015
+		"endermanoverhaul:crimson_forest_enderman": {
+			"energy_budget": 0.15,
+			"charge": 0.7
+		},
+		"endermanoverhaul:warped_forest_enderman": {
+			"energy_budget": 0.15,
+			"charge": 0.7
+		},
+		"endermanoverhaul:badlands_enderman": {
+			"energy_budget": 0.15,
+			"charge": 0.7
 		}
 	},
 	"spawners": {
diff --git a/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json b/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json
index cf11f53bf..2e12af65d 100644
--- a/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json
+++ b/kubejs/data/tfg/worldgen/biome/mars/sangnum_plains.json
@@ -57,9 +57,17 @@
 	],
 	"has_precipitation": false,
 	"spawn_costs": {
-		"ad_astra:martian_raptor": {
-			"charge": 0.2,
-			"energy_budget": 0.015
+		"endermanoverhaul:crimson_forest_enderman": {
+			"energy_budget": 0.15,
+			"charge": 0.7
+		},
+		"endermanoverhaul:warped_forest_enderman": {
+			"energy_budget": 0.15,
+			"charge": 0.7
+		},
+		"endermanoverhaul:badlands_enderman": {
+			"energy_budget": 0.15,
+			"charge": 0.7
 		}
 	},
 	"spawners": {