get most of the virtual pack stuff working

Author: woodiertexas

src/main/java/gay/debuggy/architecture_extensions/ArchitectureExtensions.java

@@ -5,7 +5,7 @@
 import gay.debuggy.architecture_extensions.api.ArchExIntegration;
 import gay.debuggy.architecture_extensions.api.BlockGroup;
 import gay.debuggy.architecture_extensions.api.BlockType;
-import gay.debuggy.architecture_extensions.resource.DataGeneration;
+import gay.debuggy.architecture_extensions.resource.MapBackedPack;
 import gay.debuggy.architecture_extensions.staticdata.BlockGroupSchema;
 import gay.debuggy.staticdata.api.StaticData;
 import gay.debuggy.staticdata.api.StaticDataItem;
@@ -19,18 +19,16 @@
 import net.minecraft.registry.Registry;
 import net.minecraft.registry.RegistryKey;
 import net.minecraft.registry.RegistryKeys;
-import net.minecraft.resource.ResourceType;
 import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
-import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.util.List;
 import java.util.Set;
 
-public class ArchitectureExtensions implements ModInitializer, PackRegistrationContext.Callback {
+public class ArchitectureExtensions implements ModInitializer {
 	public static final String MOD_ID = "architecture_extensions";
 	public static final Logger LOGGER = LoggerFactory.getLogger("Architecture Extensions");
 
@@ -43,7 +41,7 @@ public class ArchitectureExtensions implements ModInitializer, PackRegistrationC
 	public static final BlockCreationCallback CALLBACK_ADD_TO_ITEM_GROUP = (group, blockType, baseBlock, derivedBlock) ->
 		ItemGroupUtil.pull(ArchitectureExtensions.ITEM_GROUP, blockType, baseBlock, derivedBlock.asItem());
 
-	public static final InMemoryPack RESOURCE_PACK = new InMemoryPack.Named("Architecture Extensions");
+	public static final MapBackedPack RESOURCE_PACK = new MapBackedPack();
 
 	@Override
 	public void onInitialize() {
@@ -93,15 +91,17 @@ public void onInitialize() {
 		DeferredRegistration.init();
 
 		ItemGroupUtil.push();
-
-		ResourceLoader.get(ResourceType.SERVER_DATA).getRegisterDefaultPackEvent().register(this);
+		
+		//ResourceManagerHelper.get(ResourceType.SERVER_DATA).getRegisterDefaultPackEvent().register(this);
 	}
 
+	/*
 	@Override
 	public void onRegisterPack(@NotNull PackRegistrationContext context) {
 		DataGeneration.generate(ResourceType.SERVER_DATA);
 		context.addResourcePack(RESOURCE_PACK);
 	}
+	 */
 
 	public static Identifier id(String path) {
 		return Identifier.of("architecture_extensions", path);

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

@@ -0,0 +1,67 @@
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+/*
+ * <a href="https://github.com/Sweet-Berry-Collective/Wandering-Wizardry/blob/1.21/common/src/main/java/dev/sweetberry/wwizardry/mixin/Mixin_ReloadableResourceManager.java">
+ *     Borrowed from Wandering Wizardry with Octal's permission.
+ * </a>
+ */
+package gay.debuggy.architecture_extensions.mixin;
+
+import gay.debuggy.architecture_extensions.ArchitectureExtensions;
+import net.minecraft.resource.MultiPackResourceManager;
+import net.minecraft.resource.ResourceReload;
+import net.minecraft.resource.pack.ResourcePack;
+import net.minecraft.util.Unit;
+import net.minecraft.resource.ResourceType;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.ModifyArg;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Executor;
+
+public class ReloadableResourceManagerMixin {
+	@Shadow
+	@Final
+	ResourceType type;
+
+
+	@Inject(
+		method = "createReload",
+		at = @At(
+			value = "INVOKE",
+			target = "Lnet/minecraft/resource/MultiPackResourceManager;<init>(Lnet/minecraft/resource/ResourceType;Ljava/util/List;)V",
+			shift = At.Shift.BEFORE
+		)
+	)
+	private void archEx$reloadGeneratedData(Executor prepareExecutor, Executor applyExecutor, CompletableFuture<Unit> initialStage, List<ResourcePack> packs, CallbackInfoReturnable<ResourceReload> cir) {
+		var temp = new MultiPackResourceManager(type, packs);
+		try {
+			// (re)load arch-ex's virtual resource pack
+		} catch (IOException ex) {}
+		temp.close();
+	}
+
+	@ModifyArg(
+		method = "createReload",
+		at = @At(
+			value = "INVOKE",
+			target = "Lnet/minecraft/server/packs/resources/MultiPackResourceManager;<init>(Lnet/minecraft/server/packs/PackType;Ljava/util/List;)V"
+		)
+	)
+	private List<ResourcePack> archEx$getPacks(List<ResourcePack> old) {
+		var packs = new ArrayList<>(old);
+		packs.add(ArchitectureExtensions.RESOURCE_PACK); // add arch-ex's virtual resource pack
+		return packs;
+	}
+}

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

@@ -90,44 +90,44 @@ private static void generateModels(TypedGroupedBlock block) {
 				if (rawModel.contains(textureId)) model.addTexture(textureId, textureConfiguration.apply(block.type(), textureId));
 			}
 
-			ArchitectureExtensions.RESOURCE_PACK.putTextAsync(ResourceType.CLIENT_RESOURCES, Identifier.of(modelId.getNamespace(), modelId.getPath() + variant + ".json"), path -> model.serialize().toString());
+			ArchitectureExtensions.RESOURCE_PACK.put(ResourceType.CLIENT_RESOURCES, Identifier.of(modelId.getNamespace(), modelId.getPath() + variant + ".json"), model.serialize().toString());
 		}
 
 		var itemModel = "{\"parent\":\"" + modelId.toString().replaceFirst("models/", "") + "\"}";
-		ArchitectureExtensions.RESOURCE_PACK.putText(ResourceType.CLIENT_RESOURCES, Identifier.of(modelId.getNamespace(), modelId.getPath().replaceFirst("block", "item") + ".json"), itemModel);
+		ArchitectureExtensions.RESOURCE_PACK.put(ResourceType.CLIENT_RESOURCES, Identifier.of(modelId.getNamespace(), modelId.getPath().replaceFirst("block", "item") + ".json"), itemModel);
 	}
 
 	private static void generateBlockState(TypedGroupedBlock block) {
 		var rawBlockState = getBlockStateTemplate(block.type());
 		if (rawBlockState == null) return;
 		var blockState = new BlockStateTemplate(rawBlockState);
 		blockState.addConstant(MODEL_PLACEHOLDER, Identifier.of(block.id().getNamespace(), "block/" + block.id().getPath()).toString());
-		ArchitectureExtensions.RESOURCE_PACK.putTextAsync(ResourceType.CLIENT_RESOURCES, Identifier.of(block.id().getNamespace(), "blockstates/" + block.id().getPath() + ".json"), path -> blockState.serialize().toString());
+		ArchitectureExtensions.RESOURCE_PACK.put(ResourceType.CLIENT_RESOURCES, Identifier.of(block.id().getNamespace(), "blockstates/" + block.id().getPath() + ".json"), blockState.serialize().toString());
 	}
 
 	private static void generateMineableByPickaxeTag() {
 		var tag = TagTemplate.DEFAULT.get();
 		BLOCKS.forEach(block -> { if (BlockContentRegistries.STRIPPABLE.get(block.groupedBlock().baseBlock().get()).isEmpty()) tag.addValue(block.id().toString()); });
-		ArchitectureExtensions.RESOURCE_PACK.putTextAsync(ResourceType.SERVER_DATA, Identifier.of("tags/blocks/mineable/pickaxe.json"), path -> tag.serialize().toString());
+		ArchitectureExtensions.RESOURCE_PACK.put(ResourceType.SERVER_DATA, Identifier.of("tags/blocks/mineable/pickaxe.json"), tag.serialize().toString());
 	}
 
 	private static void generateMineableByAxeTag() {
 		var tag = TagTemplate.DEFAULT.get();
 		BLOCKS.forEach(block -> { if (BlockContentRegistries.STRIPPABLE.get(block.groupedBlock().baseBlock().get()).isPresent()) tag.addValue(block.id().toString()); });
-		ArchitectureExtensions.RESOURCE_PACK.putTextAsync(ResourceType.SERVER_DATA, Identifier.of("tags/blocks/mineable/axe.json"), path -> tag.serialize().toString());
+		ArchitectureExtensions.RESOURCE_PACK.put(ResourceType.SERVER_DATA, Identifier.of("tags/blocks/mineable/axe.json"), tag.serialize().toString());
 	}
 
 	private static void generateNeedsStoneToolTag() {
 		var tag = TagTemplate.DEFAULT.get();
 		BLOCKS.forEach(block -> tag.addValue(block.id().toString()));
-		ArchitectureExtensions.RESOURCE_PACK.putTextAsync(ResourceType.SERVER_DATA, Identifier.of("tags/blocks/needs_stone_tool.json"), path -> tag.serialize().toString());
+		ArchitectureExtensions.RESOURCE_PACK.put(ResourceType.SERVER_DATA, Identifier.of("tags/blocks/needs_stone_tool.json"), tag.serialize().toString());
 	}
 
 	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.putTextAsync(ResourceType.SERVER_DATA, Identifier.of(block.id().getNamespace(), "loot_tables/blocks/" + block.id().getPath() + ".json"), path -> lootTable.serialize().toString());
+			ArchitectureExtensions.RESOURCE_PACK.put(ResourceType.SERVER_DATA, Identifier.of(block.id().getNamespace(), "loot_tables/blocks/" + block.id().getPath() + ".json"), lootTable.serialize().toString());
 		}
 	}
 
