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

Merge remote-tracking branch 'origin/1.18' into 1.19.2

Browse Source
This commit is contained in:
embeddedt 2023-08-05 12:11:30 -04:00
commit 605058522e
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
1 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,9 +9,12 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.resources.model.BakedModel; import net.minecraft.client.resources.model.BakedModel;
import net.minecraft.client.resources.model.BlockModelRotation; import net.minecraft.client.resources.model.BlockModelRotation;
import net.minecraft.client.resources.model.ModelBakery; import net.minecraft.client.resources.model.ModelBakery;
import net.minecraft.client.resources.model.ModelResourceLocation;
import net.minecraft.core.Direction; import net.minecraft.core.Direction;
import net.minecraft.core.Registry;
import net.minecraft.resources.ResourceLocation; import net.minecraft.resources.ResourceLocation;
import net.minecraft.util.RandomSource; import net.minecraft.util.RandomSource;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.BlockState;
import org.apache.commons.lang3.tuple.Triple; import org.apache.commons.lang3.tuple.Triple;
import org.embeddedt.modernfix.ModernFix; import org.embeddedt.modernfix.ModernFix;
@ -104,6 +107,25 @@ public class DynamicBakedModelProvider implements Map<ResourceLocation, BakedMod
public boolean containsValue(Object o) { public boolean containsValue(Object o) {
return permanentOverrides.containsValue(o) || bakedCache.containsValue(o); return permanentOverrides.containsValue(o) || bakedCache.containsValue(o);
} }
private static boolean isVanillaTopLevelModel(ResourceLocation location) {
if(location instanceof ModelResourceLocation) {
try {
ModelResourceLocation mrl = (ModelResourceLocation)location;
ResourceLocation registryKey = new ResourceLocation(mrl.getNamespace(), mrl.getPath());
// check for standard inventory model
if(mrl.getVariant().equals("inventory") && Registry.ITEM.containsKey(registryKey))
return true;
Optional<Block> blockOpt = Registry.BLOCK.getOptional(registryKey);
if(blockOpt.isPresent()) {
return ModelBakeryHelpers.getBlockStatesForMRL(blockOpt.get().getStateDefinition(), mrl).size() > 0;
}
} catch(RuntimeException ignored) {
// can occur if the MRL is not valid for that blockstate, ignore
}
}
return false;
}
@Override @Override
public BakedModel get(Object o) { public BakedModel get(Object o) {
@ -118,11 +140,11 @@ public class DynamicBakedModelProvider implements Map<ResourceLocation, BakedMod
model = missingModel; model = missingModel;
} }
if(model == missingModel) { if(model == missingModel) {
// to correctly emulate the original map, we return null for missing models // to correctly emulate the original map, we return null for missing models, unless they are top-level
permanentOverrides.put((ResourceLocation) o, null); model = isVanillaTopLevelModel((ResourceLocation)o) ? model : null;
return null; permanentOverrides.put((ResourceLocation) o, model);
} else }
return model; return model;
} }
} }