Commit graph

265 commits

Author SHA1 Message Date
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
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
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
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
3f99784f4f rename flankguard -> chestpiece 2018-08-17 12:02:23 +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
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
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
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
Sollace
028b86d749 Fix derped swimming animation 2018-07-27 00:10:35 +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
137371f394 Fixed derpy foal scaling 2018-07-22 17:24:11 +02:00
Sollace
0798fa88d3 Combine PonyArmour and IEquestrianArmor 2018-07-13 20:01:35 +02:00
Sollace
f8084c2975 Add armour apis 2018-07-12 13:17:30 +02:00
Sollace
bb16e157df Fixed elytra floating off of foal's backs 2018-07-08 12:21:57 +02:00
Sollace
6cc8e95991 Added seapony support to the skins gui, and some mlp-themed panoramas 2018-07-01 17:33:30 +02:00
Sollace
58b24d07b7 Fixed snouts not rendering 2018-06-29 19:14:11 +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
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
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
8fe228ae5a Removed sleepy solly code. 2018-06-08 23:30:18 +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
42081b38d4 Implemented pony wearables as saddlebags and (soon) 2018-06-08 01:06:37 +02:00
Sollace
9611198a86 Merge branch 'skins_fix' 2018-06-07 20:31:51 +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
d3efbc5c05 Pegasus wings flap slower when underwater 2018-06-03 22:23:32 +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
5178b8f40d Translate everypony down so they don't float 2018-06-02 23:32:01 +02:00
Sollace
86fe40f48f Unmirror wings. Fixes #63 2018-06-02 20:15:42 +02:00
Sollace
8d992a5361 Fixed the tops and bottoms of saddlebags being flipped 2018-06-02 20:14:01 +02:00
Sollace
7f6a01cf9d Fixed swinging animation not playing for horny ponies 2018-06-02 20:05:22 +02:00
Sollace
cd84f64d37 Fixed snouts not following the snuzzles config option 2018-06-02 19:13:52 +02:00
Sollace
0393daa0ba Fix merge conflicts 2018-06-02 18:05:33 +02:00
Matthew Messinger
46180b9691
Merge pull request #50 from Sollace/trim_armour_models
Cut all of the extra code from armour
2018-06-02 11:34:59 -04:00
Matthew Messinger
0a11cfc4ab
Merge pull request #48 from Sollace/zebra_models
Further rework models and added a few new ones
2018-06-02 11:34:05 -04:00
Sollace
28fce6ef5d Cut all of the extra code from armour 2018-06-02 13:35:28 +02:00
Sollace
362f17ea49 Added unicorn models to all the stuffs 2018-05-27 12:36:52 +02:00
Sollace
93ec981628 Guardians are now seaponies! 2018-05-27 12:36:47 +02:00
Sollace
8e1fb834f7 (From the capes branch) Let's be a bit more sensible about flying 2018-05-27 12:35:38 +02:00
Sollace
72b3bce950 Added Modelseapony (I will make sure this works later) 2018-05-27 12:35:38 +02:00
Sollace
5686608969 Decompose ModelAlicorn into its constituents 2018-05-27 12:35:37 +02:00
Sollace
3da7853265 Added zebras and finished witches 2018-05-27 12:35:37 +02:00
Sollace
7af76994ec Fix texture alignment on saddlebags 2018-05-27 12:29:22 +02:00
Sollace
9a98ac4b22 Scaling fix (#53)
* Actually USE show scaling when rendering Fixes #51
* Center models on the entity being rendered (initial) Fixes #52
2018-05-25 21:39:30 -04:00
Sollace
df36cf61fc Fixed leg placement whilst flying (alicorns will still have held items lag behind them - I call it a feature) 2018-05-01 21:30:10 +02:00
Sollace
df5d18d350 One last codestyle commit to clean stuff up I missed, correct and document some names, and add TODO items for everything that needs to be done. 2018-05-01 12:38:13 +02:00
Sollace
4513f1c443 Fixed bows shooting off into space https://www.youtube.com/watch?v=7dwLCHNdqWw 2018-04-30 17:27:21 +02:00
Sollace
e4281116cd Remove these todos because I think they've been done now 2018-04-30 17:12:08 +02:00
Sollace
6981cde884 Debug code pls 2018-04-30 12:53:08 +02:00
Sollace
d1724fa307 Rendering is super annoying, I agree >.> 2018-04-30 11:49:29 +02:00
Sollace
51e5c9ddc5 Fixed unicorns not swinging their arms when their hands are empty 2018-04-30 10:31:14 +02:00
Sollace
e2c94901c4 Tried dissassembling the staircase, but it broke half the model. Could probably get it to work, but it'd take more math. 2018-04-30 08:31:57 +02:00
Sollace
35e9ef750b Fixed leg outset being encorrect for normal width legs 2018-04-29 23:06:34 +02:00
Sollace
871f12c3e2 Ponies no longer float above beds when they're sleeping 2018-04-29 20:18:57 +02:00
Sollace
7d4c7ede88 Fixed various leg alignment issues (may break resourcepacks)
May Break Resourcepacks:
 To fix, just rescale skeleton legs to 2x2 pixels
 width keeping the original positions.
2018-04-29 18:00:26 +02:00
Sollace
fd68e60923 Refactoring for refactoring's sake. I wasn't happy with how things were split up 2018-04-29 14:22:26 +02:00
Sollace
dfb338e39d Fixed snouts 2018-04-29 14:20:13 +02:00
Sollace
44ab173613 No longer used 2018-04-29 11:57:59 +02:00
Sollace
4b27e432b9 Move some things for consistency 2018-04-29 11:56:26 +02:00
Sollace
7fbc14ca01 Added a model for witches (current texture is a placeholder until we can get Zebras) 2018-04-28 23:00:01 +02:00
Sollace
3f32e2b19a Zombie villagers will render with saddlebags and all the other stuff normal villagers do 2018-04-28 22:59:19 +02:00
Sollace
7237480d04 When you're sick and tired of staring at this unreadable code 2018-04-28 21:23:08 +02:00
Sollace
de88e95ffe Unused import 2018-04-28 20:39:21 +02:00
Sollace
45ad30503c Okay, things are clear now. CRYSTAL CLEAR 2018-04-28 18:20:56 +02:00
Sollace
7ff68e0e4f Snippity snippity. That should fix horn glows 2018-04-28 18:13:35 +02:00
Sollace
12ec6c1302 Break ModelPlayerPony into each different race 2018-04-28 16:39:32 +02:00
Sollace
2dfe647165 All four legs are now thin, update the ALEX skin to have thin legs 2018-04-27 23:23:47 +02:00
Sollace
52ed49defd Mobs now flap their wings when falling/flying 2018-04-27 23:23:07 +02:00
Sollace
3a4e1fc32a Fix mirroring issues on villager's saddlebags, add depth to the bag's strap 2018-04-27 21:49:27 +02:00
Sollace
2e090498db Rewrite breezies (and ensure it has a head) 2018-04-27 21:48:55 +02:00
Sollace
2b154d2441 Some more tidying up 2018-04-27 20:37:54 +02:00
Sollace
0e0ee17f46 Codestyle to remove all trailing whitespace, unneccessary this arguments, and standardise parameter names 2018-04-27 13:49:33 +02:00
Sollace
7fbb56ad79 No changes, just whitespace 2018-04-27 09:48:55 +02:00
Sollace
17624c484a Clean up elytra code 2018-04-27 09:46:44 +02:00
Sollace
36ee3966d7 Tidy up snuzzles 2018-04-26 23:55:09 +02:00
Sollace
c6e81529f3 More formatting 2018-04-26 23:54:05 +02:00
Sollace
7a66dfda42 Tidy up ponytails 2018-04-26 23:53:22 +02:00
Sollace
2ad7119723 Yet more codestyle! 2018-04-26 23:53:03 +02:00
Sollace
785784b694 Move HornGlow to the correct package 2018-04-26 23:46:53 +02:00
Sollace
441fc61508 Apparantly google hates concise readable code. So there, can't complain about static members if they're not static. :P
I may just revert this later...
2018-04-26 22:31:26 +02:00
Sollace
ca2e5ddf46 Fixed some armour issues 2018-04-26 18:20:22 +02:00
Sollace
f01bdd973b Added some more swing to tails 2018-04-26 18:19:25 +02:00
Sollace
d233399b68 Fixed skeleton legs not swinging 2018-04-26 17:21:47 +02:00
Sollace
af3dff6c87 Fix errors when rendering armour 2018-04-26 17:20:40 +02:00
Sollace
618a9b78bb Rewrite wings - fix walking/interacting wing animation 2018-04-26 17:20:02 +02:00
Sollace
280013c8a4 Rewrite model code (part 1) 2018-04-26 16:01:31 +02:00
Sollace
0c6e2a74ff Infinite loops are bad, mmmkay? 2018-04-25 22:02:02 +02:00
Sollace
5964cf1bc4 What time is it? Amputation time! 2018-04-25 21:38:11 +02:00
Sollace
9391c1d8c0 Code stylee, documentation, fixed leg alignment 2018-04-25 21:29:49 +02:00
Sollace
f151b31597 Clean up armor/armour, clean up villager models, more package changes 2018-04-25 16:40:47 +02:00
Sollace
403c195007 Time to tackle packages (phase 1: separate the data from all the other carp) 2018-04-25 13:02:10 +02:00
Sollace
52e2c84b67 Model rewrites wave 2, clean up horn rendering, plane rendering, Zombie and Skeleton models 2018-04-25 12:59:18 +02:00
Sollace
b9e9251c43 Model rewrites wave 1, moved pony tails to their own class 2018-04-25 09:49:41 +02:00
Sollace
228c32b4e5 Fixed Top and Bottom planes being reversed causing encorrect lighting on ponies 2018-04-25 09:45:41 +02:00
Sollace
1718868ca4 Format PonyModelConstants 2018-04-24 21:35:42 +02:00
Sollace
e25326eed4 Fixed position/angle of the wings 2018-04-24 21:24:29 +02:00
Sollace
0657a03703 Models now work again 2018-04-24 17:12:23 +02:00
Sollace
a99873f8e6 Refactor PegasusWings 2018-04-24 16:46:53 +02:00
Sollace
fbb40134e2 * Move player rendering to make use of the build in skinMap
* Remove reflection
* Use the interface (IPonyData) not the class
2018-04-24 14:55:32 +02:00
Matthew Messinger
29f2f5ee58 Fix class cast exceptions
* elytras in skins menu
* zombie villagers
2017-06-16 02:14:50 -04:00
Matthew Messinger
8b99a03e28 Remove randomness from mobs and fix some super issues
Also update mappings
2017-06-16 01:35:02 -04:00
Matthew Messinger
52da7f800b Fix vindicator's metadata not updating, causing its held item to be misplaced 2017-06-13 05:09:55 -04:00
Matthew Messinger
c9d7a394ad Update to 1.12
Changes:
 * Added a base layer class which can intelligently switch between pony and human.
 * Skins no longer are "converted" when they are already in the new format.
 * Illagers now use the existing model and texture format.
 * Metadata can now be read from the .mcmeta file (taken from old illagers)
 * Non-converted resources are no longer re-uploaded
 * (1.12) Parrots are rendered on the head instead of shoulders
2017-06-13 03:31:01 -04:00
Matthew Messinger
370e8e3af3 fix nullables and formatting 2017-06-13 01:27:30 -04:00
Matthew Messinger
a411969a98 Add package-info files for annotations 2017-06-12 23:44:34 -04:00