PonyMirrors/MineLittlePony
1
0
Fork 0
mirror of https://github.com/MineLittlePony/MineLittlePony.git synced 2025-02-13 08:14:23 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fixed remote preview player not being scaled correctly

Browse source
This commit is contained in:
Sollace 2018-08-10 20:18:28 +02:00
parent 377cda5481
commit 40866cc22b
2 changed files with 34 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/hdskins/java/com/voxelmodpack/hdskins/gui/RenderPlayerModel.java
View file

@ -120,13 +120,4 @@ public class RenderPlayerModel<M extends EntityPlayerModel> extends RenderLiving
popAttrib();
}
@Override
protected void preRenderCallback(M par1EntityLiving, float par2) {
this.renderCloak(par1EntityLiving, par2);
}
protected void renderCloak(M entity, float par2) {
super.preRenderCallback(entity, par2);
}
}

38
src/main/java/com/minelittlepony/hdskins/gui/RenderPonyModel.java
View file

@ -1,11 +1,13 @@
package com.minelittlepony.hdskins.gui;
import com.minelittlepony.MineLittlePony;
import com.minelittlepony.ducks.IRenderPony;
import com.minelittlepony.model.ModelWrapper;
import com.minelittlepony.model.player.PlayerModels;
import com.minelittlepony.pony.data.Pony;
import com.minelittlepony.pony.data.PonyRace;
import com.minelittlepony.render.layer.LayerPonyElytra;
import com.minelittlepony.render.RenderPony;
import com.voxelmodpack.hdskins.gui.RenderPlayerModel;
import net.minecraft.client.model.ModelBase;
@ -19,14 +21,40 @@ import net.minecraft.util.ResourceLocation;
/**
* Renderer used for the dummy pony model when selecting a skin.
*/
public class RenderPonyModel extends RenderPlayerModel<EntityPonyModel> {
public class RenderPonyModel extends RenderPlayerModel<EntityPonyModel> implements IRenderPony<EntityPonyModel> {
boolean renderingAsHuman = false;
protected final RenderPony<EntityPonyModel> renderPony = new RenderPony<>(this);
public RenderPonyModel(RenderManager manager) {
super(manager);
}
private ModelWrapper playerModel;
@Override
public ModelWrapper getModelWrapper() {
return playerModel;
}
@Override
public Pony getEntityPony(EntityPonyModel entity) {
boolean slim = entity.usesThinSkin();
ResourceLocation loc = getEntityTexture(entity);
return MineLittlePony.getInstance().getManager().getPony(loc, slim);
}
@Override
protected void preRenderCallback(EntityPonyModel entity, float ticks) {
if (renderingAsHuman) {
super.preRenderCallback(entity, ticks);
} else {
renderPony.preRenderCallback(entity, ticks);
}
}
@Override
public ModelPlayer getEntityModel(EntityPonyModel playermodel) {
renderingAsHuman = true;
@ -48,12 +76,14 @@ public class RenderPonyModel extends RenderPlayerModel<EntityPonyModel> {
boolean canWet = playermodel.wet && (loc == playermodel.getBlankSkin() || race == PonyRace.SEAPONY);
ModelWrapper pm = canWet ? PlayerModels.SEAPONY.getModel(slim) : thePony.getModel(true);
pm.apply(thePony.getMetadata());
playerModel = canWet ? PlayerModels.SEAPONY.getModel(slim) : thePony.getModel(true);
playerModel.apply(thePony.getMetadata());
renderPony.setPonyModel(playerModel);
renderingAsHuman = false;
return pm.getBody();
return playerModel.getBody();
}
@Override