Merge branch '1.20.5' into 1.20.4

CHANGELOG.md

@@ -1,13 +1,4 @@
-### Updated to 1.20.5
-
-### Tweaks
-* Significantly reduce EMI's RAM consumption at the minor cost of niche ItemStack identity dependency scenarios (halved total RAM consumption in smaller pack testing with other optimization mods).
-* Fluid hovering highlight no longer covers the fluid in the sidebar.
-
 ### Fixes
-* Tooltips rendering in peculiar locations in Mekanism GUIs #480
-* Support for custom tag types #483
-
-### API (Experimental)
-* Expose registry adapter registration to allow tag collection of arbitrary registry types.
-* SlotWidget.getRecipe is no longer marked as internal.
+* Fixed deprecated API being removed on older versions instead of remaining deprecated
+* Fixed 1.20.6 item deletion (#525)
+* Registry adapters can now be registered for dynamic registries (#527)

gradle.properties

@@ -4,7 +4,7 @@ minecraft_version=1.20.4
 enabled_platforms=fabric,neoforge
 
 archives_base_name=emi
-mod_version=1.1.5
+mod_version=1.1.6
 maven_group=dev.emi
 
 architectury_version=4.9.83

xplat/src/main/java/dev/emi/emi/EmiUtil.java

@@ -29,9 +29,7 @@
 import net.minecraft.inventory.Inventory;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraft.registry.Registries;
 import net.minecraft.registry.Registry;
-import net.minecraft.registry.RegistryKey;
 import net.minecraft.registry.entry.RegistryEntry;
 import net.minecraft.registry.entry.RegistryEntryList.Named;
 import net.minecraft.registry.tag.TagKey;
@@ -57,9 +55,9 @@ public static String subId(Fluid fluid) {
 		return subId(EmiPort.getFluidRegistry().getId(fluid));
 	}
 
-	@SuppressWarnings({"unchecked", "rawtypes"})
 	public static <T> Stream<RegistryEntry<T>> values(TagKey<T> key) {
-		Registry<T> registry = Registries.REGISTRIES.get((RegistryKey) key.registry());
+		MinecraftClient client = MinecraftClient.getInstance();
+		Registry<T> registry = client.world.getRegistryManager().get(key.registry());
 		Optional<Named<T>> opt = registry.getEntryList(key);
 		if (opt.isEmpty()) {
 			return Stream.of();