From 97fda0ed861f94d880a95705b5da6bfe8b9c532c Mon Sep 17 00:00:00 2001 From: Sollace Date: Thu, 30 Mar 2023 01:46:03 +0100 Subject: [PATCH] april fools 2023! --- gradle.properties | 6 +- .../client/GuiPonySettings.java | 3 + .../minelittlepony/client/MineLittlePony.java | 9 +- .../client/hdskins/GuiSkinsMineLP.java | 8 +- .../client/model/AbstractPonyModel.java | 26 ++++-- .../client/model/part/LionTail.java | 2 + .../client/model/part/PonyEars.java | 4 + .../client/model/part/PonySnout.java | 1 + .../client/model/part/PonyTail.java | 9 +- .../assets/minelittlepony/lang/de_de.json | 2 +- .../assets/minelittlepony/lang/en_us.json | 82 +++++++++---------- .../assets/minelittlepony/lang/fr_fr.json | 2 +- .../assets/minelittlepony/lang/ru_ru.json | 4 +- .../assets/minelittlepony/lang/sr_rs.json | 4 +- .../models/entity/components/ears.json | 4 +- .../models/entity/races/steve/bat_pony.json | 18 ++-- .../models/entity/races/steve/hippogriff.json | 7 ++ .../models/entity/races/steve/kirin.json | 36 ++++++-- .../models/entity/races/steve/unicorn.json | 18 ++-- .../models/entity/races/steve/zebra.json | 21 +++-- .../models/entity/steve_pony.json | 50 +++++------ src/main/resources/fabric.mod.json | 6 +- 22 files changed, 209 insertions(+), 113 deletions(-) diff --git a/gradle.properties b/gradle.properties index ea565ba2..312164bb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,9 +10,9 @@ org.gradle.daemon=false # Mod Properties group=com.minelittlepony - displayname=Mine Little Pony - authors=Verdana, Rene_Z, Mumfrey, Killjoy1221, Sollace - description=Mine Little Pony turns players and mobs into ponies. Press F9 ingame to access settings. + displayname=Mine Horsey Horse + authors=A bunch of horesy people + description=Mine Horsey Horse turns players and mobs into horses. Press F9 ingame to neigh loudly. # Publishing minecraft_version_range=>=1.19.4 diff --git a/src/main/java/com/minelittlepony/client/GuiPonySettings.java b/src/main/java/com/minelittlepony/client/GuiPonySettings.java index a0568d9a..f9050b65 100644 --- a/src/main/java/com/minelittlepony/client/GuiPonySettings.java +++ b/src/main/java/com/minelittlepony/client/GuiPonySettings.java @@ -149,6 +149,9 @@ public class GuiPonySettings extends GameGui { .onChange(i::set) .getStyle().setText(MOB_PREFIX + i.name); } + content.addButton(new Toggle(RIGHT, row += 20, false)) + .onChange(s -> s) + .getStyle().setText("Horsify Horses"); row += 15; diff --git a/src/main/java/com/minelittlepony/client/MineLittlePony.java b/src/main/java/com/minelittlepony/client/MineLittlePony.java index 0b011afb..0101fed1 100644 --- a/src/main/java/com/minelittlepony/client/MineLittlePony.java +++ b/src/main/java/com/minelittlepony/client/MineLittlePony.java @@ -24,8 +24,10 @@ import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.screen.TitleScreen; import net.minecraft.client.option.KeyBinding; +import net.minecraft.client.sound.PositionedSoundInstance; import net.minecraft.client.util.InputUtil; import net.minecraft.resource.ResourceType; +import net.minecraft.sound.SoundEvents; import net.minecraft.util.Identifier; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -107,7 +109,12 @@ public class MineLittlePony implements ClientModInitializer { } if ((mainMenu || inGame) && keyBinding.isPressed()) { - client.setScreen(new GuiPonySettings(client.currentScreen)); + // client.setScreen(new GuiPonySettings(client.currentScreen)); + client.getSoundManager().play(PositionedSoundInstance.master(SoundEvents.ENTITY_HORSE_ANGRY, 1, 1)); + } + + if (inGame && client.options.jumpKey.isPressed() && client.player.isOnGround()) { + client.getSoundManager().play(PositionedSoundInstance.master(SoundEvents.ENTITY_HORSE_ANGRY, 1, 1)); } } diff --git a/src/main/java/com/minelittlepony/client/hdskins/GuiSkinsMineLP.java b/src/main/java/com/minelittlepony/client/hdskins/GuiSkinsMineLP.java index 76d9259e..a502fe7c 100644 --- a/src/main/java/com/minelittlepony/client/hdskins/GuiSkinsMineLP.java +++ b/src/main/java/com/minelittlepony/client/hdskins/GuiSkinsMineLP.java @@ -12,6 +12,8 @@ import com.minelittlepony.hdskins.profile.SkinType; import com.mojang.authlib.minecraft.MinecraftProfileTexture; import net.minecraft.client.gui.screen.Screen; +import net.minecraft.client.sound.PositionedSoundInstance; +import net.minecraft.sound.SoundEvents; import net.minecraft.util.Identifier; import org.lwjgl.glfw.GLFW; @@ -37,7 +39,11 @@ class GuiSkinsMineLP extends GuiSkins { if (!(parent instanceof GuiPonySettings)) { addButton(new Button(width - 25, height - 90, 20, 20)) - .onClick(sender -> client.setScreen(new GuiPonySettings(this))) + .onClick(sender -> { + client.getSoundManager().play(PositionedSoundInstance.master(SoundEvents.ENTITY_HORSE_ANGRY, 1, 1)); + //client.setScreen(new GuiPonySettings(this)); + }) + .getStyle() .setIcon(new TextureSprite() .setPosition(2, 2) diff --git a/src/main/java/com/minelittlepony/client/model/AbstractPonyModel.java b/src/main/java/com/minelittlepony/client/model/AbstractPonyModel.java index 7f137d8d..33044601 100644 --- a/src/main/java/com/minelittlepony/client/model/AbstractPonyModel.java +++ b/src/main/java/com/minelittlepony/client/model/AbstractPonyModel.java @@ -148,8 +148,8 @@ public abstract class AbstractPonyModel extends ClientPo } else { adjustBody(0, ORIGIN); - rightLeg.pivotY = FRONT_LEGS_Y; - leftLeg.pivotY = FRONT_LEGS_Y; + // rightLeg.pivotY = FRONT_LEGS_Y; + // leftLeg.pivotY = FRONT_LEGS_Y; if (!attributes.isSleeping) { animateBreathing(animationProgress); @@ -165,6 +165,10 @@ public abstract class AbstractPonyModel extends ClientPo ponySleep(); } + head.pivotY -= 3; + head.pivotZ -= 2; + head.pitch = 0.5F; + parts.forEach(part -> part.setPartAngles(attributes, limbAngle, limbSpeed, wobbleAmount, animationProgress)); } @@ -275,6 +279,7 @@ public abstract class AbstractPonyModel extends ClientPo leftArm.pivotZ = 2 - sin; float legRPX = attributes.getMainInterpolator().interpolate("legOffset", cos - getLegOutset() - 0.001F, 2); + legRPX += 2; rightArm.pivotX = -legRPX; rightLeg.pivotX = -legRPX; @@ -285,8 +290,10 @@ public abstract class AbstractPonyModel extends ClientPo rightArm.yaw += body.yaw; leftArm.yaw += body.yaw; - rightArm.pivotY = leftArm.pivotY = 8; - rightLeg.pivotZ = leftLeg.pivotZ = 11; + rightArm.pivotZ = leftArm.pivotZ = 1; + rightArm.pivotY = leftArm.pivotY = 6; + rightLeg.pivotY = leftLeg.pivotY = 6; + rightLeg.pivotZ = leftLeg.pivotZ = 21; } /** @@ -517,7 +524,7 @@ public abstract class AbstractPonyModel extends ClientPo protected void adjustBody(float pitch, Pivot pivot) { adjustBodyComponents(pitch, pivot); - neck.setPivot(NECK_X + pitch, pivot.y(), pivot.z()); + neck.setPivot(NECK_X + pitch, pivot.y() - 1, pivot.z() - 2); } protected void adjustBodyComponents(float pitch, Pivot pivot) { @@ -541,16 +548,25 @@ public abstract class AbstractPonyModel extends ClientPo public void setVisible(boolean visible) { super.setVisible(visible); neck.visible = visible; + hat.visible = false; parts.forEach(part -> part.setVisible(visible, attributes)); } @Override public void transform(BodyPart part, MatrixStack stack) { + + stack.translate(0, 0.1F, 0); + if (attributes.isSleeping || attributes.isRiptide) { stack.multiply(RotationAxis.POSITIVE_X.rotationDegrees(90)); stack.multiply(RotationAxis.POSITIVE_Y.rotationDegrees(180)); } + if (part == BodyPart.BODY) { + stack.scale(1.5F, 1, 1.5F); + } + + neck.visible = head.visible; PonyTransformation.forSize(getSize()).transform(this, part, stack); } } diff --git a/src/main/java/com/minelittlepony/client/model/part/LionTail.java b/src/main/java/com/minelittlepony/client/model/part/LionTail.java index 8528f2ef..a418af29 100644 --- a/src/main/java/com/minelittlepony/client/model/part/LionTail.java +++ b/src/main/java/com/minelittlepony/client/model/part/LionTail.java @@ -87,6 +87,8 @@ public class LionTail implements IPart { @Override public void setVisible(boolean visible, ModelAttributes attributes) { tail.visible = visible; + tail.pivotZ = 14; + tail.pivotY = 7; } @Override diff --git a/src/main/java/com/minelittlepony/client/model/part/PonyEars.java b/src/main/java/com/minelittlepony/client/model/part/PonyEars.java index a6b887ad..7294a2af 100644 --- a/src/main/java/com/minelittlepony/client/model/part/PonyEars.java +++ b/src/main/java/com/minelittlepony/client/model/part/PonyEars.java @@ -33,5 +33,9 @@ public class PonyEars implements IPart, MsonModel { public void setVisible(boolean visible, ModelAttributes attributes) { right.visible = visible && !attributes.metadata.getRace().isHuman(); left.visible = visible && !attributes.metadata.getRace().isHuman(); + left.pivotX = -1; + right.pivotX = 1; + left.pivotY = right.pivotY = 1; + left.pivotZ = right.pivotZ = 1.5F; } } diff --git a/src/main/java/com/minelittlepony/client/model/part/PonySnout.java b/src/main/java/com/minelittlepony/client/model/part/PonySnout.java index 70d66f81..4709c9c5 100644 --- a/src/main/java/com/minelittlepony/client/model/part/PonySnout.java +++ b/src/main/java/com/minelittlepony/client/model/part/PonySnout.java @@ -41,6 +41,7 @@ public class PonySnout implements IPart, MsonModel { public void setVisible(boolean visible, ModelAttributes attributes) { visible &= !attributes.metadata.getRace().isHuman() && MineLittlePony.getInstance().getConfig().snuzzles.get(); Gender gender = attributes.metadata.getGender(); + visible = false; mare.visible = (visible && gender.isMare()); stallion.visible = (visible && gender.isStallion()); diff --git a/src/main/java/com/minelittlepony/client/model/part/PonyTail.java b/src/main/java/com/minelittlepony/client/model/part/PonyTail.java index 57605901..b67b4da5 100644 --- a/src/main/java/com/minelittlepony/client/model/part/PonyTail.java +++ b/src/main/java/com/minelittlepony/client/model/part/PonyTail.java @@ -108,9 +108,14 @@ public class PonyTail implements IPart, MsonModel { return; } - if (tail.shape == TailShape.STRAIGHT) { + tree.pitch = 0.5F; + tree.pivotX = 0; + tree.pivotY = 6; + tree.pivotZ = -6; + + if (true || tail.shape == TailShape.STRAIGHT) { tree.yaw = 0; - tree.pivotZ = 0; + // tree.pivotZ = 0; tree.render(stack, renderContext, overlayUv, lightUv, red, green, blue, alpha); return; } diff --git a/src/main/resources/assets/minelittlepony/lang/de_de.json b/src/main/resources/assets/minelittlepony/lang/de_de.json index 2b2bff61..ecf9813c 100644 --- a/src/main/resources/assets/minelittlepony/lang/de_de.json +++ b/src/main/resources/assets/minelittlepony/lang/de_de.json @@ -1,5 +1,5 @@ { - "minelp.options.title": "Mine Little Pony Einstellungen", + "minelp.options.title": "Mine Horsey Horse Einstellungen", "minelp.options.ponylevel": "Pony-Stufen", "minelp.options.ponylevel.ponies": "Nur Ponies", "minelp.options.ponylevel.ponies.tooltip": "Alle Spieler sind Ponies\n\nSkins, die keine Ponys sind, werden durch ein zufälliges Hintergrundpony ersetzt", diff --git a/src/main/resources/assets/minelittlepony/lang/en_us.json b/src/main/resources/assets/minelittlepony/lang/en_us.json index f6961b6b..e06666a3 100644 --- a/src/main/resources/assets/minelittlepony/lang/en_us.json +++ b/src/main/resources/assets/minelittlepony/lang/en_us.json @@ -1,64 +1,64 @@ { - "key.minelittlepony.settings": "Mine Little Pony", - "minelp.options.title": "Mine Little Pony Settings", - "minelp.options.ponylevel": "Pony Level", - "minelp.options.ponylevel.ponies": "Ponies Only", - "minelp.options.ponylevel.ponies.tooltip": "All players are ponies\n\nNon-pony skins are replaced with a random background pony", - "minelp.options.ponylevel.humans": "Humans Only", - "minelp.options.ponylevel.humans.tooltip": "All players are humans\n\nPony skins are used but will be applied to the human model", - "minelp.options.ponylevel.both": "Both", - "minelp.options.ponylevel.both.tooltip": "Players can be ponies or humans", - "minelp.options.options": "Pony Options", - "minelp.options.sizes": "Varied Pony Sizes", + "key.minelittlepony.settings": "Mine Horsey Horse", + "minelp.options.title": "NEeeeeeeeiiiiiiiiiigh!", + "minelp.options.ponylevel": "Horsieness", + "minelp.options.ponylevel.ponies": "Not Very Horse", + "minelp.options.ponylevel.ponies.tooltip": "All players are horsies\n\nNon-pony skins are replaced with a random background horsie", + "minelp.options.ponylevel.humans": "Very Horse", + "minelp.options.ponylevel.humans.tooltip": "All players are horises!!!", + "minelp.options.ponylevel.both": "HORSIIIIEEEEE", + "minelp.options.ponylevel.both.tooltip": "Whiiiiiiiineeeeeeeeeeeeiiiiiiiiiiiiiiiiiiggghhhhhhhhht!", + "minelp.options.options": "Horsie Options", + "minelp.options.sizes": "Varied Horsie Sizes", "minelp.options.skins": "Skin Uploader", "minelp.options.skins.hdskins.open": "Open HD Skins", "minelp.options.skins.hdskins.disabled": "HD Skins is not installed\n\nThe HD Skins mod is required to upload skins from in-game and to use custom skin servers.\n\nIf you cannot use that you will have to go to www.minecraft.net to upload your skin there.", - "minelp.options.snuzzles": "Show Snuzzles", - "minelp.options.fillycam": "Filly Cam", + "minelp.options.snuzzles": "Snoots", + "minelp.options.fillycam": "Smol HOrsie Cam", "minelp.options.showscale": "Show-accurate scaling", - "minelp.options.fpsmagic": "Magic in first-person", - "minelp.options.tpsmagic": "Magic in third-person", - "minelp.options.ponyskulls": "Pony Skulls", + "minelp.options.fpsmagic": "Witchcraft in first-person", + "minelp.options.tpsmagic": "Witchcraft in third-person", + "minelp.options.ponyskulls": "Horsie Heads", "minelp.options.frustrum": "Frustum checks", "minelp.options.flappyelytras": "Flap Wings whilst Gliding", "minelp.options.nofun": "Boring Mode", "minelp.options.button": "Display On Title Screen", - "minelp.options.button.on": "Always Display\n\nBoth the pony button and HD Skins button are visible (if installed)", + "minelp.options.button.on": "Always Display\n\nBoth the horsie button and HD Skins button are visible (if installed)", "minelp.options.button.auto": "Display only when HD Skins is not installed", "minelp.options.button.off": "Never Display\n\nYou will only see the HD Skins button if installed.", "minelp.options.option.disabled": "This option is locked in survival multiplayer.\n\nChange game modes or leave and rejoin\nthe server to change this setting.", "minelp.mobs.title": "Mob Settings", - "minelp.mobs.villagers": "Ponify Villagers", - "minelp.mobs.zombies": "Ponify Zombies", - "minelp.mobs.pigzombies": "Ponify Piglins", - "minelp.mobs.striders": "Ponify Striders", - "minelp.mobs.skeletons": "Ponify Skeletons", - "minelp.mobs.illagers": "Ponify Illagers", - "minelp.mobs.guardians": "Ponify Guardians", - "minelp.mobs.endermen": "Ponify Endermen", - "minelp.mobs.allays": "Ponify Allays", - "minelp.mobs.inanimates": "Ponify Objects", - "minelp.mode.dry": "Land pony", - "minelp.mode.wet": "Sea pony", - "minelp.debug.reload_models.message": "Reloading pony models...", + "minelp.mobs.villagers": "Horsify Villagers", + "minelp.mobs.zombies": "Horsify Zombies", + "minelp.mobs.pigzombies": "Horsify Piglins", + "minelp.mobs.striders": "Horsify Striders", + "minelp.mobs.skeletons": "Horsify Skeletons", + "minelp.mobs.illagers": "Horsify Illagers", + "minelp.mobs.guardians": "Horsify Guardians", + "minelp.mobs.endermen": "Horsify Endermen", + "minelp.mobs.allays": "Horsify Allays", + "minelp.mobs.inanimates": "Horsify Objects", + "minelp.mode.dry": "Horse", + "minelp.mode.wet": "Seahorsie", + "minelp.debug.reload_models.message": "Reloading horsie models...", "minelp.debug.scale": "Scaling Factor", "minelp.debug.scale.value": "%.2f", - "minelp.debug.scale.meg": "Mega", - "minelp.debug.scale.max": "Double", - "minelp.debug.scale.mid": "Default", - "minelp.debug.scale.sa": "Show Accurate", - "minelp.debug.scale.min": "Miniscule", + "minelp.debug.scale.meg": "Much Much Bigger Than Pipp", + "minelp.debug.scale.max": "Much Bigger Than Pipp", + "minelp.debug.scale.mid": "Bigger Than Pipp", + "minelp.debug.scale.sa": "Still Bigger Than Pipp", + "minelp.debug.scale.min": "Slightly Bigger Than Pipp", "minelp.debug.size": "Size Override", "minelp.debug.race": "Race Override", - "minelp.debug.armour": "Disable ponified armour textures", + "minelp.debug.armour": "Disable horsified armour textures", - "hdskins.mode.minelp_seapony": "Seapony", + "hdskins.mode.minelp_seapony": "Seahorsie", "hdskins.mode.minelittlepony_crown": "Crown", - "hdskins.mode.minelittlepony_muffin": "Muffin Hat", + "hdskins.mode.minelittlepony_muffin": "[C&D'd] Hat", "hdskins.mode.minelittlepony_hat": "Witch Hat", - "hdskins.mode.minelittlepony_antlers": "Deer Antlers", + "hdskins.mode.minelittlepony_antlers": "Festive Horns", "hdskins.mode.minelittlepony_saddle_bags_left": "Left Satchel", "hdskins.mode.minelittlepony_saddle_bags_right": "Right Satchel", - "hdskins.mode.minelittlepony_saddle_bags_both": "Saddlebags", - "hdskins.mode.minelittlepony_stetson": "Stetson" + "hdskins.mode.minelittlepony_saddle_bags_both": "Horsie Purse", + "hdskins.mode.minelittlepony_stetson": "Non-Denominational Head Garment" } diff --git a/src/main/resources/assets/minelittlepony/lang/fr_fr.json b/src/main/resources/assets/minelittlepony/lang/fr_fr.json index 933f3fb5..f9ba4f7a 100644 --- a/src/main/resources/assets/minelittlepony/lang/fr_fr.json +++ b/src/main/resources/assets/minelittlepony/lang/fr_fr.json @@ -1,5 +1,5 @@ { - "minelp.options.title": "Mine Little Pony Réglages", + "minelp.options.title": "Mine Horsey Horse Réglages", "minelp.options.ponylevel": "Niveau Poney", "minelp.options.ponylevel.ponies": "Seuls Poneys", "minelp.options.ponylevel.humans": "Seuls Humains", diff --git a/src/main/resources/assets/minelittlepony/lang/ru_ru.json b/src/main/resources/assets/minelittlepony/lang/ru_ru.json index 199a01d5..0fbd53fe 100644 --- a/src/main/resources/assets/minelittlepony/lang/ru_ru.json +++ b/src/main/resources/assets/minelittlepony/lang/ru_ru.json @@ -1,6 +1,6 @@ { - "key.minelittlepony.settings": "Mine Little Pony", - "minelp.options.title": "Настройки Mine Little Pony", + "key.minelittlepony.settings": "Mine Horsey Horse", + "minelp.options.title": "Настройки Mine Horsey Horse", "minelp.options.ponylevel": "Уровень пони", "minelp.options.ponylevel.ponies": "Только пони", "minelp.options.ponylevel.ponies.tooltip": "Все игроки - пони\n\nИгроки без скина пони отображаются, как случайный фоновый персонаж", diff --git a/src/main/resources/assets/minelittlepony/lang/sr_rs.json b/src/main/resources/assets/minelittlepony/lang/sr_rs.json index 1a9a241f..6b6d92d5 100644 --- a/src/main/resources/assets/minelittlepony/lang/sr_rs.json +++ b/src/main/resources/assets/minelittlepony/lang/sr_rs.json @@ -1,6 +1,6 @@ { - "key.minelittlepony.settings": "Mine Mali Poni", - "minelp.options.title": "Mine Mali Poni Podešavanja", + "key.minelittlepony.settings": "Mine Horsey Horse", + "minelp.options.title": "Mine Horsey Horse Podešavanja", "minelp.options.ponylevel": "Poni Nivo", "minelp.options.ponylevel.ponies": "Samo Poniji", "minelp.options.ponylevel.ponies.tooltip": "Svi igrači su poniji\n\nObični Minecraft ljudski skinovi su automatski zamenjeni nekim sporednim ponijem", diff --git a/src/main/resources/assets/minelittlepony/models/entity/components/ears.json b/src/main/resources/assets/minelittlepony/models/entity/components/ears.json index 26495b7d..0f028d57 100644 --- a/src/main/resources/assets/minelittlepony/models/entity/components/ears.json +++ b/src/main/resources/assets/minelittlepony/models/entity/components/ears.json @@ -14,7 +14,7 @@ "pivot": ["#x", "#y", "#z"], "rotate": [0, 0, "#ear_spread"], "cubes": [ - { "from": [-4, -8, -1], "size": [2, 2, 2], "dilate": [0, "#ear_pronouncement", 0] } + { "from": [-4, -8, -1], "size": [2, 2, 2], "dilate": [0, "#ear_pronouncement", -0.5] } ] }, "left": { @@ -23,7 +23,7 @@ "mirror": [true, false, false], "rotate": [0, 0, "#ear_spread_neg"], "cubes": [ - { "from": [2, -8, -1], "size": [2, 2, 2], "dilate": [0, "#ear_pronouncement", 0] } + { "from": [2, -8, -1], "size": [2, 2, 2], "dilate": [0, "#ear_pronouncement", -0.5] } ] } } diff --git a/src/main/resources/assets/minelittlepony/models/entity/races/steve/bat_pony.json b/src/main/resources/assets/minelittlepony/models/entity/races/steve/bat_pony.json index f6bf7b92..d91481fb 100644 --- a/src/main/resources/assets/minelittlepony/models/entity/races/steve/bat_pony.json +++ b/src/main/resources/assets/minelittlepony/models/entity/races/steve/bat_pony.json @@ -1,11 +1,19 @@ { "parent": "minelittlepony:steve_pony", "data": { - "head": { - "cubes": [ - { "from": [-4, -6, -6], "size": [ 8, 8, 8] } - ], - "children": { + "head": { + "pivot": [ 0, "#head_pivot_y", 0 ], + "dilate": [-1, -1, 0], + "cubes": [ + { "from": [-4, -6, -6], "size": [ 8, 8, 8] } + ], + "children": { + "nose": { + "dilate": [-1, 0, -1], + "cubes": [ + { "from": [-4, -6, -13], "size": [ 8, 8, 8] } + ] + }, "snout": { "data": "minelittlepony:components/snout", "implementation": "com.minelittlepony.client.model.part.PonySnout" diff --git a/src/main/resources/assets/minelittlepony/models/entity/races/steve/hippogriff.json b/src/main/resources/assets/minelittlepony/models/entity/races/steve/hippogriff.json index cbaa36dd..a1ec23dd 100644 --- a/src/main/resources/assets/minelittlepony/models/entity/races/steve/hippogriff.json +++ b/src/main/resources/assets/minelittlepony/models/entity/races/steve/hippogriff.json @@ -16,10 +16,17 @@ "data": { "head": { "pivot": [ 0, "#head_pivot_y", 0 ], + "dilate": [-1, -1, 0], "cubes": [ { "from": [-4, -6, -6], "size": [ 8, 8, 8] } ], "children": { + "nose": { + "dilate": [-1, 0, -1], + "cubes": [ + { "from": [-4, -6, -13], "size": [ 8, 8, 8] } + ] + }, "snout": { "implementation": "com.minelittlepony.client.model.part.PonySnout", "data": "minelittlepony:components/beak" diff --git a/src/main/resources/assets/minelittlepony/models/entity/races/steve/kirin.json b/src/main/resources/assets/minelittlepony/models/entity/races/steve/kirin.json index f936b80e..1bc91bb8 100644 --- a/src/main/resources/assets/minelittlepony/models/entity/races/steve/kirin.json +++ b/src/main/resources/assets/minelittlepony/models/entity/races/steve/kirin.json @@ -1,11 +1,19 @@ { "parent": "minelittlepony:races/steve/unicorn", "data": { - "head": { - "cubes": [ - { "from": [-4, -6, -6], "size": [ 8, 8, 8] } - ], - "children": { + "head": { + "pivot": [ 0, "#head_pivot_y", 0 ], + "dilate": [-1, -1, 0], + "cubes": [ + { "from": [-4, -6, -6], "size": [ 8, 8, 8] } + ], + "children": { + "nose": { + "dilate": [-1, 0, -1], + "cubes": [ + { "from": [-4, -6, -13], "size": [ 8, 8, 8] } + ] + }, "snout": { "data": "minelittlepony:components/snout", "implementation": "com.minelittlepony.client.model.part.PonySnout" @@ -30,18 +38,30 @@ }, "neck": { "type": "mson:planar", - "dilate": [ -0.3, "#neck_dilate_y", -0.3 ], + "pivot": [0, -2, -4], + "dilate": [ -0.3, "#neck_dilate_y", 1.5 ], "texture": { "u": 0, "v": 16 }, - "rotate": [9, 0, 0], + "rotate": [30, 0, 0], "north": [-2, 1.199998, -2.8, 4, 4], "south": [-2, 1.199998, 1.2, 4, 4], "east": [ 2, 1.199998, -2.8, 4, 4], "west": [-2, 1.199998, -2.8, 4, 4], "children": { + "mane": { + "type": "mson:planar", + "pivot": [0, -2.9, 1.5], + "dilate": [ -0.8, 2, 0 ], + "texture": { "u": 32, "v": 0 }, + "rotate": [0, 0, 0], + "north": [-2, 1.199998, -2.8, 4, 4], + "south": [-2, 1.199998, 1.2, 4, 4], + "east": [ 2, 1.199998, -2.8, 4, 4], + "west": [-2, 1.199998, -2.8, 4, 4] + }, "beard": { "texture": { "u": 16, "v": 16 }, "pivot": [-4, 2, -2], - "rotate": [-29, 0, 0], + "rotate": [-50, 0, 0], "cubes": [ { "from": [0, 0, 0], "size": [ 8, 8, 4], "dilate": [0.5, -0.5, 0] } ] diff --git a/src/main/resources/assets/minelittlepony/models/entity/races/steve/unicorn.json b/src/main/resources/assets/minelittlepony/models/entity/races/steve/unicorn.json index 8ff4d185..ec4658e5 100644 --- a/src/main/resources/assets/minelittlepony/models/entity/races/steve/unicorn.json +++ b/src/main/resources/assets/minelittlepony/models/entity/races/steve/unicorn.json @@ -1,11 +1,19 @@ { "parent": "minelittlepony:steve_pony", "data": { - "head": { - "cubes": [ - { "from": [-4, -6, -6], "size": [ 8, 8, 8] } - ], - "children": { + "head": { + "pivot": [ 0, "#head_pivot_y", 0 ], + "dilate": [-1, -1, 0], + "cubes": [ + { "from": [-4, -6, -6], "size": [ 8, 8, 8] } + ], + "children": { + "nose": { + "dilate": [-1, 0, -1], + "cubes": [ + { "from": [-4, -6, -13], "size": [ 8, 8, 8] } + ] + }, "snout": { "data": "minelittlepony:components/snout", "implementation": "com.minelittlepony.client.model.part.PonySnout" }, "ears": { "data": "minelittlepony:components/ears", "implementation": "com.minelittlepony.client.model.part.PonyEars" }, "horn": { "data": "minelittlepony:components/horn", "implementation": "com.minelittlepony.client.model.part.UnicornHorn" } diff --git a/src/main/resources/assets/minelittlepony/models/entity/races/steve/zebra.json b/src/main/resources/assets/minelittlepony/models/entity/races/steve/zebra.json index 683532b6..f70038e7 100644 --- a/src/main/resources/assets/minelittlepony/models/entity/races/steve/zebra.json +++ b/src/main/resources/assets/minelittlepony/models/entity/races/steve/zebra.json @@ -1,16 +1,21 @@ { "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] } - ], - "children": { + "head": { + "pivot": [ 0, "#head_pivot_y", 0 ], + "dilate": [-1, -1, 0], + "cubes": [ + { "from": [-4, -6, -6], "size": [ 8, 8, 8] } + ], + "children": { + "nose": { + "dilate": [-1, 0, -1], + "cubes": [ + { "from": [-4, -6, -13], "size": [ 8, 8, 8] } + ] + }, "snout": { "data": "minelittlepony:components/snout", "implementation": "com.minelittlepony.client.model.part.PonySnout" }, "ears": { "data": "minelittlepony:components/ears", "implementation": "com.minelittlepony.client.model.part.PonyEars" }, "bristles": { diff --git a/src/main/resources/assets/minelittlepony/models/entity/steve_pony.json b/src/main/resources/assets/minelittlepony/models/entity/steve_pony.json index f582dfa9..2202c8a3 100644 --- a/src/main/resources/assets/minelittlepony/models/entity/steve_pony.json +++ b/src/main/resources/assets/minelittlepony/models/entity/steve_pony.json @@ -9,20 +9,27 @@ "arm_depth": 4, "arm_x": 0, "arm_x_neg": ["#arm_x", "-", "#arm_width"], - "arm_z": [2, "-", "#arm_depth"], + "arm_z": [0, "-", "#arm_depth"], "arm_rotation_x": 0, "arm_rotation_x_neg": [0, "-", "#arm_rotation_x"], "arm_rotation_y": 8, "head_pivot_y": 0, - "neck_dilate_y": -0.1 + "neck_dilate_y": 3 }, "data": { "head": { "pivot": [ 0, "#head_pivot_y", 0 ], + "dilate": [-1, -1, 0], "cubes": [ { "from": [-4, -6, -6], "size": [ 8, 8, 8] } ], "children": { + "nose": { + "dilate": [-1, 0, -1], + "cubes": [ + { "from": [-4, -6, -13], "size": [ 8, 8, 8] } + ] + }, "snout": { "implementation": "com.minelittlepony.client.model.part.PonySnout", "data": "minelittlepony:components/snout" @@ -35,6 +42,7 @@ }, "hat": { "texture": { "u": 32, "v": 0 }, + "dilate": [-1, -1, 0], "pivot": [ 0, "#head_pivot_y", 0 ], "cubes": [ { "from": [-4, -6, -6], "size": [ 8, 8, 8], "dilate": 0.5 } @@ -138,36 +146,32 @@ "size": [ 4, 4 ] } ] - }, - "tail_stub": { - "type": "mson:planar", - "pivot": [0, 1, -2.25], - "texture": { "u": 32, "v": 0 }, - "rotate": [29, 0, 0], - "up": [-1, 10, 10, 2, 6], - "down": [-1, 12, 10, 2, 6], - "east": [ 1, 10, 10, 6, 2], - "south":[-1, 10, 16, 2, 2], - "cubes": [ - { - "type": "mson:plane", - "mirror": [ true, false ], - "face": "west", - "position": [ -1, 10, 10 ], "size": [ 6, 2 ] - } - ] } } }, "neck": { "type": "mson:planar", - "dilate": [ -0.3, "#neck_dilate_y", -0.3 ], + "pivot": [0, -2, -4], + "dilate": [ -0.3, "#neck_dilate_y", 1.5 ], "texture": { "u": 0, "v": 16 }, - "rotate": [9, 0, 0], + "rotate": [30, 0, 0], "north": [-2, 1.199998, -2.8, 4, 4], "south": [-2, 1.199998, 1.2, 4, 4], "east": [ 2, 1.199998, -2.8, 4, 4], - "west": [-2, 1.199998, -2.8, 4, 4] + "west": [-2, 1.199998, -2.8, 4, 4], + "children": { + "mane": { + "type": "mson:planar", + "pivot": [0, -2.9, 1.5], + "dilate": [ -0.8, 2, 0 ], + "texture": { "u": 32, "v": 0 }, + "rotate": [0, 0, 0], + "north": [-2, 1.199998, -2.8, 4, 4], + "south": [-2, 1.199998, 1.2, 4, 4], + "east": [ 2, 1.199998, -2.8, 4, 4], + "west": [-2, 1.199998, -2.8, 4, 4] + } + } }, "jacket": { "texture": { "u": 24, "v": 0 }, diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index ae4e1f24..e4f7123e 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -2,10 +2,10 @@ "schemaVersion": 1, "id": "minelp", "version": "${version}", - "name": "Mine Little Pony", - "description": "Mine Little Pony turns players and mobs into ponies.", + "name": "Mine Horsey Horse", + "description": "Mine Horsey Horse turns players and mobs into horsies.", "authors": [ - "Mumfrey", "Killjoy1221", "Sollace" + "A bunch of horsey people" ], "contact": { "homepage": "https://minelittlepony-mod.com/",