Remove dependency to LibCD

DawnTeamMC · Mar 8, 2022 · 4bf189a · 4bf189a
1 parent 6529227
commit 4bf189a
Show file tree

Hide file tree

Showing 22 changed files with 104 additions and 102 deletions.
diff --git a/src/main/resources/data/columns/tags/blocks/columns.json b/src/main/resources/data/columns/tags/blocks/columns.json
@@ -1,17 +1,13 @@
 {
 	"replace": false,
-	"values": [],
-	"libcd": {
-		"entries": [
-			{
-				"when": {
-					"libcd:mod_loaded": "columns"
-				},
-				"values": [
-					"promenade:blunite_column",
-					"promenade:carbonite_column"
-				]
-			}
-		]
-	}
+	"values": [
+		{
+			"id": "promenade:blunite_column",
+			"required": false
+		},
+		{
+			"id": "promenade:carbonite_column",
+			"required": false
+		}
+	]
 }
diff --git a/src/main/resources/data/columns/tags/items/columns.json b/src/main/resources/data/columns/tags/items/columns.json
@@ -1,17 +1,13 @@
 {
 	"replace": false,
-	"values": [],
-	"libcd": {
-		"entries": [
-			{
-				"when": {
-					"libcd:mod_loaded": "columns"
-				},
-				"values": [
-					"promenade:blunite_column",
-					"promenade:carbonite_column"
-				]
-			}
-		]
-	}
+	"values": [
+		{
+			"id": "promenade:blunite_column",
+			"required": false
+		},
+		{
+			"id": "promenade:carbonite_column",
+			"required": false
+		}
+	]
 }
diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/blunite_column.json b/src/main/resources/data/promenade/advancements/recipes/crafting/blunite_column.json
@@ -28,5 +28,13 @@
 			"has_blunite",
 			"has_the_recipe"
 		]
+	],
+	"fabric:load_conditions": [
+		{
+			"condition": "fabric:all_mods_loaded",
+			"values": [
+				"columns"
+			]
+		}
 	]
 }
diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/blunite_column.json.mcmeta b/src/main/resources/data/promenade/advancements/recipes/crafting/blunite_column.json.mcmeta
diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/carbonite_column.json b/src/main/resources/data/promenade/advancements/recipes/crafting/carbonite_column.json
@@ -28,5 +28,13 @@
 			"has_carbonite",
 			"has_the_recipe"
 		]
+	],
+	"fabric:load_conditions": [
+		{
+			"condition": "fabric:all_mods_loaded",
+			"values": [
+				"columns"
+			]
+		}
 	]
 }
diff --git a/src/main/resources/data/promenade/advancements/recipes/crafting/carbonite_column.json.mcmeta b/src/main/resources/data/promenade/advancements/recipes/crafting/carbonite_column.json.mcmeta
diff --git a/src/main/resources/data/promenade/advancements/recipes/stonecutting/blunite_column.json b/src/main/resources/data/promenade/advancements/recipes/stonecutting/blunite_column.json
@@ -28,5 +28,13 @@
 			"has_blunite",
 			"has_the_recipe"
 		]
+	],
+	"fabric:load_conditions": [
+		{
+			"condition": "fabric:all_mods_loaded",
+			"values": [
+				"columns"
+			]
+		}
 	]
 }
diff --git a/...ain/resources/data/promenade/advancements/recipes/stonecutting/blunite_column.json.mcmeta b/...ain/resources/data/promenade/advancements/recipes/stonecutting/blunite_column.json.mcmeta
diff --git a/src/main/resources/data/promenade/advancements/recipes/stonecutting/carbonite_column.json b/src/main/resources/data/promenade/advancements/recipes/stonecutting/carbonite_column.json
@@ -28,5 +28,13 @@
 			"has_carbonite",
 			"has_the_recipe"
 		]
+	],
+	"fabric:load_conditions": [
+		{
+			"condition": "fabric:all_mods_loaded",
+			"values": [
+				"columns"
+			]
+		}
 	]
 }
