update recipe format for 1.21.1 + enable temporary logging in DataGeneration, and attempt to get MC to load our server data (recipes and so on)

Author: woodiertexas

src/main/java/gay/debuggy/architecture_extensions/mixin/ReloadableResourceManagerMixin.java

@@ -53,8 +53,9 @@ public class ReloadableResourceManagerMixin {
 		//  also figure out whether or not generating twice can work on a (headless) server
 
 		ArchitectureExtensions.LOGGER.info("our multipack manager: " + temp.toString());
-		//ArchitectureExtensions.RESOURCE_PACK.clear(ResourceType.CLIENT_RESOURCES);
+		ArchitectureExtensions.RESOURCE_PACK.clear(ResourceType.CLIENT_RESOURCES);
 		DataGeneration.generate(ResourceType.CLIENT_RESOURCES);
+		DataGeneration.generate(ResourceType.SERVER_DATA);
 		ArchitectureExtensions.LOGGER.info("pack type: " + type.toString());
 
 		// might not be needed since we're not giving "temp" to any datageneration method

src/main/java/gay/debuggy/architecture_extensions/resource/DataGeneration.java

@@ -110,29 +110,29 @@ private static void generateMineableByPickaxeTag() {
 
 		BLOCKS.forEach(block -> { if (!IsLog.isLog(block.id())) tag.addValue(block.id().toString()); });
 		ArchitectureExtensions.RESOURCE_PACK.put(ResourceType.SERVER_DATA, Identifier.parse("tags/block/mineable/pickaxe.json"), tag.serialize().toString());
-		//ArchitectureExtensions.LOGGER.info("our pickaxe mineable tag: {}", tag.serialize());
+		ArchitectureExtensions.LOGGER.info("our pickaxe mineable tag: {}", tag.serialize());
 	}
 
 	private static void generateMineableByAxeTag() {
 		var tag = TagTemplate.DEFAULT.get();
 		BLOCKS.forEach(block -> { if (IsLog.isLog(block.id())) tag.addValue(block.id().toString()); });
 		ArchitectureExtensions.RESOURCE_PACK.put(ResourceType.SERVER_DATA, Identifier.parse("tags/block/mineable/axe.json"), tag.serialize().toString());
-		//ArchitectureExtensions.LOGGER.info("our axe mineable tag: {}", tag.serialize());
+		ArchitectureExtensions.LOGGER.info("our axe mineable tag: {}", tag.serialize());
 	}
 
 	private static void generateNeedsStoneToolTag() {
 		var tag = TagTemplate.DEFAULT.get();
 		BLOCKS.forEach(block -> tag.addValue(block.id().toString()));
 		ArchitectureExtensions.RESOURCE_PACK.put(ResourceType.SERVER_DATA, Identifier.parse("tags/block/needs_stone_tool.json"), tag.serialize().toString());
-		//ArchitectureExtensions.LOGGER.info("our stone tool tag: {}", tag.serialize());
+		ArchitectureExtensions.LOGGER.info("our stone tool tag: {}", tag.serialize());
 	}
 
 	private static void generateLootTables() {
 		for (TypedGroupedBlock block : BLOCKS) {
 			var lootTable = LootTableTemplate.BLOCK_BREAK.get();
 			lootTable.addPool(JPool.ofItems(block.id()).addCondition(JCondition.SURVIVES_EXPLOSION.get()));
 			ArchitectureExtensions.RESOURCE_PACK.put(ResourceType.SERVER_DATA, Identifier.of(block.id().getNamespace(), "loot_table/blocks/" + block.id().getPath() + ".json"), lootTable.serialize().toString());
-			//ArchitectureExtensions.LOGGER.info("loot table: {}", lootTable.serialize());
+			ArchitectureExtensions.LOGGER.info("loot table: {}", lootTable.serialize());
 		}
 	}
 
@@ -152,8 +152,8 @@ private static void generateRecipes() {
 				final var path = template.tablesaw() ? "custom_recipes/tablesaw/" : "recipe/";
 				final var prefix = template.simple() ? "" : block.id().getPath() + "_";
 				ArchitectureExtensions.RESOURCE_PACK.put(ResourceType.SERVER_DATA, Identifier.of(block.id().getNamespace(), path + prefix + template.id() + ".json"), recipe.serialize().toString());
-				//ArchitectureExtensions.LOGGER.info("{} recipe path: {}", template.id(), Identifier.of(block.id().getNamespace(), path + prefix + template.id() + ".json"));
-				//ArchitectureExtensions.LOGGER.info("{} recipe contents: {}", template.id(), recipe.serialize());
+				ArchitectureExtensions.LOGGER.info("{} recipe path: {}", template.id(), Identifier.of(block.id().getNamespace(), path + prefix + template.id() + ".json"));
+				ArchitectureExtensions.LOGGER.info("{} recipe contents: {}", template.id(), recipe.serialize());
 			}
 			templates.clear();
 		}
