Merge 1.20 into 1.21.1

Author: embeddedt

common/src/main/resources/modernfix.accesswidener

@@ -54,4 +54,7 @@ accessible field net/minecraft/client/renderer/block/model/ItemOverrides$BakedOv
 mutable field net/minecraft/client/renderer/block/model/ItemOverrides$BakedOverride model Lnet/minecraft/client/resources/model/BakedModel;
 accessible field net/minecraft/client/renderer/entity/EnderDragonRenderer$DragonModel entity Lnet/minecraft/world/entity/boss/enderdragon/EnderDragon;
 accessible method net/minecraft/world/level/block/state/StateDefinition appendPropertyCodec (Lcom/mojang/serialization/MapCodec;Ljava/util/function/Supplier;Ljava/lang/String;Lnet/minecraft/world/level/block/state/properties/Property;)Lcom/mojang/serialization/MapCodec;
-accessible class net/minecraft/client/multiplayer/SessionSearchTrees$Key
+accessible class net/minecraft/client/multiplayer/SessionSearchTrees$Key
+
+accessible class net/minecraft/world/item/crafting/Ingredient$Value
+accessible class net/minecraft/world/item/crafting/Ingredient$ItemValue

neoforge/src/main/java/org/embeddedt/modernfix/neoforge/dynresources/ModelBakeEventHelper.java

@@ -34,6 +34,7 @@ public class ModelBakeEventHelper {
             "mekanism",
             "vampirism",
             "elevatorid",
+            "cfm",
             "embers");
     private final Map<ModelResourceLocation, BakedModel> modelRegistry;
     private final Set<ModelResourceLocation> topLevelModelLocations;