@@ -146,7 +146,7 @@ private static void generateRecipes() {
 
 				final var path = template.tablesaw() ? "custom_recipes/tablesaw/" : "recipes/";
 				final var prefix = template.simple() ? "" : block.id().getPath() + "_";
-				ArchitectureExtensions.RESOURCE_PACK.putTextAsync(ResourceType.SERVER_DATA, Identifier.of(block.id().getNamespace(), path + prefix + template.id() + ".json"), blah -> recipe.serialize().toString());
+				ArchitectureExtensions.RESOURCE_PACK.put(ResourceType.SERVER_DATA, Identifier.of(block.id().getNamespace(), path + prefix + template.id() + ".json"), recipe.serialize().toString());
 			}
 			templates.clear();
 		}

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

@@ -0,0 +1,137 @@
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+/*
+ * <a href="https://github.com/Sweet-Berry-Collective/Wandering-Wizardry/blob/1.21/common/src/main/java/dev/sweetberry/wwizardry/api/resource/MapBackedPack.java">
+ *     Borrowed from Wandering Wizardry with Octal's permission.
+ * </a>
+ */
+package gay.debuggy.architecture_extensions.resource;
+
+import gay.debuggy.architecture_extensions.ArchitectureExtensions;
+import net.minecraft.resource.ResourceIoSupplier;
+import net.minecraft.resource.ResourceType;
+import net.minecraft.resource.pack.PackLocationInfo;
+import net.minecraft.resource.pack.PackSource;
+import net.minecraft.resource.pack.ResourcePack;
+import net.minecraft.resource.pack.metadata.ResourceMetadataSectionReader;
+import net.minecraft.text.Text;
+import net.minecraft.util.Identifier;
+import org.jetbrains.annotations.Nullable;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
+
+public class MapBackedPack implements ResourcePack {
+	private final Map<Identifier, byte[]> assets = new ConcurrentHashMap<>();
+	private final Map<Identifier, byte[]> data = new ConcurrentHashMap<>();
+	private final Map<String, byte[]> root = new ConcurrentHashMap<>();
+
+	public void put(ResourceType type, Identifier id, byte[] bytes) {
+		getForType(type).put(id, bytes);
+	}
+
+	public void put(String path, byte[] bytes) {
+		root.put(path, bytes);
+	}
+
+	public void put(ResourceType type, Identifier id, String text) {
+		put(type, id, text.getBytes(StandardCharsets.UTF_8));
+	}
+
+	public void put(String path, String text) {
+		put(path, text.getBytes(StandardCharsets.UTF_8));
+	}
+
+	@Override
+	public @Nullable ResourceIoSupplier<InputStream> openRoot(String... path) {
+		return open(root, String.join("/", path));
+	}
+
+	@Override
+	public @Nullable ResourceIoSupplier<InputStream> open(ResourceType type, Identifier id) {
+		return open(getForType(type), id);
+	}
+
+	@Override
+	public void listResources(ResourceType type, String namespace, String startingPath, ResourceConsumer consumer) {
+		getForType(type)
+			.entrySet()
+			.stream()
+			.filter(entry ->
+				entry.getKey().getNamespace().equals(namespace)
+					&& entry.getKey().getPath().startsWith(startingPath)
+			).forEach(entry -> {
+				var bytes = entry.getValue();
+				if (bytes == null)
+					return;
+				consumer.accept(entry.getKey(), () -> new ByteArrayInputStream(bytes));
+			});
+	}
+
+	@Override
+	public Set<String> getNamespaces(ResourceType type) {
+		return getForType(type)
+			.keySet()
+			.stream()
+			.map(Identifier::getNamespace)
+			.collect(Collectors.toUnmodifiableSet());
+	}
+
+	@Override
+	public @Nullable <T> T parseMetadata(ResourceMetadataSectionReader<T> metaReader) throws IOException {
+		return null;
+	}
+
+	@Override
+	public PackLocationInfo getLocationInfo() {
+		return new PackLocationInfo(ArchitectureExtensions.MOD_ID, Text.empty(), PackSource.PACK_SOURCE_BUILTIN, Optional.empty());
+	}
+
+	@Nullable
+	public <T> T getMetadataSection(ResourceMetadataSectionReader<T> metaReader) throws IOException {
+		return null;
+	}
+
+	public String packId() {
+		return "Arch-Ex Resources";
+	}
+
+	@Override
+	public void close() {
+		
+	}
+
+	public void clear() {
+		root.clear();
+		assets.clear();
+		data.clear();
+	}
+
+	public void clear(ResourceType type) {
+		getForType(type).clear();
+	}
+
+	private Map<Identifier, byte[]> getForType(ResourceType type) {
+		if (type == ResourceType.CLIENT_RESOURCES)
+			return assets;
+		return data;
+	}
+
+	private <T> ResourceIoSupplier<InputStream> open(Map<T, byte[]> map, T path) {
+		var bytes = map.get(path);
+		if (bytes == null)
+			return null;
+		return () -> new ByteArrayInputStream(bytes);
+	}
+}

src/main/resources/architecture_extensions.mixins.json

@@ -0,0 +1,12 @@
+{
+	"required": true,
+	"minVersion": "0.8",
+	"package": "gay.debuggy.architecture_extensions.mixin",
+	"compatibilityLevel": "JAVA_21",
+	"mixins": [
+		"ReloadableResourceManagerMixin"
+	],
+	"injectors": {
+		"defaultRequire": 1
+	}
+}