Merge 1.20 into 1.21.1
This commit is contained in:
commit
cdfe53589e
|
|
@ -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;
|
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 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 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
|
||||||
|
|
|
||||||
|
|
@ -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;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user