diff --git a/...n/resources/data/promenade/advancements/recipes/stonecutting/carbonite_column.json.mcmeta b/...n/resources/data/promenade/advancements/recipes/stonecutting/carbonite_column.json.mcmeta
diff --git a/src/main/resources/data/promenade/loot_tables/blocks/blunite_column.json b/src/main/resources/data/promenade/loot_tables/blocks/blunite_column.json
@@ -15,5 +15,13 @@
 				}
 			]
 		}
+	],
+	"fabric:load_conditions": [
+		{
+			"condition": "fabric:all_mods_loaded",
+			"values": [
+				"columns"
+			]
+		}
 	]
 }
diff --git a/src/main/resources/data/promenade/loot_tables/blocks/blunite_column.json.mcmeta b/src/main/resources/data/promenade/loot_tables/blocks/blunite_column.json.mcmeta
diff --git a/src/main/resources/data/promenade/loot_tables/blocks/carbonite_column.json b/src/main/resources/data/promenade/loot_tables/blocks/carbonite_column.json
@@ -15,5 +15,13 @@
 				}
 			]
 		}
+	],
+	"fabric:load_conditions": [
+		{
+			"condition": "fabric:all_mods_loaded",
+			"values": [
+				"columns"
+			]
+		}
 	]
 }
diff --git a/src/main/resources/data/promenade/loot_tables/blocks/carbonite_column.json.mcmeta b/src/main/resources/data/promenade/loot_tables/blocks/carbonite_column.json.mcmeta
diff --git a/src/main/resources/data/promenade/recipes/crafting/blunite_column.json b/src/main/resources/data/promenade/recipes/crafting/blunite_column.json
@@ -13,5 +13,13 @@
 	"result": {
 		"item": "promenade:blunite_column",
 		"count": 6
-	}
+	},
+	"fabric:load_conditions": [
+		{
+			"condition": "fabric:all_mods_loaded",
+			"values": [
+				"columns"
+			]
+		}
+	]
 }
diff --git a/src/main/resources/data/promenade/recipes/crafting/blunite_column.json.mcmeta b/src/main/resources/data/promenade/recipes/crafting/blunite_column.json.mcmeta
diff --git a/src/main/resources/data/promenade/recipes/crafting/carbonite_column.json b/src/main/resources/data/promenade/recipes/crafting/carbonite_column.json
@@ -13,5 +13,13 @@
 	"result": {
 		"item": "promenade:carbonite_column",
 		"count": 6
-	}
+	},
+	"fabric:load_conditions": [
+		{
+			"condition": "fabric:all_mods_loaded",
+			"values": [
+				"columns"
+			]
+		}
+	]
 }
diff --git a/src/main/resources/data/promenade/recipes/crafting/carbonite_column.json.mcmeta b/src/main/resources/data/promenade/recipes/crafting/carbonite_column.json.mcmeta
diff --git a/src/main/resources/data/promenade/recipes/stonecutting/blunite_column.json b/src/main/resources/data/promenade/recipes/stonecutting/blunite_column.json
@@ -4,5 +4,13 @@
 		"item": "promenade:blunite"
 	},
 	"result": "promenade:blunite_column",
-	"count": 1
+	"count": 1,
+	"fabric:load_conditions": [
+		{
+			"condition": "fabric:all_mods_loaded",
+			"values": [
+				"columns"
+			]
+		}
+	]
 }
diff --git a/src/main/resources/data/promenade/recipes/stonecutting/blunite_column.json.mcmeta b/src/main/resources/data/promenade/recipes/stonecutting/blunite_column.json.mcmeta
diff --git a/src/main/resources/data/promenade/recipes/stonecutting/carbonite_column.json b/src/main/resources/data/promenade/recipes/stonecutting/carbonite_column.json
@@ -4,5 +4,13 @@
 		"item": "promenade:carbonite"
 	},
 	"result": "promenade:carbonite_column",
-	"count": 1
+	"count": 1,
+	"fabric:load_conditions": [
+		{
+			"condition": "fabric:all_mods_loaded",
+			"values": [
+				"columns"
+			]
+		}
+	]
 }
diff --git a/src/main/resources/data/promenade/recipes/stonecutting/carbonite_column.json.mcmeta b/src/main/resources/data/promenade/recipes/stonecutting/carbonite_column.json.mcmeta