PonyMirrors/MineLittlePony
1
0
Fork 0
mirror of https://github.com/MineLittlePony/MineLittlePony.git synced 2024-11-22 12:37:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove the ZebraPonyModel class (no longer needed)

Browse source
This commit is contained in:
Sollace 2022-07-06 11:02:26 +02:00
parent 84886cf798
commit e8a5e6ce13
5 changed files with 15 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/com/minelittlepony/client/model/ModelType.java
View file

@ -14,13 +14,7 @@ import com.minelittlepony.api.pony.meta.Race;
import com.minelittlepony.api.pony.meta.Wearable;
import com.minelittlepony.client.model.armour.PonyArmourModel;
import com.minelittlepony.client.model.entity.*;
import com.minelittlepony.client.model.entity.race.AlicornModel;
import com.minelittlepony.client.model.entity.race.ChangelingModel;
import com.minelittlepony.client.model.entity.race.EarthPonyModel;
import com.minelittlepony.client.model.entity.race.PegasusModel;
import com.minelittlepony.client.model.entity.race.SeaponyModel;
import com.minelittlepony.client.model.entity.race.UnicornModel;
import com.minelittlepony.client.model.entity.race.ZebraModel;
import com.minelittlepony.client.model.entity.race.*;
import com.minelittlepony.client.model.gear.*;
import com.minelittlepony.client.render.entity.PlayerPonyRenderer;
import com.minelittlepony.client.render.entity.PlayerSeaponyRenderer;
@ -82,7 +76,7 @@ public final class ModelType {
public static final PlayerModelKey<?, PegasusModel<?>> BAT_PONY = registerPlayer("bat_pony", Race.BATPONY, PegasusModel::new);
public static final PlayerModelKey<?, ChangelingModel<?>> CHANGELING = registerPlayer("changeling", Race.CHANGELING, ChangelingModel::new);
public static final PlayerModelKey<?, ChangelingModel<?>> CHANGEDLING = registerPlayer("reformed_changeling", Race.CHANGEDLING, ChangelingModel::new);
public static final PlayerModelKey<?, ZebraModel<?>> ZEBRA = registerPlayer("zebra", Race.ZEBRA, ZebraModel::new);
public static final PlayerModelKey<?, EarthPonyModel<?>> ZEBRA = registerPlayer("zebra", Race.ZEBRA, EarthPonyModel::new);
static <E extends LivingEntity, T extends Model & MsonModel> PlayerModelKey<E, T> registerPlayer(String name, Race race, BiFunction<ModelPart, Boolean, T> constructor) {
return registerPlayer(name, race, constructor, PlayerPonyRenderer::new);

4
src/main/java/com/minelittlepony/client/model/entity/WitchPonyModel.java
View file

@ -7,9 +7,9 @@ import net.minecraft.util.math.MathHelper;
import com.minelittlepony.api.model.ModelAttributes;
import com.minelittlepony.api.pony.IPony;
import com.minelittlepony.api.pony.meta.Wearable;
import com.minelittlepony.client.model.entity.race.ZebraModel;
import com.minelittlepony.client.model.entity.race.EarthPonyModel;
public class WitchPonyModel extends ZebraModel<WitchEntity> {
public class WitchPonyModel extends EarthPonyModel<WitchEntity> {
public WitchPonyModel(ModelPart tree) {
super(tree, false);

49
src/main/java/com/minelittlepony/client/model/entity/race/ZebraModel.java
View file

@ -1,49 +0,0 @@
package com.minelittlepony.client.model.entity.race;
import net.minecraft.client.model.ModelPart;
import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.entity.LivingEntity;
import com.minelittlepony.client.model.armour.PonyArmourModel;
import com.minelittlepony.api.model.BodyPart;
import com.minelittlepony.api.model.armour.IArmour;
import com.minelittlepony.client.model.armour.ArmourWrapper;
public class ZebraModel<T extends LivingEntity> extends EarthPonyModel<T> {
public ZebraModel(ModelPart tree, boolean useSmallArms) {
super(tree, useSmallArms);
}
@Override
public IArmour<?> createArmour() {
return ArmourWrapper.of(Armour::new);
}
@Override
public void transform(BodyPart part, MatrixStack stack) {
applyLongNeck(part, stack);
super.transform(part, stack);
}
class Armour extends PonyArmourModel<T> {
public Armour(ModelPart tree) {
super(tree);
}
@Override
public void transform(BodyPart part, MatrixStack stack) {
applyLongNeck(part, stack);
super.transform(part, stack);
}
}
static void applyLongNeck(BodyPart part, MatrixStack stack) {
if (part == BodyPart.HEAD || part == BodyPart.NECK) {
stack.translate(0, -0.1F, 0);
}
if (part == BodyPart.NECK) {
stack.scale(1, 1.3F, 1);
}
}
}

5
src/main/resources/assets/minelittlepony/models/races/steve/zebra.json
View file

@ -1,7 +1,12 @@
{
"parent": "minelittlepony:steve_pony",
"locals": {
"head_pivot_y": -1.2,
"neck_dilate_y": 1.6
},
"data": {
"head": {
"pivot": [ 0, "#head_pivot_y", 0 ],
"cubes": [
{ "from": [-4, -6, -6], "size": [ 8, 8, 8] }
],

8
src/main/resources/assets/minelittlepony/models/steve_pony.json
View file

@ -12,7 +12,9 @@
"arm_z": [2, "-", "#arm_depth"],
"arm_rotation_x": 0,
"arm_rotation_x_neg": [0, "-", "#arm_rotation_x"],
"arm_rotation_y": 8
"arm_rotation_y": 8,
"head_pivot_y": 0,
"neck_dilate_y": 0
},
"skeleton": {
"upper_torso": {
@ -32,6 +34,7 @@
},
"data": {
"head": {
"pivot": [ 0, "#head_pivot_y", 0 ],
"cubes": [
{ "from": [-4, -6, -6], "size": [ 8, 8, 8] }
],
@ -52,7 +55,7 @@
},
"hat": {
"texture": { "u": 32, "v": 0 },
"pivot": [ 0, 0, 0 ],
"pivot": [ 0, "#head_pivot_y", 0 ],
"cubes": [
{ "from": [-4, -6, -6], "size": [ 8, 8, 8], "dilate": 0.5 }
]
@ -172,6 +175,7 @@
},
"neck": {
"type": "mson:planar",
"dilate": [ 0, "#neck_dilate_y", 0 ],
"texture": { "u": 0, "v": 16 },
"rotate": [9, 0, 0],
"north": [-2, 1.199998, -2.8, 4, 4],