server-side resource loading is busted right now....

Author: woodiertexas

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

@@ -51,7 +51,11 @@ public class ReloadableResourceManagerMixin {
 		var temp = new MultiPackResourceManager(type, packs);
 		// TODO: figure out exactly what to reload in here when someone reloads resources. 
 		//  also figure out whether or not generating twice can work on a (headless) server
-		DataGeneration.generate(type);
+		
+		ArchitectureExtensions.LOGGER.info("our multipack manager: " + temp.toString());
+		//ArchitectureExtensions.RESOURCE_PACK.clear(ResourceType.CLIENT_RESOURCES);
+		DataGeneration.generate(ResourceType.CLIENT_RESOURCES);
+		ArchitectureExtensions.LOGGER.info("pack type: " + type.toString());
 
 		// might not be needed since we're not giving "temp" to any datageneration method
 		temp.close();

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

@@ -109,26 +109,30 @@ private static void generateMineableByPickaxeTag() {
 		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/blocks/mineable/pickaxe.json"), tag.serialize().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());
 	}
 
 	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/blocks/mineable/axe.json"), tag.serialize().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());
 	}
 
 	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/blocks/needs_stone_tool.json"), tag.serialize().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());
 	}
 
 	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_tables/blocks/" + block.id().getPath() + ".json"), lootTable.serialize().toString());
+			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());
 		}
 	}
 
@@ -145,21 +149,23 @@ private static void generateRecipes() {
 				recipe.addConstant(BASE_PLACEHOLDER, Registries.BLOCK.getId(block.groupedBlock().baseBlock().get()).toString());
 				recipe.addConstant(RESULT_PLACEHOLDER, block.id().toString());
 
-				final var path = template.tablesaw() ? "custom_recipes/tablesaw/" : "recipes/";
+				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());
 			}
 			templates.clear();
 		}
 	}
 
 	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??!??!!?!
+			 //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);
-
+	
 			generateMineableByPickaxeTag();
 			generateMineableByAxeTag();
 			generateNeedsStoneToolTag();