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

Merge 1.20 into 1.20.2

Browse Source
This commit is contained in:
embeddedt 2023-10-29 11:41:44 -04:00
commit 546a362d9c
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/src/main/java/org/embeddedt/modernfix/dynamicresources/DynamicBakedModelProvider.java
View File

@ -96,11 +96,11 @@ public class DynamicBakedModelProvider implements Map<ResourceLocation, BakedMod
public void setMissingModel(BakedModel model) { public void setMissingModel(BakedModel model) {
this.missingModel = model; this.missingModel = model;
this.permanentOverrides.put(ModelBakery.MISSING_MODEL_LOCATION, this.missingModel); this.put(ModelBakery.MISSING_MODEL_LOCATION, this.missingModel);
} }
private static Triple<ResourceLocation, Transformation, Boolean> vanillaKey(Object o) { private static ModelBakery.BakedCacheKey vanillaKey(Object o) {
return Triple.of((ResourceLocation)o, BlockModelRotation.X0_Y0.getRotation(), false); return new ModelBakery.BakedCacheKey((ResourceLocation)o, BlockModelRotation.X0_Y0.getRotation(), false);
} }
@Override @Override
public int size() { public int size() {