fujin/Wizardry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Have PlayerAnimator ignore renderers for which no layers/models are stored, fixes #518

Browse Source 
This will stop the crashing but might well mean broken animations - for now there's not much I can do about that
This commit is contained in:
Electroblob77
2020-10-28 23:37:51 +00:00
parent cfd3e796e1
commit d3df59df73
1 changed files with 33 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/electroblob/wizardry/client/animation/PlayerAnimator.java
+33 -21
View File
@@ -133,39 +133,51 @@ public class PlayerAnimator {
private static void updateModels(EntityPlayer player, Render<?> renderer, float partialTicks, boolean firstPerson){ private static void updateModels(EntityPlayer player, Render<?> renderer, float partialTicks, boolean firstPerson){
// Biped armour is special because of Forge's armour item render hook // TODO: This will stop the crashing but it might break animations for any mod that replaces the player renderer
// This needs to be lazy-loaded because we need access to an actual item // There may be a way to make it compatible but we'll have to look into that at a later date
for(LayerRenderer<? extends EntityLivingBase> layer : playerLayers.get(renderer)){ List<ModelBiped> models = playerLayerModels.get(renderer);
if(layer instanceof LayerBipedArmor){
for(EntityEquipmentSlot slot : InventoryUtils.ARMOUR_SLOTS){
ItemStack armour = player.getItemStackFromSlot(slot); // If no models were registered for the given renderer, don't do anything
// This method could behave dynamically depending on stuff like NBT so there's not really any way to if(models != null){
// optimise it further, we *have* to retrieve the model every time (shouldn't be too bad though)
ModelBiped model = ForgeHooksClient.getArmorModel(player, armour, slot, ((LayerBipedArmor)layer).getModelFromSlot(slot));
List<ModelBiped> models = playerLayerModels.get(renderer); List<LayerRenderer<? extends EntityLivingBase>> layers = playerLayers.get(renderer);
if(!models.contains(model)){ // Ignore already-wrapped models // If no layers were registered for the given renderer there's no point trying to lazy-load anything!
models.add(model); if(layers != null){
ModelRendererExtended.wrap(model);
// Biped armour is special because of Forge's armour item render hook
// This needs to be lazy-loaded because we need access to an actual item
for(LayerRenderer<? extends EntityLivingBase> layer : layers){
if(layer instanceof LayerBipedArmor){
for(EntityEquipmentSlot slot : InventoryUtils.ARMOUR_SLOTS){
ItemStack armour = player.getItemStackFromSlot(slot);
// This method could behave dynamically depending on stuff like NBT so there's not really any way to
// optimise it further, we *have* to retrieve the model every time (shouldn't be too bad though)
ModelBiped model = ForgeHooksClient.getArmorModel(player, armour, slot, ((LayerBipedArmor)layer).getModelFromSlot(slot));
if(!models.contains(model)){ // Ignore already-wrapped models
models.add(model);
ModelRendererExtended.wrap(model);
}
}
} }
} }
} }
}
for(Animation animation : animations){ for(Animation animation : animations){
if(animation.shouldDisplay(player, firstPerson)){ if(animation.shouldDisplay(player, firstPerson)){
boolean autoRotateSecondLayer = animation.autoRotateSecondLayer(player, firstPerson); boolean autoRotateSecondLayer = animation.autoRotateSecondLayer(player, firstPerson);
for(ModelBiped model : playerLayerModels.get(renderer)){ for(ModelBiped model : models){
animation.setRotationAngles(player, model, partialTicks, firstPerson); animation.setRotationAngles(player, model, partialTicks, firstPerson);
if(autoRotateSecondLayer && model instanceof ModelPlayer){ if(autoRotateSecondLayer && model instanceof ModelPlayer){
alignSecondLayer((ModelPlayer)model); alignSecondLayer((ModelPlayer)model);
}
} }
} }
} }