R3944Realms/ModernFix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 1.21.1 into 1.21.3

Browse Source
This commit is contained in:
embeddedt 2024-11-04 16:55:12 -05:00
commit 7645af1bab
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/src/main/resources/modernfix.accesswidener
View File

@ -49,3 +49,6 @@ accessible method net/minecraft/client/gui/screens/Screen addRenderableWidget (L
accessible field net/minecraft/client/KeyMapping ALL Ljava/util/Map; accessible field net/minecraft/client/KeyMapping ALL Ljava/util/Map;
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 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

1
neoforge/src/main/java/org/embeddedt/modernfix/neoforge/dynresources/ModelBakeEventHelper.java
View File

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