Commit graph

645 commits

Author SHA1 Message Date
Matthew Messinger
fd113f1b90 Stop skin updates when the pony level hasn't updated 2018-08-26 18:27:28 -04:00
Matthew Messinger
f54e54da40 Fix skulls causing Pony to load before the texture is loaded. 2018-08-26 16:35:15 -04:00
Matthew Messinger
d9ddd3f842 Remove slim from Pony class. 2018-08-26 15:32:17 -04:00
Matthew Messinger
a022d3758a Refactor Skulls to separate them from their entity renderer.
(Most mods would just create their own TESR class for custom skulls)
2018-08-26 15:30:22 -04:00
Matthew Messinger
e38856aee7 Add skin parser used to populate metadata based on the image data 2018-08-25 22:40:07 -04:00
Sollace
1442dc51a3 Make bat wings more wing-like 2018-08-26 04:17:35 +02:00
Sollace
9a4c0a4804 Fixed player skulls not rendering a magical glow 2018-08-26 03:40:17 +02:00
Sollace
23f01e0f12 Merge branch 'master' of https://github.com/MineLittlePony/MineLittlePony 2018-08-26 03:13:22 +02:00
Matthew Messinger
8eb19c117f Quick fix for mixin conflict which caused ponies to be broken 2018-08-25 16:53:42 -04:00
Sollace
75bb59eeab Bat wings for bat ponies. Kinda. 2018-08-25 17:40:39 +02:00
Matthew Messinger
981cd002b3 Slightly rewrite texture loading so it is better adaptable.
Also exposes metadata more
2018-08-24 21:55:45 -04:00
Sollace
8f7a226b4a Pon pont 2018-08-25 00:26:09 +02:00
Sollace
d20199fffb Added batpony models 2018-08-24 17:19:21 +02:00
Sollace
96e429930b Fixed folded wing rotation point to not detach it from the body whilst swinging 2018-08-24 17:18:07 +02:00
Sollace
7a6a6716de Fixed ear behaviour on armour 2018-08-24 13:54:24 +02:00
Sollace
a70925b57f Remove 'unused' blocks from the enderstallion texture 2018-08-23 15:36:17 +02:00
Sollace
dc05d1baad Reword the skin save dialog as an actual saving dialogue 2018-08-23 15:07:33 +02:00
Sollace
804a25c255 Add batpony race 2018-08-22 23:35:40 +02:00
Sollace
5ecbc12b78 Replace the missing wing on alex_pony 2018-08-22 22:01:50 +02:00
Sollace
f5e0e355ae Removed the null checks. 2018-08-22 21:55:30 +02:00
Sollace
4aecea94cb Seaponies shouldn't have a sneaking animation 2018-08-22 21:55:16 +02:00
Sollace
153d32af3f Move saddlebags away from pure white and do ABSOLUTELY NOTHING ELSE 2018-08-22 21:54:54 +02:00
Sollace
bc04d43f3c Fixed NPE 2018-08-22 16:35:03 +02:00
Sollace
aa1a6e0002 NOW fix hooves busting shields whilst riding 2018-08-22 15:21:47 +02:00
Sollace
32b9182671 Fix blocking with shields in both hands 2018-08-22 15:15:48 +02:00
Sollace
531368e4ee Fixed rainboom parameter not checking if you're flying O.o 2018-08-22 14:49:29 +02:00
Sollace
d135d5601f Adjust riding position of all races 2018-08-22 14:32:02 +02:00
Sollace
5ce82e42ce Fixed item position whilst riding 2018-08-22 14:11:03 +02:00
Sollace
343d2656cf Fixed shield rendering in first person 2018-08-22 12:31:24 +02:00
Sollace
475d545887 Split up the GuiSkins by concern (There is now a skin chooser and an uploader, and the gui only has gui stuff) 2018-08-21 21:18:20 +02:00
Sollace
e0e2598cd0 Rename all of the armour textures to the new layering system (update yer resourcepacks) 2018-08-21 14:09:27 +02:00
Sollace
10f25a5b91 The 48, 8 2018-08-21 09:21:56 +02:00
Sollace
63d69d026a Make magic slightly brighter 2018-08-20 22:24:22 +02:00
Sollace
446a38b2fc Enable transparency on ponies' skins 2018-08-20 21:25:11 +02:00
Sollace
472e048d26 Remove this block of pointless transforms (fixes items held by foals are too tiny, and items held by foals are not in their hands) 2018-08-20 20:51:35 +02:00
Sollace
716d8e6f4b Fix alignment of the witch's hat 2018-08-20 20:51:35 +02:00
Sollace
f7052504e8 Rework the base pony scaling to be less awkward 2018-08-20 20:51:35 +02:00
Sollace
f4395e286a Sssecrets 2018-08-20 20:51:24 +02:00
Sollace
e26e21b160 Removed baby witches. Killjoy 2018-08-20 10:38:31 +02:00
Matthew Messinger
99eed8570d GuiSkins no longer has a concept of a gateway server.
Servers are now selectable by clicking the "?" button.
2018-08-19 17:55:38 -04:00
Matthew Messinger
cf132b8bcc Fix build errors. 2018-08-19 00:03:40 -04:00
Matthew Messinger
af398e6d85 Revert "Refactors for AvatarAPI Won't compile yet because AvatarAPI isn't on maven yet."
This reverts commit a24b6a1
2018-08-18 23:44:32 -04:00
Matthew Messinger
a24b6a108c Refactors for AvatarAPI
Won't compile yet because AvatarAPI isn't on maven yet.
2018-08-18 23:41:30 -04:00
Sollace
c95d540923 Remove debug code and add deadmous5 ears 2018-08-18 17:35:18 +02:00
Sollace
57902a7e62 Witches have a 1/300 chance of spawning as a foal. If you find one there is a 142% chance that it will be adorable 2018-08-18 16:17:21 +02:00
Sollace
50c7b373fc Fixed witch hats being in the wrong position when riding 2018-08-18 16:16:11 +02:00
Sollace
9c446122b8 Adjust neck placement on foals 2018-08-18 15:21:37 +02:00
Sollace
dafe85b358 Adjust neck and head placement on alicorns 2018-08-18 15:21:18 +02:00
Sollace
240345f29a Fixed armour leg placement when riding 2018-08-18 15:15:11 +02:00
Sollace
dca3cad2cd Fixed magic rendering of items that have permanent enchantment effects AND items with a dark tint 2018-08-18 14:15:05 +02:00
Sollace
ad18186382 Adjust positioning of held items 2018-08-18 13:33:29 +02:00
Sollace
8c15d46f68 Best of both worlds: Add the neck on both layers 2018-08-18 00:27:40 +02:00
Sollace
e18db6bb19 Normalize constant names 2018-08-18 00:24:58 +02:00
Sollace
d71aa20ced Remove unused constants 2018-08-17 23:23:50 +02:00
Sollace
6c50f40881 Admittedly his was a better way of doing it. Especially not that models are more hierarchical in nature 2018-08-17 23:18:54 +02:00
Sollace
be96ffd894 More interface 2018-08-17 23:13:58 +02:00
Sollace
2c9175b83a Turn PMAPI into an interface 2018-08-17 23:12:40 +02:00
Sollace
8527792dba No more reflection 2018-08-17 23:12:02 +02:00
Sollace
cea9419fb6 Some spring cleaning 2018-08-17 22:49:32 +02:00
Sollace
da26aef533 Fixed plane renderer not accounting for scaling on the z axes 2018-08-17 18:09:46 +02:00
Sollace
0ca03dbfa6 Pigmen should use the zombie model 2018-08-17 17:41:19 +02:00
Sollace
85622b335d Skeletons have a 1/3 chance of spawning without a horn 2018-08-17 16:37:22 +02:00
Sollace
f49d8bcadf Zombies have a 1/30 chance of spawning with wings 2018-08-17 16:36:55 +02:00
Sollace
1a80f768eb Move neck to the outer layer 2018-08-17 16:35:20 +02:00
Sollace
9d5d204535 Fix shadow scale on child mobs 2018-08-17 16:34:08 +02:00
Sollace
943019ba2e Fixed unicorn horns not rendering 2018-08-17 16:00:37 +02:00
Sollace
6a55833fb8 Derp. Actually have to do it like this. 2018-08-17 15:55:13 +02:00
Sollace
fabb66a5b2 Show necks as part of armour 2018-08-17 15:50:59 +02:00
Sollace
9ffb62d335 Reduce the probability of enderstallions having horns 2018-08-17 15:38:10 +02:00
Sollace
09f8a99066 Rotate player arms to put the front up 2018-08-17 15:33:19 +02:00
Sollace
d59ec9514f Properly detect old human textures 2018-08-17 15:09:20 +02:00
Sollace
ada764f946 Move the armour texture resolver to a class and interface 2018-08-17 15:08:37 +02:00
Sollace
2752bdcc4c Fix arm positioning (final) 2018-08-17 14:12:25 +02:00
Sollace
3f99784f4f rename flankguard -> chestpiece 2018-08-17 12:02:23 +02:00
Sollace
cf34174ac1 Merge branch 'master' of https://github.com/MineLittlePony/MineLittlePony 2018-08-17 08:48:42 +02:00
Matthew Messinger
ca94bfa860 Quick fix for weird first person fist. Fixes #90 2018-08-16 16:51:16 -04:00
Sollace
96c8034636 Bleep 2018-08-16 21:34:28 +02:00
Sollace
23f2151eed Skeletons don't need two armour layers, do they? 2018-08-16 21:32:09 +02:00
Sollace
4bea2e77a3 Rewrite armour AGAIN 2018-08-16 21:31:24 +02:00
Matthew Messinger
c53d2a12f6 Fix modded armor not having a helmet 2018-08-15 21:14:49 -04:00
PolyacovYury
13a37de5a1 Update ru_ru.lang (#89)
Inaccuracies. :)
2018-08-15 19:13:11 -04:00
Matthew Messinger
26e1d7b3d6 Re-add armor layer which was removed in 7f12104e 2018-08-15 18:34:22 -04:00
Sollace
b9ea6ad28a Merge branch 'master' of https://github.com/MineLittlePony/MineLittlePony 2018-08-15 17:33:19 +02:00
Sollace
1694edebe5 Update translation strings for russian and french 2018-08-15 17:32:57 +02:00
Sollace
22bb316f2d Clear warnings and fix imports 2018-08-15 17:28:58 +02:00
Sollace
d2b0577eaa Add translation strings for the endermen 2018-08-15 17:19:13 +02:00
Sollace
6ea3ed2d75 Pony endermen 2018-08-15 17:14:40 +02:00
Sollace
3c53d3e4ff Fixed a derp with pony tails not hiding 2018-08-15 17:12:19 +02:00
Sollace
f0453844a0 Add missing @Override annotations 2018-08-15 17:12:06 +02:00
Matthew Messinger
38a2fcd7c0 Fix mappings (forgot to build) 2018-08-14 20:00:16 -04:00
Sollace
57206213c5 Adjust yearling dimensions to be big headed :3 2018-08-15 00:26:24 +02:00
Sollace
640cf8ef03 Finalize the seapony colour code 2018-08-14 22:58:53 +02:00
Sollace
3225d727fd Add yearlings (teenage) ponies 2018-08-14 22:55:42 +02:00
Sollace
36015ba384 Fixed the Proxy renderer not including layers. (Guardians can have arrows now! :D) 2018-08-14 19:06:46 +02:00
Sollace
bf8025bdaf Guard as best we can against shenanigans. Should fix rendering errors, or at least replace them with a clearer message that something or someone is misbehaving 2018-08-14 19:05:54 +02:00
Sollace
d5efe0d3f6 (reported by Poly) Fix head position and vertical alignment issues when sneaking 2018-08-13 08:14:38 +02:00
Sollace
fe06800823 Fixed lighting and rendering shenanigans 2018-08-13 08:14:37 +02:00
Sollace
78a756f9c3 Move the GuiItemStackButton to live with the rest of the gui classes and improved error message handling 2018-08-13 08:14:36 +02:00
Sollace
29c72f654c Split the elytra button into its own toggle 2018-08-13 08:14:36 +02:00
Sollace
25230a384c Fix layering of tooltips and make buttons more hmmmhmmmhmmm 2018-08-13 08:14:35 +02:00
Sollace
063d9bfbd0 Arrange buttons 2018-08-13 08:14:35 +02:00
Sollace
73f0eddf01 Rewrite SkinsGui using the new-age gui classes 2018-08-13 08:14:34 +02:00
Sollace
01bdac7ed8 Split duplicated code out to LocalTexture 2018-08-13 08:14:33 +02:00
­Sollace
b485f07d17
Merge pull request #87 from TheWeatherPony/master
Friendlier Modifiers for external mod access
2018-08-10 22:36:06 +02:00
Sollace
ba429c300b Fix compilation errors 2018-08-10 20:40:01 +02:00
Sollace
33296e336c Center the preview models so rotating isn't as janked 2018-08-10 20:19:08 +02:00
Sollace
40866cc22b Fixed remote preview player not being scaled correctly 2018-08-10 20:18:28 +02:00
Sollace
377cda5481 Remove the c/p to prevent future errors 2018-08-10 20:00:53 +02:00
Sollace
8b5d2b33cb Fixed Elytras not appearing in the correct place on skin previews. 2018-08-10 19:59:10 +02:00
TheWeatherPony
3268e768c1 Friendlier Access Modifiers
Added support for potential external usage without going through Pony.class and potential swapping of models without swapping renders. Usages/Implementations not included.
2018-08-09 23:32:09 -07:00
Matthew Messinger
1369665fd6 Elytra flying is different from regular flying 2018-07-29 23:49:45 -04:00
Matthew Messinger
21ea56d134 Add valhalla skin server as a default one. 2018-07-28 15:35:41 -04:00
Sollace
b86403ae65 Use the model's head position rather than the entities for determining if it's submerged 2018-07-27 00:17:23 +02:00
Sollace
028b86d749 Fix derped swimming animation 2018-07-27 00:10:35 +02:00
Sollace
7f12104ec5 Clean up some dank around the IRenderPony(s) 2018-07-27 00:10:18 +02:00
Sollace
302a8a22ad Fixed mobs not heeding the scale of their skins 2018-07-26 18:45:22 +02:00
Sollace
14f98369e8 Foals were _slightly_ too small 2018-07-26 17:53:26 +02:00
Sollace
10f44f9326 Fixed shadows rendering on sleeping players 2018-07-22 17:26:15 +02:00
Sollace
137371f394 Fixed derpy foal scaling 2018-07-22 17:24:11 +02:00
Sollace
76a3f30f32 Correct pony scaling 2018-07-22 16:31:38 +02:00
Matthew Messinger
8e663c81d3
Merge pull request #74 from MineLittlePony/valhalla
Valhalla Implementation
2018-07-14 10:54:30 -04:00
Matthew Messinger
540ed43178 Make SkinServer json serializable and add a button go skins menu to show current gateway server. 2018-07-13 23:05:21 -04:00
Sollace
25e68bb2c4 These ended up not being needed 2018-07-13 20:03:01 +02:00
Sollace
0798fa88d3 Combine PonyArmour and IEquestrianArmor 2018-07-13 20:01:35 +02:00
Sollace
6839105881 Move everything to main so gradles doesn't choke 2018-07-12 13:17:31 +02:00
Sollace
fe6c51c75a Add IEquestrianArmor 2018-07-12 13:17:30 +02:00
Sollace
f8084c2975 Add armour apis 2018-07-12 13:17:30 +02:00
Sollace
ff690af493 Default to normal for unknown pony sizes 2018-07-11 20:51:04 +02:00
Sollace
bb16e157df Fixed elytra floating off of foal's backs 2018-07-08 12:21:57 +02:00
Sollace
13b1f3385f Correct typo (again) and scale down panorama images 2018-07-08 11:56:18 +02:00
Sollace
4ee7d2d88e Only blank skins and skins that support seapony mode should render as a seapony in seapony skin mode 2018-07-07 14:29:09 +02:00
Matthew Messinger
a92a121a5b Revert "Fix spelling mistake and apply custom panoramas to the title screen"
This reverts commit a5b0e187a0.
2018-07-05 22:49:28 -04:00
Sollace
a5b0e187a0 Fix spelling mistake and apply custom panoramas to the title screen 2018-07-03 19:07:36 +02:00
Sollace
6cc8e95991 Added seapony support to the skins gui, and some mlp-themed panoramas 2018-07-01 17:33:30 +02:00
PolyacovYury
8852f80171 Updated and fixed ru_ru.lang files (#73) 2018-06-30 11:54:39 +02:00
Sollace
1e52830c91 Added proper alex model support to HDSkins. Skin servers should remember what the "model" parameter was when saving a skin and include it in their responses. 2018-06-29 23:33:05 +02:00
Sollace
8a31d6c48f Fixed preview pony not having a tail 2018-06-29 19:39:12 +02:00
Sollace
2acb8e6555 Preserve tool orientation so it doesn't look like you're mining with the blunt edge 2018-06-29 19:25:08 +02:00
Sollace
58b24d07b7 Fixed snouts not rendering 2018-06-29 19:14:11 +02:00
Sollace
849301ae9c Handle HDSkins' skin type 2018-06-29 19:01:04 +02:00
Sollace
f520998365 SHOOO BE DOO! https://www.youtube.com/watch?v=iakTl9SZTTY 2018-06-29 18:36:03 +02:00
Sollace
04b852ce7e Fixed seapony's arms not being positioned correctly 2018-06-26 21:57:34 +02:00
Sollace
f9dba78570 Remove unused constants 2018-06-22 17:58:18 +02:00
Sollace
16634d9957 Clean up these old human fields 2018-06-22 01:46:10 +02:00
Sollace
8e173fc859 Change packages and use enums 2018-06-22 01:23:52 +02:00
Sollace
658a48fe83 Move all the transformations out into their own classes 2018-06-22 01:23:02 +02:00
Sollace
cea593e68e Fixed unicorn arms rotating into the ground when sneaking 2018-06-22 01:21:20 +02:00
Sollace
e657865305 Move normal transforms into its own method 2018-06-21 23:53:32 +02:00
Sollace
aed1dbd8d3 Clean up and get rid of this weird split between textures and positions 2018-06-21 23:49:11 +02:00
Sollace
b14a6cb233 Pony snouts will no longer bust through player's skulls. ... That's likely less violent than it sounds. 2018-06-21 19:28:22 +02:00
Sollace
7ddb747b28 Add a translation string for the new pony heads option 2018-06-20 23:58:51 +02:00
Sollace
d08c43ffba Fixed skulls not always rendering with magic effects 2018-06-20 23:54:41 +02:00
Sollace
232089bfad Sort out problems when the pony skulls are off 2018-06-20 23:41:08 +02:00
Sollace
00d4009a76 Fix rebase conflict 2018-06-20 23:28:29 +02:00
Sollace
2c121d2960 Finish ponyskulls, add the deadmou5 ears, and ad an option to toggle skulls on and off 2018-06-20 23:27:17 +02:00
Sollace
31ce31a109 Hey, they work! :D (v1) 2018-06-20 23:27:15 +02:00
Sollace
4b6c49f6fa Pony skulls, pony skulls, what 'chu gonna do when they come for you! 2018-06-20 23:27:13 +02:00
Sollace
224fe4b7ab Add pony features to skulls (WIP) 2018-06-20 23:27:12 +02:00
Sollace
a637a213c4 Correct neck placement whilst sneaking 2018-06-20 23:24:14 +02:00
Sollace
caee032cb2 Reimplement the in-game options menu (oops) 2018-06-20 23:24:14 +02:00
Sollace
1642614eb4 I completely forgot that this was why I added an interpolator in the first place 2018-06-11 20:11:21 +02:00
Sollace
a9abab820e Don't try to strafe at angles of NaN 2018-06-11 20:10:21 +02:00
Sollace
2a32b74b5b Implement proper tweening for certain animations 2018-06-11 19:59:51 +02:00
PolyacovYury
845f3536ad Merging together @PolyacovYury and @Sollace's visions on saddlebags. (#69) 2018-06-11 17:51:38 +02:00
Sollace
8be2f2fa39 Fix texture alignment issues with wings and make pegasus available during render 2018-06-10 23:04:58 +02:00
Sollace
803e79343d Rename PonyRenderer.flipX -> PonyRenderer.flip to better reflect its meaning 2018-06-10 19:49:28 +02:00
Sollace
cf1a2bf058
Merge pull request #68 from PolyacovYury/player_strafing
Implemented player strafing calculation from change in model rotation angle
2018-06-10 18:56:22 +02:00
Sollace
7b9eaffdbf Fixed the double gui bug 2018-06-10 18:54:50 +02:00
Sollace
334e768166 Added an option to toggle first-person magic 2018-06-10 09:37:15 +02:00
Sollace
0b4086db05 Keep the player model where it is, translate the shadow instead 2018-06-10 09:05:44 +02:00
PolyacovYury
2dff61c925 Implemented player strafing calculation from change in model rotation angle (since a strafing model that doesn't turn anywhere would look silly and would be exponentially hard to implement) 2018-06-09 05:18:01 +03:00
Sollace
8fe228ae5a Removed sleepy solly code. 2018-06-08 23:30:18 +02:00
Sollace
46199208ce Fix strafing getting stuck at invalid angles 2018-06-08 21:21:08 +02:00
Sollace
3800bc2424 Fix placement and improve animations 2018-06-08 01:06:38 +02:00
Sollace
03b558bb8f Whitespace 2018-06-08 01:06:38 +02:00
Sollace
9d5c6d1a37 Fix trigger pixel for saddlebags 2018-06-08 01:06:37 +02:00
Sollace
2c8ecdf1b5 Off by one 2018-06-08 01:06:37 +02:00
Sollace
42081b38d4 Implemented pony wearables as saddlebags and (soon) 2018-06-08 01:06:37 +02:00
Sollace
ad77b48e59 Get a trigger value on each individual component of a pixel rather than the whole colour 2018-06-08 01:06:36 +02:00
Sollace
a4a6e7a1c4 Fixed parrots spazzing out when riding a pony. I GET IT I'M A TALKING HORSE GASH 2018-06-07 23:19:54 +02:00
Sollace
9611198a86 Merge branch 'skins_fix' 2018-06-07 20:31:51 +02:00
Sollace
eba8589963 Add protocol to the minelp server urls 2018-06-06 20:53:24 +02:00
Sollace
d338a4ddb6 HDSkins has player data loaded when fetching a pony. 2018-06-06 20:02:26 +02:00
Sollace
3ea22fd67c Implement saddlebags as a separate component with more interesting animations 2018-06-04 22:26:05 +02:00
Sollace
4123ee8c6e Resolve naming clash between IModelPart and ModelRenderer 2018-06-04 19:34:31 +02:00
Sollace
3aedf474ba Better barrel roles! This should be less likely to break on diagonals. 2018-06-04 19:27:57 +02:00
Sollace
d3efbc5c05 Pegasus wings flap slower when underwater 2018-06-03 22:23:32 +02:00
Sollace
b879c979ce Typo 2018-06-03 22:18:42 +02:00
Sollace
da2d435ca2 Multiply, not divide (0.2 / 5 == 0.04) 2018-06-03 19:59:55 +02:00
Sollace
bafe9aca31 Apply the same amount of waggle to saddlebags as is applied to the body 2018-06-03 19:34:32 +02:00
Sollace
f584f40826 Fixed transforms on villagers' bits 2018-06-03 19:20:10 +02:00
Sollace
5f8b0cf395 Naming collusion between MCP:ModelRenderer.render and MLP:IModelPart.render 2018-06-03 17:47:21 +02:00
Sollace
979782c8f8 guess ponies still have to block with a bow, even if their arms bust through the front... 2018-06-03 17:30:53 +02:00
Sollace
32df82ba77 Skeletons should now hold their items correctly 2018-06-03 17:26:43 +02:00
Sollace
2dc2642bc9 Fixed more wonkyness and inconsistency between players and mobs 2018-06-03 17:20:30 +02:00
Sollace
a5d67a7e1c Fix leg wonkyness in general 2018-06-03 16:38:03 +02:00
Sollace
51dc230d1a Fix alignment of held shields and blocking 2018-06-03 13:23:27 +02:00
Sollace
28274b76fd Clear the pony cache alongside the skin cache, and fixed windows appearing behind the client 2018-06-03 11:57:22 +02:00
Sollace
5178b8f40d Translate everypony down so they don't float 2018-06-02 23:32:01 +02:00
Sollace
1afc1cc301 Center and align players and mobs to the same position whilst riding 2018-06-02 23:27:59 +02:00