@@ -162,24 +162,26 @@ private static void generateRecipes() {
 	public static void generate(ResourceType resourceType) {
 		if (resourceType == ResourceType.SERVER_DATA) {
 			 //needs to be a count since for some reason server data tries to get generated 4 TIMES??!??!!?!
-			++serverLoadCount;
-			if (serverLoadCount % 4 == 1) return;
-			if (serverLoadCount > 4) ResourceUtils.refreshCaches(ResourceType.SERVER_DATA);
-	
+			ArchitectureExtensions.LOGGER.info("are we going to actually load this stuff?");
+			//++serverLoadCount;
+			//if (serverLoadCount % 4 == 1) return;
+			//if (serverLoadCount > 4) ResourceUtils.refreshCaches(ResourceType.SERVER_DATA);
 			generateMineableByPickaxeTag();
 			generateMineableByAxeTag();
 			generateNeedsStoneToolTag();
 			generateLootTables();
 			generateRecipes();
+			
+			ArchitectureExtensions.LOGGER.info("excuse me, what?");
 
 			return;
 		}
 
 		if (resourceType == ResourceType.CLIENT_RESOURCES) {
 			// needs to be a count since for some reason client resources try to get generated 2 times!
-			++clientLoadCount;
-			if (clientLoadCount % 2 == 1) return;
-			if (clientLoadCount > 1) ResourceUtils.refreshCaches(ResourceType.CLIENT_RESOURCES);
+			//++clientLoadCount;
+			//if (clientLoadCount % 2 == 1) return;
+			//if (clientLoadCount > 1) ResourceUtils.refreshCaches(ResourceType.CLIENT_RESOURCES);
 
 			for (TypedGroupedBlock block : BLOCKS) {
 				generateModels(block);

src/main/resources/data/architecture_extensions/templates/recipe/fence_to_post.json

@@ -15,6 +15,7 @@
 	],
 	"result": {
 		"item": "{result}",
+		"id": "{group}",
 		"count": 1
 	}
 }

src/main/resources/data/architecture_extensions/templates/recipe/h_beam.json

@@ -14,6 +14,7 @@
 		}
 	},
 	"result": {
-		"item": "{result}"
+		"item": "{result}",
+		"id": "{group}"
 	}
 }

src/main/resources/data/architecture_extensions/templates/recipe/i_beam.json

@@ -11,6 +11,7 @@
 		}
 	},
 	"result": {
-		"item": "{result}"
+		"item": "{result}",
+		"id": "{group}"
 	}
 }

src/main/resources/data/architecture_extensions/templates/recipe/post_to_fence.json

@@ -15,6 +15,7 @@
 	],
 	"result": {
 		"item": "{group}_fence",
+		"id": "{group}",
 		"count": 1
 	}
 }

src/main/resources/data/architecture_extensions/templates/recipe/post_to_wall.json

@@ -15,6 +15,7 @@
 	],
 	"result": {
 		"item": "{group}_wall",
+		"id": "{group}",
 		"count": 1
 	}
 }

src/main/resources/data/architecture_extensions/templates/recipe/square_tube.json

@@ -12,6 +12,7 @@
 	},
 	"result": {
 		"item": "{result}",
+		"id": "{group}",
 		"count": 1
 	}
 }

src/main/resources/data/architecture_extensions/templates/recipe/stonecutting.json

@@ -4,5 +4,6 @@
 		"item": "{base}"
 	},
 	"result": "{result}",
+	"id": "{group}",
 	"count": 1
 }

src/main/resources/data/architecture_extensions/templates/recipe/wall_to_post.json

@@ -15,6 +15,7 @@
 	],
 	"result": {
 		"item": "{result}",
+		"id": "{group}",
 		"count": 1
 	}
 }