Update HDSkins

This commit is contained in:
Sollace 2019-07-18 13:19:30 +02:00
parent a18b2a46d9
commit a17661124c
4 changed files with 12 additions and 7 deletions

View file

@ -19,4 +19,4 @@ org.gradle.daemon=false
# Dependencies # Dependencies
fabric_version=0.3.0+ fabric_version=0.3.0+
kirin_version=1.14.3-1.4-SNAPSHOT kirin_version=1.14.3-1.4-SNAPSHOT
hd_skins_version=1.14.3-5.3.2-SNAPSHOT hd_skins_version=1.14.3-5.3.3-SNAPSHOT

View file

@ -4,7 +4,7 @@ import com.minelittlepony.client.MineLittlePony;
import com.minelittlepony.client.SkinsProxy; import com.minelittlepony.client.SkinsProxy;
import com.minelittlepony.client.hdskins.gui.DummyPony; import com.minelittlepony.client.hdskins.gui.DummyPony;
import com.minelittlepony.client.hdskins.gui.GuiSkinsMineLP; import com.minelittlepony.client.hdskins.gui.GuiSkinsMineLP;
import com.minelittlepony.client.hdskins.gui.RenderDummyPony; import com.minelittlepony.client.hdskins.gui.DummyPonyRenderer;
import com.minelittlepony.common.event.ClientReadyCallback; import com.minelittlepony.common.event.ClientReadyCallback;
import com.minelittlepony.hdskins.SkinCacheClearCallback; import com.minelittlepony.hdskins.SkinCacheClearCallback;
import net.fabricmc.fabric.api.client.render.EntityRendererRegistry; import net.fabricmc.fabric.api.client.render.EntityRendererRegistry;
@ -24,7 +24,7 @@ class MineLPHDSkins {
ClientReadyCallback.EVENT.register(this::postInit); ClientReadyCallback.EVENT.register(this::postInit);
// Preview on the select skin gui // Preview on the select skin gui
EntityRendererRegistry.INSTANCE.register(DummyPony.class, RenderDummyPony::new); EntityRendererRegistry.INSTANCE.register(DummyPony.class, DummyPonyRenderer::new);
} }
private void postInit(MinecraftClient minecraft) { private void postInit(MinecraftClient minecraft) {

View file

@ -7,9 +7,10 @@ import com.minelittlepony.client.model.races.PlayerModels;
import com.minelittlepony.client.render.IPonyRender; import com.minelittlepony.client.render.IPonyRender;
import com.minelittlepony.client.render.RenderPony; import com.minelittlepony.client.render.RenderPony;
import com.minelittlepony.client.render.layer.LayerGear; import com.minelittlepony.client.render.layer.LayerGear;
import com.minelittlepony.client.render.layer.LayerHeldPonyItemMagical;
import com.minelittlepony.client.render.layer.LayerPonyArmor; import com.minelittlepony.client.render.layer.LayerPonyArmor;
import com.minelittlepony.client.render.layer.LayerPonyElytra; import com.minelittlepony.client.render.layer.LayerPonyElytra;
import com.minelittlepony.hdskins.dummy.RenderDummyPlayer; import com.minelittlepony.hdskins.dummy.DummyPlayerRenderer;
import com.minelittlepony.pony.IPony; import com.minelittlepony.pony.IPony;
import com.minelittlepony.pony.meta.Race; import com.minelittlepony.pony.meta.Race;
import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type; import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type;
@ -23,11 +24,11 @@ import net.minecraft.util.Identifier;
/** /**
* Renderer used for the dummy pony model when selecting a skin. * Renderer used for the dummy pony model when selecting a skin.
*/ */
public class RenderDummyPony extends RenderDummyPlayer<DummyPony, ClientPonyModel<DummyPony>> implements IPonyRender<DummyPony, ClientPonyModel<DummyPony>> { public class DummyPonyRenderer extends DummyPlayerRenderer<DummyPony, ClientPonyModel<DummyPony>> implements IPonyRender<DummyPony, ClientPonyModel<DummyPony>> {
protected final RenderPony<DummyPony, ClientPonyModel<DummyPony>> renderPony = new RenderPony<>(this); protected final RenderPony<DummyPony, ClientPonyModel<DummyPony>> renderPony = new RenderPony<>(this);
public RenderDummyPony(EntityRenderDispatcher manager, EntityRendererRegistry.Context context) { public DummyPonyRenderer(EntityRenderDispatcher manager, EntityRendererRegistry.Context context) {
super(manager, context); super(manager, context);
addFeature(new LayerGear<>(this)); addFeature(new LayerGear<>(this));
@ -90,6 +91,11 @@ public class RenderDummyPony extends RenderDummyPlayer<DummyPony, ClientPonyMode
return new LayerPonyArmor<>(this); return new LayerPonyArmor<>(this);
} }
@Override
protected FeatureRenderer<DummyPony, ClientPonyModel<DummyPony>> getHeldItemLayer() {
return new LayerHeldPonyItemMagical<>(this);
}
@Override @Override
protected FeatureRenderer<DummyPony, ClientPonyModel<DummyPony>> getElytraLayer() { protected FeatureRenderer<DummyPony, ClientPonyModel<DummyPony>> getElytraLayer() {
return new LayerPonyElytra<DummyPony, ClientPonyModel<DummyPony>>(this) { return new LayerPonyElytra<DummyPony, ClientPonyModel<DummyPony>>(this) {

View file

@ -3,7 +3,6 @@ package com.minelittlepony.client.model;
import net.minecraft.client.model.Cuboid; import net.minecraft.client.model.Cuboid;
import net.minecraft.client.render.entity.model.BipedEntityModel; import net.minecraft.client.render.entity.model.BipedEntityModel;
import net.minecraft.client.render.entity.model.PlayerEntityModel; import net.minecraft.client.render.entity.model.PlayerEntityModel;
import net.minecraft.client.render.entity.model.BipedEntityModel.ArmPose;
import net.minecraft.entity.LivingEntity; import net.minecraft.entity.LivingEntity;
import net.minecraft.util.AbsoluteHand; import net.minecraft.util.AbsoluteHand;